This commit is contained in:
Odein
2023-11-22 14:53:35 +04:30
parent 22d0390e90
commit cd3b1080f5
298 changed files with 800 additions and 413 deletions
View File
View File
View File
View File
View File
+15 -12
View File
@@ -2,6 +2,7 @@ import 'package:cssd/models/my_package_model.dart';
import 'package:cssd/providers/auth.dart';
import 'package:cssd/providers/my_packages.dart';
import 'package:cssd/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart';
import 'package:cssd/widgets/MyPackagesScreens/History/user_package_history_box.dart';
import 'package:cssd/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart';
import '../../config/routes.dart';
@@ -118,8 +119,8 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
),
Expanded(
child: Consumer<MyPackageProvider>(
builder: (context, userResults, child) {
return userResults.isloading
builder: (context, packageResults, child) {
return packageResults.isloading
? Center(
child: CircularProgressIndicator(
color: Colors.black,
@@ -133,16 +134,18 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
itemBuilder: (context, index) {
return Column(
children: [
PackageHistoryDate(
deviceBlockSize: _deviceBlockSize,
packages: packageData!,
),
SizedBox(
height: 20.0,
),
Text(
packageData!.userHistory
.toString(),
PackageHistoryDate(
deviceBlockSize: _deviceBlockSize,
packages: packageResults
.packageHistory![index],
),
UserPackageDataBox(
deviceBlockSize: _deviceBlockSize,
user: packageResults
.packageHistory![index],
),
SizedBox(
height: 20.0,
@@ -150,13 +153,13 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
],
);
},
itemCount: userResults
.originalPackageHistory!.length,
itemCount:
packageResults.packageHistory!.length,
shrinkWrap: true,
);
},
),
)
),
],
),
)
View File
+3 -1
View File
@@ -44,6 +44,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
packageData =
ModalRoute.of(context)!.settings.arguments as PackageDetailObject?;
var userResults = Provider.of<UsersProvider>(context);
userResults.resetSelectedUser();
userResults.setLoading();
String medicalCenterId =
await userResults.getUserMedicalCenter() as String;
@@ -115,8 +116,9 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
ResultSearchBox(
searchCTRL: searchCTRL,
text: 'user',
text2: 'name',
text2: 'name or ID',
deviceBlockSize: _deviceBlockSize,
textInputType: TextInputType.name,
onChanged: (value) {
Provider.of<UsersProvider>(context, listen: false)
.searchUsers(value);