Commit Graph

157 Commits (c4efbba6a866e7e9c3432d967a0cb77ccaf291d0)

Author SHA1 Message Date
Sikander Saleem 84dd801ed1 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
#	lib/views/pages/user/ppm/ppm_details_page.dart
#	lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
12 months ago
Sikander Saleem 2cd5777f55 ppm model improvement. 12 months ago
WaseemAbbasi22 7b620b9f6e Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 1 year ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 1 year ago
WaseemAbbasi22 d181c81029 save and complete api integrated for recurrent task 1 year ago
WaseemAbbasi22 99bcae1dc2 recurrent task api integrated 1 year ago
WaseemAbbasi22 b5bfb3c0c0 arrival bottomsheet dismiss fixes and add check for next step value 1 year ago
WaseemAbbasi22 a5876ec1d3 swipe module added 1 year ago
WaseemAbbasi22 ba50ed5809 add swipe and forget password apis 1 year ago
Sikander Saleem f3d52eef52 bug fixes 1 year ago
WaseemAbbasi22 904f1919d4 all changes implemented 1 year ago
WaseemAbbasi22 501c78dc09 notifications implemented 1 year ago
WaseemAbbasi22 3a27b9d6ca implement scan qr code and ask requester to verify flow 1 year ago
muhammad.abbasi 8b0bf4bedc timer implemented 1 year ago
Sikander Saleem 973c85418e code improvements & fixes. 1 year ago
muhammad.abbasi f1fe0b3339 edit maintenance request completed 1 year ago
muhammad.abbasi 0095facdf5 maintenance request flow in progress 1 year ago
muhammad.abbasi 34e54df40d intial testing fixes 1 year ago
muhammad.abbasi c2b3288423 in progress 1 year ago
muhammad.abbasi e8dc052d02 integrating api in new flow 1 year ago
muhammad.abbasi 53c5240377 ui fixes 1 year ago
muhammad.abbasi 68a8dc250f bug fixes 1 year ago
Sikander Saleem f694252828 null safety conversion after merge. 1 year ago
Sikander Saleem 0d876a41fc Merge remote-tracking branch 'refs/remotes/origin/design_3.0_waseem' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/dashboard_latest/dashboard_view.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/extensions/text_extensions.dart
#	lib/models/lookup.dart
#	lib/new_views/app_style/app_themes.dart
#	lib/new_views/common_widgets/app_bottom_nav_bar.dart
#	lib/new_views/common_widgets/app_dashed_button.dart
#	lib/new_views/common_widgets/app_filled_button.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/new_views/pages/land_page/requests_list_page.dart
#	lib/providers/work_order/reason_provider.dart
#	lib/service_request_latest/views/components/bottom_sheets/action_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/activity_type_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/initial_visit_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/reject_request_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/spare_part/spare_part_request.dart
#	lib/utilities/general_utils.dart
#	lib/views/widgets/date_and_time/date_picker.dart
#	lib/views/widgets/date_and_time/time_picker.dart
#	lib/views/widgets/e_signature/e_signature.dart
#	lib/views/widgets/images/multi_image_picker.dart
#	pubspec.yaml
1 year ago
muhammad.abbasi d13f3e3551 Ui updated 1 year ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 1 year ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 1 year ago
muhammad.abbasi f257fbadfa new Api models and provider added 1 year ago
Sikander Saleem 7d0a2eb65c sdk upgrade changes. 1 year ago
Muhammad Abbasi ad1a01b7c6 initial commit 1 year ago
Sikander Saleem 2c6e81284d 1.2.2+9 uploaded. 2 years ago
Sikander Saleem da442df2bb pending asset requests new parameter added. 2 years ago
Sikander Saleem a9042a834c text to speech, call comments & voice record added. 2 years ago
Sikander Saleem 8273537b00 create supplier engineer functionality added. 2 years ago
Sikander Saleem b508e839c5 multi auth added, token verification added, multi time added on ppm. 2 years ago
Sikander Saleem e212cf75b1 ppm multi timer added. 2 years ago
Sikander Saleem e304a252d6 1.2.0 uploaded. 2 years ago
Sikander Saleem 2a53ab8b8e electrical safety, asset availability, task status and ppm service added. 2 years ago
Sikander Saleem d6c3fc2778 head nurse role added, pending asset service requests added & AssetGroup header added. 2 years ago
Sikander Saleem db5abda8a1 url update 2 years ago
Sikander Saleem d2e4c8276c snag points added. 2 years ago
Sikander Saleem 60639620c6 snag issues resolve 2 years ago
Sikander Saleem b6c08450fe version 1.1.0 uploaded on stores. 2 years ago
Sikander Saleem 1fbcbd0662 reason api ADDED. 2 years ago
Sikander Saleem adba86b10e snag list remaining 4 points resolved & improvements. 2 years ago
Sikander Saleem cbafa20df8 when session ended, show dialog to login. 2 years ago
Sikander Saleem a6dd802321 receiver name added on new transfer request & improvements 2 years ago
Sikander Saleem 5d706d89b4 service type added. 2 years ago
nextwo d3bee4f39a gas refill comments 2 years ago
zaid_daoud 23700d0adf Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT) 2 years ago
zaid_daoud 51ef873770 Reformatting code 2 years ago
Sikander Saleem 29e414a703 user profile change added & improvements. 2 years ago
Sikander Saleem 7ecd90a556 gas refill flow added. 2 years ago
Sikander Saleem ff80897a3c dashboard apis added. 2 years ago
zaid_daoud 37a9cd3cc9 service request comment done 2 years ago
Sikander Saleem 2c9f2dce08 notifications api added. 2 years ago
Sikander Saleem fd18e5d39c dashboard cont 2 years ago
Sikander Saleem 8347afec6d Merge branch 'main_latest_merged' into main_design2.0
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart
#	lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
#	lib/views/widgets/status/report/service_report_assistant_employee_menu.dart
2 years ago
Sikander Saleem 98c68bfbf0 search work order by assigned employee fixed. 2 years ago
Sikander Saleem c9f903fac8 urgent improvements. 2 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 2 years ago
zaid_daoud 7d2afa23cc add record player to the recorder 2 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 2 years ago
Sikander Saleem 050c710bf8 android 1.0.4 released. 2 years ago
zaid_daoud b77a36ac50 Gas refill screen 2 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 2 years ago
Sikander Saleem f0c605b07d improvements 2 years ago
zaid_daoud 2d0c72b138 1- prevent the user from creating a new gas refill request if the department isn't selected.
2- working on host: https://atomsmdev.hmg.com
2 years ago
zaid_daoud 0f9d4127b4 [SubWorkOrder]: Auto Filled Fields Depending on ParentId 2 years ago
zaid_daoud 60f6cbf1b8 Voice Note Issue Fixed 2 years ago
Sikander Saleem 1eaf9a21fa asset transfer status fixed. 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 bd299e2a6d Some changes on work orders model attributes & change File Base Url (Still under testing) 3 years ago
zaid_daoud 66100c36a4 Enhancements 3 years ago
zaid_daoud 6caab58171 Merge With Majd [part #2] 3 years ago
nextwo be636bb18b some changes 3 years ago
zaid_daoud 96c9515e87 Status for both sender and receiver is synchronized. 3 years ago
Sikander Saleem b8051a40fe signature fixes 3 years ago
Sikander Saleem a2edcadc1a edit work order added. 3 years ago
Sikander Saleem 4d70fe2c36 improvements 3 years ago
zaid_daoud 27d3a74d3b Search Sub Work Order Screen DONE 3 years ago
Sikander Saleem 8e2b21bd9d gas refill cont. 3 years ago
Sikander Saleem b4aac2a8b8 new work order, service type, fault description fixes 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
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 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
nextwo d869f82020 implement searchWorkOrders api and edit on ui 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 048774bd8c Enhancements 3 years ago
Sikander Saleem 4f37bb9476 improvements. 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