nextwo
|
2604d8b253
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# pubspec.yaml
|
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
|
e419b17bd1
|
Service request design done
|
2 years ago |
|
Sikander Saleem
|
2d553b56e0
|
service request detail ui changed.
|
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 |
|
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 |
|
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
|
085674ee18
|
adding radio buttons for theme
|
2 years ago |
|
Sikander Saleem
|
3df1bf70ca
|
improvements
|
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
|
5fc2aceecf
|
ppm disable edit on closed, gaz refill site fix, & print statements remove.
|
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
|
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
|
1c9101d8ab
|
Fix pm entry empty values when scroll
|
2 years ago |
|
zaid_daoud
|
a26684de11
|
Device Status in PM Entry
|
2 years ago |
|
Sikander Saleem
|
6e0ff34499
|
improvements
|
2 years ago |
|
zaid_daoud
|
58c5b434e2
|
Fault Desc Issue Fixed
|
2 years ago |
|
zaid_daoud
|
2384bab11f
|
Fault Desc Issue Fixed
|
2 years ago |
|
Sikander Saleem
|
d63a18226a
|
ppm attachments fix
|
2 years ago |
|
zaid_daoud
|
0950639c22
|
Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new
|
2 years ago |
|
zaid_daoud
|
fe9ca387ed
|
Multiple Images Everywhere
|
2 years ago |
|
Sikander Saleem
|
830bf6e5e6
|
first action improvement.
|
2 years ago |
|
Sikander Saleem
|
da339c68f4
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
Sikander Saleem
|
c9705e0b74
|
attachments improvements.
|
2 years ago |
|
zaid_daoud
|
6d6fc30806
|
Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new
|
2 years ago |
|
Sikander Saleem
|
8624515433
|
local & network files opener added.
|
2 years ago |
|
zaid_daoud
|
19cd20c645
|
1- Fix Vendor Engineer Issue
2- Add Install Qty & Return Qty
|
2 years ago |
|
Sikander Saleem
|
90aabebe12
|
calling api to get complete data for service request to show attachments and voice notes. & improvements
|
2 years ago |
|
zaid_daoud
|
ad48521170
|
Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new
|
2 years ago |
|
zaid_daoud
|
0b46974c47
|
Change Pick Image to Pick File
|
2 years ago |
|
Sikander Saleem
|
f3349b0209
|
improvements.
|
2 years ago |
|
zaid_daoud
|
05d1976969
|
Make QR code searches for a specific elements which are equal to asset no.
|
2 years ago |
|
zaid_daoud
|
5f842068a4
|
Track Asset Transfer [Most Recent]
|
2 years ago |
|
zaid_daoud
|
fd439a4f46
|
Track Asset Transfer [Most Recent]
|
2 years ago |
|
zaid_daoud
|
d277a28f54
|
Activate Attachment Picker Dialog with a New Field (Pick From Files)
|
2 years ago |
|
Sikander Saleem
|
1eaf9a21fa
|
asset transfer status fixed.
|
2 years ago |
|
zaid_daoud
|
6c2480edd2
|
stop loading on null values
|
2 years ago |
|
Sikander Saleem
|
cb093e0be1
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
bfacfc68e2
|
fix
|
2 years ago |
|
Sikander Saleem
|
91d6b686c7
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
bc3696cd1e
|
loading when fault description is null or empty
|
2 years ago |