ATOMS-881 fixed

design_3.0_demo_module
WaseemAbbasi22 10 months ago
parent facbb9002d
commit f780049e87

@ -107,7 +107,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
), ),
'${context.translation.taskType}: ${taskModel?.taskType?.typeName ?? "-"}'.bodyText(context), '${context.translation.taskType}: ${taskModel?.taskType?.typeName ?? "-"}'.bodyText(context),
'${context.translation.taskNo}: ${taskModel?.taskJobNo ?? "-"}'.bodyText(context), '${context.translation.taskNo}: ${taskModel?.taskJobNo ?? "-"}'.bodyText(context),
if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[ if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[
recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!), recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!),
Column( Column(
@ -132,6 +132,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
FilesList(images: taskProvider.taskRequestModel!.taskJobAttachments!.map((toElement) => URLs.getFileUrl(toElement.name ?? '') ?? '').toList()), FilesList(images: taskProvider.taskRequestModel!.taskJobAttachments!.map((toElement) => URLs.getFileUrl(toElement.name ?? '') ?? '').toList()),
], ],
buildTechnicalComments(taskModel: taskModel),
], ],
).toShadowContainer(context).paddingAll(16), ).toShadowContainer(context).paddingAll(16),
).expanded, ).expanded,
@ -155,7 +156,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
Text( Text(
"Site Details".addTranslation, "Site Details".addTranslation,
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
@ -171,6 +172,25 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
); );
} }
Widget buildTechnicalComments({TaskData? taskModel}) {
String previousComments = taskModel?.taskJobActivityEngineerTimers?.map((e) => e.comment?.trim()).where((comment) => comment != null && comment.isNotEmpty).join('\n') ?? '';
if (previousComments.isNotEmpty) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Divider().defaultStyle(context),
Text(
"Technical Comments".addTranslation,
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
previousComments.bodyText2(context).custom(color: AppColor.neutral50),
8.height,
],
);
}
return const SizedBox();
}
Widget linkWithLocationWidget({required TaskData taskModel}) { Widget linkWithLocationWidget({required TaskData taskModel}) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -52,6 +52,7 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
List<File> _files = []; List<File> _files = [];
bool installationType = true; bool installationType = true;
String comments = '';
@override @override
void initState() { void initState() {
@ -84,10 +85,12 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<TaskRequestProvider>(builder: (context, taskProvider, child) { return Consumer<TaskRequestProvider>(builder: (context, taskProvider, child) {
return Scaffold( return Scaffold(
appBar: DefaultAppBar(title: context.translation.taskRequest, appBar: DefaultAppBar(
title: context.translation.taskRequest,
onWillPopScope: () { onWillPopScope: () {
_updateTask(context: context, status: 0); _updateTask(context: context, status: 0);
},), },
),
key: _scaffoldKey, key: _scaffoldKey,
body: taskProvider.isLoading body: taskProvider.isLoading
? const ALoading() ? const ALoading()
@ -124,7 +127,8 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
showShadow: false, showShadow: false,
alignLabelWithHint: true, alignLabelWithHint: true,
onChange: (value) { onChange: (value) {
taskProvider.taskRequestModel?.taskTimerModel?.comments = value; comments = value;
setState(() {});
}, },
onSaved: (value) {}, onSaved: (value) {},
), ),
@ -179,7 +183,6 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
TaskRequestProvider taskRequestProvider = Provider.of<TaskRequestProvider>(context, listen: false); TaskRequestProvider taskRequestProvider = Provider.of<TaskRequestProvider>(context, listen: false);
TaskData? taskModel = taskRequestProvider.taskRequestModel; TaskData? taskModel = taskRequestProvider.taskRequestModel;
taskModel?.statusValue = status; taskModel?.statusValue = status;
if (validate(model: taskModel)) { if (validate(model: taskModel)) {
showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
List<TaskJobAttachment> attachement = []; List<TaskJobAttachment> attachement = [];
@ -191,16 +194,17 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
int durationInSecond = timer.endAt!.difference(timer.startAt!).inSeconds; int durationInSecond = timer.endAt!.difference(timer.startAt!).inSeconds;
taskModel.taskJobActivityEngineerTimers?.add( taskModel.taskJobActivityEngineerTimers?.add(
TaskJobActivityEngineerTimer( TaskJobActivityEngineerTimer(
id: 0, id: 0,
startDate: timer.startAt!.toIso8601String(), startDate: timer.startAt!.toIso8601String(),
// Handle potential null // Handle potential null
endDate: timer.endAt?.toIso8601String(), endDate: timer.endAt?.toIso8601String(),
// Handle potential null // Handle potential null
totalWorkingHour: ((durationInSecond) / 60 / 60), totalWorkingHour: ((durationInSecond) / 60 / 60),
comment: timer.comments, // comment: timer.comments,
), comment: timer.comments ?? comments),
); );
}); });
await taskRequestProvider.updateTaskByEngineer().whenComplete(() async { await taskRequestProvider.updateTaskByEngineer().whenComplete(() async {
if (taskRequestProvider.stateCode == 200) { if (taskRequestProvider.stateCode == 200) {
if (status == 1) { if (status == 1) {

Loading…
Cancel
Save