mirror of
https://git.meshkee.com/applications/cssd.git
synced 2026-10-13 08:48:55 +03:30
2.2.0
This commit is contained in:
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+15
-12
@@ -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,
|
||||
);
|
||||
},
|
||||
),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
|
||||
Regular → Executable
Regular → Executable
+3
-1
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user