diff --git a/lib/views/pages/user/tasks_request/task_request_detail_view.dart b/lib/views/pages/user/tasks_request/task_request_detail_view.dart
index 10f121a1..88606286 100644
--- a/lib/views/pages/user/tasks_request/task_request_detail_view.dart
+++ b/lib/views/pages/user/tasks_request/task_request_detail_view.dart
@@ -113,10 +113,10 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
                           Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              'Type of alert: ${taskProvider.taskRequestModel?.typeOfAlert?.name}'.bodyText(context),
-                              'Risk Level: ${taskProvider.taskRequestModel?.riskLevel?.name}'.bodyText(context),
-                              'Resource: ${taskProvider.taskRequestModel?.resource?.name}'.bodyText(context),
-                              'Evaluator User: ${taskProvider.taskRequestModel?.evaluatorUser?.userName}'.bodyText(context)
+                              'Type of alert: ${taskProvider.taskRequestModel?.typeOfAlert?.name ?? '-'}'.bodyText(context),
+                              'Risk Level: ${taskProvider.taskRequestModel?.riskLevel?.name ?? '-'}'.bodyText(context),
+                              'Resource: ${taskProvider.taskRequestModel?.resource?.name ?? '-'}'.bodyText(context),
+                              'Evaluator User: ${taskProvider.taskRequestModel?.evaluatorUser?.userName ?? '-'}'.bodyText(context)
                             ],
                           ),
                         ],
diff --git a/lib/views/pages/user/tasks_request/update_task_request_view.dart b/lib/views/pages/user/tasks_request/update_task_request_view.dart
index f479ce75..58d4a395 100644
--- a/lib/views/pages/user/tasks_request/update_task_request_view.dart
+++ b/lib/views/pages/user/tasks_request/update_task_request_view.dart
@@ -543,6 +543,17 @@ bool validate({TaskData? model}) {
     Fluttertoast.showToast(msg: "Please Stop The Timer");
     return false;
   }
+  if (model?.assistantEmployees != null) {
+    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;
+    }
+  }
+
   return true;
 }
 
@@ -695,7 +706,7 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
                       backgroundColor: AppColor.neutral80,
                       controller: _workingHoursController,
                       suffixIcon: "clock".toSvgAsset(width: 20, color: context.isDark ? AppColor.neutral10 : null).paddingOnly(end: 16),
-                      initialValue: taskModel?.modelAssistantEmployees?.workingHours != null ? taskModel!.modelAssistantEmployees!.workingHours.toString() : '',
+                      initialValue: taskModel?.modelAssistantEmployees?.workingHours != null ? taskModel!.modelAssistantEmployees!.workingHours?.toStringAsFixed(2) : '',
                       textAlign: TextAlign.center,
                       labelStyle: AppTextStyles.textFieldLabelStyle,
                       enable: false,