test commit

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
@@ -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,
),
@@ -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),
@@ -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();
},
);
}
},
),
],