Commit Graph

455 Commits (facf80b07ec8fc3476d2a6f934203bb6b769efc8)

Author SHA1 Message Date
WaseemAbbasi22 38ce0bd9a0 Merge branch 'design_3.0_fixes' into design_3.0_latest
# Conflicts:
#	lib/dashboard_latest/dashboard_provider.dart
#	lib/dashboard_latest/widgets/request_category_fragment.dart
#	lib/dashboard_latest/widgets/requests_fragment.dart
#	lib/extensions/enum_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/models/new_models/arrival_verification_type_model.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/service_request_latest/service_request_detail_provider.dart
#	lib/service_request_latest/utilities/service_request_utils.dart
#	lib/service_request_latest/views/components/action_button/footer_action_button.dart
#	lib/service_request_latest/views/components/activities_list_view.dart
#	lib/service_request_latest/views/components/service_request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart
#	lib/service_request_latest/views/service_request_detail_main_view.dart
1 year ago
WaseemAbbasi22 3a27b9d6ca implement scan qr code and ask requester to verify flow 1 year ago
muhammad.abbasi e582072a83 improvements 1 year ago
muhammad.abbasi fbdbdf67a0 improvements 1 year ago
Sikander Saleem 426d47b64c Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart
#	lib/views/widgets/status/assistant_employee_menu.dart
#	lib/views/widgets/status/report/service_report_assistant_employee_menu.dart
1 year ago
muhammad.abbasi 8b0bf4bedc timer implemented 1 year ago
Sikander Saleem f3695b90fb assistant employee improvements 1 year ago
Sikander Saleem f20929b1dc huawei integration added & code compatibility issues fix. 1 year ago
Sikander Saleem 973c85418e code improvements & fixes. 1 year ago
muhammad.abbasi f1fe0b3339 edit maintenance request completed 1 year ago
muhammad.abbasi 77d18bd413 add 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 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
Muhammad Abbasi ad1a01b7c6 initial commit 1 year ago
Sikander Saleem 2c6e81284d 1.2.2+9 uploaded. 1 year ago
Sikander Saleem da442df2bb pending asset requests new parameter added. 1 year ago
Sikander Saleem a9042a834c text to speech, call comments & voice record added. 1 year ago
nextwo e65d2a44ed search asset ui 1 year ago
nextwo 9a1303fc5e search asset ui 1 year ago
nextwo 7ef71849dd comment unused files 1 year ago
Sikander Saleem 5348bc81eb sub work order improvements. 1 year ago
Sikander Saleem be449b8a51 android target sdk moved to 34. 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 b508e839c5 multi auth added, token verification added, multi time added on ppm. 1 year ago
Sikander Saleem e212cf75b1 ppm multi timer added. 1 year ago
Sikander Saleem e304a252d6 1.2.0 uploaded. 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 a7f2573584 remember me added. 1 year ago
Sikander Saleem ff3dfcc9cb Merge branch 'main_production' into main_design2.0 1 year ago
Sikander Saleem 6281364579 dashboard api calling structure improvement. 1 year ago
Sikander Saleem 11ab040f90 biometric / faceId auth added. cont. 1 year ago
Sikander Saleem f3b432d0c1 ppm external supplier fields added. & improvements. 1 year ago
Sikander Saleem 40fe6ec192 archived data filter added. 1 year ago
Sikander Saleem 2a53ab8b8e electrical safety, asset availability, task status and ppm service added. 1 year ago
Sikander Saleem 9c7653109d request search improvements 1 year ago
Sikander Saleem 873b5bcfec switching in multiple asset group 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 d858eeace4 improvement. 2 years ago
Sikander Saleem d2e4c8276c snag points added. 2 years ago
Sikander Saleem 9101783703 device transfer added in filters 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 cacd973386 workorder, create ,edit& sub workorder reason fixed. 2 years ago
Sikander Saleem 2734d17421 improvement 2 years ago
Sikander Saleem 96cb264bf1 ios bundle id changed to com.habib.atoms 2 years ago
Sikander Saleem 44a123b968 apns token for ios. 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 26b82fbda0 attachment added on transfer request. 2 years ago
Sikander Saleem adab2e36ea first action time added, comment fixed, 2 years ago
Sikander Saleem 965ccc3c9f voice note issue fix in update 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
Sikander Saleem 0b2ef3d114 improvements 2 years ago
nextwo 0be6013ec5 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo d3bee4f39a gas refill comments 2 years ago
Sikander Saleem eeaa9bef85 improvements. 2 years ago
nextwo 6b740549a5 my requests pagination + Sender only close sender request Sender,
Receiver can do both jobs, sender & receiver.
2 years ago
nextwo 8295fd2b1d values are not shown in overview screen. also on my request screens. 2 years ago
zaid_daoud 4309c509e8 Assistant Engineer can be unselected 2 years ago
zaid_daoud 23700d0adf Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT) 2 years ago
zaid_daoud 8fa3fd4a6e Fix Calendar Spelling 2 years ago
zaid_daoud 3e3bdf2ce6 Remove loan availability 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
nextwo 151c727861 fix calender bugs 2 years ago
zaid_daoud 9e2baae2e2 Change Chart Design && Update dark theme colors 2 years ago
zaid_daoud 04da316440 Fix Asset Filter Pagination Issue 2 years ago
Sikander Saleem d813c29802 improvements 2 years ago
Sikander Saleem 593cecbe55 improvements 2 years ago
Sikander Saleem e98bd62be9 profile image change improvement 2 years ago
zaid_daoud 03926a1fd1 Multiple spare parts in all places 2 years ago
zaid_daoud 51ef873770 Reformatting code 2 years ago
zaid.daoud 4f116b1ea4 Update Gas refill issues fixed 2 years ago
zaid.daoud 5bf73172f6 Previous Business Logic in Work order & sub work order 2 years ago
Sikander Saleem aad9c3dde1 improvements. 2 years ago
Sikander Saleem 686c70e3db profile image improvement & notificaiton 2 years ago
zaid_daoud a403fb0028 Device Transfer Issued Fixed For Sender & Receiver 2 years ago
nextwo ae71e5a53d Add timer in gas refill update & also nurse & engineer signatures should be added. 2 years ago
zaid_daoud 884471009a Sub work order screen under testing 2 years ago
Sikander Saleem 3f05bd2988 open request fixed for nurse & enigneer. 2 years ago
Sikander Saleem 29e414a703 user profile change added & improvements. 2 years ago
Sikander Saleem 708e7c80d1 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 f8ba08a44b ppm flow added. 2 years ago
Sikander Saleem 7ecd90a556 gas refill flow added. 2 years ago
zaid_daoud e29946e280 Search All Requests Done 2 years ago
Sikander Saleem 34bae463b6 improvements. 2 years ago
Sikander Saleem 3725adb0aa Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart
2 years ago
Sikander Saleem 6d0aa0e17c my requests added. 2 years ago
zaid_daoud affb486fbd Calendar API done 2 years ago
Sikander Saleem 29d83101af statuses & date added. 2 years ago
Sikander Saleem ff80897a3c dashboard apis added. 2 years ago
Sikander Saleem 67a7fcfe54 improvements. 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
Sikander Saleem 258fb2c333 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/pentry/pentry_ppm_check_list_form.dart
2 years ago
zaid_daoud 932841cbef PPM Done 2 years ago
Sikander Saleem fd18e5d39c dashboard cont 2 years ago
zaid_daoud 3299c0c7a4 Working on ppm 2 years ago
Sikander Saleem f4afe5ca5a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo 9c43eab5db device transfer 2 years ago
zaid_daoud daa427bac2 Update Work Order Screen DONE 2 years ago
zaid_daoud c3d6643ead Enhancements 2 years ago
zaid_daoud 8b7aa8235d Update Service Request DONE 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
zaid_daoud 43b2f18a1a New Work Order [In Progress] 2 years ago
zaid_daoud e407b00630 New Work Order [In Progress] 2 years ago
zaid_daoud 402f7513bd First Action Bottom Sheet Done 2 years ago
zaid_daoud 6258035a88 add room field to asset transfer 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
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 2 years ago
zaid_daoud 7d2afa23cc add record player to the recorder 2 years ago
zaid_daoud e419b17bd1 Service request design done 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
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
zaid_daoud 4bffab9c9b Request Gas refill screen Done 2 years ago
Sikander Saleem 050c710bf8 android 1.0.4 released. 2 years ago
zaid_daoud b673cd8a2b Gas refill screen 2 years ago
zaid_daoud b77a36ac50 Gas refill screen 2 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 2 years ago
zaid_daoud 05398a9f76 Enhancement 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 f0c605b07d improvements 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 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
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 3e314447c6 Fix building, floor, room issue when edit sender or receiver 2 years ago
zaid_daoud fe1885b367 Fix asset destination issue 2 years ago
zaid_daoud 0dd9400c91 Sorting gaz refill using mostRecent key 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 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 05d1976969 Make QR code searches for a specific elements which are equal to asset no. 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 0e95b32ecb Service Request [Most Recent] 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 eee1b0dc51 fix bugs 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
nextwo f132004c11 remove expected date 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 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
zaid_daoud 66100c36a4 Enhancements 2 years ago
zaid_daoud 6caab58171 Merge With Majd [part #2] 2 years ago