Commit Graph

1246 Commits (599da0155427a78bcac75011a34374307e4145c6)
 

Author SHA1 Message Date
nextwo 12764a647c pagintion + FIX BUGS 2 years ago
zaid daoud 6fd1f53315 Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
#   lib/views/pages/user/land_page.dart
3 years ago
zaid_daoud 42787e450e Enhancements 3 years ago
zaid_daoud 048774bd8c Enhancements 3 years ago
zaid_daoud 8968f9ae2f Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 3 years ago
zaid_daoud e25dc22bd0 Enhancements 3 years ago
zaid_daoud a33e4f4b7d Preventive Maintenance Search Issue Fixed 3 years ago
zaid_daoud f7057f4827 Login Api Issue Fixed Manually 3 years ago
Sikander Saleem 5265a45563 Merge branch 'majd_development_new' into 'main_latest_merged'
Majd development new

See merge request haroon6138/cloudsolutions-atoms!23
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
Sikander Saleem 0736abba17 Merge branch 'zaid_development_new' into 'main_latest_merged'
Fixing bugs

See merge request haroon6138/cloudsolutions-atoms!22
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
nextwo 2c09cdb7e4 FIX BUGS 3 years ago
zaid daoud 3623cf9786 Merge branch 'main_latest_merged' into 'zaid_development_new' 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 e4c37ec052 create report submission fix. 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 fab1bdf65d auth edits 3 years ago
MaximusAshraf c5b5a8011a active api auth 3 years ago
MaximusAshraf 35ae5e9002 handling null values
- in get service requests and create device transfer
3 years ago
Sikander Saleem 7004de16db modifications. 3 years ago
MaximusAshraf 910e01324f bug fixing 3 years ago
MaximusAshraf 75fedf395e new server edits 3 years ago
Sikander Saleem 079a11ad98 uat url added. 3 years ago
Sikander Saleem 4d72301437 Merge remote-tracking branch 'origin/main' into main 3 years ago
Sikander Saleem 008232e69f Merge branch 'sikander-development' into 'main'
Sikander development

See merge request haroon6138/cloudsolutions-atoms!1
3 years ago
Sikander Saleem a9a269b2f9 modifications. 3 years ago
MaximusAshraf d256a27a21 comment sign up button in login form 3 years ago
Sikander Saleem 4fbefdf4e2 android build name and code added. 3 years ago
Sikander Saleem 4af0c3c9b0 import optimization 3 years ago
Sikander Saleem 14eceb7ae5 pentry added. 3 years ago
Sikander Saleem f2aba4b924 config files 3 years ago
MaximusAshraf 72ff36020c remove prints and optimize imports 3 years ago
MaximusAshraf 2d741e5917 remove unused file 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 df36b3405e IOS and Android release configurations 3 years ago
Sikander Saleem 46aa527028 android app package name change. 3 years ago
haroon amjad 129bac004b Google files 3 years ago
Sikander Saleem 9ce90c745f Changes for Phase-1 3 years ago
Sikander Saleem c713184c78
Update README.md 3 years ago
MaximusAshraf 2d2e22fa11 Initial commit 3 years ago