Commit Graph

406 Commits (facf80b07ec8fc3476d2a6f934203bb6b769efc8)

Author SHA1 Message Date
muhammad.abbasi 457455a1b5 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
1 year ago
muhammad.abbasi 0095facdf5 maintenance request flow in progress 1 year ago
Sikander Saleem e1aaa71ae7 spare part comment fix and improvement. 1 year ago
Sikander Saleem 3484859028 dashboard & workorder details bug fixes. 1 year ago
muhammad.abbasi 473b26036e initial testing 1 year ago
muhammad.abbasi c2b3288423 in progress 1 year ago
muhammad.abbasi e8dc052d02 integrating api in new flow 1 year ago
muhammad.abbasi acbf33e2a2 Merge branch 'refs/heads/design_3.0_sdk_upgrade' into design_3.0_waseem_dev
# Conflicts:
#	lib/service_request_latest/views/components/request_detail_view.dart
1 year ago
muhammad.abbasi 8dd596bc35 -design completed 1 year ago
Sikander Saleem 69ae0147bb Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/dashboard_latest/dashboard_provider.dart
#	lib/dashboard_latest/dashboard_view.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/dashboard_latest/widgets/requests_fragment.dart
#	lib/new_views/app_style/app_color.dart
#	lib/service_request_latest/request_detail_provider.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/request_detail_main_view.dart
1 year ago
Sikander Saleem 0d333fa688 dashboard screen & service detail screen, flow changed. 1 year ago
muhammad.abbasi 53c5240377 ui fixes 1 year ago
muhammad.abbasi 68a8dc250f bug fixes 1 year ago
muhammad.abbasi d99a083792 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 be4c8d7653 null safety conversation 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 246bb1fb55 pagination added 1 year ago
Sikander Saleem a1941511a0 call comments are mandatory now. 1 year ago
Sikander Saleem da442df2bb pending asset requests new parameter added. 1 year ago
nextwo 49a6ac8996 add oracle code parameter 1 year ago
nextwo 7ef71849dd comment unused files 1 year ago
Sikander Saleem 5348bc81eb sub work order improvements. 1 year ago
nextwo 1f18dcadb7 majd 1 year ago
nextwo b792585810 add timer list in asset transfer for sender and receiver 1 year ago
nextwo 67854d2e8c add timer list in asset transfer for sender and receiver 1 year ago
Sikander Saleem 8273537b00 create supplier engineer functionality added. 1 year ago
Sikander Saleem e212cf75b1 ppm multi timer added. 1 year ago
Sikander Saleem 494087ef18 update service request & work order attachment issue fix. 1 year ago
Sikander Saleem 06cee34657 first action fixed remotely, start & end date added. 1 year ago
Sikander Saleem f3b432d0c1 ppm external supplier fields added. & improvements. 1 year ago
Sikander Saleem d50f711aec archived cont. 1 year ago
Sikander Saleem ae8991493b supplier added on ppm update, cont. 1 year ago
Sikander Saleem 7b6b170f23 requester info added. 1 year ago
Sikander Saleem 9c7653109d request search improvements 1 year ago
Sikander Saleem d6c3fc2778 head nurse role added, pending asset service requests added & AssetGroup header added. 2 years ago
Sikander Saleem 9f7a9acede asset room model fix 2 years ago
Sikander Saleem c7e2736bd8 department name issue fixed on login 2 years ago
Sikander Saleem ebef7a7d81 loan availability added. 2 years ago
Sikander Saleem caa1f975ab ppm timer & receiver name fixed. 2 years ago
Sikander Saleem adba86b10e snag list remaining 4 points resolved & improvements. 2 years ago
Sikander Saleem 58f5fbab5e push notifications added. 2 years ago
Sikander Saleem d217500df4 improvements 2 years ago
Sikander Saleem 7db4bca3b2 receiver name added on transfer detail 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
Sikander Saleem 4d0b18b5a8 room model & gas refill request number added. 2 years ago
Sikander Saleem 2932796068 asset transfer room model & comment added 2 years ago
Sikander Saleem 6bb2b81ac3 improvements & fixes 2 years ago
nextwo d3bee4f39a gas refill comments 2 years ago
zaid_daoud 08ada0c275 Spare parts became mandatory only if the callLastSituation is [PART INSTALLATION (id = 12)] 2 years ago
zaid_daoud 7200efcbca ppm issues fixed & code formatting 2 years ago
zaid_daoud 67a224f60a fix timer issue on update transfer asset & update gas refill 2 years ago
zaid_daoud 58e6118cff change function name 2 years ago
zaid_daoud c8a02c828d Search for requests by single item. 2 years ago
zaid_daoud 2ac79188d9 change some labels 2 years ago
Sikander Saleem 593cecbe55 improvements 2 years ago
zaid_daoud af17525c3c Enhancements 2 years ago
zaid_daoud 27fec0183f Enhancements on search and filter reset button 2 years ago
zaid_daoud 51ef873770 Reformatting code 2 years ago
zaid.daoud 5bf73172f6 Previous Business Logic in Work order & sub work order 2 years ago
zaid_daoud a403fb0028 Device Transfer Issued Fixed For Sender & Receiver 2 years ago
zaid_daoud 042d7df708 Sub work order screen done 2 years ago
zaid_daoud 884471009a Sub work order screen under testing 2 years ago
Sikander Saleem 31b0eaeb2e asset image fixed. 2 years ago
Sikander Saleem 29e414a703 user profile change added & improvements. 2 years ago
zaid_daoud 4cf650702f Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud dbb26d8cd4 Filter Requests DONE 2 years ago
Sikander Saleem c6115e5938 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem c96f611051 service request flow added & improvements 2 years ago
zaid_daoud cc089d917f simple change 2 years ago
zaid_daoud e29946e280 Search All Requests Done 2 years ago
zaid_daoud affb486fbd Calendar API done 2 years ago
Sikander Saleem af5144ffa3 all request details model updated. 2 years ago
Sikander Saleem ff80897a3c dashboard apis added. 2 years ago
zaid_daoud 37a9cd3cc9 service request comment done 2 years ago
Sikander Saleem b03f350a2c Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 2c9f2dce08 notifications api added. 2 years ago
zaid_daoud a2e2d9ac12 Timer For Working Hours 2 years ago
zaid_daoud 932841cbef PPM Done 2 years ago
nextwo 9c43eab5db device transfer 2 years ago
nextwo a85d8f4880 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
2 years ago
nextwo 57abce1b75 device transfer 2 years ago
zaid_daoud 7a06f251be Create New Work Order Done 2 years ago
zaid_daoud 743bb28b1d Create New Work Order Done 2 years ago
nextwo 1daf9b4437 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo 62f6f135bb device transfer 2 years ago
zaid_daoud 43b2f18a1a New Work Order [In Progress] 2 years ago
zaid_daoud e407b00630 New Work Order [In Progress] 2 years ago
zaid_daoud ee16e35485 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud fb3f442ed5 asset search done & filter assets need to be discussed 2 years ago
nextwo 985ab01bf0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 5cf84e6988 Change device class name to asset 2 years ago
nextwo e21bde0153 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
2 years ago
nextwo 4cc12691ac gas refill 2 years ago
zaid_daoud 957e3d9e6f Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud 3959068858 Asset Transfer Done + Multiple Image Picker + Enhancements 2 years ago
nextwo d6de203ba0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 2 years ago
nextwo 2604d8b253 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	pubspec.yaml
2 years ago
zaid_daoud e419b17bd1 Service request design done 2 years ago
nextwo 64b249a0cd gas refill 2 years ago
Sikander Saleem eaa9bb62ee Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	assets/translations/ar.json
#	lib/views/widgets/equipment/pick_asset.dart
2 years ago
Sikander Saleem 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
zaid_daoud 937c30736e test 2 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 2 years ago
zaid_daoud 1e1ac215ea Rename asset to be device as it was before 2 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 2 years ago
Sikander Saleem c8e3f2df48 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 392182e234 track service request cont. 2 years ago
zaid_daoud 4bffab9c9b Request Gas refill screen Done 2 years ago
zaid_daoud b77a36ac50 Gas refill screen 2 years ago
zaid_daoud b1e93abf4d Gas refill design without submit button 2 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 2 years ago
zaid_daoud 1db543710e Working on gas request screen 2 years ago
zaid_daoud 3bdae42769 1- change text form field code
2- app bar design
3- working on request gas refill screen
2 years ago
zaid_daoud 9c25b6d2e0 Add Submit Button To the new requests screens 2 years ago
zaid_daoud 8e315d54d0 Default App Bar 2 years ago
zaid_daoud 42deeeb104 new service request page 2 years ago
zaid_daoud 1f4fbee83b floating button animation 2 years ago
zaid_daoud 95eac4b196 Call Us bottomsheet 2 years ago
zaid_daoud ebb7c114a2 Dashboard Name 2 years ago
zaid_daoud 06152bee2f Fix Bottom Nav Bar Style 2 years ago
nextwo e20f3b5433 app bar
nav bar
2 years ago
zaid_daoud ca673787f1 1 -> New Way of Localizations
2 -> Implementing Login Page
3 -> New way to achieve responsive design
2 years ago
zaid_daoud 3b3de831f0 Preparing new style (theme & colors) 2 years ago
Sikander Saleem 71ccd100b5 Merge branch 'zaid_development_new' into sikander-development
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 years ago
zaid_daoud 630a4e1b9d Add (mr number) field to the WO details bottom sheet 2 years ago
Sikander Saleem 00ba893bf2 fixes. 2 years ago
Sikander Saleem 5fc2aceecf ppm disable edit on closed, gaz refill site fix, & print statements remove. 2 years ago
zaid_daoud 9dca070121 add asset id to spare parts API
add attachments and signature to the sender & receiver info
2 years ago
zaid_daoud 5c14375d6f Fixing PPM issues 2 years ago
zaid_daoud 3e314447c6 Fix building, floor, room issue when edit sender or receiver 2 years ago
zaid_daoud a26684de11 Device Status in PM Entry 2 years ago
Sikander Saleem 300bc0a1a6 improvements 2 years ago
zaid_daoud fe1885b367 Fix asset destination issue 2 years ago
Sikander Saleem d63a18226a ppm attachments fix 2 years ago
zaid_daoud dc2dab5869 Multiple Images Everywhere 2 years ago
zaid_daoud 0950639c22 Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new 2 years ago
zaid_daoud fe9ca387ed Multiple Images Everywhere 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 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 0b46974c47 Change Pick Image to Pick File 2 years ago
zaid_daoud fd439a4f46 Track Asset Transfer [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
zaid_daoud d277a28f54 Activate Attachment Picker Dialog with a New Field (Pick From Files) 2 years ago
zaid_daoud 8962889973 Merge remote-tracking branch 'origin/majd_development_new' into zaid_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
zaid_daoud 5aedb12004 Vendor Fields Have Been Added 2 years ago
zaid_daoud a3264f4f1c Multiple types of attachments 2 years ago
nextwo d33c97d1df make return to service not required 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 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 ac38159b0a User Model Change 2 years ago
zaid_daoud af1874600a Improvements 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 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
nextwo c393f29829 some changes 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 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 0124918d29 status added to update service request 2 years ago
Sikander Saleem 5de7b1b759 pm entry nurse & eng signature fix. 2 years ago
zaid_daoud 4997e1e3df Timer Fixed 2 years ago
Sikander Saleem 8ada0dd0af fixes-1 2 years ago
Sikander Saleem da286ea075 fixes 2 years ago
zaid_daoud 5890835f7b Simple Changes 2 years ago
Sikander Saleem be6a418bb6 sender & receiver transfer edit login update & fixes 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 45b66e6b2a Convert (Start Date & End Date) to Timer 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
zaid_daoud 8f05983c14 Ready For Testing 2 years ago
zaid_daoud 575005ebdd Enhancements 2 years ago
nextwo f97712e434 work order 2 years ago