Sikander Saleem
26b82fbda0
attachment added on transfer request.
2 years ago
Sikander Saleem
cda5b5cbe5
ppm request no & report status changed
2 years ago
Sikander Saleem
7db4bca3b2
receiver name added on transfer detail
2 years ago
Sikander Saleem
a6dd802321
receiver name added on new transfer request & improvements
2 years ago
Sikander Saleem
c25862b98d
improvement
2 years ago
Sikander Saleem
4d0b18b5a8
room model & gas refill request number added.
2 years ago
Sikander Saleem
2932796068
asset transfer room model & comment added
2 years ago
Sikander Saleem
162ebd38be
gas & transfer request status on open improvement.
2 years ago
Sikander Saleem
88108686d0
sender & receiver transfer fix.
2 years ago
Sikander Saleem
6bb2b81ac3
improvements & fixes
2 years ago
Sikander Saleem
a7f5fcb911
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
8079646728
timer on device transfer,
2 years ago
nextwo
6b740549a5
my requests pagination + Sender only close sender request Sender,
...
Receiver can do both jobs, sender & receiver.
2 years ago
zaid_daoud
23700d0adf
Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT)
2 years ago
zaid_daoud
9e2baae2e2
Change Chart Design && Update dark theme colors
2 years ago
zaid_daoud
04da316440
Fix Asset Filter Pagination Issue
2 years ago
zaid_daoud
9971416f6f
Enhancements
2 years ago
zaid_daoud
5b9a33c519
Enhancements on Assets Filter
2 years ago
zaid_daoud
2a2142adb3
Enhancements on Assets Filter
2 years ago
zaid_daoud
5eb1ab2755
Enhancements
2 years ago
zaid_daoud
82720bf831
Enhancements
2 years ago
zaid_daoud
cb658f0e60
Enhancements on search and filter reset button
2 years ago
zaid_daoud
51ef873770
Reformatting code
2 years ago
nextwo
81afa14ffc
When we have filters, add reset button.
2 years ago
nextwo
7966378016
When we have filters, add reset button.
2 years ago
zaid_daoud
a403fb0028
Device Transfer Issued Fixed For Sender & Receiver
2 years ago
Sikander Saleem
09f24edb35
eSignature fixed,
2 years ago
nextwo
0a699fe33b
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
884471009a
Sub work order screen under testing
2 years ago
nextwo
b295256d66
When log out, it keeps loading ,
...
On asset transfer, on complete & close , dont show edit button,
Signature issue on update asset.
On calendar weekly swipe data calling issue.
Also on monthly
2 years ago
Sikander Saleem
ab83963c65
improvements
2 years ago
nextwo
4757c73737
dark / ligth dark
2 years ago
nextwo
204305f705
dark / ligth dark
2 years ago
zaid_daoud
9ce5ca2f09
Improvements
2 years ago
zaid_daoud
a2e2d9ac12
Timer For Working Hours
2 years ago
nextwo
9c43eab5db
device transfer
2 years ago
nextwo
57abce1b75
device transfer
2 years ago
nextwo
62f6f135bb
device transfer
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
fb3f442ed5
asset search done & filter assets need to be discussed
2 years ago
zaid_daoud
5cf84e6988
Change device class name to asset
2 years ago
zaid_daoud
3959068858
Asset Transfer Done + Multiple Image Picker + Enhancements
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
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
Sikander Saleem
300bc0a1a6
improvements
2 years ago
zaid_daoud
f1bb4117e2
Add asset floor and room to create asset transfer screen
2 years ago
Sikander Saleem
1eaf9a21fa
asset transfer status fixed.
2 years ago
Sikander Saleem
07c8acf3a3
improvement
2 years ago
zaid_daoud
90fe4e76b7
Asset Transfer Search Dialog Done
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
13d4b71128
sender & receiver issue
2 years ago
zaid_daoud
af1874600a
Improvements
3 years ago
Sikander Saleem
c14aaceb5e
rename device with asset
3 years ago
zaid_daoud
6caab58171
Merge With Majd [part #2 ]
3 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
3 years ago
nextwo
be636bb18b
some changes
3 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
3 years ago
zaid_daoud
460c3138fd
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/visits/visit_details.dart
# lib/views/widgets/search/service_request_search_bar.dart
# lib/views/widgets/search/visits_search_bar.dart
3 years ago
nextwo
c393f29829
some changes
3 years ago
zaid_daoud
ca114f5cf8
the receiver engineer can edit information for both sender and receiver
3 years ago
zaid_daoud
96c9515e87
Status for both sender and receiver is synchronized.
3 years ago
zaid_daoud
11f95b9578
Search in service request, preventive maintenance, gas refill, and transfer to arrange the requests from most recent to earliestt
3 years ago
zaid_daoud
4d548e1048
In Asset Transfer request add Destination label under pick asset
3 years ago
zaid_daoud
ff9cb5102c
Solution #2 : View the site and department of picked asset
3 years ago
zaid_daoud
fc52f7ec30
View the site and department of picked asset
3 years ago
zaid_daoud
5941a421e2
Not Required Solution
3 years ago
zaid_daoud
8df2edd55f
Rename Transfer Device to Transfer Asset
3 years ago
zaid_daoud
4997e1e3df
Timer Fixed
3 years ago
Sikander Saleem
b8051a40fe
signature fixes
3 years ago
Sikander Saleem
8ada0dd0af
fixes-1
3 years ago
zaid_daoud
5890835f7b
Simple Changes
3 years ago
Sikander Saleem
be6a418bb6
sender & receiver transfer edit login update & fixes
3 years ago
nextwo
44654e1e38
some edits
3 years ago
zaid_daoud
b97d6e4283
- on deivce transfer list screen, add asset number.
...
- on deivce transfer details screen, add asset name on 2nd position.
- on deivce transfer details screen, add asset serial number.
- on deivce transfer details screen, rename title to transfer id.
- on deivce transfer details screen, name unit to department.
3 years ago
zaid_daoud
45b66e6b2a
Convert (Start Date & End Date) to Timer
3 years ago
Sikander Saleem
da911ea7ae
fixes
3 years ago
Sikander Saleem
ffacf3949e
startdate, end date & working hours fixed.
3 years ago
nextwo
1b7c1a3692
editing in working hours in update transfer device
3 years ago
nextwo
8c0ef0acf0
transfer device + track transfer device
3 years ago
nextwo
b51ee155c0
track transfer complete
3 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
3 years ago
nextwo
756e2a1881
implement searchWorkOrders api and edit on ui
3 years ago
zaid daoud
51c5bcc3a0
Merge branch 'main_latest_merged' into 'zaid_development_new'
...
# Conflicts:
# lib/views/widgets/equipment/single_device_picker.dart
3 years ago
zaid_daoud
d0f083ce22
- Update Login API
...
- Adding Get Service Request By ID API
3 years ago
nextwo
dad222f8fb
fix track device transfer issue
3 years ago
nextwo
12764a647c
pagintion + FIX BUGS
3 years ago
zaid_daoud
1bf9d612ad
Fixing bugs
3 years ago
Sikander Saleem
c5c96a4fce
Merge remote-tracking branch 'atoms_main/main' into main_latest_merged
...
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/controllers/providers/api/departments_provider.dart
# lib/controllers/providers/api/device_transfer_provider.dart
# lib/controllers/providers/api/devices_provider.dart
# lib/controllers/providers/api/gas_refill_provider.dart
# lib/controllers/providers/api/hospitals_provider.dart
# lib/controllers/providers/api/parts_provider.dart
# lib/controllers/providers/api/regular_visits_provider.dart
# lib/controllers/providers/api/service_requests_provider.dart
# lib/controllers/providers/api/status_drop_down/employee/assigned_to_provider.dart
# lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart
# lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart
# lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart
# lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart
# lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart
# lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart
# lib/main.dart
# lib/models/device/device.dart
# lib/models/device/device_transfer.dart
# lib/models/device/device_transfer_info.dart
# lib/models/gas_refill/gas_refill_details.dart
# lib/models/gas_refill/gas_refill_model.dart
# lib/models/lookup.dart
# lib/models/pantry/calibration_tools.dart
# lib/models/pantry/lookups/contact_person.dart
# lib/models/pantry/lookups/contact_title.dart
# lib/models/pantry/pentry.dart
# lib/models/pantry/pm_kit.dart
# lib/models/pantry/ppm_check_list.dart
# lib/models/service_report.dart
# lib/models/service_request/service_request.dart
# lib/models/user.dart
# lib/models/visits/visit.dart
# lib/models/visits/visits_group.dart
# lib/views/app_style/colors.dart
# lib/views/pages/login.dart
# lib/views/pages/register.dart
# lib/views/pages/splash_screen.dart
# lib/views/pages/user/land_page.dart
# lib/views/pages/user/requests/create_request.dart
# lib/views/pages/user/requests/report/create_service_report.dart
# lib/views/pages/user/requests/report/edit_service_report.dart
# lib/views/pages/user/requests/request_details.dart
# lib/views/pages/user/visits/pantry/edit_pentry.dart
# lib/views/pages/user/visits/preventive_maintenance_visits_page.dart
# lib/views/pages/user/visits/regular_visits_page.dart
# lib/views/pages/user/visits/update_visits_group_sheet.dart
# lib/views/pages/user/visits/visit_details.dart
# lib/views/widgets/app_text_form_field.dart
# lib/views/widgets/buttons/app_back_button.dart
# lib/views/widgets/departments/department_button.dart
# lib/views/widgets/drawer/drawer_item.dart
# lib/views/widgets/equipment/auto_complete_devices_field.dart
# lib/views/widgets/equipment/device_button.dart
# lib/views/widgets/equipment/single_device_picker.dart
# lib/views/widgets/hospitals/hospital_auto_complete_field.dart
# lib/views/widgets/hospitals/hospital_button.dart
# lib/views/widgets/images/multi_image_picker.dart
# lib/views/widgets/loaders/loading_manager.dart
# lib/views/widgets/parts/auto_complete_parts_field.dart
# lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
# lib/views/widgets/pentry/pentry_calibration_tool_form.dart
# lib/views/widgets/pentry/pentry_info_form.dart
# lib/views/widgets/pentry/pentry_pm_kit_form.dart
# lib/views/widgets/requests/service_request_update_dialog.dart
# lib/views/widgets/search/service_request_search_bar.dart
# lib/views/widgets/search/visits_search_bar.dart
# lib/views/widgets/sound/record_sound.dart
# lib/views/widgets/sound/sound_player.dart
# lib/views/widgets/speech_to_text/speech_to_text.dart
# lib/views/widgets/status/employee/assigned_to_mune.dart
# lib/views/widgets/status/multi_status_menu.dart
# lib/views/widgets/status/report/service_status.dart
# lib/views/widgets/status/single_status_menu.dart
# lib/views/widgets/timer/app_timer.dart
# lib/views/widgets/visits/visit_item.dart
# pubspec.yaml
3 years ago
MaximusAshraf
35ae5e9002
handling null values
...
- in get service requests and create device transfer
3 years ago
MaximusAshraf
910e01324f
bug fixing
3 years ago
MaximusAshraf
75fedf395e
new server edits
3 years ago
Sikander Saleem
4af0c3c9b0
import optimization
3 years ago
Sikander Saleem
14eceb7ae5
pentry added.
3 years ago