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

test commit

Browse Source
This commit is contained in:
HooDie
2023-10-27 20:50:17 +03:30
parent 11f910bb1c
commit eab99539d5
22 changed files with 504 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart
+78
View File
@@ -3,6 +3,7 @@ import 'package:cssd/config/routes.dart';
import 'package:cssd/models/item_model.dart';
import 'package:cssd/providers/auth.dart';
import 'package:cssd/providers/items.dart';
import 'package:cssd/providers/my_items.dart';
import 'package:cssd/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart';
import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart';
import 'package:flutter/material.dart';
@@ -417,6 +418,83 @@ class MyItemsDetailsDataBox extends StatelessWidget {
);
},
),
SizedBox(
height: 10.0,
),
userData['roles']?.contains('User') ?? false
? Container()
: TransferDestroyButton(
deviceBlockSize: _deviceBlockSize,
firstColor: Colors.black,
secondColor: Colors.black87,
text: 'Repair',
onTap: () {
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: Text(
'Are you sure to repair this Item?',
style: TextStyle(
fontSize: 4 * _deviceBlockSize,
),
),
content: SizedBox(
width: _deviceBlockSize,
height: 220,
child: Column(
children: [
Text(
'By approving, your item will be set in repair mode and it can be use anymore unless you disable repair mode.',
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
),
),
SizedBox(
height: 10.0,
),
ItemCard(_deviceBlockSize),
SizedBox(
height: 20.0,
),
TransferDestroyButton(
deviceBlockSize: _deviceBlockSize,
firstColor: Colors.black,
secondColor: Colors.black87,
onTap: () {
Provider.of<MyItemProvider>(context,
listen: false)
.repairItems(datas.id, 'approved')
.then(
(value) {
Navigator.of(context).pop();
Navigator.pushReplacementNamed(
context,
Routes.myItemsResultScreen,
);
},
);
},
text: 'Repair',
),
SizedBox(
height: 5.0,
),
CancelTransferButton(
deviceBlockSize: _deviceBlockSize,
color: kDarkBlue,
onTap: () {
Navigator.pop(context);
},
),
],
),
),
);
},
);
},
),
SizedBox(
height: 20.0,
),
lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart
+3 -2
View File
@@ -1,4 +1,3 @@
import 'package:cssd/config/colors.dart';
import 'package:cssd/models/users_model.dart';
import 'package:flutter/material.dart';
@@ -6,12 +5,14 @@ class TransferDataBox extends StatelessWidget {
final Users? user;
final Function(String)? onTap;
final bool isClicked;
final Color? clickColor;
const TransferDataBox({
Key? key,
required double deviceBlockSize,
this.user,
this.onTap,
this.clickColor,
this.isClicked = false,
}) : _deviceBlockSize = deviceBlockSize,
super(key: key);
@@ -32,7 +33,7 @@ class TransferDataBox extends StatelessWidget {
borderRadius: BorderRadius.all(
Radius.circular(10),
),
border: Border.all(color: kDarkBlue, width: 2.0),
border: Border.all(color: clickColor!, width: 2.0),
)
: BoxDecoration(),
padding: EdgeInsets.all(8),
lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart
+15 -5
View File
@@ -1,3 +1,4 @@
import 'package:cssd/providers/auth.dart';
import 'package:cssd/providers/my_items.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -31,6 +32,7 @@ class MyItemFilterChip extends StatelessWidget {
@override
Widget build(BuildContext context) {
final userData = Provider.of<Auth>(context, listen: false).user;
return Row(
children: <Widget>[
SizedBox(
@@ -59,11 +61,19 @@ class MyItemFilterChip extends StatelessWidget {
_specific,
);
itemProvider.setLoading();
itemProvider.getMyItems().then(
(_) {
itemProvider.resetLoading();
},
);
if (userData['roles']?.contains('User')) {
itemProvider.getMyItems().then(
(_) {
itemProvider.resetLoading();
},
);
} else {
itemProvider.getHospitalItems().then(
(_) {
itemProvider.resetLoading();
},
);
}
},
),
],
lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart
+78 -83
View File
@@ -1,13 +1,8 @@
import 'package:cssd/config/colors.dart';
import 'package:cssd/config/routes.dart';
import 'package:cssd/models/package_model.dart';
import 'package:cssd/providers/auth.dart';
import 'package:cssd/providers/packages.dart';
import 'package:cssd/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart';
import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
class MyPackageDetailsDataBox extends StatelessWidget {
@@ -25,7 +20,7 @@ class MyPackageDetailsDataBox extends StatelessWidget {
@override
Widget build(BuildContext context) {
final userData = Provider.of<Auth>(context, listen: false).user;
// final userData = Provider.of<Auth>(context, listen: false).user;
return Padding(
padding: EdgeInsets.all(20),
child: ListView(
@@ -276,83 +271,83 @@ class MyPackageDetailsDataBox extends StatelessWidget {
push();
},
),
SizedBox(
height: 10.0,
),
userData['roles']?.contains('User') ?? false
? Container()
: TransferDestroyButton(
deviceBlockSize: _deviceBlockSize,
firstColor: kPink,
secondColor: kPinkSub,
text: 'Destroy',
onTap: () {
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: Text(
'Are you sure to destroy this Package?',
style: TextStyle(
fontSize: 4 * _deviceBlockSize,
),
),
content: SizedBox(
width: _deviceBlockSize,
height: 220,
child: Column(
children: [
Text(
'By approving, your package will be removed and it can not be used any more.',
style: TextStyle(
fontSize: 3 * _deviceBlockSize,
),
),
SizedBox(
height: 10.0,
),
PackageCard(_deviceBlockSize),
SizedBox(
height: 20.0,
),
TransferDestroyButton(
deviceBlockSize: _deviceBlockSize,
firstColor: kPink,
secondColor: kPinkSub,
onTap: () {
Provider.of<PackageProvider>(context,
listen: false)
.removePackages(datas.id)
.then(
(value) {
Navigator.of(context).pop();
Navigator.pushReplacementNamed(
context,
Routes.myPackagesResultScreen,
);
},
);
},
text: 'Destroy',
),
SizedBox(
height: 5.0,
),
CancelTransferButton(
deviceBlockSize: _deviceBlockSize,
color: kDarkPurple,
onTap: () {
Navigator.pop(context);
},
),
],
),
),
);
},
);
},
),
// SizedBox(
// height: 10.0,
// ),
// userData['roles']?.contains('User') ?? false
// ? Container()
// : TransferDestroyButton(
// deviceBlockSize: _deviceBlockSize,
// firstColor: kPink,
// secondColor: kPinkSub,
// text: 'Destroy',
// onTap: () {
// showDialog(
// context: context,
// builder: (context) {
// return AlertDialog(
// title: Text(
// 'Are you sure to destroy this Package?',
// style: TextStyle(
// fontSize: 4 * _deviceBlockSize,
// ),
// ),
// content: SizedBox(
// width: _deviceBlockSize,
// height: 220,
// child: Column(
// children: [
// Text(
// 'By approving, your package will be removed and it can not be used any more.',
// style: TextStyle(
// fontSize: 3 * _deviceBlockSize,
// ),
// ),
// SizedBox(
// height: 10.0,
// ),
// PackageCard(_deviceBlockSize),
// SizedBox(
// height: 20.0,
// ),
// TransferDestroyButton(
// deviceBlockSize: _deviceBlockSize,
// firstColor: kPink,
// secondColor: kPinkSub,
// onTap: () {
// Provider.of<PackageProvider>(context,
// listen: false)
// .removePackages(datas.id)
// .then(
// (value) {
// Navigator.of(context).pop();
// Navigator.pushReplacementNamed(
// context,
// Routes.myPackagesResultScreen,
// );
// },
// );
// },
// text: 'Destroy',
// ),
// SizedBox(
// height: 5.0,
// ),
// CancelTransferButton(
// deviceBlockSize: _deviceBlockSize,
// color: kDarkPurple,
// onTap: () {
// Navigator.pop(context);
// },
// ),
// ],
// ),
// ),
// );
// },
// );
// },
// ),
SizedBox(
height: 20,
),
lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart
+15 -5
View File
@@ -1,3 +1,4 @@
import 'package:cssd/providers/auth.dart';
import 'package:cssd/providers/my_packages.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -25,6 +26,7 @@ class MyPackageFilterChip extends StatelessWidget {
@override
Widget build(BuildContext context) {
final userData = Provider.of<Auth>(context, listen: false).user;
return Row(
children: <Widget>[
SizedBox(
@@ -51,11 +53,19 @@ class MyPackageFilterChip extends StatelessWidget {
_udi,
);
packageProvider.setLoading();
packageProvider.getMyPackages().then(
(_) {
packageProvider.resetLoading();
},
);
if (userData['roles']?.contains('User')) {
packageProvider.getMyPackages().then(
(_) {
packageProvider.resetLoading();
},
);
} else {
packageProvider.getHospitalPackages().then(
(_) {
packageProvider.resetLoading();
},
);
}
},
),
],
lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart
+1 -1
View File
@@ -106,7 +106,7 @@ class MyPackagesItemDataBox extends StatelessWidget {
width: 9 * _deviceBlockSize,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: kDarkBlue,
color: kDarkPurple,
),
child: Icon(
FontAwesomeIcons.history,
lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart
+7 -7
View File
@@ -1,6 +1,6 @@
import 'package:cssd/config/colors.dart';
import 'package:cssd/models/my_package_model.dart';
import 'package:cssd/providers/my_items.dart';
import 'package:cssd/providers/my_packages.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -104,9 +104,9 @@ class PackageRequestsDataBox extends StatelessWidget {
actions: <Widget>[
TextButton(
onPressed: () async {
Provider.of<MyItemProvider>(context,
Provider.of<MyPackageProvider>(context,
listen: false)
.verifyItemRequests(
.verifyPackageRequests(
package!.id, 'approved')
.then((result) {
if (result) {
@@ -114,7 +114,7 @@ class PackageRequestsDataBox extends StatelessWidget {
}
Navigator.of(ctx).pop();
Navigator.of(context).popAndPushNamed(
Routes.myItemsResultScreen);
Routes.myPackagesResultScreen);
});
},
child: Text('Yes'),
@@ -158,9 +158,9 @@ class PackageRequestsDataBox extends StatelessWidget {
actions: <Widget>[
TextButton(
onPressed: () async {
Provider.of<MyItemProvider>(context,
Provider.of<MyPackageProvider>(context,
listen: false)
.verifyItemRequests(
.verifyPackageRequests(
package!.id, 'rejected')
.then((result) {
if (result) {
@@ -168,7 +168,7 @@ class PackageRequestsDataBox extends StatelessWidget {
}
Navigator.of(ctx).pop();
Navigator.of(context).popAndPushNamed(
Routes.myItemsResultScreen);
Routes.myPackagesResultScreen);
});
},
child: Text('Yes'),