Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Task Request Design complete

Browse Source
design_3.0_task_module_new
WaseemAbbasi22 8 months ago
parent eb978af46f
commit 15e62bb004
3 changed files with 271 additions and 187 deletions
Show Stats Download Patch File Download Diff File

4
lib/l10n/app_ar.arb
Unescape Escape View File

@ -553,6 +553,8 @@
"task": "مهمة", "task": "مهمة",
"taskType": "نوع المهمة", "taskType": "نوع المهمة",
"createTaskRequest": "إنشاء طلب مهمة", "createTaskRequest": "إنشاء طلب مهمة",
"taskRequest": "طلب مهمة" "taskRequest": "طلب مهمة",
"completedActions": "الإجراءات المكتملة",
"impactStatus": "حالة التأثير"
} }

4
lib/l10n/app_en.arb
Unescape Escape View File

@ -556,5 +556,7 @@
"task": "Task", "task": "Task",
"taskType": "Task Type", "taskType": "Task Type",
"createTaskRequest": "Create Task Request", "createTaskRequest": "Create Task Request",
"taskRequest": "Task Request" "taskRequest": "Task Request",
"completedActions": "Completed Actions",
"impactStatus": "Impact Status"
} }

450
lib/views/pages/user/tasks_request/task_request_view.dart
Unescape Escape View File

@ -1,4 +1,3 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -45,10 +44,23 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
List<File> _files = []; List<File> _files = [];
bool installationTye = false;
List<Lookup> completedActions = [
Lookup(value: 0, name: 'Physical Check'),
Lookup(value: 1, name: 'Software Update'),
Lookup(value: 0, name: 'Hardware Update'),
];
List<Lookup> impactStatus = [
Lookup(value: 0, name: 'Impacted'),
Lookup(value: 1, name: 'Not Impacted'),
];
Lookup selectedValue = Lookup(value: 0, name: 'Impacted');
@override @override
void initState() { void initState() {
_formModel.fromDetails(widget.model); _formModel.fromDetails(widget.model);
_files = widget.model.receiverAttachments?.map((e) => File(e.attachmentName!)).toList() ?? []; _files = widget.model.receiverAttachments?.map((e) => File(e.attachmentName!)).toList() ?? [];
super.initState(); super.initState();
} }
@ -57,6 +69,7 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
_requestedQuantityController.dispose(); _requestedQuantityController.dispose();
super.dispose(); super.dispose();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -81,64 +94,73 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
children: [ children: [
_timerWidget(context, 0, true), _timerWidget(context, 0, true),
12.height, 12.height,
ADatePicker( installationTye
label: context.translation.installationDate, ? Column(
hideShadow: true, crossAxisAlignment: CrossAxisAlignment.start,
backgroundColor: AppColor.neutral90, children: [
date: DateTime.now(), ADatePicker(
formatDateWithTime: false, label: context.translation.installationDate,
onDatePicker: (selectedDate) { hideShadow: true,
backgroundColor: AppColor.neutral90,
// Handle the selected date and time here. date: DateTime.now(),
DateTime selectedDateTime = DateTime( formatDateWithTime: false,
selectedDate.year, onDatePicker: (selectedDate) {
selectedDate.month, // Handle the selected date and time here.
selectedDate.day, DateTime selectedDateTime = DateTime(
); selectedDate.year,
selectedDate.month,
}, selectedDate.day,
), );
12.height, },
//TODO replace with provided lookup.. ),
SingleItemDropDownMenu<Lookup, LastSituationProvider>( 12.height,
context: context, //TODO replace with provided lookup..
height: 56.toScreenHeight, SingleItemDropDownMenu<Lookup, LastSituationProvider>(
title: context.translation.serialNo, context: context,
showShadow: false, height: 56.toScreenHeight,
backgroundColor: AppColor.neutral90, title: context.translation.serialNo,
showAsBottomSheet: true, showShadow: false,
initialValue: null, backgroundColor: AppColor.neutral90,
onSelect: (status) { showAsBottomSheet: true,
if (status != null) { initialValue: null,
setState(() {}); onSelect: (status) {
} if (status != null) {
}, setState(() {});
), }
12.height, },
//TODO replace with provided lookup.. ),
SingleItemDropDownMenu<Department, NullableLoadingProvider>( 12.height,
context: context, //TODO replace with provided lookup..
title: context.translation.department, SingleItemDropDownMenu<Department, NullableLoadingProvider>(
initialValue: Department(), context: context,
enabled: true, title: context.translation.department,
backgroundColor: AppColor.neutral90, initialValue: Department(),
showShadow: false, enabled: true,
staticData: [], backgroundColor: AppColor.neutral90,
showAsBottomSheet: true, showShadow: false,
onSelect: (value) { staticData: [],
showAsBottomSheet: true,
}, onSelect: (value) {},
), ),
],
)
: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
context.translation.completedActions.bodyText(context).custom(color: AppColor.white936),
completedActionWidget(),
16.height,
context.translation.impactStatus.bodyText(context).custom(color: AppColor.white936),
impactStatusWidget(),
]),
12.height, 12.height,
AppTextFormField( AppTextFormField(
initialValue: _formModel.receiverComment ?? "", initialValue: _formModel.receiverComment ?? "",
labelText: context.translation.technicalComment, labelText: context.translation.technicalComment,
textInputType: TextInputType.multiline, textInputType: TextInputType.multiline,
backgroundColor: AppColor.neutral90, backgroundColor: AppColor.neutral90,
showShadow: false, showShadow: false,
alignLabelWithHint: true, alignLabelWithHint: true,
onSaved: (value) { onSaved: (value) {
_formModel.receiverComment = value; _formModel.receiverComment = value;
}, },
), ),
20.height, 20.height,
@ -160,7 +182,7 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
child: AppFilledButton( child: AppFilledButton(
buttonColor: AppColor.green70, buttonColor: AppColor.green70,
label: context.translation.markAsCompleted, label: context.translation.markAsCompleted,
onPressed: (){}, onPressed: () {},
// buttonColor: AppColor.primary10, // buttonColor: AppColor.primary10,
), ),
), ),
@ -181,6 +203,66 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
// notifyListeners(); // notifyListeners();
} }
Widget completedActionWidget() {
return Column(
children: completedActions.asMap().entries.map((entry) {
int index = entry.key;
Lookup action = entry.value;
return Row(
children: [
Checkbox(
value: action.value == 1,
activeColor: AppColor.blueStatus(context),
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (value) {
setState(() {
completedActions[index] = Lookup(value: value! ? 1 : 0, name: action.name);
});
},
),
action.name!
.bodyText(context)
.custom(
color: context.isDark ? AppColor.primary50 : AppColor.neutral50,
)
.expanded,
],
);
}).toList(),
);
}
Widget impactStatusWidget() {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // Aligns to the start
children: impactStatus.map((item) {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Radio<Lookup>(
value: item,
groupValue: selectedValue,
activeColor: AppColor.blueStatus(context),
visualDensity: VisualDensity.compact,
// Removes extra spacing
onChanged: (value) {
selectedValue = value!;
setState(() {});
},
),
Text(
item.name!,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: context.isDark ? AppColor.primary50 : AppColor.neutral50,
),
),
16.width, // Adds spacing between items
],
);
}).toList(),
);
}
Widget _timerWidget(BuildContext context, double totalWorkingHours, bool isTimerEnable) { Widget _timerWidget(BuildContext context, double totalWorkingHours, bool isTimerEnable) {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -218,7 +300,6 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
], ],
); );
} }
} }
class AssistantEmployeeCard extends StatefulWidget { class AssistantEmployeeCard extends StatefulWidget {
@ -281,142 +362,141 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
}), }),
isExpanded isExpanded
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
ServiceReportAssistantEmployeeMenu( ServiceReportAssistantEmployeeMenu(
title: context.translation.select, title: context.translation.select,
backgroundColor: AppColor.neutral100, backgroundColor: AppColor.neutral100,
initialValue: null, initialValue: null,
assetId: 23, assetId: 23,
//TODO add check... //TODO add check...
// enable: !isCurrentUserIsAssistantEmp, // enable: !isCurrentUserIsAssistantEmp,
onSelect: (employee) { onSelect: (employee) {
if (employee == null) { if (employee == null) {
requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = []; requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [];
} else { } else {
requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [employee.copyWith(id: 0)]; requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [employee.copyWith(id: 0)];
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.user = AssignedEmployee(userId: employee.user?.id, userName: employee.user?.name); requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.user = AssignedEmployee(userId: employee.user?.id, userName: employee.user?.name);
}
},
),
12.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [
ADatePicker(
label: context.translation.startTime,
hideShadow: true,
backgroundColor: AppColor.neutral100,
date: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
formatDateWithTime: true,
onDatePicker: (selectedDate) {
showTimePicker(
context: context,
initialTime: TimeOfDay.now(),
).then((selectedTime) {
// Handle the selected date and time here.
if (selectedTime != null) {
DateTime selectedDateTime = DateTime(
selectedDate.year,
selectedDate.month,
selectedDate.day,
selectedTime.hour,
selectedTime.minute,
);
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate = selectedDateTime;
requestDetailProvider.updateActivityMaintenanceHelperModel(requestDetailProvider.activityMaintenanceHelperModel);
ServiceRequestUtils.calculateAndAssignWorkingHours(
startTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
endTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
workingHoursController: _workingHoursController,
updateModel: (hours) {
requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.workingHours = hours;
});
}
});
},
).expanded,
8.width,
ADatePicker(
label: context.translation.endTime,
hideShadow: true,
backgroundColor: AppColor.neutral100,
date: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.endDate,
formatDateWithTime: true,
onDatePicker: (selectedDate) {
showTimePicker(
context: context,
initialTime: TimeOfDay.now(),
).then((selectedTime) {
// Handle the selected date and time here.
if (selectedTime != null) {
DateTime selectedDateTime = DateTime(
selectedDate.year,
selectedDate.month,
selectedDate.day,
selectedTime.hour,
selectedTime.minute,
);
//TODO need to replace with model attributes..
// if (requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate != null &&
// selectedDateTime.isBefore(requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.startDate!)) {
// "End Date time must be greater then start date".showToast;
// return;
// }
// requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.endDate = selectedDateTime;
// requestDetailProvider.updateActivityMaintenanceHelperModel(requestDetailProvider.activityMaintenanceHelperModel);
// ServiceRequestUtils.calculateAndAssignWorkingHours(
// startTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
// endTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.endDate,
// workingHoursController: _workingHoursController,
// updateModel: (hours) {
// requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.workingHours = hours;
// });
} }
}); },
}, ),
).expanded, 12.height,
], Row(
), mainAxisSize: MainAxisSize.min,
12.height, children: [
AppTextFormField( ADatePicker(
labelText: context.translation.workingHours, label: context.translation.startTime,
backgroundColor: AppColor.neutral80, hideShadow: true,
controller: _workingHoursController, backgroundColor: AppColor.neutral100,
suffixIcon: "clock".toSvgAsset(width: 20, color: context.isDark ? AppColor.neutral10 : null).paddingOnly(end: 16), date: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
initialValue: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.workingHours != null formatDateWithTime: true,
? requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.workingHours.toString() onDatePicker: (selectedDate) {
: '', showTimePicker(
textAlign: TextAlign.center, context: context,
labelStyle: AppTextStyles.textFieldLabelStyle, initialTime: TimeOfDay.now(),
enable: false, ).then((selectedTime) {
showShadow: false, // Handle the selected date and time here.
style: Theme.of(context).textTheme.titleMedium, if (selectedTime != null) {
), DateTime selectedDateTime = DateTime(
12.height, selectedDate.year,
AppTextFormField( selectedDate.month,
initialValue: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.technicalComment, selectedDate.day,
labelText: context.translation.technicalComment, selectedTime.hour,
backgroundColor: AppColor.neutral100, selectedTime.minute,
showShadow: false, );
labelStyle: AppTextStyles.textFieldLabelStyle, requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate = selectedDateTime;
alignLabelWithHint: true, requestDetailProvider.updateActivityMaintenanceHelperModel(requestDetailProvider.activityMaintenanceHelperModel);
textInputType: TextInputType.multiline, ServiceRequestUtils.calculateAndAssignWorkingHours(
onChange: (value) { startTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.technicalComment = value; endTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
}, workingHoursController: _workingHoursController,
onSaved: (value) { updateModel: (hours) {
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.technicalComment = value; requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.workingHours = hours;
}, });
), }
16.height, });
], },
) ).expanded,
8.width,
ADatePicker(
label: context.translation.endTime,
hideShadow: true,
backgroundColor: AppColor.neutral100,
date: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.endDate,
formatDateWithTime: true,
onDatePicker: (selectedDate) {
showTimePicker(
context: context,
initialTime: TimeOfDay.now(),
).then((selectedTime) {
// Handle the selected date and time here.
if (selectedTime != null) {
DateTime selectedDateTime = DateTime(
selectedDate.year,
selectedDate.month,
selectedDate.day,
selectedTime.hour,
selectedTime.minute,
);
//TODO need to replace with model attributes..
// if (requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate != null &&
// selectedDateTime.isBefore(requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.startDate!)) {
// "End Date time must be greater then start date".showToast;
// return;
// }
// requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.endDate = selectedDateTime;
// requestDetailProvider.updateActivityMaintenanceHelperModel(requestDetailProvider.activityMaintenanceHelperModel);
// ServiceRequestUtils.calculateAndAssignWorkingHours(
// startTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.startDate,
// endTime: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.endDate,
// workingHoursController: _workingHoursController,
// updateModel: (hours) {
// requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.workingHours = hours;
// });
}
});
},
).expanded,
],
),
12.height,
AppTextFormField(
labelText: context.translation.workingHours,
backgroundColor: AppColor.neutral80,
controller: _workingHoursController,
suffixIcon: "clock".toSvgAsset(width: 20, color: context.isDark ? AppColor.neutral10 : null).paddingOnly(end: 16),
initialValue: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.workingHours != null
? requestDetailProvider.activityMaintenanceHelperModel!.modelAssistantEmployees!.workingHours.toString()
: '',
textAlign: TextAlign.center,
labelStyle: AppTextStyles.textFieldLabelStyle,
enable: false,
showShadow: false,
style: Theme.of(context).textTheme.titleMedium,
),
12.height,
AppTextFormField(
initialValue: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.technicalComment,
labelText: context.translation.technicalComment,
backgroundColor: AppColor.neutral100,
showShadow: false,
labelStyle: AppTextStyles.textFieldLabelStyle,
alignLabelWithHint: true,
textInputType: TextInputType.multiline,
onChange: (value) {
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.technicalComment = value;
},
onSaved: (value) {
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.technicalComment = value;
},
),
16.height,
],
)
: const SizedBox(), : const SizedBox(),
], ],
); );
}); });
} }
} }

Write Preview
Loading…
Cancel
Save