b295256d66
When log out, it keeps loading ,
...
On asset transfer, on complete & close , dont show edit button,
Signature issue on update asset.
On calendar weekly swipe data calling issue.
Also on monthly
2 years ago
a602dbe2eb
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
29e414a703
user profile change added & improvements.
2 years ago
zaid_daoud
cd3d9e1455
Working on create sub work order screen
2 years ago
zaid_daoud
f07a70462a
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
15c98e873e
Enhancement
2 years ago
708e7c80d1
improvements.
2 years ago
ab83963c65
improvements
2 years ago
f8ba08a44b
ppm flow added.
2 years ago
7ecd90a556
gas refill flow added.
2 years ago
c96f611051
service request flow added & improvements
2 years ago
zaid_daoud
19ba1f9ad0
Enhancement
2 years ago
b51555c2f4
improvements.
2 years ago
4757c73737
dark / ligth dark
2 years ago
204305f705
dark / ligth dark
2 years ago
zaid_daoud
753d9577d5
Improvements
2 years ago
zaid_daoud
9ce5ca2f09
Improvements
2 years ago
zaid_daoud
eb8a9cc971
Improvements
2 years ago
4ec0b27afa
loclization
2 years ago
63cbbe48d1
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
fe624596a1
request fragment added on dashboard.
2 years ago
zaid_daoud
649ddf6c01
Fix preventive maintenance status colors
2 years ago
zaid_daoud
a5393b5a85
Fix loading issue in comments bottom sheet
2 years ago
zaid_daoud
37a9cd3cc9
service request comment done
2 years ago
zaid_daoud
675572be40
Profile Screen DONE
2 years ago
zaid_daoud
5e1d6517de
Change Notifications Screen Design DONE
2 years ago
b03f350a2c
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
2c9f2dce08
notifications api added.
2 years ago
zaid_daoud
a2e2d9ac12
Timer For Working Hours
2 years ago
258fb2c333
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/views/widgets/pentry/pentry_ppm_check_list_form.dart
2 years ago
zaid_daoud
932841cbef
PPM Done
2 years ago
zaid_daoud
2ebf36ca2f
Calibration Tool & PM Kit Design DONE
2 years ago
fd18e5d39c
dashboard cont
2 years ago
zaid_daoud
3464666485
PPM TBS DONE
2 years ago
zaid_daoud
3299c0c7a4
Working on ppm
2 years ago
f4afe5ca5a
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
9c43eab5db
device transfer
2 years ago
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
57abce1b75
device transfer
2 years ago
zaid_daoud
daa427bac2
Update Work Order Screen DONE
2 years ago
zaid_daoud
c3d6643ead
Enhancements
2 years ago
zaid_daoud
8b7aa8235d
Update Service Request DONE
2 years ago
8347afec6d
Merge branch 'main_latest_merged' into main_design2.0
...
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart
# lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
# lib/views/widgets/status/report/service_report_assistant_employee_menu.dart
2 years ago
98c68bfbf0
search work order by assigned employee fixed.
2 years ago
zaid_daoud
18d0bdbd60
Fix Service Details Design
2 years ago
c9f903fac8
urgent improvements.
2 years ago
zaid_daoud
477e6751aa
Enhancements
2 years ago
zaid_daoud
19845bd9d8
Enhancements
2 years ago
zaid_daoud
c281fba1ac
Enhancements
2 years ago
zaid_daoud
73d090cb9e
Edit wo only for eng
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
1daf9b4437
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
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
402f7513bd
First Action Bottom Sheet Done
2 years ago
zaid_daoud
32e54d6853
add [pm date range] & [equipment status] to asset filter
2 years ago
zaid_daoud
6258035a88
add room field to asset transfer
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
985ab01bf0
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
cef6b1a77c
gas refill
2 years ago
zaid_daoud
5cf84e6988
Change device class name to asset
2 years ago
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
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
d6de203ba0
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
4ffe899ff9
asset list & detail screens, models, added.
2 years ago
2604d8b253
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# pubspec.yaml
2 years ago
zaid_daoud
84c9efda5a
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_en.arb
2 years ago
zaid_daoud
e419b17bd1
Service request design done
2 years ago
0e30fef10c
work order list ui changed.
2 years ago
2d553b56e0
service request detail ui changed.
2 years ago
8f11ef577e
gas refill
2 years ago
64b249a0cd
gas refill
2 years ago
1ee58eeed9
merge conflict resolved.
2 years ago
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
7e17bd2558
localization i18 implementation
2 years ago
zaid_daoud
1e1ac215ea
Rename asset to be device as it was before
2 years ago
zaid_daoud
c7d6b68fd2
Change Asset & Asset Transfer models
2 years ago
392182e234
track service request cont.
2 years ago
150ad60de6
track service request
2 years ago
zaid_daoud
c66acbd1ee
Gas refill screen
2 years ago
zaid_daoud
ed759f5dcf
Still working on gas refill request
2 years ago
zaid_daoud
085674ee18
adding radio buttons for theme
2 years ago
zaid_daoud
bb1a516f0a
add the old route
2 years ago
zaid_daoud
a8e7d26355
Back to the old dashboard
2 years ago
zaid_daoud
3bdae42769
1- change text form field code
...
2- app bar design
3- working on request gas refill screen
2 years ago
zaid_daoud
a8a7b5a613
Activate light and dark theme
2 years ago
zaid_daoud
ca673787f1
1 -> New Way of Localizations
...
2 -> Implementing Login Page
3 -> New way to achieve responsive design
2 years ago
Sikander Saleem
f0c605b07d
improvements
2 years ago
Sikander Saleem
71ccd100b5
Merge branch 'zaid_development_new' into sikander-development
...
# Conflicts:
# lib/controllers/api_routes/urls.dart
2 years ago
zaid_daoud
630a4e1b9d
Add (mr number) field to the WO details bottom sheet
2 years ago
zaid_daoud
2d0c72b138
1- prevent the user from creating a new gas refill request if the department isn't selected.
...
2- working on host: https://atomsmdev.hmg.com
2 years ago
088e980b18
Merge branch 'zaid_development_new' into sikander-development
2 years ago
zaid_daoud
d1d83bb614
Fixing sub work order issue
2 years ago
5fc2aceecf
ppm disable edit on closed, gaz refill site fix, & print statements remove.
2 years ago
09f2ae32eb
improvements
2 years ago
nextwo
Sikander Saleem
zaid_daoud
Sikander Saleem