Commit Graph

356 Commits (17210195db07dc51bf3101466cceea9abbc6632d)

Author SHA1 Message Date
WaseemAbbasi22 e3531d471d ATOMS-783 fixed 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
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 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
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 e66ae78c83 files format 9 months ago
Sikander Saleem 015b73b634 ponit 87 fixed. 9 months ago
WaseemAbbasi22 2291350d6f added request type for task requests 9 months ago
WaseemAbbasi22 6795ba7f72 device transfer gas refill merged in ppm_newflow 9 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
9 months ago
WaseemAbbasi22 5031c3cbb8 gas refill fixes 9 months ago
WaseemAbbasi22 ab91baf216 bug fixes mentioned on excel sheet and tested with backend 9 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
Sikander Saleem ef50f37a15 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 152a0795c6 add and update gas refill ui and api integrated 11 months ago
Sikander Saleem 4a7f1eb037 ppm improvement, recurrent task improvement 11 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 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 58c0f176a6 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 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
WaseemAbbasi22 b67e6dea11 Recurrent Work Order Complete ready to test 11 months ago
Sikander Saleem 28b30d9fa8 ppm data model upgraded. 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
11 months ago
Sikander Saleem 2cd5777f55 ppm model improvement. 11 months ago
WaseemAbbasi22 7b620b9f6e Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 11 months ago
WaseemAbbasi22 ce1044f201 timer and working hours issue fixes 11 months ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 11 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
11 months ago
WaseemAbbasi22 d181c81029 save and complete api integrated for recurrent task 11 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 a5876ec1d3 swipe module added 1 year ago
WaseemAbbasi22 ba50ed5809 add swipe and forget password apis 1 year ago
Sikander Saleem 561881c7f2 non hmg employee cont-1 1 year ago
Sikander Saleem f3d52eef52 bug fixes 1 year ago
WaseemAbbasi22 c1ec32fa33 bug fixes 1 year ago
WaseemAbbasi22 4c9a730e24 all the changes are implemented 1 year ago
muhammad.abbasi fbdbdf67a0 improvements 1 year ago
muhammad.abbasi 77d18bd413 add maintenance request completed 1 year ago
muhammad.abbasi e8dc052d02 integrating api in new flow 1 year ago
muhammad.abbasi acbf33e2a2 Merge branch 'refs/heads/design_3.0_sdk_upgrade' into design_3.0_waseem_dev
# Conflicts:
#	lib/service_request_latest/views/components/request_detail_view.dart
1 year ago
muhammad.abbasi 8dd596bc35 -design completed 1 year ago
Sikander Saleem 69ae0147bb Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/dashboard_latest/dashboard_provider.dart
#	lib/dashboard_latest/dashboard_view.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/dashboard_latest/widgets/requests_fragment.dart
#	lib/new_views/app_style/app_color.dart
#	lib/service_request_latest/request_detail_provider.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/request_detail_main_view.dart
1 year ago
Sikander Saleem 0d333fa688 dashboard screen & service detail screen, flow changed. 1 year ago
muhammad.abbasi d99a083792 bug fixes 1 year ago
Sikander Saleem f694252828 null safety conversion after merge. 1 year ago
Sikander Saleem 0d876a41fc Merge remote-tracking branch 'refs/remotes/origin/design_3.0_waseem' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/dashboard_latest/dashboard_view.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/extensions/text_extensions.dart
#	lib/models/lookup.dart
#	lib/new_views/app_style/app_themes.dart
#	lib/new_views/common_widgets/app_bottom_nav_bar.dart
#	lib/new_views/common_widgets/app_dashed_button.dart
#	lib/new_views/common_widgets/app_filled_button.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/new_views/pages/land_page/requests_list_page.dart
#	lib/providers/work_order/reason_provider.dart
#	lib/service_request_latest/views/components/bottom_sheets/action_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/activity_type_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/initial_visit_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/reject_request_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/spare_part/spare_part_request.dart
#	lib/utilities/general_utils.dart
#	lib/views/widgets/date_and_time/date_picker.dart
#	lib/views/widgets/date_and_time/time_picker.dart
#	lib/views/widgets/e_signature/e_signature.dart
#	lib/views/widgets/images/multi_image_picker.dart
#	pubspec.yaml
1 year ago
muhammad.abbasi d13f3e3551 Ui updated 1 year ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 1 year ago
Sikander Saleem be4c8d7653 null safety conversation complete 1 year ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 1 year ago
muhammad.abbasi f257fbadfa new Api models and provider added 1 year ago
Sikander Saleem 7d0a2eb65c sdk upgrade changes. 1 year ago
Muhammad Abbasi 246bb1fb55 pagination added 1 year ago
Muhammad Abbasi ad1a01b7c6 initial commit 1 year ago
Sikander Saleem 2c6e81284d 1.2.2+9 uploaded. 1 year ago
nextwo e65d2a44ed search asset ui 2 years ago
nextwo 9a1303fc5e search asset ui 2 years ago
nextwo 7ef71849dd comment unused files 2 years ago
Sikander Saleem 5348bc81eb sub work order improvements. 2 years ago
Sikander Saleem be449b8a51 android target sdk moved to 34. 2 years ago
nextwo b792585810 add timer list in asset transfer for sender and receiver 2 years ago
nextwo 67854d2e8c add timer list in asset transfer for sender and receiver 2 years ago
Sikander Saleem 8273537b00 create supplier engineer functionality added. 2 years ago
Sikander Saleem b508e839c5 multi auth added, token verification added, multi time added on ppm. 2 years ago
Sikander Saleem e212cf75b1 ppm multi timer added. 2 years ago
Sikander Saleem 494087ef18 update service request & work order attachment issue fix. 2 years ago
Sikander Saleem 06cee34657 first action fixed remotely, start & end date added. 2 years ago
Sikander Saleem a7f2573584 remember me added. 2 years ago
Sikander Saleem ff3dfcc9cb Merge branch 'main_production' into main_design2.0 2 years ago
Sikander Saleem 6281364579 dashboard api calling structure improvement. 2 years ago
Sikander Saleem 11ab040f90 biometric / faceId auth added. cont. 2 years ago
Sikander Saleem f3b432d0c1 ppm external supplier fields added. & improvements. 2 years ago
Sikander Saleem 40fe6ec192 archived data filter added. 2 years ago
Sikander Saleem 9c7653109d request search improvements 2 years ago
Sikander Saleem 873b5bcfec switching in multiple asset group added. 2 years ago
Sikander Saleem d6c3fc2778 head nurse role added, pending asset service requests added & AssetGroup header added. 2 years ago
Sikander Saleem d858eeace4 improvement. 2 years ago
Sikander Saleem 9101783703 device transfer added in filters 2 years ago
Sikander Saleem 60639620c6 snag issues resolve 2 years ago
Sikander Saleem cacd973386 workorder, create ,edit& sub workorder reason fixed. 2 years ago
Sikander Saleem adba86b10e snag list remaining 4 points resolved & improvements. 2 years ago
Sikander Saleem 26b82fbda0 attachment added on transfer request. 2 years ago
Sikander Saleem adab2e36ea first action time added, comment fixed, 2 years ago
Sikander Saleem 965ccc3c9f voice note issue fix in update 2 years ago
Sikander Saleem a6dd802321 receiver name added on new transfer request & improvements 2 years ago
Sikander Saleem 0b2ef3d114 improvements 2 years ago
nextwo 0be6013ec5 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo d3bee4f39a gas refill comments 2 years ago
Sikander Saleem eeaa9bef85 improvements. 2 years ago
nextwo 6b740549a5 my requests pagination + Sender only close sender request Sender,
Receiver can do both jobs, sender & receiver.
2 years ago
nextwo 8295fd2b1d values are not shown in overview screen. also on my request screens. 2 years ago
zaid_daoud 4309c509e8 Assistant Engineer can be unselected 2 years ago