Commit Graph

779 Commits (main_production)

Author SHA1 Message Date
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 da339c68f4 Merge branch 'zaid_development_new' into sikander-development 2 years ago
Sikander Saleem c9705e0b74 attachments improvements. 2 years ago
zaid_daoud 6d6fc30806 Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new 2 years ago
zaid_daoud 7d68d1db51 Fix 2 years ago
zaid_daoud f5820a93c7 Enhancement 2 years ago
zaid_daoud 8c018158ae Vendors Will Be Visible If Previous Data API contains data 2 years ago
Sikander Saleem 8624515433 local & network files opener added. 2 years ago
zaid_daoud b908322f06 1- [WO Details] Get Vendor Name And Engineer According To Last Status 2 years ago
zaid_daoud 19cd20c645 1- Fix Vendor Engineer Issue
2- Add Install Qty & Return Qty
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
zaid_daoud 6fc8e9b02c Return to service isn't required 2 years ago
Sikander Saleem f3349b0209 improvements. 2 years ago
Sikander Saleem 9b2c1c8f8d Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud ec4916d4ec hide create service request module form engineer session 2 years ago
zaid_daoud 05d1976969 Make QR code searches for a specific elements which are equal to asset no. 2 years ago
zaid_daoud 5f842068a4 Track Asset Transfer [Most Recent] 2 years ago
zaid_daoud fd439a4f46 Track Asset Transfer [Most Recent] 2 years ago
zaid_daoud 232713f841 Track Gaz Refills [Most Recent] 2 years ago
zaid_daoud c52d7cd527 Preventive Maintenance [Most Recent] 2 years ago
zaid_daoud 0e95b32ecb Service Request [Most Recent] 2 years ago
zaid_daoud 0f9d4127b4 [SubWorkOrder]: Auto Filled Fields Depending on ParentId 2 years ago
Sikander Saleem 4efcf9d787 Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud 60f6cbf1b8 Voice Note Issue Fixed 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
Sikander Saleem da7ce0ac52 Merge remote-tracking branch 'origin/sikander-development' into sikander-development 2 years ago
Sikander Saleem 6453c932ab improvements 2 years ago
Sikander Saleem ef2431d7df Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud d277a28f54 Activate Attachment Picker Dialog with a New Field (Pick From Files) 2 years ago
Sikander Saleem 1839536caa image url updated 2 years ago
Sikander Saleem 1eaf9a21fa asset transfer status fixed. 2 years ago
Sikander Saleem 07c8acf3a3 improvement 2 years ago
zaid_daoud bf39badc3d enhancement 2 years ago
zaid_daoud 6c2480edd2 stop loading on null values 2 years ago
zaid_daoud 4cbedc0b60 add start and end time to gas refill details 2 years ago
Sikander Saleem 2549157eee rename fixes. 2 years ago
Sikander Saleem c9155eb852 Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud 4193b42985 fix 2 years ago
zaid_daoud 9bc4f67995 fix 2 years ago
Sikander Saleem cb093e0be1 Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud bfacfc68e2 fix 2 years ago
Sikander Saleem 91d6b686c7 Merge branch 'zaid_development_new' into sikander-development 2 years ago
zaid_daoud bc3696cd1e loading when fault description is null or empty 2 years ago
zaid_daoud 5f21d4e5c9 Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new 2 years ago
nextwo eee1b0dc51 fix bugs 2 years ago
zaid_daoud 8962889973 Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new 2 years ago
zaid_daoud 2761edf17d Support jpeg 2 years ago
Sikander Saleem 8736e68c27 Merge branch 'zaid_development_new' into sikander-development 2 years ago
Sikander Saleem 7ca12e6484 record audio plugin replaced. 2 years ago
nextwo 648d48e486 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
zaid_daoud 90fe4e76b7 Asset Transfer Search Dialog Done 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 e32de37209 Improve most recent filter 2 years ago
zaid_daoud a3264f4f1c Multiple types of attachments 2 years ago
Sikander Saleem 591e1513a2 enable sub workorder & name to create 2 years ago
nextwo d33c97d1df make return to service not required 2 years ago
zaid_daoud 799c9a50bd nothing 2 years ago
nextwo f5bc07c3a2 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo f132004c11 remove expected date 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 29c5f0e5cf in ppm summery if no employee found it will be empty 2 years ago
zaid_daoud 614426853b [API doesn't support the required parameters] add search dialog to track asset transfer 2 years ago
zaid_daoud d80e28f706 gaz refill timer 2 years ago
zaid_daoud 13d4b71128 sender & receiver issue 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 ac38159b0a User Model Change 2 years ago
zaid_daoud b16ca9ce77 Improvements 2 years ago
zaid_daoud af1874600a Improvements 2 years ago
zaid_daoud 8184632ce7 Improvements 2 years ago
Sikander Saleem 5bab5c92a6 improvement. 2 years ago
Sikander Saleem 3c8791b590 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
Sikander Saleem c14aaceb5e rename device with asset 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
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
nextwo be636bb18b some changes 2 years ago
zaid_daoud 1e3a9825af Cloud logo 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
zaid_daoud 460c3138fd 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/visits/visit_details.dart
#	lib/views/widgets/search/service_request_search_bar.dart
#	lib/views/widgets/search/visits_search_bar.dart
2 years ago
zaid_daoud bec9c38269 In track gas refill update:
- add timer for working hours.
 - enable the engineer to add start and end date.
2 years ago
zaid_daoud b8f2a72cad Update Gas Refill : enable status menu 2 years ago
zaid_daoud 3e79091d7e In Update gas refill : add expected Date field and enable the engineer to updated. 2 years ago
nextwo c393f29829 some changes 2 years ago
zaid_daoud 4b23db582a Enhancement 2 years ago
zaid_daoud 2592478ea6 In track gas refill summery to rename the title to Gas Refill Requests. 2 years ago
zaid_daoud 46f61884bc In track gas refill summery to add Gas Type and Expected Date fields. 2 years ago
zaid_daoud 4d3c128191 Remove Search Work Order Module and add the following filters in search service request:
○ Assigned Employee
○ Call ID
○ Call Date (Service Request Date)
2 years ago
zaid_daoud ca114f5cf8 the receiver engineer can edit information for both sender and receiver 2 years ago
zaid_daoud 96c9515e87 Status for both sender and receiver is synchronized. 2 years ago
zaid_daoud 11f95b9578 Search in service request, preventive maintenance, gas refill, and transfer to arrange the requests from most recent to earliestt 2 years ago
zaid_daoud 4d548e1048 In Asset Transfer request add Destination label under pick asset 2 years ago
zaid_daoud ff9cb5102c Solution #2 : View the site and department of picked asset 2 years ago
zaid_daoud fc52f7ec30 View the site and department of picked asset 2 years ago
zaid_daoud 5941a421e2 Not Required Solution 2 years ago
zaid_daoud 8df2edd55f Rename Transfer Device to Transfer Asset 2 years ago
zaid_daoud 64d9305b84 Site Field locked and the data retrieved from user info 2 years ago
zaid_daoud bb5cc8eda6 The speech to text in new service request is stop recording now
Microphone permission issue on IOS has been fixed also the delete option is working in IOS version now
2 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.
2 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.
2 years ago
zaid_daoud 914a9e0057 Add Asset Number and Asset Name in new service request after select pickup Asset 2 years ago
Sikander Saleem 32652141b2 service status fix. 2 years ago
zaid_daoud 0124918d29 status added to update service request 2 years ago
zaid_daoud 58bd5075ed Merge branch 'main_latest_merged' into zaid_development_new 2 years ago
zaid_daoud 519d5a9f42 No Assigned Employee 2 years ago
Sikander Saleem 5de7b1b759 pm entry nurse & eng signature fix. 2 years ago
Sikander Saleem 55cbf99264 Merge branch 'majd_development_new' into main_latest_merged 2 years ago
zaid_daoud 4997e1e3df Timer Fixed 2 years ago
Sikander Saleem 8bc2275c35 asset name added in device transfer list. 2 years ago
Sikander Saleem b8051a40fe signature fixes 2 years ago
Sikander Saleem 8ada0dd0af fixes-1 2 years ago
nextwo b40727b920 review comment 2 years ago
Sikander Saleem da286ea075 fixes 2 years ago
Sikander Saleem 883f32d9e6 Merge branch 'majd_development_new' into main_latest_merged 2 years ago
zaid_daoud 2a85d6b355 Simple Changes 2 years ago
zaid_daoud 5890835f7b Simple Changes 2 years ago
nextwo eae8be206e Merge remote-tracking branch 'origin/main_latest_merged' into majd_development_new 2 years ago
Sikander Saleem be6a418bb6 sender & receiver transfer edit login update & fixes 2 years ago
nextwo d4ea2d4c58 show images in the app + search list issue 2 years ago
nextwo f583151345 show images in the app + search list issue 2 years ago
nextwo 44654e1e38 some edits 2 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
2 years ago
nextwo c58a86758c some edits 2 years ago
zaid_daoud 0459ab14e2 PPM Updates Done 2 years ago
zaid_daoud 0563c545b5 Add Engineer Signature & Nurse Signature to Update Gas Refill 2 years ago
zaid_daoud 53c1f83bac Enhancements 2 years ago
zaid_daoud 8e8cdb6bfe Dropdown issue 2 years ago
zaid_daoud c742dfaacc Asset name rather than asset serial number 2 years ago
zaid_daoud d4a1607392 First Action Date 2 years ago
zaid_daoud ccf329798a QR reader 2 years ago
zaid_daoud 77e2b7402b Rename (PK Kits) to (PM Kits) 2 years ago
zaid_daoud 9cf9c7f30c - New Gas Refill -> Status Disabled With ("Open") default value.
- Rename (Pentry) to (PM Entry)
2 years ago
zaid_daoud b97d6e4283 - on deivce transfer list screen, add asset number.
- on deivce transfer details screen, add asset name on 2nd position.
- on deivce transfer details screen, add asset serial number.
- on deivce transfer details screen, rename title to transfer id.
- on deivce transfer details screen, name unit to department.
2 years ago
zaid_daoud 45b66e6b2a Convert (Start Date & End Date) to Timer 2 years ago
Sikander Saleem 147351bd10 add sub workorder fix 2 years ago
Sikander Saleem 74dc2be238 add sub workorder fix 2 years ago
Sikander Saleem da911ea7ae fixes 2 years ago
Sikander Saleem a2edcadc1a edit work order added. 2 years ago
Sikander Saleem 4d70fe2c36 improvements 2 years ago
zaid_daoud 8f05983c14 Ready For Testing 2 years ago
zaid_daoud a1f2960fad Enhancements 2 years ago
zaid_daoud 575005ebdd Enhancements 2 years ago
nextwo 7d7594a3ab work order 2 years ago
nextwo 912a306e9e Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new
# Conflicts:
#	lib/views/pages/sub_workorder/create_sub_workorder_page.dart
2 years ago
nextwo f97712e434 work order 2 years ago
zaid_daoud 3010458cd8 Enhancements 2 years ago
zaid_daoud e0d2f8360e Enhancements 2 years ago
zaid_daoud 6aab5e6750 Enhancements 2 years ago
zaid_daoud ffaa340d9d Enhancements 2 years ago
nextwo 52eee5196f work order 2 years ago
nextwo 6db92bc08d Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new 2 years ago
nextwo 1fa14c1a86 work order 2 years ago
zaid_daoud 342cf3968b Fixing Bug 2 years ago
nextwo fea1f31474 Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new
# Conflicts:
#	lib/views/pages/sub_workorder/create_sub_workorder_page.dart
#	lib/views/pages/sub_workorder/workorder_details.dart
#	lib/views/pages/sub_workorder/workorder_update.dart
2 years ago
nextwo 73cc2143bc work order 2 years ago
zaid_daoud 19cee08954 Updating Search Work Order Model 2 years ago
zaid_daoud ebd9297646 Update Work order [Sub work orders] 2 years ago
nextwo b8ea1ab030 work order 2 years ago
nextwo 47e744f481 Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new
# Conflicts:
#	lib/views/pages/sub_workorder/search_sub_workorder_page.dart
2 years ago
nextwo 8646b8f1e9 work order 2 years ago
zaid_daoud 4fac73cd67 Preparing the functionality [Still doesn't work] 2 years ago
zaid_daoud e2a2104087 Preparing the functionality [Still doesn't work] 2 years ago
zaid_daoud d13bfa5f60 Wo Details Bottom Sheet & Spare Parts Bottom Sheet Design Done
[without activating update buttons]
2 years ago
zaid_daoud 27d3a74d3b Search Sub Work Order Screen DONE 2 years ago
zaid_daoud 33758f4cfd Test 3 years ago
zaid_daoud 674a803189 Fixing Bug 3 years ago
Sikander Saleem b9263ae1d8 Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
#	assets/subtitles/ar_subtitle.json
#	assets/subtitles/en_subtitle.json
#	lib/models/subtitle.dart
3 years ago
Sikander Saleem de7aff6b9f imp 3 years ago
zaid_daoud dadc591fcf Fixing Bug 3 years ago
zaid_daoud 10604b4f5c Fixing Bug 3 years ago
zaid_daoud 79edef1d66 Update Gas Refill done 3 years ago
zaid_daoud d470a19bef Need some enhancements 3 years ago
zaid_daoud 08841c7859 Update gas refill issue fixed 3 years ago
Sikander Saleem ffacf3949e startdate, end date & working hours fixed. 3 years ago
nextwo 1b7c1a3692 editing in working hours in update transfer device 3 years ago
zaid_daoud c24fe473ff Add Delivered Quantity Field 3 years ago
nextwo 8c0ef0acf0 transfer device + track transfer device 3 years ago
zaid_daoud 7828e52c64 Fixing 3 years ago
zaid_daoud 7ed8f86ba2 Create Gas Refill Bug Fixed 3 years ago
zaid_daoud 1381d54208 Create Gas Refill Bug Fixed 3 years ago
zaid_daoud 83bf02e69f Track Gaz Refill Done 3 years ago
nextwo 08484b4904 Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new 3 years ago
zaid_daoud ee4498a55e Date Time Fields (Gas Refill) 3 years ago
nextwo b51ee155c0 track transfer complete 3 years ago
Sikander Saleem 8e2b21bd9d gas refill cont. 3 years ago
Sikander Saleem 333c684670 improvements 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 6d6c6c700c Enhancements 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 5d4da1961f Merge remote-tracking branch 'origin/main_latest_merged' into main_latest_merged 3 years ago
Sikander Saleem c24353c9ea work order fixes. 3 years ago
Sikander Saleem e20e99bebe through fix. 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 64cb524917 Change service last calls API 3 years ago
Sikander Saleem 37df63c866 user role parsing fix. 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 31c7c7376f Enhancements 3 years ago
zaid_daoud 62dcae610d Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 3 years ago
zaid_daoud 7044cc8ff0 Enhancements 3 years ago
zaid daoud 51c5bcc3a0 Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
#   lib/views/widgets/equipment/single_device_picker.dart
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
zaid_daoud 93f2378ec5 Update Service Request Date Still Has Issue 3 years ago
nextwo dad222f8fb fix track device transfer issue 3 years ago
zaid_daoud e08fcc8b32 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 3 years ago
zaid_daoud 81a6a515c4 Enhancements 3 years ago
nextwo 1201a4d542 Merge branch 'main_latest_merged' into majd_development_new 3 years ago
nextwo 12764a647c pagintion + FIX BUGS 3 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 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
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
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 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
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 a9a269b2f9 modifications. 3 years ago
MaximusAshraf d256a27a21 comment sign up button in login form 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 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 9ce90c745f Changes for Phase-1 3 years ago
MaximusAshraf 2d2e22fa11 Initial commit 3 years ago