Commit Graph

465 Commits (282bf040944baef8a0b4ece2d4ff94b9da954692)

Author SHA1 Message Date
Sikander Saleem d3c000004e code improvements 4 months ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 4 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 4 months ago
WaseemAbbasi22 c19fdb173b api integrated for main views 4 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 4 months ago
Sikander Saleem 3ac3c11b4b improvement 4 months ago
Sikander Saleem ee70ca3c2b Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge 4 months ago
WaseemAbbasi22 423968d7f6 timer history added 4 months ago
Sikander Saleem 89b81391e9 site contact list api added. 4 months ago
WaseemAbbasi22 e40d9a1138 ATOMS-1025, ATOMS-937 and some color fixes for dark mode 5 months ago
Sikander Saleem 23e7550212 counter animation added. 5 months ago
Sikander Saleem 7efeeed619 bottom sheet ui improvements,safe area added. 5 months ago
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
5 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 5 months ago
Sikander Saleem c1a7562e3b create asset transfer, on internal & external destination values reset. 5 months ago
Sikander Saleem 630c1533e7 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/pages/user/requests/create_service_request_page.dart
#	lib/views/widgets/images/multi_image_picker.dart
5 months ago
Sikander Saleem 642d1a908c auto login improvement. 5 months ago
waseemabbasi22 6c3f36944a auth and attachment fixes 5 months ago
Sikander Saleem b2d3d60152 logout api added. 5 months ago
WaseemAbbasi22 2fab61b144 task module disabled 5 months ago
WaseemAbbasi22 5e3b09315f dark mode color fixes 5 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 5 months ago
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 5 months ago
Sikander Saleem a479a23790 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module 6 months ago
Sikander Saleem e3a97c0ae9 enable engineer time picker issue fixed, session expired dialog issue fixed. 6 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
6 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
6 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 6 months ago
WaseemAbbasi22 7ecccf8bf8 improvements 6 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 6 months ago
Sikander Saleem aa1d75de07 merge conflict resolved. 6 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
6 months ago
SikanderSaleem 5589d5b563 asset currency model & ios face id failed improvement. 6 months ago
Sikander Saleem eba3154f32 splash session expired handled. 6 months ago
Sikander Saleem 5484c7f5a4 improvement 6 months ago
Sikander Saleem 262b3aa42f local auth fail handling and improvements. 6 months ago
Sikander Saleem 6adea49150 image full screen loading improvement 6 months ago
Sikander Saleem daa4a12893 improvement 6 months ago
Sikander Saleem 97adfa1def Merge remote-tracking branch 'origin/design_3.0_task_module_new' into design_3.0_task_module_new 7 months ago
Sikander Saleem d5059758ac Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new 7 months ago
WaseemAbbasi22 8b76629448 requestlist changes to model for status fixes 7 months ago
Sikander Saleem a2e5a8a588 otp verification improved, serial no added 7 months ago
Sikander Saleem 8101521791 eng can create Task request. 7 months ago
Sikander Saleem 6539848f31 method name fix. 7 months ago
Sikander Saleem e9efca620d enable task module. 7 months ago
Sikander Saleem be2fd8a2d5 1.3.1+20 uploaded on stores 7 months ago
Sikander Saleem 5fd2bb1e5b vendor list issue when already have a supplier. 7 months ago
Sikander Saleem 46dd66b165 selection replaced to full screen. 7 months ago
Sikander Saleem 4d13105b91 cancel a selection from bottom sheet dropdown added. 7 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 8 months ago
Sikander Saleem 64a2d39cb1 timer picker added and improvements 8 months ago
Sikander Saleem 7f594fbb41 timer tab switch issue fixed. 8 months ago
SikanderSaleem b29284f59f changes for ios release 8 months ago
Sikander Saleem 65064bc0a2 low priority removed from gas refill, transfer, ppm and sparepart cost. 8 months ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 9 months ago
WaseemAbbasi22 7b57ca54c3 renaming done as per pdf shared 9 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
9 months ago
WaseemAbbasi22 b320e3751a add code for nurse edit gas refill request 9 months ago
Sikander Saleem 5169894dc4 code restructured and improvements. 9 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 9 months ago
Sikander Saleem 8dc35a20af FMS- engineer can create CM request, hide priority for nurse. 9 months ago
WaseemAbbasi22 ef7722ab2a Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
9 months ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 9 months ago
Sikander Saleem 50ca2bb8a3 create request method improvement. 9 months ago
Sikander Saleem 5b3d746b14 ui improvements & task details added on details screen 9 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 9 months ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 9 months ago
WaseemAbbasi22 93c7fb553d task detail page improvement 9 months ago
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 9 months ago
Sikander Saleem 002172ab87 unused file 9 months ago
Sikander Saleem b8f6473378 UAt apk provided To QA. 9 months ago
Sikander Saleem 33dea07449 merge conflict resolved and file format. 9 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
9 months ago
WaseemAbbasi22 9edaca4326 task request module flow completed and tested with backend 9 months ago
WaseemAbbasi22 14e55c63e7 create task flow completed 10 months ago
WaseemAbbasi22 0fdbe8722e task request item view api integrated 10 months ago
WaseemAbbasi22 71ee34c658 gas refill attachment and device transfer assistant employee issue fixes 10 months ago
WaseemAbbasi22 b592e114bc gas refill attachment issue fixed 10 months ago
WaseemAbbasi22 2291350d6f added request type for task requests 10 months ago
Sikander Saleem ac0cf47a8d point 49 fixed, 10 months ago
Sikander Saleem f043c6ff6c point 8 fixed, 10 months ago
WaseemAbbasi22 b506616f48 bug fixes for recurrent task and service request added missing details mentioned in bugs sheet 10 months ago
WaseemAbbasi22 6795ba7f72 device transfer gas refill merged in ppm_newflow 10 months ago
WaseemAbbasi22 ef6c14ba55 Merge branch 'design_3.0_transfer_request_new_flow' into demo_branch
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/models/new_models/gas_refill_model.dart
#	lib/new_views/common_widgets/default_app_bar.dart
#	lib/views/pages/user/gas_refill/gas_refill_details.dart
#	lib/views/pages/user/ppm/update_ppm/ppm_pm_kits_form.dart
10 months ago
WaseemAbbasi22 5031c3cbb8 gas refill fixes 10 months ago
WaseemAbbasi22 ab91baf216 bug fixes mentioned on excel sheet and tested with backend 10 months ago
WaseemAbbasi22 4954549594 bug fixes for workorder detail view 10 months ago
WaseemAbbasi22 e4dd92c4a9 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
#	lib/views/pages/user/ppm/update_ppm/wo_info_form.dart
10 months ago
WaseemAbbasi22 a66215ef8b bug fixes 10 months ago
Sikander Saleem 99ef704913 rename points done 10 months ago
Sikander Saleem f99ea0dacd remove camel case text, confirmation dialog added, on back press. 10 months ago
Sikander Saleem ec63446802 Merge branch 'refs/heads/design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
# Conflicts:
#	lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart
11 months ago
WaseemAbbasi22 be8c83cc8f Asset tranfer api integrated ready to test 11 months ago
WaseemAbbasi22 eb978af46f installition type task engineer ui complete 11 months ago
WaseemAbbasi22 54db7c97fc Task Request nurse side ui completed 11 months ago
Sikander Saleem 280c84a9cc full screen dialog added for selection. 11 months ago
Sikander Saleem 15023ea99d bug 726 fixed. 11 months ago
WaseemAbbasi22 289d06ff68 Asset transfer nurse side ui completed 11 months ago
Sikander Saleem 5ab0ba4c2c bug 710 & 711 fixed. 11 months ago
WaseemAbbasi22 48591de22a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 11 months ago