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

2.1.1

Browse Source
This commit is contained in:
HooDie
2023-11-12 17:41:02 +03:30
parent f43f5cc54f
commit 22d0390e90
6 changed files with 116 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/MyPackagesPages/my_packages_transfer_screen.dart
+1 -1
View File
@@ -185,7 +185,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
), ),
content: SizedBox( content: SizedBox(
width: _deviceBlockSize, width: _deviceBlockSize,
height: 280, height: 300,
child: Column( child: Column(
children: [ children: [
Text( Text(
lib/pages/home_screen.dart
+43 -36
View File
@@ -159,6 +159,9 @@ class HomePage extends StatelessWidget {
), ),
), ),
), ),
Divider(
height: 2,
),
SelectionItem( SelectionItem(
firstLine: 'CYCLES', firstLine: 'CYCLES',
secondLine: 'List, Details & Add a one', secondLine: 'List, Details & Add a one',
@@ -180,24 +183,26 @@ class HomePage extends StatelessWidget {
Divider( Divider(
height: 2, height: 2,
), ),
SelectionItem( userData['roles']?.contains('User') ?? false
firstLine: 'PACKAGES', ? Container()
secondLine: 'List, Details & Add a one', : SelectionItem(
firstLineColor: kPurple, firstLine: 'PACKAGES',
secondLineColor: kPurpleSub, secondLine: 'List, Details & Add a one',
onTap: () => Navigator.push( firstLineColor: kPurple,
context, secondLineColor: kPurpleSub,
MaterialPageRoute( onTap: () => Navigator.push(
builder: (context) { context,
return Consumer<Auth>( MaterialPageRoute(
builder: (ctx, auth, _) { builder: (context) {
return PackageResultScreen(); return Consumer<Auth>(
}, builder: (ctx, auth, _) {
); return PackageResultScreen();
}, },
), );
), },
), ),
),
),
SelectionItem( SelectionItem(
firstLine: 'MY PACKAGES', firstLine: 'MY PACKAGES',
secondLine: 'The Package that i possess', secondLine: 'The Package that i possess',
@@ -219,24 +224,26 @@ class HomePage extends StatelessWidget {
Divider( Divider(
height: 2, height: 2,
), ),
SelectionItem( userData['roles']?.contains('User') ?? false
firstLine: 'ITEMS', ? Container()
secondLine: 'List, Details & Add a one', : SelectionItem(
firstLineColor: kBlue, firstLine: 'ITEMS',
secondLineColor: kBlueSub, secondLine: 'List, Details & Add a one',
onTap: () => Navigator.push( firstLineColor: kBlue,
context, secondLineColor: kBlueSub,
MaterialPageRoute( onTap: () => Navigator.push(
builder: (context) { context,
return Consumer<Auth>( MaterialPageRoute(
builder: (ctx, auth, _) { builder: (context) {
return ItemResultScreen(); return Consumer<Auth>(
}, builder: (ctx, auth, _) {
); return ItemResultScreen();
}, },
), );
), },
), ),
),
),
SelectionItem( SelectionItem(
firstLine: 'MY ITEMS', firstLine: 'MY ITEMS',
secondLine: 'The Items that i possess', secondLine: 'The Items that i possess',
lib/providers/labels.dart
+5 -5
View File
@@ -101,10 +101,10 @@ class LabelsProvider extends ChangeNotifier {
Future<void> createLabelResult(lotNumber, cycleNumber, sterileDate, packages, Future<void> createLabelResult(lotNumber, cycleNumber, sterileDate, packages,
expireDate, sterilizerId) async { expireDate, sterilizerId) async {
List<Map<String, Object>> pkgs = []; // List<Map<String, Object>> pkgs = [];
for (var package in packages) { // for (var package in packages) {
pkgs.add({'name': '', 'id': package}); // pkgs.add({'name': '', 'id': package});
} // }
var response = await http.post(Uri.parse(Url.createLabelResult), var response = await http.post(Uri.parse(Url.createLabelResult),
body: json.encode( body: json.encode(
{ {
@@ -113,7 +113,7 @@ class LabelsProvider extends ChangeNotifier {
'sterilizer_id': sterilizerId, 'sterilizer_id': sterilizerId,
'cycle_number': cycleNumber, 'cycle_number': cycleNumber,
'lot_number': lotNumber, 'lot_number': lotNumber,
'package_id': pkgs, 'package_id': packages,
}, },
), ),
headers: { headers: {
lib/widgets/Global/drawer.dart
+65 -56
View File
@@ -24,6 +24,7 @@ class _AppDrawerState extends State<AppDrawer> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final userData = Provider.of<Auth>(context, listen: false).user;
return SafeArea( return SafeArea(
child: SizedBox( child: SizedBox(
width: 250, width: 250,
@@ -192,35 +193,39 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
), ),
InkWell( userData['roles']?.contains('User') ?? false
onTap: () { ? Container()
Navigator.of(context).pushNamed(Routes.packageResultScreen); : InkWell(
}, onTap: () {
child: Container( Navigator.of(context)
padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), .pushNamed(Routes.packageResultScreen);
margin: EdgeInsets.only(top: 10), },
decoration: BoxDecoration( child: Container(
borderRadius: BorderRadius.circular(5), padding:
), EdgeInsets.symmetric(vertical: 5, horizontal: 15),
child: Row( margin: EdgeInsets.only(top: 10),
children: <Widget>[ decoration: BoxDecoration(
Icon( borderRadius: BorderRadius.circular(5),
Icons.all_inbox_rounded,
color: Colors.white,
),
SizedBox(
width: 10,
),
Text(
'Packages',
style: TextStyle(
color: Colors.white,
), ),
) child: Row(
], children: <Widget>[
), Icon(
), Icons.all_inbox_rounded,
), color: Colors.white,
),
SizedBox(
width: 10,
),
Text(
'Packages',
style: TextStyle(
color: Colors.white,
),
)
],
),
),
),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context) Navigator.of(context)
@@ -251,35 +256,39 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
), ),
InkWell( userData['roles']?.contains('User') ?? false
onTap: () { ? Container()
Navigator.of(context).pushNamed(Routes.itemResultScreen); : InkWell(
}, onTap: () {
child: Container( Navigator.of(context)
padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), .pushNamed(Routes.itemResultScreen);
margin: EdgeInsets.only(top: 10), },
decoration: BoxDecoration( child: Container(
borderRadius: BorderRadius.circular(5), padding:
), EdgeInsets.symmetric(vertical: 5, horizontal: 15),
child: Row( margin: EdgeInsets.only(top: 10),
children: <Widget>[ decoration: BoxDecoration(
Icon( borderRadius: BorderRadius.circular(5),
Icons.book,
color: Colors.white,
),
SizedBox(
width: 10,
),
Text(
'Items',
style: TextStyle(
color: Colors.white,
), ),
) child: Row(
], children: <Widget>[
), Icon(
), Icons.book,
), color: Colors.white,
),
SizedBox(
width: 10,
),
Text(
'Items',
style: TextStyle(
color: Colors.white,
),
)
],
),
),
),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(Routes.myItemsResultScreen); Navigator.of(context).pushNamed(Routes.myItemsResultScreen);
lib/widgets/LabelScreens/Add/save_button.dart
+1 -1
View File
@@ -46,7 +46,7 @@ class LabelAddSaveButton extends StatelessWidget {
sDateCTRL.text, sDateCTRL.text,
// sDateValue, // sDateValue,
// {'id': packageValue[0], 'name': packageValue[1]}, // {'id': packageValue[0], 'name': packageValue[1]},
packages, packages[0],
eDateCTRL.text, eDateCTRL.text,
// eDateValue, // eDateValue,
striizerIdCTRL.text, striizerIdCTRL.text,
lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart
+1 -1
View File
@@ -364,7 +364,7 @@ class MyItemsDetailsDataBox extends StatelessWidget {
), ),
content: SizedBox( content: SizedBox(
width: _deviceBlockSize, width: _deviceBlockSize,
height: 220, height: 250,
child: Column( child: Column(
children: [ children: [
Text( Text(