Commit Graph

469 Commits (4d07ddc7e85df2d09fa2f76ba0157c8db959c4c6)

Author SHA1 Message Date
zaid_daoud c0f801c1c1 Review Comment in Add Work Order Screen 1 year ago
zaid_daoud 19edc321f5 Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
#	lib/views/pages/user/requests/create_request.dart
1 year ago
Sikander Saleem 74b7fc4130 add work order improvements. 1 year ago
zaid_daoud 4c75debbd5 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 1 year ago
zaid_daoud 59ca4277a9 Enhancements 1 year ago
Sikander Saleem 5d4da1961f Merge remote-tracking branch 'origin/main_latest_merged' into main_latest_merged 1 year ago
Sikander Saleem c24353c9ea work order fixes. 1 year ago
Sikander Saleem e20e99bebe through fix. 1 year ago
Sikander Saleem ecb8d1e1a7 improvements 1 year 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
1 year ago
Sikander Saleem 49147eab3d improvement. 1 year ago
zaid_daoud 9346990626 Enhancemnets 1 year ago
zaid_daoud 64cb524917 Change service last calls API 1 year ago
Sikander Saleem 37df63c866 user role parsing fix. 1 year ago
zaid_daoud 5f7bc0cf6e Change service last calls API 1 year ago
nextwo 4e89566d1f implement searchWorkOrders api and edit on ui 1 year 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
1 year ago
zaid_daoud 5945756e60 New Work Order Done (Unable to upload Engineer Signature) 1 year ago
nextwo 2a5a8f411f implement searchWorkOrders api and edit on ui 1 year ago
nextwo 756e2a1881 implement searchWorkOrders api and edit on ui 1 year ago
Sikander Saleem f39b6f5d8e work order improvement. 1 year ago
nextwo d869f82020 implement searchWorkOrders api and edit on ui 1 year ago
zaid_daoud 31c7c7376f Enhancements 1 year ago
zaid_daoud 62dcae610d Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 1 year ago
zaid_daoud 7044cc8ff0 Enhancements 1 year ago
zaid daoud 51c5bcc3a0 Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
#   lib/views/widgets/equipment/single_device_picker.dart
1 year ago
zaid_daoud d0f083ce22 - Update Login API
- Adding Get Service Request By ID API
1 year ago
zaid_daoud a219d81ccc Update Service Request Done 1 year ago
zaid_daoud a499889603 Add New Service Body Changed 1 year ago
zaid_daoud bdfa26411b Add New Service Body Changed 1 year ago
zaid_daoud 93f2378ec5 Update Service Request Date Still Has Issue 1 year ago
nextwo dad222f8fb fix track device transfer issue 1 year ago
zaid_daoud e08fcc8b32 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 1 year ago
zaid_daoud 81a6a515c4 Enhancements 1 year ago
nextwo 1201a4d542 Merge branch 'main_latest_merged' into majd_development_new 1 year ago
nextwo 12764a647c pagintion + FIX BUGS 1 year ago
zaid daoud 6fd1f53315 Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
#   lib/views/pages/user/land_page.dart
1 year ago
zaid_daoud 42787e450e Enhancements 1 year ago
zaid_daoud 048774bd8c Enhancements 1 year ago
zaid_daoud e25dc22bd0 Enhancements 1 year ago
zaid_daoud a33e4f4b7d Preventive Maintenance Search Issue Fixed 1 year ago
zaid_daoud f7057f4827 Login Api Issue Fixed Manually 1 year 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
1 year ago
majd alattari e2a3ae4cb7 Merge branch 'main_latest_merged' into 'majd_development_new'
# Conflicts:
#   lib/views/widgets/status/single_status_menu.dart
1 year ago
nextwo 2c09cdb7e4 FIX BUGS 1 year ago
zaid_daoud 1bf9d612ad Fixing bugs 1 year ago
nextwo 7b49f9f40e FIX BUGS 1 year ago
Sikander Saleem b82c9b86d9 improvement 1 year ago
Sikander Saleem e4c37ec052 create report submission fix. 1 year ago
Sikander Saleem 363a46b97f improvements 1 year ago
Sikander Saleem 4f37bb9476 improvements. 1 year ago
Sikander Saleem 534aab3ceb latest code merge changes 1 year 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
1 year ago
MaximusAshraf fab1bdf65d auth edits 1 year ago
MaximusAshraf c5b5a8011a active api auth 1 year ago
MaximusAshraf 35ae5e9002 handling null values
- in get service requests and create device transfer
2 years ago
MaximusAshraf 910e01324f bug fixing 2 years ago
MaximusAshraf 75fedf395e new server edits 2 years ago
Sikander Saleem 079a11ad98 uat url added. 2 years ago
Sikander Saleem a9a269b2f9 modifications. 2 years ago
MaximusAshraf d256a27a21 comment sign up button in login form 2 years ago
Sikander Saleem 4af0c3c9b0 import optimization 2 years ago
Sikander Saleem 14eceb7ae5 pentry added. 2 years ago
MaximusAshraf 72ff36020c remove prints and optimize imports 2 years ago
MaximusAshraf 2d741e5917 remove unused file 2 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
2 years ago
Sikander Saleem df36b3405e IOS and Android release configurations 2 years ago
Sikander Saleem 9ce90c745f Changes for Phase-1 2 years ago
MaximusAshraf 2d2e22fa11 Initial commit 2 years ago