Commit Graph

329 Commits (c5d3eead2daa73eb57248904f9a68d23994f48d9)

Author SHA1 Message Date
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 1 year ago
WaseemAbbasi22 ce1044f201 timer and working hours issue fixes 1 year ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 1 year 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
1 year ago
WaseemAbbasi22 d181c81029 save and complete api integrated for recurrent task 1 year ago
WaseemAbbasi22 99bcae1dc2 recurrent task api integrated 1 year ago
WaseemAbbasi22 c15cec364d Gas refill and Asset Transfer attributes addition done 1 year ago
WaseemAbbasi22 b5bfb3c0c0 arrival bottomsheet dismiss fixes and add check for next step value 1 year 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 657526736c add reminder to device calendar fixes 1 year ago
Sikander Saleem dbea53734b Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 1 year ago
WaseemAbbasi22 904f1919d4 all changes implemented 1 year ago
Sikander Saleem d898dda015 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/components/verify_arrival_view.dart
1 year ago
WaseemAbbasi22 78ebf9e60d improvements 1 year ago
Sikander Saleem c6dcec4a3c test 1 year ago
WaseemAbbasi22 c1ec32fa33 bug fixes 1 year ago
WaseemAbbasi22 501c78dc09 notifications implemented 1 year ago
WaseemAbbasi22 7aed41380b notification in progress 1 year ago
WaseemAbbasi22 4c9a730e24 all the changes are implemented 1 year ago
WaseemAbbasi22 38ce0bd9a0 Merge branch 'design_3.0_fixes' into design_3.0_latest
# Conflicts:
#	lib/dashboard_latest/dashboard_provider.dart
#	lib/dashboard_latest/widgets/request_category_fragment.dart
#	lib/dashboard_latest/widgets/requests_fragment.dart
#	lib/extensions/enum_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/models/new_models/arrival_verification_type_model.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/service_request_latest/service_request_detail_provider.dart
#	lib/service_request_latest/utilities/service_request_utils.dart
#	lib/service_request_latest/views/components/action_button/footer_action_button.dart
#	lib/service_request_latest/views/components/activities_list_view.dart
#	lib/service_request_latest/views/components/service_request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart
#	lib/service_request_latest/views/service_request_detail_main_view.dart
1 year ago
WaseemAbbasi22 3a27b9d6ca implement scan qr code and ask requester to verify flow 1 year ago
muhammad.abbasi e582072a83 improvements 1 year ago
muhammad.abbasi fbdbdf67a0 improvements 1 year ago
Sikander Saleem 426d47b64c Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart
#	lib/views/widgets/status/assistant_employee_menu.dart
#	lib/views/widgets/status/report/service_report_assistant_employee_menu.dart
1 year ago
muhammad.abbasi 8b0bf4bedc timer implemented 1 year ago
Sikander Saleem f3695b90fb assistant employee improvements 1 year ago
Sikander Saleem f20929b1dc huawei integration added & code compatibility issues fix. 1 year ago
Sikander Saleem 973c85418e code improvements & fixes. 1 year ago
muhammad.abbasi f1fe0b3339 edit maintenance request completed 1 year ago
muhammad.abbasi 77d18bd413 add maintenance request completed 1 year ago
muhammad.abbasi 0095facdf5 maintenance request flow in progress 1 year ago
muhammad.abbasi 34e54df40d intial testing fixes 1 year ago
muhammad.abbasi c2b3288423 in progress 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 53c5240377 ui fixes 1 year ago
muhammad.abbasi 68a8dc250f bug fixes 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