mirror of
https://git.meshkee.com/applications/cssd.git
synced 2026-10-13 07:08:56 +03:30
2.2.0
This commit is contained in:
Regular → Executable
Regular → Executable
Regular → Executable
+8
@@ -28,6 +28,14 @@ class CyclesProvider extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
removeLabelVal() {
|
||||
curLabelVal -= 1;
|
||||
TextEditingController lbl = new TextEditingController();
|
||||
lbl.text = initialLabelValue;
|
||||
labelValues.removeLast();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
changeLabelVal(String value, int index) {
|
||||
labelValues[index].text = value;
|
||||
notifyListeners();
|
||||
|
||||
Regular → Executable
Regular → Executable
+20
-5
@@ -93,13 +93,13 @@ class ItemProvider extends ChangeNotifier {
|
||||
|
||||
Future<String> addImage(String batchId, dynamic file, String fileName) async {
|
||||
var imageListInt = file.cast<int>();
|
||||
var dio = Dio();
|
||||
var dio = new Dio();
|
||||
dio.options.headers = {
|
||||
'Authorization': User.token,
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
'Content-Type': 'application/json',
|
||||
};
|
||||
FormData formData = FormData.fromMap(
|
||||
FormData formData = new FormData.fromMap(
|
||||
{
|
||||
"batch_id": batchId,
|
||||
'model_type': 'Item',
|
||||
@@ -111,6 +111,10 @@ class ItemProvider extends ChangeNotifier {
|
||||
Url.addImage,
|
||||
data: formData,
|
||||
);
|
||||
// print(response.statusCode);
|
||||
// print(response.statusMessage);
|
||||
// print(response.data);
|
||||
|
||||
return 'Added';
|
||||
}
|
||||
|
||||
@@ -122,7 +126,7 @@ class ItemProvider extends ChangeNotifier {
|
||||
note,
|
||||
batchId,
|
||||
) async {
|
||||
batchId = randomString(10);
|
||||
final batchId = randomString(10);
|
||||
|
||||
for (var image in catchImages) {
|
||||
await addImage(batchId, image.bytes, image.path!);
|
||||
@@ -264,12 +268,12 @@ class ItemProvider extends ChangeNotifier {
|
||||
},
|
||||
);
|
||||
|
||||
var testResultData = json.decode(response.body);
|
||||
var itemsData = json.decode(response.body);
|
||||
if (pageNumber == 1) {
|
||||
originalItems = [];
|
||||
}
|
||||
|
||||
for (var item in testResultData['data']['data']) {
|
||||
for (var item in itemsData['data']['data']) {
|
||||
originalItems!.add(
|
||||
ItemResultObject(
|
||||
name: item['name'],
|
||||
@@ -345,4 +349,15 @@ class ItemProvider extends ChangeNotifier {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> exportItems() async {
|
||||
var response = await http.get(
|
||||
Uri.parse(
|
||||
Url.exportItems,
|
||||
),
|
||||
headers: {'Authorization': User.token},
|
||||
);
|
||||
print(response.body);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Regular → Executable
+10
-8
@@ -14,23 +14,25 @@ class LabelsProvider extends ChangeNotifier {
|
||||
List<String> packageVals = [];
|
||||
List<TextEditingController> packageValues = [];
|
||||
String initialPackageValue = '';
|
||||
String? packageId;
|
||||
int curPackageVal = 1;
|
||||
|
||||
resetPackageVals() {
|
||||
packageVals = [];
|
||||
packageValues = [];
|
||||
initialPackageValue = '';
|
||||
packageId = null;
|
||||
curPackageVal = 1;
|
||||
// notifyListeners();
|
||||
}
|
||||
|
||||
addPackageVal() {
|
||||
curPackageVal += 1;
|
||||
TextEditingController lbl = new TextEditingController();
|
||||
lbl.text = initialPackageValue;
|
||||
packageValues.add(lbl);
|
||||
notifyListeners();
|
||||
}
|
||||
// addPackageVal() {
|
||||
// curPackageVal += 1;
|
||||
// TextEditingController lbl = new TextEditingController();
|
||||
// lbl.text = initialPackageValue;
|
||||
// packageValues.add(lbl);
|
||||
// notifyListeners();
|
||||
// }
|
||||
|
||||
changePackageVal(String value, int index) {
|
||||
packageValues[index].text = value;
|
||||
@@ -91,7 +93,7 @@ class LabelsProvider extends ChangeNotifier {
|
||||
result.add(package['id'].toString());
|
||||
}
|
||||
packageVals = result;
|
||||
initialPackageValue = packageVals[0];
|
||||
initialPackageValue = packageId ?? packageVals[0];
|
||||
TextEditingController newLbl = new TextEditingController();
|
||||
newLbl.text = initialPackageValue;
|
||||
packageValues.add(newLbl);
|
||||
|
||||
Regular → Executable
Regular → Executable
+16
-24
@@ -19,7 +19,7 @@ class MyItemProvider extends ChangeNotifier {
|
||||
List<MyItemResultObject>? originalMyItemsRequests;
|
||||
List<MyItemResultObject>? originalHospitalItemsRequests;
|
||||
|
||||
List<MyItemResultObject>? originalItemHistory;
|
||||
List<ItemHistoryObject>? itemHistory;
|
||||
|
||||
MyItemFilterObject? filters = MyItemFilterObject(
|
||||
id: '',
|
||||
@@ -120,7 +120,7 @@ class MyItemProvider extends ChangeNotifier {
|
||||
originalMyItems = [];
|
||||
}
|
||||
|
||||
for (var item in itemsData['data']) {
|
||||
for (var item in itemsData['data']['data']) {
|
||||
originalMyItems!.add(
|
||||
MyItemResultObject(
|
||||
name: item['name'],
|
||||
@@ -157,15 +157,13 @@ class MyItemProvider extends ChangeNotifier {
|
||||
headers: {'Authorization': User.token, "Accept": "application/json"},
|
||||
);
|
||||
|
||||
print(response.body);
|
||||
|
||||
var itemsData = json.decode(response.body);
|
||||
|
||||
if (pageNumber == 1) {
|
||||
originalHospitalItems = [];
|
||||
}
|
||||
|
||||
for (var item in itemsData['data']) {
|
||||
for (var item in itemsData['data']['data']) {
|
||||
originalHospitalItems!.add(
|
||||
MyItemResultObject(
|
||||
name: item['name'],
|
||||
@@ -188,28 +186,22 @@ class MyItemProvider extends ChangeNotifier {
|
||||
|
||||
var itemsData = json.decode(response.body)['data'];
|
||||
|
||||
String fromDate = '';
|
||||
String toDate = '';
|
||||
String userHistory = '';
|
||||
itemHistory = [];
|
||||
|
||||
for (var transfer in itemsData['transfers']) {
|
||||
fromDate =
|
||||
transfer['from_date'] != null ? transfer['from_date'].toString() : '';
|
||||
toDate =
|
||||
transfer['to_date'] != null ? transfer['to_date'].toString() : '';
|
||||
userHistory = transfer['user']['name'].toString();
|
||||
}
|
||||
if (itemsData.isNotEmpty) {
|
||||
originalItemHistory!.add(
|
||||
MyItemResultObject(
|
||||
name: itemsData['name'],
|
||||
id: itemsData['id'].toString(),
|
||||
size: itemsData['size'].toString(),
|
||||
fromDate: fromDate,
|
||||
toDate: toDate,
|
||||
userHistory: userHistory,
|
||||
itemHistory!.add(
|
||||
ItemHistoryObject(
|
||||
fromDate: transfer['from_date'] != null
|
||||
? transfer['from_date'].toString()
|
||||
: '',
|
||||
toDate: transfer['to_date'] != null
|
||||
? transfer['to_date'].toString()
|
||||
: 'Now',
|
||||
userHistoryName: transfer['user']['name'].toString(),
|
||||
userHistoryId: transfer['user']['id'].toString(),
|
||||
userHistoryPhon: transfer['user']['cell_number'].toString(),
|
||||
),
|
||||
);
|
||||
originalItemHistory!.reversed.toList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Regular → Executable
+15
-20
@@ -19,7 +19,7 @@ class MyPackageProvider extends ChangeNotifier {
|
||||
List<MyPackageResultObject>? originalMyPackagesRequests;
|
||||
List<MyPackageResultObject>? originalHospitalPackagesRequests;
|
||||
|
||||
List<MyPackageResultObject>? originalPackageHistory;
|
||||
List<PackageHistoryObject>? packageHistory;
|
||||
|
||||
MyPackageFilterObject? filters = MyPackageFilterObject(
|
||||
id: '',
|
||||
@@ -210,29 +210,24 @@ class MyPackageProvider extends ChangeNotifier {
|
||||
);
|
||||
|
||||
var packagesData = json.decode(response.body)['data'];
|
||||
print(packagesData);
|
||||
|
||||
packageHistory = [];
|
||||
|
||||
String fromDate = '';
|
||||
String toDate = '';
|
||||
String userHistory = '';
|
||||
for (var transfer in packagesData['transfers']) {
|
||||
fromDate =
|
||||
transfer['from_date'] != null ? transfer['from_date'].toString() : '';
|
||||
toDate =
|
||||
transfer['to_date'] != null ? transfer['to_date'].toString() : '';
|
||||
userHistory = transfer['user']['name'].toString();
|
||||
}
|
||||
if (packagesData.isNotEmpty) {
|
||||
originalPackageHistory!.add(
|
||||
MyPackageResultObject(
|
||||
name: packagesData['name'],
|
||||
id: packagesData['id'].toString(),
|
||||
createdAt: packagesData['created_at'].toString(),
|
||||
fromDate: fromDate,
|
||||
toDate: toDate,
|
||||
userHistory: userHistory,
|
||||
packageHistory!.add(
|
||||
PackageHistoryObject(
|
||||
fromDate: transfer['from_date'] != null
|
||||
? transfer['from_date'].toString()
|
||||
: '',
|
||||
toDate: transfer['to_date'] != null
|
||||
? transfer['to_date'].toString()
|
||||
: 'Now',
|
||||
userHistoryName: transfer['user']['name'].toString(),
|
||||
userHistoryId: transfer['user']['id'].toString(),
|
||||
userHistoryPhon: transfer['user']['cell_number'].toString(),
|
||||
),
|
||||
);
|
||||
originalPackageHistory!.reversed.toList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Regular → Executable
+39
-2
@@ -1,5 +1,6 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:cssd/models/item_model.dart';
|
||||
import 'package:cssd/models/package_model.dart';
|
||||
|
||||
import '../config/urls.dart';
|
||||
@@ -8,7 +9,10 @@ import 'package:flutter/material.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
class PackageProvider extends ChangeNotifier {
|
||||
List<ItemResultObject>? filteredItems;
|
||||
// List<Map<String, dynamic>> itemVals = [];
|
||||
List<String> itemVals = [];
|
||||
|
||||
List<TextEditingController> itemValues = [];
|
||||
String initialItemValue = '';
|
||||
int curItemVal = 1;
|
||||
@@ -18,7 +22,6 @@ class PackageProvider extends ChangeNotifier {
|
||||
itemValues = [];
|
||||
initialItemValue = '';
|
||||
curItemVal = 1;
|
||||
// notifyListeners();
|
||||
}
|
||||
|
||||
addItemVal() {
|
||||
@@ -29,11 +32,28 @@ class PackageProvider extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
removeItemVal() {
|
||||
curItemVal -= 1;
|
||||
TextEditingController lbl = new TextEditingController();
|
||||
lbl.text = initialItemValue;
|
||||
itemValues.removeLast();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
changeItemVal(String value, int index) {
|
||||
itemValues[index].text = value;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
changeItemValByScan(String value, int index) {
|
||||
for (var item in filteredItems!) {
|
||||
if (item.udi == value) {
|
||||
itemValues[index].text = item.id;
|
||||
}
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
String searchBoxValue = '';
|
||||
bool filterOn = false;
|
||||
List<PackageResultObject>? items;
|
||||
@@ -84,11 +104,28 @@ class PackageProvider extends ChangeNotifier {
|
||||
'Authorization': User.token,
|
||||
},
|
||||
);
|
||||
// List<Map<String, dynamic>> result = [];
|
||||
List<String> result = [];
|
||||
filteredItems = [];
|
||||
var filterData = json.decode(response.body);
|
||||
for (var item in filterData['data']) {
|
||||
// result.add("${item['name']} - ${item['udi'] != null ? item['udi'] : ''}");
|
||||
result.add(item['id'].toString());
|
||||
// result.add({
|
||||
// 'name-udi':
|
||||
// "${item['name']} - ${item['udi'] != null ? item['udi'] : ''}",
|
||||
// 'id': item['id'].toString()
|
||||
// });
|
||||
filteredItems!.add(
|
||||
ItemResultObject(
|
||||
name: item['name'],
|
||||
id: item['id'].toString(),
|
||||
size: item['size'].toString(),
|
||||
userName: item['user'] != null ? item['user']['name'] : '',
|
||||
status: item['status'],
|
||||
udi: item['udi'] != null ? item['udi'] : '',
|
||||
),
|
||||
);
|
||||
}
|
||||
itemVals = result;
|
||||
initialItemValue = itemVals[0];
|
||||
@@ -105,7 +142,7 @@ class PackageProvider extends ChangeNotifier {
|
||||
items,
|
||||
note,
|
||||
) async {
|
||||
List<Map<String, Object>> itms = [];
|
||||
List<Map<String, dynamic>> itms = [];
|
||||
for (var item in items) {
|
||||
itms.add({'id': item});
|
||||
}
|
||||
|
||||
Regular → Executable
+5
@@ -19,6 +19,11 @@ class TestResultsProvider with ChangeNotifier {
|
||||
String testType = '';
|
||||
String testCode = '';
|
||||
|
||||
resetTests() {
|
||||
testCode = '';
|
||||
testType = '';
|
||||
}
|
||||
|
||||
setImages() async {
|
||||
images = [];
|
||||
for (var image in catchImages) {
|
||||
|
||||
Regular → Executable
+4
@@ -36,6 +36,10 @@ class UsersProvider extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void resetSelectedUser() {
|
||||
selectedUserIndex = null;
|
||||
}
|
||||
|
||||
void searchUsers(String value) {
|
||||
usersBox = [];
|
||||
searchBoxValue = value;
|
||||
|
||||
Reference in New Issue
Block a user