Fix initialPackageValue in labels

This commit is contained in:
fhkhd
2024-02-27 18:59:20 +03:30
parent 50e929123c
commit 18f7d5a759
3 changed files with 15 additions and 8 deletions
+2 -1
View File
@@ -61,7 +61,8 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
); );
var arguments = ModalRoute.of(context)!.settings.arguments; var arguments = ModalRoute.of(context)!.settings.arguments;
if (arguments != null && arguments is Map<dynamic, dynamic>) { if (arguments != null && arguments is Map<dynamic, dynamic>) {
labelProviderObject.packageId = arguments['id']; labelProviderObject.packageId =
"${arguments['id']} - ${arguments['name']}";
} }
} }
@@ -89,6 +89,7 @@ class _PackageDetailScreenState extends State<PackageDetailScreen> {
Routes.labelAddScreen, Routes.labelAddScreen,
arguments: { arguments: {
"id": datas!.id, "id": datas!.id,
"name": datas!.name
}, },
); );
}, },
+12 -7
View File
@@ -47,8 +47,10 @@ class LabelsProvider extends ChangeNotifier {
hospital: '', hospital: '',
); );
int pageNumber = 1; int pageNumber = 1;
void resetPageNumber() => pageNumber = 1; void resetPageNumber() => pageNumber = 1;
bool isloading = false; bool isloading = false;
void resetLoading() { void resetLoading() {
isloading = false; isloading = false;
notifyListeners(); notifyListeners();
@@ -60,6 +62,7 @@ class LabelsProvider extends ChangeNotifier {
} }
bool isloadingButton = false; bool isloadingButton = false;
void resetLoadingButton() { void resetLoadingButton() {
isloadingButton = false; isloadingButton = false;
notifyListeners(); notifyListeners();
@@ -105,9 +108,9 @@ class LabelsProvider extends ChangeNotifier {
} }
if (result.isEmpty) result.add(""); if (result.isEmpty) result.add("");
packageVals = result; packageVals = result;
initialPackageValue = packageId ?? packageVals[0]; initialPackageValue = packageId ?? "";
TextEditingController newLbl = new TextEditingController(); TextEditingController newLbl = new TextEditingController();
newLbl.text = ""; newLbl.text = initialPackageValue;
packageValues.add(newLbl); packageValues.add(newLbl);
notifyListeners(); notifyListeners();
return result; return result;
@@ -269,8 +272,11 @@ class LabelsProvider extends ChangeNotifier {
LabelResultObject( LabelResultObject(
expireDate: item['expire_date'], expireDate: item['expire_date'],
id: item['id'].toString(), id: item['id'].toString(),
package: item['package'] != null ? item['package']['name'].toString() : ' ', package: item['package'] != null
packageId: item['package'] != null ? item['package']['id'].toString() : ' ', ? item['package']['name'].toString()
: ' ',
packageId:
item['package'] != null ? item['package']['id'].toString() : ' ',
), ),
); );
} }
@@ -305,9 +311,8 @@ class LabelsProvider extends ChangeNotifier {
result = LabelDetailsObject( result = LabelDetailsObject(
id: data['id'].toString(), id: data['id'].toString(),
package: data['package'] != null ? data['package']['name'] : '', package: data['package'] != null ? data['package']['name'] : '',
packageId: data['package'] != null packageId:
? data['package']['id'].toString() data['package'] != null ? data['package']['id'].toString() : '',
: '',
hospitalName: data['user']['medical_center']['name'], hospitalName: data['user']['medical_center']['name'],
createDate: data['created_at'] != null ? data['created_at'] : '', createDate: data['created_at'] != null ? data['created_at'] : '',
expireDate: data['expire_date'] != null ? data['expire_date'] : '', expireDate: data['expire_date'] != null ? data['expire_date'] : '',