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
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
zaid_daoud
8962889973
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
2 years ago
zaid_daoud
2761edf17d
Support jpeg
2 years ago
Sikander Saleem
8736e68c27
Merge branch 'zaid_development_new' into sikander-development
2 years ago
Sikander Saleem
7ca12e6484
record audio plugin replaced.
2 years ago
zaid_daoud
90fe4e76b7
Asset Transfer Search Dialog Done
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
a3264f4f1c
Multiple types of attachments
2 years ago
zaid_daoud
799c9a50bd
nothing
2 years ago
zaid_daoud
7a02b2e715
fault description is disabled when create new work order
2 years ago
zaid_daoud
29c5f0e5cf
in ppm summery if no employee found it will be empty
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
Sikander Saleem
5bab5c92a6
improvement.
2 years ago
zaid_daoud
99c16197f2
Service Request Type for end user profile should be by default Maintenance Request and locked field.
2 years ago
zaid_daoud
66100c36a4
Enhancements
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
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
2 years ago
nextwo
c393f29829
some changes
3 years ago
zaid_daoud
46f61884bc
In track gas refill summery to add Gas Type and Expected Date fields.
3 years ago
zaid_daoud
4d3c128191
Remove Search Work Order Module and add the following filters in search service request:
...
○ Assigned Employee
○ Call ID
○ Call Date (Service Request Date)
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
64d9305b84
Site Field locked and the data retrieved from user info
3 years ago
zaid_daoud
bb5cc8eda6
The speech to text in new service request is stop recording now
...
Microphone permission issue on IOS has been fixed also the delete option is working in IOS version now
3 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.
3 years ago
zaid_daoud
914a9e0057
Add Asset Number and Asset Name in new service request after select pickup Asset
3 years ago
zaid_daoud
4997e1e3df
Timer Fixed
3 years ago
Sikander Saleem
8bc2275c35
asset name added in device transfer list.
3 years ago
Sikander Saleem
b8051a40fe
signature fixes
3 years ago
Sikander Saleem
883f32d9e6
Merge branch 'majd_development_new' into main_latest_merged
3 years ago
zaid_daoud
2a85d6b355
Simple Changes
3 years ago
zaid_daoud
5890835f7b
Simple Changes
3 years ago
nextwo
f583151345
show images in the app + search list issue
3 years ago
nextwo
44654e1e38
some edits
3 years ago
nextwo
3737c3b41c
Merge remote-tracking branch 'origin/main_latest_merged' into majd_development_new
...
# Conflicts:
# lib/views/pages/user/requests/report/edit_service_report.dart
# lib/views/widgets/equipment/single_device_picker.dart
3 years ago
nextwo
c58a86758c
some edits
3 years ago
zaid_daoud
0459ab14e2
PPM Updates Done
3 years ago
zaid_daoud
53c1f83bac
Enhancements
3 years ago
zaid_daoud
8e8cdb6bfe
Dropdown issue
3 years ago
zaid_daoud
c742dfaacc
Asset name rather than asset serial number
3 years ago
zaid_daoud
ccf329798a
QR reader
3 years ago
zaid_daoud
9cf9c7f30c
- New Gas Refill -> Status Disabled With ("Open") default value.
...
- Rename (Pentry) to (PM Entry)
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
a2edcadc1a
edit work order added.
3 years ago
zaid_daoud
8f05983c14
Ready For Testing
3 years ago
zaid_daoud
a1f2960fad
Enhancements
3 years ago
zaid_daoud
6aab5e6750
Enhancements
3 years ago
zaid_daoud
ffaa340d9d
Enhancements
3 years ago
nextwo
73cc2143bc
work order
3 years ago
zaid_daoud
27d3a74d3b
Search Sub Work Order Screen DONE
3 years ago
zaid_daoud
674a803189
Fixing Bug
3 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
3 years ago
Sikander Saleem
de7aff6b9f
imp
3 years ago
zaid_daoud
10604b4f5c
Fixing Bug
3 years ago
zaid_daoud
79edef1d66
Update Gas Refill done
3 years ago
zaid_daoud
d470a19bef
Need some enhancements
3 years ago
zaid_daoud
c24fe473ff
Add Delivered Quantity Field
3 years ago
nextwo
8c0ef0acf0
transfer device + track transfer device
3 years ago
zaid_daoud
83bf02e69f
Track Gaz Refill Done
3 years ago
Sikander Saleem
8e2b21bd9d
gas refill cont.
3 years ago
Sikander Saleem
13c5b3891a
equipment status added.
3 years ago
Sikander Saleem
b4aac2a8b8
new work order, service type, fault description fixes
3 years ago
Sikander Saleem
dd7c866e39
improvements.
3 years ago
zaid_daoud
c8f498db6a
Merged with main_latest
3 years ago
zaid_daoud
655f96049c
Fault Description Became a Dropdown Menu
3 years ago
Sikander Saleem
c24353c9ea
work order fixes.
3 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
3 years ago
zaid_daoud
64cb524917
Change service last calls API
3 years ago
zaid_daoud
5f7bc0cf6e
Change service last calls API
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
zaid_daoud
5945756e60
New Work Order Done (Unable to upload Engineer Signature)
3 years ago
nextwo
756e2a1881
implement searchWorkOrders api and edit on ui
3 years ago
zaid_daoud
31c7c7376f
Enhancements
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
zaid_daoud
a219d81ccc
Update Service Request Done
3 years ago
nextwo
12764a647c
pagintion + FIX BUGS
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
majd alattari
e2a3ae4cb7
Merge branch 'main_latest_merged' into 'majd_development_new'
...
# Conflicts:
# lib/views/widgets/status/single_status_menu.dart
3 years ago
zaid_daoud
1bf9d612ad
Fixing bugs
3 years ago
nextwo
7b49f9f40e
FIX BUGS
3 years ago
Sikander Saleem
b82c9b86d9
improvement
3 years ago
Sikander Saleem
363a46b97f
improvements
3 years ago
Sikander Saleem
4f37bb9476
improvements.
3 years ago
Sikander Saleem
534aab3ceb
latest code merge changes
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
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
MaximusAshraf
72ff36020c
remove prints and optimize imports
3 years ago
MaximusAshraf
bba0b3d7d7
version 0.7.4 - update pentry
...
add update pentry
add Defect Type and priority for service request
rename and remove unused fields
add search with asset number and view it in service request and ppm visit
3 years ago
Sikander Saleem
9ce90c745f
Changes for Phase-1
3 years ago
MaximusAshraf
2d2e22fa11
Initial commit
3 years ago