Commit Graph

216 Commits (e8dc052d02b8dca1b113e136a6a49991a80de81c)

Author SHA1 Message Date
Sikander Saleem 0e30fef10c work order list ui changed. 2 years ago
Sikander Saleem 2d553b56e0 service request detail ui changed. 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 392182e234 track service request cont. 2 years ago
Sikander Saleem 150ad60de6 track service request 2 years ago
Sikander Saleem 5fc2aceecf ppm disable edit on closed, gaz refill site fix, & print statements remove. 2 years ago
Sikander Saleem 09f2ae32eb improvements 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
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
nextwo a85ea2d799 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo 7d37d66e62 fix bugs 2 years ago
zaid_daoud 58c5b434e2 Fault Desc Issue Fixed 2 years ago
nextwo 8df2900254 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo 350ea3f9e7 fix bugs 2 years ago
zaid_daoud 2384bab11f Fault Desc Issue Fixed 2 years ago
zaid_daoud a9d4d2a373 Enhancements 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 bf30e1d763 update service request attachment fixed. 2 years ago
Sikander Saleem c9705e0b74 attachments improvements. 2 years ago
Sikander Saleem 8624515433 local & network files opener added. 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 61c28aa8b8 FIX 2 years ago
zaid_daoud 8932871e12 Back to the previous commit 2 years ago
zaid_daoud 6145f8a0cb Fix 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 a3264f4f1c Multiple types of attachments 2 years ago
nextwo d33c97d1df make return to service not required 2 years ago
zaid_daoud 871274433b Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
zaid_daoud 7a02b2e715 fault description is disabled when create new work order 2 years ago
Sikander Saleem b02a4ab1fc Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
Sikander Saleem 311c8c974d gaz refill status fix, when change from web. 2 years ago
zaid_daoud 349ac7dba4 Simple Updates 2 years ago
zaid_daoud bd299e2a6d Some changes on work orders model attributes & change File Base Url (Still under testing) 2 years ago
zaid_daoud 383c634c50 User departments in create new service request 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
nextwo be636bb18b some changes 2 years ago
nextwo c393f29829 some changes 3 years ago
zaid_daoud 54854ee9e8 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 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 58bd5075ed Merge branch 'main_latest_merged' into zaid_development_new 3 years ago
zaid_daoud 519d5a9f42 No Assigned Employee 3 years ago
Sikander Saleem 55cbf99264 Merge branch 'majd_development_new' into main_latest_merged 3 years ago
zaid_daoud 4997e1e3df Timer Fixed 3 years ago
Sikander Saleem b8051a40fe signature fixes 3 years ago
nextwo b40727b920 review comment 3 years ago
Sikander Saleem da286ea075 fixes 3 years ago
Sikander Saleem be6a418bb6 sender & receiver transfer edit login update & fixes 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 53c1f83bac Enhancements 3 years ago
zaid_daoud d4a1607392 First Action Date 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 3010458cd8 Enhancements 3 years ago
zaid_daoud e0d2f8360e Enhancements 3 years ago
zaid_daoud 6aab5e6750 Enhancements 3 years ago
zaid_daoud 19cee08954 Updating Search Work Order Model 3 years ago
zaid_daoud 27d3a74d3b Search Sub Work Order Screen DONE 3 years ago
Sikander Saleem ffacf3949e startdate, end date & working hours fixed. 3 years ago
Sikander Saleem 13c5b3891a equipment status added. 3 years ago
Sikander Saleem 79d987d49e improvement 3 years ago
Sikander Saleem b4aac2a8b8 new work order, service type, fault description fixes 3 years ago
zaid_daoud f72d2cc41a Minor Bug Fixed 3 years ago
Sikander Saleem dd7c866e39 improvements. 3 years ago
zaid_daoud c8f498db6a Merged with main_latest 3 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
3 years ago
zaid_daoud 655f96049c Fault Description Became a Dropdown Menu 3 years ago
zaid_daoud 29466092b0 Service Type Became Read Only 3 years ago
zaid_daoud a19bd39516 Enhancements on Add Work Order Screen 3 years ago
zaid_daoud c0f801c1c1 Review Comment in Add Work Order Screen 3 years ago
zaid_daoud 19edc321f5 Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
#	lib/views/pages/user/requests/create_request.dart
3 years ago
Sikander Saleem 74b7fc4130 add work order improvements. 3 years ago
zaid_daoud 4c75debbd5 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 3 years ago
zaid_daoud 59ca4277a9 Enhancements 3 years ago
Sikander Saleem c24353c9ea work order fixes. 3 years ago
Sikander Saleem ecb8d1e1a7 improvements 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
Sikander Saleem 49147eab3d improvement. 3 years ago
zaid_daoud 9346990626 Enhancemnets 3 years ago
zaid_daoud 5f7bc0cf6e Change service last calls API 3 years ago
nextwo 4e89566d1f implement searchWorkOrders api and edit on ui 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 2a5a8f411f implement searchWorkOrders api and edit on ui 3 years ago
nextwo 756e2a1881 implement searchWorkOrders api and edit on ui 3 years ago
Sikander Saleem f39b6f5d8e work order improvement. 3 years ago
nextwo d869f82020 implement searchWorkOrders api and edit on ui 3 years ago
zaid_daoud 7044cc8ff0 Enhancements 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
zaid_daoud a499889603 Add New Service Body Changed 3 years ago
zaid_daoud bdfa26411b Add New Service Body Changed 3 years ago
Sikander Saleem e4c37ec052 create report submission fix. 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