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

Merge branch 'master' into 'sultan-dev'

Browse Source 
# Conflicts:
#   lib/ui/profile/add_update_family_member.dart
merge-requests/48/head^2
Sultan khan 3 years ago
parent e9edc80eae 0bd94fb6e0
commit 1f09d49aac
8 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
lib/api/profile_api_client.dart
Unescape Escape View File

@ -293,7 +293,7 @@ class ProfileApiClient {
"P_COUNTRY_CODE": countryCode, //"SA", "P_COUNTRY_CODE": countryCode, //"SA",
"P_DESC_FLEX_CONTEXT_CODE": "SA", "P_DESC_FLEX_CONTEXT_CODE": "SA",
"P_FUNCTION_NAME": pFunctionName, "P_FUNCTION_NAME": pFunctionName,
"P_ACTION": correctOrNew == 1 ? 'CORRECT' : 'NEW', "P_ACTION": correctOrNew == 1 ? 'CORRECT' : 'CHANGE',
"P_EFFECTIVE_DATE": effectiveDate, "P_EFFECTIVE_DATE": effectiveDate,
//"EITTransactionTBL": list, //"EITTransactionTBL": list,

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;

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

@ -5,7 +5,7 @@
String? dATATYPE; String? dATATYPE;
String? dATEVALUE; String? dATEVALUE;
String? dISPLAYFLAG; String? dISPLAYFLAG;
Null? nUMBERVALUE; dynamic? nUMBERVALUE;
String? sEGMENTPROMPT; String? sEGMENTPROMPT;
int? sEGMENTSEQNUM; int? sEGMENTSEQNUM;
String? sEGMENTVALUEDSP; String? sEGMENTVALUEDSP;

6
lib/models/profile/get_address_dff_structure_list.dart
Unescape Escape View File

@ -5,7 +5,7 @@ class GetAddressDffStructureList {
String? aLPHANUMERICALLOWEDFLAG; String? aLPHANUMERICALLOWEDFLAG;
String? aPPLICATIONCOLUMNNAME; String? aPPLICATIONCOLUMNNAME;
String? cHILDSEGMENTSVS; String? cHILDSEGMENTSVS;
Null? cHILDSEGMENTSVSSplited; dynamic? cHILDSEGMENTSVSSplited;
String? dEFAULTTYPE; String? dEFAULTTYPE;
String? dEFAULTVALUE; String? dEFAULTVALUE;
String? dESCFLEXCONTEXTCODE; String? dESCFLEXCONTEXTCODE;
@ -27,9 +27,9 @@ class GetAddressDffStructureList {
String? nUMBERPRECISION; String? nUMBERPRECISION;
String? nUMERICMODEENABLEDFLAG; String? nUMERICMODEENABLEDFLAG;
String? pARENTSEGMENTSDV; String? pARENTSEGMENTSDV;
List<Null>? pARENTSEGMENTSDVSplited; List<dynamic>? pARENTSEGMENTSDVSplited;
String? pARENTSEGMENTSVS; String? pARENTSEGMENTSVS;
List<Null>? pARENTSEGMENTSVSSplitedVS; List<dynamic>? pARENTSEGMENTSVSSplitedVS;
String? rEADONLY; String? rEADONLY;
String? rEQUIREDFLAG; String? rEQUIREDFLAG;
String? sEGMENTNAME; String? sEGMENTNAME;

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

36
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,
errorBuilder: (BuildContext context, error, stackTrace) { width: 68,)
return SvgPicture.asset( : CircleAvatar(
"assets/images/user.svg", height: 50, width: 50, radius: 68,
); backgroundImage: MemoryImage(Utils.dataFromBase64String(getEmployeeSubordinates!.eMPLOYEEIMAGE!)),
}, backgroundColor: Colors.black,
width: 50, ),
height: 50, // Image.memory(
fit: BoxFit.cover, // Utils.getPostBytes(
).circle(50).paddingOnly(top: 21), // getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
// ),
// errorBuilder: (BuildContext context, error, stackTrace) {
// return SvgPicture.asset(
// "assets/images/user.svg", height: 50, width: 50,
// );
// },
// width: 50,
// height: 50,
// fit: BoxFit.cover,
// ).circle(50).paddingOnly(top: 21),
], ],
), ),
), ),

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),

3
lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
Unescape Escape View File

@ -266,7 +266,6 @@ class _DynamicInputScreenState extends State<DynamicInputScreenAddress> {
if (e.fORMATTYPE == "X") { if (e.fORMATTYPE == "X") {
// for date format type, date format is changed // for date format type, date format is changed
tempVar = e.eSERVICESDV?.pVALUECOLUMNNAME ?? ""; tempVar = e.eSERVICESDV?.pVALUECOLUMNNAME ?? "";
if (tempVar.isNotEmpty) { if (tempVar.isNotEmpty) {
DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar); DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
tempVar = DateFormat('dd-MMM-yyy').format(date); tempVar = DateFormat('dd-MMM-yyy').format(date);
@ -275,7 +274,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenAddress> {
} }
} }
} else if (e.eSERVICESVS?.isNotEmpty ?? false) { } else if (e.eSERVICESVS?.isNotEmpty ?? false) {
e.getEmployeeAddressList!.vARCHAR2VALUE != null ? tempVar = e.getEmployeeAddressList!.vARCHAR2VALUE! : tempVar = ""; tempVar = e.getEmployeeAddressList!.vARCHAR2VALUE ?? "";
if (e.aPPLICATIONCOLUMNNAME == null) { if (e.aPPLICATIONCOLUMNNAME == null) {
countryCode = tempVar; countryCode = tempVar;
} }

Write Preview
Loading…
Cancel
Save