Commit Graph

1018 Commits (16a0f20fbbdf3d2df0f5cc93cc33e3f5e9bdd96e)

Author SHA1 Message Date
Sikander Saleem 353ff337f7 file format 9 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
9 months ago
WaseemAbbasi22 71ee34c658 gas refill attachment and device transfer assistant employee issue fixes 9 months ago
Sikander Saleem b34014e24f sender and receiver comment fixed 9 months ago
Sikander Saleem e66ae78c83 files format 9 months ago
Sikander Saleem 015b73b634 ponit 87 fixed. 9 months ago
WaseemAbbasi22 5963a27213 Merge remote-tracking branch 'origin/demo_branch' into demo_branch 9 months ago
WaseemAbbasi22 43820f01d3 asset transfer attachment issue fixed 9 months ago
Sikander Saleem b0d5e03d5c Merge remote-tracking branch 'origin/demo_branch' into demo_branch 9 months ago
Sikander Saleem c4c68fbe8b asset fixes 9 months ago
WaseemAbbasi22 b592e114bc gas refill attachment issue fixed 9 months ago
WaseemAbbasi22 2291350d6f added request type for task requests 9 months ago
WaseemAbbasi22 be276f327d view activities for closed request issue fixed 9 months ago
Sikander Saleem ac0cf47a8d point 49 fixed, 9 months ago
Sikander Saleem f043c6ff6c point 8 fixed, 9 months ago
WaseemAbbasi22 b506616f48 bug fixes for recurrent task and service request added missing details mentioned in bugs sheet 9 months ago
WaseemAbbasi22 4d45dcf0b9 maintenance request complete ui issue fixes 9 months ago
WaseemAbbasi22 e74f506be0 part avalibility ui implemented 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 045c890a27 bug 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 68c4df0c14 validateAssetSituation check removed handled from backend 10 months ago
Sikander Saleem e13a7c9634 rename text 10 months ago
Sikander Saleem 5825464ed5 ppm wo inspection back button added. 10 months ago
Sikander Saleem bbc584800a CM contact info added. 10 months ago
Sikander Saleem c4847f172c Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 10 months ago
Sikander Saleem 99ef704913 rename points done 10 months ago
WaseemAbbasi22 6b93479170 work order attachment added 10 months ago
Sikander Saleem 544dffc03f chart updated overview screen. 10 months ago
Sikander Saleem 5302858097 confirmation dialog added on ppm & recurrent 10 months ago
Sikander Saleem f99ea0dacd remove camel case text, confirmation dialog added, on back press. 10 months ago
WaseemAbbasi22 15e62bb004 Task Request Design complete 10 months ago
Sikander Saleem 6b51805827 improvement 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
10 months ago
WaseemAbbasi22 be8c83cc8f Asset tranfer api integrated ready to test 10 months ago
WaseemAbbasi22 eb978af46f installition type task engineer ui complete 10 months ago
WaseemAbbasi22 54db7c97fc Task Request nurse side ui completed 10 months ago
Sikander Saleem 280c84a9cc full screen dialog added for selection. 11 months ago
Sikander Saleem c1295ac7b0 bug 726 fixed. 11 months ago
Sikander Saleem f6b4b77aed bug 734 fixed. 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 ef50f37a15 bug 703 fixed. 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
Sikander Saleem bd362cb0f6 bug 706 fixed. 11 months ago
Sikander Saleem ab6608f5a6 bug 703 fixed. 11 months ago
WaseemAbbasi22 6bd888e06a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 11 months ago
WaseemAbbasi22 b767f9123e Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 11 months ago
WaseemAbbasi22 152a0795c6 add and update gas refill ui and api integrated 11 months ago
Sikander Saleem 4a7f1eb037 ppm improvement, recurrent task improvement 11 months ago
Sikander Saleem 2a6277ee76 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 11 months ago
WaseemAbbasi22 f06426091b room null value issue fixed in recurrent task 11 months ago
WaseemAbbasi22 52626e7495 ui issue fixed for verify asset details screen 11 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 11 months ago
Sikander Saleem 0a06ad9fe3 privacy policy check added. 11 months ago
Sikander Saleem 880f1eb1f0 development mode and external storage excluded from device security check. 11 months ago
Sikander Saleem c9b3538720 test done with UAT env and UAT-PM-Task-Apk created 11 months ago
Sikander Saleem 8d9de6ce1a history log improvement added. 11 months ago
Sikander Saleem edd22bf4af stop working hide for nurse. 11 months ago
Sikander Saleem 8fe01adcb0 ppm pm kits improvement 11 months ago
Sikander Saleem 5a211a295f ppm dynamic tabs added. 11 months ago
Sikander Saleem 1893b45dc9 ppm timer fix. 11 months ago
Sikander Saleem 58c0f176a6 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 11 months ago
Sikander Saleem a31c82f188 nurse dashboard categories order changed. 11 months ago
WaseemAbbasi22 7df18179a1 ppm task supplier ui completed and save and update api implemented 11 months ago
Sikander Saleem 4c328b2cba recurrent task timer improvements. 11 months ago
Sikander Saleem 86aeddc6c2 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 11 months ago
WaseemAbbasi22 b67e6dea11 Recurrent Work Order Complete ready to test 11 months ago
Sikander Saleem b6e2cc9276 timer improvements for CM. 11 months ago
Sikander Saleem 729e7ad901 timer improvements. 11 months ago
Sikander Saleem 0246bb1606 ppm timer improvement cont-1 11 months ago
Sikander Saleem 58fb4b3829 cm feedback points, 11 months ago
Sikander Saleem 28b30d9fa8 ppm data model upgraded. 11 months ago
WaseemAbbasi22 c5d3eead2d Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 11 months ago
WaseemAbbasi22 8c9b1b3c46 missing attributes added for recurrent task 11 months ago
Sikander Saleem 84dd801ed1 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
#	lib/views/pages/user/ppm/ppm_details_page.dart
#	lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
12 months ago
Sikander Saleem 2cd5777f55 ppm model improvement. 12 months ago
WaseemAbbasi22 7b620b9f6e Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 12 months ago
WaseemAbbasi22 ce1044f201 timer and working hours issue fixes 12 months ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 12 months ago
WaseemAbbasi22 ecaf58fcdc Merge branch 'refs/heads/design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
12 months ago
WaseemAbbasi22 d181c81029 save and complete api integrated for recurrent task 12 months ago
WaseemAbbasi22 99bcae1dc2 recurrent task api integrated 12 months ago
WaseemAbbasi22 c15cec364d Gas refill and Asset Transfer attributes addition done 12 months ago
WaseemAbbasi22 ed1337e16d recurrent task ui complete 12 months ago
Sikander Saleem 81d4fa6a89 ppm calibration tools, pm kits and checklist ui changed 1 year ago
WaseemAbbasi22 ae3b9297d5 Merge branch 'design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow 1 year ago
WaseemAbbasi22 be413d4e7b in progress 1 year ago
WaseemAbbasi22 8a5478f37f initial commit 1 year ago
Sikander Saleem 27097956cb gas quantity field change to dropdown 1 year ago
Sikander Saleem 31f94bd110 Merge remote-tracking branch 'origin/design_3.0_non_hmg_emp_flow' into design_3.0_non_hmg_emp_flow 1 year ago
WaseemAbbasi22 b5bfb3c0c0 arrival bottomsheet dismiss fixes and add check for next step value 1 year ago
Sikander Saleem d89ec1d317 improvements 1 year ago
WaseemAbbasi22 08428fc745 swipe module and reset password added 1 year ago