Commit Graph

447 Commits (2e3736cdc9b17615283dccdac84d8b4fbbc0698c)

Author SHA1 Message Date
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
2 days 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
2 days 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
2 days 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
2 days ago
Sikander Saleem 260dfbcf06 demoRequest model updated in asset model 2 days ago
Sikander Saleem 66b8ea59d9 signature added. 1 week ago
Sikander Saleem 67da263e0d loan improvements 1 week 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
2 weeks 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
2 weeks ago
Sikander Saleem cb2329a6c2 incident create request completed. 2 weeks 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
4 weeks ago
WaseemAbbasi22 1e158e8bd4 update form changed 4 weeks ago
Sikander Saleem 3372f7d38d demo attachment document type added. 4 weeks 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
4 weeks ago
WaseemAbbasi22 e0ed594072 API's implemented 1 month ago
Sikander Saleem 6f43fd777a user shift information added. 1 month 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
1 month 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
1 month ago
WaseemAbbasi22 a0a084803d UI improvements 1 month ago
Sikander Saleem b78d10af46 current user employee id for chat. 1 month ago
WaseemAbbasi22 3944a549b2 requested changes done 1 month ago
WaseemAbbasi22 4f9f76515d added form design for installation and pullout, handle pullout type task and other improvements 2 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
2 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 2 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 2 months ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 2 months ago
Sikander Saleem db2175b7f5 quality auditor role added. 2 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 3 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
3 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
3 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
3 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 3 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
3 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
3 months ago
WaseemAbbasi22 542070c791 improvements 3 months ago
Sikander Saleem c5b4325aec survey notification finalized. 3 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 3 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 3 months ago
Sikander Saleem 01f004cecc chat development cont. 3 months ago
Sikander Saleem 233dc19030 users position added. 4 months 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
4 months 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
4 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 4 months ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 4 months ago
Sikander Saleem ae0e08183f asset group switching added. 4 months ago
Sikander Saleem 599da01554 traf request item list view added. 4 months ago
Sikander Saleem 144951caec traf request creation completed. 4 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 4 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 4 months ago
WaseemAbbasi22 f83109d5ca pagination fixes and 5 months ago