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

Fix some issue

Browse Source
This commit is contained in:
fhkhd
2024-02-13 17:17:42 +03:30
parent c448b695ec
commit d2b81bd4a6
9 changed files with 839 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/CyclePages/cycle_add_screen.dart
+35 -14
View File
@@ -36,6 +36,7 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
List<TextEditingController> labelsCTRL = [TextEditingController()];
int curLabelVal = 1;
@override
void initState() {
descriptionCTRL.text = '';
@@ -73,8 +74,10 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return Consumer<CyclesProvider>(builder: (context, cyclesProvider, _) {
return WillPopScope(
onWillPop: () async {
cyclesProvider.resetLoadingButton();
Navigator.pushReplacementNamed(
context,
Routes.cycleResultScreen,
@@ -89,7 +92,12 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
title: Text('Cycles', style: TextStyle(color: Colors.white,),),
title: Text(
'Cycles',
style: TextStyle(
color: Colors.white,
),
),
backgroundColor: Colors.black,
leading: IconButton(
icon: Icon(
@@ -97,8 +105,11 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
color: Colors.white,
size: 35,
),
onPressed: () => Navigator.of(context)
.pushReplacementNamed(Routes.cycleResultScreen),
onPressed: () {
cyclesProvider.resetLoadingButton();
Navigator.of(context)
.pushReplacementNamed(Routes.cycleResultScreen);
},
),
),
body: Consumer<ConnectivityProvider>(
@@ -142,7 +153,8 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
controller: striizerIdCTRL,
decoration: InputDecoration(
icon: Icon(
FontAwesomeIcons.sortNumericDown,
FontAwesomeIcons
.sortNumericDown,
size: 7 * _deviceBlockSize,
),
labelStyle: TextStyle(
@@ -163,9 +175,11 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
),
keyboardType:
TextInputType.visiblePassword,
textInputAction: TextInputAction.next,
textInputAction:
TextInputAction.next,
onFieldSubmitted: (_) {
FocusScope.of(context).requestFocus(
FocusScope.of(context)
.requestFocus(
_cycleNumberFocusNode);
},
),
@@ -178,13 +192,16 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
(String result) {
if (result == 'cancel') {
print('cancel');
} else if (result == 'error') {
} else if (result ==
'error') {
print('error');
} else if (result == 'access') {
} else if (result ==
'access') {
print('access');
} else {
print(result);
striizerIdCTRL.text = result;
striizerIdCTRL.text =
result;
}
},
);
@@ -238,8 +255,8 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
keyboardType: TextInputType.number,
textInputAction: TextInputAction.next,
onFieldSubmitted: (_) {
FocusScope.of(context)
.requestFocus(_descriptionFocosNode);
FocusScope.of(context).requestFocus(
_descriptionFocosNode);
},
),
SizedBox(
@@ -253,7 +270,8 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
height: 20.0,
),
Container(
margin: EdgeInsets.symmetric(vertical: 10),
margin:
EdgeInsets.symmetric(vertical: 10),
child: Text(
'Labels included',
style: TextStyle(
@@ -268,7 +286,8 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
ListView.builder(
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, index) => AddLabelBox(
itemBuilder: (ctx, index) =>
AddLabelBox(
text: 'Select Labels included',
iconColor: kPinkSub,
deviceBlockSize: _deviceBlockSize,
@@ -279,7 +298,8 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
cycleProvider.initialLabelValue,
index: index,
hasRemoveButton:
cycleProvider.labelValues.length > 1
cycleProvider.labelValues.length >
1
? true
: false,
),
@@ -344,5 +364,6 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
),
),
);
});
}
}
lib/pages/LabelPages/label_add_screen.dart
+49 -21
View File
@@ -31,11 +31,13 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
final _form = GlobalKey<FormState>();
bool isInit = true;
// String? packageId;
// String? previousRoute;
List<TextEditingController> labelsCTRL = [TextEditingController()];
int curLabelVal = 1;
@override
void initState() {
sDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now());
@@ -72,8 +74,11 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
// String initialLabelValue;
return Consumer<LabelsProvider>(
builder: (context, labelsProvider, _) {
return WillPopScope(
onWillPop: () async {
labelsProvider.resetLoadingButton();
Navigator.pushReplacementNamed(
context,
Routes.labelResultScreen,
@@ -88,7 +93,12 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
title: Text('Labels', style: TextStyle(color: Colors.white,),),
title: Text(
'Labels',
style: TextStyle(
color: Colors.white,
),
),
backgroundColor: Colors.black,
leading: IconButton(
icon: Icon(
@@ -96,8 +106,11 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
color: Colors.white,
size: 35,
),
onPressed: () => Navigator.of(context)
.pushReplacementNamed(Routes.labelResultScreen),
onPressed: () {
labelsProvider.resetLoadingButton();
Navigator.of(context)
.pushReplacementNamed(Routes.labelResultScreen);
},
),
),
body: Consumer<ConnectivityProvider>(
@@ -154,10 +167,12 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
labelText: 'Strilizer ID',
contentPadding:
EdgeInsets.symmetric(
vertical: 2, horizontal: 3),
vertical: 2,
horizontal: 3),
labelStyle: TextStyle(
fontWeight: FontWeight.w100,
fontSize: 4 * _deviceBlockSize,
fontSize:
4 * _deviceBlockSize,
),
),
style: TextStyle(
@@ -166,9 +181,11 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
),
keyboardType:
TextInputType.visiblePassword,
textInputAction: TextInputAction.next,
textInputAction:
TextInputAction.next,
onFieldSubmitted: (_) {
FocusScope.of(context).requestFocus(
FocusScope.of(context)
.requestFocus(
_cycleNumberFocusNode);
},
),
@@ -181,13 +198,16 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
(String result) {
if (result == 'cancel') {
print('cancel');
} else if (result == 'error') {
} else if (result ==
'error') {
print('error');
} else if (result == 'access') {
} else if (result ==
'access') {
print('access');
} else {
print(result);
striizerIdCTRL.text = result;
striizerIdCTRL.text =
result;
}
},
);
@@ -216,7 +236,9 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
setState(
() {
lotNumberCTRL.text =
striizerIdCTRL.text + ' - ' + val;
striizerIdCTRL.text +
' - ' +
val;
},
);
},
@@ -275,13 +297,15 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
fontWeight: FontWeight.w700,
fontSize: 5 * _deviceBlockSize,
),
keyboardType: TextInputType.visiblePassword,
keyboardType:
TextInputType.visiblePassword,
),
SizedBox(
height: 20,
),
Container(
margin: EdgeInsets.symmetric(vertical: 10),
margin:
EdgeInsets.symmetric(vertical: 10),
child: Text(
'Packages included',
style: TextStyle(
@@ -294,22 +318,23 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
Consumer<LabelsProvider>(
builder: (ctx, labelProvider, _) {
return ListView.builder(
physics: NeverScrollableScrollPhysics(),
physics:
NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, index) =>
AddPackageBox(
text: 'Package ID',
iconColor: kLightBlueSub,
deviceBlockSize: _deviceBlockSize,
values:
labelProvider.packageValues[index],
values: labelProvider
.packageValues[index],
vals: labelProvider.packageVals,
initialLabelValue:
labelProvider.initialPackageValue,
initialLabelValue: labelProvider
.initialPackageValue,
index: index,
),
itemCount:
labelProvider.packageValues.length,
itemCount: labelProvider
.packageValues.length,
);
}),
SizedBox(
@@ -336,7 +361,8 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
lotNumberCTRL: lotNumberCTRL,
cycleNumberCTRL: cycleNumberCTRL,
sDateCTRL: sDateCTRL,
packageValue: Provider.of<LabelsProvider>(
packageValue:
Provider.of<LabelsProvider>(
context,
listen: false,
).packageValues,
@@ -358,5 +384,7 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
),
),
);
},
);
}
}
lib/pages/PackagePages/package_add_screen.dart
+28 -14
View File
@@ -21,6 +21,7 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
final _packageUdiFocusNode = FocusNode();
final _descriptionFocusNode = FocusNode();
TextEditingController descriptionCTRL = new TextEditingController();
// TextEditingController udiCTRL = new TextEditingController();
TextEditingController nameCTRL = new TextEditingController();
TextEditingController dateCTRL = new TextEditingController();
@@ -30,6 +31,7 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
PackageFilterObject? filters;
int curLabelVal = 1;
@override
void initState() {
descriptionCTRL.text = '';
@@ -62,8 +64,11 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return Consumer<PackageProvider>(
builder: (context, packageProvider, _) {
return WillPopScope(
onWillPop: () async {
packageProvider.resetLoadingButton();
Navigator.pushReplacementNamed(
context,
Routes.packageResultScreen,
@@ -91,8 +96,11 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
color: Colors.white,
size: 35,
),
onPressed: () => Navigator.of(context)
.pushReplacementNamed(Routes.packageResultScreen),
onPressed: () {
packageProvider.resetLoadingButton();
Navigator.of(context)
.pushReplacementNamed(Routes.packageResultScreen);
},
),
),
body: Consumer<ConnectivityProvider>(
@@ -152,8 +160,8 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
onFieldSubmitted: (_) {
FocusScope.of(context)
.requestFocus(_packageUdiFocusNode);
FocusScope.of(context).requestFocus(
_packageUdiFocusNode);
},
),
SizedBox(
@@ -197,7 +205,8 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
// height: 20,
// ),
Container(
margin: EdgeInsets.symmetric(vertical: 5),
margin:
EdgeInsets.symmetric(vertical: 5),
child: Text(
'Items included',
style: TextStyle(
@@ -210,22 +219,24 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
Consumer<PackageProvider>(
builder: (ctx, packageProvider, _) =>
ListView.builder(
physics: NeverScrollableScrollPhysics(),
physics:
NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, index) => AddItemBox(
itemBuilder: (ctx, index) =>
AddItemBox(
text: 'Select Items Included',
iconColor: kPurpleSub,
deviceBlockSize: _deviceBlockSize,
values:
packageProvider.itemValues[index],
values: packageProvider
.itemValues[index],
vals: packageProvider.itemVals,
initialItemValue:
packageProvider.initialItemValue,
initialItemValue: packageProvider
.initialItemValue,
index: index,
// filteredItems:
// packageProvider.filteredItems!,
hasRemoveButton:
packageProvider.itemValues.length >
hasRemoveButton: packageProvider
.itemValues.length >
1
? true
: false,
@@ -267,7 +278,8 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
),
PackageAddSaveButton(
form: _form,
itemValues: Provider.of<PackageProvider>(
itemValues:
Provider.of<PackageProvider>(
context,
listen: false,
).itemValues,
@@ -291,5 +303,7 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
),
),
);
},
);
}
}
lib/providers/cycles.dart
+2 -1
View File
@@ -110,10 +110,11 @@ class CyclesProvider extends ChangeNotifier {
result.add(label['id'].toString());
// print(hospital['name']);
}
if (result.isEmpty) result.add("");
labelVals = result;
initialLabelValue = labelVals[0];
TextEditingController newLbl = new TextEditingController();
newLbl.text = initialLabelValue;
newLbl.text = "";
labelValues.add(newLbl);
notifyListeners();
return result;
lib/providers/labels.dart
+8 -7
View File
@@ -103,16 +103,17 @@ class LabelsProvider extends ChangeNotifier {
// "${package['name']} - ${package['package_id'] != null ? package['package_id'] : ''}");
result.add("${package['id'].toString()} - ${package['name'].toString()}");
}
if (result.isEmpty) result.add("");
packageVals = result;
initialPackageValue = packageId ?? packageVals[0];
TextEditingController newLbl = new TextEditingController();
newLbl.text = initialPackageValue;
newLbl.text = "";
packageValues.add(newLbl);
notifyListeners();
return result;
}
Future<void> createLabelResult(lotNumber, cycleNumber, sterileDate, packages,
Future<void> createLabelResult(lotNumber, cycleNumber, sterileDate, packageId,
expireDate, sterilizerId) async {
// List<Map<String, Object>> pkgs = [];
// for (var package in packages) {
@@ -126,7 +127,7 @@ class LabelsProvider extends ChangeNotifier {
'sterilizer_id': sterilizerId,
'cycle_number': cycleNumber,
'lot_number': lotNumber,
'package_id': packages,
'package_id': packageId,
},
),
headers: {
@@ -268,8 +269,8 @@ class LabelsProvider extends ChangeNotifier {
LabelResultObject(
expireDate: item['expire_date'],
id: item['id'].toString(),
package: item['package']['name'],
packageId: item['package']['id'].toString(),
package: item['package'] != null ? item['package']['name'].toString() : ' ',
packageId: item['package'] != null ? item['package']['id'].toString() : ' ',
),
);
}
@@ -303,8 +304,8 @@ class LabelsProvider extends ChangeNotifier {
print(data);
result = LabelDetailsObject(
id: data['id'].toString(),
package: data['package']['name'] != null ? data['package']['name'] : '',
packageId: data['package']['id'].toString() != 'null'
package: data['package'] != null ? data['package']['name'] : '',
packageId: data['package'] != null
? data['package']['id'].toString()
: '',
hospitalName: data['user']['medical_center']['name'],
lib/widgets/CycleScreens/Add/add_label_box.dart
+6
View File
@@ -112,6 +112,12 @@ class AddLabelBox extends StatelessWidget {
const EdgeInsets.symmetric(horizontal: 0),
child: TextFormField(
controller: values,
validator: (val) {
if (val!.isEmpty) {
return 'Label required!';
}
return null;
},
decoration: InputDecoration(
contentPadding: EdgeInsets.only(
bottom: 12,
lib/widgets/CycleScreens/Add/save_button.dart
-17
View File
@@ -49,23 +49,6 @@ class CycleAddSaveButton extends StatelessWidget {
descriptionCTRL.text,
striizerIdCTRL.text,
);
showDialog(
context: context,
builder: (ctx) => AlertDialog(
content: Text('Cycle added.'),
actions: <Widget>[
TextButton(
onPressed: () {
Navigator.of(ctx).pop();
},
child: Text('Ok'),
)
],
),
).then((_) {
Navigator.of(context)
.pushReplacementNamed(Routes.cycleResultScreen);
});
Navigator.of(context).pushReplacementNamed(Routes.cycleResultScreen);
Fluttertoast.showToast(
msg: "Cycle added.",
lib/widgets/LabelScreens/Add/add_package_box.dart
+6
View File
@@ -109,6 +109,12 @@ class AddPackageBox extends StatelessWidget {
const EdgeInsets.symmetric(horizontal: 0),
child: TextFormField(
controller: values,
validator: (val) {
if (val!.isEmpty) {
return 'Package required!';
}
return null;
},
decoration: InputDecoration(
contentPadding: EdgeInsets.only(
bottom: 12,
lib/widgets/LabelScreens/Add/save_button.dart
+4 -5
View File
@@ -39,10 +39,9 @@ class LabelAddSaveButton extends StatelessWidget {
if (!_form.currentState!.validate()) {
return;
}
List<String> packages = [];
for (TextEditingController package in packageValue) {
packages.add(package.text);
}
int packageId;
var pacagecValues = packageValue[0].text.split(" ");
packageId = int.parse(pacagecValues[0]);
await Provider.of<LabelsProvider>(context, listen: false)
.createLabelResult(
lotNumberCTRL.text,
@@ -50,7 +49,7 @@ class LabelAddSaveButton extends StatelessWidget {
sDateCTRL.text,
// sDateValue,
// {'id': packageValue[0], 'name': packageValue[1]},
packages[0],
packageId,
eDateCTRL.text,
// eDateValue,
striizerIdCTRL.text,