Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

fix issues

Browse Source
merge-requests/47/head
Fatimah Alshammari 3 years ago
parent d1652ef04d
commit 0cca8ec935
7 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
assets/langs/en-US.json
Unescape Escape View File

@ -296,7 +296,7 @@
"relatedTopic": "Related Topic", "relatedTopic": "Related Topic",
"selectTopic": "Select Topic", "selectTopic": "Select Topic",
"supportingDocument": "Supporting Document", "supportingDocument": "Supporting Document",
"mowadhafhiRequest": "Mowadhafhi Request", "mowadhafhiRequest": "Mowadhafi Request",
"ticketReference": "Ticket Reference", "ticketReference": "Ticket Reference",
"section": "Section", "section": "Section",
"topic": "Topic", "topic": "Topic",

2
lib/models/generic_response_model.dart
Unescape Escape View File

@ -1291,7 +1291,7 @@ class GenericResponseModel {
startEitApprovalProcess = json['StartEitApprovalProcess'] != null ? StartEitApprovalProcess.fromJson(json['StartEitApprovalProcess']) : null; startEitApprovalProcess = json['StartEitApprovalProcess'] != null ? StartEitApprovalProcess.fromJson(json['StartEitApprovalProcess']) : null;
startHrApprovalProcessList = json['StartHrApprovalProcessList']; startHrApprovalProcessList = json['StartHrApprovalProcessList'];
startPhonesApprovalProcessList = json['StartPhonesApprovalProcessList'] != null ? StartPhoneApprovalProcess.fromJson(json['startPhonesApprovalProcessList']) : null; startPhonesApprovalProcessList = json['StartPhonesApprovalProcessList'] != null ? StartPhoneApprovalProcess.fromJson(json['StartPhonesApprovalProcessList']) : null;
startSitApprovalProcess = json['StartSitApprovalProcess']; startSitApprovalProcess = json['StartSitApprovalProcess'];
startTermApprovalProcessList = json['StartTermApprovalProcessList'] != null ? StartTermApprovalProcessList.fromJson(json['StartTermApprovalProcessList']) : null; startTermApprovalProcessList = json['StartTermApprovalProcessList'] != null ? StartTermApprovalProcessList.fromJson(json['StartTermApprovalProcessList']) : null;

15
lib/ui/misc/request_submit_screen.dart
Unescape Escape View File

@ -68,7 +68,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
} }
void submitRequest() async { void submitRequest() async {
try { // try {
Utils.showLoading(context); Utils.showLoading(context);
List<Map<String, dynamic>> list = []; List<Map<String, dynamic>> list = [];
if (attachmentFiles.isNotEmpty) { if (attachmentFiles.isNotEmpty) {
@ -97,7 +97,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
); );
} else if (params!.approvalFlag == 'address') { } else if (params!.approvalFlag == 'address') {
await ProfileApiClient().startAddressApprovalProcess( await ProfileApiClient().startAddressApprovalProcess(
"SUBMIT", LocaleKeys.submit.tr(),
comments.text, comments.text,
params!.pItemId, params!.pItemId,
params!.transactionId, params!.transactionId,
@ -111,7 +111,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
); );
} else if (params!.approvalFlag == 'basicDetails') { } else if (params!.approvalFlag == 'basicDetails') {
await ProfileApiClient().startBasicDetailsApprovalProcess( await ProfileApiClient().startBasicDetailsApprovalProcess(
"SUBMIT", LocaleKeys.submit.tr(),
comments.text, comments.text,
params!.pItemId, params!.pItemId,
params!.transactionId, params!.transactionId,
@ -131,6 +131,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
); );
}else if (params!.approvalFlag == 'endEmployment') { }else if (params!.approvalFlag == 'endEmployment') {
await TerminationDffApiClient().startTermApprovalProcess( await TerminationDffApiClient().startTermApprovalProcess(
// "SUBMIT",
LocaleKeys.submit.tr(), LocaleKeys.submit.tr(),
comments.text, comments.text,
params!.pItemId, params!.pItemId,
@ -142,10 +143,10 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
Utils.showToast(LocaleKeys.yourRequestHasBeenSubmittedForApprovals.tr(), longDuration: true); Utils.showToast(LocaleKeys.yourRequestHasBeenSubmittedForApprovals.tr(), longDuration: true);
Navigator.of(context).popUntil((route) => route.settings.name == AppRoutes.dashboard); Navigator.of(context).popUntil((route) => route.settings.name == AppRoutes.dashboard);
Navigator.pushNamed(context, AppRoutes.workList); Navigator.pushNamed(context, AppRoutes.workList);
} catch (ex) { // } catch (ex) {
Utils.hideLoading(context); // Utils.hideLoading(context);
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} // }
} }
@override @override

10
lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
Unescape Escape View File

@ -136,7 +136,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
} }
Future getDefaultValues(GetEITDFFStructureList structureList) async { Future getDefaultValues(GetEITDFFStructureList structureList) async {
try { // try {
Utils.showLoading(context); Utils.showLoading(context);
for (int i = 0; i < (structureList.cHILDSEGMENTSDVSplited?.length ?? 0); i++) { for (int i = 0; i < (structureList.cHILDSEGMENTSDVSplited?.length ?? 0); i++) {
String segmentId = structureList.cHILDSEGMENTSDVSplited![i]; String segmentId = structureList.cHILDSEGMENTSDVSplited![i];
@ -163,10 +163,10 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
await Future.delayed(const Duration(seconds: 1)); await Future.delayed(const Duration(seconds: 1));
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
} catch (ex) { // } catch (ex) {
Utils.hideLoading(context); // Utils.hideLoading(context);
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} // }
} }
// List<Map<String, dynamic>> calGetValueSetValuesIonicLogic(GetEITDFFStructureList structureElement) { // List<Map<String, dynamic>> calGetValueSetValuesIonicLogic(GetEITDFFStructureList structureElement) {

34
lib/ui/my_team/employee_details.dart
Unescape Escape View File

@ -256,19 +256,29 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
child: Column( child: Column(
children: [ children: [
Text(LocaleKeys.addFavoriteList).tr(namedArgs: {'name': '${getEmployeeSubordinates!.eMPLOYEENAME}'}), Text(LocaleKeys.addFavoriteList).tr(namedArgs: {'name': '${getEmployeeSubordinates!.eMPLOYEENAME}'}),
Image.memory( getEmployeeSubordinates!.eMPLOYEEIMAGE == null
Utils.getPostBytes( ? SvgPicture.asset(
getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "", "assets/images/user.svg",
height: 68,
width: 68,)
: CircleAvatar(
radius: 68,
backgroundImage: MemoryImage(Utils.dataFromBase64String(getEmployeeSubordinates!.eMPLOYEEIMAGE!)),
backgroundColor: Colors.black,
), ),
errorBuilder: (BuildContext context, error, stackTrace) { // Image.memory(
return SvgPicture.asset( // Utils.getPostBytes(
"assets/images/user.svg", height: 50, width: 50, // getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
); // ),
}, // errorBuilder: (BuildContext context, error, stackTrace) {
width: 50, // return SvgPicture.asset(
height: 50, // "assets/images/user.svg", height: 50, width: 50,
fit: BoxFit.cover, // );
).circle(50).paddingOnly(top: 21), // },
// width: 50,
// height: 50,
// fit: BoxFit.cover,
// ).circle(50).paddingOnly(top: 21),
], ],
), ),
), ),

15
lib/ui/profile/add_update_family_member.dart
Unescape Escape View File

@ -223,8 +223,7 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
isEnable: false, isEnable: false,
onTap: () async { onTap: () async {
DateTime dateValue = await _selectDate(context); DateTime dateValue = await _selectDate(context);
//date = DateFormat('yyyy/MM/dd').format(dateValue); date = (DateFormat('yyyy-MM-dd').format(dateValue));
date = "2022-10-23T09:17:38.653+03:00";
// date = (DateFormat('yyyy-MM-dd').format(dateValue)+"T"+ dateTime.toString() + dateTime1.toString()); // date = (DateFormat('yyyy-MM-dd').format(dateValue)+"T"+ dateTime.toString() + dateTime1.toString());
model!.getContactDetailsList!.sEGMENTVALUEDSP = date; model!.getContactDetailsList!.sEGMENTVALUEDSP = date;
print(dateTime); print(dateTime);
@ -288,9 +287,8 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
isEnable: false, isEnable: false,
onTap: () async { onTap: () async {
DateTime dateValue = await _selectDate(context); DateTime dateValue = await _selectDate(context);
date = "2022-10-23T09:17:38.653+03:00";
// date = (DateFormat('yyyy-MM-dd').format(dateValue) +"T"+ dateTime.toString() + dateTime1.toString()); // date = (DateFormat('yyyy-MM-dd').format(dateValue) +"T"+ dateTime.toString() + dateTime1.toString());
// date = DateFormat('yyyy/MM/dd').format(dateValue); date = (DateFormat('yyyy-MM-dd').format(dateValue));
model!.getContactDetailsList!.sEGMENTVALUEDSP = date; model!.getContactDetailsList!.sEGMENTVALUEDSP = date;
setState(() {}); setState(() {});
}, },
@ -349,9 +347,8 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
isEnable: false, isEnable: false,
onTap: () async { onTap: () async {
DateTime dateValue = await _selectDate(context); DateTime dateValue = await _selectDate(context);
date = "2022-10-23T09:17:38.653+03:00";
// date = (DateFormat('yyyy-MM-dd').format(dateValue)+"T"+ dateTime.toString() + dateTime1.toString()); // date = (DateFormat('yyyy-MM-dd').format(dateValue)+"T"+ dateTime.toString() + dateTime1.toString());
// date = DateFormat('yyyy/MM/dd').format(dateValue); date = (DateFormat('yyyy-MM-dd').format(dateValue));
model!.getContactDetailsList!.sEGMENTVALUEDSP = date; model!.getContactDetailsList!.sEGMENTVALUEDSP = date;
setState(() {}); setState(() {});
}, },
@ -407,7 +404,7 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
numberVal = null; numberVal = null;
} else { } else {
dateVal = null; dateVal = null;
vatcherVal = e!.getContactDetailsList!.sEGMENTVALUEDSP; vatcherVal = e!.getContactDetailsList!.vARCHAR2VALUE;
numberVal = null; numberVal = null;
} }
return ValidateEitTransactionModel(dATEVALUE: dateVal, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: numberVal, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: vatcherVal.toString()).toJson(); return ValidateEitTransactionModel(dATEVALUE: dateVal, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: numberVal, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: vatcherVal.toString()).toJson();
@ -427,7 +424,7 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
} else { } else {
dateVal = null; dateVal = null;
numberVal = null; numberVal = null;
vatcherVal = e!.getContactDetailsList!.sEGMENTVALUEDSP; vatcherVal = e!.getContactDetailsList!.vARCHAR2VALUE;
} }
return ValidateEitTransactionModel(dATEVALUE: dateVal, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: numberVal, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: vatcherVal.toString()).toJson(); return ValidateEitTransactionModel(dATEVALUE: dateVal, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: numberVal, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: vatcherVal.toString()).toJson();
}).toList(); }).toList();
@ -441,7 +438,7 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
if (e!.dATATYPE == 'VARCHAR2') { if (e!.dATATYPE == 'VARCHAR2') {
dateVal = null; dateVal = null;
numberVal = null; numberVal = null;
vatcherVal = e.getContactDetailsList?.sEGMENTVALUEDSP ?? ""; vatcherVal = e.getContactDetailsList?.vARCHAR2VALUE ?? "";
} else if (e.dATATYPE == 'DATE') { } else if (e.dATATYPE == 'DATE') {
dateVal = e.getContactDetailsList!.sEGMENTVALUEDSP.toString(); dateVal = e.getContactDetailsList!.sEGMENTVALUEDSP.toString();
print("dateVal:${dateVal ?? ""}"); print("dateVal:${dateVal ?? ""}");

7
lib/ui/profile/contact_details.dart
Unescape Escape View File

@ -129,7 +129,12 @@ class _ContactDetailsState extends State<ContactDetails> {
separatorBuilder: (cxt, index) => 12.height, separatorBuilder: (cxt, index) => 12.height,
itemCount: getEmployeeAddressList.length), itemCount: getEmployeeAddressList.length),
if (menuEntriesAddress.updateButton == 'Y') if (menuEntriesAddress.updateButton == 'Y')
Positioned( AppState().isArabic(context)? Positioned(
top: 1,
left: 1,
child: const Icon(Icons.edit_location_alt_outlined, size: 20).onPress(addUpdateAddress),
)
:Positioned(
top: 1, top: 1,
right: 1, right: 1,
child: const Icon(Icons.edit_location_alt_outlined, size: 20).onPress(addUpdateAddress), child: const Icon(Icons.edit_location_alt_outlined, size: 20).onPress(addUpdateAddress),

Write Preview
Loading…
Cancel
Save