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
+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(),
),
);
}