cssd-doc/cssd
1
0
Fork 0
mirror of https://git.meshkee.com/applications/cssd.git synced 2026-10-12 10:38:56 +03:30
Code Issues Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
Odein
2023-10-28 15:25:31 +04:30
parent eab99539d5
commit 92d6024cb1
11 changed files with 181 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/providers/my_items.dart
+38 -14
View File
@@ -19,6 +19,8 @@ class MyItemProvider extends ChangeNotifier {
List<MyItemResultObject>? originalMyItemsRequests;
List<MyItemResultObject>? originalHospitalItemsRequests;
List<MyItemResultObject>? originalItemHistory;
MyItemFilterObject? filters = MyItemFilterObject(
id: '',
name: '',
@@ -92,7 +94,6 @@ class MyItemProvider extends ChangeNotifier {
String url = Url.getMyItems(pageNumber);
if (filterOn) {
if (filters!.id != '') {
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Modify this. Filter Items by ID dos'nt work!!!!
url += '&item_id=${filters!.id}';
}
if (filters!.name != '') {
@@ -125,12 +126,6 @@ class MyItemProvider extends ChangeNotifier {
name: item['name'],
id: item['id'].toString(),
size: item['size'].toString(),
fromDate: item['transfers'].isNotEmpty
? item['transfers']['from_date'].toString()
: '',
toDate: item['transfers'].isNotEmpty
? item['transfers']['to_date'].toString()
: '',
),
);
}
@@ -142,7 +137,6 @@ class MyItemProvider extends ChangeNotifier {
String url = Url.getHospitalItems(pageNumber);
if (filterOn) {
if (filters!.id != '') {
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Modify this. Filter Items by ID dos'nt work!!!!
url += '&item_id=${filters!.id}';
}
if (filters!.name != '') {
@@ -178,12 +172,6 @@ class MyItemProvider extends ChangeNotifier {
id: item['id'].toString(),
size: item['size'].toString(),
userName: item['user'] != null ? item['user']['name'] : '',
fromDate: item['transfers'].isNotEmpty
? item['transfers']['from_date'].toString()
: '',
toDate: item['transfers'].isNotEmpty
? item['transfers']['to_date'].toString()
: '',
),
);
}
@@ -191,6 +179,40 @@ class MyItemProvider extends ChangeNotifier {
searchHospitalItems('');
}
Future<void> getItemsHistory(String id) async {
String url = Url.getItemResult(id);
var response = await http.get(
Uri.parse(url),
headers: {'Authorization': User.token, "Accept": "application/json"},
);
var itemsData = json.decode(response.body)['data'];
String fromDate = '';
String toDate = '';
String userHistory = '';
for (var transfer in itemsData['transfers']) {
fromDate =
transfer['from_date'] != null ? transfer['from_date'].toString() : '';
toDate =
transfer['to_date'] != null ? transfer['to_date'].toString() : '';
userHistory = transfer['user']['name'].toString();
}
if (itemsData.isNotEmpty) {
originalItemHistory!.add(
MyItemResultObject(
name: itemsData['name'],
id: itemsData['id'].toString(),
size: itemsData['size'].toString(),
fromDate: fromDate,
toDate: toDate,
userHistory: userHistory,
),
);
originalItemHistory!.reversed.toList();
}
}
Future<void> getMyItemRequests() async {
String url = Url.getMyItemRequests;
var response = await http.get(
@@ -208,6 +230,7 @@ class MyItemProvider extends ChangeNotifier {
name: item['transferable']['name'],
id: item['transferable']['id'].toString(),
size: item['transferable']['size'].toString(),
requestId: item['id'].toString(),
),
);
}
@@ -232,6 +255,7 @@ class MyItemProvider extends ChangeNotifier {
id: item['transferable']['id'].toString(),
size: item['transferable']['size'].toString(),
userName: item['user'] != null ? item['user']['name'] : '',
requestId: item['id'].toString(),
),
);
}
lib/providers/my_packages.dart
+42 -12
View File
@@ -102,17 +102,30 @@ class MyPackageProvider extends ChangeNotifier {
originalMyPackages = [];
}
String fromDate = '';
String toDate = '';
String userHistory = '';
for (var package in packagesData['data']) {
for (var transfer in package['transfers']) {
fromDate = transfer['from_date'] != null
? transfer['from_date'].toString()
: '';
toDate =
transfer['to_date'] != null ? transfer['to_date'].toString() : '';
userHistory = transfer['user']['name'].toString();
}
}
for (var package in packagesData['data']) {
originalMyPackages!.add(
MyPackageResultObject(
name: package['name'],
id: package['id'].toString(),
// fromDate: package['transfers'].isNotEmpty
// ? package['transfers']['from_date'].toString()
// : '',
// toDate: package['transfers'].isNotEmpty
// ? package['transfers']['to_date'].toString()
// : '',
createdAt: package['created_at'].toString(),
fromDate: fromDate,
toDate: toDate,
userName: userHistory,
),
);
}
@@ -144,18 +157,31 @@ class MyPackageProvider extends ChangeNotifier {
originalHospitalPackages = [];
}
String fromDate = '';
String toDate = '';
String userHistory = '';
for (var package in packagesData['data']) {
for (var transfer in package['transfers']) {
fromDate = transfer['from_date'] != null
? transfer['from_date'].toString()
: '';
toDate =
transfer['to_date'] != null ? transfer['to_date'].toString() : '';
userHistory = transfer['user']['name'].toString();
}
}
for (var package in packagesData['data']) {
originalHospitalPackages!.add(
MyPackageResultObject(
name: package['name'],
id: package['id'].toString(),
createdAt: package['created_at'].toString(),
userName: package['user'] != null ? package['user']['name'] : '',
// fromDate: package['transfers'].isNotEmpty
// ? package['transfers']['from_date'].toString()
// : '',
// toDate: package['transfers'].isNotEmpty
// ? package['transfers']['to_date'].toString()
// : '',
fromDate: fromDate,
toDate: toDate,
userHistory: userHistory,
),
);
}
@@ -179,6 +205,8 @@ class MyPackageProvider extends ChangeNotifier {
MyPackageResultObject(
name: package['transferable']['name'],
id: package['transferable']['id'].toString(),
createdAt: package['created_at'].toString(),
requestId: package['id'].toString(),
),
);
}
@@ -200,7 +228,9 @@ class MyPackageProvider extends ChangeNotifier {
MyPackageResultObject(
name: package['transferable']['name'],
id: package['transferable']['id'].toString(),
createdAt: package['created_at'].toString(),
userName: package['user'] != null ? package['user']['name'] : '',
requestId: package['id'].toString(),
),
);
}