 WaseemAbbasi22
|
c5d3eead2d
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
9 months ago |
|
WaseemAbbasi22
|
8c9b1b3c46
|
missing attributes added for recurrent task
|
9 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
|
9 months ago |
|
Sikander Saleem
|
2cd5777f55
|
ppm model improvement.
|
9 months ago |
|
WaseemAbbasi22
|
7b620b9f6e
|
Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
|
9 months ago |
|
WaseemAbbasi22
|
ce1044f201
|
timer and working hours issue fixes
|
9 months ago |
|
Sikander Saleem
|
0a8b3314ce
|
unsafe device added, swipe only added, force update added,
|
9 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
|
9 months ago |
|
WaseemAbbasi22
|
d181c81029
|
save and complete api integrated for recurrent task
|
9 months ago |
|
WaseemAbbasi22
|
99bcae1dc2
|
recurrent task api integrated
|
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 |
|
Sikander Saleem
|
a498a229d1
|
install and return qty added on spare part edit.
|
11 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
|
da664e957b
|
implement changes mentioned in testing document
|
1 year ago |
|
WaseemAbbasi22
|
310ec59917
|
history log time duration 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 |
|
muhammad.abbasi
|
e582072a83
|
improvements
|
1 year ago |
|
muhammad.abbasi
|
fbdbdf67a0
|
improvements
|
1 year ago |
|
Sikander Saleem
|
0d9e119c32
|
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
|
f20929b1dc
|
huawei integration added & code compatibility issues fix.
|
1 year ago |
|
muhammad.abbasi
|
f6b3c82fb3
|
activity status on sparepart activity and last situation in maintenance request added
|
1 year ago |
|
muhammad.abbasi
|
8550fb98bf
|
activity status on sparepart activity added.
|
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
|
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
|
473b26036e
|
initial testing
|
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 |
|
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 |
Muhammad Abbasi
|
246bb1fb55
|
pagination added
|
1 year ago |
|
Sikander Saleem
|
a1941511a0
|
call comments are mandatory now.
|
1 year ago |
|
Sikander Saleem
|
da442df2bb
|
pending asset requests new parameter added.
|
1 year ago |
nextwo
|
49a6ac8996
|
add oracle code parameter
|
1 year ago |
|
nextwo
|
7ef71849dd
|
comment unused files
|
1 year ago |
|
Sikander Saleem
|
5348bc81eb
|
sub work order improvements.
|
1 year ago |
|
nextwo
|
1f18dcadb7
|
majd
|
1 year ago |
|
nextwo
|
b792585810
|
add timer list in asset transfer for sender and receiver
|
1 year ago |
|
nextwo
|
67854d2e8c
|
add timer list in asset transfer for sender and receiver
|
1 year ago |
|
Sikander Saleem
|
8273537b00
|
create supplier engineer functionality added.
|
1 year ago |
|
Sikander Saleem
|
e212cf75b1
|
ppm multi timer added.
|
1 year ago |
|
Sikander Saleem
|
494087ef18
|
update service request & work order attachment issue fix.
|
1 year ago |
|
Sikander Saleem
|
06cee34657
|
first action fixed remotely, start & end date added.
|
1 year ago |
|
Sikander Saleem
|
f3b432d0c1
|
ppm external supplier fields added. & improvements.
|
1 year ago |
 Sikander Saleem
|
d50f711aec
|
archived cont.
|
1 year ago |
|
Sikander Saleem
|
ae8991493b
|
supplier added on ppm update, cont.
|
1 year ago |
|
Sikander Saleem
|
7b6b170f23
|
requester info added.
|
1 year ago |
|
Sikander Saleem
|
9c7653109d
|
request search improvements
|
1 year ago |
|
Sikander Saleem
|
d6c3fc2778
|
head nurse role added, pending asset service requests added & AssetGroup header added.
|
2 years ago |
|
Sikander Saleem
|
9f7a9acede
|
asset room model fix
|
2 years ago |
|
Sikander Saleem
|
c7e2736bd8
|
department name issue fixed on login
|
2 years ago |
|
Sikander Saleem
|
ebef7a7d81
|
loan availability added.
|
2 years ago |
|
Sikander Saleem
|
caa1f975ab
|
ppm timer & receiver name fixed.
|
2 years ago |
|
Sikander Saleem
|
adba86b10e
|
snag list remaining 4 points resolved & improvements.
|
2 years ago |
|
Sikander Saleem
|
58f5fbab5e
|
push notifications added.
|
2 years ago |
|
Sikander Saleem
|
d217500df4
|
improvements
|
2 years ago |
|
Sikander Saleem
|
7db4bca3b2
|
receiver name added on transfer detail
|
2 years ago |
|
Sikander Saleem
|
a6dd802321
|
receiver name added on new transfer request & improvements
|
2 years ago |
|
Sikander Saleem
|
5d706d89b4
|
service type added.
|
2 years 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 |
|
nextwo
|
d3bee4f39a
|
gas refill comments
|
2 years ago |
 zaid_daoud
|
08ada0c275
|
Spare parts became mandatory only if the callLastSituation is [PART INSTALLATION (id = 12)]
|
2 years ago |
|
zaid_daoud
|
7200efcbca
|
ppm issues fixed & code formatting
|
2 years ago |
|
zaid_daoud
|
67a224f60a
|
fix timer issue on update transfer asset & update gas refill
|
2 years ago |
|
zaid_daoud
|
58e6118cff
|
change function name
|
2 years ago |
|
zaid_daoud
|
c8a02c828d
|
Search for requests by single item.
|
2 years ago |
|
zaid_daoud
|
2ac79188d9
|
change some labels
|
2 years ago |
|
Sikander Saleem
|
593cecbe55
|
improvements
|
2 years ago |
|
zaid_daoud
|
af17525c3c
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
27fec0183f
|
Enhancements on search and filter reset button
|
2 years ago |
|
zaid_daoud
|
51ef873770
|
Reformatting code
|
2 years ago |
|
zaid.daoud
|
5bf73172f6
|
Previous Business Logic in Work order & sub work order
|
2 years ago |
|
zaid_daoud
|
a403fb0028
|
Device Transfer Issued Fixed For Sender & Receiver
|
2 years ago |
|
zaid_daoud
|
042d7df708
|
Sub work order screen done
|
2 years ago |
|
zaid_daoud
|
884471009a
|
Sub work order screen under testing
|
2 years ago |
|
Sikander Saleem
|
31b0eaeb2e
|
asset image fixed.
|
2 years ago |
|
Sikander Saleem
|
29e414a703
|
user profile change added & improvements.
|
2 years ago |
|
zaid_daoud
|
4cf650702f
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_en.arb
|
2 years ago |
|
zaid_daoud
|
dbb26d8cd4
|
Filter Requests DONE
|
2 years ago |
|
Sikander Saleem
|
c6115e5938
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
|
Sikander Saleem
|
c96f611051
|
service request flow added & improvements
|
2 years ago |
|
zaid_daoud
|
cc089d917f
|
simple change
|
2 years ago |
|
zaid_daoud
|
e29946e280
|
Search All Requests Done
|
2 years ago |
|
zaid_daoud
|
affb486fbd
|
Calendar API done
|
2 years ago |
|
Sikander Saleem
|
af5144ffa3
|
all request details model updated.
|
2 years ago |
|
Sikander Saleem
|
ff80897a3c
|
dashboard apis added.
|
2 years ago |
|
zaid_daoud
|
37a9cd3cc9
|
service request comment done
|
2 years ago |
|
Sikander Saleem
|
b03f350a2c
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
|
Sikander Saleem
|
2c9f2dce08
|
notifications api added.
|
2 years ago |
|
zaid_daoud
|
a2e2d9ac12
|
Timer For Working Hours
|
2 years ago |
|
zaid_daoud
|
932841cbef
|
PPM Done
|
2 years ago |
|
nextwo
|
9c43eab5db
|
device transfer
|
2 years ago |
|
nextwo
|
a85d8f4880
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
|
2 years ago |
|
nextwo
|
57abce1b75
|
device transfer
|
2 years ago |
|
zaid_daoud
|
7a06f251be
|
Create New Work Order Done
|
2 years ago |
|
zaid_daoud
|
743bb28b1d
|
Create New Work Order Done
|
2 years ago |
|
nextwo
|
1daf9b4437
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
|
nextwo
|
62f6f135bb
|
device transfer
|
2 years ago |
|
zaid_daoud
|
43b2f18a1a
|
New Work Order [In Progress]
|
2 years ago |
|
zaid_daoud
|
e407b00630
|
New Work Order [In Progress]
|
2 years ago |
|
zaid_daoud
|
ee16e35485
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
|
zaid_daoud
|
fb3f442ed5
|
asset search done & filter assets need to be discussed
|
2 years ago |
|
nextwo
|
985ab01bf0
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
|
zaid_daoud
|
5cf84e6988
|
Change device class name to asset
|
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
|
957e3d9e6f
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_en.arb
|
2 years ago |
|
zaid_daoud
|
3959068858
|
Asset Transfer Done + Multiple Image Picker + Enhancements
|
2 years ago |
|
nextwo
|
d6de203ba0
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
|
Sikander Saleem
|
4ffe899ff9
|
asset list & detail screens, models, added.
|
2 years ago |
|
nextwo
|
2604d8b253
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# pubspec.yaml
|
2 years ago |
|
zaid_daoud
|
e419b17bd1
|
Service request design done
|
2 years ago |
|
nextwo
|
64b249a0cd
|
gas refill
|
2 years ago |
|
Sikander Saleem
|
eaa9bb62ee
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# assets/translations/ar.json
# lib/views/widgets/equipment/pick_asset.dart
|
2 years ago |