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

1.3.6+25 merge conflict resolved.

Browse Source
design_3.0_TM_Module_snagsFix
Sikander Saleem 3 months ago
parent 47673e3473
commit 1edcea47be
6 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
lib/modules/pm_module/ppm_wo/ppm_details_page.dart
Unescape Escape View File

@ -117,9 +117,11 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
},
label: context.translation.updateWorkOrder,
),
context: context,
)
] else ...[
FooterActionButton.footerContainer(
context: context,
child: AppFilledButton(
onPressed: () async {
await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit)));

10
lib/modules/pm_module/ppm_wo/update_ppm/update_ppm.dart
Unescape Escape View File

@ -48,9 +48,8 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
ppmProvider.planPreventiveVisit?.preventiveVisitAttachments = [];
for (var item in ppmProvider.ppmPlanAttachments) {
String fileName = ServiceRequestUtils.isLocalUrl(item.name??'') ? ("${item.name??''.split("/").last}|${base64Encode(File(item.name??'').readAsBytesSync())}") :item.name??'';
ppmProvider.planPreventiveVisit?.preventiveVisitAttachments
?.add(PreventiveVisitAttachments(id: item.id, attachmentName: fileName));
String fileName = ServiceRequestUtils.isLocalUrl(item.name ?? '') ? ("${item.name ?? ''.split("/").last}|${base64Encode(File(item.name ?? '').readAsBytesSync())}") : item.name ?? '';
ppmProvider.planPreventiveVisit?.preventiveVisitAttachments?.add(PreventiveVisitAttachments(id: item.id, attachmentName: fileName));
}
ppmProvider.planPreventiveVisit?.preventiveVisitTimers = ppmProvider.planPreventiveVisit?.preventiveVisitTimers ?? [];
@ -202,6 +201,7 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
),
).expanded,
FooterActionButton.footerContainer(
context: context,
child: Row(
children: [
if (tabIndex == 1) ...[
@ -227,8 +227,8 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
AppFilledButton(
// buttonColor: AppColor.white60,
// textColor: AppColor.neutral50,
buttonColor: context.isDark?AppColor.neutral50:AppColor.white60,
textColor: context.isDark ? Colors.white: AppColor.neutral150,
buttonColor: context.isDark ? AppColor.neutral50 : AppColor.white60,
textColor: context.isDark ? Colors.white : AppColor.neutral150,
onPressed: () {
_onSubmit(status: 0);
},

1
lib/modules/tm_module/tasks_wo/task_request_detail_view.dart
Unescape Escape View File

@ -146,6 +146,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
).expanded,
if (userProvider!.user!.type == UsersTypes.engineer && (taskModel?.taskJobStatus?.value != 4 && taskModel?.taskJobStatus?.value != 3))
FooterActionButton.footerContainer(
context: context,
child: AppFilledButton(
onPressed: () async {
if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) {

1
lib/views/pages/user/gas_refill/gas_refill_details.dart
Unescape Escape View File

@ -75,6 +75,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
).expanded,
if (_userProvider.user!.type == UsersTypes.engineer && (_model.status!.value! != 2)) ...[
FooterActionButton.footerContainer(
context: context,
child: AppFilledButton(
onPressed: () async {
await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateGasRefillRequest(gasRefillModel: _model)));

2
lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
Unescape Escape View File

@ -147,7 +147,7 @@ class _SelectionBottomSheetState<T> extends State<SelectionFullScreenDialog<T>>
Navigator.pop(context);
widget.onSelect(_selectedValue);
},
),
), context: context,
),
],
),

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

@ -339,7 +339,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
);
if (result != null) {
for (var path in result.paths) {
widget.attachment.add(GenericAttachmentModel(id: 0,name: File(path!).path));
widget.attachment.add(GenericAttachmentModel(id: 0, name: File(path!).path));
}
if (widget.onChange != null) {
widget.onChange!(widget.attachment);
@ -347,8 +347,12 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
setState(() {});
}
}
}
void showFileSourceSheet() async {
if (widget.attachment.length >= 5) {
Fluttertoast.showToast(msg: context.translation.maxImagesNumberIs5);
return;
}
ImageSource source = (await showModalBottomSheet(
context: context,
shape: const RoundedRectangleBorder(
@ -386,7 +390,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
if (pickedFile != null) {
File fileImage = File(pickedFile.path);
widget.attachment.add(GenericAttachmentModel(id: 0,name: fileImage.path));
widget.attachment.add(GenericAttachmentModel(id: 0, name: fileImage.path));
if (widget.onChange != null) {
widget.onChange!(widget.attachment);
}
@ -476,32 +480,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
);
},
);
// ImageSource source = await showDialog(
// context: context,
// builder: (dialogContext) => CupertinoAlertDialog(
// actions: <Widget>[
// TextButton(
// child: Text(context.translation.pickFromCamera),
// onPressed: () {
// Navigator.of(dialogContext).pop(ImageSource.camera);
// },
// ),
// TextButton(
// child: Text(context.translation.pickFromGallery),
// onPressed: () {
// Navigator.of(dialogContext).pop(ImageSource.gallery);
// },
// ),
// TextButton(
// child: Text(context.translation.pickFromFiles),
// onPressed: () async {
// await fromFilePicker();
// Navigator.pop(context);
// },
// ),
// ],
// ),
// );
if (source == null) return;
final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);

Write Preview
Loading…
Cancel
Save