Commit Graph

489 Commits (63d4c79a739a0e8b171e1aaf33a0710284a5bee2)

Author SHA1 Message Date
WaseemAbbasi22 d45c6a1db8 Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement 5 months ago
Sikander Saleem 1da0ff7d14 bottom sheet color scheme, 5 months ago
Sikander Saleem 620945d1c1 attachment color scheme changed. 5 months ago
Sikander Saleem 6a01df319d session expired dialog color scheme. 5 months ago
Sikander Saleem 1699acc27c improvements 5 months ago
Sikander Saleem b9aabf8691 improvements 5 months ago
WaseemAbbasi22 27557c0555 Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement 5 months ago
Sikander Saleem c553253917 time picker unified method added. 5 months ago
WaseemAbbasi22 b963dc65bc Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement
# Conflicts:
#	lib/modules/cm_module/cm_detail_page.dart
5 months ago
Sikander Saleem 19b6de7ef8 date picker and time picker color scheme changes 5 months ago
WaseemAbbasi22 8cd3e8aa3b export improvements 5 months ago
Sikander Saleem e09ba251ca improvements 5 months ago
Sikander Saleem 5a61d52455 improvements 5 months ago
Sikander Saleem c12a0ce88d bug fixes for clear filters. 5 months ago
Sikander Saleem 789ef59b0b filter chips added. 5 months ago
Sikander Saleem 59ad837864 improvements. 5 months ago
Sikander Saleem eba5552bc8 improvement. 5 months ago
Sikander Saleem 4b5150eb69 icons added. 5 months ago
Sikander Saleem 35d4020013 multiple dropdown chips added. 5 months ago
Sikander Saleem 05f3d89930 multiple dropdown selection fixed. 5 months ago
Sikander Saleem 831cc1fef5 Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement 5 months ago
Sikander Saleem 141d8c001f icon added & improvements 5 months ago
WaseemAbbasi22 d675c34d5a Ui changes for all requests item view card 5 months ago
Sikander Saleem a722635dfe loan & cm item view ui changes 5 months ago
Sikander Saleem 8864e122bc Merge branch 'refs/heads/export_module' into export_module_ui_ux_enhancement 5 months ago
Sikander Saleem 7f99349067 tab bar ui changes 5 months ago
Sikander Saleem 252a03b219 ui changes 5 months ago
Sikander Saleem 07560f3b57 ui changes 5 months ago
Sikander Saleem 1bfa8858f3 ui changes 5 months ago
Sikander Saleem e0fda1e00a ui changes 5 months ago
WaseemAbbasi22 729a03e1a9 Print request added for CM request 5 months ago
WaseemAbbasi22 d3dadb70c3 improvements 5 months ago
Sikander Saleem 8e53a271c8 ui changes 5 months ago
Sikander Saleem 3429dcff60 ui changes 5 months ago
Sikander Saleem 839f878d35 ui changes 5 months ago
WaseemAbbasi22 1e6a3d2f4d export feature progress and success dialog added 6 months ago
WaseemAbbasi22 77f5d41757 export feature added for asset and my request 6 months ago
Sikander Saleem d1a94df33d improvements. 6 months ago
Sikander Saleem 515da156b2 improvements. 6 months ago
Sikander Saleem d242b190ce improvements. 6 months ago
Sikander Saleem 8d60f4c81e improvements. 6 months ago
Sikander Saleem 023a47f69f recurrent task, cleaner improvements. 6 months ago
Sikander Saleem 68fcc444d9 Merge branch 'refs/heads/main_production_ai_enhancement' into cleaner_module 6 months ago
WaseemAbbasi22 33f1f07e86 housekeeping module completed 6 months ago
Sikander Saleem 1d8ef3676b loan details user model, bug fixed. 6 months ago
Sikander Saleem 3352c73e1d chat text msg improvement, 6 months ago
Sikander Saleem b3ec1f0a63 code enhancement with ai. 6 months ago
Sikander Saleem b09609f692 commented files/codes deleted. 6 months ago
WaseemAbbasi22 765115390f bottomsheet fixes 7 months ago
Sikander Saleem 0a6fca7f63 room model changed to json. 7 months ago
Sikander Saleem c6a6f24774 asset transfer improvement 8 months ago
Sikander Saleem 0ec0a45c94 improvement 8 months ago
Sikander Saleem c0f670c33a improvement 8 months ago
Sikander Saleem 121a4a9762 evaluation form submit fixed. 8 months ago
Sikander Saleem 3180a80a88 demo moved to permission api. 8 months ago
Sikander Saleem 8adc8f8fc3 improvements 8 months ago
Sikander Saleem 7020b9b36e improvement 8 months ago
Sikander Saleem 2e3736cdc9 Merge branch 'design_3.0_loan_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/models/generic_attachment_model.dart
#	lib/modules/loan_module/pages/loan_equipment_detail_page.dart
8 months ago
Sikander Saleem 188df51ce3 spare cost added on cm detail 8 months ago
Sikander Saleem 65c0566eef Merge branch 'design_3.0_incident_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
#	lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
8 months ago
Sikander Saleem 619c643367 Merge branch 'refs/heads/design_3.0_eng_role_module' into design_3.0_demo_module 8 months ago
Sikander Saleem 64fbf46b82 Merge branch 'refs/heads/design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/loan_module/pages/loan_equipment_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
#	lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
8 months ago
Sikander Saleem edcc1471a1 request info added. 8 months ago
Sikander Saleem 16b71e1685 site switch bug fixed 8 months ago
WaseemAbbasi22 d723b6bc16 refresh screen after update data 8 months ago
Sikander Saleem c81d3181d2 acknowledgment added for demo request creation. 8 months ago
Sikander Saleem 17dc2a7809 bottom nav padding added. 8 months ago
Sikander Saleem 6d4bc4694a ovr ticker validation added. 8 months ago
Sikander Saleem 5d945e07cb validation added, if asset not selected 8 months ago
Sikander Saleem 4b44a41598 demo request cancellation added. 8 months ago
Sikander Saleem c510c8e168 unread message list added. 8 months ago
Sikander Saleem 4fdd04b106 unread messages api added. 8 months ago
Sikander Saleem 5dee736d28 multiple timer entries bux fixed. 8 months ago
Sikander Saleem 6c6ba32997 delivered status added. 8 months ago
Sikander Saleem 67f9081f50 ovr ticket information added. 8 months ago
Sikander Saleem 66b8ea59d9 signature added. 8 months ago
Sikander Saleem 67da263e0d loan improvements 8 months ago
Sikander Saleem 0a06edd883 improvements 8 months ago
Sikander Saleem af1680e575 end user status added. 8 months ago
Sikander Saleem 31a9296a8e improvements 8 months ago
Sikander Saleem 2997eef5ad chat sync fixes. 8 months ago
Sikander Saleem 2349925ed1 information dialog added. 8 months ago
Sikander Saleem df8d22f792 chat employee id changes. 8 months ago
Sikander Saleem f6a433ca09 Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
8 months ago
Sikander Saleem ce873d99a5 Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
8 months ago
Sikander Saleem 35e494863f Merge branch 'design_3.0_cx_module' into design_3.0_loan_module 8 months ago
Sikander Saleem 450128b26f Merge branch 'design_3.0_traf_module' into design_3.0_cx_module 8 months ago
Sikander Saleem 6e1b63cef8 improvements. 8 months ago
Sikander Saleem 6cf051e66e incident detail page addded. 8 months ago
Sikander Saleem cb2329a6c2 incident create request completed. 8 months ago
Sikander Saleem 58ee00b00a incident module dev -1 8 months ago
Sikander Saleem b20f42848b supplier attachment, extend demo period and submit evaluation. 8 months ago
Sikander Saleem 1a2845337b improvements 8 months ago
Sikander Saleem 5391cc324c improvements 8 months ago
Sikander Saleem 5855b347e9 improvements 8 months ago
Sikander Saleem 8b2e47df09 check request type is new, user can change the quantity, improvement. 8 months ago
Sikander Saleem 8db4094716 assign to me & cancel added for asset transfer. 8 months ago
Sikander Saleem 0f4a409780 assign to me added ion gas refill and tasks 8 months ago
WaseemAbbasi22 1df25cc9dd validation added for forms 9 months ago
WaseemAbbasi22 42677a72b3 improvements 9 months ago
Sikander Saleem 8f2e9db062 existing loan check api added. 9 months ago
WaseemAbbasi22 60051af331 Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/demo_module/create_demo_request_page.dart
#	lib/modules/demo_module/demo_provider.dart
9 months ago
WaseemAbbasi22 1e158e8bd4 update form changed 9 months ago
Sikander Saleem 4e56746e88 evaluation form added-1. 9 months ago
Sikander Saleem cea77ff7f7 evaluation form added. 9 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 9 months ago
Sikander Saleem 5a5995306b improvement. 9 months ago
WaseemAbbasi22 3d77a96fda added vendor dropdown along with free text 9 months ago
WaseemAbbasi22 afa165dc3d added vendor dropdown along with free text 9 months ago
WaseemAbbasi22 63efb3fae0 change vendor details from dropdown to free text 9 months ago
WaseemAbbasi22 1f3c0bad97 Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/cm_module/cm_detail_page.dart
9 months ago
WaseemAbbasi22 20b362142c bug fixes 9 months ago
WaseemAbbasi22 7c8855c423 bug fixes 9 months ago
WaseemAbbasi22 5d856fc46b improvements 9 months ago
WaseemAbbasi22 d13e9d0439 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 9 months ago
WaseemAbbasi22 9704c26af9 confirmation dialoge added for cancel request 9 months ago
WaseemAbbasi22 e0ed594072 API's implemented 9 months ago
Sikander Saleem e544fc640e add 0 in gas refill 9 months ago
WaseemAbbasi22 56252716b3 Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module 9 months ago
Sikander Saleem 9b00c0c158 improvements 9 months ago
WaseemAbbasi22 bf4d2a3257 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 9 months ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 9 months ago
Sikander Saleem 9eaae96c84 Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
#	lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
9 months ago
Sikander Saleem 178309eb1e Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
9 months ago
Sikander Saleem da85a2b639 Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
9 months ago
Sikander Saleem 4bd055cfe8 merge conflict resolved. 9 months ago
Sikander Saleem 48b4b5e368 Merge branch 'design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/notification/firebase_notification_manger.dart
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_widget.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/views/pages/user/requests/pending_requests_screen.dart
9 months ago
WaseemAbbasi22 bff132ec6b API implementation inprogress 9 months ago
WaseemAbbasi22 a0a084803d UI improvements 9 months ago
WaseemAbbasi22 73ee12cba4 Atoms-1743,1745,1748 fixes 9 months ago
WaseemAbbasi22 415bdf18f1 improvements 9 months ago
Sikander Saleem b78d10af46 current user employee id for chat. 9 months ago
WaseemAbbasi22 1c86fe71a2 improvements and added modifiedBy details 9 months ago
WaseemAbbasi22 ac50236aa2 bugs fixes 9 months ago
Sikander Saleem 7a5db103e0 api integrate cont. 9 months ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 9 months ago
WaseemAbbasi22 3944a549b2 requested changes done 9 months ago
WaseemAbbasi22 bfb2685c55 added form design for installation and pullout, handle pullout type task and other improvements 9 months ago
WaseemAbbasi22 4f9f76515d added form design for installation and pullout, handle pullout type task and other improvements 9 months ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 9 months ago
WaseemAbbasi22 e598f3b5ad chat bug fixes 10 months ago
Sikander Saleem af6ae868d7 improvements 10 months ago
WaseemAbbasi22 d57348dd92 bug fixes for site and department previously it was showing all sites not related to that specif user 10 months ago
WaseemAbbasi22 e303b4e099 chat bug fixes 10 months ago
WaseemAbbasi22 66b77c51a6 loan site bug fixes 10 months ago
WaseemAbbasi22 077095502e chat count implemented 10 months ago
WaseemAbbasi22 2425c78cf9 chat count implemented 10 months ago
Sikander Saleem ab6b143763 improvements 10 months ago
Sikander Saleem 9f670d4a0b Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
10 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 10 months ago