Commit Graph

345 Commits (b5773433536fa8a093778de0d72e582b3ead6b7d)

Author SHA1 Message Date
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 12 months ago
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 12 months ago
Sikander Saleem 33dea07449 merge conflict resolved and file format. 1 year 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
1 year ago
WaseemAbbasi22 9edaca4326 task request module flow completed and tested with backend 1 year ago
Sikander Saleem b75c0b321d multiple asset picker added. 1 year ago
Sikander Saleem 015b73b634 ponit 87 fixed. 1 year ago
WaseemAbbasi22 b592e114bc gas refill attachment issue fixed 1 year ago
Sikander Saleem f043c6ff6c point 8 fixed, 1 year 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
1 year 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
1 year ago
WaseemAbbasi22 a66215ef8b bug fixes 1 year ago
Sikander Saleem e13a7c9634 rename text 1 year 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
1 year ago
WaseemAbbasi22 54db7c97fc Task Request nurse side ui completed 1 year ago
Sikander Saleem 280c84a9cc full screen dialog added for selection. 1 year ago
WaseemAbbasi22 289d06ff68 Asset transfer nurse side ui completed 1 year ago
WaseemAbbasi22 48591de22a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 1 year ago
Sikander Saleem ab6608f5a6 bug 703 fixed. 1 year ago
WaseemAbbasi22 6bd888e06a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 1 year ago
WaseemAbbasi22 152a0795c6 add and update gas refill ui and api integrated 1 year ago
Sikander Saleem 4a7f1eb037 ppm improvement, recurrent task improvement 1 year ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 1 year ago
Sikander Saleem edd22bf4af stop working hide for nurse. 1 year ago
Sikander Saleem 8fe01adcb0 ppm pm kits improvement 1 year ago
Sikander Saleem 2cd5777f55 ppm model improvement. 1 year ago
Sikander Saleem 81d4fa6a89 ppm calibration tools, pm kits and checklist ui changed 1 year ago
WaseemAbbasi22 8a5478f37f initial commit 1 year ago
Sikander Saleem ef38c3d2bd non hmg mark attendance module added. 1 year ago
Sikander Saleem e878881e5a request confirmation improvements. 1 year ago
WaseemAbbasi22 655a5cf790 all changes implemented 1 year ago
WaseemAbbasi22 8a9eabac2f improvements 1 year ago
WaseemAbbasi22 778bf30eb6 improvements 1 year ago
WaseemAbbasi22 501c78dc09 notifications implemented 1 year ago
WaseemAbbasi22 d3ed7e39c2 notification in progress 2 years ago
WaseemAbbasi22 7aed41380b notification in progress 2 years ago
Sikander Saleem dc9266a0da approval bottom sheet added. & improvements. 2 years ago
Sikander Saleem 58f5f6103a app red screen, on drawer & asset filter fixed. 2 years ago
Sikander Saleem c9ce003b29 bug fixed & 1.3.0+12 sent for UAT 2 years ago
Sikander Saleem f3695b90fb assistant employee improvements 2 years ago
Sikander Saleem f20929b1dc huawei integration added & code compatibility issues fix. 2 years ago
muhammad.abbasi 77d18bd413 add maintenance request completed 2 years ago
muhammad.abbasi 457455a1b5 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
2 years ago
muhammad.abbasi 0095facdf5 maintenance request flow in progress 2 years ago
Sikander Saleem e1aaa71ae7 spare part comment fix and improvement. 2 years ago
Sikander Saleem b76a0bc53a new file picker added. 2 years ago
Sikander Saleem 0ea7954c6a history log completed. 2 years ago
muhammad.abbasi e8dc052d02 integrating api in new flow 2 years 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
2 years ago
Sikander Saleem 0d333fa688 dashboard screen & service detail screen, flow changed. 2 years ago