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

Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge

Browse Source
design_3.0_TM_Module_snagsFix
Sikander Saleem 2 months ago
parent 644fe5b880 e40d9a1138
commit 26c8c6844a
3 changed files with 99 additions and 106 deletions
Show Stats Download Patch File Download Diff File

31
lib/modules/tm_module/tasks_wo/update_task_request_view.dart
Unescape Escape View File

@ -230,38 +230,18 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
TaskJobActivityEngineerTimer(
id: 0,
startDate: timer.startAt!.toIso8601String(),
// Handle potential null
endDate: timer.endAt?.toIso8601String(),
// Handle potential null
totalWorkingHour: ((durationInSecond) / 60 / 60),
// comment: timer.comments,
comment: timer.comments ?? comments),
);
});
// TODO need to test this when task is enabled ...
// await taskRequestProvider.updateTaskByEngineer().then((success) {
// Navigator.pop(context);
// if (success) {
// if (status == 1) {
// AllRequestsProvider allRequestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
// allRequestsProvider.reset();
// allRequestsProvider.getAllRequests(context, typeTransaction: 6);
// } else {
// taskRequestProvider.getTaskById(id: widget.taskId, showLoading: false);
//
// }
// Navigator.pop(context);
// Navigator.pop(context);
// }
// });
await taskRequestProvider.updateTaskByEngineer().whenComplete(() async {
if (taskRequestProvider.stateCode == 200) {
await taskRequestProvider.updateTaskByEngineer().then((success) async {
if (success) {
if (status == 1) {
AllRequestsProvider allRequestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
allRequestsProvider.reset();
await allRequestsProvider.getAllRequests(context, typeTransaction: 6);
await allRequestsProvider.getAllRequests(context, typeTransaction: taskRequestProvider.taskRequestModel?.taskType?.id);
Navigator.pop(context);
Navigator.pop(context);
Navigator.pop(context);
@ -469,7 +449,8 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
setState(() {});
}
},
)
),
8.height,
],
],
);
@ -528,6 +509,7 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
AppTimer(
label: context.translation.timer,
timer: taskProvider.taskRequestModel?.taskTimerModel,
pickerFromDate: DateTime.tryParse(widget.createdDate ?? ''),
width: double.infinity,
enabled: isTimerEnable,
decoration: BoxDecoration(
@ -538,7 +520,6 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
onPick: (time) {
taskProvider.taskRequestModel?.taskTimePicker = time;
},
timerProgress: (isRunning) {},
onChange: (timer) async {
taskProvider.updateTaskTimer(timer: timer);
return true;

21
lib/new_views/app_style/app_color.dart
Unescape Escape View File

@ -96,11 +96,16 @@ class AppColor {
static Color yellowIcon(BuildContext context) => context.isDark ? const Color(0xffFFC945) : orange70;
static Color background(BuildContext context) => context.isDark ? neutral60 : Colors.white;
static Color textColor(BuildContext context) =>context.isDark ? AppColor.neutral30 : AppColor.neutral50;
static Color headingTextColor(BuildContext context) =>context.isDark ? AppColor.neutral30 : AppColor.black10;
static Color lightTextColor(BuildContext context) =>AppColor.neutral120;
static Color iconColor(BuildContext context) =>context.isDark ? AppColor.neutral30 : AppColor.neutral50;
static Color fieldBgColor(BuildContext context) => context.isDark ? AppColor.neutral20 : AppColor.neutral100;
static Color textColor(BuildContext context) => context.isDark ? neutral30 : neutral50;
static Color headingTextColor(BuildContext context) => context.isDark ? neutral30 : black10;
static Color lightTextColor(BuildContext context) => neutral120;
static Color iconColor(BuildContext context) => context.isDark ? neutral30 : neutral50;
static Color fieldBgColor(BuildContext context) => context.isDark ? neutral20 : neutral100;
static Color selectedButtonColor(BuildContext context) => context.isDark ? neutral60 : neutral30;
@ -143,6 +148,7 @@ class AppColor {
return Colors.white;
}
}
static Color getActivityTypeBgColor(String type) {
switch (type) {
case "Internal":
@ -150,11 +156,11 @@ class AppColor {
case "External":
return white90;
default:
return primary10;
}
}
static Color getActivityTypeTextColor(String type) {
static Color getActivityTypeTextColor(String type) {
switch (type) {
case "Internal":
return white10;
@ -280,6 +286,7 @@ static Color getActivityTypeTextColor(String type) {
return blueStatus(context);
}
}
static Color getEquipmentStatusColor(BuildContext context, int id) {
switch (id) {
case 368:

9
lib/views/widgets/images/multi_image_picker.dart
Unescape Escape View File

@ -487,7 +487,8 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
return Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
color: AppColor.background(context),
// color: Colors.white,
borderRadius: BorderRadius.circular(12),
border: Border.all(color: const Color(0xffF1F1F1), width: 1),
),
@ -495,7 +496,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
icon.toSvgAsset(color: const Color(0xff7D859A), width: 36, height: 36),
icon.toSvgAsset(color: AppColor.iconColor(context), width: 36, height: 36),
// Icon(iconData, color: const Color(0xff7D859A), size: 36),
Text(
label,
@ -508,6 +509,9 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
return SafeArea(
top: false,
child: Container(
width: double.infinity,
color: AppColor.background(context),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@ -576,6 +580,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
// ),
],
).paddingAll(16),
),
);
},
);

Write Preview
Loading…
Cancel
Save