inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-06-15 11:45:31 +00:00
Code Activity

More checks

Browse Source
This commit is contained in:
Oliver Walters
2022-05-22 09:56:22 +10:00
parent 53b69d9623
commit b98f044204
7 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/api.dart
View File

@ -208,7 +208,7 @@ class InvenTreeAPI {
* Check server connection and display messages if not connected.
* Useful as a precursor check before performing operations.
*/
bool checkConnection(BuildContext context) {
bool checkConnection() {
// Firstly, is the server connected?
if (!isConnected()) {
@ -292,14 +292,10 @@ class InvenTreeAPI {
static final InvenTreeAPI _api = InvenTreeAPI._internal();
// API endpoint for receiving purchase order line items was introduced in v12
bool supportPoReceive() {
return apiVersion >= 12;
}
bool get supportsPoReceive => apiVersion >= 12;
// "Modern" API transactions were implemented in API v14
bool supportModernStockTransactions() {
return apiVersion >= 14;
}
bool get supportsModernStockTransactions => apiVersion >= 14;
/*
* Connect to the remote InvenTree server:

4
lib/inventree/stock.dart
View File

@ -533,7 +533,7 @@ class InvenTreeStockItem extends InvenTreeModel {
Map<String, dynamic> data = {};
// Note: Format of adjustment API was updated in API v14
if (api.supportModernStockTransactions()) {
if (api.supportsModernStockTransactions) {
// Modern (> 14) API
data = {
"items": [
@ -560,7 +560,7 @@ class InvenTreeStockItem extends InvenTreeModel {
}
// Expected API return code depends on server API version
final int expected_response = api.supportModernStockTransactions() ? 201 : 200;
final int expected_response = api.supportsModernStockTransactions ? 201 : 200;
var response = await api.post(
endpoint,

4
lib/widget/drawer.dart
View File

@ -34,7 +34,7 @@ class InvenTreeDrawer extends StatelessWidget {
void _search() {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
_closeDrawer();
@ -51,7 +51,7 @@ class InvenTreeDrawer extends StatelessWidget {
* Upon successful scan, data are passed off to be decoded.
*/
Future <void> _scan() async {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
_closeDrawer();
scanQrCode(context);

16
lib/widget/home.dart
View File

@ -71,13 +71,13 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> {
UserProfile? _profile;
void _scan(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
scanQrCode(context);
}
void _showParts(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)));
}
@ -87,7 +87,7 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> {
}
void _showStarredParts(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(
context,
@ -100,13 +100,13 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> {
}
void _showStock(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => LocationDisplayWidget(null)));
}
void _showPurchaseOrders(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(
context,
@ -118,19 +118,19 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> {
/*
void _showSuppliers(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CompanyListWidget(L10().suppliers, {"is_supplier": "true"})));
}
void _showManufacturers(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CompanyListWidget(L10().manufacturers, {"is_manufacturer": "true"})));
}
void _showCustomers(BuildContext context) {
if (!InvenTreeAPI().checkConnection(context)) return;
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CompanyListWidget(L10().customers, {"is_customer": "true"})));
}

2
lib/widget/purchase_order_detail.dart
View File

@ -247,7 +247,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
);
*/
if (order.isPlaced && InvenTreeAPI().supportPoReceive()) {
if (order.isPlaced && InvenTreeAPI().supportsPoReceive) {
children.add(
SimpleDialogOption(
onPressed: () {

8
lib/widget/stock_detail.dart
View File

@ -311,7 +311,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
Future <void> _addStockDialog() async {
// TODO: In future, deprecate support for older API
if (InvenTreeAPI().supportModernStockTransactions()) {
if (InvenTreeAPI().supportsModernStockTransactions) {
Map<String, dynamic> fields = {
"pk": {
@ -391,7 +391,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
void _removeStockDialog() {
// TODO: In future, deprecate support for the older API
if (InvenTreeAPI().supportModernStockTransactions()) {
if (InvenTreeAPI().supportsModernStockTransactions) {
Map<String, dynamic> fields = {
"pk": {
"parent": "items",
@ -463,7 +463,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
Future <void> _countStockDialog() async {
// TODO: In future, deprecate support for older API
if (InvenTreeAPI().supportModernStockTransactions()) {
if (InvenTreeAPI().supportsModernStockTransactions) {
Map<String, dynamic> fields = {
"pk": {
@ -566,7 +566,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
Future <void> _transferStockDialog(BuildContext context) async {
// TODO: In future, deprecate support for older API
if (InvenTreeAPI().supportModernStockTransactions()) {
if (InvenTreeAPI().supportsModernStockTransactions) {
Map<String, dynamic> fields = {
"pk": {