mirror of
https://git.meshkee.com/applications/cssd.git
synced 2026-10-12 23:48:55 +03:30
test commit
This commit is contained in:
HooDie
@@ -1,6 +1,5 @@
|
||||
// ignore_for_file: public_member_api_docs, sort_constructors_first
|
||||
import 'package:cssd/config/routes.dart';
|
||||
import 'package:cssd/pages/MyPackagesPages/my_packages_history_screen.dart';
|
||||
import 'package:cssd/providers/auth.dart';
|
||||
import 'package:cssd/providers/connectivity.dart';
|
||||
import 'package:cssd/providers/my_packages.dart';
|
||||
@@ -49,11 +48,11 @@ class _MyPackagesMineScreenState extends State<MyPackagesMineScreen> {
|
||||
() {
|
||||
if (sc!.position.pixels == sc!.position.maxScrollExtent &&
|
||||
searchCTRL.text == '') {
|
||||
var myItemResults = Provider.of<MyPackageProvider>(
|
||||
var myPackageResults = Provider.of<MyPackageProvider>(
|
||||
context,
|
||||
listen: false,
|
||||
);
|
||||
myItemResults.getMyPackages();
|
||||
myPackageResults.getMyPackages();
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -181,16 +180,10 @@ class _MyPackagesMineScreenState extends State<MyPackagesMineScreen> {
|
||||
packages:
|
||||
packageResults.myPackages?[index],
|
||||
push: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: ((context) =>
|
||||
MyPackagesHistoryScreen(
|
||||
packages: packageResults
|
||||
.myPackages?[index],
|
||||
)),
|
||||
),
|
||||
);
|
||||
Navigator.pushNamed(context,
|
||||
Routes.myItemsHistoryScreen,
|
||||
arguments: packageResults
|
||||
.myPackages?[index]);
|
||||
},
|
||||
);
|
||||
} else {
|
||||
@@ -200,16 +193,10 @@ class _MyPackagesMineScreenState extends State<MyPackagesMineScreen> {
|
||||
packages: packageResults
|
||||
.hospitalPackages?[index],
|
||||
push: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: ((context) =>
|
||||
MyPackagesHistoryScreen(
|
||||
packages: packageResults
|
||||
.myPackages?[index],
|
||||
)),
|
||||
),
|
||||
);
|
||||
Navigator.pushNamed(context,
|
||||
Routes.myItemsHistoryScreen,
|
||||
arguments: packageResults
|
||||
.hospitalPackages?[index]);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:cssd/config/routes.dart';
|
||||
import 'package:cssd/models/package_model.dart';
|
||||
import 'package:cssd/pages/MyPackagesPages/my_packages_transfer_screen.dart';
|
||||
import 'package:cssd/providers/packages.dart';
|
||||
import 'package:cssd/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -82,14 +82,9 @@ class _MyPackagesDetailScreenState extends State<MyPackagesDetailScreen> {
|
||||
datas: datas!,
|
||||
deviceBlockSize: _deviceBlockSize,
|
||||
push: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => PackageTransferScreen(
|
||||
packages: datas,
|
||||
),
|
||||
),
|
||||
);
|
||||
Navigator.pushNamed(
|
||||
context, Routes.packagesTransferScreen,
|
||||
arguments: datas);
|
||||
},
|
||||
)
|
||||
: ConnectionErrorBox();
|
||||
|
||||
@@ -36,6 +36,14 @@ class _MyPackageFilterScreenState extends State<MyPackageFilterScreen> {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
if (isInit) {
|
||||
isInit = false;
|
||||
}
|
||||
super.didChangeDependencies();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final _media = MediaQuery.of(context);
|
||||
@@ -198,31 +206,71 @@ class _MyPackageFilterScreenState extends State<MyPackageFilterScreen> {
|
||||
SizedBox(
|
||||
height: 30,
|
||||
),
|
||||
TextFormField(
|
||||
controller: udiCTRL,
|
||||
decoration: InputDecoration(
|
||||
icon: Icon(
|
||||
FontAwesomeIcons.alignLeft,
|
||||
size: 6 * _deviceBlockSize,
|
||||
Row(
|
||||
children: [
|
||||
Flexible(
|
||||
flex: 8,
|
||||
child: TextFormField(
|
||||
controller: udiCTRL,
|
||||
decoration: InputDecoration(
|
||||
icon: Icon(
|
||||
FontAwesomeIcons.alignLeft,
|
||||
size: 6 * _deviceBlockSize,
|
||||
),
|
||||
labelStyle: TextStyle(
|
||||
fontWeight: FontWeight.w100,
|
||||
fontSize: 4 * _deviceBlockSize,
|
||||
),
|
||||
labelText: 'UDI',
|
||||
isDense: true,
|
||||
contentPadding: EdgeInsets.symmetric(
|
||||
vertical: 2,
|
||||
horizontal: 3,
|
||||
),
|
||||
),
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.w700,
|
||||
fontSize: 5 * _deviceBlockSize,
|
||||
),
|
||||
focusNode: _udiFocusNode,
|
||||
keyboardType: TextInputType.text,
|
||||
textInputAction: TextInputAction.next,
|
||||
),
|
||||
),
|
||||
labelStyle: TextStyle(
|
||||
fontWeight: FontWeight.w100,
|
||||
fontSize: 4 * _deviceBlockSize,
|
||||
),
|
||||
labelText: 'UDI',
|
||||
isDense: true,
|
||||
contentPadding: EdgeInsets.symmetric(
|
||||
vertical: 2,
|
||||
horizontal: 3,
|
||||
),
|
||||
),
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.w700,
|
||||
fontSize: 5 * _deviceBlockSize,
|
||||
),
|
||||
focusNode: _udiFocusNode,
|
||||
keyboardType: TextInputType.text,
|
||||
textInputAction: TextInputAction.next,
|
||||
Flexible(
|
||||
flex: 1,
|
||||
child: InkWell(
|
||||
onTap: () {
|
||||
scan().then(
|
||||
(String result) {
|
||||
if (result == 'cancel') {
|
||||
print('cancel');
|
||||
} else if (result == 'error') {
|
||||
print('error');
|
||||
} else if (result == 'access') {
|
||||
print('access');
|
||||
} else {
|
||||
print(result);
|
||||
idCTRL.text = result;
|
||||
}
|
||||
},
|
||||
);
|
||||
},
|
||||
child: Container(
|
||||
padding: EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.black,
|
||||
),
|
||||
child: Icon(
|
||||
Icons.qr_code_scanner,
|
||||
size: 5 * _deviceBlockSize,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
SizedBox(
|
||||
height: 90,
|
||||
|
||||
@@ -15,9 +15,9 @@ import 'package:provider/provider.dart';
|
||||
|
||||
class MyPackagesHistoryScreen extends StatefulWidget {
|
||||
final bool? isAdmin;
|
||||
final MyPackageResultObject? packages;
|
||||
final MyPackageResultObject? items;
|
||||
|
||||
MyPackagesHistoryScreen({this.isAdmin, this.packages});
|
||||
MyPackagesHistoryScreen({this.isAdmin, this.items});
|
||||
|
||||
@override
|
||||
_MyPackagesHistoryScreenState createState() =>
|
||||
@@ -27,6 +27,7 @@ class MyPackagesHistoryScreen extends StatefulWidget {
|
||||
class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
|
||||
bool _isInit = true;
|
||||
ScrollController? sc;
|
||||
MyPackageResultObject? packageData;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -35,13 +36,15 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
void didChangeDependencies() async {
|
||||
if (_isInit) {
|
||||
packageData =
|
||||
ModalRoute.of(context)!.settings.arguments as MyPackageResultObject?;
|
||||
var userResults = Provider.of<UsersProvider>(context);
|
||||
userResults.setLoading();
|
||||
userResults
|
||||
.getUsers(userResults.getUserMedicalCenter() as String)
|
||||
.then((_) {
|
||||
String medicalCenterId =
|
||||
await userResults.getUserMedicalCenter() as String;
|
||||
userResults.getUsers(medicalCenterId).then((_) {
|
||||
userResults.resetLoading();
|
||||
sc?.addListener(
|
||||
() {
|
||||
@@ -50,8 +53,7 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
|
||||
context,
|
||||
listen: false,
|
||||
);
|
||||
userResults
|
||||
.getUsers(userResults.getUserMedicalCenter() as String);
|
||||
userResults.getUsers(medicalCenterId);
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -106,20 +108,13 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
|
||||
MyPackagesItemDataBox(
|
||||
deviceBlockSize: _deviceBlockSize,
|
||||
hasHistoryBtn: false,
|
||||
packages: MyPackagesHistoryScreen().packages!,
|
||||
packages: packageData,
|
||||
isAdmin: userData['roles']?.contains('User')
|
||||
? false
|
||||
: true,
|
||||
),
|
||||
SizedBox(
|
||||
height: 10.0,
|
||||
),
|
||||
Divider(
|
||||
color: Colors.grey,
|
||||
height: 2.0,
|
||||
),
|
||||
SizedBox(
|
||||
height: 10.0,
|
||||
height: 20.0,
|
||||
),
|
||||
Expanded(
|
||||
child: Consumer<UsersProvider>(
|
||||
@@ -137,9 +132,7 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
|
||||
children: [
|
||||
PackageHistoryDate(
|
||||
deviceBlockSize: _deviceBlockSize,
|
||||
packages:
|
||||
MyPackagesHistoryScreen()
|
||||
.packages!,
|
||||
packages: packageData!,
|
||||
),
|
||||
SizedBox(
|
||||
height: 20.0,
|
||||
|
||||
@@ -30,6 +30,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
bool _isInit = true;
|
||||
ScrollController? sc;
|
||||
TextEditingController searchCTRL = new TextEditingController();
|
||||
PackageDetailObject? packageData;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -38,13 +39,15 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
void didChangeDependencies() async {
|
||||
if (_isInit) {
|
||||
packageData =
|
||||
ModalRoute.of(context)!.settings.arguments as PackageDetailObject?;
|
||||
var userResults = Provider.of<UsersProvider>(context);
|
||||
userResults.setLoading();
|
||||
userResults
|
||||
.getUsers(userResults.getUserMedicalCenter() as String)
|
||||
.then((_) {
|
||||
String medicalCenterId =
|
||||
await userResults.getUserMedicalCenter() as String;
|
||||
userResults.getUsers(medicalCenterId).then((_) {
|
||||
userResults.resetLoading();
|
||||
sc!.addListener(
|
||||
() {
|
||||
@@ -54,8 +57,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
context,
|
||||
listen: false,
|
||||
);
|
||||
userResults
|
||||
.getUsers(userResults.getUserMedicalCenter() as String);
|
||||
userResults.getUsers(medicalCenterId);
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -138,6 +140,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
return TransferDataBox(
|
||||
deviceBlockSize: _deviceBlockSize,
|
||||
user: userResults.usersBox?[index],
|
||||
clickColor: kDarkPurple,
|
||||
isClicked:
|
||||
userResults.selectedUserIndex ==
|
||||
index,
|
||||
@@ -148,8 +151,14 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
).selectUser(index);
|
||||
print(userId);
|
||||
Provider.of<UsersProvider>(
|
||||
context)
|
||||
context,
|
||||
listen: false)
|
||||
.saveUserId = userId;
|
||||
Provider.of<UsersProvider>(
|
||||
context,
|
||||
listen: false)
|
||||
.selectedUserForPackages =
|
||||
userResults.usersBox?[index];
|
||||
},
|
||||
);
|
||||
},
|
||||
@@ -188,7 +197,8 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
SizedBox(
|
||||
height: 10.0,
|
||||
),
|
||||
PackageCard(_deviceBlockSize),
|
||||
PackageCard(
|
||||
_deviceBlockSize, packageData!),
|
||||
SizedBox(
|
||||
height: 5.0,
|
||||
),
|
||||
@@ -199,7 +209,13 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
SizedBox(
|
||||
width: 5.0,
|
||||
),
|
||||
PackageCard(_deviceBlockSize),
|
||||
TransferDataBox(
|
||||
deviceBlockSize:
|
||||
_deviceBlockSize,
|
||||
user: Provider.of<
|
||||
UsersProvider>(context)
|
||||
.selectedUserForPackages,
|
||||
)
|
||||
],
|
||||
),
|
||||
SizedBox(
|
||||
@@ -207,20 +223,23 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
),
|
||||
TransferDestroyButton(
|
||||
deviceBlockSize: _deviceBlockSize,
|
||||
firstColor: kDarkBlue,
|
||||
secondColor: kDarkBlueSub,
|
||||
firstColor: kDarkPurple,
|
||||
secondColor: kDarkPurpleSub,
|
||||
onTap: () {
|
||||
Provider.of<MyPackageProvider>(
|
||||
context,
|
||||
listen: false,
|
||||
).transferPackage(
|
||||
PackageTransferScreen()
|
||||
.packages!
|
||||
.id,
|
||||
packageData!.id,
|
||||
Provider.of<UsersProvider>(
|
||||
context,
|
||||
).saveUserId!,
|
||||
context,
|
||||
listen: false)
|
||||
.saveUserId!,
|
||||
);
|
||||
Navigator.of(context).pop();
|
||||
Navigator.of(context)
|
||||
.popAndPushNamed(Routes
|
||||
.myPackagesResultScreen);
|
||||
},
|
||||
text: 'Transfer',
|
||||
),
|
||||
@@ -254,7 +273,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
);
|
||||
}
|
||||
|
||||
Container PackageCard(double _deviceBlockSize) {
|
||||
Container PackageCard(double _deviceBlockSize, PackageDetailObject package) {
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: Colors.grey),
|
||||
@@ -266,7 +285,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
Container(
|
||||
padding: const EdgeInsets.all(6.0),
|
||||
child: Text(
|
||||
PackageTransferScreen().packages!.id,
|
||||
package.id,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.w700,
|
||||
fontSize: 5 * _deviceBlockSize,
|
||||
@@ -283,7 +302,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
|
||||
Container(
|
||||
width: 40 * _deviceBlockSize,
|
||||
child: Text(
|
||||
PackageTransferScreen().packages!.name,
|
||||
package.name,
|
||||
style: TextStyle(
|
||||
fontSize: 3 * _deviceBlockSize,
|
||||
fontWeight: FontWeight.w700,
|
||||
|
||||
Reference in New Issue
Block a user