zaid_daoud
|
9ce5ca2f09
|
Improvements
|
2 years ago |
nextwo
|
1083aa6a8b
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
nextwo
|
746691c164
|
dark / ligth dark
|
2 years ago |
zaid_daoud
|
7fcf49df5c
|
Improvements
|
2 years ago |
zaid_daoud
|
eb8a9cc971
|
Improvements
|
2 years ago |
Sikander Saleem
|
ff80897a3c
|
dashboard apis added.
|
2 years ago |
Sikander Saleem
|
8a097a1ed6
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
nextwo
|
7666364083
|
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
|
4ec0b27afa
|
loclization
|
2 years ago |
Sikander Saleem
|
67a7fcfe54
|
improvements.
|
2 years ago |
zaid_daoud
|
d908fe1c9d
|
Weekly Calendar Design
|
2 years ago |
zaid_daoud
|
3af18cb884
|
Working On Calendar
|
2 years ago |
Sikander Saleem
|
c93e249519
|
improvement.
|
2 years ago |
Sikander Saleem
|
ba1b0ded40
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_en.arb
# lib/new_views/common_widgets/app_bottom_nav_bar.dart
# lib/new_views/pages/land_page/land_page.dart
# pubspec.yaml
|
2 years ago |
zaid_daoud
|
9f0de18ea6
|
Working On Calendar
|
2 years ago |
zaid_daoud
|
1091af7f23
|
Working On Calendar
|
2 years ago |
Sikander Saleem
|
49377d2418
|
calender cont.
|
2 years ago |
zaid_daoud
|
456dc4bd77
|
Testing Dashboard Chart
|
2 years ago |
Sikander Saleem
|
63cbbe48d1
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
Sikander Saleem
|
e3fbcae6d3
|
recent activities added.
|
2 years ago |
Sikander Saleem
|
fe624596a1
|
request fragment added on dashboard.
|
2 years ago |
zaid_daoud
|
fc4bfca61b
|
Fix preventive maintenance status colors
|
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
|
ce143947d1
|
Survey Screen Needs APIs to be DONE
|
2 years ago |
zaid_daoud
|
1ccb8cdcb4
|
Help Center Screen
|
2 years ago |
zaid_daoud
|
675572be40
|
Profile Screen DONE
|
2 years ago |
zaid_daoud
|
5e1d6517de
|
Change Notifications Screen Design DONE
|
2 years ago |
zaid_daoud
|
8226cd3702
|
Settings Screen 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
|
8541fce08f
|
PPM in progress
|
2 years ago |
zaid_daoud
|
2ebf36ca2f
|
Calibration Tool & PM Kit Design DONE
|
2 years ago |
Sikander Saleem
|
fd18e5d39c
|
dashboard cont
|
2 years ago |
zaid_daoud
|
3464666485
|
PPM TBS 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 |
zaid_daoud
|
3c91abf47d
|
Enhancement on Signature
|
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
|
8b63cee7c5
|
Update Work Order Screen DONE
|
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 |
zaid_daoud
|
18d0bdbd60
|
Fix Service Details Design
|
2 years ago |
Sikander Saleem
|
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 |
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
|
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 |
nextwo
|
985ab01bf0
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
2 years ago |
nextwo
|
cef6b1a77c
|
gas refill
|
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
|
39515c48ad
|
Merged
|
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
|
487b04514a
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/views/widgets/equipment/single_device_picker.dart
|
2 years ago |
Sikander Saleem
|
4ffe899ff9
|
asset list & detail screens, models, added.
|
2 years ago |
zaid_daoud
|
35b67d2cb5
|
_
|
2 years ago |
zaid_daoud
|
0c6f4d5156
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/views/widgets/sound/sound_player.dart
|
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
|
5b1e067a93
|
Pick asset screen design
|
2 years ago |
Sikander Saleem
|
c49b66a401
|
sound player color fix.
|
2 years ago |
zaid_daoud
|
7d2afa23cc
|
add record player to the recorder
|
2 years ago |
zaid_daoud
|
b4ea88e7db
|
_
|
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
|
0170c6f5cb
|
service request status color improvement.
|
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
|
ec4d4a9193
|
merge conflict resolved.
|
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 |
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 |
zaid_daoud
|
937c30736e
|
test
|
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 |