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

2.1.0

Browse Source
This commit is contained in:
HooDie
2023-11-11 19:57:09 +03:30
parent b567d4dac9
commit f43f5cc54f
41 changed files with 1181 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/LabelPages/label_add_screen.dart
+26 -5
View File
@@ -34,6 +34,8 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
List<Map<String, String>> packageVals = [];
List<String> packageValue = [];
bool isInit = true;
// String? packageId;
// String? previousRoute;
List<TextEditingController> labelsCTRL = [TextEditingController()];
int curLabelVal = 1;
@@ -47,7 +49,15 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
@override
void didChangeDependencies() async {
if (isInit) {
// final pastRoute = ModalRoute.of(context)!.settings.name;
// previousRoute = pastRoute;
// print(previousRoute);
var labelProviderObject = Provider.of<LabelsProvider>(context);
// var arguments = ModalRoute.of(context)!.settings.arguments;
// if (arguments != null && arguments is Map<dynamic, dynamic>) {
// packageId = arguments['id'];
// }
// print(packageId);
labelProviderObject.resetPackageVals();
labelProviderObject.getPackageFilters().then(
(result) {
@@ -67,6 +77,7 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
// String initialLabelValue;
return WillPopScope(
onWillPop: () async {
Navigator.pushReplacementNamed(
@@ -286,8 +297,15 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
),
),
Consumer<LabelsProvider>(
builder: (ctx, labelProvider, _) =>
ListView.builder(
builder: (ctx, labelProvider, _) {
// if (previousRoute ==
// '/PackageDetailScreen') {
// initialLabelValue = packageId!;
// } else {
// initialLabelValue =
// labelProvider.initialPackageValue;
// }
return ListView.builder(
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, index) =>
@@ -304,8 +322,8 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
),
itemCount:
labelProvider.packageValues.length,
),
),
);
}),
SizedBox(
height: 10,
),
@@ -330,7 +348,10 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
lotNumberCTRL: lotNumberCTRL,
cycleNumberCTRL: cycleNumberCTRL,
sDateCTRL: sDateCTRL,
packageValue: packageValue,
packageValue: Provider.of<LabelsProvider>(
context,
listen: false,
).packageValues,
eDateCTRL: eDateCTRL,
striizerIdCTRL: striizerIdCTRL,
deviceBlockSize: _deviceBlockSize,
lib/pages/LabelPages/label_result_screen.dart
+3 -2
View File
@@ -67,8 +67,9 @@ class _LabelResultScreenState extends State<LabelResultScreen> {
FocusManager.instance.primaryFocus?.unfocus();
},
child: Scaffold(
floatingActionButton:
LabelFloatingButtons(deviceBlockSize: _deviceBlockSize),
floatingActionButton: LabelFloatingButtons(
deviceBlockSize: _deviceBlockSize,
),
appBar: AppBar(
titleSpacing: -10,
title: Text('Home'),
lib/pages/LabelPages/label_update_screen.dart
+16 -17
View File
@@ -1,4 +1,3 @@
import 'package:cssd/widgets/LabelScreens/Add/selector_box.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:intl/intl.dart' as DateEditor;
@@ -27,7 +26,7 @@ class _LabelUpdateScreenState extends State<LabelUpdateScreen> {
TextEditingController striizerIdCTRL = new TextEditingController();
TextEditingController sDateCTRL = new TextEditingController();
TextEditingController eDateCTRL = new TextEditingController();
TextEditingController packageCTRL = new TextEditingController();
// TextEditingController packageCTRL = new TextEditingController();
DateTime? dateTimeS;
// String sDateValue;
@@ -35,8 +34,8 @@ class _LabelUpdateScreenState extends State<LabelUpdateScreen> {
final _form = GlobalKey<FormState>();
List<Map<String, String>> packageVals = [];
List<String> packageValue = [];
// List<Map<String, String>> packageVals = [];
// List<String> packageValue = [];
bool isEmpty = false;
bool isInit = true;
LabelDetailsObject? datas;
@@ -67,9 +66,9 @@ class _LabelUpdateScreenState extends State<LabelUpdateScreen> {
striizerIdCTRL.text = datas!.sterileId;
sDateCTRL.text = datas!.sterileDate;
eDateCTRL.text = datas!.expireDate;
packageValue.add(datas!.packageId);
packageValue.add(datas!.package);
packageCTRL.text = datas!.package;
// packageValue.add(datas!.packageId);
// packageValue.add(datas!.package);
// packageCTRL.text = datas!.package;
},
);
},
@@ -256,15 +255,15 @@ class _LabelUpdateScreenState extends State<LabelUpdateScreen> {
SizedBox(
height: 20,
),
LabelAddSelectorBox(
deviceBlockSize: _deviceBlockSize,
packageCTRL: packageCTRL,
packageVals: packageVals,
packageValue: packageValue,
),
SizedBox(
height: 20,
),
// LabelAddSelectorBox(
// deviceBlockSize: _deviceBlockSize,
// packageCTRL: packageCTRL,
// packageVals: packageVals,
// packageValue: packageValue,
// ),
// SizedBox(
// height: 20,
// ),
LabelAddDatePicker(
dateCTRL: sDateCTRL,
deviceBlockSize: _deviceBlockSize,
@@ -287,7 +286,7 @@ class _LabelUpdateScreenState extends State<LabelUpdateScreen> {
lotNumberCTRL: lotNumberCTRL,
cycleNumberCTRL: cycleNumberCTRL,
sDateCTRL: sDateCTRL,
packageValue: packageValue,
// packageValue: packageValue,
eDateCTRL: eDateCTRL,
striizerIdCTRL: striizerIdCTRL,
deviceBlockSize: _deviceBlockSize,