diff --git a/lib/models/new_models/task_request/task_request_model.dart b/lib/models/new_models/task_request/task_request_model.dart index 3bf67b21..f9950df1 100644 --- a/lib/models/new_models/task_request/task_request_model.dart +++ b/lib/models/new_models/task_request/task_request_model.dart @@ -542,7 +542,7 @@ class TaskJobAssistantEmployees { data['id'] = id ?? 0; data['startDate'] = startDate?.toIso8601String(); data['endDate'] = endDate?.toIso8601String(); - data['workingHours'] = workingHours; + data['totalWorkingHour'] = workingHours; data['comment'] = comment; data['assistantEnginerId'] = user?.userId; return data; diff --git a/lib/modules/cm_module/views/forms/maintenance_request/maintenance_request_main.dart b/lib/modules/cm_module/views/forms/maintenance_request/maintenance_request_main.dart index 4a9ce491..4802f98b 100644 --- a/lib/modules/cm_module/views/forms/maintenance_request/maintenance_request_main.dart +++ b/lib/modules/cm_module/views/forms/maintenance_request/maintenance_request_main.dart @@ -223,6 +223,16 @@ class _MaintenanceRequestFormState extends State with Si Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.repairLocation}"); return false; } + if (model.assistantEmployees != null && model.assistantEmployees!.isNotEmpty) { + if (model.modelAssistantEmployees?.startDate == null) { + Fluttertoast.showToast(msg: "Please Select Assistant Employee Start Time"); + return false; + } + if (model.modelAssistantEmployees?.endDate == null) { + Fluttertoast.showToast(msg: "Please Select Assistant Employee End Time"); + return false; + } + } // else if (model.assignedEmployeeId == null) { // Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.assignedEmployee}"); // return false; diff --git a/lib/modules/tm_module/tasks_wo/task_request_detail_view.dart b/lib/modules/tm_module/tasks_wo/task_request_detail_view.dart index fe96070f..a23c866a 100644 --- a/lib/modules/tm_module/tasks_wo/task_request_detail_view.dart +++ b/lib/modules/tm_module/tasks_wo/task_request_detail_view.dart @@ -121,7 +121,7 @@ class _TaskRequestDetailsViewState extends State { ], ), ], - if (taskProvider.taskRequestModel!.taskJobContactPersons!.isNotEmpty) contactInfoCard(context, taskProvider.taskRequestModel), + // if (taskProvider.taskRequestModel!.taskJobContactPersons!.isNotEmpty) contactInfoCard(context, taskProvider.taskRequestModel), if (taskProvider.taskRequestModel?.callComment != null) ...[ const Divider().defaultStyle(context), Text(