cssd-doc/cssd
1
0
Fork 0
mirror of https://git.meshkee.com/applications/cssd.git synced 2026-10-10 19: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/config/urls.dart
+1 -1
View File
@@ -187,6 +187,6 @@ class Url {
}
static String getUsers(String id) {
return '$baseUrl/Users?medicalCenter_id=$id';
return '$baseUrl/Users?medical_center_id=$id';
}
}
lib/models/my_item_model.dart
+6
View File
@@ -7,6 +7,8 @@ class MyItemResultObject extends Equatable {
final String? userName;
final String? fromDate;
final String? toDate;
final String? requestId;
final String? userHistory;
MyItemResultObject({
required this.id,
@@ -15,6 +17,8 @@ class MyItemResultObject extends Equatable {
this.userName,
this.fromDate,
this.toDate,
this.requestId,
this.userHistory,
});
@override
@@ -25,6 +29,8 @@ class MyItemResultObject extends Equatable {
userName!,
fromDate!,
toDate!,
requestId!,
userHistory!,
];
@override
lib/models/my_package_model.dart
+9 -3
View File
@@ -3,28 +3,34 @@ import 'package:equatable/equatable.dart';
class MyPackageResultObject extends Equatable {
final String id;
final String name;
final List<String>? items;
final String createdAt;
final String? userName;
final String? fromDate;
final String? toDate;
final String? requestId;
final String? userHistory;
MyPackageResultObject({
required this.id,
required this.name,
required this.createdAt,
this.userName,
this.fromDate,
this.toDate,
this.items,
this.requestId,
this.userHistory,
});
@override
List<Object> get props => [
id,
name,
items!,
createdAt,
userName!,
fromDate!,
toDate!,
requestId!,
userHistory!,
];
@override
lib/pages/MyItemsPages/my_items_history_screen.dart
+27 -28
View File
@@ -1,7 +1,6 @@
import 'package:cssd/models/my_item_model.dart';
import 'package:cssd/providers/auth.dart';
import 'package:cssd/providers/users.dart';
import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_data_box.dart';
import 'package:cssd/providers/my_items.dart';
import 'package:cssd/widgets/MyItemsScreens/History/my_items_history_date_widget.dart';
import 'package:cssd/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart';
@@ -35,28 +34,29 @@ class _MyItemsHistoryScreenState extends State<MyItemsHistoryScreen> {
}
@override
void didChangeDependencies() async {
void didChangeDependencies() {
if (_isInit) {
itemData =
ModalRoute.of(context)!.settings.arguments as MyItemResultObject?;
var userResults = Provider.of<UsersProvider>(context);
userResults.setLoading();
String medicalCenterId =
await userResults.getUserMedicalCenter() as String;
userResults.getUsers(medicalCenterId).then((_) {
userResults.resetLoading();
sc?.addListener(
() {
if (sc!.position.pixels == sc!.position.maxScrollExtent) {
var userResults = Provider.of<UsersProvider>(
context,
listen: false,
);
userResults.getUsers(medicalCenterId);
}
},
);
});
var _id = itemData!.id;
var myItemResults = Provider.of<MyItemProvider>(context);
myItemResults.setLoading();
myItemResults.getItemsHistory(_id).then(
(_) {
myItemResults.resetLoading();
sc!.addListener(
() {
if (sc!.position.pixels == sc!.position.maxScrollExtent) {
var myItemResults = Provider.of<MyItemProvider>(
context,
listen: false,
);
myItemResults.getItemsHistory(_id);
}
},
);
},
);
}
_isInit = false;
super.didChangeDependencies();
@@ -116,9 +116,9 @@ class _MyItemsHistoryScreenState extends State<MyItemsHistoryScreen> {
height: 20.0,
),
Expanded(
child: Consumer<UsersProvider>(
child: Consumer<MyItemProvider>(
builder: (context, userResults, child) {
return userResults.isLoading
return userResults.isloading
? Center(
child: CircularProgressIndicator(
color: Colors.black,
@@ -136,15 +136,14 @@ class _MyItemsHistoryScreenState extends State<MyItemsHistoryScreen> {
SizedBox(
height: 20.0,
),
TransferDataBox(
deviceBlockSize: _deviceBlockSize,
user:
userResults.usersBox?[index],
Text(
itemData!.userHistory.toString(),
),
],
);
},
itemCount: userResults.usersBox?.length,
itemCount: userResults
.originalItemHistory?.length,
shrinkWrap: true,
);
},
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(),
),
);
}
lib/widgets/Global/drawer.dart
+2 -1
View File
@@ -223,7 +223,8 @@ class _AppDrawerState extends State<AppDrawer> {
),
InkWell(
onTap: () {
Navigator.of(context).pushNamed(Routes.myItemsResultScreen);
Navigator.of(context)
.pushNamed(Routes.myPackagesResultScreen);
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15),
lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart
+2 -2
View File
@@ -26,7 +26,7 @@ class ItemHistoryDate extends StatelessWidget {
width: 6.0,
),
Text(
items.fromDate!.toString(),
items.fromDate.toString(),
style: TextStyle(
fontSize: 4 * _deviceBlockSize,
fontWeight: FontWeight.w700,
@@ -49,7 +49,7 @@ class ItemHistoryDate extends StatelessWidget {
width: 6.0,
),
Text(
items.toDate!.toString(),
items.toDate.toString(),
style: TextStyle(
fontSize: 4 * _deviceBlockSize,
fontWeight: FontWeight.w700,
lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart
+2 -2
View File
@@ -130,7 +130,7 @@ class RequestsDataBox extends StatelessWidget {
Provider.of<MyItemProvider>(context,
listen: false)
.verifyItemRequests(
item!.id, 'approved')
item!.requestId!, 'approved')
.then((result) {
if (result) {
print('true');
@@ -184,7 +184,7 @@ class RequestsDataBox extends StatelessWidget {
Provider.of<MyItemProvider>(context,
listen: false)
.verifyItemRequests(
item!.id, 'rejected')
item!.requestId!, 'rejected')
.then((result) {
if (result) {
print('false');
lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart
+25
View File
@@ -2,6 +2,7 @@ import 'package:cssd/config/colors.dart';
import 'package:cssd/models/my_package_model.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:intl/intl.dart';
import '../../../../config/routes.dart';
@@ -64,6 +65,30 @@ class MyPackagesItemDataBox extends StatelessWidget {
),
),
),
Container(
width: 30 * _deviceBlockSize,
child: Row(
children: <Widget>[
Text(
'Date:',
style: TextStyle(
color: Colors.grey,
fontSize: 3 * _deviceBlockSize,
),
),
Text(
DateFormat('y-M-d').format(
DateTime.parse(
packages!.createdAt,
),
),
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
),
),
],
),
),
if (isAdmin)
Container(
width: 30 * _deviceBlockSize,
lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart
+27 -2
View File
@@ -2,6 +2,7 @@ import 'package:cssd/config/colors.dart';
import 'package:cssd/models/my_package_model.dart';
import 'package:cssd/providers/my_packages.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../config/routes.dart';
@@ -61,6 +62,30 @@ class PackageRequestsDataBox extends StatelessWidget {
),
),
),
Container(
width: 30 * _deviceBlockSize,
child: Row(
children: <Widget>[
Text(
'Date:',
style: TextStyle(
color: Colors.grey,
fontSize: 3 * _deviceBlockSize,
),
),
Text(
DateFormat('y-M-d').format(
DateTime.parse(
package!.createdAt,
),
),
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
),
),
],
),
),
if (isAdmin)
Container(
width: 30 * _deviceBlockSize,
@@ -107,7 +132,7 @@ class PackageRequestsDataBox extends StatelessWidget {
Provider.of<MyPackageProvider>(context,
listen: false)
.verifyPackageRequests(
package!.id, 'approved')
package!.requestId!, 'approved')
.then((result) {
if (result) {
print('true');
@@ -161,7 +186,7 @@ class PackageRequestsDataBox extends StatelessWidget {
Provider.of<MyPackageProvider>(context,
listen: false)
.verifyPackageRequests(
package!.id, 'rejected')
package!.requestId!, 'rejected')
.then((result) {
if (result) {
print('false');