From 31b0eaeb2ec90260d0237b9777c12d1b3c58a650 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 14 Nov 2023 17:42:39 +0300 Subject: [PATCH 1/2] asset image fixed. --- lib/models/device/asset.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/models/device/asset.dart b/lib/models/device/asset.dart index 1b3e0344..9b3775ec 100644 --- a/lib/models/device/asset.dart +++ b/lib/models/device/asset.dart @@ -115,7 +115,9 @@ class Asset { } comment = json['comment']; tagCode = json['tagCode']; + assetPhoto = json['assetPhoto']; } + num id; String assetSerialNo; String systemID; @@ -165,6 +167,7 @@ class Asset { String comment; String tagCode; String assetPhoto; + Asset copyWith({ num id, String assetSerialNo, @@ -267,6 +270,7 @@ class Asset { tagCode: tagCode ?? this.tagCode, assetPhoto: assetPhoto ?? this.assetPhoto, ); + Map toJson() { final map = {}; map['id'] = id; From 3f05bd298850794f0454b767b24cbfa379231dca Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 14 Nov 2023 17:52:15 +0300 Subject: [PATCH 2/2] open request fixed for nurse & enigneer. --- lib/controllers/providers/api/all_requests_provider.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 3bbece0b..71fe7e87 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -5,6 +5,7 @@ import 'package:http/http.dart'; import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart'; +import 'package:test_sa/models/enums/user_types.dart'; import '../../../models/search_all_requests_model.dart'; @@ -175,9 +176,10 @@ class AllRequestsProvider extends ChangeNotifier { if (openRequests == null) notifyListeners(); Response response; try { + bool isEngineer = ApiManager.instance.user.type == UsersTypes.engineer; Map body = { "typeTransaction": [1, 2, 3, 4], - "statusTransaction": [1], + "statusTransaction": [isEngineer ? 2 : 1], "priority": [], "displayData": [] };