Commit Graph

268 Commits (188df51ce3ee28ccffebae2845c4b5fe6587bf83)

Author SHA1 Message Date
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
7 months ago
Sikander Saleem 619c643367 Merge branch 'refs/heads/design_3.0_eng_role_module' into design_3.0_demo_module 7 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
7 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
7 months ago
Sikander Saleem 4b44a41598 demo request cancellation 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 0a06edd883 improvements 8 months ago
Sikander Saleem f0d79da6db release config added. 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 cb2329a6c2 incident create request completed. 8 months ago
Sikander Saleem 58ee00b00a incident module dev -1 8 months ago
Sikander Saleem 1a2845337b improvements 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
Sikander Saleem 594fabd51a uat apk provided 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 cea77ff7f7 evaluation form added. 8 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 8 months ago
WaseemAbbasi22 afa165dc3d added vendor dropdown along with free text 8 months ago
WaseemAbbasi22 938f5173a4 improvements 8 months ago
WaseemAbbasi22 5d856fc46b improvements 8 months ago
WaseemAbbasi22 e0ed594072 API's implemented 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 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 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 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
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 9 months ago
WaseemAbbasi22 e303b4e099 chat bug fixes 9 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
9 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 9 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 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