Commit Graph

1481 Commits (e87346e5b31e443fe39890a6c36f1d817aeb7c11)

Author SHA1 Message Date
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 3 months ago
Sikander Saleem 4b991d807c v1.4.0+31 uploaded on stores. 3 months ago
Sikander Saleem f2ebadf1b7 attachment list view added in files list widget. 3 months ago
Sikander Saleem 4763132302 attachment as listview added. 3 months ago
Sikander Saleem bf2b777f8d chat improvements. 3 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 3 months ago
WaseemAbbasi22 789522b79b asset delivery modules design flow completed 3 months ago
Sikander Saleem a9362d90f5 asset information auto fetch from CM workOrder. 3 months ago
Sikander Saleem 30bf847e6e department dropdown return first index item fixed. 3 months ago
Sikander Saleem f0c003e6fa disabled loan type dropdown added. 3 months ago
Sikander Saleem 0a9dd86ce0 improvements. 3 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 4 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
4 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
4 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
4 months ago
Sikander Saleem 05e97a5c47 apk provided for pre-release. 4 months ago
Sikander Saleem 7cdd3aa58a dev to uat env 4 months ago
Sikander Saleem 16d5eb32b9 assign fe user model updated. 4 months ago
Sikander Saleem 5d2291a30f loan option for in progress requests. 4 months ago
Sikander Saleem 290cdf29d8 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_page.dart
4 months ago
Sikander Saleem 8e29c84c70 loan improvements. 4 months ago
waseemabbasi22 2962f248e0 timer fixes 4 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 4 months ago
Sikander Saleem e7e0f7375c chat fix when contact persons list is empty. 4 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 4 months ago
Sikander Saleem 22fd3c8cc9 loan equipment item view added; 4 months ago
Sikander Saleem e76067bdac LoanTypeId param added. 4 months ago
Sikander Saleem 60511b60cf files refactoring 4 months ago
Sikander Saleem 09762fd278 files refactoring 4 months ago
Sikander Saleem 1a3861d816 files refactoring 4 months ago
Sikander Saleem 16a2fa2b26 files refactoring 4 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 4 months ago
waseemabbasi22 05d9224a08 Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
4 months ago
waseemabbasi22 de48ca97bd initial test done 4 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
4 months ago
waseemabbasi22 b4943aff3d initial test done 4 months ago
Sikander Saleem a3509e9464 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/main.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
4 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
4 months ago
Sikander Saleem 60125bb6d9 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 4 months ago
Sikander Saleem 9eb828cc75 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
4 months ago
Sikander Saleem 92a94577d5 merge conflict resolved. 4 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
4 months ago
waseemabbasi22 c02fc2f1b1 api integration inprogress 4 months ago
waseemabbasi22 7291d1b4d8 Merge branch 'design_3.0_traf_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
4 months ago
Sikander Saleem bbeabda38d parameter added for push notifications. 4 months ago
waseemabbasi22 0ffc0f650f improvements 4 months ago
waseemabbasi22 c4160ff98b improvements 4 months ago
WaseemAbbasi22 a2453e8c88 loan form desing created 4 months ago
Sikander Saleem 4f78e23922 chat widget finalized. 4 months ago
WaseemAbbasi22 542070c791 improvements 4 months ago
WaseemAbbasi22 255691f47a loan design in progress 4 months ago
Sikander Saleem e1c06a1857 site id improvement 4 months ago
Sikander Saleem 59d21ae72e jira 1430 & 1434 & 1437 fixed. 4 months ago
Sikander Saleem e3857149e7 improvements 4 months ago
Sikander Saleem 1f074b33e5 chat finalized. 4 months ago
Sikander Saleem c31771aaa7 chat improvements 4 months ago
Sikander Saleem e52caee730 chat improvements 4 months ago
Sikander Saleem f3aa929cb1 view all attachments added. 4 months ago
Sikander Saleem 7445902564 chat attachment added. 4 months ago
Sikander Saleem c5b4325aec survey notification finalized. 4 months ago
Sikander Saleem 186987c5ce chat flow improvement and connect to SignalR. 4 months ago
Sikander Saleem 781e61814a survey questionare finalized. 4 months ago
Sikander Saleem 47e68b8cc3 switch to dev. 4 months ago
Sikander Saleem db1e7ea0bd 1 to 1 chat ui completed for text message, with 2 users. 4 months ago
Sikander Saleem a902204ff1 survey improvements. 4 months ago
WaseemAbbasi22 659f2029dc label changes 4 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 4 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 4 months ago
Sikander Saleem 37ff2b4f4a APK to provided to FM with fixed tracker issues. 4 months ago
Sikander Saleem 1cc5ebd9fb survey question cont. 4 months ago
Sikander Saleem bcfa23bad3 chat message ui completed for sender and recipient. 4 months ago
Sikander Saleem 01f004cecc chat development cont. 4 months ago
Sikander Saleem 830700ce79 grey error fixed on release build. 4 months ago
Sikander Saleem ec28f8992c chat cont. 4 months ago
Sikander Saleem 12e971749e rename Oracle Code-> Name/Oracle Code 4 months ago
Sikander Saleem 233dc19030 users position added. 4 months ago
Sikander Saleem 675c1fa10b for uat 4 months ago
Sikander Saleem 5c8e1d5763 bug fixes. 4 months ago
WaseemAbbasi22 c1455378a6 bug fixes and improvements 4 months ago
Sikander Saleem 3d2e908613 traf form validation added. 4 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 4 months ago
Sikander Saleem d2665fd10f chat provider , api client added. 4 months ago
WaseemAbbasi22 81dd799672 internal audit api's implementation in progress 4 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 4 months ago
Sikander Saleem 3b6a0eea3c voice note ui added. 4 months ago
Sikander Saleem a9ce4eac3d Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_cx_module 4 months ago
Sikander Saleem e54167b9b0 getUsersBasedOnSearch api for nurse role only. 4 months ago
Sikander Saleem 96b65e99fa chat list ui added-1. 4 months ago
Sikander Saleem 18a53d7518 chat list ui 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
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 4 months ago
Sikander Saleem 46fd537c3a global health ui improvements added. 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
Sikander Saleem c5c0c51ecb phone number added. 5 months ago
Sikander Saleem eb70aa6e58 spelling correct. 5 months ago
Sikander Saleem ee36baaad5 transaction date added in asset detail card. 5 months ago
Sikander Saleem dccd5542bf request creation failed bug fix. 5 months ago
Sikander Saleem 3c93245e4d census q type changed from int to string. 5 months ago
Sikander Saleem 33251cfcff improvements. 5 months ago
WaseemAbbasi22 1e901e4c24 ATOMS-1374 fixes 5 months ago
WaseemAbbasi22 4438d96312 ATOMS-1356 fixes 5 months ago
Sikander Saleem d181cce56b improvements. 5 months ago
WaseemAbbasi22 09843a9625 Ui Changes 5 months ago
Sikander Saleem 78cec1c69c created date added. 5 months ago
WaseemAbbasi22 4a283a685c classification API added 5 months ago
Sikander Saleem 8c1c865759 temporary server added. 5 months ago
Sikander Saleem a763538771 temporary server added. 5 months ago
Sikander Saleem 4f2cb42a3f temporary server added. 5 months ago
WaseemAbbasi22 549e5f4fd9 ATOMS-1305 bug fixes 5 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 5 months ago
Sikander Saleem 866ec5754e improvements 5 months ago
Sikander Saleem ea54aea1f6 1.3.11+30 uploaded on stores. 5 months ago
Sikander Saleem 985d559860 ppm update button hide for end user. & status color changed. 5 months ago
Sikander Saleem c6e66e82e8 ppm external type id changed to value. 5 months ago
Sikander Saleem b71207538d assessor dashboard api improvement. 5 months ago
Sikander Saleem a8a2d4bbbf improvement 5 months ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 5 months ago
Sikander Saleem ae0e08183f asset group switching added. 5 months ago
Sikander Saleem 8c45d89c3e improvements 5 months ago
Sikander Saleem 7c367ba614 Apk provided to QA. 5 months ago
Sikander Saleem 599da01554 traf request item list view added. 5 months ago
Sikander Saleem 144951caec traf request creation completed. 5 months ago
Sikander Saleem 174e714d38 nurse cannot see recall and alert. 5 months ago
Sikander Saleem dd19507fa1 add traf payload added. 5 months ago
Sikander Saleem 567be98f74 improvement. 5 months ago
Sikander Saleem 4e28068eef improvement. 5 months ago
Sikander Saleem 5d28eb6c21 ui improvement. 5 months ago
Sikander Saleem ceee6d689d total working hours added on task detail. 5 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 5 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 5 months ago
WaseemAbbasi22 d0565a321a asset number free text field added for existing project and manual project not registered 5 months ago
WaseemAbbasi22 b6c5d7ffa3 Merge remote-tracking branch 'origin/design_3.0_asset_inventory_module' into design_3.0_asset_inventory_module 5 months ago
WaseemAbbasi22 f83109d5ca pagination fixes and 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
Sikander Saleem f9b101c233 improvement. 5 months ago
Sikander Saleem dfef9aadb7 Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module 5 months ago
Sikander Saleem a9973047d6 improvement 5 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 5 months ago
Sikander Saleem 4d035e9c46 android AGP upgraded & enhancement. 6 months ago
Sikander Saleem 88f64e2297 comment bug fixed, on time picker. 6 months ago
Sikander Saleem 3ac3c11b4b improvement 6 months ago
Sikander Saleem ee70ca3c2b Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge 6 months ago
Sikander Saleem 0efc166a69 total working hour parameter changed. 6 months ago
WaseemAbbasi22 423968d7f6 timer history added 6 months ago
Sikander Saleem 89b81391e9 site contact list api added. 6 months ago
WaseemAbbasi22 4d2931e335 Recall and Alert payload fixes 6 months ago
WaseemAbbasi22 f991456d17 Recall and Alert Fixes 6 months ago
Sikander Saleem 94d57685cd task module toJson model changed, duplicate timer activity fixed. 6 months ago
Sikander Saleem f9c7d335e2 file format. 6 months ago
Sikander Saleem 26c8c6844a Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge 6 months ago
Sikander Saleem 644fe5b880 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge 6 months ago
WaseemAbbasi22 e40d9a1138 ATOMS-1025, ATOMS-937 and some color fixes for dark mode 6 months ago
Sikander Saleem fad81a84ba 1.3.10+29 uploaded. 6 months ago
Sikander Saleem 0604dd6d69 improvements. 6 months ago
Sikander Saleem 23e7550212 counter animation added. 6 months ago
Sikander Saleem 328b2fe48d for edd date limitation increased 1 year. 6 months ago
Sikander Saleem 5e9e8dc870 assistant employee selection sheet ui improvement. 6 months ago
Sikander Saleem 7efeeed619 bottom sheet ui improvements,safe area added. 6 months ago
WaseemAbbasi22 b45035a35f Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge 6 months ago
WaseemAbbasi22 bbc4974458 task attachment fixes 6 months ago
Sikander Saleem df66cf5c77 improvements 6 months ago
Sikander Saleem b7aefbe7f3 task contact info in detail view, & improvements 6 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
7 months ago
Sikander Saleem bb0a031104 1.3.9+28 uploaded. 7 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 7 months ago
Sikander Saleem c1a7562e3b create asset transfer, on internal & external destination values reset. 7 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
7 months ago
Sikander Saleem 79fa949ba2 1.3.8+27 uploaded. 7 months ago
Sikander Saleem 642d1a908c auto login improvement. 7 months ago
waseemabbasi22 6c3f36944a auth and attachment fixes 7 months ago
Sikander Saleem 04da46c4bb 1.3.7+26 uploaded. 7 months ago
Sikander Saleem b2d3d60152 logout api added. 7 months ago
WaseemAbbasi22 2fab61b144 task module disabled 7 months ago
WaseemAbbasi22 5e3b09315f dark mode color fixes 7 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 7 months ago
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 7 months ago
Sikander Saleem 19ee892d67 app timer, time and date picker color improvements. 7 months ago
Sikander Saleem df8f0e7298 remember me username and password improvement. 7 months ago
Sikander Saleem c1b1f37eec asset search loading ui fixed. 7 months ago
Sikander Saleem a479a23790 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module 7 months ago
Sikander Saleem c4efbba6a8 ui fixes 7 months ago
Sikander Saleem e3a97c0ae9 enable engineer time picker issue fixed, session expired dialog issue fixed. 7 months ago
Sikander Saleem 1edcea47be 1.3.6+25 merge conflict resolved. 7 months 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
7 months ago
Sikander Saleem 89865c0ddd Merge branch 'refs/heads/design_3.0_dark_mode' into design_3.0_TM_Module_attachmentFix
# Conflicts:
#	lib/modules/cm_module/views/forms/asset_retired/verify_asset_detail.dart
#	lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
#	lib/modules/pm_module/ppm_wo/update_ppm/ppm_calibration_tools_form.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
7 months ago
Sikander Saleem 8517562d6a 1.3.6+25 uploaded 7 months ago
WaseemAbbasi22 841fc93783 calibration tool picker fixes 7 months ago
WaseemAbbasi22 0637a51ea0 spare part attachment fixes 7 months ago
Sikander Saleem f2eb4d7432 update asset details improvement. 7 months ago
Sikander Saleem 4fe2943a5f update asset details improvement. 7 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 7 months ago
Sikander Saleem b4e8e82995 mr no keyboard type fix. 7 months ago
WaseemAbbasi22 dfe8f0c271 mr no and exchange cost added and tested in uat 7 months ago
WaseemAbbasi22 8d9aacb870 dark mode fixes 7 months ago
WaseemAbbasi22 0f7a8e0955 Merge branch 'design_3.0_TM_Module_snagsFix' into design_3.0_dark_mode 7 months ago