Commit Graph

421 Commits (c2068544dbaa49c8a239aafd68b53db1efdf10e1)

Author SHA1 Message Date
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 3 weeks ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 4 weeks 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
1 month 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
1 month 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
1 month ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 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 542070c791 improvements 2 months ago
Sikander Saleem c5b4325aec survey notification finalized. 2 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 2 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 2 months ago
Sikander Saleem 01f004cecc chat development cont. 2 months ago
Sikander Saleem 233dc19030 users position added. 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
2 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
2 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 3 months ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 3 months ago
Sikander Saleem ae0e08183f asset group switching added. 3 months ago
Sikander Saleem 599da01554 traf request item list view added. 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 b17d6db327 po number, site, information added in asset details, 3 months ago
WaseemAbbasi22 f83109d5ca pagination fixes and 3 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 3 months ago
WaseemAbbasi22 c19fdb173b api integrated for main views 3 months ago
Sikander Saleem 4d035e9c46 android AGP upgraded & enhancement. 4 months ago
Sikander Saleem 0efc166a69 total working hour parameter changed. 4 months ago
Sikander Saleem 89b81391e9 site contact list api added. 4 months ago
WaseemAbbasi22 4d2931e335 Recall and Alert payload fixes 4 months ago
WaseemAbbasi22 f991456d17 Recall and Alert Fixes 4 months ago
Sikander Saleem 94d57685cd task module toJson model changed, duplicate timer activity fixed. 4 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
4 months ago
Sikander Saleem bb0a031104 1.3.9+28 uploaded. 5 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 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
waseemabbasi22 6c3f36944a auth and attachment fixes 5 months ago
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 5 months ago
Sikander Saleem e3a97c0ae9 enable engineer time picker issue fixed, session expired dialog issue fixed. 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 4e665d1959 attachment fixes 5 months ago
WaseemAbbasi22 8d02ff5ec1 mr number and exchange cost added 5 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
SikanderSaleem 5589d5b563 asset currency model & ios face id failed improvement. 6 months ago
Sikander Saleem 262b3aa42f local auth fail handling and improvements. 6 months ago
WaseemAbbasi22 1285ae68ec multiple assistant employee structure added 6 months ago
WaseemAbbasi22 705dff245d multiple assistant employee structure added 6 months ago
Sikander Saleem ffbe58b6c6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 6 months ago
WaseemAbbasi22 59c4d8f9b0 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 6 months ago
WaseemAbbasi22 32627bbda1 form fixes 6 months ago