Sikander Saleem
|
f50ede8321
|
Merge remote-tracking branch 'origin/demo_branch' into demo_branch
# Conflicts:
# lib/views/pages/user/gas_refill/gas_refill_form.dart
|
7 months ago |
 WaseemAbbasi22
|
71ee34c658
|
gas refill attachment and device transfer assistant employee issue fixes
|
7 months ago |
|
Sikander Saleem
|
015b73b634
|
ponit 87 fixed.
|
7 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
|
7 months ago |
|
WaseemAbbasi22
|
5031c3cbb8
|
gas refill fixes
|
7 months ago |
|
WaseemAbbasi22
|
4954549594
|
bug fixes for workorder detail view
|
7 months 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
|
7 months ago |
|
WaseemAbbasi22
|
a66215ef8b
|
bug fixes
|
7 months ago |
|
Sikander Saleem
|
99ef704913
|
rename points done
|
7 months ago |
|
WaseemAbbasi22
|
6bd888e06a
|
Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
|
8 months ago |
|
WaseemAbbasi22
|
152a0795c6
|
add and update gas refill ui and api integrated
|
8 months ago |
|
Sikander Saleem
|
4a7f1eb037
|
ppm improvement, recurrent task improvement
|
8 months ago |
|
WaseemAbbasi22
|
3f90630db9
|
gas refill and asset transfer ui completed waiting for api
|
8 months ago |
|
Sikander Saleem
|
8d9de6ce1a
|
history log improvement added.
|
9 months ago |
|
Sikander Saleem
|
4c328b2cba
|
recurrent task timer improvements.
|
9 months ago |
|
WaseemAbbasi22
|
c15cec364d
|
Gas refill and Asset Transfer attributes addition done
|
9 months ago |
|
Sikander Saleem
|
27097956cb
|
gas quantity field change to dropdown
|
9 months ago |
|
WaseemAbbasi22
|
a5876ec1d3
|
swipe module added
|
10 months ago |
|
WaseemAbbasi22
|
ba50ed5809
|
add swipe and forget password apis
|
10 months ago |
|
WaseemAbbasi22
|
3787bb26e4
|
testing issues fixed
|
11 months ago |
|
WaseemAbbasi22
|
904f1919d4
|
all changes implemented
|
12 months ago |
|
WaseemAbbasi22
|
c1ec32fa33
|
bug fixes
|
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 |
|
WaseemAbbasi22
|
4be1bd2e8a
|
verify asset detail form changes
|
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 |
|
muhammad.abbasi
|
e582072a83
|
improvements
|
1 year ago |
|
muhammad.abbasi
|
fbdbdf67a0
|
improvements
|
1 year ago |
|
Sikander Saleem
|
0d9e119c32
|
improvements
|
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
|
77d18bd413
|
add maintenance request completed
|
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
|
3484859028
|
dashboard & workorder details bug fixes.
|
1 year ago |
|
muhammad.abbasi
|
c2b3288423
|
in progress
|
1 year ago |
|
muhammad.abbasi
|
e8dc052d02
|
integrating api in new flow
|
1 year ago |
|
Sikander Saleem
|
0d333fa688
|
dashboard screen & service detail screen, flow changed.
|
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 |
|
muhammad.abbasi
|
f257fbadfa
|
new Api models and provider added
|
1 year ago |
|
Sikander Saleem
|
7d0a2eb65c
|
sdk upgrade changes.
|
1 year ago |
|
Sikander Saleem
|
4d0b18b5a8
|
room model & gas refill request number added.
|
2 years ago |
|
Sikander Saleem
|
2932796068
|
asset transfer room model & comment added
|
2 years ago |
|
Sikander Saleem
|
6bb2b81ac3
|
improvements & fixes
|
2 years ago |
 zaid_daoud
|
7200efcbca
|
ppm issues fixed & code formatting
|
2 years ago |
|
zaid_daoud
|
af17525c3c
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
51ef873770
|
Reformatting code
|
2 years ago |
|
zaid_daoud
|
884471009a
|
Sub work order screen under testing
|
2 years ago |
|
Sikander Saleem
|
29e414a703
|
user profile change added & improvements.
|
2 years ago |
|
zaid_daoud
|
a2e2d9ac12
|
Timer For Working Hours
|
2 years ago |
|
zaid_daoud
|
e407b00630
|
New Work Order [In Progress]
|
2 years ago |
nextwo
|
e21bde0153
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
# lib/new_views/common_widgets/single_item_drop_down_menu.dart
|
2 years ago |
|
nextwo
|
4cc12691ac
|
gas refill
|
2 years ago |
|
zaid_daoud
|
3959068858
|
Asset Transfer Done + Multiple Image Picker + Enhancements
|
2 years ago |
|
Sikander Saleem
|
47b863c479
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/main.dart
# lib/new_views/common_widgets/app_floating_action_button.dart
# lib/new_views/common_widgets/app_text_form_field.dart
# lib/new_views/pages/new_gas_refill_request_page.dart
# lib/new_views/pages/new_service_request_page.dart
# lib/views/pages/device_transfer/device_transfer_details.dart
# lib/views/pages/device_transfer/update_device_transfer.dart
# lib/views/pages/user/requests/create_request.dart
# lib/views/pages/user/requests/request_details.dart
# lib/views/widgets/device_trancfer/device_transfer_info_section.dart
# lib/views/widgets/device_trancfer/device_transfer_item.dart
# lib/views/widgets/device_trancfer/device_transfer_list.dart
# lib/views/widgets/equipment/auto_complete_devices_field.dart
# lib/views/widgets/equipment/auto_complete_models_field.dart
# lib/views/widgets/equipment/device_button.dart
# lib/views/widgets/equipment/device_item.dart
# lib/views/widgets/equipment/single_device_picker.dart
# lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
# lib/views/widgets/requests/service_request_item.dart
# lib/views/widgets/search/asset_transfer_search_dialog.dart
|
2 years ago |
|
Sikander Saleem
|
7e17bd2558
|
localization i18 implementation
|
2 years ago |
|
zaid_daoud
|
c7d6b68fd2
|
Change Asset & Asset Transfer models
|
2 years ago |
|
zaid_daoud
|
b77a36ac50
|
Gas refill screen
|
2 years ago |
|
zaid_daoud
|
b1e93abf4d
|
Gas refill design without submit button
|
2 years ago |
|
zaid_daoud
|
ed759f5dcf
|
Still working on gas refill request
|
2 years ago |