 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 |
|
Sikander Saleem
|
00ba893bf2
|
fixes.
|
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
|
3e314447c6
|
Fix building, floor, room issue when edit sender or receiver
|
2 years ago |
|
zaid_daoud
|
fe1885b367
|
Fix asset destination issue
|
2 years ago |
|
zaid_daoud
|
0dd9400c91
|
Sorting gaz refill using mostRecent key
|
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 |
|
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
|
05d1976969
|
Make QR code searches for a specific elements which are equal to asset no.
|
2 years ago |
|
zaid_daoud
|
fd439a4f46
|
Track Asset Transfer [Most Recent]
|
2 years ago |
|
zaid_daoud
|
232713f841
|
Track Gaz Refills [Most Recent]
|
2 years ago |
|
zaid_daoud
|
0e95b32ecb
|
Service Request [Most Recent]
|
2 years ago |
|
zaid_daoud
|
0f9d4127b4
|
[SubWorkOrder]: Auto Filled Fields Depending on ParentId
|
2 years ago |
|
Sikander Saleem
|
1eaf9a21fa
|
asset transfer status fixed.
|
2 years ago |
|
nextwo
|
eee1b0dc51
|
fix bugs
|
2 years ago |
|
nextwo
|
798faf51a4
|
Merge branch 'zaid_development_new' into majd_development_new
|
2 years ago |
|
nextwo
|
b3c577d03e
|
fix bugs
|
2 years ago |
|
zaid_daoud
|
5aedb12004
|
Vendor Fields Have Been Added
|
2 years ago |
|
zaid_daoud
|
e32de37209
|
Improve most recent filter
|
2 years ago |
|
nextwo
|
f132004c11
|
remove expected date
|
2 years ago |
|
zaid_daoud
|
614426853b
|
[API doesn't support the required parameters] add search dialog to track asset transfer
|
2 years ago |
|
zaid_daoud
|
d80e28f706
|
gaz refill timer
|
2 years ago |
|
zaid_daoud
|
349ac7dba4
|
Simple Updates
|
2 years ago |
|
zaid_daoud
|
383c634c50
|
User departments in create new service request
|
2 years ago |
|
zaid_daoud
|
ac38159b0a
|
User Model Change
|
2 years ago |
|
zaid_daoud
|
b16ca9ce77
|
Improvements
|
2 years ago |
|
zaid_daoud
|
af1874600a
|
Improvements
|
2 years ago |
|
zaid_daoud
|
8184632ce7
|
Improvements
|
2 years ago |
|
zaid_daoud
|
6caab58171
|
Merge With Majd [part #2]
|
2 years ago |
|
zaid_daoud
|
984f46913a
|
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
# Conflicts:
# lib/models/visits/visits_search.dart
# lib/views/pages/device_transfer/device_transfer_details.dart
# lib/views/pages/user/gas_refill/request_gas_refill.dart
# lib/views/widgets/device_trancfer/device_transfer_info_section.dart
# lib/views/widgets/search/service_request_search_bar.dart
# lib/views/widgets/search/visits_search_bar.dart
|
2 years ago |
|
nextwo
|
be636bb18b
|
some changes
|
2 years ago |
|
zaid_daoud
|
60a2e372a3
|
Change To Powered By Cloud Solutions, and remove engineer name from the track device transfer info, in addition to merge with majd's branch
|
2 years ago |
|
zaid_daoud
|
bec9c38269
|
In track gas refill update:
- add timer for working hours.
- enable the engineer to add start and end date.
|
2 years ago |
|
zaid_daoud
|
3e79091d7e
|
In Update gas refill : add expected Date field and enable the engineer to updated.
|
2 years ago |
|
zaid_daoud
|
4b23db582a
|
Enhancement
|
2 years ago |
|
zaid_daoud
|
96c9515e87
|
Status for both sender and receiver is synchronized.
|
2 years ago |
|
zaid_daoud
|
11f95b9578
|
Search in service request, preventive maintenance, gas refill, and transfer to arrange the requests from most recent to earliestt
|
2 years ago |
|
zaid_daoud
|
21f7986fa4
|
1- Service Request Type for end user profile should be by default Maintenance Request and locked field.
2- Through field in new service request should be by default APP and locked or hidden.
3- Rename text to speech to speech to text.
|
2 years ago |
 Sikander Saleem
|
32652141b2
|
service status fix.
|
2 years ago |
|
zaid_daoud
|
0124918d29
|
status added to update service request
|
2 years ago |
|
Sikander Saleem
|
55cbf99264
|
Merge branch 'majd_development_new' into main_latest_merged
|
2 years ago |
|
Sikander Saleem
|
b8051a40fe
|
signature fixes
|
2 years ago |
|
nextwo
|
b40727b920
|
review comment
|
2 years ago |
|
Sikander Saleem
|
da286ea075
|
fixes
|
2 years ago |
|
nextwo
|
44654e1e38
|
some edits
|
2 years ago |
|
zaid_daoud
|
0563c545b5
|
Add Engineer Signature & Nurse Signature to Update Gas Refill
|
2 years ago |
|
zaid_daoud
|
ccf329798a
|
QR reader
|
2 years ago |
|
zaid_daoud
|
45b66e6b2a
|
Convert (Start Date & End Date) to Timer
|
2 years ago |
|
Sikander Saleem
|
147351bd10
|
add sub workorder fix
|
2 years ago |
|
Sikander Saleem
|
da911ea7ae
|
fixes
|
2 years ago |
|
Sikander Saleem
|
a2edcadc1a
|
edit work order added.
|
2 years ago |
|
zaid_daoud
|
8f05983c14
|
Ready For Testing
|
2 years ago |
|
zaid_daoud
|
575005ebdd
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
3010458cd8
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
ffaa340d9d
|
Enhancements
|
2 years ago |
|
nextwo
|
52eee5196f
|
work order
|
2 years ago |
|
nextwo
|
6db92bc08d
|
Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new
|
2 years ago |
|
zaid_daoud
|
342cf3968b
|
Fixing Bug
|
2 years ago |
|
nextwo
|
fea1f31474
|
Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new
# Conflicts:
# lib/views/pages/sub_workorder/create_sub_workorder_page.dart
# lib/views/pages/sub_workorder/workorder_details.dart
# lib/views/pages/sub_workorder/workorder_update.dart
|
2 years ago |
|
nextwo
|
73cc2143bc
|
work order
|
2 years ago |
|
zaid_daoud
|
19cee08954
|
Updating Search Work Order Model
|
2 years ago |
|
zaid_daoud
|
ebd9297646
|
Update Work order [Sub work orders]
|
2 years ago |
|
zaid_daoud
|
e2a2104087
|
Preparing the functionality [Still doesn't work]
|
2 years ago |
|
zaid_daoud
|
27d3a74d3b
|
Search Sub Work Order Screen DONE
|
2 years ago |
|
Sikander Saleem
|
b9263ae1d8
|
Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
# assets/subtitles/ar_subtitle.json
# assets/subtitles/en_subtitle.json
# lib/models/subtitle.dart
|
2 years ago |
|
zaid_daoud
|
dadc591fcf
|
Fixing Bug
|
2 years ago |
|
zaid_daoud
|
d470a19bef
|
Need some enhancements
|
2 years ago |
|
zaid_daoud
|
08841c7859
|
Update gas refill issue fixed
|
2 years ago |
|
Sikander Saleem
|
ffacf3949e
|
startdate, end date & working hours fixed.
|
2 years ago |
|
nextwo
|
1b7c1a3692
|
editing in working hours in update transfer device
|
2 years ago |
|
nextwo
|
8c0ef0acf0
|
transfer device + track transfer device
|
2 years ago |
|
zaid_daoud
|
7ed8f86ba2
|
Create Gas Refill Bug Fixed
|
2 years ago |
|
zaid_daoud
|
1381d54208
|
Create Gas Refill Bug Fixed
|
2 years ago |
|
zaid_daoud
|
83bf02e69f
|
Track Gaz Refill Done
|
2 years ago |
|
zaid_daoud
|
ee4498a55e
|
Date Time Fields (Gas Refill)
|
2 years ago |
|
Sikander Saleem
|
8e2b21bd9d
|
gas refill cont.
|
2 years ago |
|
Sikander Saleem
|
333c684670
|
improvements
|
2 years ago |
|
Sikander Saleem
|
13c5b3891a
|
equipment status added.
|
2 years ago |
|
Sikander Saleem
|
b4aac2a8b8
|
new work order, service type, fault description fixes
|
2 years ago |
|
zaid_daoud
|
47b1a0ff36
|
Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
# lib/controllers/providers/api/service_requests_provider.dart
# lib/models/service_report.dart
# lib/views/pages/user/requests/report/create_service_report.dart
|
2 years ago |
|
zaid_daoud
|
655f96049c
|
Fault Description Became a Dropdown Menu
|
2 years ago |
|
zaid_daoud
|
29466092b0
|
Service Type Became Read Only
|
2 years ago |
|
zaid_daoud
|
6d6c6c700c
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
a19bd39516
|
Enhancements on Add Work Order Screen
|
2 years ago |
|
zaid_daoud
|
c0f801c1c1
|
Review Comment in Add Work Order Screen
|
2 years ago |
|
Sikander Saleem
|
74b7fc4130
|
add work order improvements.
|
2 years ago |
|
Sikander Saleem
|
5d4da1961f
|
Merge remote-tracking branch 'origin/main_latest_merged' into main_latest_merged
|
2 years ago |
|
Sikander Saleem
|
c24353c9ea
|
work order fixes.
|
2 years ago |
|
Sikander Saleem
|
e20e99bebe
|
through fix.
|
2 years ago |
|
Sikander Saleem
|
29181aa965
|
Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
# assets/subtitles/en_subtitle.json
# lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart
# lib/models/subtitle.dart
# lib/views/pages/user/requests/report/create_service_report.dart
# lib/views/pages/user/requests/report/edit_service_report.dart
# lib/views/widgets/status/report/service_report_status.dart
|
2 years ago |
|
zaid_daoud
|
9346990626
|
Enhancemnets
|
2 years ago |
|
zaid_daoud
|
5f7bc0cf6e
|
Change service last calls API
|
2 years ago |
|
nextwo
|
8b7b40b0af
|
Merge branch 'main_latest_merged' into majd_development_new
# Conflicts:
# assets/subtitles/ar_subtitle.json
# assets/subtitles/en_subtitle.json
# lib/main.dart
# lib/models/service_request/service_request.dart
# lib/views/pages/splash_screen.dart
# lib/views/pages/user/notifications/notifications_page.dart
# lib/views/pages/user/profile_page.dart
# lib/views/pages/user/requests/create_request.dart
# lib/views/pages/user/requests/request_details.dart
# lib/views/pages/user/requests/requests_page.dart
# lib/views/widgets/equipment/auto_complete_devices_field.dart
# lib/views/widgets/equipment/single_device_picker.dart
|
2 years ago |
|
zaid_daoud
|
5945756e60
|
New Work Order Done (Unable to upload Engineer Signature)
|
2 years ago |
|
nextwo
|
756e2a1881
|
implement searchWorkOrders api and edit on ui
|
2 years ago |
|
nextwo
|
d869f82020
|
implement searchWorkOrders api and edit on ui
|
2 years ago |
|
zaid_daoud
|
62dcae610d
|
Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new
|
2 years ago |
|
zaid_daoud
|
7044cc8ff0
|
Enhancements
|
2 years ago |
|
zaid daoud
|
51c5bcc3a0
|
Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
# lib/views/widgets/equipment/single_device_picker.dart
|
2 years ago |
|
zaid_daoud
|
d0f083ce22
|
- Update Login API
- Adding Get Service Request By ID API
|
2 years ago |
|
zaid_daoud
|
a219d81ccc
|
Update Service Request Done
|
2 years ago |
|
zaid_daoud
|
a499889603
|
Add New Service Body Changed
|
2 years ago |
|
zaid_daoud
|
bdfa26411b
|
Add New Service Body Changed
|
2 years ago |
|
zaid_daoud
|
93f2378ec5
|
Update Service Request Date Still Has Issue
|
2 years ago |
|
nextwo
|
dad222f8fb
|
fix track device transfer issue
|
2 years ago |
|
zaid_daoud
|
e08fcc8b32
|
Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new
|
2 years ago |
|
zaid_daoud
|
81a6a515c4
|
Enhancements
|
2 years ago |
|
nextwo
|
1201a4d542
|
Merge branch 'main_latest_merged' into majd_development_new
|
3 years ago |
|
nextwo
|
12764a647c
|
pagintion + FIX BUGS
|
3 years ago |
|
zaid daoud
|
6fd1f53315
|
Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
# lib/views/pages/user/land_page.dart
|
3 years ago |
|
zaid_daoud
|
048774bd8c
|
Enhancements
|
3 years ago |
|
zaid_daoud
|
e25dc22bd0
|
Enhancements
|
3 years ago |
|
zaid_daoud
|
a33e4f4b7d
|
Preventive Maintenance Search Issue Fixed
|
3 years ago |
|
zaid_daoud
|
f7057f4827
|
Login Api Issue Fixed Manually
|
3 years ago |
 majd alattari
|
ca5e0fa9b4
|
Merge branch 'main_latest_merged' into 'majd_development_new'
# Conflicts:
# lib/controllers/providers/api/device_transfer_provider.dart
# lib/views/pages/user/land_page.dart
# lib/views/widgets/status/single_status_menu.dart
|
3 years ago |
|
nextwo
|
2c09cdb7e4
|
FIX BUGS
|
3 years ago |
|
zaid_daoud
|
1bf9d612ad
|
Fixing bugs
|
3 years ago |
|
nextwo
|
7b49f9f40e
|
FIX BUGS
|
3 years ago |
|
Sikander Saleem
|
363a46b97f
|
improvements
|
3 years ago |
|
Sikander Saleem
|
4f37bb9476
|
improvements.
|
3 years ago |