 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
|
8 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
|
8 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
|
8 months ago |
|
Sikander Saleem
|
05e97a5c47
|
apk provided for pre-release.
|
8 months ago |
waseemabbasi22
|
2962f248e0
|
timer fixes
|
8 months ago |
|
Sikander Saleem
|
ff7ee7f8bb
|
user module permission api added. asset inventory switch to user permissions.
|
8 months ago |
|
waseemabbasi22
|
de48ca97bd
|
initial test done
|
9 months ago |
|
waseemabbasi22
|
c9d2df4ea7
|
Merge remote-tracking branch 'origin/design_3.0_internal_audit_module' into design_3.0_internal_audit_module
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
9 months ago |
|
waseemabbasi22
|
b4943aff3d
|
initial test done
|
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
|
92a94577d5
|
merge conflict resolved.
|
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 |
|
Sikander Saleem
|
4f78e23922
|
chat widget finalized.
|
9 months ago |
|
Sikander Saleem
|
e1c06a1857
|
site id improvement
|
9 months ago |
|
Sikander Saleem
|
59d21ae72e
|
jira 1430 & 1434 & 1437 fixed.
|
9 months ago |
|
Sikander Saleem
|
7445902564
|
chat attachment added.
|
9 months ago |
|
Sikander Saleem
|
c5b4325aec
|
survey notification finalized.
|
9 months ago |
|
Sikander Saleem
|
186987c5ce
|
chat flow improvement and connect to SignalR.
|
9 months ago |
|
Sikander Saleem
|
781e61814a
|
survey questionare finalized.
|
9 months ago |
|
Sikander Saleem
|
47e68b8cc3
|
switch to dev.
|
9 months ago |
|
Sikander Saleem
|
a902204ff1
|
survey improvements.
|
9 months ago |
 WaseemAbbasi22
|
a04ae0c833
|
attachment fixes
|
9 months ago |
|
Sikander Saleem
|
9d7c3a38b2
|
chat connection improvements
|
9 months ago |
|
Sikander Saleem
|
37ff2b4f4a
|
APK to provided to FM with fixed tracker issues.
|
9 months ago |
|
Sikander Saleem
|
1cc5ebd9fb
|
survey question cont.
|
9 months ago |
|
Sikander Saleem
|
bcfa23bad3
|
chat message ui completed for sender and recipient.
|
9 months ago |
|
Sikander Saleem
|
01f004cecc
|
chat development cont.
|
9 months ago |
|
Sikander Saleem
|
ec28f8992c
|
chat cont.
|
9 months ago |
|
Sikander Saleem
|
675c1fa10b
|
for uat
|
9 months ago |
|
WaseemAbbasi22
|
c1455378a6
|
bug fixes and improvements
|
9 months ago |
|
WaseemAbbasi22
|
81dd189025
|
internal audit api's implementation in progress
|
9 months ago |
|
WaseemAbbasi22
|
a8e8774040
|
internal audit api's implementation in progress
|
9 months ago |
|
Sikander Saleem
|
e54167b9b0
|
getUsersBasedOnSearch api for nurse role only.
|
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
|
9 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
|
9 months ago |
|
Sikander Saleem
|
d48fdfaaa5
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation
|
9 months ago |
|
Sikander Saleem
|
25475de68e
|
Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_TM_Module_snagsFix
# Conflicts:
# lib/modules/pm_module/ppm_wo/ppm_details_page.dart
|
9 months ago |
|
WaseemAbbasi22
|
4a283a685c
|
classification API added
|
9 months ago |
|
Sikander Saleem
|
8c1c865759
|
temporary server added.
|
9 months ago |
|
Sikander Saleem
|
a763538771
|
temporary server added.
|
9 months ago |
|
Sikander Saleem
|
4f2cb42a3f
|
temporary server added.
|
9 months ago |
|
WaseemAbbasi22
|
cbddd807d4
|
internal audit design complete
|
9 months ago |
|
Sikander Saleem
|
866ec5754e
|
improvements
|
9 months ago |
Sikander Saleem
|
ea54aea1f6
|
1.3.11+30 uploaded on stores.
|
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
|
7c367ba614
|
Apk provided to QA.
|
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
|
174e714d38
|
nurse cannot see recall and alert.
|
10 months ago |