Commit Graph

528 Commits (c69bcc284355c174ca8889cd2fb9fee989ed5869)

Author SHA1 Message Date
Sikander Saleem cea77ff7f7 evaluation form added. 19 hours ago
Sikander Saleem 3372f7d38d demo attachment document type added. 21 hours 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
1 week 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 week 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 week ago
Sikander Saleem 4bd055cfe8 merge conflict resolved. 1 week 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
1 week ago
WaseemAbbasi22 1c86fe71a2 improvements and added modifiedBy details 2 weeks ago
WaseemAbbasi22 ac50236aa2 bugs fixes 2 weeks ago
Sikander Saleem 7a5db103e0 api integrate cont. 2 weeks ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 2 weeks ago
WaseemAbbasi22 3944a549b2 requested changes done 2 weeks ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 4 weeks ago
WaseemAbbasi22 e303b4e099 chat bug fixes 4 weeks ago
WaseemAbbasi22 077095502e chat count implemented 1 month 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
1 month ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 1 month ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 1 month ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 1 month ago
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 1 month 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
1 month ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 1 month ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 1 month 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
1 month 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
1 month ago
Sikander Saleem 7d7a34a6d5 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 1 month 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
1 month ago
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 1 month ago
Sikander Saleem 4b991d807c v1.4.0+31 uploaded on stores. 2 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 2 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 2 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
2 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
2 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
2 months ago
Sikander Saleem 05e97a5c47 apk provided for pre-release. 2 months ago
Sikander Saleem 7cdd3aa58a dev to uat env 2 months ago
waseemabbasi22 2962f248e0 timer fixes 2 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 2 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 2 months ago
Sikander Saleem 1a3861d816 files refactoring 2 months ago
Sikander Saleem 16a2fa2b26 files refactoring 2 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 2 months ago
waseemabbasi22 de48ca97bd initial test done 2 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
2 months ago
waseemabbasi22 b4943aff3d initial test done 2 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
2 months ago
Sikander Saleem 92a94577d5 merge conflict resolved. 2 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
2 months ago
Sikander Saleem 4f78e23922 chat widget finalized. 2 months ago
Sikander Saleem e1c06a1857 site id improvement 2 months ago