Commit Graph

115 Commits (59d21ae72e4cd03cf5d8df2e13c9be579924a450)

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
2 months ago
Sikander Saleem 144951caec traf request creation completed. 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 3 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 3 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 642d1a908c auto login improvement. 5 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 5 months ago
Sikander Saleem 93caf55354 edd and wo frame fields added. 6 months ago
Sikander Saleem 64a2d39cb1 timer picker added and improvements 7 months ago
Sikander Saleem e26db46108 improvements 8 months ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 8 months ago
Sikander Saleem 84bf5ac399 undo certificate check. 8 months ago
Sikander Saleem 2e4e567f1d certificate issue fixed. 8 months ago
Sikander Saleem 5169894dc4 code restructured and improvements. 8 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 8 months ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 9 months ago
WaseemAbbasi22 a42466b578 ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues 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 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 54db7c97fc Task Request nurse side ui completed 10 months ago
WaseemAbbasi22 289d06ff68 Asset transfer nurse side ui completed 11 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 11 months ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 11 months ago
WaseemAbbasi22 a5876ec1d3 swipe module added 1 year ago
WaseemAbbasi22 904f1919d4 all changes implemented 1 year ago
WaseemAbbasi22 78ebf9e60d improvements 1 year ago
WaseemAbbasi22 310ec59917 history log time duration added 1 year ago
muhammad.abbasi e582072a83 improvements 1 year ago
muhammad.abbasi f6b3c82fb3 activity status on sparepart activity and last situation in maintenance request added 1 year ago
muhammad.abbasi 34e54df40d intial testing fixes 1 year ago
muhammad.abbasi c2b3288423 in progress 1 year ago
muhammad.abbasi e8dc052d02 integrating api in new flow 1 year ago
Sikander Saleem 0d876a41fc Merge remote-tracking branch 'refs/remotes/origin/design_3.0_waseem' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/dashboard_latest/dashboard_view.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/extensions/text_extensions.dart
#	lib/models/lookup.dart
#	lib/new_views/app_style/app_themes.dart
#	lib/new_views/common_widgets/app_bottom_nav_bar.dart
#	lib/new_views/common_widgets/app_dashed_button.dart
#	lib/new_views/common_widgets/app_filled_button.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/new_views/pages/land_page/requests_list_page.dart
#	lib/providers/work_order/reason_provider.dart
#	lib/service_request_latest/views/components/bottom_sheets/action_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/activity_type_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/initial_visit_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/reject_request_bottomsheet.dart
#	lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/spare_part/spare_part_request.dart
#	lib/utilities/general_utils.dart
#	lib/views/widgets/date_and_time/date_picker.dart
#	lib/views/widgets/date_and_time/time_picker.dart
#	lib/views/widgets/e_signature/e_signature.dart
#	lib/views/widgets/images/multi_image_picker.dart
#	pubspec.yaml
1 year ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 1 year ago
Sikander Saleem be4c8d7653 null safety conversation complete 1 year ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 1 year ago
muhammad.abbasi f257fbadfa new Api models and provider added 1 year ago
nextwo 7ef71849dd comment unused files 2 years ago
Sikander Saleem 8273537b00 create supplier engineer functionality added. 2 years ago
Sikander Saleem 2a53ab8b8e electrical safety, asset availability, task status and ppm service added. 2 years ago
Sikander Saleem 828ae74e48 bug 309, 297, 293 fixed. 2 years ago
Sikander Saleem bddc7ded1f loan availability 2 years ago
Sikander Saleem 58f5fbab5e push notifications added. 2 years ago
Sikander Saleem cbafa20df8 when session ended, show dialog to login. 2 years ago
Sikander Saleem a6dd802321 receiver name added on new transfer request & improvements 2 years ago
Sikander Saleem 88108686d0 sender & receiver transfer fix. 2 years ago
nextwo d3bee4f39a gas refill comments 2 years ago