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 d28cbc13..3dc5e315 100644 --- a/lib/models/new_models/task_request/task_request_model.dart +++ b/lib/models/new_models/task_request/task_request_model.dart @@ -473,7 +473,7 @@ class TaskJobActivityEngineerTimer { id: json['id'] as int?, startDate: json['startDate'], endDate: json['endDate'], - totalWorkingHour: (json['totalWorkingHour'] as num?)?.toDouble(), + totalWorkingHour: (json['totalWorkingHours'] as num?)?.toDouble(), comment: json['comment'] as String?, ); } @@ -483,7 +483,7 @@ class TaskJobActivityEngineerTimer { 'id': id, 'startDate': startDate, 'endDate': endDate, - 'totalWorkingHour': totalWorkingHour, + 'totalWorkingHours': totalWorkingHour, 'comment': comment, }; } @@ -692,7 +692,7 @@ class TaskJobAssistantEmployees { data['id'] = id ?? 0; data['startDate'] = startDate?.toIso8601String(); data['endDate'] = endDate?.toIso8601String(); - data['totalWorkingHour'] = workingHours; + data['totalWorkingHours'] = workingHours; data['comment'] = comment; data['assistantEnginerId'] = user?.userId; return data; diff --git a/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart b/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart index 1871dc61..8dd78032 100644 --- a/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart +++ b/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart @@ -119,8 +119,8 @@ class RecurrentTaskInfoWidget extends StatelessWidget { labelText: context.translation.comment, backgroundColor: AppColor.fieldBgColor(context), showShadow: false, - hintStyle: TextStyle(color: context.isDark?AppColor.white10:AppColor.black10), - labelStyle: TextStyle(color: context.isDark?AppColor.white10:AppColor.black10), + hintStyle: TextStyle(color: context.isDark ? AppColor.white10 : AppColor.black10), + labelStyle: TextStyle(color: context.isDark ? AppColor.white10 : AppColor.black10), alignLabelWithHint: true, textInputType: TextInputType.multiline, onChange: (value) { @@ -149,5 +149,5 @@ Widget buildingInfoWidget({required String label, required String? value, requir style: AppTextStyles.bodyText2.copyWith(color: AppColor.textColor(context)), ) ], - ).toShadowContainer(context, backgroundColor: AppColor.background(context), borderRadius: 10, paddingObject: EdgeInsets.all(12.toScreenHeight), showShadow: false); + ).toShadowContainer(context, backgroundColor: context.isDark ? AppColor.neutral60 : AppColor.neutral100, borderRadius: 10, paddingObject: EdgeInsets.all(12.toScreenHeight), showShadow: false); }