 WaseemAbbasi22
|
9a332e86e2
|
Merge branch 'design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
|
2 months ago |
 Sikander Saleem
|
c1a7562e3b
|
create asset transfer, on internal & external destination values reset.
|
2 months ago |
Sikander Saleem
|
47673e3473
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
# Conflicts:
# lib/modules/cm_module/views/components/action_button/footer_action_button.dart
# lib/modules/cm_module/views/components/service_request_detail_view.dart
# lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
# lib/modules/tm_module/tasks_wo/update_task_request_view.dart
# lib/views/pages/user/gas_refill/update_gas_refill_request.dart
# lib/views/widgets/images/multi_image_picker.dart
|
3 months ago |
|
Sikander Saleem
|
89865c0ddd
|
Merge branch 'refs/heads/design_3.0_dark_mode' into design_3.0_TM_Module_attachmentFix
# Conflicts:
# lib/modules/cm_module/views/forms/asset_retired/verify_asset_detail.dart
# lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
# lib/modules/pm_module/ppm_wo/update_ppm/ppm_calibration_tools_form.dart
# lib/views/pages/device_transfer/update_device_transfer.dart
|
3 months ago |
|
WaseemAbbasi22
|
4e665d1959
|
attachment fixes
|
3 months ago |
|
WaseemAbbasi22
|
8d9aacb870
|
dark mode fixes
|
3 months ago |
|
WaseemAbbasi22
|
6d39b20e0b
|
dark mode implementation
|
3 months ago |
|
Sikander Saleem
|
ca1ff5892e
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
# lib/modules/cm_module/service_request_detail_provider.dart
# lib/new_views/pages/land_page/land_page.dart
# lib/views/pages/device_transfer/update_device_transfer.dart
|
3 months ago |
|
WaseemAbbasi22
|
503f3a6feb
|
multiple assistant employee added for asset transfer and service-request
|
3 months ago |
|
WaseemAbbasi22
|
1285ae68ec
|
multiple assistant employee structure added
|
3 months ago |
|
Sikander Saleem
|
c92aae9048
|
improvements
|
4 months ago |
|
Sikander Saleem
|
d5059758ac
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
|
4 months ago |
|
Sikander Saleem
|
bf44e5cbec
|
verification method issue fixed, if requester not confirms arrival.
|
4 months ago |
|
Sikander Saleem
|
616ce9b630
|
timer picker end date selection fixed.
|
4 months ago |
|
Sikander Saleem
|
6539848f31
|
method name fix.
|
4 months ago |
|
Sikander Saleem
|
f3f09d1eb2
|
timer improvements
|
4 months ago |
|
WaseemAbbasi22
|
aa11d93409
|
update user contact info bottomsheet design and statedate time initial value added
|
4 months ago |
|
Sikander Saleem
|
62dd395a73
|
timer picker added, and code improvements
|
4 months ago |
|
WaseemAbbasi22
|
4d15dc9dab
|
mark as complete confirmation dialog and new timer added for all type of requests
|
5 months ago |
|
WaseemAbbasi22
|
8ae51480f9
|
added nurse signature for device transfer request and tested on uat
|
5 months ago |
|
WaseemAbbasi22
|
56c70671d8
|
add contact and created by information for asset transfer and gasrefill request
|
6 months ago |
|
WaseemAbbasi22
|
330efd90be
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
Sikander Saleem
|
b4587a6347
|
hide task module & recurrent WO for nurse
|
6 months ago |
|
WaseemAbbasi22
|
06e8831d02
|
add label for destination site details
|
6 months ago |
|
WaseemAbbasi22
|
7b57ca54c3
|
renaming done as per pdf shared
|
6 months ago |
|
WaseemAbbasi22
|
0996801f66
|
notification testing done for all type of request on dev env.
|
6 months ago |
|
WaseemAbbasi22
|
06acdb184f
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
# lib/views/pages/device_transfer/update_device_transfer.dart
|
6 months ago |
|
Sikander Saleem
|
5169894dc4
|
code restructured and improvements.
|
6 months ago |
|
WaseemAbbasi22
|
0b97ffe296
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
Sikander Saleem
|
36657cd5ca
|
cost added & refactor.
|
6 months ago |
|
WaseemAbbasi22
|
4698a3325e
|
add validation for assistant employee start and end date
|
6 months ago |
|
WaseemAbbasi22
|
6004ed1a27
|
ATOMS-820 fixed
|
6 months ago |
|
WaseemAbbasi22
|
facbb9002d
|
ATOMS-811 fixed
|
6 months ago |
|
WaseemAbbasi22
|
eeafda869a
|
ATOMS-857 fixed
|
6 months ago |
|
WaseemAbbasi22
|
02ccdd1f6a
|
ATOMS-856 fixed
|
6 months ago |
|
WaseemAbbasi22
|
e3531d471d
|
ATOMS-783 fixed
|
6 months ago |
|
WaseemAbbasi22
|
b577343353
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
|
6 months ago |
|
WaseemAbbasi22
|
824f46b0e3
|
ATOMS-823, ATOMS-825, ATOMS-782, ATOMS-784, ATOMS-807, issues fixed
|
6 months ago |
|
Sikander Saleem
|
50fb07b504
|
on back confirmation dialog added on gas refill, task and asset transfer
|
6 months ago |
|
Sikander Saleem
|
5b3d746b14
|
ui improvements & task details added on details screen
|
6 months ago |
|
WaseemAbbasi22
|
5e9ba71be6
|
ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues fixed
|
6 months ago |
|
WaseemAbbasi22
|
99249b4839
|
Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
# lib/views/pages/device_transfer/device_transfer_details.dart
|
6 months ago |
|
WaseemAbbasi22
|
a42466b578
|
ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues fixed
|
6 months ago |
|
Sikander Saleem
|
14c2decd75
|
Bug 789 fixed.
|
6 months ago |
|
WaseemAbbasi22
|
72823e37f8
|
bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed
|
6 months ago |
|
WaseemAbbasi22
|
93c7fb553d
|
task detail page improvement
|
6 months ago |
|
Sikander Saleem
|
e0902eddf7
|
Merge branch 'refs/heads/demo_branch' into design_3.0_tm_module_task_flow
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/extensions/widget_extensions.dart
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
# lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
# lib/new_views/pages/new_gas_refill_request_page.dart
# lib/views/pages/user/gas_refill/request_gas_refill.dart
# lib/views/widgets/equipment/asset_picker.dart
|
6 months ago |
|
Sikander Saleem
|
b75c0b321d
|
multiple asset picker added.
|
7 months ago |
|
Sikander Saleem
|
f50ede8321
|
Merge remote-tracking branch 'origin/demo_branch' into demo_branch
# Conflicts:
# lib/views/pages/user/gas_refill/gas_refill_form.dart
|
7 months ago |
|
WaseemAbbasi22
|
71ee34c658
|
gas refill attachment and device transfer assistant employee issue fixes
|
7 months ago |