test commit

This commit is contained in:
HooDie
2023-10-27 20:50:17 +03:30
parent 11f910bb1c
commit eab99539d5
22 changed files with 504 additions and 288 deletions
@@ -15,9 +15,9 @@ import 'package:provider/provider.dart';
class MyPackagesHistoryScreen extends StatefulWidget {
final bool? isAdmin;
final MyPackageResultObject? packages;
final MyPackageResultObject? items;
MyPackagesHistoryScreen({this.isAdmin, this.packages});
MyPackagesHistoryScreen({this.isAdmin, this.items});
@override
_MyPackagesHistoryScreenState createState() =>
@@ -27,6 +27,7 @@ class MyPackagesHistoryScreen extends StatefulWidget {
class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
bool _isInit = true;
ScrollController? sc;
MyPackageResultObject? packageData;
@override
void initState() {
@@ -35,13 +36,15 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
}
@override
void didChangeDependencies() {
void didChangeDependencies() async {
if (_isInit) {
packageData =
ModalRoute.of(context)!.settings.arguments as MyPackageResultObject?;
var userResults = Provider.of<UsersProvider>(context);
userResults.setLoading();
userResults
.getUsers(userResults.getUserMedicalCenter() as String)
.then((_) {
String medicalCenterId =
await userResults.getUserMedicalCenter() as String;
userResults.getUsers(medicalCenterId).then((_) {
userResults.resetLoading();
sc?.addListener(
() {
@@ -50,8 +53,7 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
context,
listen: false,
);
userResults
.getUsers(userResults.getUserMedicalCenter() as String);
userResults.getUsers(medicalCenterId);
}
},
);
@@ -106,20 +108,13 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
MyPackagesItemDataBox(
deviceBlockSize: _deviceBlockSize,
hasHistoryBtn: false,
packages: MyPackagesHistoryScreen().packages!,
packages: packageData,
isAdmin: userData['roles']?.contains('User')
? false
: true,
),
SizedBox(
height: 10.0,
),
Divider(
color: Colors.grey,
height: 2.0,
),
SizedBox(
height: 10.0,
height: 20.0,
),
Expanded(
child: Consumer<UsersProvider>(
@@ -137,9 +132,7 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
children: [
PackageHistoryDate(
deviceBlockSize: _deviceBlockSize,
packages:
MyPackagesHistoryScreen()
.packages!,
packages: packageData!,
),
SizedBox(
height: 20.0,