 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
|
f8ba08a44b
|
ppm flow added.
|
2 years ago |
|
Sikander Saleem
|
7ecd90a556
|
gas refill flow added.
|
2 years ago |
|
zaid_daoud
|
e29946e280
|
Search All Requests Done
|
2 years ago |
|
Sikander Saleem
|
34bae463b6
|
improvements.
|
2 years ago |
|
Sikander Saleem
|
3725adb0aa
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_en.arb
# lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart
|
2 years ago |
|
Sikander Saleem
|
6d0aa0e17c
|
my requests added.
|
2 years ago |
|
zaid_daoud
|
affb486fbd
|
Calendar API done
|
2 years ago |
|
Sikander Saleem
|
29d83101af
|
statuses & date added.
|
2 years ago |
|
Sikander Saleem
|
ff80897a3c
|
dashboard apis added.
|
2 years ago |
|
Sikander Saleem
|
67a7fcfe54
|
improvements.
|
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 |
|
Sikander Saleem
|
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
|
3299c0c7a4
|
Working on ppm
|
2 years ago |
|
Sikander Saleem
|
f4afe5ca5a
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
nextwo
|
9c43eab5db
|
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 |
|
Sikander Saleem
|
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 |
|
Sikander Saleem
|
98c68bfbf0
|
search work order by assigned employee fixed.
|
2 years ago |
|
Sikander Saleem
|
c9f903fac8
|
urgent improvements.
|
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
|
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 |
|
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 |
|
Sikander Saleem
|
4ffe899ff9
|
asset list & detail screens, models, added.
|
2 years ago |
|
zaid_daoud
|
e419b17bd1
|
Service request design done
|
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 |
|
zaid_daoud
|
4bffab9c9b
|
Request Gas refill screen Done
|
2 years ago |
|
zaid_daoud
|
b673cd8a2b
|
Gas refill screen
|
2 years ago |
|
zaid_daoud
|
b77a36ac50
|
Gas refill screen
|
2 years ago |
|
zaid_daoud
|
ed759f5dcf
|
Still working on gas refill request
|
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 |