Commit Graph

290 Commits (015b73b634b29c7927b31e4092a47d9a24d20e2b)

Author SHA1 Message Date
Sikander Saleem 015b73b634 ponit 87 fixed. 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