This commit is contained in:
unknown
2023-12-09 17:52:53 +03:30
parent 6464557956
commit ede10a2efe
36 changed files with 2252 additions and 1821 deletions
@@ -37,10 +37,8 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
void didChangeDependencies() {
if (_isInit) {
var myItemResults = Provider.of<MyItemProvider>(context);
final userData = Provider.of<Auth>(context, listen: false).user;
myItemResults.setLoading();
myItemResults.resetPageNumber();
if (userData['roles']?.contains('User')) {
myItemResults.getMyItems().then(
(_) {
myItemResults.resetLoading();
@@ -58,23 +56,6 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
);
},
);
} else {
myItemResults.getHospitalItems().then((_) {
myItemResults.resetLoading();
sc!.addListener(
() {
if (sc!.position.pixels == sc!.position.maxScrollExtent &&
searchCTRL.text == '') {
var myItemResults = Provider.of<MyItemProvider>(
context,
listen: false,
);
myItemResults.getHospitalItems();
}
},
);
});
}
}
_isInit = false;
super.didChangeDependencies();
@@ -177,13 +158,8 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
textInputType: TextInputType.visiblePassword,
deviceBlockSize: _deviceBlockSize,
onChanged: (value) {
if (userData['roles']?.contains('User')) {
Provider.of<MyItemProvider>(context, listen: false)
.searchMyItems(value);
} else {
Provider.of<MyItemProvider>(context, listen: false)
.searchHospitalItems(value);
}
Provider.of<MyItemProvider>(context, listen: false)
.searchMyItems(value);
},
),
SizedBox(
@@ -201,11 +177,13 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
: ListView.builder(
controller: sc,
itemBuilder: (context, index) {
if (userData['roles']?.contains('User')) {
return MyItemsItemDataBox(
deviceBlockSize: _deviceBlockSize,
isAdmin: false,
items: itemResults.myItems?[index],
deviceBlockSize: _deviceBlockSize,
isAdmin:
userData['roles']?.contains('User')
? false
: true,
items: itemResults.myItems?[index],
push: () {
Navigator.pushNamed(context,
Routes.myItemsHistoryScreen,
@@ -213,26 +191,8 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
itemResults.myItems?[index]);
},
);
} else {
return MyItemsItemDataBox(
deviceBlockSize: _deviceBlockSize,
isAdmin: true,
items:
itemResults.hospitalItems?[index],
push: () {
Navigator.pushNamed(
context,
Routes.myItemsHistoryScreen,
arguments: itemResults
.hospitalItems?[index],
);
},
);
}
},
itemCount: userData['roles']?.contains('User')
? itemResults.myItems?.length
: itemResults.hospitalItems?.length,
itemCount: itemResults.myItems?.length,
shrinkWrap: true,
);
},
@@ -33,44 +33,24 @@ class _MyItemsRequestsScreenState extends State<MyItemsRequestsScreen> {
void didChangeDependencies() {
if (_isInit) {
var itemResults = Provider.of<MyItemProvider>(context);
final userData = Provider.of<Auth>(context, listen: false).user;
itemResults.setLoading();
itemResults.resetPageNumber();
if (userData['roles']?.contains('User')) {
itemResults.getMyItemRequests().then(
(_) {
itemResults.resetLoading();
sc?.addListener(
() {
if (sc!.position.pixels == sc!.position.maxScrollExtent) {
var itemResults = Provider.of<MyItemProvider>(
context,
listen: false,
);
itemResults.getMyItemRequests();
}
},
);
},
);
} else {
itemResults.getHospitalItemRequests().then(
(_) {
itemResults.resetLoading();
sc?.addListener(
() {
if (sc!.position.pixels == sc!.position.maxScrollExtent) {
var itemResults = Provider.of<MyItemProvider>(
context,
listen: false,
);
itemResults.getHospitalItemRequests();
}
},
);
},
);
}
itemResults.getMyItemRequests().then(
(_) {
itemResults.resetLoading();
sc?.addListener(
() {
if (sc!.position.pixels == sc!.position.maxScrollExtent) {
var itemResults = Provider.of<MyItemProvider>(
context,
listen: false,
);
itemResults.getMyItemRequests();
}
},
);
},
);
}
_isInit = false;
super.didChangeDependencies();
@@ -116,29 +96,18 @@ class _MyItemsRequestsScreenState extends State<MyItemsRequestsScreen> {
: ListView.builder(
controller: sc,
itemBuilder: (context, index) {
if (userData['roles']?.contains('User')) {
return RequestsDataBox(
return RequestsDataBox(
deviceBlockSize: _deviceBlockSize,
isAdmin: false,
isAdmin:
userData['roles']?.contains('User')
? false
: true,
item: itemResults
.originalMyItemsRequests?[index],
);
} else {
return RequestsDataBox(
deviceBlockSize: _deviceBlockSize,
isAdmin: true,
item: itemResults
.originalHospitalItemsRequests?[
index],
);
}
);
},
itemCount: userData['roles']?.contains('User')
? itemResults
.originalMyItemsRequests?.length
: itemResults
.originalHospitalItemsRequests
?.length,
itemCount: itemResults
.originalMyItemsRequests?.length,
shrinkWrap: true,
);
},