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

Other Changes

Browse Source
This commit is contained in:
fhkhd
2024-02-02 20:54:16 +03:30
parent 725b8dc30b
commit 0f79e82c67
5 changed files with 95 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/providers/packages.dart
+12 -5
View File
@@ -30,7 +30,7 @@ class PackageProvider extends ChangeNotifier {
addItemVal() {
curItemVal += 1;
TextEditingController lbl = new TextEditingController();
lbl.text = initialItemValue;
lbl.text = '';
itemValues.add(lbl);
notifyListeners();
}
@@ -43,11 +43,18 @@ class PackageProvider extends ChangeNotifier {
notifyListeners();
}
// var isDuplicateItem = false;
changeItemVal(String value, int index) {
for (var item in filteredItems!) {
if (item.udi_name == value) {
itemValues[index].text = item.id;
}
// if(itemValues.length > 1 && value != itemValues[index-1].text){
if (item.udi_name == value) {
itemValues[index].text = item.id;
}
// }else {
// // isDuplicateItem = true;
// print("it is a problem!!!!!!!!!!");
// }
}
notifyListeners();
}
@@ -174,7 +181,7 @@ class PackageProvider extends ChangeNotifier {
itemVals = result;
initialItemValue = itemVals[0];
TextEditingController newLbl = new TextEditingController();
newLbl.text = initialItemValue;
newLbl.text = "";
itemValues.add(newLbl);
notifyListeners();
return result;
lib/providers/test_results.dart
+35 -2
View File
@@ -102,6 +102,39 @@ class TestResultsProvider with ChangeNotifier {
// notifyListeners();
}
// bool isChangeVerify = false;
// List<String> newVal = [];
// Future<void> setChangeVerify (String id, String value) async {
// // if(await changeVerification(id , value) == true){
// // isChangeVerify = true;
// //
// // // for(var testStatus in testResultData['data']['verified']){
// // // var iii = 0;
// // // newVal.add(testStatus.toString());
// // // print("i is : $iii $testStatus.");
// // // iii +1;
// // // }
// // getTestResults();
// // for(var item in items!)
// // newVal.add(item.verified);
// // notifyListeners();
// // }
// }
// void reSetChangeVerify (){
// isChangeVerify = false;
// }
bool isloadingButton = false;
void resetLoadingButton() {
isloadingButton = false;
notifyListeners();
}
void setLoadingButton() {
isloadingButton = true;
notifyListeners();
}
TestResultFilterObject get filters {
return _filters;
}
@@ -217,7 +250,7 @@ class TestResultsProvider with ChangeNotifier {
'Authorization': User.token,
},
);
print(response.body);
var testResultData = json.decode(response.body);
if (pageNumber == 1) {
originalItems = [];
@@ -228,7 +261,7 @@ class TestResultsProvider with ChangeNotifier {
TestResultObject(
id: item['id'].toString(),
name: item['test_type'] != null ? item['test_type']['name'] : '',
deviceId: item['device_id'].toString(),
deviceId: item['device_id'] != null ? item['device_id'].toString() : '',
result: item['result'] == 'Accept' ? 'Accepted' : 'Not Accepted',
date: item['created_at'].toString().substring(0, 10),
hospital: item['user']['medical_center']['name'],
lib/widgets/PackageScreens/Add/add_item_box.dart
+21 -13
View File
@@ -117,20 +117,28 @@ class AddItemBox extends StatelessWidget {
height: 70,
padding:
const EdgeInsets.symmetric(horizontal: 0),
child: TextFormField(
controller: values,
decoration: InputDecoration(
contentPadding: EdgeInsets.only(
bottom: 12,
child: Consumer<PackageProvider>(builder: (context, packageProvider, _) {
return TextFormField(
controller: values,
validator: (val) {
if (val!.isEmpty) {
return 'Item required!';
}
return null;
},
decoration: InputDecoration(
contentPadding: EdgeInsets.only(
bottom: 12,
),
isDense: true,
),
isDense: true,
),
style: TextStyle(
fontWeight: FontWeight.w700,
color: Colors.black,
fontSize: 4 * _deviceBlockSize,
),
),
style: TextStyle(
fontWeight: FontWeight.w700,
color: Colors.black,
fontSize: 4 * _deviceBlockSize,
),
);
},),
),
isDense: true,
items: vals.map((val) {
lib/widgets/PackageScreens/Add/package_save_button.dart
+1
View File
@@ -43,6 +43,7 @@ class PackageAddSaveButton extends StatelessWidget {
for (TextEditingController item in itemValues) {
items.add(item.text);
}
items = items.toSet().toList();
await Provider.of<PackageProvider>(context, listen: false)
.createPackageResult(
nameCTRL.text,
lib/widgets/PackageScreens/Details/package_detail_box.dart
+26 -18
View File
@@ -281,10 +281,16 @@ class PackageDetailsDataBox extends StatelessWidget {
Container(
width: 45 * _deviceBlockSize,
child: Text(
datas.status == 'approved' ? 'Confirmed' : 'Rejected',
datas.status == 'approved'
? 'Confirmed'
: datas.status == 'rejected'
? 'Rejected'
: 'Pending..',
style: TextStyle(
fontWeight: FontWeight.w700,
color: datas.status == 'approved' ? kBlue : kPink,
color: datas.status == 'approved' ? kBlue : datas
.status == 'rejected'
? kPink : Colors.grey,
),
overflow: TextOverflow.clip,
),
@@ -314,24 +320,25 @@ class PackageDetailsDataBox extends StatelessWidget {
),
child: ListView.separated(
shrinkWrap: true,
itemBuilder: (ctx, index) => RichText(
text: TextSpan(
text: '${index + 1}. ',
style: TextStyle(
color: Colors.grey,
fontFamily: 'montserrat',
),
children: <TextSpan>[
TextSpan(
text: datas.items[index],
itemBuilder: (ctx, index) =>
RichText(
text: TextSpan(
text: '${index + 1}. ',
style: TextStyle(
fontWeight: FontWeight.bold,
color: kPurple,
color: Colors.grey,
fontFamily: 'montserrat',
),
children: <TextSpan>[
TextSpan(
text: datas.items[index],
style: TextStyle(
fontWeight: FontWeight.bold,
color: kPurple,
),
),
],
),
],
),
),
),
separatorBuilder: (ctx, index) => Divider(),
itemCount: datas.items.length,
),
@@ -357,7 +364,8 @@ class PackageDetailsDataBox extends StatelessWidget {
height: 20,
),
InkWell(
onTap: () async => await launch(
onTap: () async =>
await launch(
'https://cssd-doc.com/Show/Package/${datas.id.toString()}',
),
child: Container(