Commit Graph

565 Commits (2e3736cdc9b17615283dccdac84d8b4fbbc0698c)

Author SHA1 Message Date
WaseemAbbasi22 e303b4e099 chat bug fixes 2 months ago
WaseemAbbasi22 077095502e chat count implemented 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
Sikander Saleem 6d6be40b9e chat notification redirection added. 2 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 2 months ago
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 2 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
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 17210195db uat improvements. md->department, enable recall and alert for quality user. 2 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
2 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
2 months ago
Sikander Saleem 7d7a34a6d5 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 2 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
2 months ago
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 2 months 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. 3 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 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 05e97a5c47 apk provided for pre-release. 3 months ago
Sikander Saleem 7cdd3aa58a dev to uat env 3 months ago
waseemabbasi22 2962f248e0 timer fixes 3 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 3 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 3 months ago
Sikander Saleem 1a3861d816 files refactoring 3 months ago
Sikander Saleem 16a2fa2b26 files refactoring 3 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 3 months ago
waseemabbasi22 de48ca97bd initial test done 3 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
3 months ago
waseemabbasi22 b4943aff3d initial test done 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 92a94577d5 merge conflict resolved. 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
Sikander Saleem 4f78e23922 chat widget finalized. 3 months ago
Sikander Saleem e1c06a1857 site id improvement 3 months ago
Sikander Saleem 59d21ae72e jira 1430 & 1434 & 1437 fixed. 3 months ago
Sikander Saleem 7445902564 chat attachment added. 3 months ago
Sikander Saleem c5b4325aec survey notification finalized. 3 months ago
Sikander Saleem 186987c5ce chat flow improvement and connect to SignalR. 3 months ago
Sikander Saleem 781e61814a survey questionare finalized. 3 months ago
Sikander Saleem 47e68b8cc3 switch to dev. 3 months ago
Sikander Saleem a902204ff1 survey improvements. 3 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 3 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 3 months ago
Sikander Saleem 37ff2b4f4a APK to provided to FM with fixed tracker issues. 3 months ago
Sikander Saleem 1cc5ebd9fb survey question cont. 3 months ago
Sikander Saleem bcfa23bad3 chat message ui completed for sender and recipient. 3 months ago
Sikander Saleem 01f004cecc chat development cont. 3 months ago
Sikander Saleem ec28f8992c chat cont. 4 months ago
Sikander Saleem 675c1fa10b for uat 4 months ago
WaseemAbbasi22 c1455378a6 bug fixes and improvements 4 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 4 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 4 months ago
Sikander Saleem e54167b9b0 getUsersBasedOnSearch api for nurse role only. 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
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 4 months ago
Sikander Saleem 25475de68e Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_TM_Module_snagsFix
# Conflicts:
#	lib/modules/pm_module/ppm_wo/ppm_details_page.dart
4 months ago
WaseemAbbasi22 4a283a685c classification API added 4 months ago
Sikander Saleem 8c1c865759 temporary server added. 4 months ago
Sikander Saleem a763538771 temporary server added. 4 months ago
Sikander Saleem 4f2cb42a3f temporary server added. 4 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 4 months ago
Sikander Saleem 866ec5754e improvements 4 months ago
Sikander Saleem ea54aea1f6 1.3.11+30 uploaded on stores. 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 7c367ba614 Apk provided to QA. 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 174e714d38 nurse cannot see recall and alert. 4 months ago
Sikander Saleem dd19507fa1 add traf payload added. 4 months ago
Sikander Saleem 4e28068eef improvement. 4 months ago
Sikander Saleem ceee6d689d total working hours added on task detail. 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 d0565a321a asset number free text field added for existing project and manual project not registered 5 months ago
Sikander Saleem aae42ddb27 Apk Provided to QA, UAT v4 5 months ago
Sikander Saleem d3c000004e code improvements 5 months ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 5 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 5 months ago
WaseemAbbasi22 c19fdb173b api integrated for main views 5 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 5 months ago
Sikander Saleem 89b81391e9 site contact list api added. 5 months ago
Sikander Saleem 644fe5b880 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge 5 months ago
Sikander Saleem fad81a84ba 1.3.10+29 uploaded. 5 months ago
WaseemAbbasi22 9a332e86e2 Merge branch 'design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
6 months ago
Sikander Saleem bb0a031104 1.3.9+28 uploaded. 6 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 6 months ago
Sikander Saleem c1a7562e3b create asset transfer, on internal & external destination values reset. 6 months ago
Sikander Saleem 630c1533e7 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/pages/user/requests/create_service_request_page.dart
#	lib/views/widgets/images/multi_image_picker.dart
6 months ago
Sikander Saleem 79fa949ba2 1.3.8+27 uploaded. 6 months ago
Sikander Saleem 642d1a908c auto login improvement. 6 months ago
waseemabbasi22 6c3f36944a auth and attachment fixes 6 months ago
Sikander Saleem 04da46c4bb 1.3.7+26 uploaded. 6 months ago
Sikander Saleem b2d3d60152 logout api added. 6 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 6 months ago
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 6 months ago