Commit Graph

103 Commits (f2b472f4df70ad7103da7f617196d2e2b12c2ca4)

Author SHA1 Message Date
WaseemAbbasi22 aab2a557c8 search fixes 7 months ago
Sikander Saleem 3180a80a88 demo moved to permission api. 9 months ago
Sikander Saleem 86c530dc45 improvements 9 months ago
Sikander Saleem 7020b9b36e improvement 9 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
9 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
9 months ago
Sikander Saleem 31a9296a8e improvements 9 months ago
Sikander Saleem df8d22f792 chat employee id changes. 9 months ago
Sikander Saleem 267a4445d1 ui improvements 9 months ago
Sikander Saleem 9dc19354a2 hide loan for release 9 months ago
Sikander Saleem 6cf051e66e incident detail page addded. 9 months ago
Sikander Saleem 1a2845337b improvements 9 months ago
WaseemAbbasi22 42677a72b3 improvements 10 months ago
WaseemAbbasi22 1e158e8bd4 update form changed 10 months ago
WaseemAbbasi22 938f5173a4 improvements 10 months ago
WaseemAbbasi22 5d856fc46b improvements 10 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
10 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
10 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
10 months ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 10 months ago
WaseemAbbasi22 3944a549b2 requested changes done 10 months ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 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
11 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 11 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 11 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
11 months ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 11 months ago
WaseemAbbasi22 789522b79b asset delivery modules design flow completed 11 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 11 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
11 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
11 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 12 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 12 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
12 months ago
waseemabbasi22 b4943aff3d initial test done 12 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
12 months ago
WaseemAbbasi22 542070c791 improvements 12 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 1 year ago
Sikander Saleem 22a667a7b3 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/dashboard_latest/widgets/request_category_list.dart
#	lib/models/new_models/dashboard_detail.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
1 year ago
Sikander Saleem 160dc57b86 Merge branch 'refs/heads/design_3.0_data_segregation' into design_3.0_asset_inventory_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
1 year ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 1 year ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 1 year ago
Sikander Saleem 144951caec traf request creation completed. 1 year ago
Sikander Saleem 174e714d38 nurse cannot see recall and alert. 1 year ago
Sikander Saleem 5d28eb6c21 ui improvement. 1 year ago
Sikander Saleem ceee6d689d total working hours added on task detail. 1 year ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 1 year ago
Sikander Saleem d3c000004e code improvements 1 year ago
WaseemAbbasi22 e5775019a4 asset inventory design 1 year ago
Sikander Saleem 7efeeed619 bottom sheet ui improvements,safe area added. 1 year ago