Commit Graph

204 Commits (e544fc640e3580dd8aaf30aa1b0b2e95e2f9e6d0)

Author SHA1 Message Date
WaseemAbbasi22 bf4d2a3257 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 3 days ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 3 days 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
3 days 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
3 days ago
WaseemAbbasi22 73ee12cba4 Atoms-1743,1745,1748 fixes 5 days ago
WaseemAbbasi22 2425c78cf9 chat count implemented 4 weeks ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 1 month ago
WaseemAbbasi22 789522b79b asset delivery modules design flow completed 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
Sikander Saleem 830700ce79 grey error fixed on release build. 2 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
3 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
3 months ago
Sikander Saleem 46fd537c3a global health ui improvements added. 3 months ago
Sikander Saleem dd19507fa1 add traf payload added. 3 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 3 months ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 4 months ago
WaseemAbbasi22 c19fdb173b api integrated for main views 4 months ago
Sikander Saleem 3ac3c11b4b improvement 4 months ago
WaseemAbbasi22 423968d7f6 timer history added 4 months ago
Sikander Saleem 23e7550212 counter animation added. 5 months ago
Sikander Saleem 7efeeed619 bottom sheet ui improvements,safe area added. 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
5 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 5 months ago
Sikander Saleem c1a7562e3b create asset transfer, on internal & external destination values reset. 5 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
5 months ago
Sikander Saleem b2d3d60152 logout api added. 5 months ago
WaseemAbbasi22 2fab61b144 task module disabled 5 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
5 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 6 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
6 months ago
Sikander Saleem 262b3aa42f local auth fail handling and improvements. 6 months ago
Sikander Saleem 8101521791 eng can create Task request. 7 months ago
Sikander Saleem 6539848f31 method name fix. 7 months ago
Sikander Saleem be2fd8a2d5 1.3.1+20 uploaded on stores 7 months ago
Sikander Saleem 46dd66b165 selection replaced to full screen. 7 months ago
Sikander Saleem 4d13105b91 cancel a selection from bottom sheet dropdown added. 7 months ago
Sikander Saleem 64a2d39cb1 timer picker added and improvements 7 months ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 8 months ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 9 months ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 9 months ago
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 9 months ago
Sikander Saleem 002172ab87 unused file 9 months ago
Sikander Saleem e0902eddf7 Merge branch 'refs/heads/demo_branch' into design_3.0_tm_module_task_flow
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/extensions/widget_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/views/pages/user/gas_refill/request_gas_refill.dart
#	lib/views/widgets/equipment/asset_picker.dart
9 months ago
WaseemAbbasi22 9edaca4326 task request module flow completed and tested with backend 9 months ago
WaseemAbbasi22 14e55c63e7 create task flow completed 9 months ago
WaseemAbbasi22 6795ba7f72 device transfer gas refill merged in ppm_newflow 10 months ago
WaseemAbbasi22 ef6c14ba55 Merge branch 'design_3.0_transfer_request_new_flow' into demo_branch
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/models/new_models/gas_refill_model.dart
#	lib/new_views/common_widgets/default_app_bar.dart
#	lib/views/pages/user/gas_refill/gas_refill_details.dart
#	lib/views/pages/user/ppm/update_ppm/ppm_pm_kits_form.dart
10 months ago
Sikander Saleem f99ea0dacd remove camel case text, confirmation dialog added, on back press. 10 months ago