cssd-doc/cssd
1
0
Fork 0
mirror of https://git.meshkee.com/applications/cssd.git synced 2026-10-12 10:28:54 +03:30
Code Issues Packages Projects Releases Wiki Activity

Fix barcode scanner bug in add package select item

Browse Source
This commit is contained in:
fhkhd
2024-03-05 14:43:17 +03:30
parent 261926f678
commit 3db8ae3cfe
3 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/providers/packages.dart
+12 -19
View File
@@ -43,18 +43,11 @@ class PackageProvider extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
// var isDuplicateItem = false;
changeItemVal(String value, int index) { changeItemVal(String value, int index) {
for (var item in filteredItems!) { for (var item in filteredItems!) {
// if(itemValues.length > 1 && value != itemValues[index-1].text){ if (item.udi_name == value) {
if (item.udi_name == value) { itemValues[index].text = item.id;
itemValues[index].text = item.id; }
}
// }else {
// // isDuplicateItem = true;
// print("it is a problem!!!!!!!!!!");
// }
} }
notifyListeners(); notifyListeners();
} }
@@ -85,12 +78,13 @@ class PackageProvider extends ChangeNotifier {
} }
} }
changeItemValByScan(String value, int index) { changeItemValByScan(String value, int index) async {
for (var item in filteredItems!) { filteredItems?.forEach((item) {
if (item.udi == value) { if (item.id == value) {
itemValues[index].text = "${item.name} - ${item.udi}"; itemValues[index].text = "${item.name} - ${item.udi}";
} }
} print("item value : ${itemValues[index].text}");
});
notifyListeners(); notifyListeners();
} }
@@ -350,11 +344,10 @@ class PackageProvider extends ChangeNotifier {
for (var item in testResultData['data']) { for (var item in testResultData['data']) {
originalItems!.add( originalItems!.add(
PackageResultObject( PackageResultObject(
createdAt: item['created_at'], createdAt: item['created_at'],
id: item['id'].toString(), id: item['id'].toString(),
name: item['name'], name: item['name'],
status: item['status'] status: item['status']),
),
); );
} }
pageNumber += 1; pageNumber += 1;
lib/widgets/PackageScreens/Add/add_item_box.dart
+30 -25
View File
@@ -1,4 +1,3 @@
import 'package:cssd/models/item_model.dart';
import 'package:cssd/providers/packages.dart'; import 'package:cssd/providers/packages.dart';
import 'package:cssd/utils/scan.dart'; import 'package:cssd/utils/scan.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -23,6 +22,7 @@ class AddItemBox extends StatelessWidget {
final double _deviceBlockSize; final double _deviceBlockSize;
final TextEditingController values; final TextEditingController values;
// final List<Map<String, dynamic>> vals; // final List<Map<String, dynamic>> vals;
final List<String> vals; final List<String> vals;
@@ -31,6 +31,7 @@ class AddItemBox extends StatelessWidget {
final String text; final String text;
final Color? iconColor; final Color? iconColor;
final bool hasRemoveButton; final bool hasRemoveButton;
// final List<ItemResultObject> filteredItems; // final List<ItemResultObject> filteredItems;
// final String scanUdi; // final String scanUdi;
@@ -117,30 +118,34 @@ class AddItemBox extends StatelessWidget {
height: 70, height: 70,
padding: padding:
const EdgeInsets.symmetric(horizontal: 0), const EdgeInsets.symmetric(horizontal: 0),
child: Consumer<PackageProvider>(builder: (context, packageProvider, _) { child: Consumer<PackageProvider>(
return TextFormField( builder: (context, packageProvider, _) {
controller: values, return TextFormField(
validator: (val) { controller:
if (val!.isEmpty) { packageProvider.itemValues[index],
return 'Item required!'; validator: (val) {
} if (val!.isEmpty) {
return null; return 'Item required!';
}, }
decoration: InputDecoration( return null;
contentPadding: EdgeInsets.only( },
bottom: 12, decoration: InputDecoration(
contentPadding: EdgeInsets.only(
bottom: 12,
),
isDense: true,
), ),
isDense: true, style: TextStyle(
), fontWeight: FontWeight.w700,
style: TextStyle( color: Colors.black,
fontWeight: FontWeight.w700, fontSize: 4 * _deviceBlockSize,
color: Colors.black, ),
fontSize: 4 * _deviceBlockSize, );
), },
); ),
},),
), ),
isDense: true, isDense: true,
// selectedItemBuilder: packageProvider.itemValues[index].value,
items: vals.map((val) { items: vals.map((val) {
return new DropdownMenuItem<String>( return new DropdownMenuItem<String>(
enabled: isEnabled, enabled: isEnabled,
@@ -166,7 +171,7 @@ class AddItemBox extends StatelessWidget {
InkWell( InkWell(
onTap: () { onTap: () {
scan().then( scan().then(
(String result) { (String result) async {
if (result == 'cancel') { if (result == 'cancel') {
print('cancel'); print('cancel');
} else if (result == 'error') { } else if (result == 'error') {
@@ -174,8 +179,8 @@ class AddItemBox extends StatelessWidget {
} else if (result == 'access') { } else if (result == 'access') {
print('access'); print('access');
} else { } else {
print(result); await Provider.of<PackageProvider>(
Provider.of<PackageProvider>(context, context,
listen: false) listen: false)
.changeItemValByScan(result, index); .changeItemValByScan(result, index);
isEnabled = false; isEnabled = false;
lib/widgets/PackageScreens/Add/package_save_button.dart
+9 -1
View File
@@ -41,7 +41,15 @@ class PackageAddSaveButton extends StatelessWidget {
} }
List<String> items = []; List<String> items = [];
for (TextEditingController item in itemValues) { for (TextEditingController item in itemValues) {
items.add(item.text); print(item.text);
if (item.text.toString().contains(" ")) {
packageProvider.filteredItems?.forEach((element) {
if (element.udi_name.toString() == item.text.toString()) {
items.add(element.id.toString());
}
});
} else
items.add(item.text);
} }
items = items.toSet().toList(); items = items.toSet().toList();
await Provider.of<PackageProvider>(context, listen: false) await Provider.of<PackageProvider>(context, listen: false)