zaid_daoud
402f7513bd
First Action Bottom Sheet Done
2 years ago
2d553b56e0
service request detail ui changed.
2 years ago
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
7e17bd2558
localization i18 implementation
2 years ago
zaid_daoud
c7d6b68fd2
Change Asset & Asset Transfer models
2 years ago
392182e234
track service request cont.
2 years ago
150ad60de6
track service request
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
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
c393f29829
some changes
2 years ago
c24353c9ea
work order fixes.
2 years ago
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
756e2a1881
implement searchWorkOrders api and edit on ui
2 years ago
zaid_daoud
a219d81ccc
Update Service Request Done
2 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
75fedf395e
new server edits
3 years ago
Sikander Saleem
4af0c3c9b0
import optimization
3 years ago
Sikander Saleem
14eceb7ae5
pentry added.
3 years ago
72ff36020c
remove prints and optimize imports
3 years ago
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
2d2e22fa11
Initial commit
3 years ago
zaid_daoud
Sikander Saleem
nextwo
Sikander Saleem
MaximusAshraf