diff --git a/lib/pages/LabelPages/label_add_screen.dart b/lib/pages/LabelPages/label_add_screen.dart index 386c77a..31f90d4 100755 --- a/lib/pages/LabelPages/label_add_screen.dart +++ b/lib/pages/LabelPages/label_add_screen.dart @@ -61,7 +61,8 @@ class _LabelAddScreenState extends State { ); var arguments = ModalRoute.of(context)!.settings.arguments; if (arguments != null && arguments is Map) { - labelProviderObject.packageId = arguments['id']; + labelProviderObject.packageId = + "${arguments['id']} - ${arguments['name']}"; } } diff --git a/lib/pages/PackagePages/package_detail_screen.dart b/lib/pages/PackagePages/package_detail_screen.dart index d9db3a2..7194a90 100755 --- a/lib/pages/PackagePages/package_detail_screen.dart +++ b/lib/pages/PackagePages/package_detail_screen.dart @@ -89,6 +89,7 @@ class _PackageDetailScreenState extends State { Routes.labelAddScreen, arguments: { "id": datas!.id, + "name": datas!.name }, ); }, diff --git a/lib/providers/labels.dart b/lib/providers/labels.dart index 9e084df..3a362e5 100755 --- a/lib/providers/labels.dart +++ b/lib/providers/labels.dart @@ -47,8 +47,10 @@ class LabelsProvider extends ChangeNotifier { hospital: '', ); int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; bool isloading = false; + void resetLoading() { isloading = false; notifyListeners(); @@ -60,6 +62,7 @@ class LabelsProvider extends ChangeNotifier { } bool isloadingButton = false; + void resetLoadingButton() { isloadingButton = false; notifyListeners(); @@ -105,9 +108,9 @@ class LabelsProvider extends ChangeNotifier { } if (result.isEmpty) result.add(""); packageVals = result; - initialPackageValue = packageId ?? packageVals[0]; + initialPackageValue = packageId ?? ""; TextEditingController newLbl = new TextEditingController(); - newLbl.text = ""; + newLbl.text = initialPackageValue; packageValues.add(newLbl); notifyListeners(); return result; @@ -269,8 +272,11 @@ class LabelsProvider extends ChangeNotifier { LabelResultObject( expireDate: item['expire_date'], id: item['id'].toString(), - package: item['package'] != null ? item['package']['name'].toString() : ' ', - packageId: item['package'] != null ? item['package']['id'].toString() : ' ', + package: item['package'] != null + ? item['package']['name'].toString() + : ' ', + packageId: + item['package'] != null ? item['package']['id'].toString() : ' ', ), ); } @@ -305,9 +311,8 @@ class LabelsProvider extends ChangeNotifier { result = LabelDetailsObject( id: data['id'].toString(), package: data['package'] != null ? data['package']['name'] : '', - packageId: data['package'] != null - ? data['package']['id'].toString() - : '', + packageId: + data['package'] != null ? data['package']['id'].toString() : '', hospitalName: data['user']['medical_center']['name'], createDate: data['created_at'] != null ? data['created_at'] : '', expireDate: data['expire_date'] != null ? data['expire_date'] : '',