From d5b1512eb4369644d984b876a26b9af97d009453 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 27 Jul 2022 11:51:31 +0300 Subject: [PATCH] improvements --- lib/api/login_api_client.dart | 3 +- .../dynamic_screens/dynamic_input_screen.dart | 87 ++++++++----------- 2 files changed, 38 insertions(+), 52 deletions(-) diff --git a/lib/api/login_api_client.dart b/lib/api/login_api_client.dart index 8016ab9..cd6a948 100644 --- a/lib/api/login_api_client.dart +++ b/lib/api/login_api_client.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:mohem_flutter_app/api/api_client.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/classes/consts.dart'; import 'package:mohem_flutter_app/models/basic_member_information_model.dart'; @@ -8,8 +9,6 @@ import 'package:mohem_flutter_app/models/generic_response_model.dart'; import 'package:mohem_flutter_app/models/get_mobile_login_info_list_model.dart'; import 'package:mohem_flutter_app/models/member_login_list_model.dart'; -import 'package:mohem_flutter_app/api/api_client.dart'; - class LoginApiClient { static final LoginApiClient _instance = LoginApiClient._internal(); diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart index 371b522..890d429 100644 --- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart +++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart @@ -183,11 +183,6 @@ class _DynamicInputScreenState extends State { List> getDefaultValuesIonicLogic(GetEITDFFStructureList structureElement) { // try { // Utils.showLoading(context); - - print("structureElementVS:${structureElement.pARENTSEGMENTSVSSplitedVS?.length}"); - print("structureElementDS:${structureElement.pARENTSEGMENTSDVSplited?.length}"); - print("vALIDATIONTYPE:${structureElement.vALIDATIONTYPE}"); - List parentValue = structureElement.pARENTSEGMENTSVSSplitedVS ?? []; List parentsList = structureElement.pARENTSEGMENTSDVSplited ?? []; @@ -212,9 +207,8 @@ class _DynamicInputScreenState extends State { } if (parentValue.isNotEmpty && (structureElement.vALIDATIONTYPE == "D" || structureElement.vALIDATIONTYPE == "Y")) { - print("entringfirst check"); List parValue = getDependenciesParams(parentValue); - print("parValue:$parValue"); + if (parValue.isNotEmpty) { parentVal = parValue.first.ID_COLUMN_NAME; } @@ -224,15 +218,12 @@ class _DynamicInputScreenState extends State { } } if (parentsList.isNotEmpty) { - print("entring2nd check"); - print("parentValue:$parentValue"); if (parentValue.isNotEmpty) { parentsList = parentsList + parentValue.map((e) => PARENTSEGMENTSDVSplited.fromJson(e.toJson())).toList(); // parentsList.addAll(parentValue.map((e) => PARENTSEGMENTSDVSplited.fromJson(e.toJson()))); // parentsList.concat(parentValue); } dependenciesList = getDependenciesParams(parentsList); - print("dependenciesList:${dependenciesList.length}"); } return dependenciesList; // for (int i = 0; i < (structureList.cHILDSEGMENTSDVSplited?.length ?? 0); i++) { @@ -266,18 +257,12 @@ class _DynamicInputScreenState extends State { } List> getDependenciesParams(parentsList) { - print("getDependenciesParams:${parentsList.length}"); List> parentArr = []; for (int i = 0; i < parentsList.length; i++) { for (int j = 0; j < (getEitDffStructureList?.length ?? 0); j++) { if (getEitDffStructureList![j].sEGMENTNAME == parentsList[i].name) { - // print("getEitDffStructureList![j].sEGMENTNAME:${getEitDffStructureList![j].sEGMENTNAME}"); - // print("getEitDffStructureList![j].fORMATTYPE:${getEitDffStructureList![j].fORMATTYPE}"); - // print("getEitDffStructureList![j].eSERVICESDV:${getEitDffStructureList![j].eSERVICESDV?.toJson()}"); if (getEitDffStructureList![j].dISPLAYFLAG != "N") { - print("getEitDffStructureList![$j].vALIDATIONTYPE:${getEitDffStructureList![j].vALIDATIONTYPE}"); - print("getEitDffStructureList![$j].fORMATTYPE:${getEitDffStructureList![j].fORMATTYPE}"); if (getEitDffStructureList![j].vALIDATIONTYPE == "N") { String? idColName; String? val; @@ -294,15 +279,15 @@ class _DynamicInputScreenState extends State { } idColName = val; if (getEitDffStructureList![j].fORMATTYPE == "Y") { - if (idColName!.contains("/")) { - DateTime date = DateFormat('yyyy/MM/dd').parse(idColName); - idColName = DateFormat('yyyy/MM/dd HH:mm:ss').format(DateTime(date.year, date.month, date.day)); - } else { - DateTime date = DateFormat('yyyy-MM-dd').parse(idColName); - idColName = DateFormat('yyyy/MM/dd HH:mm:ss').format(DateTime(date.year, date.month, date.day)); - } - - // idColName = this.cs.formatStandardDate(val); + // if (idColName!.contains("/")) { + // DateTime date = DateFormat('yyyy/MM/dd').parse(idColName); + // idColName = DateFormat('yyyy/MM/dd HH:mm:ss').format(DateTime(date.year, date.month, date.day)); + // } else { + // DateTime date = DateFormat('yyyy-MM-dd').parse(idColName); + // idColName = DateFormat('yyyy/MM/dd HH:mm:ss').format(DateTime(date.year, date.month, date.day)); + // } + + idColName = formatStandardDate(idColName!); } } else { val = getEitDffStructureList![j].eSERVICESDV?.pVALUECOLUMNNAME; @@ -314,12 +299,11 @@ class _DynamicInputScreenState extends State { idColName = val; if (getEitDffStructureList![j].fORMATTYPE == "X") { - // idColName = formatDateNew(date) - - DateTime date = DateFormat('yyyy-MM-dd').parse(idColName!); - idColName = DateFormat('yyyy-MM-dd HH:mm:ss').format(date); + idColName = formatDateNew(idColName!); + // commenting to test + // DateTime date = DateFormat('yyyy-MM-dd').parse(idColName!); + // idColName = DateFormat('yyyy-MM-dd HH:mm:ss').format(date); } - print("idColName:$idColName"); } parentArr.add(GetSetValuesRequestModel( @@ -497,21 +481,22 @@ class _DynamicInputScreenState extends State { } } DateTime date = await _selectDate(context); - DateTime date1 = DateTime(date.year, date.month, date.day); + String dateString = date.toString().split(' ').first; + // DateTime date1 = DateTime(date.year, date.month, date.day); // getEitDffStructureList![index].fieldAnswer = date.toString(); ESERVICESDV eservicesdv; if (getEitDffStructureList![index].isDefaultTypeIsCDPS) { eservicesdv = ESERVICESDV( - pIDCOLUMNNAME: DateFormat('yyyy/MM/dd HH:MM:SS').format(date1), + pIDCOLUMNNAME: formatDate(dateString), pRETURNMSG: "null", pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE, - pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy/MM/dd HH:MM:SS').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); + pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? reverseFormatStandardDate(formatDate(dateString)) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); } else { eservicesdv = ESERVICESDV( - pIDCOLUMNNAME: DateFormat('yyyy-MM-dd').format(date1), + pIDCOLUMNNAME: dateString, pRETURNMSG: "null", pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE, - pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy-MM-dd hh:mm:ss').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); + pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? reverseFormatStandardDate(formatDate(dateString)) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); } getEitDffStructureList![index].eSERVICESDV = eservicesdv; setState(() {}); @@ -526,12 +511,13 @@ class _DynamicInputScreenState extends State { } else if (model.fORMATTYPE == "Y") { String displayText = model.eSERVICESDV?.pIDCOLUMNNAME ?? (getEitDffStructureList![index].fieldAnswer ?? ""); if (getEitDffStructureList![index].isDefaultTypeIsCDPS) { - if (displayText.contains(" 00:00:00")) { - displayText = displayText.replaceAll(" 00:00:00", ""); - } - if (!displayText.contains("-")) { - displayText = DateFormat('yyyy-MM-dd').format(DateFormat("yyyy/MM/dd").parse(displayText)); - } + displayText = reverseFormatDate(displayText); + // if (displayText.contains(" 00:00:00")) { + // displayText = displayText.replaceAll(" 00:00:00", ""); + // } + // if (!displayText.contains("-")) { + // displayText = DateFormat('yyyy-MM-dd').format(DateFormat("yyyy/MM/dd").parse(displayText)); + // } } return DynamicTextFieldWidget( (model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""), @@ -555,21 +541,21 @@ class _DynamicInputScreenState extends State { } } DateTime date = await _selectDate(context); - DateTime date1 = DateTime(date.year, date.month, date.day); + String dateString = date.toString().split(' ').first; // getEitDffStructureList![index].fieldAnswer = date.toString(); ESERVICESDV eservicesdv; if (getEitDffStructureList![index].isDefaultTypeIsCDPS) { eservicesdv = ESERVICESDV( - pIDCOLUMNNAME: DateFormat('yyyy/MM/dd HH:MM:SS').format(date1), + pIDCOLUMNNAME: formatDate(dateString), pRETURNMSG: "null", pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE, - pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy-MM-dd HH:MM:SS').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); + pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? reverseFormatStandardDate(formatDate(dateString)) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); } else { eservicesdv = ESERVICESDV( - pIDCOLUMNNAME: DateFormat('yyyy-MM-dd').format(date1), + pIDCOLUMNNAME: dateString, pRETURNMSG: "null", pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE, - pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy-MM-dd hh:mm:ss').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); + pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? reverseFormatStandardDate(formatDate(dateString)) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); } getEitDffStructureList![index].eSERVICESDV = eservicesdv; @@ -678,13 +664,13 @@ class _DynamicInputScreenState extends State { } } DateTime date = await _selectDate(context); - DateTime date1 = DateTime(date.year, date.month, date.day); + String dateString = date.toString().split(' ').first; getEitDffStructureList![index].fieldAnswer = date.toString(); ESERVICESDV eservicesdv = ESERVICESDV( - pIDCOLUMNNAME: DateFormat('yyyy-MM-dd').format(date1), + pIDCOLUMNNAME: dateString, pRETURNMSG: "null", pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE, - pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy-MM-dd hh:mm:ss').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); + pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? reverseFormatStandardDate(formatDate(dateString)) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date)); getEitDffStructureList![index].eSERVICESDV = eservicesdv; setState(() {}); if (model.cHILDSEGMENTSVSSplited?.isNotEmpty ?? false) { @@ -734,7 +720,7 @@ class _DynamicInputScreenState extends State { ).objectContainerView(); } - DateTime selectedDate = DateTime.now(); + DateTime selectedDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day); Future _selectDate(BuildContext context) async { DateTime time = selectedDate; @@ -763,6 +749,7 @@ class _DynamicInputScreenState extends State { time = picked; } } + time = DateTime(time.year, time.month, time.day); return time; }