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
|
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 |
|
Sikander Saleem
|
0e30fef10c
|
work order list ui changed.
|
2 years ago |
|
Sikander Saleem
|
2d553b56e0
|
service request detail ui changed.
|
2 years ago |
|
nextwo
|
8f11ef577e
|
gas refill
|
2 years ago |
|
nextwo
|
64b249a0cd
|
gas refill
|
2 years ago |
|
Sikander Saleem
|
1ee58eeed9
|
merge conflict resolved.
|
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
|
1e1ac215ea
|
Rename asset to be device as it was before
|
2 years ago |
|
zaid_daoud
|
c7d6b68fd2
|
Change Asset & Asset Transfer models
|
2 years ago |
|
Sikander Saleem
|
392182e234
|
track service request cont.
|
2 years ago |
|
Sikander Saleem
|
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 |
|
Sikander Saleem
|
088e980b18
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
d1d83bb614
|
Fixing sub work order issue
|
2 years ago |
|
Sikander Saleem
|
5fc2aceecf
|
ppm disable edit on closed, gaz refill site fix, & print statements remove.
|
2 years ago |
|
Sikander Saleem
|
09f2ae32eb
|
improvements
|
2 years ago |
|
zaid_daoud
|
253ce67deb
|
Fixing sub work order issue
|
2 years ago |
|
zaid_daoud
|
9dca070121
|
add asset id to spare parts API
add attachments and signature to the sender & receiver info
|
2 years ago |
|
zaid_daoud
|
5c14375d6f
|
Fixing PPM issues
|
2 years ago |
|
zaid_daoud
|
50c551705f
|
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
|
2 years ago |
|
nextwo
|
91be46db22
|
confirm the call last situation has a part in some cases
add time in date picker, when first action is need a visit
disable update, edit workorder & create work order if status is a complete or closed
|
2 years ago |
|
zaid_daoud
|
3e314447c6
|
Fix building, floor, room issue when edit sender or receiver
|
2 years ago |
|
nextwo
|
a85ea2d799
|
Merge branch 'zaid_development_new' into majd_development_new
|
2 years ago |
|
nextwo
|
7d37d66e62
|
fix bugs
|
2 years ago |
|
Sikander Saleem
|
300bc0a1a6
|
improvements
|
2 years ago |
|
zaid_daoud
|
ea5738f705
|
Gas refill update reflected on the details screen
|
2 years ago |
|
zaid_daoud
|
f1bb4117e2
|
Add asset floor and room to create asset transfer screen
|
2 years ago |
|
zaid_daoud
|
05d3b7dd5d
|
department name shown in the gas refill details screen & the delivered quantity is reflected on the details screen
|
2 years ago |
|
zaid_daoud
|
58c5b434e2
|
Fault Desc Issue Fixed
|
2 years ago |
|
nextwo
|
8df2900254
|
Merge branch 'zaid_development_new' into majd_development_new
|
2 years ago |