Commit Graph

636 Commits (d63f7d8939b3cba6c757c5c4449780480149b66c)

Author SHA1 Message Date
Sikander Saleem cea77ff7f7 evaluation form added. 7 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 7 months ago
WaseemAbbasi22 afa165dc3d added vendor dropdown along with free text 7 months ago
WaseemAbbasi22 938f5173a4 improvements 7 months ago
WaseemAbbasi22 5d856fc46b improvements 7 months ago
WaseemAbbasi22 e0ed594072 API's implemented 7 months ago
WaseemAbbasi22 bf4d2a3257 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 7 months ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 7 months ago
Sikander Saleem c377c67f40 rota module added. 7 months ago
Sikander Saleem 6f43fd777a user shift information added. 7 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
7 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
7 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
7 months ago
Sikander Saleem 4bd055cfe8 merge conflict resolved. 7 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
7 months ago
WaseemAbbasi22 1c86fe71a2 improvements and added modifiedBy details 7 months ago
WaseemAbbasi22 ac50236aa2 bugs fixes 7 months ago
Sikander Saleem 7a5db103e0 api integrate cont. 7 months ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 7 months ago
WaseemAbbasi22 3944a549b2 requested changes done 7 months ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 8 months ago
WaseemAbbasi22 e303b4e099 chat bug fixes 8 months ago
WaseemAbbasi22 077095502e chat count implemented 8 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
8 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 8 months ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 8 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 8 months ago
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 8 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
8 months ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 8 months ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 8 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
8 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
8 months ago
Sikander Saleem 7d7a34a6d5 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 8 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
8 months ago
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 8 months ago
Sikander Saleem 4b991d807c v1.4.0+31 uploaded on stores. 8 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 8 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 9 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
9 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
9 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
9 months ago
Sikander Saleem 05e97a5c47 apk provided for pre-release. 9 months ago
Sikander Saleem 7cdd3aa58a dev to uat env 9 months ago
waseemabbasi22 2962f248e0 timer fixes 9 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 9 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 9 months ago
Sikander Saleem 1a3861d816 files refactoring 9 months ago
Sikander Saleem 16a2fa2b26 files refactoring 9 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 9 months ago
waseemabbasi22 de48ca97bd initial test done 9 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
9 months ago
waseemabbasi22 b4943aff3d initial test done 9 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
9 months ago
Sikander Saleem 92a94577d5 merge conflict resolved. 9 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
9 months ago
Sikander Saleem 4f78e23922 chat widget finalized. 9 months ago
Sikander Saleem e1c06a1857 site id improvement 9 months ago
Sikander Saleem 59d21ae72e jira 1430 & 1434 & 1437 fixed. 9 months ago
Sikander Saleem 7445902564 chat attachment added. 9 months ago
Sikander Saleem c5b4325aec survey notification finalized. 9 months ago
Sikander Saleem 186987c5ce chat flow improvement and connect to SignalR. 9 months ago
Sikander Saleem 781e61814a survey questionare finalized. 9 months ago
Sikander Saleem 47e68b8cc3 switch to dev. 9 months ago
Sikander Saleem a902204ff1 survey improvements. 9 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 9 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 9 months ago
Sikander Saleem 37ff2b4f4a APK to provided to FM with fixed tracker issues. 9 months ago
Sikander Saleem 1cc5ebd9fb survey question cont. 9 months ago
Sikander Saleem bcfa23bad3 chat message ui completed for sender and recipient. 9 months ago
Sikander Saleem 01f004cecc chat development cont. 9 months ago
Sikander Saleem ec28f8992c chat cont. 9 months ago
Sikander Saleem 675c1fa10b for uat 9 months ago
WaseemAbbasi22 c1455378a6 bug fixes and improvements 9 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 9 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 10 months ago
Sikander Saleem e54167b9b0 getUsersBasedOnSearch api for nurse role only. 10 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
10 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
10 months ago
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 10 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
10 months ago
WaseemAbbasi22 4a283a685c classification API added 10 months ago
Sikander Saleem 8c1c865759 temporary server added. 10 months ago
Sikander Saleem a763538771 temporary server added. 10 months ago
Sikander Saleem 4f2cb42a3f temporary server added. 10 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 10 months ago
Sikander Saleem 866ec5754e improvements 10 months ago
Sikander Saleem ea54aea1f6 1.3.11+30 uploaded on stores. 10 months ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 10 months ago
Sikander Saleem ae0e08183f asset group switching added. 10 months ago
Sikander Saleem 7c367ba614 Apk provided to QA. 10 months ago
Sikander Saleem 599da01554 traf request item list view added. 10 months ago
Sikander Saleem 144951caec traf request creation completed. 10 months ago
Sikander Saleem 174e714d38 nurse cannot see recall and alert. 10 months ago
Sikander Saleem dd19507fa1 add traf payload added. 10 months ago
Sikander Saleem 4e28068eef improvement. 10 months ago
Sikander Saleem ceee6d689d total working hours added on task detail. 10 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 10 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 10 months ago
WaseemAbbasi22 d0565a321a asset number free text field added for existing project and manual project not registered 10 months ago
Sikander Saleem aae42ddb27 Apk Provided to QA, UAT v4 10 months ago
Sikander Saleem d3c000004e code improvements 10 months ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 10 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 10 months ago
WaseemAbbasi22 c19fdb173b api integrated for main views 11 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 11 months ago
Sikander Saleem 89b81391e9 site contact list api added. 11 months ago
Sikander Saleem 644fe5b880 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge 11 months ago
Sikander Saleem fad81a84ba 1.3.10+29 uploaded. 11 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
12 months ago
Sikander Saleem bb0a031104 1.3.9+28 uploaded. 12 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 12 months ago
Sikander Saleem c1a7562e3b create asset transfer, on internal & external destination values reset. 12 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
12 months ago
Sikander Saleem 79fa949ba2 1.3.8+27 uploaded. 12 months ago
Sikander Saleem 642d1a908c auto login improvement. 12 months ago
waseemabbasi22 6c3f36944a auth and attachment fixes 12 months ago
Sikander Saleem 04da46c4bb 1.3.7+26 uploaded. 1 year ago
Sikander Saleem b2d3d60152 logout api added. 1 year ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 1 year ago
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 1 year ago
Sikander Saleem df8f0e7298 remember me username and password improvement. 1 year ago
Sikander Saleem 47673e3473 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/modules/cm_module/views/components/action_button/footer_action_button.dart
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
#	lib/modules/tm_module/tasks_wo/update_task_request_view.dart
#	lib/views/pages/user/gas_refill/update_gas_refill_request.dart
#	lib/views/widgets/images/multi_image_picker.dart
1 year ago
Sikander Saleem 8517562d6a 1.3.6+25 uploaded 1 year ago
WaseemAbbasi22 4e665d1959 attachment fixes 1 year ago
WaseemAbbasi22 dfe8f0c271 mr no and exchange cost added and tested in uat 1 year ago
WaseemAbbasi22 8d02ff5ec1 mr number and exchange cost added 1 year ago
Sikander Saleem ca1ff5892e Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/modules/cm_module/service_request_detail_provider.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
1 year ago
Sikander Saleem 2f1efaccee 1.3.5+24 uploaded. 1 year ago
Sikander Saleem 0283c92f99 1.3.4+23 uploaded. 1 year ago
Sikander Saleem 262b3aa42f local auth fail handling and improvements. 1 year ago
Sikander Saleem 633c2da82a time zone header added 1 year ago
Sikander Saleem a1e0c92b34 spare part validation added when create. 1 year ago
Sikander Saleem ffbe58b6c6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 1 year ago
WaseemAbbasi22 59c4d8f9b0 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 1 year ago
WaseemAbbasi22 32627bbda1 form fixes 1 year ago
Sikander Saleem 95ab0192fe edd and cm frame improvements 1 year ago
Sikander Saleem 93caf55354 edd and wo frame fields added. 1 year ago
Sikander Saleem 456432050d timezone header added, update ppm error flow improvement. 1 year ago
Sikander Saleem 3aef41a50f supplier engineer added for ppm external supplier 1 year ago
Sikander Saleem 754ec458a4 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
# Conflicts:
#	lib/views/widgets/images/multi_image_picker.dart
1 year ago
Sikander Saleem 4c92525589 1.3.3+22 uploaded 1 year ago
Sikander Saleem d5059758ac Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new 1 year ago
Sikander Saleem 9b9ce8c4b2 1.3.2+21 uploaded on stores. 1 year ago
Sikander Saleem bf44e5cbec verification method issue fixed, if requester not confirms arrival. 1 year ago
Sikander Saleem 616ce9b630 timer picker end date selection fixed. 1 year ago
Sikander Saleem e9efca620d enable task module. 1 year ago
Sikander Saleem be2fd8a2d5 1.3.1+20 uploaded on stores 1 year ago
Sikander Saleem f3f09d1eb2 timer improvements 1 year ago
Sikander Saleem 0b0f2ba25c improvements. 1 year ago