Commit Graph

891 Commits (b67e6dea11bc6a75a236f24916074191ca8a7cbc)

Author SHA1 Message Date
Sikander Saleem c6dcec4a3c test 1 year ago
WaseemAbbasi22 16c6640d9c bug fixes 1 year ago
WaseemAbbasi22 c1ec32fa33 bug fixes 1 year ago
WaseemAbbasi22 501c78dc09 notifications implemented 1 year ago
WaseemAbbasi22 d3ed7e39c2 notification in progress 1 year ago
WaseemAbbasi22 7aed41380b notification in progress 1 year ago
Sikander Saleem dc9266a0da approval bottom sheet added. & improvements. 1 year ago
muhammad.abbasi 388761a8aa ready for testing 1 year ago
muhammad.abbasi 3c03ef2e34 all fixed 1 year ago
WaseemAbbasi22 7ebd01d012 in progress 1 year ago
WaseemAbbasi22 abed426de2 in progress 1 year ago
WaseemAbbasi22 5ccdcd087a all the changes are implemented 1 year ago
WaseemAbbasi22 87e31978f5 Merge branch 'design_3.0_sdk_upgrade' into design_3.0_latest 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
Sikander Saleem 5d0b3b696a Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 1 year ago
Sikander Saleem 3633321d88 speech to text added on description field & improvements. 1 year ago
WaseemAbbasi22 3a27b9d6ca implement scan qr code and ask requester to verify flow 1 year ago
WaseemAbbasi22 4be1bd2e8a verify asset detail form changes 1 year ago
WaseemAbbasi22 da664e957b implement changes mentioned in testing document 1 year ago
WaseemAbbasi22 7f563e8292 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 1 year ago
WaseemAbbasi22 dacfefcc3e fixes 1 year ago
WaseemAbbasi22 310ec59917 history log time duration added 1 year ago
Sikander Saleem 60e971a240 language added. 1 year ago
WaseemAbbasi22 85a32238fb Merge branch 'schedule_local_notification' into design_3.0_fixes
# Conflicts:
#	lib/service_request_latest/utilities/service_request_utils.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/forms/maintenance_request/components/assistant_employee_card.dart
#	lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart
#	lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart
1 year ago
WaseemAbbasi22 010aaf9fe2 working hours issue fixed 1 year ago
WaseemAbbasi22 f45e0e4f80 verify asset detail card added on detail screen 1 year ago
Sikander Saleem 58f5f6103a app red screen, on drawer & asset filter fixed. 1 year ago
muhammad.abbasi e582072a83 improvements 1 year ago
Sikander Saleem 318ae666c1 completed request improvement. 1 year ago
muhammad.abbasi fbdbdf67a0 improvements 1 year ago
Sikander Saleem 0d9e119c32 improvements 1 year ago
Sikander Saleem c9ce003b29 bug fixed & 1.3.0+12 sent for UAT 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 6722e19cc5 spare part activity improvements 1 year ago
muhammad.abbasi f6b3c82fb3 activity status on sparepart activity and last situation in maintenance request added 1 year ago
muhammad.abbasi 0d2e8d63b7 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/components/action_button/footer_action_button.dart
#	lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart
1 year ago
muhammad.abbasi 8550fb98bf activity status on sparepart activity added. 1 year ago
Sikander Saleem 973c85418e code improvements & fixes. 1 year ago
muhammad.abbasi f65d5168de bottomsheet model reset while adding fixes 1 year ago
Sikander Saleem 01e0d054e6 code improvements. 1 year ago
muhammad.abbasi 1f30aec2ff verify arrival fixes 1 year ago
muhammad.abbasi 1655bab9ad verify arrival fixes 1 year ago
muhammad.abbasi b852b29a09 fix remotely working hours auto assign fixes 1 year ago
muhammad.abbasi 5d204687cc fix remotely working hours auto assign fixes 1 year ago
muhammad.abbasi 044eadaacc ready for initial testing 1 year ago
muhammad.abbasi 0dd4a0f254 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/models/new_models/work_order_detail_model.dart
1 year ago
muhammad.abbasi f1fe0b3339 edit maintenance request completed 1 year ago
Sikander Saleem 298a102f67 reorder activities added. 1 year ago
muhammad.abbasi 71d4ba43de add maintenance request completed 1 year ago
muhammad.abbasi 88b92d2d44 add maintenance request completed 1 year ago
muhammad.abbasi c2f4722bb3 add maintenance request completed 1 year ago
muhammad.abbasi 0b72f0b219 add maintenance request completed 1 year ago
muhammad.abbasi 77d18bd413 add maintenance request completed 1 year ago
Sikander Saleem 9628a6408e single dropdown loading fix. 1 year ago
Sikander Saleem 690b3822f5 code and logic improvements. 1 year ago
Sikander Saleem 40a96bad7c Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/extensions/widget_extensions.dart
1 year ago
Sikander Saleem c0afad329b improvement. 1 year 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
1 year ago
muhammad.abbasi 0095facdf5 maintenance request flow in progress 1 year ago
Sikander Saleem e1aaa71ae7 spare part comment fix and improvement. 1 year ago
Sikander Saleem 701455d939 ui and spare part improvement. 1 year ago
Sikander Saleem 3484859028 dashboard & workorder details bug fixes. 1 year ago
muhammad.abbasi b04cd1e042 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/new_views/pages/land_page/land_page.dart
1 year ago
muhammad.abbasi 34e54df40d intial testing fixes 1 year ago
Sikander Saleem c556f0dd87 requests improvements-1 1 year ago
Sikander Saleem a55ef11780 requests improvements 1 year ago
muhammad.abbasi ec34de11c5 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 1 year ago
muhammad.abbasi 473b26036e initial testing 1 year ago
Sikander Saleem b76a0bc53a new file picker added. 1 year ago
Sikander Saleem 2ec3b18231 dashboard status fragment only for engineer 1 year ago
muhammad.abbasi cc9b993de7 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/models/new_models/work_order_detail_model.dart
1 year ago
muhammad.abbasi c2b3288423 in progress 1 year ago
Sikander Saleem 0fa9173f01 history log improvement. 1 year ago
Sikander Saleem 0ea7954c6a history log completed. 1 year ago
muhammad.abbasi 58666916cc integrating api in new flow 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 c6d8c299f7 merge conflict resolve. 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
Sikander Saleem 0131297029 login screen improvement 1 year ago
muhammad.abbasi d99a083792 bug fixes 1 year ago
muhammad.abbasi bbcf093af3 update files to null seafty 1 year ago
muhammad.abbasi 1ce6f0f72c null seafty bug fixes 1 year ago
muhammad.abbasi a9ef3a827c null seafty 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