Commit Graph

510 Commits (e4b84bb3e0fa998c3d3fe246b23ca6a19d080988)

Author SHA1 Message Date
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 7f359ba496 logic improved for pre select values. 7 months ago
Sikander Saleem b94d5d1fbd android sdk upgraded to 36, 16kb page size support added. 7 months ago
Sikander Saleem 3180a80a88 demo moved to permission api. 8 months ago
Sikander Saleem 86c530dc45 improvements 8 months ago
Sikander Saleem 7020b9b36e improvement 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 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 31a9296a8e improvements 8 months ago
Sikander Saleem 2349925ed1 information dialog 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 6cf051e66e incident detail page addded. 8 months ago
Sikander Saleem 58ee00b00a incident module dev -1 8 months ago
Sikander Saleem 1a2845337b improvements 8 months ago
WaseemAbbasi22 42677a72b3 improvements 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
WaseemAbbasi22 938f5173a4 improvements 9 months ago
WaseemAbbasi22 5d856fc46b improvements 9 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
Sikander Saleem 520e7af640 fcm initialization changed to landing page 9 months ago
WaseemAbbasi22 73ee12cba4 Atoms-1743,1745,1748 fixes 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 2425c78cf9 chat count implemented 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 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 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 17210195db uat improvements. md->department, enable recall and alert for quality user. 10 months ago
Sikander Saleem 86f96a8f62 medical gas ui added. 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