Commit Graph

856 Commits (86c530dc4501f5acf628d81cf78cb2a39eac153d)

Author SHA1 Message Date
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
Sikander Saleem 985d559860 ppm update button hide for end user. & status color changed. 4 months ago
Sikander Saleem ae0e08183f asset group switching added. 4 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 4 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
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. 5 months ago
Sikander Saleem 3ac3c11b4b improvement 5 months ago
WaseemAbbasi22 423968d7f6 timer history added 5 months ago
Sikander Saleem f9c7d335e2 file format. 5 months ago
WaseemAbbasi22 e40d9a1138 ATOMS-1025, ATOMS-937 and some color fixes for dark mode 5 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
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
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 642d1a908c auto login improvement. 6 months ago
waseemabbasi22 6c3f36944a auth and attachment fixes 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
Sikander Saleem 19ee892d67 app timer, time and date picker color improvements. 6 months ago
Sikander Saleem c1b1f37eec asset search loading ui fixed. 6 months ago
Sikander Saleem 1edcea47be 1.3.6+25 merge conflict resolved. 6 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
6 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
6 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 7 months ago
WaseemAbbasi22 8d9aacb870 dark mode fixes 7 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 7 months 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
7 months ago
Sikander Saleem 262b3aa42f local auth fail handling and improvements. 7 months ago
Sikander Saleem d9f3a4e73a Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 7 months ago
WaseemAbbasi22 b35522d8e6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 7 months ago
WaseemAbbasi22 503f3a6feb multiple assistant employee added for asset transfer and service-request 7 months ago
WaseemAbbasi22 1285ae68ec multiple assistant employee structure added 7 months ago
Sikander Saleem 37c3b54237 improvements 7 months ago
Sikander Saleem 6adea49150 image full screen loading improvement 7 months ago
WaseemAbbasi22 32627bbda1 form fixes 7 months 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
8 months ago
Sikander Saleem 4c92525589 1.3.3+22 uploaded 8 months ago
Sikander Saleem 12752535b8 improvements 8 months ago
Sikander Saleem 3181e666be improvements 8 months ago
Sikander Saleem 0a38bdd9e1 improvements 8 months ago
Sikander Saleem eead9bed02 improvements 8 months ago
Sikander Saleem c92aae9048 improvements 8 months ago
Sikander Saleem d5059758ac Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new 8 months ago
Sikander Saleem bf44e5cbec verification method issue fixed, if requester not confirms arrival. 8 months ago
Sikander Saleem 616ce9b630 timer picker end date selection fixed. 8 months ago
Sikander Saleem 6539848f31 method name fix. 8 months ago
Sikander Saleem be2fd8a2d5 1.3.1+20 uploaded on stores 8 months ago
Sikander Saleem f3f09d1eb2 timer improvements 8 months ago
Sikander Saleem 407c913002 timer issue fixed. 8 months ago
WaseemAbbasi22 60979b7f95 Date picker end time fixes 8 months ago
Sikander Saleem 8129cdb768 gas refill details, contact info employee id fixed. 8 months ago
WaseemAbbasi22 547b815b61 End date picker last date changed to current date 8 months ago
Sikander Saleem 0dade3cedb unused code marked. 8 months ago
Sikander Saleem 20b5ddb92b improvements. 8 months ago
Sikander Saleem 40c37f5373 profile contact detail update added. 8 months ago
Sikander Saleem 50eb16ce32 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 8 months ago
Sikander Saleem 46dd66b165 selection replaced to full screen. 8 months ago
WaseemAbbasi22 aa11d93409 update user contact info bottomsheet design and statedate time initial value added 8 months ago
Sikander Saleem fb6641f880 number keyboard replaced with decimal 8 months ago
Sikander Saleem afe0d45d86 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 8 months ago
Sikander Saleem 4d13105b91 cancel a selection from bottom sheet dropdown added. 8 months ago
WaseemAbbasi22 9561b29822 update user info bottomsheet design and service request external date check added 8 months ago
Sikander Saleem 62dd395a73 timer picker added, and code improvements 8 months ago
Sikander Saleem 6050e47d26 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 8 months ago
Sikander Saleem bed3a9821e decimal keyboard on traveling hours, email keyboard for email for external engineer 8 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 8 months ago
Sikander Saleem 64a2d39cb1 timer picker added and improvements 8 months ago
Sikander Saleem 7f594fbb41 timer tab switch issue fixed. 8 months ago
Sikander Saleem 10dd969d71 signature null values fix. 9 months ago
WaseemAbbasi22 69d10c50de Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/controllers/api_routes/urls.dart
9 months ago
WaseemAbbasi22 8ae51480f9 added nurse signature for device transfer request and tested on uat 9 months ago
Sikander Saleem 65064bc0a2 low priority removed from gas refill, transfer, ppm and sparepart cost. 9 months ago
Sikander Saleem e26db46108 improvements 9 months ago
WaseemAbbasi22 56c70671d8 add contact and created by information for asset transfer and gasrefill request 9 months ago
WaseemAbbasi22 330efd90be Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 9 months ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 9 months ago
WaseemAbbasi22 06e8831d02 add label for destination site details 9 months ago
WaseemAbbasi22 7b57ca54c3 renaming done as per pdf shared 9 months ago
WaseemAbbasi22 0996801f66 notification testing done for all type of request on dev env. 9 months ago
WaseemAbbasi22 06acdb184f Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/views/pages/device_transfer/update_device_transfer.dart
9 months ago
WaseemAbbasi22 b320e3751a add code for nurse edit gas refill request 9 months ago
Sikander Saleem 5169894dc4 code restructured and improvements. 9 months ago
WaseemAbbasi22 0b97ffe296 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 10 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 10 months ago
WaseemAbbasi22 c1c595b135 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 10 months ago
WaseemAbbasi22 4698a3325e add validation for assistant employee start and end date 10 months ago
Sikander Saleem a54370005f bug 902 fixed. 10 months ago
WaseemAbbasi22 7251ba0e93 ATOMS-893 fixed 10 months ago
WaseemAbbasi22 6004ed1a27 ATOMS-820 fixed 10 months ago