Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

main_design2.0
nextwo 2 years ago
commit c64709b7cb

@ -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/api_manager.dart';
import 'package:test_sa/controllers/api_routes/urls.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/all_requests_and_count_model.dart';
import 'package:test_sa/models/enums/user_types.dart';
import '../../../models/search_all_requests_model.dart'; import '../../../models/search_all_requests_model.dart';
@ -175,9 +176,10 @@ class AllRequestsProvider extends ChangeNotifier {
if (openRequests == null) notifyListeners(); if (openRequests == null) notifyListeners();
Response response; Response response;
try { try {
bool isEngineer = ApiManager.instance.user.type == UsersTypes.engineer;
Map<String, dynamic> body = { Map<String, dynamic> body = {
"typeTransaction": [1, 2, 3, 4], "typeTransaction": [1, 2, 3, 4],
"statusTransaction": [1], "statusTransaction": [isEngineer ? 2 : 1],
"priority": [], "priority": [],
"displayData": [] "displayData": []
}; };

@ -115,7 +115,9 @@ class Asset {
} }
comment = json['comment']; comment = json['comment'];
tagCode = json['tagCode']; tagCode = json['tagCode'];
assetPhoto = json['assetPhoto'];
} }
num id; num id;
String assetSerialNo; String assetSerialNo;
String systemID; String systemID;
@ -165,6 +167,7 @@ class Asset {
String comment; String comment;
String tagCode; String tagCode;
String assetPhoto; String assetPhoto;
Asset copyWith({ Asset copyWith({
num id, num id,
String assetSerialNo, String assetSerialNo,
@ -267,6 +270,7 @@ class Asset {
tagCode: tagCode ?? this.tagCode, tagCode: tagCode ?? this.tagCode,
assetPhoto: assetPhoto ?? this.assetPhoto, assetPhoto: assetPhoto ?? this.assetPhoto,
); );
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
map['id'] = id; map['id'] = id;

Loading…
Cancel
Save