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

Fix status of package in detail screens

Browse Source
This commit is contained in:
fhkhd
2024-01-31 19:55:57 +03:30
parent 2dc4c6b416
commit 86feef9a38
8 changed files with 415 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/config/urls.dart
+3
View File
@@ -164,6 +164,9 @@ class Url {
static String changeItemStatus(String id) { static String changeItemStatus(String id) {
return '$baseUrl/Items/ChangeStatus/$id'; return '$baseUrl/Items/ChangeStatus/$id';
} }
static String changePackageStatus(String id) {
return '$baseUrl/Packages/ChangeStatus/$id';
}
static String repairItems(String id) { static String repairItems(String id) {
return '$baseUrl/transfer-items/ChangeRepair/$id'; return '$baseUrl/transfer-items/ChangeRepair/$id';
lib/models/package_model.dart
+2
View File
@@ -33,6 +33,7 @@ class PackageDetailObject extends Equatable {
final List<String> items; final List<String> items;
final String userName; final String userName;
final String userCreator; final String userCreator;
final String status;
PackageDetailObject({ PackageDetailObject({
required this.id, required this.id,
@@ -44,6 +45,7 @@ class PackageDetailObject extends Equatable {
required this.items, required this.items,
required this.userName, required this.userName,
required this.userCreator, required this.userCreator,
required this.status
}); });
@override @override
lib/pages/PackagePages/package_result_screen.dart
+1
View File
@@ -230,6 +230,7 @@ class _PackageResultScreenState extends State<PackageResultScreen> {
// 0, // 0,
// items.length - 3, // items.length - 3,
// ); // remove extra , // ); // remove extra ,
return PackageItemBox( return PackageItemBox(
deviceBlockSize: _deviceBlockSize, deviceBlockSize: _deviceBlockSize,
item: item:
lib/providers/items.dart
+25 -26
View File
@@ -40,8 +40,10 @@ class ItemProvider extends ChangeNotifier {
specific: '', specific: '',
); );
int pageNumber = 1; int pageNumber = 1;
void resetPageNumber() => pageNumber = 1; void resetPageNumber() => pageNumber = 1;
bool isloading = false; bool isloading = false;
void resetLoading() { void resetLoading() {
isloading = false; isloading = false;
notifyListeners(); notifyListeners();
@@ -53,6 +55,7 @@ class ItemProvider extends ChangeNotifier {
} }
bool isloadingButton = false; bool isloadingButton = false;
void resetLoadingButton() { void resetLoadingButton() {
isloadingButton = false; isloadingButton = false;
notifyListeners(); notifyListeners();
@@ -250,24 +253,22 @@ class ItemProvider extends ChangeNotifier {
items = []; items = [];
searchBoxValue = value; searchBoxValue = value;
originalItems!.forEach((result) { originalItems!.forEach((result) {
if ( if (result.udi
result.udi .toString()
.toString() .toLowerCase()
.toLowerCase() .contains(searchBoxValue.toLowerCase()) ||
.contains(searchBoxValue.toLowerCase()) || result.udi
result.udi .toString()
.toString() .toUpperCase()
.toUpperCase() .contains(searchBoxValue.toUpperCase()) ||
.contains(searchBoxValue.toUpperCase()) || result.udi
result.udi .toString()
.toString() .toLowerCase()
.toLowerCase() .contains(searchBoxValue.toUpperCase()) ||
.contains(searchBoxValue.toUpperCase()) || result.udi
result.udi .toString()
.toString() .toUpperCase()
.toUpperCase() .contains(searchBoxValue.toLowerCase())) {
.contains(searchBoxValue.toLowerCase())
) {
items!.add(result); items!.add(result);
} }
}); });
@@ -342,7 +343,7 @@ class ItemProvider extends ChangeNotifier {
size: 'null', size: 'null',
createdAt: '2019-09-18 10:02:03', createdAt: '2019-09-18 10:02:03',
udi: 'null', udi: 'null',
status: 0, status: 'null',
filePath: [], filePath: [],
packageId: 'null', packageId: 'null',
); );
@@ -377,10 +378,11 @@ class ItemProvider extends ChangeNotifier {
return result!; return result!;
} }
Future<bool> changeStatus(String id) async { Future<bool> changeStatus(String id, String value) async {
print(id); print(id);
var response = await http.post( var response = await http.post(
Uri.parse(Url.changeItemStatus(id)), Uri.parse(Url.changeItemStatus(id)),
body: json.encode({'status': value}),
headers: { headers: {
'Authorization': User.token, 'Authorization': User.token,
'X-Requested-With': 'XMLHttpRequest', 'X-Requested-With': 'XMLHttpRequest',
@@ -392,7 +394,7 @@ class ItemProvider extends ChangeNotifier {
var itemData = json.decode(response.body); var itemData = json.decode(response.body);
try { try {
if (itemData['status'] == 'Success') { if (itemData['data']['transfers']['status'] == 'approved') {
return true; return true;
} else { } else {
return false; return false;
@@ -404,13 +406,10 @@ class ItemProvider extends ChangeNotifier {
Future<bool> exportItems() async { Future<bool> exportItems() async {
final baseStorage = await getExternalStorageDirectory(); final baseStorage = await getExternalStorageDirectory();
final taskId = await FlutterDownloader.enqueue( final taskId = await FlutterDownloader.enqueue(
url: Url.exportItems, url: Url.exportItems,
savedDir: baseStorage!.path, savedDir: baseStorage!.path,
headers: { headers: {'Authorization': User.token, "Accept": "*"},
'Authorization': User.token,
"Accept": "*"
},
showNotification: true, showNotification: true,
openFileFromNotification: true, openFileFromNotification: true,
saveInPublicStorage: true, saveInPublicStorage: true,
lib/providers/packages.dart
+51 -21
View File
@@ -12,6 +12,7 @@ import 'package:http/http.dart' as http;
class PackageProvider extends ChangeNotifier { class PackageProvider extends ChangeNotifier {
List<ItemResultObject>? filteredItems; List<ItemResultObject>? filteredItems;
// List<Map<String, dynamic>> itemVals = []; // List<Map<String, dynamic>> itemVals = [];
List<String> itemVals = []; List<String> itemVals = [];
@@ -51,6 +52,32 @@ class PackageProvider extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
Future<bool> changeStatus(String id, String value) async {
print(id);
var response = await http.post(
Uri.parse(Url.changePackageStatus(id)),
body: json.encode({'status': value}),
headers: {
'Authorization': User.token,
'X-Requested-With': 'XMLHttpRequest',
"Content-Type": "application/json",
"Accept": "application/json"
},
);
var packageData = json.decode(response.body);
try {
if (packageData['data']['transfers']['status'] == 'approved') {
return true;
} else {
return false;
}
} catch (e) {
return false;
}
}
changeItemValByScan(String value, int index) { changeItemValByScan(String value, int index) {
for (var item in filteredItems!) { for (var item in filteredItems!) {
if (item.udi == value) { if (item.udi == value) {
@@ -73,8 +100,10 @@ class PackageProvider extends ChangeNotifier {
// udi: '', // udi: '',
); );
int pageNumber = 1; int pageNumber = 1;
void resetPageNumber() => pageNumber = 1; void resetPageNumber() => pageNumber = 1;
bool isloading = false; bool isloading = false;
void resetLoading() { void resetLoading() {
isloading = false; isloading = false;
notifyListeners(); notifyListeners();
@@ -86,6 +115,7 @@ class PackageProvider extends ChangeNotifier {
} }
bool isloadingButton = false; bool isloadingButton = false;
void resetLoadingButton() { void resetLoadingButton() {
isloadingButton = false; isloadingButton = false;
notifyListeners(); notifyListeners();
@@ -331,16 +361,16 @@ class PackageProvider extends ChangeNotifier {
print(response.statusCode); print(response.statusCode);
if (response.statusCode != 200) { if (response.statusCode != 200) {
return PackageDetailObject( return PackageDetailObject(
id: 'null', id: 'null',
name: 'null', name: 'null',
description: 'null', description: 'null',
createDate: '2020-07-14 13:50:42', createDate: '2020-07-14 13:50:42',
hospitalName: 'null', hospitalName: 'null',
// udi: 'null', // udi: 'null',
items: [], items: [],
userName: 'null', userName: 'null',
userCreator: 'null', userCreator: 'null',
); status: 'null');
} }
var data = json.decode(response.body)['data']; var data = json.decode(response.body)['data'];
List<String> itemsList = []; List<String> itemsList = [];
@@ -353,17 +383,17 @@ class PackageProvider extends ChangeNotifier {
} }
print(data); print(data);
result = PackageDetailObject( result = PackageDetailObject(
id: data['id'].toString(), id: data['id'].toString(),
name: data['name'] != null ? data['name'] : '', name: data['name'] != null ? data['name'] : '',
description: data['note'] != null ? data['note'] : '', description: data['note'] != null ? data['note'] : '',
// udi: data['package_id'] != null ? data['package_id'] : '', // udi: data['package_id'] != null ? data['package_id'] : '',
createDate: data['created_at'] != null ? data['created_at'] : '', createDate: data['created_at'] != null ? data['created_at'] : '',
hospitalName: hospitalName:
data['user'] != null ? data['user']['medical_center']['name'] : '', data['user'] != null ? data['user']['medical_center']['name'] : '',
userName: data['user'] != null ? data['user']['name'] : '', userName: data['user'] != null ? data['user']['name'] : '',
userCreator: data['creator'] != null ? data['creator']['name'] : '', userCreator: data['creator'] != null ? data['creator']['name'] : '',
items: itemsList, items: itemsList,
); status: data['status']);
return result!; return result!;
} }
lib/widgets/ItemScreens/Result/item_data_box.dart
+122 -57
View File
@@ -31,7 +31,7 @@ class ItemItemBox extends StatelessWidget {
child: Card( child: Card(
elevation: 1, elevation: 1,
child: Container( child: Container(
padding: EdgeInsets.all(8), padding: EdgeInsets.symmetric(vertical: 8),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
@@ -51,6 +51,7 @@ class ItemItemBox extends StatelessWidget {
// width: 3 * _deviceBlockSize, // width: 3 * _deviceBlockSize,
// ), // ),
// Spacer(), // Spacer(),
SizedBox(width: 4,),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@@ -144,7 +145,8 @@ class ItemItemBox extends StatelessWidget {
return AlertDialog( return AlertDialog(
title: Text('Delete'), title: Text('Delete'),
content: Text( content: Text(
'Are you sure you want delete this Item?',), 'Are you sure you want delete this Item?',
),
actions: <Widget>[ actions: <Widget>[
TextButton( TextButton(
child: Text('Yes'), child: Text('Yes'),
@@ -172,7 +174,7 @@ class ItemItemBox extends StatelessWidget {
color: Colors.black, color: Colors.black,
), ),
) )
: userData['roles']?.contains('Supervisor') : userData['roles']?.contains('Supervisor')
? item!.packageId != null ? item!.packageId != null
? InkWell( ? InkWell(
onTap: () { onTap: () {
@@ -213,68 +215,130 @@ class ItemItemBox extends StatelessWidget {
), ),
) )
: Container() : Container()
: Container(), : Container(),
SizedBox( SizedBox(
width: 5.0, width: 5.0,
), ),
userData['roles']?.contains('User') ?? false userData['roles']?.contains('User') ?? false
? Container() ? Container()
: InkWell( : Row(
customBorder: CircleBorder(), mainAxisAlignment: MainAxisAlignment.end,
onTap: () { children: <Widget>[
showDialog( InkWell(
context: context, customBorder: CircleBorder(),
builder: (context) { onTap: () {
return AlertDialog( showDialog(
title: Text( context: context,
item!.status == 1 builder: (context) {
? 'Are you Reject this item?' return AlertDialog(
: 'Are you Confirm this item?', title: Text(
'Are you Reject this item?'
),
actions: <Widget>[
TextButton(
onPressed: () {
Provider.of<ItemProvider>(context,
listen: false)
.changeStatus(item!.id, "rejected")
.then(
(value) {
if (value) {
print('true');
}
Navigator.of(context).pop();
// Navigator.of(context)
// .popAndPushNamed(Routes
// .itemResultScreen);
},
);
},
child: Text('Yes'),
), ),
actions: <Widget>[ TextButton(
TextButton( onPressed: () {
onPressed: () { Navigator.of(context).pop();
Provider.of<ItemProvider>(context, },
listen: false) child: Text('No'),
.changeStatus(item!.id) ),
.then( ],
(value) { );
if (value) { },
print('true'); );
} },
Navigator.of(context) child: Container(
.popAndPushNamed(Routes padding: EdgeInsets.all(7),
.itemResultScreen); width: 8 * _deviceBlockSize,
}, decoration: BoxDecoration(
); shape: BoxShape.circle,
}, color: kPink
child: Text('Yes'), ),
), child: Icon(
TextButton( Icons.close ,
onPressed: () { size: 4 * _deviceBlockSize,
Navigator.of(context).pop(); color: Colors.white,
},
child: Text('No'),
),
],
);
},
);
},
child: Container(
padding: EdgeInsets.all(7),
width: 8 * _deviceBlockSize,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: item!.status == 1 ? kPink : kBlue,
),
child: Icon(
item!.status == 1 ? Icons.close : Icons.check,
size: 4 * _deviceBlockSize,
color: Colors.white,
),
), ),
), ),
),
SizedBox(
width: 5,
),
InkWell(
customBorder: CircleBorder(),
onTap: () {
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: Text(
'Are you Confirm this item?',
),
actions: <Widget>[
TextButton(
onPressed: () {
Provider.of<ItemProvider>(context,
listen: false)
.changeStatus(item!.id, "approved")
.then(
(value) {
if (value) {
print('true');
}
Navigator.of(context).pop();
// Navigator.of(context)
// .popAndPushNamed(Routes
// .itemResultScreen);
},
);
},
child: Text('Yes'),
),
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: Text('No'),
),
],
);
},
);
},
child: Container(
padding: EdgeInsets.all(7),
width: 8 * _deviceBlockSize,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: kBlue,
),
child: Icon(
Icons.check,
size: 4 * _deviceBlockSize,
color: Colors.white,
),
),
),
],
),
SizedBox( SizedBox(
width: 5.0, width: 5.0,
), ),
@@ -304,6 +368,7 @@ class ItemItemBox extends StatelessWidget {
), ),
], ],
), ),
SizedBox(width: 4,)
], ],
), ),
), ),
lib/widgets/PackageScreens/Details/package_detail_box.dart
+27
View File
@@ -264,6 +264,33 @@ class PackageDetailsDataBox extends StatelessWidget {
], ],
), ),
Divider(), Divider(),
SizedBox(
height: 5,
),
Row(
children: <Widget>[
Container(
width: 35 * _deviceBlockSize,
child: Text(
'Status',
style: TextStyle(
color: Colors.grey,
),
),
),
Container(
width: 45 * _deviceBlockSize,
child: Text(
datas.status == 'approved' ? 'Confirmed' : 'Rejected',
style: TextStyle(
fontWeight: FontWeight.w700,
color: datas.status == 'approved' ? kBlue : kPink,
),
overflow: TextOverflow.clip,
),
),
],
),
SizedBox( SizedBox(
height: 30, height: 30,
), ),
lib/widgets/PackageScreens/Result/package_data_box.dart
+184 -57
View File
@@ -6,6 +6,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../config/colors.dart';
import '../../../config/routes.dart'; import '../../../config/routes.dart';
class PackageItemBox extends StatelessWidget { class PackageItemBox extends StatelessWidget {
@@ -127,70 +128,196 @@ class PackageItemBox extends StatelessWidget {
// ), // ),
userData['roles']?.contains('User') ?? false userData['roles']?.contains('User') ?? false
? Container() ? Container()
: InkWell( : userData['roles']?.contains('User') ?? false
customBorder: CircleBorder(), ? Container()
onTap: () { : Row(
showDialog( mainAxisAlignment: MainAxisAlignment.end,
context: context, children: <Widget>[
builder: (context) { InkWell(
return AlertDialog( customBorder: CircleBorder(),
title: Text('Delete'), onTap: () {
content: Text( showDialog(
'Are you sure you want delete this Package?', context: context,
builder: (context) {
return AlertDialog(
title: Text('Delete'),
content: Text(
'Are you sure you want delete this Package?',
),
actions: <Widget>[
TextButton(
child: Text('Yes'),
onPressed: () {
Navigator.of(context).pop();
Provider.of<PackageProvider>(
context,
listen: false)
.removePackages(item!.id);
},
), ),
actions: <Widget>[ TextButton(
TextButton( child: Text('No'),
child: Text('Yes'), onPressed: () {
onPressed: () { Navigator.of(context).pop();
Navigator.of(context).pop(); },
Provider.of<PackageProvider>( ),
context, ],
listen: false) );
.removePackages(item!.id); },
}, );
), },
TextButton( child: Icon(
child: Text('No'), Icons.delete,
onPressed: () { size: 5 * _deviceBlockSize,
Navigator.of(context).pop(); color: Colors.black,
}, ),
), ),
], SizedBox(
); width: 5.0,
}, ),
); InkWell(
}, customBorder: CircleBorder(),
onTap: () {
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: Text(
'Are you Reject this item?'
),
actions: <Widget>[
TextButton(
onPressed: () {
Provider.of<PackageProvider>(context,
listen: false)
.changeStatus(item!.id, "rejected")
.then(
(value) {
if (value) {
print('true');
}
Navigator.of(context).pop();
// Navigator.of(context)
// .popAndPushNamed(Routes
// .packageResultScreen);
},
);
},
child: Text('Yes'),
),
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: Text('No'),
),
],
);
},
);
},
child: Container(
padding: EdgeInsets.all(7),
width: 8 * _deviceBlockSize,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: kPink
),
child: Icon( child: Icon(
Icons.delete, Icons.close ,
size: 5 * _deviceBlockSize, size: 4 * _deviceBlockSize,
color: Colors.black, color: Colors.white,
), ),
), ),
SizedBox(
width: 5.0,
),
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context).pushNamed(
Routes.packageDetailScreen,
arguments: item!.id,
);
},
child: Container(
padding: EdgeInsets.all(7),
width: 9 * _deviceBlockSize,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Colors.black,
), ),
child: Icon( SizedBox(
FontAwesomeIcons.fileAlt, width: 5,
size: 5 * _deviceBlockSize,
color: Colors.white,
), ),
), InkWell(
customBorder: CircleBorder(),
onTap: () {
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: Text(
'Are you Confirm this item?',
),
actions: <Widget>[
TextButton(
onPressed: () {
Provider.of<PackageProvider>(context,
listen: false)
.changeStatus(item!.id, "approved")
.then(
(value) {
if (value) {
print('true');
}
Navigator.of(context).pop();
// Navigator.of(context)
// .popAndPushNamed(Routes
// .packageResultScreen);
},
);
},
child: Text('Yes'),
),
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: Text('No'),
),
],
);
},
);
},
child: Container(
padding: EdgeInsets.all(7),
width: 8 * _deviceBlockSize,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: kBlue,
),
child: Icon(
Icons.check,
size: 4 * _deviceBlockSize,
color: Colors.white,
),
),
),
SizedBox(
width: 5,
),
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context).pushNamed(
Routes.packageDetailScreen,
arguments: item!.id,
);
},
child: Container(
padding: EdgeInsets.all(7),
width: 9 * _deviceBlockSize,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Colors.black,
),
child: Icon(
FontAwesomeIcons.fileAlt,
size: 5 * _deviceBlockSize,
color: Colors.white,
),
),
),
],
), ),
], ],
), ),
], ],