Commit Graph

1737 Commits (d7c8d9f3cf97e985071dce9ede3ec1d44bc5ecc2)

Author SHA1 Message Date
Sikander Saleem 141d8c001f icon added & improvements 5 months ago
WaseemAbbasi22 d675c34d5a Ui changes for all requests item view card 5 months ago
WaseemAbbasi22 a298cc7087 Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement 5 months ago
Sikander Saleem b3f2225ae6 ui changes. 5 months ago
Sikander Saleem 873a4dddeb shimmer & swipe history improvement 5 months ago
Sikander Saleem a7fada1115 Medical Gas Inspection filter value fixed. 5 months ago
WaseemAbbasi22 29917cf4e0 Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement 5 months ago
Sikander Saleem a722635dfe loan & cm item view ui changes 5 months ago
WaseemAbbasi22 2c90df8d80 Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement 5 months ago
WaseemAbbasi22 fe104e977f added date range and sort on search page 5 months ago
Sikander Saleem 8864e122bc Merge branch 'refs/heads/export_module' into export_module_ui_ux_enhancement 5 months ago
Sikander Saleem fc66e2dd8a swipe view ui changes 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 518b95eb00 ui changes 5 months ago
Sikander Saleem 1bfa8858f3 ui changes 5 months ago
Sikander Saleem e0fda1e00a ui changes 5 months ago
Sikander Saleem 05960f28e0 house keeper should not create any request. 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
Sikander Saleem 95a47858d7 chart color improvements. 5 months ago
WaseemAbbasi22 1e6a3d2f4d export feature progress and success dialog added 5 months ago
WaseemAbbasi22 77f5d41757 export feature added for asset and my request 5 months ago
Sikander Saleem d1a94df33d improvements. 5 months ago
Sikander Saleem 515da156b2 improvements. 5 months ago
Sikander Saleem d242b190ce improvements. 5 months ago
Sikander Saleem 8d60f4c81e improvements. 5 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 eea2f6b4e9 1.7.5+40 uploaded. 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
Sikander Saleem 32038102fc v1.7.4+39 uploaded on stores. nfc support devices bug fix on android 11 & below devices. 6 months ago
Sikander Saleem 213ede354e improvement. 6 months ago
Sikander Saleem a3630e0d8c improvement. 6 months ago
Sikander Saleem a372f8e139 nfc plugin updated 6 months ago
Sikander Saleem 4c26778617 haptic feedback plugin changed. 6 months ago
Sikander Saleem 1523d51533 haptic added on qr scan. 6 months ago
Sikander Saleem d59a8f4d6f qr scanner improvements 6 months ago
WaseemAbbasi22 c4b4c7f75f QR scanning fixes for Huawei asset scan 6 months ago
WaseemAbbasi22 887217646a QR scanning fixes for Huawei 6 months ago
WaseemAbbasi22 aab2a557c8 search fixes 6 months ago
WaseemAbbasi22 123738e333 location and bottomsheet keyboard bug fixes 7 months ago
Sikander Saleem bdaae11c36 nfc manager improvements 7 months ago
WaseemAbbasi22 e4b84bb3e0 Merge remote-tracking branch 'origin/main_production_upgrade' into main_production_upgrade 7 months ago
WaseemAbbasi22 765115390f bottomsheet fixes 7 months ago
Sikander Saleem abe29fc7b3 Merge branch 'refs/heads/main_production' into main_production_upgrade 7 months ago
Sikander Saleem e04d4c1df8 v1.7.2+36 uploaded on stores. 7 months ago
Sikander Saleem 7f359ba496 logic improved for pre select values. 7 months ago
Sikander Saleem e87346e5b3 qr & barcode scanner improvement. 7 months ago
Sikander Saleem b94d5d1fbd android sdk upgraded to 36, 16kb page size support added. 7 months ago
Sikander Saleem 0a6fca7f63 room model changed to json. 7 months ago
Sikander Saleem 59a5103cf1 release configuration, version 1.7.0+34 uploaded on stores. 7 months ago
Sikander Saleem c6a6f24774 asset transfer improvement 7 months ago
Sikander Saleem 0ec0a45c94 improvement 8 months ago
Sikander Saleem 4ab1ad941a unread message string same as web. 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 d837d01629 improvement 8 months ago
Sikander Saleem b45afef75c pre-release UAT 8 months ago
Sikander Saleem 8adc8f8fc3 improvements 8 months ago
Sikander Saleem 86c530dc45 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 71dfcde5a1 Merge branch 'refs/heads/design_3.0_rota_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
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 260dfbcf06 demoRequest model updated in asset model 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 9226fe3ac7 asset room number 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 07c3775887 unread message list 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 4d5f001cd2 dropdown last item overlapping with navigation bar 8 months ago
Sikander Saleem 6c6ba32997 delivered status added. 8 months ago
Sikander Saleem e16add345d document lookup changed. 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 53a3282da0 v1.6.0 uploaded on stores 8 months ago
Sikander Saleem cdc69fcee0 asset scan user feedback if not found. 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 f0d79da6db release config added. 8 months ago
Sikander Saleem df8d22f792 chat employee id changes. 8 months ago
Sikander Saleem 267a4445d1 ui improvements 8 months ago
Sikander Saleem 9dc19354a2 hide loan for release 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 c50e979790 keyboard dismiss issue fixed. 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 4cf45f996d unassigned api payload changed. 8 months ago
Sikander Saleem 8db4094716 assign to me & cancel added for asset transfer. 8 months ago
Sikander Saleem b14130e6c7 Merge branch 'design_3.0_rota_module' into design_3.0_eng_role_module
# Conflicts:
#	lib/views/pages/user/profile_page.dart
8 months ago
Sikander Saleem d993a22b39 monthly calender added for rota 8 months ago
Sikander Saleem 0f4a409780 assign to me added ion gas refill and tasks 8 months ago
WaseemAbbasi22 1df25cc9dd validation added for forms 8 months ago
Sikander Saleem 594fabd51a uat apk provided 8 months ago
WaseemAbbasi22 42677a72b3 improvements 8 months ago
Sikander Saleem 8f2e9db062 existing loan check api added. 8 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
8 months ago
WaseemAbbasi22 1e158e8bd4 update form changed 8 months ago
Sikander Saleem c69bcc2843 improvement. 8 months ago
Sikander Saleem 4e56746e88 evaluation form added-1. 8 months ago
Sikander Saleem cea77ff7f7 evaluation form added. 8 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 8 months ago
Sikander Saleem 5a5995306b improvement. 8 months ago
WaseemAbbasi22 3d77a96fda added vendor dropdown along with free text 8 months ago
WaseemAbbasi22 afa165dc3d added vendor dropdown along with free text 8 months ago
WaseemAbbasi22 63efb3fae0 change vendor details from dropdown to free text 8 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
8 months ago
WaseemAbbasi22 20b362142c bug fixes 9 months ago
WaseemAbbasi22 7c8855c423 bug fixes 9 months ago
WaseemAbbasi22 938f5173a4 improvements 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 786d89404e shift start time and end time improvement. 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 c377c67f40 rota module added. 9 months ago
Sikander Saleem 6f43fd777a user shift information added. 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
Sikander Saleem 520e7af640 fcm initialization changed to landing page 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 9 months ago
Sikander Saleem af6ae868d7 improvements 9 months ago
WaseemAbbasi22 d57348dd92 bug fixes for site and department previously it was showing all sites not related to that specif user 9 months ago
WaseemAbbasi22 e303b4e099 chat bug fixes 9 months ago
WaseemAbbasi22 66b77c51a6 loan site bug fixes 9 months ago
WaseemAbbasi22 077095502e chat count implemented 9 months ago
WaseemAbbasi22 2425c78cf9 chat count implemented 9 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
Sikander Saleem a7c206e6f4 chat notification redirection added. 10 months ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 10 months ago
Sikander Saleem a103eae1c1 demo module ui cont. 10 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 10 months ago
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 10 months ago
Sikander Saleem 5faa87c1b9 Merge branch 'refs/heads/design_3.0_medical_gas_inspection' into design_3.0_demo_module 10 months ago
Sikander Saleem 282bf04094 Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_medical_gas_inspection 10 months ago
Sikander Saleem 1ebd6f2fbc Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/providers/api/all_requests_provider.dart
10 months ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 10 months ago
Sikander Saleem 2b274f1f83 bug 1518 fixed. 10 months ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 10 months ago
Sikander Saleem 9637909531 demo module starting... 10 months ago
Sikander Saleem 86f96a8f62 medical gas ui added. 10 months ago
Sikander Saleem db2175b7f5 quality auditor role added. 10 months ago
Sikander Saleem d765bf0b83 medical gas cont. 10 months ago
Sikander Saleem 883210e61b merge conflict fixed 10 months ago
Sikander Saleem ea05e965d5 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/tm_module/device_transfer/device_transfer_details.dart
#	lib/views/widgets/gas_refill/gas_refill_list.dart
10 months ago
Sikander Saleem 58ff17e008 Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
10 months ago
Sikander Saleem 7d7a34a6d5 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 10 months ago
Sikander Saleem 16de0eaa41 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
10 months ago
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 10 months ago
Sikander Saleem 4b991d807c v1.4.0+31 uploaded on stores. 10 months ago
Sikander Saleem f2ebadf1b7 attachment list view added in files list widget. 10 months ago
Sikander Saleem 4763132302 attachment as listview added. 10 months ago
Sikander Saleem bf2b777f8d chat improvements. 10 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 10 months ago
WaseemAbbasi22 789522b79b asset delivery modules design flow completed 10 months ago
Sikander Saleem a9362d90f5 asset information auto fetch from CM workOrder. 10 months ago
Sikander Saleem 30bf847e6e department dropdown return first index item fixed. 10 months ago
Sikander Saleem f0c003e6fa disabled loan type dropdown added. 10 months ago
Sikander Saleem 0a9dd86ce0 improvements. 10 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 10 months ago
Sikander Saleem af69b2959b Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/api_manager.dart
#	lib/controllers/api_routes/urls.dart
10 months ago
Sikander Saleem 12cd68a30f Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/providers/api/all_requests_provider.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
10 months ago
Sikander Saleem f4d47244be Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
#	lib/controllers/providers/api/user_provider.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.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
10 months ago
Sikander Saleem 05e97a5c47 apk provided for pre-release. 10 months ago
Sikander Saleem 7cdd3aa58a dev to uat env 10 months ago
Sikander Saleem 16d5eb32b9 assign fe user model updated. 10 months ago
Sikander Saleem 5d2291a30f loan option for in progress requests. 10 months ago
Sikander Saleem 290cdf29d8 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_page.dart
10 months ago
Sikander Saleem 8e29c84c70 loan improvements. 10 months ago
waseemabbasi22 2962f248e0 timer fixes 10 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 10 months ago
Sikander Saleem e7e0f7375c chat fix when contact persons list is empty. 11 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 11 months ago
Sikander Saleem 22fd3c8cc9 loan equipment item view added; 11 months ago
Sikander Saleem e76067bdac LoanTypeId param added. 11 months ago
Sikander Saleem 60511b60cf files refactoring 11 months ago
Sikander Saleem 09762fd278 files refactoring 11 months ago
Sikander Saleem 1a3861d816 files refactoring 11 months ago
Sikander Saleem 16a2fa2b26 files refactoring 11 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 11 months ago
waseemabbasi22 05d9224a08 Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
11 months ago
waseemabbasi22 de48ca97bd initial test done 11 months ago
waseemabbasi22 c9d2df4ea7 Merge remote-tracking branch 'origin/design_3.0_internal_audit_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
11 months ago
waseemabbasi22 b4943aff3d initial test done 11 months ago
Sikander Saleem a3509e9464 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/main.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
11 months ago
Sikander Saleem f6f5048cc8 Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	pubspec.lock
#	pubspec.yaml
11 months ago
Sikander Saleem 60125bb6d9 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 11 months ago
Sikander Saleem 9eb828cc75 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
11 months ago
Sikander Saleem 92a94577d5 merge conflict resolved. 11 months ago
Sikander Saleem 6ef6bc40a0 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/dashboard_latest/widgets/request_category_list.dart
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
11 months ago
waseemabbasi22 c02fc2f1b1 api integration inprogress 11 months ago
waseemabbasi22 7291d1b4d8 Merge branch 'design_3.0_traf_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
11 months ago