 Sikander Saleem
|
f6a433ca09
|
Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
6 months ago |
|
Sikander Saleem
|
ce873d99a5
|
Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
6 months ago |
 WaseemAbbasi22
|
1f3c0bad97
|
Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
# lib/modules/cm_module/cm_detail_page.dart
|
7 months 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
|
7 months 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
|
7 months ago |
|
WaseemAbbasi22
|
a0a084803d
|
UI improvements
|
7 months ago |
|
Sikander Saleem
|
b78d10af46
|
current user employee id for chat.
|
7 months ago |
|
WaseemAbbasi22
|
3944a549b2
|
requested changes done
|
7 months ago |
|
WaseemAbbasi22
|
4f9f76515d
|
added form design for installation and pullout, handle pullout type task and other improvements
|
7 months ago |
|
Sikander Saleem
|
9f670d4a0b
|
Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
8 months ago |
|
WaseemAbbasi22
|
c2068544db
|
Medical Gas Inspection completed
|
8 months ago |
|
WaseemAbbasi22
|
7dd8fff34e
|
asset delivery modules completed
|
8 months ago |
|
Sikander Saleem
|
b3f8dabf2f
|
Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
|
8 months ago |
|
Sikander Saleem
|
db2175b7f5
|
quality auditor role added.
|
8 months ago |
|
Sikander Saleem
|
5ff9fc5808
|
chat added gas refill, transfer asset internal & external, task request.
|
8 months 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
|
9 months 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
|
9 months 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
|
9 months ago |
|
Sikander Saleem
|
ff7ee7f8bb
|
user module permission api added. asset inventory switch to user permissions.
|
9 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
|
9 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
|
9 months ago |
|
WaseemAbbasi22
|
542070c791
|
improvements
|
9 months ago |
|
Sikander Saleem
|
c5b4325aec
|
survey notification finalized.
|
9 months ago |
|
WaseemAbbasi22
|
a04ae0c833
|
attachment fixes
|
9 months ago |
|
Sikander Saleem
|
9d7c3a38b2
|
chat connection improvements
|
9 months ago |
|
Sikander Saleem
|
01f004cecc
|
chat development cont.
|
9 months ago |
|
Sikander Saleem
|
233dc19030
|
users position added.
|
9 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
|
10 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
|
10 months ago |
|
WaseemAbbasi22
|
cbddd807d4
|
internal audit design complete
|
10 months ago |
|
Sikander Saleem
|
40c7e75fa4
|
assessor role added for TRAF.
|
10 months ago |
|
Sikander Saleem
|
ae0e08183f
|
asset group switching added.
|
10 months ago |
|
Sikander Saleem
|
599da01554
|
traf request item list view added.
|
10 months ago |
|
Sikander Saleem
|
144951caec
|
traf request creation completed.
|
10 months ago |
|
Sikander Saleem
|
76acdddabc
|
asset by oracle code api added, departments lookup added.
|
10 months ago |
|
Sikander Saleem
|
b17d6db327
|
po number, site, information added in asset details,
|
10 months ago |
|
WaseemAbbasi22
|
f83109d5ca
|
pagination fixes and
|
10 months ago |
|
WaseemAbbasi22
|
8578319cc3
|
asset inventory module ready for qa
|
11 months ago |
|
WaseemAbbasi22
|
c19fdb173b
|
api integrated for main views
|
11 months ago |
|
Sikander Saleem
|
4d035e9c46
|
android AGP upgraded & enhancement.
|
11 months ago |
|
Sikander Saleem
|
0efc166a69
|
total working hour parameter changed.
|
11 months ago |
|
Sikander Saleem
|
89b81391e9
|
site contact list api added.
|
11 months ago |
|
WaseemAbbasi22
|
4d2931e335
|
Recall and Alert payload fixes
|
11 months ago |
|
WaseemAbbasi22
|
f991456d17
|
Recall and Alert Fixes
|
11 months ago |
|
Sikander Saleem
|
94d57685cd
|
task module toJson model changed, duplicate timer activity fixed.
|
11 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
|
12 months ago |
|
Sikander Saleem
|
bb0a031104
|
1.3.9+28 uploaded.
|
12 months ago |
|
WaseemAbbasi22
|
ccef98860f
|
recall and alert type request added
|
12 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
|
12 months ago |
waseemabbasi22
|
6c3f36944a
|
auth and attachment fixes
|
12 months ago |