Commit Graph

144 Commits (9eaae96c842c4ff823a1aef82f7f5ead4689d5b4)

Author SHA1 Message Date
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
3 days 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
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
Sikander Saleem 7a5db103e0 api integrate cont. 1 week ago
WaseemAbbasi22 3944a549b2 requested changes done 1 week ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 4 weeks ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 4 weeks ago
Sikander Saleem a103eae1c1 demo module ui cont. 1 month ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 1 month ago
Sikander Saleem d765bf0b83 medical gas cont. 1 month ago
Sikander Saleem 60511b60cf files refactoring 2 months ago
Sikander Saleem 09762fd278 files refactoring 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
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
2 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
2 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
2 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
2 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
2 months ago
waseemabbasi22 0ffc0f650f improvements 2 months ago
waseemabbasi22 c4160ff98b improvements 2 months ago
WaseemAbbasi22 255691f47a loan design in progress 2 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 2 months ago
Sikander Saleem 01f004cecc chat development cont. 2 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 2 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 3 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
WaseemAbbasi22 cbddd807d4 internal audit design complete 3 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 4 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 4 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. 9 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