inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-06-17 12:45:26 +00:00
Code Activity

Format code

Browse Source
This commit is contained in:
Asterix\Oliver
2025-06-14 10:59:13 +10:00
parent 0349ebb0b3
commit 387dc1eb39
96 changed files with 5478 additions and 7340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

348
lib/api.dart
View File

@ -27,13 +27,16 @@ import "package:inventree/user_profile.dart";
import "package:inventree/widget/dialogs.dart"; import "package:inventree/widget/dialogs.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
/* /*
* Class representing an API response from the server * Class representing an API response from the server
*/ */
class APIResponse { class APIResponse {
APIResponse(
APIResponse({this.url = "", this.method = "", this.statusCode = -1, this.error = "", this.data = const {}}); {this.url = "",
this.method = "",
this.statusCode = -1,
this.error = "",
this.data = const {}});
int statusCode = -1; int statusCode = -1;
@ -88,7 +91,6 @@ class APIResponse {
* Handles case where the response is paginated, or a complete set of results * Handles case where the response is paginated, or a complete set of results
*/ */
List<dynamic> resultsList() { List<dynamic> resultsList() {
if (isList()) { if (isList()) {
return asList(); return asList();
} else if (isMap()) { } else if (isMap()) {
@ -104,14 +106,12 @@ class APIResponse {
} }
} }
/* /*
* Custom FileService for caching network images * Custom FileService for caching network images
* Requires a custom badCertificateCallback, * Requires a custom badCertificateCallback,
* so we can accept "dodgy" (e.g. self-signed) certificates * so we can accept "dodgy" (e.g. self-signed) certificates
*/ */
class InvenTreeFileService extends FileService { class InvenTreeFileService extends FileService {
InvenTreeFileService({HttpClient? client, bool strictHttps = false}) { InvenTreeFileService({HttpClient? client, bool strictHttps = false}) {
_client = client ?? HttpClient(); _client = client ?? HttpClient();
@ -141,8 +141,10 @@ class InvenTreeFileService extends FileService {
final HttpClientResponse httpResponse = await req.close(); final HttpClientResponse httpResponse = await req.close();
final http.StreamedResponse _response = http.StreamedResponse( final http.StreamedResponse _response = http.StreamedResponse(
httpResponse.timeout(Duration(seconds: 60)), httpResponse.statusCode, httpResponse.timeout(Duration(seconds: 60)),
contentLength: httpResponse.contentLength < 0 ? 0 : httpResponse.contentLength, httpResponse.statusCode,
contentLength:
httpResponse.contentLength < 0 ? 0 : httpResponse.contentLength,
reasonPhrase: httpResponse.reasonPhrase, reasonPhrase: httpResponse.reasonPhrase,
isRedirect: httpResponse.isRedirect, isRedirect: httpResponse.isRedirect,
); );
@ -158,12 +160,10 @@ class InvenTreeFileService extends FileService {
* initialised using a username:password combination. * initialised using a username:password combination.
*/ */
/* /*
* API class which manages all communication with the InvenTree server * API class which manages all communication with the InvenTree server
*/ */
class InvenTreeAPI { class InvenTreeAPI {
factory InvenTreeAPI() { factory InvenTreeAPI() {
return _api; return _api;
} }
@ -209,7 +209,6 @@ class InvenTreeAPI {
} }
String _makeUrl(String url) { String _makeUrl(String url) {
// Strip leading slash // Strip leading slash
if (url.startsWith("/")) { if (url.startsWith("/")) {
url = url.substring(1, url.length); url = url.substring(1, url.length);
@ -257,15 +256,10 @@ class InvenTreeAPI {
* Useful as a precursor check before performing operations. * Useful as a precursor check before performing operations.
*/ */
bool checkConnection() { bool checkConnection() {
// Is the server connected? // Is the server connected?
if (!isConnected()) { if (!isConnected()) {
showSnackIcon(L10().notConnected,
showSnackIcon( success: false, icon: TablerIcons.server);
L10().notConnected,
success: false,
icon: TablerIcons.server
);
return false; return false;
} }
@ -388,7 +382,6 @@ class InvenTreeAPI {
return !isConnected() && _connecting; return !isConnected() && _connecting;
} }
/* /*
* Perform the required login steps, in sequence. * Perform the required login steps, in sequence.
* Internal function, called by connectToServer() * Internal function, called by connectToServer()
@ -403,7 +396,6 @@ class InvenTreeAPI {
* 5. Request information on available plugins * 5. Request information on available plugins
*/ */
Future<bool> _connectToServer() async { Future<bool> _connectToServer() async {
if (!await _checkServer()) { if (!await _checkServer()) {
return false; return false;
} }
@ -413,7 +405,8 @@ class InvenTreeAPI {
} }
if (!await _checkAuth()) { if (!await _checkAuth()) {
showServerError(_URL_ME, L10().serverNotConnected, L10().serverAuthenticationError); showServerError(
_URL_ME, L10().serverNotConnected, L10().serverAuthenticationError);
// Invalidate the token // Invalidate the token
if (profile != null) { if (profile != null) {
@ -436,21 +429,16 @@ class InvenTreeAPI {
return true; return true;
} }
/* /*
* Check that the remote server is available. * Check that the remote server is available.
* Ping the api/ endpoint, which does not require user authentication * Ping the api/ endpoint, which does not require user authentication
*/ */
Future<bool> _checkServer() async { Future<bool> _checkServer() async {
String address = profile?.server ?? ""; String address = profile?.server ?? "";
if (address.isEmpty) { if (address.isEmpty) {
showSnackIcon( showSnackIcon(L10().incompleteDetails,
L10().incompleteDetails, icon: TablerIcons.exclamation_circle, success: false);
icon: TablerIcons.exclamation_circle,
success: false
);
return false; return false;
} }
@ -459,7 +447,8 @@ class InvenTreeAPI {
} }
// Cache the "strictHttps" setting, so we can use it later without async requirement // Cache the "strictHttps" setting, so we can use it later without async requirement
_strictHttps = await InvenTreeSettingsManager().getValue(INV_STRICT_HTTPS, false) as bool; _strictHttps = await InvenTreeSettingsManager()
.getValue(INV_STRICT_HTTPS, false) as bool;
debug("Connecting to ${apiUrl}"); debug("Connecting to ${apiUrl}");
@ -467,7 +456,8 @@ class InvenTreeAPI {
if (!response.successful()) { if (!response.successful()) {
debug("Server returned invalid response: ${response.statusCode}"); debug("Server returned invalid response: ${response.statusCode}");
showStatusCodeError(apiUrl, response.statusCode, details: response.data.toString()); showStatusCodeError(apiUrl, response.statusCode,
details: response.data.toString());
return false; return false;
} }
@ -486,7 +476,6 @@ class InvenTreeAPI {
} }
if (apiVersion < _minApiVersion) { if (apiVersion < _minApiVersion) {
String message = L10().serverApiVersion + ": ${apiVersion}"; String message = L10().serverApiVersion + ": ${apiVersion}";
message += "\n"; message += "\n";
@ -509,7 +498,6 @@ class InvenTreeAPI {
return true; return true;
} }
/* /*
* Check that the user is authenticated * Check that the user is authenticated
* Fetch the user information * Fetch the user information
@ -525,7 +513,8 @@ class InvenTreeAPI {
userInfo = response.asMap(); userInfo = response.asMap();
return true; return true;
} else { } else {
debug("Auth request failed: Server returned status ${response.statusCode}"); debug(
"Auth request failed: Server returned status ${response.statusCode}");
if (response.data != null) { if (response.data != null) {
debug("Server response: ${response.data.toString()}"); debug("Server response: ${response.data.toString()}");
} }
@ -538,8 +527,8 @@ class InvenTreeAPI {
* Fetch a token from the server, * Fetch a token from the server,
* with a temporary authentication header * with a temporary authentication header
*/ */
Future<APIResponse> fetchToken(UserProfile userProfile, String username, String password) async { Future<APIResponse> fetchToken(
UserProfile userProfile, String username, String password) async {
debug("Fetching user token from ${userProfile.server}"); debug("Fetching user token from ${userProfile.server}");
profile = userProfile; profile = userProfile;
@ -574,14 +563,13 @@ class InvenTreeAPI {
} }
// Construct auth header from username and password // Construct auth header from username and password
String authHeader = "Basic " + base64Encode(utf8.encode("${username}:${password}")); String authHeader =
"Basic " + base64Encode(utf8.encode("${username}:${password}"));
// Perform request to get a token // Perform request to get a token
final response = await get( final response = await get(_URL_TOKEN,
_URL_TOKEN, params: {"name": platform_name},
params: { "name": platform_name}, headers: {HttpHeaders.authorizationHeader: authHeader});
headers: { HttpHeaders.authorizationHeader: authHeader}
);
// Invalid response // Invalid response
if (!response.successful()) { if (!response.successful()) {
@ -643,22 +631,17 @@ class InvenTreeAPI {
_connectionStatusChanged(); _connectionStatusChanged();
} }
/* Public facing connection function. /* Public facing connection function.
*/ */
Future<bool> connectToServer(UserProfile prf) async { Future<bool> connectToServer(UserProfile prf) async {
// Ensure server is first disconnected // Ensure server is first disconnected
disconnectFromServer(); disconnectFromServer();
profile = prf; profile = prf;
if (profile == null) { if (profile == null) {
showSnackIcon( showSnackIcon(L10().profileSelect,
L10().profileSelect, success: false, icon: TablerIcons.exclamation_circle);
success: false,
icon: TablerIcons.exclamation_circle
);
return false; return false;
} }
@ -681,9 +664,7 @@ class InvenTreeAPI {
if (_notification_timer == null) { if (_notification_timer == null) {
debug("starting notification timer"); debug("starting notification timer");
_notification_timer = Timer.periodic( _notification_timer = Timer.periodic(Duration(seconds: 5), (timer) {
Duration(seconds: 5),
(timer) {
_refreshNotifications(); _refreshNotifications();
}); });
} }
@ -700,7 +681,6 @@ class InvenTreeAPI {
* Request the user roles (permissions) from the InvenTree server * Request the user roles (permissions) from the InvenTree server
*/ */
Future<bool> _fetchRoles() async { Future<bool> _fetchRoles() async {
roles.clear(); roles.clear();
debug("API: Requesting user role data"); debug("API: Requesting user role data");
@ -714,7 +694,6 @@ class InvenTreeAPI {
var data = response.asMap(); var data = response.asMap();
if (!data.containsKey("roles")) { if (!data.containsKey("roles")) {
roles = {}; roles = {};
permissions = {}; permissions = {};
@ -739,7 +718,6 @@ class InvenTreeAPI {
// Request plugin information from the server // Request plugin information from the server
Future<bool> _fetchPlugins() async { Future<bool> _fetchPlugins() async {
_plugins.clear(); _plugins.clear();
debug("API: getPluginInformation()"); debug("API: getPluginInformation()");
@ -764,7 +742,6 @@ class InvenTreeAPI {
* e.g. "sales_order", "change" * e.g. "sales_order", "change"
*/ */
bool checkRole(String role, String permission) { bool checkRole(String role, String permission) {
if (!_connected) { if (!_connected) {
return false; return false;
} }
@ -793,15 +770,11 @@ class InvenTreeAPI {
// Ignore TypeError // Ignore TypeError
} else { } else {
// Unknown error - report it! // Unknown error - report it!
sentryReportError( sentryReportError("api.checkRole", error, stackTrace, context: {
"api.checkRole",
error, stackTrace,
context: {
"role": role, "role": role,
"permission": permission, "permission": permission,
"error": error.toString(), "error": error.toString(),
} });
);
} }
// Unable to determine permission - assume true? // Unable to determine permission - assume true?
@ -841,15 +814,11 @@ class InvenTreeAPI {
// Ignore TypeError // Ignore TypeError
} else { } else {
// Unknown error - report it! // Unknown error - report it!
sentryReportError( sentryReportError("api.checkPermission", error, stackTrace, context: {
"api.checkPermission",
error, stackTrace,
context: {
"model": model, "model": model,
"permission": permission, "permission": permission,
"error": error.toString(), "error": error.toString(),
} });
);
} }
// Unable to determine permission - assume true? // Unable to determine permission - assume true?
@ -857,10 +826,9 @@ class InvenTreeAPI {
} }
} }
// Perform a PATCH request // Perform a PATCH request
Future<APIResponse> patch(String url, {Map<String, dynamic> body = const {}, int? expectedStatusCode}) async { Future<APIResponse> patch(String url,
{Map<String, dynamic> body = const {}, int? expectedStatusCode}) async {
Map<String, dynamic> _body = body; Map<String, dynamic> _body = body;
HttpClientRequest? request = await apiRequest(url, "PATCH"); HttpClientRequest? request = await apiRequest(url, "PATCH");
@ -868,24 +836,17 @@ class InvenTreeAPI {
if (request == null) { if (request == null) {
// Return an "invalid" APIResponse // Return an "invalid" APIResponse
return APIResponse( return APIResponse(
url: url, url: url, method: "PATCH", error: "HttpClientRequest is null");
method: "PATCH",
error: "HttpClientRequest is null"
);
} }
return completeRequest( return completeRequest(request,
request, data: json.encode(_body), statusCode: expectedStatusCode);
data: json.encode(_body),
statusCode: expectedStatusCode
);
} }
/* /*
* Download a file from the given URL * Download a file from the given URL
*/ */
Future<void> downloadFile(String url, {bool openOnDownload = true}) async { Future<void> downloadFile(String url, {bool openOnDownload = true}) async {
if (url.isEmpty) { if (url.isEmpty) {
// No URL provided for download // No URL provided for download
return; return;
@ -912,19 +873,20 @@ class InvenTreeAPI {
HttpClientRequest? _request; HttpClientRequest? _request;
final bool strictHttps = await InvenTreeSettingsManager().getValue(INV_STRICT_HTTPS, false) as bool; final bool strictHttps = await InvenTreeSettingsManager()
.getValue(INV_STRICT_HTTPS, false) as bool;
var client = createClient(url, strictHttps: strictHttps); var client = createClient(url, strictHttps: strictHttps);
// Attempt to open a connection to the server // Attempt to open a connection to the server
try { try {
_request = await client.openUrl("GET", _uri).timeout(Duration(seconds: 10)); _request =
await client.openUrl("GET", _uri).timeout(Duration(seconds: 10));
// Set headers // Set headers
defaultHeaders().forEach((key, value) { defaultHeaders().forEach((key, value) {
_request?.headers.set(key, value); _request?.headers.set(key, value);
}); });
} on SocketException catch (error) { } on SocketException catch (error) {
debug("SocketException at ${url}: ${error.toString()}"); debug("SocketException at ${url}: ${error.toString()}");
showServerError(url, L10().connectionRefused, error.toString()); showServerError(url, L10().connectionRefused, error.toString());
@ -943,7 +905,8 @@ class InvenTreeAPI {
showServerError(url, L10().serverError, error.toString()); showServerError(url, L10().serverError, error.toString());
sentryReportError( sentryReportError(
"api.downloadFile : client.openUrl", "api.downloadFile : client.openUrl",
error, stackTrace, error,
stackTrace,
); );
return; return;
} }
@ -974,7 +937,8 @@ class InvenTreeAPI {
showServerError(url, L10().downloadError, error.toString()); showServerError(url, L10().downloadError, error.toString());
sentryReportError( sentryReportError(
"api.downloadFile : client.closeRequest", "api.downloadFile : client.closeRequest",
error, stackTrace, error,
stackTrace,
); );
} }
} }
@ -983,7 +947,9 @@ class InvenTreeAPI {
* Upload a file to the given URL * Upload a file to the given URL
*/ */
Future<APIResponse> uploadFile(String url, File f, Future<APIResponse> uploadFile(String url, File f,
{String name = "attachment", String method="POST", Map<String, dynamic>? fields}) async { {String name = "attachment",
String method = "POST",
Map<String, dynamic>? fields}) async {
var _url = makeApiUrl(url); var _url = makeApiUrl(url);
var request = http.MultipartRequest(method, Uri.parse(_url)); var request = http.MultipartRequest(method, Uri.parse(_url));
@ -992,7 +958,6 @@ class InvenTreeAPI {
if (fields != null) { if (fields != null) {
fields.forEach((String key, dynamic value) { fields.forEach((String key, dynamic value) {
if (value == null) { if (value == null) {
request.fields[key] = ""; request.fields[key] = "";
} else { } else {
@ -1023,48 +988,35 @@ class InvenTreeAPI {
// Report a server-side error // Report a server-side error
if (response.statusCode == 500) { if (response.statusCode == 500) {
sentryReportMessage( sentryReportMessage("Server error in uploadFile()", context: {
"Server error in uploadFile()",
context: {
"url": url, "url": url,
"method": request.method, "method": request.method,
"name": name, "name": name,
"statusCode": response.statusCode.toString(), "statusCode": response.statusCode.toString(),
"requestHeaders": request.headers.toString(), "requestHeaders": request.headers.toString(),
"responseHeaders": httpResponse.headers.toString(), "responseHeaders": httpResponse.headers.toString(),
} });
);
} }
} on SocketException catch (error) { } on SocketException catch (error) {
showServerError(url, L10().connectionRefused, error.toString()); showServerError(url, L10().connectionRefused, error.toString());
response.error = "SocketException"; response.error = "SocketException";
response.errorDetail = error.toString(); response.errorDetail = error.toString();
} on FormatException { } on FormatException {
showServerError( showServerError(url, L10().formatException,
url, L10().formatExceptionJson + ":\n${jsondata}");
L10().formatException,
L10().formatExceptionJson + ":\n${jsondata}"
);
sentryReportMessage( sentryReportMessage("Error decoding JSON response from server", context: {
"Error decoding JSON response from server",
context: {
"method": "uploadFile", "method": "uploadFile",
"url": url, "url": url,
"statusCode": response.statusCode.toString(), "statusCode": response.statusCode.toString(),
"data": jsondata, "data": jsondata,
} });
);
} on TimeoutException { } on TimeoutException {
showTimeoutError(url); showTimeoutError(url);
response.error = "TimeoutException"; response.error = "TimeoutException";
} catch (error, stackTrace) { } catch (error, stackTrace) {
showServerError(url, L10().serverError, error.toString()); showServerError(url, L10().serverError, error.toString());
sentryReportError( sentryReportError("api.uploadFile", error, stackTrace);
"api.uploadFile",
error, stackTrace
);
response.error = "UnknownError"; response.error = "UnknownError";
response.errorDetail = error.toString(); response.errorDetail = error.toString();
} }
@ -1079,15 +1031,11 @@ class InvenTreeAPI {
* so that (hopefully) the field messages are correctly translated * so that (hopefully) the field messages are correctly translated
*/ */
Future<APIResponse> options(String url) async { Future<APIResponse> options(String url) async {
HttpClientRequest? request = await apiRequest(url, "OPTIONS"); HttpClientRequest? request = await apiRequest(url, "OPTIONS");
if (request == null) { if (request == null) {
// Return an "invalid" APIResponse // Return an "invalid" APIResponse
return APIResponse( return APIResponse(url: url, method: "OPTIONS");
url: url,
method: "OPTIONS"
);
} }
return completeRequest(request); return completeRequest(request);
@ -1097,51 +1045,40 @@ class InvenTreeAPI {
* Perform a HTTP POST request * Perform a HTTP POST request
* Returns a json object (or null if unsuccessful) * Returns a json object (or null if unsuccessful)
*/ */
Future<APIResponse> post(String url, {Map<String, dynamic> body = const {}, int? expectedStatusCode=201}) async { Future<APIResponse> post(String url,
{Map<String, dynamic> body = const {},
int? expectedStatusCode = 201}) async {
HttpClientRequest? request = await apiRequest(url, "POST"); HttpClientRequest? request = await apiRequest(url, "POST");
if (request == null) { if (request == null) {
// Return an "invalid" APIResponse // Return an "invalid" APIResponse
return APIResponse( return APIResponse(url: url, method: "POST");
url: url,
method: "POST"
);
} }
return completeRequest( return completeRequest(request,
request, data: json.encode(body), statusCode: expectedStatusCode);
data: json.encode(body),
statusCode: expectedStatusCode
);
} }
/* /*
* Perform a request to link a custom barcode to a particular item * Perform a request to link a custom barcode to a particular item
*/ */
Future<bool> linkBarcode(Map<String, String> body) async { Future<bool> linkBarcode(Map<String, String> body) async {
HttpClientRequest? request = await apiRequest("/barcode/link/", "POST"); HttpClientRequest? request = await apiRequest("/barcode/link/", "POST");
if (request == null) { if (request == null) {
return false; return false;
} }
final response = await completeRequest( final response = await completeRequest(request,
request, data: json.encode(body), statusCode: 200);
data: json.encode(body),
statusCode: 200
);
return response.isValid() && response.statusCode == 200; return response.isValid() && response.statusCode == 200;
} }
/* /*
* Perform a request to unlink a custom barcode from a particular item * Perform a request to unlink a custom barcode from a particular item
*/ */
Future<bool> unlinkBarcode(Map<String, dynamic> body) async { Future<bool> unlinkBarcode(Map<String, dynamic> body) async {
HttpClientRequest? request = await apiRequest("/barcode/unlink/", "POST"); HttpClientRequest? request = await apiRequest("/barcode/unlink/", "POST");
if (request == null) { if (request == null) {
@ -1157,13 +1094,11 @@ class InvenTreeAPI {
return response.isValid() && response.statusCode == 200; return response.isValid() && response.statusCode == 200;
} }
HttpClient createClient(String url, {bool strictHttps = false}) { HttpClient createClient(String url, {bool strictHttps = false}) {
var client = HttpClient(); var client = HttpClient();
client.badCertificateCallback = (X509Certificate cert, String host, int port) { client.badCertificateCallback =
(X509Certificate cert, String host, int port) {
if (strictHttps) { if (strictHttps) {
showServerError( showServerError(
url, url,
@ -1192,21 +1127,14 @@ class InvenTreeAPI {
*/ */
Future<HttpClientRequest?> apiRequest( Future<HttpClientRequest?> apiRequest(
String url, String url,
String method, String method, {
{
Map<String, String> urlParams = const {}, Map<String, String> urlParams = const {},
Map<String, String> headers = const {}, Map<String, String> headers = const {},
} }) async {
) async {
var _url = makeApiUrl(url); var _url = makeApiUrl(url);
if (_url.isEmpty) { if (_url.isEmpty) {
showServerError( showServerError(url, L10().invalidHost, L10().invalidHostDetails);
url,
L10().invalidHost,
L10().invalidHostDetails
);
return null; return null;
} }
@ -1227,23 +1155,21 @@ class InvenTreeAPI {
Uri? _uri = Uri.tryParse(_url); Uri? _uri = Uri.tryParse(_url);
if (_uri == null || _uri.host.isEmpty) { if (_uri == null || _uri.host.isEmpty) {
showServerError( showServerError(_url, L10().invalidHost, L10().invalidHostDetails);
_url,
L10().invalidHost,
L10().invalidHostDetails
);
return null; return null;
} }
HttpClientRequest? _request; HttpClientRequest? _request;
final bool strictHttps = await InvenTreeSettingsManager().getValue(INV_STRICT_HTTPS, false) as bool; final bool strictHttps = await InvenTreeSettingsManager()
.getValue(INV_STRICT_HTTPS, false) as bool;
var client = createClient(url, strictHttps: strictHttps); var client = createClient(url, strictHttps: strictHttps);
// Attempt to open a connection to the server // Attempt to open a connection to the server
try { try {
_request = await client.openUrl(method, _uri).timeout(Duration(seconds: 10)); _request =
await client.openUrl(method, _uri).timeout(Duration(seconds: 10));
// Default headers // Default headers
defaultHeaders().forEach((key, value) { defaultHeaders().forEach((key, value) {
@ -1281,42 +1207,37 @@ class InvenTreeAPI {
} catch (error, stackTrace) { } catch (error, stackTrace) {
debug("Server error at ${url}: ${error.toString()}"); debug("Server error at ${url}: ${error.toString()}");
showServerError(url, L10().serverError, error.toString()); showServerError(url, L10().serverError, error.toString());
sentryReportError( sentryReportError("api.apiRequest : openUrl", error, stackTrace,
"api.apiRequest : openUrl",
error, stackTrace,
context: { context: {
"url": url, "url": url,
"method": method, "method": method,
} });
);
return null; return null;
} }
} }
/* /*
* Complete an API request, and return an APIResponse object * Complete an API request, and return an APIResponse object
*/ */
Future<APIResponse> completeRequest(HttpClientRequest request, {String? data, int? statusCode, bool ignoreResponse = false}) async { Future<APIResponse> completeRequest(HttpClientRequest request,
{String? data, int? statusCode, bool ignoreResponse = false}) async {
if (data != null && data.isNotEmpty) { if (data != null && data.isNotEmpty) {
var encoded_data = utf8.encode(data); var encoded_data = utf8.encode(data);
request.headers.set(HttpHeaders.contentLengthHeader, encoded_data.length.toString()); request.headers
.set(HttpHeaders.contentLengthHeader, encoded_data.length.toString());
request.add(encoded_data); request.add(encoded_data);
} }
APIResponse response = APIResponse( APIResponse response =
method: request.method, APIResponse(method: request.method, url: request.uri.toString());
url: request.uri.toString()
);
String url = request.uri.toString(); String url = request.uri.toString();
try { try {
HttpClientResponse? _response = await request.close().timeout(Duration(seconds: 10)); HttpClientResponse? _response =
await request.close().timeout(Duration(seconds: 10));
response.statusCode = _response.statusCode; response.statusCode = _response.statusCode;
@ -1331,26 +1252,24 @@ class InvenTreeAPI {
case 504: // Gateway timeout case 504: // Gateway timeout
break; break;
default: // Any other error code default: // Any other error code
sentryReportMessage( sentryReportMessage("Server error", context: {
"Server error",
context: {
"url": request.uri.toString(), "url": request.uri.toString(),
"method": request.method, "method": request.method,
"statusCode": _response.statusCode.toString(), "statusCode": _response.statusCode.toString(),
"requestHeaders": request.headers.toString(), "requestHeaders": request.headers.toString(),
"responseHeaders": _response.headers.toString(), "responseHeaders": _response.headers.toString(),
"responseData": response.data.toString(), "responseData": response.data.toString(),
} });
);
break; break;
} }
} else { } else {
response.data =
response.data = ignoreResponse ? {} : await responseToJson(url, _response) ?? {}; ignoreResponse ? {} : await responseToJson(url, _response) ?? {};
// First check that the returned status code is what we expected // First check that the returned status code is what we expected
if (statusCode != null && statusCode != _response.statusCode) { if (statusCode != null && statusCode != _response.statusCode) {
showStatusCodeError(url, _response.statusCode, details: response.data.toString()); showStatusCodeError(url, _response.statusCode,
details: response.data.toString());
} }
} }
} on HttpException catch (error) { } on HttpException catch (error) {
@ -1376,14 +1295,12 @@ class InvenTreeAPI {
} }
return response; return response;
} }
/* /*
* Convert a HttpClientResponse response object to JSON * Convert a HttpClientResponse response object to JSON
*/ */
dynamic responseToJson(String url, HttpClientResponse response) async { dynamic responseToJson(String url, HttpClientResponse response) async {
String body = await response.transform(utf8.decoder).join(); String body = await response.transform(utf8.decoder).join();
try { try {
@ -1391,7 +1308,6 @@ class InvenTreeAPI {
return data ?? {}; return data ?? {};
} on FormatException { } on FormatException {
switch (response.statusCode) { switch (response.statusCode) {
case 400: case 400:
case 401: case 401:
@ -1405,36 +1321,32 @@ class InvenTreeAPI {
// Ignore for server errors // Ignore for server errors
break; break;
default: default:
sentryReportMessage( sentryReportMessage("Error decoding JSON response from server",
"Error decoding JSON response from server",
context: { context: {
"headers": response.headers.toString(), "headers": response.headers.toString(),
"statusCode": response.statusCode.toString(), "statusCode": response.statusCode.toString(),
"data": body.toString(), "data": body.toString(),
"endpoint": url, "endpoint": url,
} });
);
break; break;
} }
showServerError( showServerError(
url, url, L10().formatException, L10().formatExceptionJson + ":\n${body}");
L10().formatException,
L10().formatExceptionJson + ":\n${body}"
);
// Return an empty map // Return an empty map
return {}; return {};
} }
} }
/* /*
* Perform a HTTP GET request * Perform a HTTP GET request
* Returns a json object (or null if did not complete) * Returns a json object (or null if did not complete)
*/ */
Future<APIResponse> get(String url, {Map<String, String> params = const {}, Map<String, String> headers = const {}, int? expectedStatusCode=200}) async { Future<APIResponse> get(String url,
{Map<String, String> params = const {},
Map<String, String> headers = const {},
int? expectedStatusCode = 200}) async {
HttpClientRequest? request = await apiRequest( HttpClientRequest? request = await apiRequest(
url, url,
"GET", "GET",
@ -1442,7 +1354,6 @@ class InvenTreeAPI {
headers: headers, headers: headers,
); );
if (request == null) { if (request == null) {
// Return an "invalid" APIResponse // Return an "invalid" APIResponse
return APIResponse( return APIResponse(
@ -1459,7 +1370,6 @@ class InvenTreeAPI {
* Perform a HTTP DELETE request * Perform a HTTP DELETE request
*/ */
Future<APIResponse> delete(String url) async { Future<APIResponse> delete(String url) async {
HttpClientRequest? request = await apiRequest( HttpClientRequest? request = await apiRequest(
url, url,
"DELETE", "DELETE",
@ -1482,15 +1392,12 @@ class InvenTreeAPI {
// Find the current locale code for the running app // Find the current locale code for the running app
String get currentLocale { String get currentLocale {
if (hasContext()) { if (hasContext()) {
// Try to get app context // Try to get app context
BuildContext? context = OneContext().context; BuildContext? context = OneContext().context;
if (context != null) { if (context != null) {
Locale? locale = InvenTreeApp Locale? locale = InvenTreeApp.of(context)?.locale;
.of(context)
?.locale;
if (locale != null) { if (locale != null) {
return locale.languageCode; //.toString(); return locale.languageCode; //.toString();
@ -1530,8 +1437,8 @@ class InvenTreeAPI {
static String get staticThumb => "/static/img/blank_image.thumbnail.png"; static String get staticThumb => "/static/img/blank_image.thumbnail.png";
CachedNetworkImage? getThumbnail(String imageUrl, {double size = 40, bool hideIfNull = false}) { CachedNetworkImage? getThumbnail(String imageUrl,
{double size = 40, bool hideIfNull = false}) {
if (hideIfNull) { if (hideIfNull) {
if (imageUrl.isEmpty) { if (imageUrl.isEmpty) {
return null; return null;
@ -1539,11 +1446,7 @@ class InvenTreeAPI {
} }
try { try {
return getImage( return getImage(imageUrl, width: size, height: size);
imageUrl,
width: size,
height: size
);
} catch (error, stackTrace) { } catch (error, stackTrace) {
sentryReportError("_getThumbnail", error, stackTrace); sentryReportError("_getThumbnail", error, stackTrace);
return null; return null;
@ -1554,7 +1457,8 @@ class InvenTreeAPI {
* Load image from the InvenTree server, * Load image from the InvenTree server,
* or from local cache (if it has been cached!) * or from local cache (if it has been cached!)
*/ */
CachedNetworkImage getImage(String imageUrl, {double? height, double? width}) { CachedNetworkImage getImage(String imageUrl,
{double? height, double? width}) {
if (imageUrl.isEmpty) { if (imageUrl.isEmpty) {
imageUrl = staticImage; imageUrl = staticImage;
} }
@ -1563,19 +1467,18 @@ class InvenTreeAPI {
const key = "inventree_network_image"; const key = "inventree_network_image";
CacheManager manager = CacheManager( CacheManager manager = CacheManager(Config(
Config(
key, key,
fileService: InvenTreeFileService( fileService: InvenTreeFileService(
strictHttps: _strictHttps, strictHttps: _strictHttps,
), ),
) ));
);
return CachedNetworkImage( return CachedNetworkImage(
imageUrl: url, imageUrl: url,
placeholder: (context, url) => CircularProgressIndicator(), placeholder: (context, url) => CircularProgressIndicator(),
errorWidget: (context, url, error) => Icon(TablerIcons.circle_x, color: COLOR_DANGER), errorWidget: (context, url, error) =>
Icon(TablerIcons.circle_x, color: COLOR_DANGER),
httpHeaders: defaultHeaders(), httpHeaders: defaultHeaders(),
height: height, height: height,
width: width, width: width,
@ -1588,7 +1491,6 @@ class InvenTreeAPI {
Map<String, InvenTreeUserSetting> _userSettings = {}; Map<String, InvenTreeUserSetting> _userSettings = {};
Future<String> getGlobalSetting(String key) async { Future<String> getGlobalSetting(String key) async {
InvenTreeGlobalSetting? setting = _globalSettings[key]; InvenTreeGlobalSetting? setting = _globalSettings[key];
if ((setting != null) && setting.reloadedWithin(Duration(minutes: 5))) { if ((setting != null) && setting.reloadedWithin(Duration(minutes: 5))) {
@ -1607,7 +1509,8 @@ class InvenTreeAPI {
} }
// Return a boolean global setting value // Return a boolean global setting value
Future<bool> getGlobalBooleanSetting(String key, { bool backup = false }) async { Future<bool> getGlobalBooleanSetting(String key,
{bool backup = false}) async {
String value = await getGlobalSetting(key); String value = await getGlobalSetting(key);
if (value.isEmpty) { if (value.isEmpty) {
@ -1618,7 +1521,6 @@ class InvenTreeAPI {
} }
Future<String> getUserSetting(String key) async { Future<String> getUserSetting(String key) async {
InvenTreeUserSetting? setting = _userSettings[key]; InvenTreeUserSetting? setting = _userSettings[key];
if ((setting != null) && setting.reloadedWithin(Duration(minutes: 5))) { if ((setting != null) && setting.reloadedWithin(Duration(minutes: 5))) {
@ -1645,8 +1547,8 @@ class InvenTreeAPI {
/* /*
* Send a request to the server to locate / identify either a StockItem or StockLocation * Send a request to the server to locate / identify either a StockItem or StockLocation
*/ */
Future<void> locateItemOrLocation(BuildContext context, {int? item, int? location}) async { Future<void> locateItemOrLocation(BuildContext context,
{int? item, int? location}) async {
var plugins = getPlugins(mixin: "locate"); var plugins = getPlugins(mixin: "locate");
if (plugins.isEmpty) { if (plugins.isEmpty) {
@ -1679,16 +1581,11 @@ class InvenTreeAPI {
} }
}; };
await launchApiForm( await launchApiForm(context, L10().locateLocation, "", fields,
context,
L10().locateLocation,
"",
fields,
icon: TablerIcons.location_search, icon: TablerIcons.location_search,
onSuccess: (Map<String, dynamic> data) async { onSuccess: (Map<String, dynamic> data) async {
plugin_name = (data["plugin"] ?? "") as String; plugin_name = (data["plugin"] ?? "") as String;
} });
);
} }
Map<String, dynamic> body = { Map<String, dynamic> body = {
@ -1730,10 +1627,13 @@ class InvenTreeAPI {
} }
// Accessors methods for various status code classes // Accessors methods for various status code classes
InvenTreeStatusCode get StockHistoryStatus => _get_status_class("stock/track/status/"); InvenTreeStatusCode get StockHistoryStatus =>
_get_status_class("stock/track/status/");
InvenTreeStatusCode get StockStatus => _get_status_class("stock/status/"); InvenTreeStatusCode get StockStatus => _get_status_class("stock/status/");
InvenTreeStatusCode get PurchaseOrderStatus => _get_status_class("order/po/status/"); InvenTreeStatusCode get PurchaseOrderStatus =>
InvenTreeStatusCode get SalesOrderStatus => _get_status_class("order/so/status/"); _get_status_class("order/po/status/");
InvenTreeStatusCode get SalesOrderStatus =>
_get_status_class("order/so/status/");
void clearStatusCodeData() { void clearStatusCodeData() {
StockHistoryStatus.data.clear(); StockHistoryStatus.data.clear();
@ -1766,5 +1666,3 @@ class InvenTreeAPI {
}); });
} }
} }

287
lib/api_form.dart
View File

@ -1,4 +1,3 @@
import "dart:io"; import "dart:io";
import "package:intl/intl.dart"; import "package:intl/intl.dart";
@ -27,13 +26,11 @@ import "package:inventree/widget/fields.dart";
import "package:inventree/widget/progress.dart"; import "package:inventree/widget/progress.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
/* /*
* Class that represents a single "form field", * Class that represents a single "form field",
* defined by the InvenTree API * defined by the InvenTree API
*/ */
class APIFormField { class APIFormField {
// Constructor // Constructor
APIFormField(this.name, this.data); APIFormField(this.name, this.data);
@ -53,7 +50,6 @@ class APIFormField {
// Return the "lookup path" for this field, within the server data // Return the "lookup path" for this field, within the server data
String get lookupPath { String get lookupPath {
// Simple top-level case // Simple top-level case
if (parent.isEmpty && !nested) { if (parent.isEmpty && !nested) {
return name; return name;
@ -133,19 +129,16 @@ class APIFormField {
// Construct a set of "filters" for this field (e.g. related field) // Construct a set of "filters" for this field (e.g. related field)
Map<String, String> get filters { Map<String, String> get filters {
Map<String, String> _filters = {}; Map<String, String> _filters = {};
// Start with the field "definition" (provided by the server) // Start with the field "definition" (provided by the server)
if (definition.containsKey("filters")) { if (definition.containsKey("filters")) {
try { try {
var fDef = definition["filters"] as Map<String, dynamic>; var fDef = definition["filters"] as Map<String, dynamic>;
fDef.forEach((String key, dynamic value) { fDef.forEach((String key, dynamic value) {
_filters[key] = value.toString(); _filters[key] = value.toString();
}); });
} catch (error) { } catch (error) {
// pass // pass
} }
@ -153,7 +146,6 @@ class APIFormField {
// Next, look at any "instance_filters" provided by the server // Next, look at any "instance_filters" provided by the server
if (definition.containsKey("instance_filters")) { if (definition.containsKey("instance_filters")) {
try { try {
var fIns = definition["instance_filters"] as Map<String, dynamic>; var fIns = definition["instance_filters"] as Map<String, dynamic>;
@ -163,7 +155,6 @@ class APIFormField {
} catch (error) { } catch (error) {
// pass // pass
} }
} }
// Finally, augment or override with any filters provided by the calling function // Finally, augment or override with any filters provided by the calling function
@ -180,14 +171,12 @@ class APIFormField {
} }
return _filters; return _filters;
} }
bool hasErrors() => errorMessages().isNotEmpty; bool hasErrors() => errorMessages().isNotEmpty;
// Extract error messages from the server response // Extract error messages from the server response
void extractErrorMessages(APIResponse response) { void extractErrorMessages(APIResponse response) {
dynamic errors; dynamic errors;
if (isSimple) { if (isSimple) {
@ -213,7 +202,6 @@ class APIFormField {
// Return the error message associated with this field // Return the error message associated with this field
List<String> errorMessages() { List<String> errorMessages() {
dynamic errors = data["errors"] ?? []; dynamic errors = data["errors"] ?? [];
// Handle the case where a single error message is returned // Handle the case where a single error message is returned
@ -246,7 +234,6 @@ class APIFormField {
List<dynamic> get choices => (getParameter("choices") ?? []) as List<dynamic>; List<dynamic> get choices => (getParameter("choices") ?? []) as List<dynamic>;
Future<void> loadInitialData() async { Future<void> loadInitialData() async {
// Only for "related fields" // Only for "related fields"
if (type != "related field") { if (type != "related field") {
return; return;
@ -277,7 +264,6 @@ class APIFormField {
// Construct a widget for this input // Construct a widget for this input
Widget constructField(BuildContext context) { Widget constructField(BuildContext context) {
switch (type) { switch (type) {
case "string": case "string":
case "url": case "url":
@ -302,17 +288,13 @@ class APIFormField {
return ListTile( return ListTile(
title: Text( title: Text(
"Unsupported field type: '${type}' for field '${name}'", "Unsupported field type: '${type}' for field '${name}'",
style: TextStyle( style: TextStyle(color: COLOR_DANGER, fontStyle: FontStyle.italic),
color: COLOR_DANGER, ));
fontStyle: FontStyle.italic),
)
);
} }
} }
// Field for capturing a barcode // Field for capturing a barcode
Widget _constructBarcodeField(BuildContext context) { Widget _constructBarcodeField(BuildContext context) {
TextEditingController controller = TextEditingController(); TextEditingController controller = TextEditingController();
String barcode = (value ?? "").toString(); String barcode = (value ?? "").toString();
@ -349,15 +331,12 @@ class APIFormField {
scanBarcode(context, handler: handler); scanBarcode(context, handler: handler);
}, },
), ),
) ));
);
} }
// Field for displaying and selecting dates // Field for displaying and selecting dates
Widget _constructDateField() { Widget _constructDateField() {
DateTime? currentDate = DateTime.tryParse((value ?? "") as String);
DateTime? currentDate = DateTime.tryParse((value ?? "")as String);
return InputDecorator( return InputDecorator(
decoration: InputDecoration( decoration: InputDecoration(
@ -387,18 +366,15 @@ class APIFormField {
return time; return time;
}, },
) ));
);
} }
// Field for selecting and uploading files // Field for selecting and uploading files
Widget _constructFileField() { Widget _constructFileField() {
TextEditingController controller = TextEditingController(); TextEditingController controller = TextEditingController();
controller.text = (attachedfile?.path ?? L10().attachmentSelect).split("/").last; controller.text =
(attachedfile?.path ?? L10().attachmentSelect).split("/").last;
return InputDecorator( return InputDecorator(
decoration: InputDecoration( decoration: InputDecoration(
@ -421,17 +397,13 @@ class APIFormField {
// Save the file // Save the file
attachedfile = file; attachedfile = file;
} });
);
}, },
) )));
)
);
} }
// Field for selecting from multiple choice options // Field for selecting from multiple choice options
Widget _constructChoiceField() { Widget _constructChoiceField() {
dynamic initial; dynamic initial;
// Check if the current value is within the allowed values // Check if the current value is within the allowed values
@ -445,10 +417,7 @@ class APIFormField {
return DropdownSearch<dynamic>( return DropdownSearch<dynamic>(
popupProps: PopupProps.bottomSheet( popupProps: PopupProps.bottomSheet(
showSelectedItems: false, showSelectedItems: false,
searchFieldProps: TextFieldProps( searchFieldProps: TextFieldProps(autofocus: true)),
autofocus: true
)
),
selectedItem: initial, selectedItem: initial,
items: choices, items: choices,
dropdownDecoratorProps: DropDownDecoratorProps( dropdownDecoratorProps: DropDownDecoratorProps(
@ -472,7 +441,6 @@ class APIFormField {
// Construct a floating point numerical input field // Construct a floating point numerical input field
Widget _constructFloatField() { Widget _constructFloatField() {
// Initial value: try to cast to a valid number // Initial value: try to cast to a valid number
String initial = ""; String initial = "";
@ -491,7 +459,8 @@ class APIFormField {
hintText: placeholderText, hintText: placeholderText,
), ),
initialValue: initial, initialValue: initial,
keyboardType: TextInputType.numberWithOptions(signed: true, decimal: true), keyboardType:
TextInputType.numberWithOptions(signed: true, decimal: true),
validator: (value) { validator: (value) {
value = value?.trim() ?? ""; value = value?.trim() ?? "";
@ -512,7 +481,6 @@ class APIFormField {
data["value"] = val; data["value"] = val;
}, },
); );
} }
// Construct an input for a related field // Construct an input for a related field
@ -528,10 +496,7 @@ class APIFormField {
emptyBuilder: (context, item) { emptyBuilder: (context, item) {
return _renderEmptyResult(); return _renderEmptyResult();
}, },
searchFieldProps: TextFieldProps( searchFieldProps: TextFieldProps(autofocus: true)),
autofocus: true
)
),
selectedItem: initial_data, selectedItem: initial_data,
asyncItems: (String filter) async { asyncItems: (String filter) async {
Map<String, String> _filters = { Map<String, String> _filters = {
@ -543,7 +508,8 @@ class APIFormField {
_filters["offset"] = "0"; _filters["offset"] = "0";
_filters["limit"] = "25"; _filters["limit"] = "25";
final APIResponse response = await InvenTreeAPI().get(api_url, params: _filters); final APIResponse response =
await InvenTreeAPI().get(api_url, params: _filters);
if (response.isValid()) { if (response.isValid()) {
return response.resultsList(); return response.resultsList();
@ -551,9 +517,7 @@ class APIFormField {
return []; return [];
} }
}, },
clearButtonProps: ClearButtonProps( clearButtonProps: ClearButtonProps(isVisible: !required),
isVisible: !required
),
dropdownDecoratorProps: DropDownDecoratorProps( dropdownDecoratorProps: DropDownDecoratorProps(
dropdownSearchDecoration: InputDecoration( dropdownSearchDecoration: InputDecoration(
labelText: label, labelText: label,
@ -612,7 +576,6 @@ class APIFormField {
// Construct a set of custom filters for the dropdown search // Construct a set of custom filters for the dropdown search
Map<String, String> _relatedFieldFilters() { Map<String, String> _relatedFieldFilters() {
switch (model) { switch (model) {
case InvenTreeSupplierPart.MODEL_TYPE: case InvenTreeSupplierPart.MODEL_TYPE:
return InvenTreeSupplierPart().defaultListFilters(); return InvenTreeSupplierPart().defaultListFilters();
@ -626,8 +589,8 @@ class APIFormField {
} }
// Render a "related field" based on the "model" type // Render a "related field" based on the "model" type
Widget _renderRelatedField(String fieldName, dynamic item, bool selected, bool extended) { Widget _renderRelatedField(
String fieldName, dynamic item, bool selected, bool extended) {
// Convert to JSON // Convert to JSON
Map<String, dynamic> data = {}; Map<String, dynamic> data = {};
@ -640,16 +603,13 @@ class APIFormField {
} catch (error, stackTrace) { } catch (error, stackTrace) {
data = {}; data = {};
sentryReportError( sentryReportError("_renderRelatedField", error, stackTrace, context: {
"_renderRelatedField", error, stackTrace,
context: {
"method": "_renderRelateField", "method": "_renderRelateField",
"field_name": fieldName, "field_name": fieldName,
"item": item.toString(), "item": item.toString(),
"selected": selected.toString(), "selected": selected.toString(),
"extended": extended.toString(), "extended": extended.toString(),
} });
);
} }
switch (model) { switch (model) {
@ -657,15 +617,21 @@ class APIFormField {
var part = InvenTreePart.fromJson(data); var part = InvenTreePart.fromJson(data);
return ListTile( return ListTile(
title: Text( title: Text(part.fullname,
part.fullname, style: TextStyle(
style: TextStyle(fontWeight: selected && extended ? FontWeight.bold : FontWeight.normal) fontWeight: selected && extended
), ? FontWeight.bold
subtitle: extended ? Text( : FontWeight.normal)),
subtitle: extended
? Text(
part.description, part.description,
style: TextStyle(fontWeight: selected ? FontWeight.bold : FontWeight.normal), style: TextStyle(
) : null, fontWeight:
leading: extended ? InvenTreeAPI().getThumbnail(part.thumbnail) : null, selected ? FontWeight.bold : FontWeight.normal),
)
: null,
leading:
extended ? InvenTreeAPI().getThumbnail(part.thumbnail) : null,
); );
case InvenTreePartTestTemplate.MODEL_TYPE: case InvenTreePartTestTemplate.MODEL_TYPE:
var template = InvenTreePartTestTemplate.fromJson(data); var template = InvenTreePartTestTemplate.fromJson(data);
@ -680,22 +646,29 @@ class APIFormField {
return ListTile( return ListTile(
title: Text(part.SKU), title: Text(part.SKU),
subtitle: Text(part.partName), subtitle: Text(part.partName),
leading: extended ? InvenTreeAPI().getThumbnail(part.partImage) : null, leading:
trailing: extended && part.supplierImage.isNotEmpty ? InvenTreeAPI().getThumbnail(part.supplierImage) : null, extended ? InvenTreeAPI().getThumbnail(part.partImage) : null,
trailing: extended && part.supplierImage.isNotEmpty
? InvenTreeAPI().getThumbnail(part.supplierImage)
: null,
); );
case InvenTreePartCategory.MODEL_TYPE: case InvenTreePartCategory.MODEL_TYPE:
var cat = InvenTreePartCategory.fromJson(data); var cat = InvenTreePartCategory.fromJson(data);
return ListTile( return ListTile(
title: Text( title: Text(cat.pathstring,
cat.pathstring, style: TextStyle(
style: TextStyle(fontWeight: selected && extended ? FontWeight.bold : FontWeight.normal) fontWeight: selected && extended
), ? FontWeight.bold
subtitle: extended ? Text( : FontWeight.normal)),
subtitle: extended
? Text(
cat.description, cat.description,
style: TextStyle(fontWeight: selected ? FontWeight.bold : FontWeight.normal), style: TextStyle(
) : null, fontWeight:
selected ? FontWeight.bold : FontWeight.normal),
)
: null,
); );
case InvenTreeStockItem.MODEL_TYPE: case InvenTreeStockItem.MODEL_TYPE:
var item = InvenTreeStockItem.fromJson(data); var item = InvenTreeStockItem.fromJson(data);
@ -711,14 +684,19 @@ class APIFormField {
var loc = InvenTreeStockLocation.fromJson(data); var loc = InvenTreeStockLocation.fromJson(data);
return ListTile( return ListTile(
title: Text( title: Text(loc.pathstring,
loc.pathstring, style: TextStyle(
style: TextStyle(fontWeight: selected && extended ? FontWeight.bold : FontWeight.normal) fontWeight: selected && extended
), ? FontWeight.bold
subtitle: extended ? Text( : FontWeight.normal)),
subtitle: extended
? Text(
loc.description, loc.description,
style: TextStyle(fontWeight: selected ? FontWeight.bold : FontWeight.normal), style: TextStyle(
) : null, fontWeight:
selected ? FontWeight.bold : FontWeight.normal),
)
: null,
); );
case InvenTreeSalesOrderShipment.MODEL_TYPE: case InvenTreeSalesOrderShipment.MODEL_TYPE:
var shipment = InvenTreeSalesOrderShipment.fromJson(data); var shipment = InvenTreeSalesOrderShipment.fromJson(data);
@ -747,24 +725,18 @@ class APIFormField {
return ListTile( return ListTile(
title: Text(company.name), title: Text(company.name),
subtitle: extended ? Text(company.description) : null, subtitle: extended ? Text(company.description) : null,
leading: InvenTreeAPI().getThumbnail(company.thumbnail) leading: InvenTreeAPI().getThumbnail(company.thumbnail));
);
case InvenTreeProjectCode.MODEL_TYPE: case InvenTreeProjectCode.MODEL_TYPE:
var project_code = InvenTreeProjectCode.fromJson(data); var project_code = InvenTreeProjectCode.fromJson(data);
return ListTile( return ListTile(
title: Text(project_code.code), title: Text(project_code.code),
subtitle: Text(project_code.description), subtitle: Text(project_code.description),
leading: Icon(TablerIcons.list) leading: Icon(TablerIcons.list));
);
default: default:
return ListTile( return ListTile(
title: Text( title: Text("Unsupported model",
"Unsupported model", style:
style: TextStyle( TextStyle(fontWeight: FontWeight.bold, color: COLOR_DANGER)),
fontWeight: FontWeight.bold,
color: COLOR_DANGER
)
),
subtitle: Text("Model '${model}' rendering not supported"), subtitle: Text("Model '${model}' rendering not supported"),
); );
} }
@ -782,10 +754,8 @@ class APIFormField {
); );
} }
// Construct a string input element // Construct a string input element
Widget _constructString() { Widget _constructString() {
if (readOnly) { if (readOnly) {
return ListTile( return ListTile(
title: Text(label), title: Text(label),
@ -821,7 +791,6 @@ class APIFormField {
// Construct a boolean input element // Construct a boolean input element
Widget _constructBoolean() { Widget _constructBoolean() {
bool? initial_value; bool? initial_value;
if (value is bool || value == null) { if (value is bool || value == null) {
@ -860,15 +829,12 @@ class APIFormField {
color: hasErrors() ? COLOR_DANGER : null, color: hasErrors() ? COLOR_DANGER : null,
); );
} }
} }
/* /*
* Extract field options from a returned OPTIONS request * Extract field options from a returned OPTIONS request
*/ */
Map<String, dynamic> extractFields(APIResponse response) { Map<String, dynamic> extractFields(APIResponse response) {
if (!response.isValid()) { if (!response.isValid()) {
return {}; return {};
} }
@ -896,8 +862,8 @@ Map<String, dynamic> extractFields(APIResponse response) {
* The map "tree" is traversed based on the provided lookup string, which can use dotted notation. * The map "tree" is traversed based on the provided lookup string, which can use dotted notation.
* This allows complex paths to be used to lookup field information. * This allows complex paths to be used to lookup field information.
*/ */
Map<String, dynamic> extractFieldDefinition(Map<String, dynamic> data, String lookup) { Map<String, dynamic> extractFieldDefinition(
Map<String, dynamic> data, String lookup) {
List<String> path = lookup.split("."); List<String> path = lookup.split(".");
// Shadow copy the data for path traversal // Shadow copy the data for path traversal
@ -905,7 +871,6 @@ Map<String, dynamic> extractFieldDefinition(Map<String, dynamic> data, String lo
// Iterate through all but the last element of the path // Iterate through all but the last element of the path
for (int ii = 0; ii < (path.length - 1); ii++) { for (int ii = 0; ii < (path.length - 1); ii++) {
String el = path[ii]; String el = path[ii];
if (!_data.containsKey(el)) { if (!_data.containsKey(el)) {
@ -922,13 +887,11 @@ Map<String, dynamic> extractFieldDefinition(Map<String, dynamic> data, String lo
// Report the error // Report the error
sentryReportError( sentryReportError(
"apiForm.extractFieldDefinition : path traversal", "apiForm.extractFieldDefinition : path traversal", error, stackTrace,
error, stackTrace,
context: { context: {
"path": path.toString(), "path": path.toString(),
"el": el, "el": el,
} });
);
return {}; return {};
} }
} }
@ -938,7 +901,6 @@ Map<String, dynamic> extractFieldDefinition(Map<String, dynamic> data, String lo
if (!_data.containsKey(el)) { if (!_data.containsKey(el)) {
return {}; return {};
} else { } else {
try { try {
Map<String, dynamic> definition = _data[el] as Map<String, dynamic>; Map<String, dynamic> definition = _data[el] as Map<String, dynamic>;
@ -949,20 +911,16 @@ Map<String, dynamic> extractFieldDefinition(Map<String, dynamic> data, String lo
// Report the error // Report the error
sentryReportError( sentryReportError(
"apiForm.extractFieldDefinition : as map", "apiForm.extractFieldDefinition : as map", error, stacktrace,
error, stacktrace,
context: { context: {
"el": el.toString(), "el": el.toString(),
} });
);
return {}; return {};
} }
} }
} }
/* /*
* Launch an API-driven form, * Launch an API-driven form,
* which uses the OPTIONS metadata (at the provided URL) * which uses the OPTIONS metadata (at the provided URL)
@ -977,23 +935,19 @@ Map<String, dynamic> extractFieldDefinition(Map<String, dynamic> data, String lo
Future<void> launchApiForm( Future<void> launchApiForm(
BuildContext context, String title, String url, Map<String, dynamic> fields, BuildContext context, String title, String url, Map<String, dynamic> fields,
{ {String fileField = "",
String fileField = "",
Map<String, dynamic> modelData = const {}, Map<String, dynamic> modelData = const {},
String method = "PATCH", String method = "PATCH",
Function(Map<String, dynamic>)? onSuccess, Function(Map<String, dynamic>)? onSuccess,
bool Function(Map<String, dynamic>)? validate, bool Function(Map<String, dynamic>)? validate,
Function? onCancel, Function? onCancel,
IconData icon = TablerIcons.device_floppy IconData icon = TablerIcons.device_floppy}) async {
}) async {
showLoadingOverlay(); showLoadingOverlay();
// List of fields defined by the server // List of fields defined by the server
Map<String, dynamic> serverFields = {}; Map<String, dynamic> serverFields = {};
if (url.isNotEmpty) { if (url.isNotEmpty) {
var options = await InvenTreeAPI().options(url); var options = await InvenTreeAPI().options(url);
// Invalid response from server // Invalid response from server
@ -1022,7 +976,6 @@ Future<void> launchApiForm(
APIFormField field; APIFormField field;
for (String fieldName in fields.keys) { for (String fieldName in fields.keys) {
dynamic data = fields[fieldName]; dynamic data = fields[fieldName];
Map<String, dynamic> fieldData = {}; Map<String, dynamic> fieldData = {};
@ -1066,7 +1019,8 @@ Future<void> launchApiForm(
// Now, launch a new widget! // Now, launch a new widget!
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => APIFormWidget( MaterialPageRoute(
builder: (context) => APIFormWidget(
title, title,
url, url,
formFields, formFields,
@ -1075,26 +1029,21 @@ Future<void> launchApiForm(
validate: validate, validate: validate,
fileField: fileField, fileField: fileField,
icon: icon, icon: icon,
)) )));
);
} }
class APIFormWidget extends StatefulWidget { class APIFormWidget extends StatefulWidget {
const APIFormWidget( const APIFormWidget(
this.title, this.title,
this.url, this.url,
this.fields, this.fields,
this.method, this.method, {
{
Key? key, Key? key,
this.onSuccess, this.onSuccess,
this.validate, this.validate,
this.fileField = "", this.fileField = "",
this.icon = TablerIcons.device_floppy, this.icon = TablerIcons.device_floppy,
} }) : super(key: key);
) : super(key: key);
//! Form title to display //! Form title to display
final String title; final String title;
@ -1118,12 +1067,9 @@ class APIFormWidget extends StatefulWidget {
@override @override
_APIFormWidgetState createState() => _APIFormWidgetState(); _APIFormWidgetState createState() => _APIFormWidgetState();
} }
class _APIFormWidgetState extends State<APIFormWidget> { class _APIFormWidgetState extends State<APIFormWidget> {
_APIFormWidgetState() : super(); _APIFormWidgetState() : super();
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
@ -1133,34 +1079,26 @@ class _APIFormWidgetState extends State<APIFormWidget> {
bool spacerRequired = false; bool spacerRequired = false;
List<Widget> _buildForm() { List<Widget> _buildForm() {
List<Widget> widgets = []; List<Widget> widgets = [];
// Display non-field errors first // Display non-field errors first
if (nonFieldErrors.isNotEmpty) { if (nonFieldErrors.isNotEmpty) {
for (String error in nonFieldErrors) { for (String error in nonFieldErrors) {
widgets.add( widgets.add(ListTile(
ListTile(
title: Text( title: Text(
error, error,
style: TextStyle( style: TextStyle(
color: COLOR_DANGER, color: COLOR_DANGER,
), ),
), ),
leading: Icon( leading: Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER),
TablerIcons.exclamation_circle, ));
color: COLOR_DANGER
),
)
);
} }
widgets.add(Divider(height: 5)); widgets.add(Divider(height: 5));
} }
for (var field in widget.fields) { for (var field in widget.fields) {
if (field.hidden) { if (field.hidden) {
continue; continue;
} }
@ -1181,8 +1119,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
if (field.hasErrors()) { if (field.hasErrors()) {
for (String error in field.errorMessages()) { for (String error in field.errorMessages()) {
widgets.add( widgets.add(ListTile(
ListTile(
title: Text( title: Text(
error, error,
style: TextStyle( style: TextStyle(
@ -1190,9 +1127,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,
fontSize: 16, fontSize: 16,
), ),
) )));
)
);
} }
} }
@ -1213,20 +1148,16 @@ class _APIFormWidgetState extends State<APIFormWidget> {
} }
Future<APIResponse> _submit(Map<String, dynamic> data) async { Future<APIResponse> _submit(Map<String, dynamic> data) async {
// If a file upload is required, we have to handle the submission differently // If a file upload is required, we have to handle the submission differently
if (widget.fileField.isNotEmpty) { if (widget.fileField.isNotEmpty) {
// Pop the "file" field // Pop the "file" field
data.remove(widget.fileField); data.remove(widget.fileField);
for (var field in widget.fields) { for (var field in widget.fields) {
if (field.name == widget.fileField) { if (field.name == widget.fileField) {
File? file = field.attachedfile; File? file = field.attachedfile;
if (file != null) { if (file != null) {
// A valid file has been supplied // A valid file has been supplied
final response = await InvenTreeAPI().uploadFile( final response = await InvenTreeAPI().uploadFile(
widget.url, widget.url,
@ -1242,24 +1173,16 @@ class _APIFormWidgetState extends State<APIFormWidget> {
} }
if (widget.method == "POST") { if (widget.method == "POST") {
showLoadingOverlay(); showLoadingOverlay();
final response = await InvenTreeAPI().post( final response = await InvenTreeAPI()
widget.url, .post(widget.url, body: data, expectedStatusCode: null);
body: data,
expectedStatusCode: null
);
hideLoadingOverlay(); hideLoadingOverlay();
return response; return response;
} else { } else {
showLoadingOverlay(); showLoadingOverlay();
final response = await InvenTreeAPI().patch( final response = await InvenTreeAPI()
widget.url, .patch(widget.url, body: data, expectedStatusCode: null);
body: data,
expectedStatusCode: null
);
hideLoadingOverlay(); hideLoadingOverlay();
return response; return response;
@ -1267,7 +1190,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
} }
void extractNonFieldErrors(APIResponse response) { void extractNonFieldErrors(APIResponse response) {
List<String> errors = []; List<String> errors = [];
Map<String, dynamic> data = response.asMap(); Map<String, dynamic> data = response.asMap();
@ -1304,7 +1226,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
var errors = response.asMap(); var errors = response.asMap();
for (String fieldName in errors.keys) { for (String fieldName in errors.keys) {
bool match = false; bool match = false;
switch (fieldName) { switch (fieldName) {
@ -1316,7 +1237,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
continue; continue;
default: default:
for (var field in widget.fields) { for (var field in widget.fields) {
// Hidden fields can't display errors, so we won't match // Hidden fields can't display errors, so we won't match
if (field.hidden) { if (field.hidden) {
continue; continue;
@ -1327,7 +1247,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
match = true; match = true;
break; break;
} else if (field.parent == fieldName) { } else if (field.parent == fieldName) {
var error = errors[fieldName]; var error = errors[fieldName];
if (error is List) { if (error is List) {
@ -1349,15 +1268,13 @@ class _APIFormWidgetState extends State<APIFormWidget> {
if (!match) { if (!match) {
// Match for an unknown / unsupported field // Match for an unknown / unsupported field
sentryReportMessage( sentryReportMessage("API form returned error for unsupported field",
"API form returned error for unsupported field",
context: { context: {
"url": response.url, "url": response.url,
"status_code": response.statusCode.toString(), "status_code": response.statusCode.toString(),
"field": fieldName, "field": fieldName,
"error_message": response.data.toString(), "error_message": response.data.toString(),
} });
);
} }
} }
} }
@ -1366,14 +1283,12 @@ class _APIFormWidgetState extends State<APIFormWidget> {
* Submit the form data to the server, and handle the results * Submit the form data to the server, and handle the results
*/ */
Future<void> _save(BuildContext context) async { Future<void> _save(BuildContext context) async {
// Package up the form data // Package up the form data
Map<String, dynamic> data = {}; Map<String, dynamic> data = {};
// Iterate through and find "simple" top-level fields // Iterate through and find "simple" top-level fields
for (var field in widget.fields) { for (var field in widget.fields) {
if (field.readOnly) { if (field.readOnly) {
continue; continue;
} }
@ -1384,7 +1299,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
} else { } else {
// Not so simple... (WHY DID I MAKE THE API SO COMPLEX?) // Not so simple... (WHY DID I MAKE THE API SO COMPLEX?)
if (field.parent.isNotEmpty) { if (field.parent.isNotEmpty) {
// TODO: This is a dirty hack, there *must* be a cleaner way?! // TODO: This is a dirty hack, there *must* be a cleaner way?!
dynamic parent = data[field.parent] ?? {}; dynamic parent = data[field.parent] ?? {};
@ -1446,7 +1360,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
Navigator.pop(context); Navigator.pop(context);
if (successFunc != null) { if (successFunc != null) {
// Ensure the response is a valid JSON structure // Ensure the response is a valid JSON structure
Map<String, dynamic> json = {}; Map<String, dynamic> json = {};
@ -1475,10 +1388,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
checkInvalidErrors(response); checkInvalidErrors(response);
break; break;
case 401: case 401:
showSnackIcon( showSnackIcon("401: " + L10().response401, success: false);
"401: " + L10().response401,
success: false
);
break; break;
case 403: case 403:
showSnackIcon( showSnackIcon(
@ -1515,12 +1425,10 @@ class _APIFormWidgetState extends State<APIFormWidget> {
setState(() { setState(() {
// Refresh the form // Refresh the form
}); });
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(widget.title), title: Text(widget.title),
@ -1529,7 +1437,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
IconButton( IconButton(
icon: Icon(widget.icon), icon: Icon(widget.icon),
onPressed: () { onPressed: () {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
_formKey.currentState!.save(); _formKey.currentState!.save();
@ -1537,8 +1444,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
} }
}, },
) )
] ]),
),
body: Form( body: Form(
key: _formKey, key: _formKey,
child: SingleChildScrollView( child: SingleChildScrollView(
@ -1549,9 +1455,6 @@ class _APIFormWidgetState extends State<APIFormWidget> {
children: _buildForm(), children: _buildForm(),
), ),
padding: EdgeInsets.all(16), padding: EdgeInsets.all(16),
) )));
)
);
} }
} }

1
lib/app_colors.dart
View File

@ -4,7 +4,6 @@ import "package:inventree/helpers.dart";
import "package:one_context/one_context.dart"; import "package:one_context/one_context.dart";
bool isDarkMode() { bool isDarkMode() {
if (!hasContext()) { if (!hasContext()) {
return false; return false;
} }

95
lib/barcode/barcode.dart
View File

@ -10,7 +10,6 @@ import "package:inventree/widget/company/manufacturer_part_detail.dart";
import "package:inventree/widget/order/sales_order_detail.dart"; import "package:inventree/widget/order/sales_order_detail.dart";
import "package:one_context/one_context.dart"; import "package:one_context/one_context.dart";
import "package:inventree/api.dart"; import "package:inventree/api.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
@ -35,10 +34,8 @@ import "package:inventree/widget/stock/stock_detail.dart";
import "package:inventree/widget/company/company_detail.dart"; import "package:inventree/widget/company/company_detail.dart";
import "package:inventree/widget/company/supplier_part_detail.dart"; import "package:inventree/widget/company/supplier_part_detail.dart";
// Signal a barcode scan success to the user // Signal a barcode scan success to the user
Future<void> barcodeSuccess(String msg) async { Future<void> barcodeSuccess(String msg) async {
barcodeSuccessTone(); barcodeSuccessTone();
showSnackIcon(msg, success: true); showSnackIcon(msg, success: true);
} }
@ -46,26 +43,18 @@ Future<void> barcodeSuccess(String msg) async {
// Signal a barcode scan failure to the user // Signal a barcode scan failure to the user
Future<void> barcodeFailure(String msg, dynamic extra) async { Future<void> barcodeFailure(String msg, dynamic extra) async {
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon( showSnackIcon(msg, success: false, onAction: () {
msg,
success: false,
onAction: () {
if (hasContext()) { if (hasContext()) {
OneContext().showDialog( OneContext().showDialog(
builder: (BuildContext context) => builder: (BuildContext context) => SimpleDialog(
SimpleDialog(
title: Text(L10().barcodeError), title: Text(L10().barcodeError),
children: <Widget>[ children: <Widget>[
ListTile( ListTile(
title: Text(L10().responseData), title: Text(L10().responseData),
subtitle: Text(extra.toString()) subtitle: Text(extra.toString()))
) ]));
]
)
);
} }
} });
);
} }
/* /*
@ -75,15 +64,16 @@ Future<void> barcodeFailure(String msg, dynamic extra) async {
* - Returns a Future which resolves when the scanner is dismissed * - Returns a Future which resolves when the scanner is dismissed
* - The provided BarcodeHandler instance is used to handle the scanned barcode * - The provided BarcodeHandler instance is used to handle the scanned barcode
*/ */
Future<Object?> scanBarcode(BuildContext context, {BarcodeHandler? handler}) async { Future<Object?> scanBarcode(BuildContext context,
{BarcodeHandler? handler}) async {
// Default to generic scan handler // Default to generic scan handler
handler ??= BarcodeScanHandler(); handler ??= BarcodeScanHandler();
InvenTreeBarcodeController controller = CameraBarcodeController(handler); InvenTreeBarcodeController controller = CameraBarcodeController(handler);
// Select barcode controller based on user preference // Select barcode controller based on user preference
final int barcodeControllerType = await InvenTreeSettingsManager().getValue(INV_BARCODE_SCAN_TYPE, BARCODE_CONTROLLER_CAMERA) as int; final int barcodeControllerType = await InvenTreeSettingsManager()
.getValue(INV_BARCODE_SCAN_TYPE, BARCODE_CONTROLLER_CAMERA) as int;
switch (barcodeControllerType) { switch (barcodeControllerType) {
case BARCODE_CONTROLLER_WEDGE: case BARCODE_CONTROLLER_WEDGE:
@ -95,15 +85,12 @@ Future<Object?> scanBarcode(BuildContext context, {BarcodeHandler? handler}) asy
break; break;
} }
return Navigator.of(context).push( return Navigator.of(context).push(PageRouteBuilder(
PageRouteBuilder(
pageBuilder: (context, _, __) => controller, pageBuilder: (context, _, __) => controller,
opaque: false, opaque: false,
) ));
);
} }
/* /*
* Class for general barcode scanning. * Class for general barcode scanning.
* Scan *any* barcode without context, and then redirect app to correct view. * Scan *any* barcode without context, and then redirect app to correct view.
@ -117,13 +104,11 @@ Future<Object?> scanBarcode(BuildContext context, {BarcodeHandler? handler}) asy
* - PurchaseOrder * - PurchaseOrder
*/ */
class BarcodeScanHandler extends BarcodeHandler { class BarcodeScanHandler extends BarcodeHandler {
@override @override
String getOverlayText(BuildContext context) => L10().barcodeScanGeneral; String getOverlayText(BuildContext context) => L10().barcodeScanGeneral;
@override @override
Future<void> onBarcodeUnknown(Map<String, dynamic> data) async { Future<void> onBarcodeUnknown(Map<String, dynamic> data) async {
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon( showSnackIcon(
@ -137,12 +122,12 @@ class BarcodeScanHandler extends BarcodeHandler {
* Response when a "Part" instance is scanned * Response when a "Part" instance is scanned
*/ */
Future<void> handlePart(int pk) async { Future<void> handlePart(int pk) async {
var part = await InvenTreePart().get(pk); var part = await InvenTreePart().get(pk);
if (part is InvenTreePart) { if (part is InvenTreePart) {
OneContext().pop(); OneContext().pop();
OneContext().push(MaterialPageRoute(builder: (context) => PartDetailWidget(part))); OneContext().push(
MaterialPageRoute(builder: (context) => PartDetailWidget(part)));
} }
} }
@ -150,13 +135,12 @@ class BarcodeScanHandler extends BarcodeHandler {
* Response when a "StockItem" instance is scanned * Response when a "StockItem" instance is scanned
*/ */
Future<void> handleStockItem(int pk) async { Future<void> handleStockItem(int pk) async {
var item = await InvenTreeStockItem().get(pk); var item = await InvenTreeStockItem().get(pk);
if (item is InvenTreeStockItem) { if (item is InvenTreeStockItem) {
OneContext().pop(); OneContext().pop();
OneContext().push(MaterialPageRoute( OneContext().push(
builder: (context) => StockDetailWidget(item))); MaterialPageRoute(builder: (context) => StockDetailWidget(item)));
} }
} }
@ -164,13 +148,12 @@ class BarcodeScanHandler extends BarcodeHandler {
* Response when a "StockLocation" instance is scanned * Response when a "StockLocation" instance is scanned
*/ */
Future<void> handleStockLocation(int pk) async { Future<void> handleStockLocation(int pk) async {
var loc = await InvenTreeStockLocation().get(pk); var loc = await InvenTreeStockLocation().get(pk);
if (loc is InvenTreeStockLocation) { if (loc is InvenTreeStockLocation) {
OneContext().pop(); OneContext().pop();
OneContext().navigator.push(MaterialPageRoute( OneContext().navigator.push(
builder: (context) => LocationDisplayWidget(loc))); MaterialPageRoute(builder: (context) => LocationDisplayWidget(loc)));
} }
} }
@ -178,7 +161,6 @@ class BarcodeScanHandler extends BarcodeHandler {
* Response when a "SupplierPart" instance is scanned * Response when a "SupplierPart" instance is scanned
*/ */
Future<void> handleSupplierPart(int pk) async { Future<void> handleSupplierPart(int pk) async {
var supplierPart = await InvenTreeSupplierPart().get(pk); var supplierPart = await InvenTreeSupplierPart().get(pk);
if (supplierPart is InvenTreeSupplierPart) { if (supplierPart is InvenTreeSupplierPart) {
@ -197,7 +179,8 @@ class BarcodeScanHandler extends BarcodeHandler {
if (manufacturerPart is InvenTreeManufacturerPart) { if (manufacturerPart is InvenTreeManufacturerPart) {
OneContext().pop(); OneContext().pop();
OneContext().push(MaterialPageRoute( OneContext().push(MaterialPageRoute(
builder: (context) => ManufacturerPartDetailWidget(manufacturerPart))); builder: (context) =>
ManufacturerPartDetailWidget(manufacturerPart)));
} }
} }
@ -251,7 +234,6 @@ class BarcodeScanHandler extends BarcodeHandler {
InvenTreeManufacturerPart.MODEL_TYPE, InvenTreeManufacturerPart.MODEL_TYPE,
]; ];
if (InvenTreeAPI().supportsOrderBarcodes) { if (InvenTreeAPI().supportsOrderBarcodes) {
validModels.add(InvenTreePurchaseOrder.MODEL_TYPE); validModels.add(InvenTreePurchaseOrder.MODEL_TYPE);
validModels.add(InvenTreeSalesOrder.MODEL_TYPE); validModels.add(InvenTreeSalesOrder.MODEL_TYPE);
@ -275,7 +257,6 @@ class BarcodeScanHandler extends BarcodeHandler {
// A valid result has been found // A valid result has been found
if (pk > 0 && model.isNotEmpty) { if (pk > 0 && model.isNotEmpty) {
barcodeSuccessTone(); barcodeSuccessTone();
switch (model) { switch (model) {
@ -312,15 +293,10 @@ class BarcodeScanHandler extends BarcodeHandler {
// If we get here, we have not found a valid barcode result! // If we get here, we have not found a valid barcode result!
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon( showSnackIcon(L10().barcodeUnknown, success: false, onAction: () {
L10().barcodeUnknown,
success: false,
onAction: () {
if (hasContext()) { if (hasContext()) {
OneContext().showDialog( OneContext().showDialog(
builder: (BuildContext context) => builder: (BuildContext context) => SimpleDialog(
SimpleDialog(
title: Text(L10().unknownResponse), title: Text(L10().unknownResponse),
children: <Widget>[ children: <Widget>[
ListTile( ListTile(
@ -328,20 +304,16 @@ class BarcodeScanHandler extends BarcodeHandler {
subtitle: Text(data.toString()), subtitle: Text(data.toString()),
) )
], ],
) ));
);
} }
} });
);
} }
} }
/* /*
* Barcode handler for finding a "unique" barcode (one that does not match an item in the database) * Barcode handler for finding a "unique" barcode (one that does not match an item in the database)
*/ */
class UniqueBarcodeHandler extends BarcodeHandler { class UniqueBarcodeHandler extends BarcodeHandler {
UniqueBarcodeHandler(this.callback, {this.overlayText = ""}); UniqueBarcodeHandler(this.callback, {this.overlayText = ""});
// Callback function when a "unique" barcode hash is found // Callback function when a "unique" barcode hash is found
@ -379,7 +351,6 @@ class UniqueBarcodeHandler extends BarcodeHandler {
success: false, success: false,
); );
} else { } else {
barcodeSuccessTone(); barcodeSuccessTone();
// Close the barcode scanner // Close the barcode scanner
@ -396,12 +367,10 @@ class UniqueBarcodeHandler extends BarcodeHandler {
Future<void> onBarcodeUnknown(Map<String, dynamic> data) async { Future<void> onBarcodeUnknown(Map<String, dynamic> data) async {
await onBarcodeMatched(data); await onBarcodeMatched(data);
} }
} }
SpeedDialChild customBarcodeAction(BuildContext context, RefreshableState state,
SpeedDialChild customBarcodeAction(BuildContext context, RefreshableState state, String barcode, String model, int pk) { String barcode, String model, int pk) {
if (barcode.isEmpty) { if (barcode.isEmpty) {
return SpeedDialChild( return SpeedDialChild(
label: L10().barcodeAssign, label: L10().barcodeAssign,
@ -414,23 +383,20 @@ SpeedDialChild customBarcodeAction(BuildContext context, RefreshableState state,
}).then((bool result) { }).then((bool result) {
showSnackIcon( showSnackIcon(
result ? L10().barcodeAssigned : L10().barcodeNotAssigned, result ? L10().barcodeAssigned : L10().barcodeNotAssigned,
success: result success: result);
);
state.refresh(context); state.refresh(context);
}); });
}); });
scanBarcode(context, handler: handler); scanBarcode(context, handler: handler);
} });
);
} else { } else {
return SpeedDialChild( return SpeedDialChild(
child: Icon(Icons.barcode_reader), child: Icon(Icons.barcode_reader),
label: L10().barcodeUnassign, label: L10().barcodeUnassign,
onTap: () { onTap: () {
InvenTreeAPI().unlinkBarcode({ InvenTreeAPI()
model: pk.toString() .unlinkBarcode({model: pk.toString()}).then((bool result) {
}).then((bool result) {
showSnackIcon( showSnackIcon(
result ? L10().requestSuccessful : L10().requestFailed, result ? L10().requestSuccessful : L10().requestFailed,
success: result, success: result,
@ -438,7 +404,6 @@ SpeedDialChild customBarcodeAction(BuildContext context, RefreshableState state,
state.refresh(context); state.refresh(context);
}); });
} });
);
} }
} }

92
lib/barcode/camera_controller.dart
View File

@ -42,9 +42,8 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
String scanned_code = ""; String scanned_code = "";
final MobileScannerController controller = MobileScannerController( final MobileScannerController controller =
autoZoom: true MobileScannerController(autoZoom: true);
);
@override @override
void initState() { void initState() {
@ -80,7 +79,6 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
@override @override
Future<void> pauseScan() async { Future<void> pauseScan() async {
if (mounted) { if (mounted) {
setState(() { setState(() {
scanning_paused = true; scanning_paused = true;
@ -90,7 +88,6 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
@override @override
Future<void> resumeScan() async { Future<void> resumeScan() async {
controller.start(); controller.start();
if (mounted) { if (mounted) {
@ -114,8 +111,7 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
setState(() { setState(() {
multiple_barcodes = false; multiple_barcodes = false;
}); });
} } else if (result.barcodes.length > 1) {
else if (result.barcodes.length > 1) {
setState(() { setState(() {
multiple_barcodes = true; multiple_barcodes = true;
}); });
@ -175,18 +171,12 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
void onControllerCreated(CameraController? controller, Exception? error) { void onControllerCreated(CameraController? controller, Exception? error) {
if (error != null) { if (error != null) {
sentryReportError( sentryReportError(
"CameraBarcodeController.onControllerCreated", "CameraBarcodeController.onControllerCreated", error, null);
error,
null
);
} }
if (controller == null) { if (controller == null) {
showSnackIcon( showSnackIcon(L10().cameraCreationError,
L10().cameraCreationError, icon: TablerIcons.camera_x, success: false);
icon: TablerIcons.camera_x,
success: false
);
if (OneContext.hasContext) { if (OneContext.hasContext) {
Navigator.pop(OneContext().context!); Navigator.pop(OneContext().context!);
@ -195,7 +185,6 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
} }
Widget BarcodeOverlay(BuildContext context) { Widget BarcodeOverlay(BuildContext context) {
final Size screenSize = MediaQuery.of(context).size; final Size screenSize = MediaQuery.of(context).size;
final double width = screenSize.width; final double width = screenSize.width;
final double height = screenSize.height; final double height = screenSize.height;
@ -213,8 +202,7 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
overlayColor = COLOR_WARNING; overlayColor = COLOR_WARNING;
} }
return Stack( return Stack(children: [
children: [
Center( Center(
child: Container( child: Container(
width: D, width: D,
@ -225,17 +213,14 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
width: 4, width: 4,
), ),
), ),
) ))
) ]);
]
);
} }
/* /*
* Build the barcode reader widget * Build the barcode reader widget
*/ */
Widget BarcodeReader(BuildContext context) { Widget BarcodeReader(BuildContext context) {
final Size screenSize = MediaQuery.of(context).size; final Size screenSize = MediaQuery.of(context).size;
final double width = screenSize.width; final double width = screenSize.width;
final double height = screenSize.height; final double height = screenSize.height;
@ -248,10 +233,7 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
return BarcodeOverlay(context); return BarcodeOverlay(context);
}, },
scanWindow: Rect.fromCenter( scanWindow: Rect.fromCenter(
center: Offset(width / 2, height / 2), center: Offset(width / 2, height / 2), width: D, height: D),
width: D,
height: D
),
onDetect: (result) { onDetect: (result) {
onScanSuccess(result); onScanSuccess(result);
}, },
@ -263,28 +245,18 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
child: Align( child: Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding:
left: 10, EdgeInsets.only(left: 10, right: 10, top: 75, bottom: 10),
right: 10, child: Text(widget.handler.getOverlayText(context),
top: 75,
bottom: 10
),
child: Text(
widget.handler.getOverlayText(context),
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold fontWeight: FontWeight.bold)))));
)
)
)
)
);
} }
Widget bottomCenterOverlay() { Widget bottomCenterOverlay() {
String info_text =
String info_text = scanning_paused ? L10().barcodeScanPaused : L10().barcodeScanPause; scanning_paused ? L10().barcodeScanPaused : L10().barcodeScanPause;
String text = scanned_code.isNotEmpty ? scanned_code : info_text; String text = scanned_code.isNotEmpty ? scanned_code : info_text;
@ -296,28 +268,18 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
child: Align( child: Align(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding:
left: 10, EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 75),
right: 10, child: Text(text,
top: 10,
bottom: 75
),
child: Text(
text,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold fontWeight: FontWeight.bold)),
) )));
),
)
)
);
} }
Widget? buildActions(BuildContext context) { Widget? buildActions(BuildContext context) {
List<SpeedDialChild> actions = [ List<SpeedDialChild> actions = [
SpeedDialChild( SpeedDialChild(
child: Icon(flash_status ? TablerIcons.bulb_off : TablerIcons.bulb), child: Icon(flash_status ? TablerIcons.bulb_off : TablerIcons.bulb),
@ -329,15 +291,13 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
flash_status = !flash_status; flash_status = !flash_status;
}); });
} }
} }),
),
SpeedDialChild( SpeedDialChild(
child: Icon(TablerIcons.camera), child: Icon(TablerIcons.camera),
label: L10().switchCamera, label: L10().switchCamera,
onTap: () async { onTap: () async {
controller.switchCamera(); controller.switchCamera();
} })
)
]; ];
return SpeedDial( return SpeedDial(
@ -348,7 +308,6 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: COLOR_APP_BAR, backgroundColor: COLOR_APP_BAR,
@ -368,9 +327,7 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
children: <Widget>[ children: <Widget>[
Column( Column(
children: [ children: [
Expanded( Expanded(child: BarcodeReader(context)),
child: BarcodeReader(context)
),
], ],
), ),
topCenterOverlay(), topCenterOverlay(),
@ -380,5 +337,4 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
), ),
); );
} }
} }

14
lib/barcode/controller.dart
View File

@ -11,7 +11,6 @@ import "package:inventree/widget/progress.dart";
* which is used to process the scanned barcode. * which is used to process the scanned barcode.
*/ */
class InvenTreeBarcodeController extends StatefulWidget { class InvenTreeBarcodeController extends StatefulWidget {
const InvenTreeBarcodeController(this.handler, {Key? key}) : super(key: key); const InvenTreeBarcodeController(this.handler, {Key? key}) : super(key: key);
final BarcodeHandler handler; final BarcodeHandler handler;
@ -20,16 +19,16 @@ class InvenTreeBarcodeController extends StatefulWidget {
State<StatefulWidget> createState() => InvenTreeBarcodeControllerState(); State<StatefulWidget> createState() => InvenTreeBarcodeControllerState();
} }
/* /*
* Base state widget for the barcode controller. * Base state widget for the barcode controller.
* This defines the basic interface for the barcode controller. * This defines the basic interface for the barcode controller.
*/ */
class InvenTreeBarcodeControllerState extends State<InvenTreeBarcodeController> { class InvenTreeBarcodeControllerState
extends State<InvenTreeBarcodeController> {
InvenTreeBarcodeControllerState() : super(); InvenTreeBarcodeControllerState() : super();
final GlobalKey barcodeControllerKey = GlobalKey(debugLabel: "barcodeController"); final GlobalKey barcodeControllerKey =
GlobalKey(debugLabel: "barcodeController");
// Internal state flag to test if we are currently processing a barcode // Internal state flag to test if we are currently processing a barcode
bool processingBarcode = false; bool processingBarcode = false;
@ -40,7 +39,6 @@ class InvenTreeBarcodeControllerState extends State<InvenTreeBarcodeController>
* Barcode data should be passed as a string * Barcode data should be passed as a string
*/ */
Future<void> handleBarcodeData(String? data) async { Future<void> handleBarcodeData(String? data) async {
// Check that the data is valid, and this view is still mounted // Check that the data is valid, and this view is still mounted
if (!mounted || data == null || data.isEmpty) { if (!mounted || data == null || data.isEmpty) {
return; return;
@ -66,7 +64,8 @@ class InvenTreeBarcodeControllerState extends State<InvenTreeBarcodeController>
return; return;
} }
int delay = await InvenTreeSettingsManager().getValue(INV_BARCODE_SCAN_DELAY, 500) as int; int delay = await InvenTreeSettingsManager()
.getValue(INV_BARCODE_SCAN_DELAY, 500) as int;
Future.delayed(Duration(milliseconds: delay), () { Future.delayed(Duration(milliseconds: delay), () {
hideLoadingOverlay(); hideLoadingOverlay();
@ -99,5 +98,4 @@ class InvenTreeBarcodeControllerState extends State<InvenTreeBarcodeController>
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container(); return Container();
} }
} }

15
lib/barcode/handler.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -13,7 +12,6 @@ import "package:inventree/inventree/sentry.dart";
import "package:inventree/widget/dialogs.dart"; import "package:inventree/widget/dialogs.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
/* Generic class which "handles" a barcode, by communicating with the InvenTree server, /* Generic class which "handles" a barcode, by communicating with the InvenTree server,
* and handling match / unknown / error cases. * and handling match / unknown / error cases.
* *
@ -21,7 +19,6 @@ import "package:inventree/widget/snacks.dart";
* based on the response returned from the InvenTree server * based on the response returned from the InvenTree server
*/ */
class BarcodeHandler { class BarcodeHandler {
BarcodeHandler(); BarcodeHandler();
// Return the text to display on the barcode overlay // Return the text to display on the barcode overlay
@ -60,21 +57,16 @@ class BarcodeHandler {
Future<void> processBarcode(String barcode, Future<void> processBarcode(String barcode,
{String url = "barcode/", {String url = "barcode/",
Map<String, dynamic> extra_data = const {}}) async { Map<String, dynamic> extra_data = const {}}) async {
debug("Scanned barcode data: '${barcode}'"); debug("Scanned barcode data: '${barcode}'");
barcode = barcode.trim(); barcode = barcode.trim();
// Empty barcode is invalid // Empty barcode is invalid
if (barcode.isEmpty) { if (barcode.isEmpty) {
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon( showSnackIcon(L10().barcodeError,
L10().barcodeError, icon: TablerIcons.exclamation_circle, success: false);
icon: TablerIcons.exclamation_circle,
success: false
);
return; return;
} }
@ -123,8 +115,7 @@ class BarcodeHandler {
"error": response.error, "error": response.error,
"errorDetail": response.errorDetail, "errorDetail": response.errorDetail,
"className": "${this}", "className": "${this}",
} });
);
} else if (data.containsKey("success")) { } else if (data.containsKey("success")) {
await onBarcodeMatched(data); await onBarcodeMatched(data);
} else if ((response.statusCode >= 400) || data.containsKey("error")) { } else if ((response.statusCode >= 400) || data.containsKey("error")) {

41
lib/barcode/purchase_order.dart
View File

@ -20,7 +20,6 @@ import "package:inventree/widget/snacks.dart";
* - If location or quantity information wasn't provided, show a form to fill it in * - If location or quantity information wasn't provided, show a form to fill it in
*/ */
class POReceiveBarcodeHandler extends BarcodeHandler { class POReceiveBarcodeHandler extends BarcodeHandler {
POReceiveBarcodeHandler({this.purchaseOrder, this.location, this.lineItem}); POReceiveBarcodeHandler({this.purchaseOrder, this.location, this.lineItem});
InvenTreePurchaseOrder? purchaseOrder; InvenTreePurchaseOrder? purchaseOrder;
@ -34,8 +33,8 @@ class POReceiveBarcodeHandler extends BarcodeHandler {
Future<void> processBarcode(String barcode, Future<void> processBarcode(String barcode,
{String url = "barcode/po-receive/", {String url = "barcode/po-receive/",
Map<String, dynamic> extra_data = const {}}) async { Map<String, dynamic> extra_data = const {}}) async {
final bool confirm =
final bool confirm = await InvenTreeSettingsManager().getBool(INV_PO_CONFIRM_SCAN, true); await InvenTreeSettingsManager().getBool(INV_PO_CONFIRM_SCAN, true);
final po_extra_data = { final po_extra_data = {
"purchase_order": purchaseOrder?.pk, "purchase_order": purchaseOrder?.pk,
@ -50,7 +49,6 @@ class POReceiveBarcodeHandler extends BarcodeHandler {
@override @override
Future<void> onBarcodeMatched(Map<String, dynamic> data) async { Future<void> onBarcodeMatched(Map<String, dynamic> data) async {
if (data.containsKey("lineitem") || data.containsKey("success")) { if (data.containsKey("lineitem") || data.containsKey("success")) {
barcodeSuccess(L10().receivedItem); barcodeSuccess(L10().receivedItem);
return; return;
@ -66,7 +64,8 @@ class POReceiveBarcodeHandler extends BarcodeHandler {
} }
final lineItemData = data["lineitem"] as Map<String, dynamic>; final lineItemData = data["lineitem"] as Map<String, dynamic>;
if (!lineItemData.containsKey("pk") || !lineItemData.containsKey("purchase_order")) { if (!lineItemData.containsKey("pk") ||
!lineItemData.containsKey("purchase_order")) {
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon(L10().missingData, success: false); showSnackIcon(L10().missingData, success: false);
} }
@ -79,7 +78,8 @@ class POReceiveBarcodeHandler extends BarcodeHandler {
return; return;
} }
InvenTreePOLineItem? lineItem = await InvenTreePOLineItem().get(lineItemId) as InvenTreePOLineItem?; InvenTreePOLineItem? lineItem =
await InvenTreePOLineItem().get(lineItemId) as InvenTreePOLineItem?;
if (lineItem == null) { if (lineItem == null) {
barcodeFailureTone(); barcodeFailureTone();
@ -89,7 +89,8 @@ class POReceiveBarcodeHandler extends BarcodeHandler {
// Next, extract the "optional" fields // Next, extract the "optional" fields
// Extract information from the returned server response // Extract information from the returned server response
double? quantity = double.tryParse((lineItemData["quantity"] ?? "0").toString()); double? quantity =
double.tryParse((lineItemData["quantity"] ?? "0").toString());
int? destination = lineItemData["location"] as int?; int? destination = lineItemData["location"] as int?;
String? barcode = data["barcode_data"] as String?; String? barcode = data["barcode_data"] as String?;
@ -98,33 +99,26 @@ class POReceiveBarcodeHandler extends BarcodeHandler {
OneContext().pop(); OneContext().pop();
} }
await lineItem.receive( await lineItem.receive(OneContext().context!,
OneContext().context!,
destination: destination, destination: destination,
quantity: quantity, quantity: quantity,
barcode: barcode, barcode: barcode, onSuccess: () {
onSuccess: () {
showSnackIcon(L10().receivedItem, success: true); showSnackIcon(L10().receivedItem, success: true);
} });
);
} }
@override @override
Future<void> onBarcodeUnknown(Map<String, dynamic> data) async { Future<void> onBarcodeUnknown(Map<String, dynamic> data) async {
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon( showSnackIcon(data["error"] as String? ?? L10().barcodeError,
data["error"] as String? ?? L10().barcodeError, success: false);
success: false
);
} }
} }
/* /*
* Barcode handler to add a line item to a purchase order * Barcode handler to add a line item to a purchase order
*/ */
class POAllocateBarcodeHandler extends BarcodeHandler { class POAllocateBarcodeHandler extends BarcodeHandler {
POAllocateBarcodeHandler({this.purchaseOrder}); POAllocateBarcodeHandler({this.purchaseOrder});
InvenTreePurchaseOrder? purchaseOrder; InvenTreePurchaseOrder? purchaseOrder;
@ -133,11 +127,9 @@ class POAllocateBarcodeHandler extends BarcodeHandler {
String getOverlayText(BuildContext context) => L10().scanSupplierPart; String getOverlayText(BuildContext context) => L10().scanSupplierPart;
@override @override
Future<void> processBarcode(String barcode, { Future<void> processBarcode(String barcode,
String url = "barcode/po-allocate/", {String url = "barcode/po-allocate/",
Map<String, dynamic> extra_data = const {}} Map<String, dynamic> extra_data = const {}}) {
) {
final po_extra_data = { final po_extra_data = {
"purchase_order": purchaseOrder?.pk, "purchase_order": purchaseOrder?.pk,
...extra_data, ...extra_data,
@ -189,7 +181,6 @@ class POAllocateBarcodeHandler extends BarcodeHandler {
@override @override
Future<void> onBarcodeUnhandled(Map<String, dynamic> data) async { Future<void> onBarcodeUnhandled(Map<String, dynamic> data) async {
print("onBarcodeUnhandled:"); print("onBarcodeUnhandled:");
print(data.toString()); print(data.toString());

35
lib/barcode/sales_order.dart
View File

@ -14,13 +14,11 @@ import "package:inventree/barcode/tones.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
/* /*
* Barcode handler class for scanning a new part into a SalesOrder * Barcode handler class for scanning a new part into a SalesOrder
*/ */
class SOAddItemBarcodeHandler extends BarcodeHandler { class SOAddItemBarcodeHandler extends BarcodeHandler {
SOAddItemBarcodeHandler({this.salesOrder}); SOAddItemBarcodeHandler({this.salesOrder});
InvenTreeSalesOrder? salesOrder; InvenTreeSalesOrder? salesOrder;
@ -30,7 +28,6 @@ class SOAddItemBarcodeHandler extends BarcodeHandler {
@override @override
Future<void> onBarcodeMatched(Map<String, dynamic> data) async { Future<void> onBarcodeMatched(Map<String, dynamic> data) async {
// Extract the part ID from the returned data // Extract the part ID from the returned data
int part_id = -1; int part_id = -1;
@ -46,7 +43,6 @@ class SOAddItemBarcodeHandler extends BarcodeHandler {
var part = await InvenTreePart().get(part_id); var part = await InvenTreePart().get(part_id);
if (part is InvenTreePart) { if (part is InvenTreePart) {
if (part.isSalable) { if (part.isSalable) {
// Dispose of the barcode scanner // Dispose of the barcode scanner
if (OneContext.hasContext) { if (OneContext.hasContext) {
@ -68,23 +64,18 @@ class SOAddItemBarcodeHandler extends BarcodeHandler {
L10().lineItemAdd, L10().lineItemAdd,
fields: fields, fields: fields,
); );
} else { } else {
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon(L10().partNotSalable, success: false); showSnackIcon(L10().partNotSalable, success: false);
} }
} else { } else {
// Failed to fetch part // Failed to fetch part
return onBarcodeUnknown(data); return onBarcodeUnknown(data);
} }
} }
} }
class SOAllocateStockHandler extends BarcodeHandler { class SOAllocateStockHandler extends BarcodeHandler {
SOAllocateStockHandler({this.salesOrder, this.lineItem, this.shipment}); SOAllocateStockHandler({this.salesOrder, this.lineItem, this.shipment});
InvenTreeSalesOrder? salesOrder; InvenTreeSalesOrder? salesOrder;
@ -96,10 +87,8 @@ class SOAllocateStockHandler extends BarcodeHandler {
@override @override
Future<void> processBarcode(String barcode, Future<void> processBarcode(String barcode,
{ {String url = "barcode/so-allocate/",
String url = "barcode/so-allocate/",
Map<String, dynamic> extra_data = const {}}) { Map<String, dynamic> extra_data = const {}}) {
final so_extra_data = { final so_extra_data = {
"sales_order": salesOrder?.pk, "sales_order": salesOrder?.pk,
"shipment": shipment?.pk, "shipment": shipment?.pk,
@ -121,8 +110,8 @@ class SOAllocateStockHandler extends BarcodeHandler {
@override @override
Future<void> onBarcodeUnhandled(Map<String, dynamic> data) async { Future<void> onBarcodeUnhandled(Map<String, dynamic> data) async {
if (!data.containsKey("action_required") ||
if (!data.containsKey("action_required") || !data.containsKey("line_item")) { !data.containsKey("line_item")) {
return super.onBarcodeUnhandled(data); return super.onBarcodeUnhandled(data);
} }
@ -147,20 +136,14 @@ class SOAllocateStockHandler extends BarcodeHandler {
fields["quantity"]?["value"] = data["quantity"]; fields["quantity"]?["value"] = data["quantity"];
fields["shipment"]?["value"] = data["shipment"]; fields["shipment"]?["value"] = data["shipment"];
fields["shipment"]?["filters"] = { fields["shipment"]?["filters"] = {"order": salesOrder!.pk.toString()};
"order": salesOrder!.pk.toString()
};
final context = OneContext().context!; final context = OneContext().context!;
launchApiForm( launchApiForm(
context, context, L10().allocateStock, salesOrder!.allocate_url, fields,
L10().allocateStock,
salesOrder!.allocate_url,
fields,
method: "POST", method: "POST",
icon: TablerIcons.transition_right, icon: TablerIcons.transition_right, onSuccess: (data) async {
onSuccess: (data) async {
showSnackIcon(L10().allocated, success: true); showSnackIcon(L10().allocated, success: true);
}); });
} }
@ -168,9 +151,7 @@ class SOAllocateStockHandler extends BarcodeHandler {
@override @override
Future<void> onBarcodeUnknown(Map<String, dynamic> data) async { Future<void> onBarcodeUnknown(Map<String, dynamic> data) async {
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon( showSnackIcon(data["error"] as String? ?? L10().barcodeError,
data["error"] as String? ?? L10().barcodeError, success: false);
success: false
);
} }
} }

73
lib/barcode/stock.dart
View File

@ -16,7 +16,6 @@ import "package:inventree/inventree/stock.dart";
import "package:inventree/widget/dialogs.dart"; import "package:inventree/widget/dialogs.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
/* /*
* Generic class for scanning a StockLocation. * Generic class for scanning a StockLocation.
* *
@ -24,20 +23,17 @@ import "package:inventree/widget/snacks.dart";
* - Runs a "callback" function if a valid StockLocation is found * - Runs a "callback" function if a valid StockLocation is found
*/ */
class BarcodeScanStockLocationHandler extends BarcodeHandler { class BarcodeScanStockLocationHandler extends BarcodeHandler {
@override @override
String getOverlayText(BuildContext context) => L10().barcodeScanLocation; String getOverlayText(BuildContext context) => L10().barcodeScanLocation;
@override @override
Future<void> onBarcodeMatched(Map<String, dynamic> data) async { Future<void> onBarcodeMatched(Map<String, dynamic> data) async {
// We expect that the barcode points to a 'stocklocation' // We expect that the barcode points to a 'stocklocation'
if (data.containsKey("stocklocation")) { if (data.containsKey("stocklocation")) {
int _loc = (data["stocklocation"]?["pk"] ?? -1) as int; int _loc = (data["stocklocation"]?["pk"] ?? -1) as int;
// A valid stock location! // A valid stock location!
if (_loc > 0) { if (_loc > 0) {
debug("Scanned stock location ${_loc}"); debug("Scanned stock location ${_loc}");
final bool result = await onLocationScanned(_loc); final bool result = await onLocationScanned(_loc);
@ -64,10 +60,8 @@ class BarcodeScanStockLocationHandler extends BarcodeHandler {
// Re-implement this for particular subclass // Re-implement this for particular subclass
return false; return false;
} }
} }
/* /*
* Generic class for scanning a StockItem * Generic class for scanning a StockItem
* *
@ -75,7 +69,6 @@ class BarcodeScanStockLocationHandler extends BarcodeHandler {
* - Runs a "callback" function if a valid StockItem is found * - Runs a "callback" function if a valid StockItem is found
*/ */
class BarcodeScanStockItemHandler extends BarcodeHandler { class BarcodeScanStockItemHandler extends BarcodeHandler {
@override @override
String getOverlayText(BuildContext context) => L10().barcodeScanItem; String getOverlayText(BuildContext context) => L10().barcodeScanItem;
@ -87,7 +80,6 @@ class BarcodeScanStockItemHandler extends BarcodeHandler {
// A valid stock location! // A valid stock location!
if (_item > 0) { if (_item > 0) {
barcodeSuccessTone(); barcodeSuccessTone();
bool result = await onItemScanned(_item); bool result = await onItemScanned(_item);
@ -115,7 +107,6 @@ class BarcodeScanStockItemHandler extends BarcodeHandler {
} }
} }
/* /*
* Barcode handler for scanning a provided StockItem into a scanned StockLocation. * Barcode handler for scanning a provided StockItem into a scanned StockLocation.
* *
@ -124,36 +115,28 @@ class BarcodeScanStockItemHandler extends BarcodeHandler {
* - The StockItem is transferred into the scanned location * - The StockItem is transferred into the scanned location
*/ */
class StockItemScanIntoLocationHandler extends BarcodeScanStockLocationHandler { class StockItemScanIntoLocationHandler extends BarcodeScanStockLocationHandler {
StockItemScanIntoLocationHandler(this.item); StockItemScanIntoLocationHandler(this.item);
final InvenTreeStockItem item; final InvenTreeStockItem item;
@override @override
Future<bool> onLocationScanned(int locationId) async { Future<bool> onLocationScanned(int locationId) async {
final bool confirm =
final bool confirm = await InvenTreeSettingsManager().getBool(INV_STOCK_CONFIRM_SCAN, false); await InvenTreeSettingsManager().getBool(INV_STOCK_CONFIRM_SCAN, false);
bool result = false; bool result = false;
if (confirm) { if (confirm) {
Map<String, dynamic> fields = item.transferFields(); Map<String, dynamic> fields = item.transferFields();
// Override location with scanned value // Override location with scanned value
fields["location"]?["value"] = locationId; fields["location"]?["value"] = locationId;
launchApiForm( launchApiForm(OneContext().context!, L10().transferStock,
OneContext().context!, InvenTreeStockItem.transferStockUrl(), fields,
L10().transferStock, method: "POST", icon: TablerIcons.transfer, onSuccess: (data) async {
InvenTreeStockItem.transferStockUrl(),
fields,
method: "POST",
icon: TablerIcons.transfer,
onSuccess: (data) async {
showSnackIcon(L10().stockItemUpdated, success: true); showSnackIcon(L10().stockItemUpdated, success: true);
} });
);
return true; return true;
} else { } else {
@ -171,7 +154,6 @@ class StockItemScanIntoLocationHandler extends BarcodeScanStockLocationHandler {
} }
} }
/* /*
* Barcode handler for scanning stock item(s) into the specified StockLocation. * Barcode handler for scanning stock item(s) into the specified StockLocation.
* *
@ -180,7 +162,6 @@ class StockItemScanIntoLocationHandler extends BarcodeScanStockLocationHandler {
* - The scanned StockItem is transferred into the provided StockLocation * - The scanned StockItem is transferred into the provided StockLocation
*/ */
class StockLocationScanInItemsHandler extends BarcodeScanStockItemHandler { class StockLocationScanInItemsHandler extends BarcodeScanStockItemHandler {
StockLocationScanInItemsHandler(this.location); StockLocationScanInItemsHandler(this.location);
final InvenTreeStockLocation location; final InvenTreeStockLocation location;
@ -190,14 +171,14 @@ class StockLocationScanInItemsHandler extends BarcodeScanStockItemHandler {
@override @override
Future<bool> onItemScanned(int itemId) async { Future<bool> onItemScanned(int itemId) async {
final InvenTreeStockItem? item =
final InvenTreeStockItem? item = await InvenTreeStockItem().get(itemId) as InvenTreeStockItem?; await InvenTreeStockItem().get(itemId) as InvenTreeStockItem?;
final bool confirm = await InvenTreeSettingsManager().getBool(INV_STOCK_CONFIRM_SCAN, false); final bool confirm =
await InvenTreeSettingsManager().getBool(INV_STOCK_CONFIRM_SCAN, false);
bool result = false; bool result = false;
if (item != null) { if (item != null) {
// Item is already *in* the specified location // Item is already *in* the specified location
if (item.locationId == location.pk) { if (item.locationId == location.pk) {
barcodeFailureTone(); barcodeFailureTone();
@ -210,27 +191,22 @@ class StockLocationScanInItemsHandler extends BarcodeScanStockItemHandler {
// Override location with provided location value // Override location with provided location value
fields["location"]?["value"] = location.pk; fields["location"]?["value"] = location.pk;
launchApiForm( launchApiForm(OneContext().context!, L10().transferStock,
OneContext().context!, InvenTreeStockItem.transferStockUrl(), fields,
L10().transferStock,
InvenTreeStockItem.transferStockUrl(),
fields,
method: "POST", method: "POST",
icon: TablerIcons.transfer, icon: TablerIcons.transfer, onSuccess: (data) async {
onSuccess: (data) async {
showSnackIcon(L10().stockItemUpdated, success: true); showSnackIcon(L10().stockItemUpdated, success: true);
} });
);
return true; return true;
} else { } else {
result = await item.transferStock(location.pk); result = await item.transferStock(location.pk);
showSnackIcon( showSnackIcon(
result ? L10().barcodeScanIntoLocationSuccess : L10().barcodeScanIntoLocationFailure, result
success: result ? L10().barcodeScanIntoLocationSuccess
); : L10().barcodeScanIntoLocationFailure,
success: result);
} }
} }
} }
@ -240,7 +216,6 @@ class StockLocationScanInItemsHandler extends BarcodeScanStockItemHandler {
} }
} }
/* /*
* Barcode handler class for scanning a StockLocation into another StockLocation * Barcode handler class for scanning a StockLocation into another StockLocation
* *
@ -249,14 +224,12 @@ class StockLocationScanInItemsHandler extends BarcodeScanStockItemHandler {
* - The scanned StockLocation is set as the "parent" of the provided StockLocation * - The scanned StockLocation is set as the "parent" of the provided StockLocation
*/ */
class ScanParentLocationHandler extends BarcodeScanStockLocationHandler { class ScanParentLocationHandler extends BarcodeScanStockLocationHandler {
ScanParentLocationHandler(this.location); ScanParentLocationHandler(this.location);
final InvenTreeStockLocation location; final InvenTreeStockLocation location;
@override @override
Future<bool> onLocationScanned(int locationId) async { Future<bool> onLocationScanned(int locationId) async {
final response = await location.update( final response = await location.update(
values: { values: {
"parent": locationId.toString(), "parent": locationId.toString(),
@ -275,17 +248,13 @@ class ScanParentLocationHandler extends BarcodeScanStockLocationHandler {
return false; return false;
default: default:
barcodeFailureTone(); barcodeFailureTone();
showSnackIcon( showSnackIcon(L10().barcodeScanIntoLocationFailure,
L10().barcodeScanIntoLocationFailure, success: false, actionText: L10().details, onAction: () {
success: false,
actionText: L10().details,
onAction: () {
showErrorDialog( showErrorDialog(
L10().barcodeError, L10().barcodeError,
response: response, response: response,
); );
} });
);
return false; return false;
} }
} }

10
lib/barcode/tones.dart
View File

@ -5,17 +5,17 @@ import "package:inventree/preferences.dart";
* Play an audible 'success' alert to the user. * Play an audible 'success' alert to the user.
*/ */
Future<void> barcodeSuccessTone() async { Future<void> barcodeSuccessTone() async {
final bool en = await InvenTreeSettingsManager()
final bool en = await InvenTreeSettingsManager().getValue(INV_SOUNDS_BARCODE, true) as bool; .getValue(INV_SOUNDS_BARCODE, true) as bool;
if (en) { if (en) {
playAudioFile("sounds/barcode_scan.mp3"); playAudioFile("sounds/barcode_scan.mp3");
} }
} }
Future <void> barcodeFailureTone() async { Future<void> barcodeFailureTone() async {
final bool en = await InvenTreeSettingsManager()
final bool en = await InvenTreeSettingsManager().getValue(INV_SOUNDS_BARCODE, true) as bool; .getValue(INV_SOUNDS_BARCODE, true) as bool;
if (en) { if (en) {
playAudioFile("sounds/barcode_error.mp3"); playAudioFile("sounds/barcode_error.mp3");

30
lib/barcode/wedge_controller.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter/services.dart"; import "package:flutter/services.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -15,17 +14,14 @@ import "package:inventree/helpers.dart";
* intercepting barcode data which is entered as rapid keyboard presses * intercepting barcode data which is entered as rapid keyboard presses
*/ */
class WedgeBarcodeController extends InvenTreeBarcodeController { class WedgeBarcodeController extends InvenTreeBarcodeController {
const WedgeBarcodeController(BarcodeHandler handler, {Key? key})
const WedgeBarcodeController(BarcodeHandler handler, {Key? key}) : super(handler, key: key); : super(handler, key: key);
@override @override
State<StatefulWidget> createState() => _WedgeBarcodeControllerState(); State<StatefulWidget> createState() => _WedgeBarcodeControllerState();
} }
class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState { class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
_WedgeBarcodeControllerState() : super(); _WedgeBarcodeControllerState() : super();
bool canScan = true; bool canScan = true;
@ -40,7 +36,6 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
@override @override
Future<void> pauseScan() async { Future<void> pauseScan() async {
if (mounted) { if (mounted) {
setState(() { setState(() {
canScan = false; canScan = false;
@ -50,7 +45,6 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
@override @override
Future<void> resumeScan() async { Future<void> resumeScan() async {
if (mounted) { if (mounted) {
setState(() { setState(() {
canScan = true; canScan = true;
@ -60,7 +54,6 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
// Callback for a single key press / scan // Callback for a single key press / scan
void handleKeyEvent(KeyEvent event) { void handleKeyEvent(KeyEvent event) {
if (!scanning) { if (!scanning) {
return; return;
} }
@ -78,7 +71,8 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
DateTime now = DateTime.now(); DateTime now = DateTime.now();
// Throw away old characters // Throw away old characters
if (_lastScanTime == null || _lastScanTime!.isBefore(now.subtract(Duration(milliseconds: 250)))) { if (_lastScanTime == null ||
_lastScanTime!.isBefore(now.subtract(Duration(milliseconds: 250)))) {
_scannedCharacters.clear(); _scannedCharacters.clear();
} }
@ -99,7 +93,6 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: COLOR_APP_BAR, backgroundColor: COLOR_APP_BAR,
@ -118,8 +111,7 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
focusNode: _focusNode, focusNode: _focusNode,
child: SizedBox( child: SizedBox(
child: CircularProgressIndicator( child: CircularProgressIndicator(
color: scanning ? COLOR_ACTION : COLOR_PROGRESS color: scanning ? COLOR_ACTION : COLOR_PROGRESS),
),
width: 64, width: 64,
height: 64, height: 64,
), ),
@ -136,18 +128,12 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState {
), ),
Spacer(flex: 5), Spacer(flex: 5),
Padding( Padding(
child: Text( child: Text(widget.handler.getOverlayText(context),
widget.handler.getOverlayText(context),
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold, color: Colors.white)),
color: Colors.white)
),
padding: EdgeInsets.all(20), padding: EdgeInsets.all(20),
) )
], ],
) )));
)
);
} }
} }

4
lib/dsn.dart
View File

@ -1,7 +1,7 @@
/* /*
* For integration with sentry.io, fill out the SENTRY_DSN_KEY value below. * For integration with sentry.io, fill out the SENTRY_DSN_KEY value below.
* This should be set to a valid DSN key, from your sentry.io account * This should be set to a valid DSN key, from your sentry.io account
* *
*/ */
String SENTRY_DSN_KEY = "https://fea705aa4b8e4c598dcf9b146b3d1b86@o378676.ingest.sentry.io/5202450"; String SENTRY_DSN_KEY =
"https://fea705aa4b8e4c598dcf9b146b3d1b86@o378676.ingest.sentry.io/5202450";

28
lib/helpers.dart
View File

@ -17,8 +17,6 @@ import "package:audioplayers/audioplayers.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
List<String> debug_messages = []; List<String> debug_messages = [];
void clearDebugMessage() => debug_messages.clear(); void clearDebugMessage() => debug_messages.clear();
@ -44,14 +42,12 @@ bool debugContains(String msg, {bool raiseAssert = true}) {
} }
if (raiseAssert) { if (raiseAssert) {
assert(result); assert(result);
} }
return result; return result;
} }
bool isTesting() { bool isTesting() {
return Platform.environment.containsKey("FLUTTER_TEST"); return Platform.environment.containsKey("FLUTTER_TEST");
} }
@ -64,12 +60,10 @@ bool hasContext() {
} }
} }
/* /*
* Display a debug message if we are in testing mode, or running in debug mode * Display a debug message if we are in testing mode, or running in debug mode
*/ */
void debug(dynamic msg) { void debug(dynamic msg) {
if (Platform.environment.containsKey("FLUTTER_TEST")) { if (Platform.environment.containsKey("FLUTTER_TEST")) {
debug_messages.add(msg.toString()); debug_messages.add(msg.toString());
} }
@ -77,13 +71,11 @@ void debug(dynamic msg) {
print("DEBUG: ${msg.toString()}"); print("DEBUG: ${msg.toString()}");
} }
/* /*
* Simplify string representation of a floating point value * Simplify string representation of a floating point value
* Basically, don't display fractional component if it is an integer * Basically, don't display fractional component if it is an integer
*/ */
String simpleNumberString(double number) { String simpleNumberString(double number) {
if (number.toInt() == number) { if (number.toInt() == number) {
return number.toInt().toString(); return number.toInt().toString();
} else { } else {
@ -98,7 +90,6 @@ String simpleNumberString(double number) {
* we will not attempt to play the sound * we will not attempt to play the sound
*/ */
Future<void> playAudioFile(String path) async { Future<void> playAudioFile(String path) async {
// Debug message for unit testing // Debug message for unit testing
debug("Playing audio file: '${path}'"); debug("Playing audio file: '${path}'");
@ -115,16 +106,13 @@ Future<void> playAudioFile(String path) async {
usageType: AndroidUsageType.notification, usageType: AndroidUsageType.notification,
audioFocus: AndroidAudioFocus.none, audioFocus: AndroidAudioFocus.none,
), ),
iOS: AudioContextIOS() iOS: AudioContextIOS()));
));
player.play(AssetSource(path)); player.play(AssetSource(path));
} }
// Open an external URL // Open an external URL
Future<void> openLink(String url) async { Future<void> openLink(String url) async {
final link = Uri.parse(url); final link = Uri.parse(url);
try { try {
@ -134,24 +122,20 @@ Future<void> openLink(String url) async {
} }
} }
/* /*
* Helper function for rendering a money / currency object as a String * Helper function for rendering a money / currency object as a String
*/ */
String renderCurrency(double? amount, String currency, {int decimals = 2}) { String renderCurrency(double? amount, String currency, {int decimals = 2}) {
if (amount == null || amount.isInfinite || amount.isNaN) return "-"; if (amount == null || amount.isInfinite || amount.isNaN) return "-";
currency = currency.trim(); currency = currency.trim();
if (currency.isEmpty) return "-"; if (currency.isEmpty) return "-";
CurrencyFormat fmt = CurrencyFormat.fromCode(currency.toLowerCase()) ?? CurrencyFormat.usd; CurrencyFormat fmt =
CurrencyFormat.fromCode(currency.toLowerCase()) ?? CurrencyFormat.usd;
String value = CurrencyFormatter.format( String value = CurrencyFormatter.format(amount, fmt);
amount,
fmt
);
return value; return value;
} }
@ -163,8 +147,8 @@ bool isValidNumber(double? value) {
/* /*
* Render a "range" of prices between two values. * Render a "range" of prices between two values.
*/ */
String formatPriceRange(double? minPrice, double? maxPrice, { String? currency }) { String formatPriceRange(double? minPrice, double? maxPrice,
{String? currency}) {
// Account for empty or null values // Account for empty or null values
if (!isValidNumber(minPrice) && !isValidNumber(maxPrice)) { if (!isValidNumber(minPrice) && !isValidNumber(maxPrice)) {
return "-"; return "-";

7
lib/inventree/bom.dart
View File

@ -1,4 +1,3 @@
import "package:inventree/inventree/model.dart"; import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/part.dart"; import "package:inventree/inventree/part.dart";
@ -6,13 +5,13 @@ import "package:inventree/inventree/part.dart";
* Class representing the BomItem database model * Class representing the BomItem database model
*/ */
class InvenTreeBomItem extends InvenTreeModel { class InvenTreeBomItem extends InvenTreeModel {
InvenTreeBomItem() : super(); InvenTreeBomItem() : super();
InvenTreeBomItem.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeBomItem.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeBomItem.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeBomItem.fromJson(json);
@override @override
String get URL => "bom/"; String get URL => "bom/";
@ -57,7 +56,7 @@ class InvenTreeBomItem extends InvenTreeModel {
} }
return null; return null;
} }
// Extract the ID of the related sub-part // Extract the ID of the related sub-part
int get subPartId => getInt("sub_part"); int get subPartId => getInt("sub_part");

95
lib/inventree/company.dart
View File

@ -6,13 +6,11 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/purchase_order.dart"; import "package:inventree/inventree/purchase_order.dart";
import "package:inventree/widget/company/company_detail.dart"; import "package:inventree/widget/company/company_detail.dart";
/* /*
* The InvenTreeCompany class represents the Company model in the InvenTree database. * The InvenTreeCompany class represents the Company model in the InvenTree database.
*/ */
class InvenTreeCompany extends InvenTreeModel { class InvenTreeCompany extends InvenTreeModel {
InvenTreeCompany() : super(); InvenTreeCompany() : super();
InvenTreeCompany.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeCompany.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@ -24,16 +22,13 @@ class InvenTreeCompany extends InvenTreeModel {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => CompanyDetailWidget(this)));
MaterialPageRoute(
builder: (context) => CompanyDetailWidget(this)
)
);
} }
@override @override
List<String> get rolesRequired => ["purchase_order", "sales_order", "return_order"]; List<String> get rolesRequired =>
["purchase_order", "sales_order", "return_order"];
@override @override
Map<String, Map<String, dynamic>> formFields() { Map<String, Map<String, dynamic>> formFields() {
@ -54,9 +49,13 @@ class InvenTreeCompany extends InvenTreeModel {
return fields; return fields;
} }
String get image => (jsondata["image"] ?? jsondata["thumbnail"] ?? InvenTreeAPI.staticImage) as String; String get image =>
(jsondata["image"] ?? jsondata["thumbnail"] ?? InvenTreeAPI.staticImage)
as String;
String get thumbnail => (jsondata["thumbnail"] ?? jsondata["image"] ?? InvenTreeAPI.staticThumb) as String; String get thumbnail =>
(jsondata["thumbnail"] ?? jsondata["image"] ?? InvenTreeAPI.staticThumb)
as String;
String get website => getString("website"); String get website => getString("website");
@ -77,19 +76,16 @@ class InvenTreeCompany extends InvenTreeModel {
int get partManufacturedCount => getInt("parts_manufactured"); int get partManufacturedCount => getInt("parts_manufactured");
// Request a list of purchase orders against this company // Request a list of purchase orders against this company
Future<List<InvenTreePurchaseOrder>> getPurchaseOrders({bool? outstanding}) async { Future<List<InvenTreePurchaseOrder>> getPurchaseOrders(
{bool? outstanding}) async {
Map<String, String> filters = { Map<String, String> filters = {"supplier": "${pk}"};
"supplier": "${pk}"
};
if (outstanding != null) { if (outstanding != null) {
filters["outstanding"] = outstanding ? "true" : "false"; filters["outstanding"] = outstanding ? "true" : "false";
} }
final List<InvenTreeModel> results = await InvenTreePurchaseOrder().list( final List<InvenTreeModel> results =
filters: filters await InvenTreePurchaseOrder().list(filters: filters);
);
List<InvenTreePurchaseOrder> orders = []; List<InvenTreePurchaseOrder> orders = [];
@ -103,18 +99,18 @@ class InvenTreeCompany extends InvenTreeModel {
} }
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeCompany.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeCompany.fromJson(json);
} }
/* /*
* Class representing an attachment file against a Company object * Class representing an attachment file against a Company object
*/ */
class InvenTreeCompanyAttachment extends InvenTreeAttachment { class InvenTreeCompanyAttachment extends InvenTreeAttachment {
InvenTreeCompanyAttachment() : super(); InvenTreeCompanyAttachment() : super();
InvenTreeCompanyAttachment.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeCompanyAttachment.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get REFERENCE_FIELD => "company"; String get REFERENCE_FIELD => "company";
@ -123,21 +119,23 @@ class InvenTreeCompanyAttachment extends InvenTreeAttachment {
String get REF_MODEL_TYPE => "company"; String get REF_MODEL_TYPE => "company";
@override @override
String get URL => InvenTreeAPI().supportsModernAttachments ? "attachment/" : "company/attachment/"; String get URL => InvenTreeAPI().supportsModernAttachments
? "attachment/"
: "company/attachment/";
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeCompanyAttachment.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeCompanyAttachment.fromJson(json);
} }
/* /*
* The InvenTreeSupplierPart class represents the SupplierPart model in the InvenTree database * The InvenTreeSupplierPart class represents the SupplierPart model in the InvenTree database
*/ */
class InvenTreeSupplierPart extends InvenTreeModel { class InvenTreeSupplierPart extends InvenTreeModel {
InvenTreeSupplierPart() : super(); InvenTreeSupplierPart() : super();
InvenTreeSupplierPart.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeSupplierPart.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get URL => "company/part/"; String get URL => "company/part/";
@ -180,14 +178,16 @@ class InvenTreeSupplierPart extends InvenTreeModel {
}; };
} }
int get manufacturerId => getInt("pk", subKey: "manufacturer_detail"); int get manufacturerId => getInt("pk", subKey: "manufacturer_detail");
String get manufacturerName => getString("name", subKey: "manufacturer_detail"); String get manufacturerName =>
getString("name", subKey: "manufacturer_detail");
String get MPN => getString("MPN", subKey: "manufacturer_part_detail"); String get MPN => getString("MPN", subKey: "manufacturer_part_detail");
String get manufacturerImage => (jsondata["manufacturer_detail"]?["image"] ?? jsondata["manufacturer_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb) as String; String get manufacturerImage => (jsondata["manufacturer_detail"]?["image"] ??
jsondata["manufacturer_detail"]?["thumbnail"] ??
InvenTreeAPI.staticThumb) as String;
int get manufacturerPartId => getInt("manufacturer_part"); int get manufacturerPartId => getInt("manufacturer_part");
@ -195,7 +195,9 @@ class InvenTreeSupplierPart extends InvenTreeModel {
String get supplierName => getString("name", subKey: "supplier_detail"); String get supplierName => getString("name", subKey: "supplier_detail");
String get supplierImage => (jsondata["supplier_detail"]?["image"] ?? jsondata["supplier_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb) as String; String get supplierImage => (jsondata["supplier_detail"]?["image"] ??
jsondata["supplier_detail"]?["thumbnail"] ??
InvenTreeAPI.staticThumb) as String;
String get SKU => getString("SKU"); String get SKU => getString("SKU");
@ -203,7 +205,9 @@ class InvenTreeSupplierPart extends InvenTreeModel {
int get partId => getInt("part"); int get partId => getInt("part");
String get partImage => (jsondata["part_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb) as String; String get partImage =>
(jsondata["part_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb)
as String;
String get partName => getString("name", subKey: "part_detail"); String get partName => getString("name", subKey: "part_detail");
@ -224,15 +228,15 @@ class InvenTreeSupplierPart extends InvenTreeModel {
} }
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeSupplierPart.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeSupplierPart.fromJson(json);
} }
class InvenTreeManufacturerPart extends InvenTreeModel { class InvenTreeManufacturerPart extends InvenTreeModel {
InvenTreeManufacturerPart() : super(); InvenTreeManufacturerPart() : super();
InvenTreeManufacturerPart.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeManufacturerPart.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String URL = "company/part/manufacturer/"; String URL = "company/part/manufacturer/";
@ -269,18 +273,25 @@ class InvenTreeManufacturerPart extends InvenTreeModel {
String get partIPN => getString("IPN", subKey: "part_detail"); String get partIPN => getString("IPN", subKey: "part_detail");
String get partImage => (jsondata["part_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb) as String; String get partImage =>
(jsondata["part_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb)
as String;
int get manufacturerId => getInt("manufacturer"); int get manufacturerId => getInt("manufacturer");
String get manufacturerName => getString("name", subKey: "manufacturer_detail"); String get manufacturerName =>
getString("name", subKey: "manufacturer_detail");
String get manufacturerDescription => getString("description", subKey: "manufacturer_detail"); String get manufacturerDescription =>
getString("description", subKey: "manufacturer_detail");
String get manufacturerImage => (jsondata["manufacturer_detail"]?["image"] ?? jsondata["manufacturer_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb) as String; String get manufacturerImage => (jsondata["manufacturer_detail"]?["image"] ??
jsondata["manufacturer_detail"]?["thumbnail"] ??
InvenTreeAPI.staticThumb) as String;
String get MPN => getString("MPN"); String get MPN => getString("MPN");
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeManufacturerPart.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeManufacturerPart.fromJson(json);
} }

190
lib/inventree/model.dart
View File

@ -17,10 +17,8 @@ import "package:inventree/inventree/sentry.dart";
import "package:inventree/widget/dialogs.dart"; import "package:inventree/widget/dialogs.dart";
import "package:inventree/widget/fields.dart"; import "package:inventree/widget/fields.dart";
// Paginated response object // Paginated response object
class InvenTreePageResponse { class InvenTreePageResponse {
InvenTreePageResponse() { InvenTreePageResponse() {
results = []; results = [];
} }
@ -42,7 +40,6 @@ class InvenTreePageResponse {
* for interacting with InvenTree data. * for interacting with InvenTree data.
*/ */
class InvenTreeModel { class InvenTreeModel {
InvenTreeModel(); InvenTreeModel();
// Construct an InvenTreeModel from a JSON data object // Construct an InvenTreeModel from a JSON data object
@ -87,7 +84,6 @@ class InvenTreeModel {
// If a subKey is specified, we need to dig deeper into the JSON data // If a subKey is specified, we need to dig deeper into the JSON data
if (subKey.isNotEmpty) { if (subKey.isNotEmpty) {
if (!data.containsKey(subKey)) { if (!data.containsKey(subKey)) {
debug("JSON data does not contain subKey '$subKey' for key '$key'"); debug("JSON data does not contain subKey '$subKey' for key '$key'");
return backup; return backup;
@ -98,7 +94,6 @@ class InvenTreeModel {
if (sub_data is Map<String, dynamic>) { if (sub_data is Map<String, dynamic>) {
data = (data[subKey] ?? {}) as Map<String, dynamic>; data = (data[subKey] ?? {}) as Map<String, dynamic>;
} }
} }
if (data.containsKey(key)) { if (data.containsKey(key)) {
@ -109,7 +104,8 @@ class InvenTreeModel {
} }
// Helper function to get sub-map from JSON data // Helper function to get sub-map from JSON data
Map<String, dynamic> getMap(String key, {Map<String, dynamic> backup = const {}, String subKey = ""}) { Map<String, dynamic> getMap(String key,
{Map<String, dynamic> backup = const {}, String subKey = ""}) {
dynamic value = getValue(key, backup: backup, subKey: subKey); dynamic value = getValue(key, backup: backup, subKey: subKey);
if (value == null) { if (value == null) {
@ -152,7 +148,7 @@ class InvenTreeModel {
return double.tryParse(value.toString()) ?? backup; return double.tryParse(value.toString()) ?? backup;
} }
double getDouble(String key, {double backup = 0.0, String subkey = "" }) { double getDouble(String key, {double backup = 0.0, String subkey = ""}) {
double? value = getDoubleOrNull(key, backup: backup, subKey: subkey); double? value = getDoubleOrNull(key, backup: backup, subKey: subkey);
return value ?? backup; return value ?? backup;
} }
@ -194,7 +190,6 @@ class InvenTreeModel {
// Return the InvenTree web server URL for this object // Return the InvenTree web server URL for this object
String get webUrl { String get webUrl {
if (api.isConnected()) { if (api.isConnected()) {
String web = InvenTreeAPI().baseUrl; String web = InvenTreeAPI().baseUrl;
@ -205,7 +200,6 @@ class InvenTreeModel {
web = web.replaceAll("//", "/"); web = web.replaceAll("//", "/");
return web; return web;
} else { } else {
return ""; return "";
} }
@ -216,7 +210,8 @@ class InvenTreeModel {
*/ */
List<String> get rolesRequired { List<String> get rolesRequired {
// Default implementation should not be called // Default implementation should not be called
debug("rolesRequired() not implemented for model ${URL} - returning empty list"); debug(
"rolesRequired() not implemented for model ${URL} - returning empty list");
return []; return [];
} }
@ -271,12 +266,14 @@ class InvenTreeModel {
// Fields for editing / creating this model // Fields for editing / creating this model
// Override per-model // Override per-model
Map<String, Map<String, dynamic>> formFields() { Map<String, Map<String, dynamic>> formFields() {
return {}; return {};
} }
Future<void> createForm(BuildContext context, String title, {String fileField = "", Map<String, dynamic> fields=const{}, Map<String, dynamic> data=const {}, Function(dynamic)? onSuccess}) async { Future<void> createForm(BuildContext context, String title,
{String fileField = "",
Map<String, dynamic> fields = const {},
Map<String, dynamic> data = const {},
Function(dynamic)? onSuccess}) async {
if (fields.isEmpty) { if (fields.isEmpty) {
fields = formFields(); fields = formFields();
} }
@ -291,28 +288,20 @@ class InvenTreeModel {
method: "POST", method: "POST",
fileField: fileField, fileField: fileField,
); );
} }
/* /*
* Launch a modal form to edit the fields available to this model instance. * Launch a modal form to edit the fields available to this model instance.
*/ */
Future<void> editForm(BuildContext context, String title, {Map<String, dynamic> fields=const {}, Function(dynamic)? onSuccess}) async { Future<void> editForm(BuildContext context, String title,
{Map<String, dynamic> fields = const {},
Function(dynamic)? onSuccess}) async {
if (fields.isEmpty) { if (fields.isEmpty) {
fields = formFields(); fields = formFields();
} }
launchApiForm( launchApiForm(context, title, url, fields,
context, modelData: jsondata, onSuccess: onSuccess, method: "PATCH");
title,
url,
fields,
modelData: jsondata,
onSuccess: onSuccess,
method: "PATCH"
);
} }
// JSON data which defines this object // JSON data which defines this object
@ -387,8 +376,7 @@ class InvenTreeModel {
return ""; return "";
} }
Future <void> goToInvenTreePage() async { Future<void> goToInvenTreePage() async {
var uri = Uri.tryParse(webUrl); var uri = Uri.tryParse(webUrl);
if (uri != null && await canLaunchUrl(uri)) { if (uri != null && await canLaunchUrl(uri)) {
await launchUrl(uri); await launchUrl(uri);
@ -397,8 +385,7 @@ class InvenTreeModel {
} }
} }
Future <void> openLink() async { Future<void> openLink() async {
if (link.isNotEmpty) { if (link.isNotEmpty) {
var uri = Uri.tryParse(link); var uri = Uri.tryParse(link);
if (uri != null && await canLaunchUrl(uri)) { if (uri != null && await canLaunchUrl(uri)) {
@ -410,14 +397,17 @@ class InvenTreeModel {
String get keywords => getString("keywords"); String get keywords => getString("keywords");
// Create a new object from JSON data (not a constructor!) // Create a new object from JSON data (not a constructor!)
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeModel.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeModel.fromJson(json);
// Return the API detail endpoint for this Model object // Return the API detail endpoint for this Model object
String get url => "${URL}/${pk}/".replaceAll("//", "/"); String get url => "${URL}/${pk}/".replaceAll("//", "/");
// Search this Model type in the database // Search this Model type in the database
Future<List<InvenTreeModel>> search(String searchTerm, {Map<String, String> filters = const {}, int offset = 0, int limit = 25}) async { Future<List<InvenTreeModel>> search(String searchTerm,
{Map<String, String> filters = const {},
int offset = 0,
int limit = 25}) async {
Map<String, String> searchFilters = {}; Map<String, String> searchFilters = {};
for (String key in filters.keys) { for (String key in filters.keys) {
@ -431,12 +421,11 @@ class InvenTreeModel {
final results = list(filters: searchFilters); final results = list(filters: searchFilters);
return results; return results;
} }
// Return the number of results that would meet a particular "query" // Return the number of results that would meet a particular "query"
Future<int> count({Map<String, String> filters = const {}, String searchQuery = ""} ) async { Future<int> count(
{Map<String, String> filters = const {}, String searchQuery = ""}) async {
var params = defaultListFilters(); var params = defaultListFilters();
filters.forEach((String key, String value) { filters.forEach((String key, String value) {
@ -458,7 +447,7 @@ class InvenTreeModel {
} else { } else {
return 0; return 0;
} }
} }
Map<String, String> defaultFilters() { Map<String, String> defaultFilters() {
return {}; return {};
@ -476,8 +465,8 @@ class InvenTreeModel {
/* /*
* Report error information to sentry, when a model operation fails. * Report error information to sentry, when a model operation fails.
*/ */
Future<void> reportModelError(String title, APIResponse response, {Map<String, String> context = const {}}) async { Future<void> reportModelError(String title, APIResponse response,
{Map<String, String> context = const {}}) async {
String dataString = response.data?.toString() ?? "null"; String dataString = response.data?.toString() ?? "null";
// If the response has "errorDetail" set, then the error has already been handled, and there is no need to continue // If the response has "errorDetail" set, then the error has already been handled, and there is no need to continue
@ -515,7 +504,6 @@ class InvenTreeModel {
/// Delete the instance on the remote server /// Delete the instance on the remote server
/// Returns true if the operation was successful, else false /// Returns true if the operation was successful, else false
Future<bool> delete() async { Future<bool> delete() async {
// Return if we do not have a valid pk // Return if we do not have a valid pk
if (pk < 0) { if (pk < 0) {
return false; return false;
@ -523,8 +511,9 @@ class InvenTreeModel {
var response = await api.delete(url); var response = await api.delete(url);
if (!response.isValid() || response.data == null || (response.data is! Map)) { if (!response.isValid() ||
response.data == null ||
(response.data is! Map)) {
reportModelError( reportModelError(
"InvenTreeModel.delete() returned invalid response", "InvenTreeModel.delete() returned invalid response",
response, response,
@ -547,26 +536,23 @@ class InvenTreeModel {
* Reload this object, by requesting data from the server * Reload this object, by requesting data from the server
*/ */
Future<bool> reload() async { Future<bool> reload() async {
// If we do not have a valid pk (for some reason), exit immediately // If we do not have a valid pk (for some reason), exit immediately
if (pk < 0) { if (pk < 0) {
return false; return false;
} }
var response = await api.get(url, params: defaultGetFilters(), expectedStatusCode: 200); var response = await api.get(url,
params: defaultGetFilters(), expectedStatusCode: 200);
// A valid response has been returned // A valid response has been returned
if (response.isValid() && response.statusCode == 200) { if (response.isValid() && response.statusCode == 200) {
// Returned data was not a valid JSON object // Returned data was not a valid JSON object
if (response.data == null || response.data is! Map) { if (response.data == null || response.data is! Map) {
reportModelError( reportModelError(
"InvenTreeModel.reload() returned invalid response", "InvenTreeModel.reload() returned invalid response", response,
response,
context: { context: {
"pk": pk.toString(), "pk": pk.toString(),
} });
);
showServerError( showServerError(
url, url,
@ -577,7 +563,6 @@ class InvenTreeModel {
return false; return false;
} }
} else { } else {
switch (response.statusCode) { switch (response.statusCode) {
case 404: // Object has been deleted case 404: // Object has been deleted
showSnackIcon( showSnackIcon(
@ -589,11 +574,7 @@ class InvenTreeModel {
String detail = L10().errorFetch; String detail = L10().errorFetch;
detail += "\n${L10().statusCode}: ${response.statusCode}"; detail += "\n${L10().statusCode}: ${response.statusCode}";
showServerError( showServerError(url, L10().serverError, detail);
url,
L10().serverError,
detail
);
break; break;
} }
@ -608,8 +589,9 @@ class InvenTreeModel {
} }
// POST data to update the model // POST data to update the model
Future<APIResponse> update({Map<String, String> values = const {}, int? expectedStatusCode = 200}) async { Future<APIResponse> update(
{Map<String, String> values = const {},
int? expectedStatusCode = 200}) async {
var url = path.join(URL, pk.toString()); var url = path.join(URL, pk.toString());
// Return if we do not have a valid pk // Return if we do not have a valid pk
@ -633,8 +615,8 @@ class InvenTreeModel {
} }
// Return the detail view for the associated pk // Return the detail view for the associated pk
Future<InvenTreeModel?> getModel(String pk, {Map<String, String> filters = const {}}) async { Future<InvenTreeModel?> getModel(String pk,
{Map<String, String> filters = const {}}) async {
var url = path.join(URL, pk.toString()); var url = path.join(URL, pk.toString());
if (!url.endsWith("/")) { if (!url.endsWith("/")) {
@ -651,17 +633,14 @@ class InvenTreeModel {
var response = await api.get(url, params: params); var response = await api.get(url, params: params);
if (!response.isValid() || response.data == null || response.data is! Map) { if (!response.isValid() || response.data == null || response.data is! Map) {
if (response.statusCode != -1) { if (response.statusCode != -1) {
// Report error // Report error
reportModelError( reportModelError(
"InvenTreeModel.getModel() returned invalid response", "InvenTreeModel.getModel() returned invalid response", response,
response,
context: { context: {
"filters": filters.toString(), "filters": filters.toString(),
"pk": pk, "pk": pk,
} });
);
} }
showServerError( showServerError(
@ -671,7 +650,6 @@ class InvenTreeModel {
); );
return null; return null;
} }
lastReload = DateTime.now(); lastReload = DateTime.now();
@ -679,8 +657,8 @@ class InvenTreeModel {
return createFromJson(response.asMap()); return createFromJson(response.asMap());
} }
Future<InvenTreeModel?> get(int pk, {Map<String, String> filters = const {}}) async { Future<InvenTreeModel?> get(int pk,
{Map<String, String> filters = const {}}) async {
if (pk < 0) { if (pk < 0) {
return null; return null;
} }
@ -689,7 +667,6 @@ class InvenTreeModel {
} }
Future<InvenTreeModel?> create(Map<String, dynamic> data) async { Future<InvenTreeModel?> create(Map<String, dynamic> data) async {
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
data.remove("pk"); data.remove("pk");
} }
@ -702,14 +679,11 @@ class InvenTreeModel {
// Invalid response returned from server // Invalid response returned from server
if (!response.isValid() || response.data == null || response.data is! Map) { if (!response.isValid() || response.data == null || response.data is! Map) {
reportModelError( reportModelError(
"InvenTreeModel.create() returned invalid response", "InvenTreeModel.create() returned invalid response", response,
response,
context: { context: {
"pk": pk.toString(), "pk": pk.toString(),
} });
);
showServerError( showServerError(
URL, URL,
@ -723,7 +697,8 @@ class InvenTreeModel {
return createFromJson(response.asMap()); return createFromJson(response.asMap());
} }
Future<InvenTreePageResponse?> listPaginated(int limit, int offset, {Map<String, String> filters = const {}}) async { Future<InvenTreePageResponse?> listPaginated(int limit, int offset,
{Map<String, String> filters = const {}}) async {
var params = defaultListFilters(); var params = defaultListFilters();
for (String key in filters.keys) { for (String key in filters.keys) {
@ -739,7 +714,6 @@ class InvenTreeModel {
* - In such a case, we want to concatenate them together * - In such a case, we want to concatenate them together
*/ */
if (params.containsKey("original_search")) { if (params.containsKey("original_search")) {
String search = params["search"] ?? ""; String search = params["search"] ?? "";
String original = params["original_search"] ?? ""; String original = params["original_search"] ?? "";
@ -761,7 +735,9 @@ class InvenTreeModel {
// First attempt is to look for paginated data, returned as a map // First attempt is to look for paginated data, returned as a map
if (dataMap.isNotEmpty && dataMap.containsKey("count") && dataMap.containsKey("results")) { if (dataMap.isNotEmpty &&
dataMap.containsKey("count") &&
dataMap.containsKey("results")) {
page.count = (dataMap["count"] ?? 0) as int; page.count = (dataMap["count"] ?? 0) as int;
page.results = []; page.results = [];
@ -794,7 +770,8 @@ class InvenTreeModel {
} }
// Return list of objects from the database, with optional filters // Return list of objects from the database, with optional filters
Future<List<InvenTreeModel>> list({Map<String, String> filters = const {}}) async { Future<List<InvenTreeModel>> list(
{Map<String, String> filters = const {}}) async {
var params = defaultListFilters(); var params = defaultListFilters();
for (String key in filters.keys) { for (String key in filters.keys) {
@ -823,7 +800,6 @@ class InvenTreeModel {
} }
for (var d in data) { for (var d in data) {
// Create a new object (of the current class type // Create a new object (of the current class type
InvenTreeModel obj = createFromJson(d as Map<String, dynamic>); InvenTreeModel obj = createFromJson(d as Map<String, dynamic>);
@ -849,7 +825,6 @@ class InvenTreeModel {
// Each filter must be matched // Each filter must be matched
// Used for (e.g.) filtering returned results // Used for (e.g.) filtering returned results
bool filter(String filterString) { bool filter(String filterString) {
List<String> filters = filterString.trim().toLowerCase().split(" "); List<String> filters = filterString.trim().toLowerCase().split(" ");
for (var f in filters) { for (var f in filters) {
@ -862,22 +837,20 @@ class InvenTreeModel {
} }
} }
/* /*
* Class representing a single plugin instance * Class representing a single plugin instance
*/ */
class InvenTreePlugin extends InvenTreeModel { class InvenTreePlugin extends InvenTreeModel {
InvenTreePlugin() : super(); InvenTreePlugin() : super();
InvenTreePlugin.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePlugin.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePlugin.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePlugin.fromJson(json);
@override @override
String get URL { String get URL {
/* Note: The plugin API endpoint changed at API version 90, /* Note: The plugin API endpoint changed at API version 90,
* < 90 = 'plugin' * < 90 = 'plugin'
* >= 90 = 'plugins' * >= 90 = 'plugins'
@ -895,19 +868,20 @@ class InvenTreePlugin extends InvenTreeModel {
bool get active => getBool("active"); bool get active => getBool("active");
// Return the metadata struct for this plugin // Return the metadata struct for this plugin
Map<String, dynamic> get _meta => (jsondata["meta"] ?? {}) as Map<String, dynamic>; Map<String, dynamic> get _meta =>
(jsondata["meta"] ?? {}) as Map<String, dynamic>;
String get humanName => (_meta["human_name"] ?? "") as String; String get humanName => (_meta["human_name"] ?? "") as String;
// Return the mixins struct for this plugin // Return the mixins struct for this plugin
Map<String, dynamic> get _mixins => (jsondata["mixins"] ?? {}) as Map<String, dynamic>; Map<String, dynamic> get _mixins =>
(jsondata["mixins"] ?? {}) as Map<String, dynamic>;
bool supportsMixin(String mixin) { bool supportsMixin(String mixin) {
return _mixins.containsKey(mixin); return _mixins.containsKey(mixin);
} }
} }
/* /*
* Class representing a 'setting' object on the InvenTree server. * Class representing a 'setting' object on the InvenTree server.
* There are two sorts of settings available from the server, via the API: * There are two sorts of settings available from the server, via the API:
@ -915,10 +889,10 @@ class InvenTreePlugin extends InvenTreeModel {
* - UserSetting (applicable only to the current user) * - UserSetting (applicable only to the current user)
*/ */
class InvenTreeGlobalSetting extends InvenTreeModel { class InvenTreeGlobalSetting extends InvenTreeModel {
InvenTreeGlobalSetting() : super(); InvenTreeGlobalSetting() : super();
InvenTreeGlobalSetting.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeGlobalSetting.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeGlobalSetting createFromJson(Map<String, dynamic> json) { InvenTreeGlobalSetting createFromJson(Map<String, dynamic> json) {
@ -933,14 +907,13 @@ class InvenTreeGlobalSetting extends InvenTreeModel {
String get value => getString("value"); String get value => getString("value");
String get type => getString("type"); String get type => getString("type");
} }
class InvenTreeUserSetting extends InvenTreeGlobalSetting { class InvenTreeUserSetting extends InvenTreeGlobalSetting {
InvenTreeUserSetting() : super(); InvenTreeUserSetting() : super();
InvenTreeUserSetting.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeUserSetting.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeGlobalSetting createFromJson(Map<String, dynamic> json) { InvenTreeGlobalSetting createFromJson(Map<String, dynamic> json) {
@ -951,22 +924,19 @@ class InvenTreeUserSetting extends InvenTreeGlobalSetting {
String get URL => "settings/user/"; String get URL => "settings/user/";
} }
class InvenTreeAttachment extends InvenTreeModel { class InvenTreeAttachment extends InvenTreeModel {
// Class representing an "attachment" file // Class representing an "attachment" file
InvenTreeAttachment() : super(); InvenTreeAttachment() : super();
InvenTreeAttachment.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeAttachment.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get URL => "attachment/"; String get URL => "attachment/";
@override @override
Map<String, Map<String, dynamic>> formFields() { Map<String, Map<String, dynamic>> formFields() {
Map<String, Map<String, dynamic>> fields = { Map<String, Map<String, dynamic>> fields = {"link": {}, "comment": {}};
"link": {},
"comment": {}
};
if (!hasLink) { if (!hasLink) {
fields.remove("link"); fields.remove("link");
@ -1035,7 +1005,6 @@ class InvenTreeAttachment extends InvenTreeModel {
// Return a count of how many attachments exist against the specified model ID // Return a count of how many attachments exist against the specified model ID
Future<int> countAttachments(int modelId) { Future<int> countAttachments(int modelId) {
Map<String, String> filters = {}; Map<String, String> filters = {};
if (InvenTreeAPI().supportsModernAttachments) { if (InvenTreeAPI().supportsModernAttachments) {
@ -1048,8 +1017,8 @@ class InvenTreeAttachment extends InvenTreeModel {
return count(filters: filters); return count(filters: filters);
} }
Future<bool> uploadAttachment(File attachment, int modelId, {String comment = "", Map<String, String> fields = const {}}) async { Future<bool> uploadAttachment(File attachment, int modelId,
{String comment = "", Map<String, String> fields = const {}}) async {
// Ensure that the correct reference field is set // Ensure that the correct reference field is set
Map<String, String> data = Map<String, String>.from(fields); Map<String, String> data = Map<String, String>.from(fields);
@ -1060,15 +1029,13 @@ class InvenTreeAttachment extends InvenTreeModel {
} }
if (InvenTreeAPI().supportsModernAttachments) { if (InvenTreeAPI().supportsModernAttachments) {
url = "attachment/"; url = "attachment/";
data["model_id"] = modelId.toString(); data["model_id"] = modelId.toString();
data["model_type"] = REF_MODEL_TYPE; data["model_type"] = REF_MODEL_TYPE;
} else { } else {
if (REFERENCE_FIELD.isEmpty) { if (REFERENCE_FIELD.isEmpty) {
sentryReportMessage("uploadAttachment called with empty 'REFERENCE_FIELD'"); sentryReportMessage(
"uploadAttachment called with empty 'REFERENCE_FIELD'");
return false; return false;
} }
@ -1076,24 +1043,17 @@ class InvenTreeAttachment extends InvenTreeModel {
} }
final APIResponse response = await InvenTreeAPI().uploadFile( final APIResponse response = await InvenTreeAPI().uploadFile(
url, url, attachment,
attachment, method: "POST", name: "attachment", fields: data);
method: "POST",
name: "attachment",
fields: data
);
return response.successful(); return response.successful();
} }
Future<bool> uploadImage(int modelId, {String prefix = "InvenTree"}) async { Future<bool> uploadImage(int modelId, {String prefix = "InvenTree"}) async {
bool result = false; bool result = false;
await FilePickerDialog.pickImageFromCamera().then((File? file) { await FilePickerDialog.pickImageFromCamera().then((File? file) {
if (file != null) { if (file != null) {
String dir = path.dirname(file.path); String dir = path.dirname(file.path);
String ext = path.extension(file.path); String ext = path.extension(file.path);
String now = DateTime.now().toIso8601String().replaceAll(":", "-"); String now = DateTime.now().toIso8601String().replaceAll(":", "-");
@ -1120,14 +1080,10 @@ class InvenTreeAttachment extends InvenTreeModel {
return result; return result;
} }
/* /*
* Download this attachment file * Download this attachment file
*/ */
Future<void> downloadAttachment() async { Future<void> downloadAttachment() async {
await InvenTreeAPI().downloadFile(attachment); await InvenTreeAPI().downloadFile(attachment);
} }
} }

7
lib/inventree/notification.dart
View File

@ -5,10 +5,10 @@ import "package:inventree/inventree/model.dart";
*/ */
class InvenTreeNotification extends InvenTreeModel { class InvenTreeNotification extends InvenTreeModel {
InvenTreeNotification() : super(); InvenTreeNotification() : super();
InvenTreeNotification.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeNotification.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeNotification createFromJson(Map<String, dynamic> json) { InvenTreeNotification createFromJson(Map<String, dynamic> json) {
@ -20,7 +20,6 @@ class InvenTreeNotification extends InvenTreeModel {
@override @override
Map<String, String> defaultListFilters() { Map<String, String> defaultListFilters() {
// By default, only return 'unread' notifications // By default, only return 'unread' notifications
return { return {
"read": "false", "read": "false",
@ -41,7 +40,6 @@ class InvenTreeNotification extends InvenTreeModel {
* Dismiss this notification (mark as read) * Dismiss this notification (mark as read)
*/ */
Future<void> dismiss() async { Future<void> dismiss() async {
if (api.apiVersion >= 82) { if (api.apiVersion >= 82) {
// "Modern" API endpoint operates a little differently // "Modern" API endpoint operates a little differently
await update(values: {"read": "true"}); await update(values: {"read": "true"});
@ -49,5 +47,4 @@ class InvenTreeNotification extends InvenTreeModel {
await api.post("${url}read/"); await api.post("${url}read/");
} }
} }
} }

20
lib/inventree/orders.dart
View File

@ -2,16 +2,13 @@
* Base model for various "orders" which share common properties * Base model for various "orders" which share common properties
*/ */
import "package:inventree/inventree/model.dart"; import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/part.dart"; import "package:inventree/inventree/part.dart";
/* /*
* Generic class representing an "order" * Generic class representing an "order"
*/ */
class InvenTreeOrder extends InvenTreeModel { class InvenTreeOrder extends InvenTreeModel {
InvenTreeOrder() : super(); InvenTreeOrder() : super();
InvenTreeOrder.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeOrder.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@ -34,7 +31,8 @@ class InvenTreeOrder extends InvenTreeModel {
int get shipmentCount => getInt("shipments_count", backup: 0); int get shipmentCount => getInt("shipments_count", backup: 0);
int get completedShipmentCount => getInt("completed_shipments_count", backup: 0); int get completedShipmentCount =>
getInt("completed_shipments_count", backup: 0);
bool get complete => completedLineItemCount >= lineItemCount; bool get complete => completedLineItemCount >= lineItemCount;
@ -46,14 +44,16 @@ class InvenTreeOrder extends InvenTreeModel {
String get responsibleName => getString("name", subKey: "responsible_detail"); String get responsibleName => getString("name", subKey: "responsible_detail");
String get responsibleLabel => getString("label", subKey: "responsible_detail"); String get responsibleLabel =>
getString("label", subKey: "responsible_detail");
// Project code information // Project code information
int get projectCodeId => getInt("project_code"); int get projectCodeId => getInt("project_code");
String get projectCode => getString("code", subKey: "project_code_detail"); String get projectCode => getString("code", subKey: "project_code_detail");
String get projectCodeDescription => getString("description", subKey: "project_code_detail"); String get projectCodeDescription =>
getString("description", subKey: "project_code_detail");
bool get hasProjectCode => projectCode.isNotEmpty; bool get hasProjectCode => projectCode.isNotEmpty;
@ -84,12 +84,10 @@ class InvenTreeOrder extends InvenTreeModel {
} }
} }
/* /*
* Generic class representing an "order line" * Generic class representing an "order line"
*/ */
class InvenTreeOrderLine extends InvenTreeModel { class InvenTreeOrderLine extends InvenTreeModel {
InvenTreeOrderLine() : super(); InvenTreeOrderLine() : super();
InvenTreeOrderLine.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeOrderLine.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@ -121,15 +119,14 @@ class InvenTreeOrderLine extends InvenTreeModel {
String get targetDate => getDateString("target_date"); String get targetDate => getDateString("target_date");
} }
/* /*
* Generic class representing an "ExtraLineItem" * Generic class representing an "ExtraLineItem"
*/ */
class InvenTreeExtraLineItem extends InvenTreeModel { class InvenTreeExtraLineItem extends InvenTreeModel {
InvenTreeExtraLineItem() : super(); InvenTreeExtraLineItem() : super();
InvenTreeExtraLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeExtraLineItem.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
int get orderId => getInt("order"); int get orderId => getInt("order");
@ -157,5 +154,4 @@ class InvenTreeExtraLineItem extends InvenTreeModel {
"notes": {}, "notes": {},
}; };
} }
} }

103
lib/inventree/part.dart
View File

@ -14,15 +14,14 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/widget/part/category_display.dart"; import "package:inventree/widget/part/category_display.dart";
import "package:inventree/widget/part/part_detail.dart"; import "package:inventree/widget/part/part_detail.dart";
/* /*
* Class representing the PartCategory database model * Class representing the PartCategory database model
*/ */
class InvenTreePartCategory extends InvenTreeModel { class InvenTreePartCategory extends InvenTreeModel {
InvenTreePartCategory() : super(); InvenTreePartCategory() : super();
InvenTreePartCategory.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePartCategory.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get URL => "part/category/"; String get URL => "part/category/";
@ -36,17 +35,12 @@ class InvenTreePartCategory extends InvenTreeModel {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
// Default implementation does not do anything... // Default implementation does not do anything...
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(this)));
MaterialPageRoute(
builder: (context) => CategoryDisplayWidget(this)
)
);
} }
@override @override
Map<String, Map<String, dynamic>> formFields() { Map<String, Map<String, dynamic>> formFields() {
Map<String, Map<String, dynamic>> fields = { Map<String, Map<String, dynamic>> fields = {
"name": {}, "name": {},
"description": {}, "description": {},
@ -60,7 +54,6 @@ class InvenTreePartCategory extends InvenTreeModel {
String get pathstring => getString("pathstring"); String get pathstring => getString("pathstring");
String get parentPathString { String get parentPathString {
List<String> psplit = pathstring.split("/"); List<String> psplit = pathstring.split("/");
if (psplit.isNotEmpty) { if (psplit.isNotEmpty) {
@ -78,21 +71,22 @@ class InvenTreePartCategory extends InvenTreeModel {
// Return the number of parts in this category // Return the number of parts in this category
// Note that the API changed from 'parts' to 'part_count' (v69) // Note that the API changed from 'parts' to 'part_count' (v69)
int get partcount => (jsondata["part_count"] ?? jsondata["parts"] ?? 0) as int; int get partcount =>
(jsondata["part_count"] ?? jsondata["parts"] ?? 0) as int;
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePartCategory.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePartCategory.fromJson(json);
} }
/* /*
* Class representing the PartTestTemplate database model * Class representing the PartTestTemplate database model
*/ */
class InvenTreePartTestTemplate extends InvenTreeModel { class InvenTreePartTestTemplate extends InvenTreeModel {
InvenTreePartTestTemplate() : super(); InvenTreePartTestTemplate() : super();
InvenTreePartTestTemplate.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePartTestTemplate.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get URL => "part/test-template/"; String get URL => "part/test-template/";
@ -110,10 +104,10 @@ class InvenTreePartTestTemplate extends InvenTreeModel {
bool get requiresAttachment => getBool("requires_attachment"); bool get requiresAttachment => getBool("requires_attachment");
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePartTestTemplate.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePartTestTemplate.fromJson(json);
bool passFailStatus() { bool passFailStatus() {
var result = latestResult(); var result = latestResult();
if (result == null) { if (result == null) {
@ -134,17 +128,16 @@ class InvenTreePartTestTemplate extends InvenTreeModel {
return results.last; return results.last;
} }
} }
/* /*
Class representing the PartParameter database model Class representing the PartParameter database model
*/ */
class InvenTreePartParameter extends InvenTreeModel { class InvenTreePartParameter extends InvenTreeModel {
InvenTreePartParameter() : super(); InvenTreePartParameter() : super();
InvenTreePartParameter.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePartParameter.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get URL => "part/parameter/"; String get URL => "part/parameter/";
@ -153,11 +146,11 @@ class InvenTreePartParameter extends InvenTreeModel {
List<String> get rolesRequired => ["part"]; List<String> get rolesRequired => ["part"];
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePartParameter.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePartParameter.fromJson(json);
@override @override
Map<String, Map<String, dynamic>> formFields() { Map<String, Map<String, dynamic>> formFields() {
Map<String, Map<String, dynamic>> fields = { Map<String, Map<String, dynamic>> fields = {
"header": { "header": {
"type": "string", "type": "string",
@ -197,14 +190,14 @@ class InvenTreePartParameter extends InvenTreeModel {
String get units => getString("units", subKey: "template_detail"); String get units => getString("units", subKey: "template_detail");
bool get is_checkbox => getBool("checkbox", subKey: "template_detail", backup: false); bool get is_checkbox =>
getBool("checkbox", subKey: "template_detail", backup: false);
} }
/* /*
* Class representing the Part database model * Class representing the Part database model
*/ */
class InvenTreePart extends InvenTreeModel { class InvenTreePart extends InvenTreeModel {
InvenTreePart() : super(); InvenTreePart() : super();
InvenTreePart.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePart.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@ -221,12 +214,8 @@ class InvenTreePart extends InvenTreeModel {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
// Default implementation does not do anything... // Default implementation does not do anything...
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => PartDetailWidget(this)));
MaterialPageRoute(
builder: (context) => PartDetailWidget(this)
)
);
} }
@override @override
@ -270,8 +259,8 @@ class InvenTreePart extends InvenTreeModel {
int get stockItemCount => stockItems.length; int get stockItemCount => stockItems.length;
// Request stock items for this part // Request stock items for this part
Future<void> getStockItems(BuildContext context, {bool showDialog=false}) async { Future<void> getStockItems(BuildContext context,
{bool showDialog = false}) async {
await InvenTreeStockItem().list( await InvenTreeStockItem().list(
filters: { filters: {
"part": "${pk}", "part": "${pk}",
@ -290,7 +279,6 @@ class InvenTreePart extends InvenTreeModel {
// Request pricing data for this part // Request pricing data for this part
Future<InvenTreePartPricing?> getPricing() async { Future<InvenTreePartPricing?> getPricing() async {
print("REQUEST PRICING FOR: ${pk}"); print("REQUEST PRICING FOR: ${pk}");
try { try {
@ -316,11 +304,9 @@ class InvenTreePart extends InvenTreeModel {
Future<List<InvenTreeSupplierPart>> getSupplierParts() async { Future<List<InvenTreeSupplierPart>> getSupplierParts() async {
List<InvenTreeSupplierPart> _supplierParts = []; List<InvenTreeSupplierPart> _supplierParts = [];
final parts = await InvenTreeSupplierPart().list( final parts = await InvenTreeSupplierPart().list(filters: {
filters: {
"part": "${pk}", "part": "${pk}",
} });
);
for (var result in parts) { for (var result in parts) {
if (result is InvenTreeSupplierPart) { if (result is InvenTreeSupplierPart) {
@ -338,13 +324,11 @@ class InvenTreePart extends InvenTreeModel {
// Request test templates from the serve // Request test templates from the serve
Future<void> getTestTemplates() async { Future<void> getTestTemplates() async {
InvenTreePartTestTemplate().list( InvenTreePartTestTemplate().list(
filters: { filters: {
"part": "${pk}", "part": "${pk}",
}, },
).then((var templates) { ).then((var templates) {
testingTemplates.clear(); testingTemplates.clear();
for (var t in templates) { for (var t in templates) {
@ -373,12 +357,12 @@ class InvenTreePart extends InvenTreeModel {
// Get the 'available stock' for this Part // Get the 'available stock' for this Part
double get unallocatedStock { double get unallocatedStock {
double unallocated = 0; double unallocated = 0;
// Note that the 'available_stock' was not added until API v35 // Note that the 'available_stock' was not added until API v35
if (jsondata.containsKey("unallocated_stock")) { if (jsondata.containsKey("unallocated_stock")) {
unallocated = double.tryParse(jsondata["unallocated_stock"].toString()) ?? 0; unallocated =
double.tryParse(jsondata["unallocated_stock"].toString()) ?? 0;
} else { } else {
unallocated = inStock; unallocated = inStock;
} }
@ -411,7 +395,8 @@ class InvenTreePart extends InvenTreeModel {
double get building => getDouble("building"); double get building => getDouble("building");
// Get the number of BOMs this Part is used in (if it is a component) // Get the number of BOMs this Part is used in (if it is a component)
int get usedInCount => jsondata.containsKey("used_in") ? getInt("used_in", backup: 0) : 0; int get usedInCount =>
jsondata.containsKey("used_in") ? getInt("used_in", backup: 0) : 0;
bool get isAssembly => getBool("assembly"); bool get isAssembly => getBool("assembly");
@ -457,6 +442,7 @@ class InvenTreePart extends InvenTreeModel {
return (jsondata["category_detail"]?["description"] ?? "") as String; return (jsondata["category_detail"]?["description"] ?? "") as String;
} }
// Get the image URL for the Part instance // Get the image URL for the Part instance
String get _image => getString("image"); String get _image => getString("image");
@ -465,7 +451,6 @@ class InvenTreePart extends InvenTreeModel {
// Return the fully-qualified name for the Part instance // Return the fully-qualified name for the Part instance
String get fullname { String get fullname {
String fn = getString("full_name"); String fn = getString("full_name");
if (fn.isNotEmpty) return fn; if (fn.isNotEmpty) return fn;
@ -513,21 +498,22 @@ class InvenTreePart extends InvenTreeModel {
bool get starred => getBool("starred"); bool get starred => getBool("starred");
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePart.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePart.fromJson(json);
} }
class InvenTreePartPricing extends InvenTreeModel { class InvenTreePartPricing extends InvenTreeModel {
InvenTreePartPricing() : super(); InvenTreePartPricing() : super();
InvenTreePartPricing.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePartPricing.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
List<String> get rolesRequired => ["part"]; List<String> get rolesRequired => ["part"];
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePartPricing.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePartPricing.fromJson(json);
// Price data accessors // Price data accessors
String get currency => getString("currency", backup: "USD"); String get currency => getString("currency", backup: "USD");
@ -538,8 +524,10 @@ class InvenTreePartPricing extends InvenTreeModel {
double? get overrideMin => getDoubleOrNull("override_min"); double? get overrideMin => getDoubleOrNull("override_min");
double? get overrideMax => getDoubleOrNull("override_max"); double? get overrideMax => getDoubleOrNull("override_max");
String get overrideMinCurrency => getString("override_min_currency", backup: currency); String get overrideMinCurrency =>
String get overrideMaxCurrency => getString("override_max_currency", backup: currency); getString("override_min_currency", backup: currency);
String get overrideMaxCurrency =>
getString("override_max_currency", backup: currency);
double? get bomCostMin => getDoubleOrNull("bom_cost_min"); double? get bomCostMin => getDoubleOrNull("bom_cost_min");
double? get bomCostMax => getDoubleOrNull("bom_cost_max"); double? get bomCostMax => getDoubleOrNull("bom_cost_max");
@ -563,15 +551,14 @@ class InvenTreePartPricing extends InvenTreeModel {
double? get saleHistoryMax => getDoubleOrNull("sale_history_max"); double? get saleHistoryMax => getDoubleOrNull("sale_history_max");
} }
/* /*
* Class representing an attachment file against a Part object * Class representing an attachment file against a Part object
*/ */
class InvenTreePartAttachment extends InvenTreeAttachment { class InvenTreePartAttachment extends InvenTreeAttachment {
InvenTreePartAttachment() : super(); InvenTreePartAttachment() : super();
InvenTreePartAttachment.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePartAttachment.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get REFERENCE_FIELD => "part"; String get REFERENCE_FIELD => "part";
@ -580,9 +567,11 @@ class InvenTreePartAttachment extends InvenTreeAttachment {
String get REF_MODEL_TYPE => "part"; String get REF_MODEL_TYPE => "part";
@override @override
String get URL => InvenTreeAPI().supportsModernAttachments ? "attachment/" : "part/attachment/"; String get URL => InvenTreeAPI().supportsModernAttachments
? "attachment/"
: "part/attachment/";
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePartAttachment.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePartAttachment.fromJson(json);
} }

8
lib/inventree/project_code.dart
View File

@ -1,17 +1,17 @@
import "package:inventree/inventree/model.dart"; import "package:inventree/inventree/model.dart";
/* /*
* Class representing the ProjectCode database model * Class representing the ProjectCode database model
*/ */
class InvenTreeProjectCode extends InvenTreeModel { class InvenTreeProjectCode extends InvenTreeModel {
InvenTreeProjectCode() : super(); InvenTreeProjectCode() : super();
InvenTreeProjectCode.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeProjectCode.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeProjectCode.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeProjectCode.fromJson(json);
@override @override
String get URL => "project-code/"; String get URL => "project-code/";

89
lib/inventree/purchase_order.dart
View File

@ -12,18 +12,18 @@ import "package:inventree/widget/progress.dart";
import "package:inventree/api_form.dart"; import "package:inventree/api_form.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
/* /*
* Class representing an individual PurchaseOrder instance * Class representing an individual PurchaseOrder instance
*/ */
class InvenTreePurchaseOrder extends InvenTreeOrder { class InvenTreePurchaseOrder extends InvenTreeOrder {
InvenTreePurchaseOrder() : super(); InvenTreePurchaseOrder() : super();
InvenTreePurchaseOrder.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePurchaseOrder.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePurchaseOrder.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePurchaseOrder.fromJson(json);
@override @override
String get URL => "order/po/"; String get URL => "order/po/";
@ -33,9 +33,7 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
return Navigator.push( return Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PurchaseOrderDetailWidget(this) builder: (context) => PurchaseOrderDetailWidget(this)));
)
);
} }
static const String MODEL_TYPE = "purchaseorder"; static const String MODEL_TYPE = "purchaseorder";
@ -82,7 +80,6 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
} }
return fields; return fields;
} }
@override @override
@ -95,7 +92,6 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
int get supplierId => getInt("supplier"); int get supplierId => getInt("supplier");
InvenTreeCompany? get supplier { InvenTreeCompany? get supplier {
dynamic supplier_detail = jsondata["supplier_detail"]; dynamic supplier_detail = jsondata["supplier_detail"];
if (supplier_detail == null) { if (supplier_detail == null) {
@ -109,21 +105,21 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
int get destinationId => getInt("destination"); int get destinationId => getInt("destination");
bool get isOpen => api.PurchaseOrderStatus.isNameIn(status, ["PENDING", "PLACED", "ON_HOLD"]); bool get isOpen => api.PurchaseOrderStatus.isNameIn(
status, ["PENDING", "PLACED", "ON_HOLD"]);
bool get isPending => api.PurchaseOrderStatus.isNameIn(status, ["PENDING", "ON_HOLD"]); bool get isPending =>
api.PurchaseOrderStatus.isNameIn(status, ["PENDING", "ON_HOLD"]);
bool get isPlaced => api.PurchaseOrderStatus.isNameIn(status, ["PLACED"]); bool get isPlaced => api.PurchaseOrderStatus.isNameIn(status, ["PLACED"]);
bool get isFailed => api.PurchaseOrderStatus.isNameIn(status, ["CANCELLED", "LOST", "RETURNED"]); bool get isFailed => api.PurchaseOrderStatus.isNameIn(
status, ["CANCELLED", "LOST", "RETURNED"]);
Future<List<InvenTreePOLineItem>> getLineItems() async { Future<List<InvenTreePOLineItem>> getLineItems() async {
final results = await InvenTreePOLineItem().list(filters: {
final results = await InvenTreePOLineItem().list(
filters: {
"order": "${pk}", "order": "${pk}",
} });
);
List<InvenTreePOLineItem> items = []; List<InvenTreePOLineItem> items = [];
@ -161,13 +157,14 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
} }
class InvenTreePOLineItem extends InvenTreeOrderLine { class InvenTreePOLineItem extends InvenTreeOrderLine {
InvenTreePOLineItem() : super(); InvenTreePOLineItem() : super();
InvenTreePOLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePOLineItem.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePOLineItem.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePOLineItem.fromJson(json);
@override @override
String get URL => "order/po-line/"; String get URL => "order/po-line/";
@ -216,14 +213,14 @@ class InvenTreePOLineItem extends InvenTreeOrderLine {
return received / quantity; return received / quantity;
} }
String get progressString => simpleNumberString(received) + " / " + simpleNumberString(quantity); String get progressString =>
simpleNumberString(received) + " / " + simpleNumberString(quantity);
double get outstanding => quantity - received; double get outstanding => quantity - received;
int get supplierPartId => getInt("part"); int get supplierPartId => getInt("part");
InvenTreeSupplierPart? get supplierPart { InvenTreeSupplierPart? get supplierPart {
dynamic detail = jsondata["supplier_part_detail"]; dynamic detail = jsondata["supplier_part_detail"];
if (detail == null) { if (detail == null) {
@ -256,7 +253,11 @@ class InvenTreePOLineItem extends InvenTreeOrderLine {
Map<String, dynamic> get destinationDetail => getMap("destination_detail"); Map<String, dynamic> get destinationDetail => getMap("destination_detail");
// Receive this line item into stock // Receive this line item into stock
Future<void> receive(BuildContext context, {int? destination, double? quantity, String? barcode, Function? onSuccess}) async { Future<void> receive(BuildContext context,
{int? destination,
double? quantity,
String? barcode,
Function? onSuccess}) async {
// Infer the destination location from the line item if not provided // Infer the destination location from the line item if not provided
if (destinationId > 0) { if (destinationId > 0) {
destination = destinationId; destination = destinationId;
@ -305,32 +306,26 @@ class InvenTreePOLineItem extends InvenTreeOrderLine {
InvenTreePurchaseOrder? order = purchaseOrder; InvenTreePurchaseOrder? order = purchaseOrder;
if (order != null) { if (order != null) {
await launchApiForm( await launchApiForm(context, L10().receiveItem, order.receive_url, fields,
context,
L10().receiveItem,
order.receive_url,
fields,
method: "POST", method: "POST",
icon: TablerIcons.transition_right, icon: TablerIcons.transition_right, onSuccess: (data) {
onSuccess: (data) {
if (onSuccess != null) { if (onSuccess != null) {
onSuccess(); onSuccess();
} }
} });
);
} }
} }
} }
class InvenTreePOExtraLineItem extends InvenTreeExtraLineItem { class InvenTreePOExtraLineItem extends InvenTreeExtraLineItem {
InvenTreePOExtraLineItem() : super(); InvenTreePOExtraLineItem() : super();
InvenTreePOExtraLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePOExtraLineItem.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePOExtraLineItem.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePOExtraLineItem.fromJson(json);
@override @override
String get URL => "order/po-extra-line/"; String get URL => "order/po-extra-line/";
@ -340,25 +335,19 @@ class InvenTreePOExtraLineItem extends InvenTreeExtraLineItem {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => ExtraLineDetailWidget(this)));
MaterialPageRoute(
builder: (context) => ExtraLineDetailWidget(this)
)
);
} }
} }
/* /*
* Class representing an attachment file against a PurchaseOrder object * Class representing an attachment file against a PurchaseOrder object
*/ */
class InvenTreePurchaseOrderAttachment extends InvenTreeAttachment { class InvenTreePurchaseOrderAttachment extends InvenTreeAttachment {
InvenTreePurchaseOrderAttachment() : super(); InvenTreePurchaseOrderAttachment() : super();
InvenTreePurchaseOrderAttachment.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreePurchaseOrderAttachment.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get REFERENCE_FIELD => "order"; String get REFERENCE_FIELD => "order";
@ -367,9 +356,11 @@ class InvenTreePurchaseOrderAttachment extends InvenTreeAttachment {
String get REF_MODEL_TYPE => "purchaseorder"; String get REF_MODEL_TYPE => "purchaseorder";
@override @override
String get URL => InvenTreeAPI().supportsModernAttachments ? "attachment/" : "order/po/attachment/"; String get URL => InvenTreeAPI().supportsModernAttachments
? "attachment/"
: "order/po/attachment/";
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePurchaseOrderAttachment.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreePurchaseOrderAttachment.fromJson(json);
} }

87
lib/inventree/sales_order.dart
View File

@ -1,5 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:inventree/api.dart"; import "package:inventree/api.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
@ -11,18 +9,18 @@ import "package:inventree/widget/progress.dart";
import "package:inventree/widget/order/extra_line_detail.dart"; import "package:inventree/widget/order/extra_line_detail.dart";
import "package:inventree/widget/order/sales_order_detail.dart"; import "package:inventree/widget/order/sales_order_detail.dart";
/* /*
* Class representing an individual SalesOrder * Class representing an individual SalesOrder
*/ */
class InvenTreeSalesOrder extends InvenTreeOrder { class InvenTreeSalesOrder extends InvenTreeOrder {
InvenTreeSalesOrder() : super(); InvenTreeSalesOrder() : super();
InvenTreeSalesOrder.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeSalesOrder.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeSalesOrder.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeSalesOrder.fromJson(json);
@override @override
String get URL => "order/so/"; String get URL => "order/so/";
@ -36,12 +34,8 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => SalesOrderDetailWidget(this)));
MaterialPageRoute(
builder: (context) => SalesOrderDetailWidget(this)
)
);
} }
@override @override
@ -124,28 +118,30 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
String get customerReference => getString("customer_reference"); String get customerReference => getString("customer_reference");
bool get isOpen => api.SalesOrderStatus.isNameIn(status, ["PENDING", "IN_PROGRESS", "ON_HOLD"]); bool get isOpen => api.SalesOrderStatus.isNameIn(
status, ["PENDING", "IN_PROGRESS", "ON_HOLD"]);
bool get isPending => api.SalesOrderStatus.isNameIn(status, ["PENDING", "ON_HOLD"]); bool get isPending =>
api.SalesOrderStatus.isNameIn(status, ["PENDING", "ON_HOLD"]);
bool get isInProgress => api.SalesOrderStatus.isNameIn(status, ["IN_PROGRESS"]); bool get isInProgress =>
api.SalesOrderStatus.isNameIn(status, ["IN_PROGRESS"]);
bool get isComplete => api.SalesOrderStatus.isNameIn(status, ["SHIPPED"]); bool get isComplete => api.SalesOrderStatus.isNameIn(status, ["SHIPPED"]);
} }
/* /*
* Class representing an individual line item in a SalesOrder * Class representing an individual line item in a SalesOrder
*/ */
class InvenTreeSOLineItem extends InvenTreeOrderLine { class InvenTreeSOLineItem extends InvenTreeOrderLine {
InvenTreeSOLineItem() : super(); InvenTreeSOLineItem() : super();
InvenTreeSOLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeSOLineItem.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeSOLineItem.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeSOLineItem.fromJson(json);
@override @override
String get URL => "order/so-line/"; String get URL => "order/so-line/";
@ -172,7 +168,6 @@ class InvenTreeSOLineItem extends InvenTreeOrderLine {
} }
Map<String, Map<String, dynamic>> allocateFormFields() { Map<String, Map<String, dynamic>> allocateFormFields() {
return { return {
"line_item": { "line_item": {
"parent": "items", "parent": "items",
@ -188,9 +183,7 @@ class InvenTreeSOLineItem extends InvenTreeOrderLine {
"parent": "items", "parent": "items",
"nested": true, "nested": true,
}, },
"shipment": { "shipment": {"filters": {}}
"filters": {}
}
}; };
} }
@ -223,7 +216,8 @@ class InvenTreeSOLineItem extends InvenTreeOrderLine {
return unallocated; return unallocated;
} }
String get allocatedString => simpleNumberString(allocated) + " / " + simpleNumberString(quantity); String get allocatedString =>
simpleNumberString(allocated) + " / " + simpleNumberString(quantity);
double get shipped => getDouble("shipped"); double get shipped => getDouble("shipped");
@ -239,26 +233,28 @@ class InvenTreeSOLineItem extends InvenTreeOrderLine {
return shipped / quantity; return shipped / quantity;
} }
String get progressString => simpleNumberString(shipped) + " / " + simpleNumberString(quantity); String get progressString =>
simpleNumberString(shipped) + " / " + simpleNumberString(quantity);
bool get isComplete => shipped >= quantity; bool get isComplete => shipped >= quantity;
double get available => getDouble("available_stock") + getDouble("available_variant_stock"); double get available =>
getDouble("available_stock") + getDouble("available_variant_stock");
double get salePrice => getDouble("sale_price"); double get salePrice => getDouble("sale_price");
String get salePriceCurrency => getString("sale_price_currency"); String get salePriceCurrency => getString("sale_price_currency");
} }
class InvenTreeSOExtraLineItem extends InvenTreeExtraLineItem { class InvenTreeSOExtraLineItem extends InvenTreeExtraLineItem {
InvenTreeSOExtraLineItem() : super(); InvenTreeSOExtraLineItem() : super();
InvenTreeSOExtraLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeSOExtraLineItem.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeSOExtraLineItem.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeSOExtraLineItem.fromJson(json);
@override @override
String get URL => "order/so-extra-line/"; String get URL => "order/so-extra-line/";
@ -268,12 +264,8 @@ class InvenTreeSOExtraLineItem extends InvenTreeExtraLineItem {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => ExtraLineDetailWidget(this)));
MaterialPageRoute(
builder: (context) => ExtraLineDetailWidget(this)
)
);
} }
} }
@ -281,13 +273,14 @@ class InvenTreeSOExtraLineItem extends InvenTreeExtraLineItem {
* Class representing a sales order shipment * Class representing a sales order shipment
*/ */
class InvenTreeSalesOrderShipment extends InvenTreeModel { class InvenTreeSalesOrderShipment extends InvenTreeModel {
InvenTreeSalesOrderShipment() : super(); InvenTreeSalesOrderShipment() : super();
InvenTreeSalesOrderShipment.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeSalesOrderShipment.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeSalesOrderShipment.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeSalesOrderShipment.fromJson(json);
@override @override
String get URL => "/order/so/shipment/"; String get URL => "/order/so/shipment/";
@ -318,19 +311,18 @@ class InvenTreeSalesOrderShipment extends InvenTreeModel {
bool get shipped => shipment_date != null && shipment_date!.isNotEmpty; bool get shipped => shipment_date != null && shipment_date!.isNotEmpty;
} }
/* /*
* Class representing an attachment file against a SalesOrder object * Class representing an attachment file against a SalesOrder object
*/ */
class InvenTreeSalesOrderAttachment extends InvenTreeAttachment { class InvenTreeSalesOrderAttachment extends InvenTreeAttachment {
InvenTreeSalesOrderAttachment() : super(); InvenTreeSalesOrderAttachment() : super();
InvenTreeSalesOrderAttachment.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeSalesOrderAttachment.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeSalesOrderAttachment.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeSalesOrderAttachment.fromJson(json);
@override @override
String get REFERENCE_FIELD => "order"; String get REFERENCE_FIELD => "order";
@ -339,6 +331,7 @@ class InvenTreeSalesOrderAttachment extends InvenTreeAttachment {
String get REF_MODEL_TYPE => "salesorder"; String get REF_MODEL_TYPE => "salesorder";
@override @override
String get URL => InvenTreeAPI().supportsModernAttachments ? "attachment/" : "order/so/attachment/"; String get URL => InvenTreeAPI().supportsModernAttachments
? "attachment/"
: "order/so/attachment/";
} }

36
lib/inventree/sentry.dart
View File

@ -11,7 +11,6 @@ import "package:inventree/dsn.dart";
import "package:inventree/preferences.dart"; import "package:inventree/preferences.dart";
Future<Map<String, dynamic>> getDeviceInfo() async { Future<Map<String, dynamic>> getDeviceInfo() async {
// Extract device information // Extract device information
final DeviceInfoPlugin deviceInfo = DeviceInfoPlugin(); final DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
@ -31,7 +30,6 @@ Future<Map<String, dynamic>> getDeviceInfo() async {
"identifierForVendor": iosDeviceInfo.identifierForVendor, "identifierForVendor": iosDeviceInfo.identifierForVendor,
"isPhysicalDevice": iosDeviceInfo.isPhysicalDevice, "isPhysicalDevice": iosDeviceInfo.isPhysicalDevice,
}; };
} else if (Platform.isAndroid) { } else if (Platform.isAndroid) {
final androidDeviceInfo = await deviceInfo.androidInfo; final androidDeviceInfo = await deviceInfo.androidInfo;
@ -57,12 +55,10 @@ Future<Map<String, dynamic>> getDeviceInfo() async {
return device_info; return device_info;
} }
Map<String, dynamic> getServerInfo() => { Map<String, dynamic> getServerInfo() => {
"version": InvenTreeAPI().serverVersion, "version": InvenTreeAPI().serverVersion,
"apiVersion": InvenTreeAPI().apiVersion, "apiVersion": InvenTreeAPI().apiVersion,
}; };
Future<Map<String, dynamic>> getAppInfo() async { Future<Map<String, dynamic>> getAppInfo() async {
// Add app info // Add app info
@ -76,7 +72,6 @@ Future<Map<String, dynamic>> getAppInfo() async {
}; };
} }
bool isInDebugMode() { bool isInDebugMode() {
bool inDebugMode = false; bool inDebugMode = false;
@ -85,8 +80,8 @@ bool isInDebugMode() {
return inDebugMode; return inDebugMode;
} }
Future<bool> sentryReportMessage(String message, {Map<String, String>? context}) async { Future<bool> sentryReportMessage(String message,
{Map<String, String>? context}) async {
if (SENTRY_DSN_KEY.isEmpty) { if (SENTRY_DSN_KEY.isEmpty) {
return false; return false;
} }
@ -106,23 +101,21 @@ Future<bool> sentryReportMessage(String message, {Map<String, String>? context})
// We don't care about the server address, only the path and query parameters! // We don't care about the server address, only the path and query parameters!
// Overwrite the provided URL // Overwrite the provided URL
context["url"] = uri.path + "?" + uri.query; context["url"] = uri.path + "?" + uri.query;
} catch (error) { } catch (error) {
// Ignore if any errors are thrown here // Ignore if any errors are thrown here
} }
} }
} }
print("Sending user message to Sentry: ${message}, ${context}"); print("Sending user message to Sentry: ${message}, ${context}");
if (isInDebugMode()) { if (isInDebugMode()) {
print("----- In dev mode. Not sending message to Sentry.io -----"); print("----- In dev mode. Not sending message to Sentry.io -----");
return true; return true;
} }
final upload = await InvenTreeSettingsManager().getValue(INV_REPORT_ERRORS, true) as bool; final upload = await InvenTreeSettingsManager()
.getValue(INV_REPORT_ERRORS, true) as bool;
if (!upload) { if (!upload) {
print("----- Error reporting disabled -----"); print("----- Error reporting disabled -----");
@ -152,12 +145,12 @@ Future<bool> sentryReportMessage(String message, {Map<String, String>? context})
} }
} }
/* /*
* Report an error message to sentry.io * Report an error message to sentry.io
*/ */
Future<void> sentryReportError(String source, dynamic error, StackTrace? stackTrace, {Map<String, String> context = const {}}) async { Future<void> sentryReportError(
String source, dynamic error, StackTrace? stackTrace,
{Map<String, String> context = const {}}) async {
if (sentryIgnoreError(error)) { if (sentryIgnoreError(error)) {
// No action on this error // No action on this error
return; return;
@ -170,7 +163,6 @@ Future<void> sentryReportError(String source, dynamic error, StackTrace? stackTr
// check if you are running in dev mode using an assertion and omit sending // check if you are running in dev mode using an assertion and omit sending
// the report. // the report.
if (isInDebugMode()) { if (isInDebugMode()) {
print("----- In dev mode. Not sending report to Sentry.io -----"); print("----- In dev mode. Not sending report to Sentry.io -----");
return; return;
} }
@ -179,7 +171,8 @@ Future<void> sentryReportError(String source, dynamic error, StackTrace? stackTr
return; return;
} }
final upload = await InvenTreeSettingsManager().getValue(INV_REPORT_ERRORS, true) as bool; final upload = await InvenTreeSettingsManager()
.getValue(INV_REPORT_ERRORS, true) as bool;
if (!upload) { if (!upload) {
print("----- Error reporting disabled -----"); print("----- Error reporting disabled -----");
@ -188,11 +181,12 @@ Future<void> sentryReportError(String source, dynamic error, StackTrace? stackTr
// Some errors are outside our control, and we do not want to "pollute" the uploaded data // Some errors are outside our control, and we do not want to "pollute" the uploaded data
if (source == "FlutterError.onError") { if (source == "FlutterError.onError") {
String errorString = error.toString(); String errorString = error.toString();
// Missing media file // Missing media file
if (errorString.contains("HttpException") && errorString.contains("404") && errorString.contains("/media/")) { if (errorString.contains("HttpException") &&
errorString.contains("404") &&
errorString.contains("/media/")) {
return; return;
} }
@ -234,14 +228,14 @@ Future<void> sentryReportError(String source, dynamic error, StackTrace? stackTr
}); });
} }
/* /*
* Test if a certain error should be ignored by Sentry * Test if a certain error should be ignored by Sentry
*/ */
bool sentryIgnoreError(dynamic error) { bool sentryIgnoreError(dynamic error) {
// Ignore 404 errors for media files // Ignore 404 errors for media files
if (error is HttpException) { if (error is HttpException) {
if (error.uri.toString().contains("/media/") && error.message.contains("404")) { if (error.uri.toString().contains("/media/") &&
error.message.contains("404")) {
return true; return true;
} }
} }

8
lib/inventree/status_codes.dart
View File

@ -11,12 +11,10 @@ import "package:inventree/api.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
/* /*
* Base class definition for a "status code" definition. * Base class definition for a "status code" definition.
*/ */
class InvenTreeStatusCode { class InvenTreeStatusCode {
InvenTreeStatusCode(this.URL); InvenTreeStatusCode(this.URL);
final String URL; final String URL;
@ -34,10 +32,7 @@ class InvenTreeStatusCode {
dynamic _entry = data[key]; dynamic _entry = data[key];
if (_entry is Map<String, dynamic>) { if (_entry is Map<String, dynamic>) {
_choices.add({ _choices.add({"value": _entry["key"], "display_name": _entry["label"]});
"value": _entry["key"],
"display_name": _entry["label"]
});
} }
} }
@ -46,7 +41,6 @@ class InvenTreeStatusCode {
// Load status code information from the server // Load status code information from the server
Future<void> load({bool forceReload = false}) async { Future<void> load({bool forceReload = false}) async {
// Return internally cached data // Return internally cached data
if (data.isNotEmpty && !forceReload) { if (data.isNotEmpty && !forceReload) {
return; return;

100
lib/inventree/stock.dart
View File

@ -10,16 +10,14 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/widget/stock/location_display.dart"; import "package:inventree/widget/stock/location_display.dart";
import "package:inventree/widget/stock/stock_detail.dart"; import "package:inventree/widget/stock/stock_detail.dart";
/* /*
* Class representing a test result for a single stock item * Class representing a test result for a single stock item
*/ */
class InvenTreeStockItemTestResult extends InvenTreeModel { class InvenTreeStockItemTestResult extends InvenTreeModel {
InvenTreeStockItemTestResult() : super(); InvenTreeStockItemTestResult() : super();
InvenTreeStockItemTestResult.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeStockItemTestResult.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get URL => "stock/test/"; String get URL => "stock/test/";
@ -37,7 +35,6 @@ class InvenTreeStockItemTestResult extends InvenTreeModel {
@override @override
Map<String, Map<String, dynamic>> formFields() { Map<String, Map<String, dynamic>> formFields() {
Map<String, Map<String, dynamic>> fields = { Map<String, Map<String, dynamic>> fields = {
"stock_item": {"hidden": true}, "stock_item": {"hidden": true},
"test": {}, "test": {},
@ -82,25 +79,23 @@ class InvenTreeStockItemTestResult extends InvenTreeModel {
var result = InvenTreeStockItemTestResult.fromJson(json); var result = InvenTreeStockItemTestResult.fromJson(json);
return result; return result;
} }
} }
class InvenTreeStockItemHistory extends InvenTreeModel { class InvenTreeStockItemHistory extends InvenTreeModel {
InvenTreeStockItemHistory() : super(); InvenTreeStockItemHistory() : super();
InvenTreeStockItemHistory.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeStockItemHistory.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeStockItemHistory.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeStockItemHistory.fromJson(json);
@override @override
String get URL => "stock/track/"; String get URL => "stock/track/";
@override @override
Map<String, String> defaultFilters() { Map<String, String> defaultFilters() {
// By default, order by decreasing date // By default, order by decreasing date
return { return {
"ordering": "-date", "ordering": "-date",
@ -133,7 +128,6 @@ class InvenTreeStockItemHistory extends InvenTreeModel {
int? get user => getValue("user") as int?; int? get user => getValue("user") as int?;
String get userString { String get userString {
if (user != null) { if (user != null) {
return getString("username", subKey: "user_detail"); return getString("username", subKey: "user_detail");
} else { } else {
@ -142,12 +136,10 @@ class InvenTreeStockItemHistory extends InvenTreeModel {
} }
} }
/* /*
* Class representing a StockItem database instance * Class representing a StockItem database instance
*/ */
class InvenTreeStockItem extends InvenTreeModel { class InvenTreeStockItem extends InvenTreeModel {
InvenTreeStockItem() : super(); InvenTreeStockItem() : super();
InvenTreeStockItem.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeStockItem.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@ -162,12 +154,8 @@ class InvenTreeStockItem extends InvenTreeModel {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => StockDetailWidget(this)));
MaterialPageRoute(
builder: (context) => StockDetailWidget(this)
)
);
} }
// Return a set of fields to transfer this stock item via dialog // Return a set of fields to transfer this stock item via dialog
@ -250,7 +238,6 @@ class InvenTreeStockItem extends InvenTreeModel {
@override @override
Map<String, String> defaultFilters() { Map<String, String> defaultFilters() {
return { return {
"part_detail": "true", "part_detail": "true",
"location_detail": "true", "location_detail": "true",
@ -265,7 +252,7 @@ class InvenTreeStockItem extends InvenTreeModel {
int get testTemplateCount => testTemplates.length; int get testTemplateCount => testTemplates.length;
// Get all the test templates associated with this StockItem // Get all the test templates associated with this StockItem
Future<void> getTestTemplates({bool showDialog=false}) async { Future<void> getTestTemplates({bool showDialog = false}) async {
await InvenTreePartTestTemplate().list( await InvenTreePartTestTemplate().list(
filters: { filters: {
"part": "${partId}", "part": "${partId}",
@ -287,7 +274,6 @@ class InvenTreeStockItem extends InvenTreeModel {
int get testResultCount => testResults.length; int get testResultCount => testResults.length;
Future<void> getTestResults() async { Future<void> getTestResults() async {
await InvenTreeStockItemTestResult().list( await InvenTreeStockItemTestResult().list(
filters: { filters: {
"stock_item": "${pk}", "stock_item": "${pk}",
@ -363,7 +349,6 @@ class InvenTreeStockItem extends InvenTreeModel {
String get stocktakeDateString => getDateString("stocktake_date"); String get stocktakeDateString => getDateString("stocktake_date");
String get partName { String get partName {
String nm = ""; String nm = "";
// Use the detailed part information as priority // Use the detailed part information as priority
@ -412,7 +397,6 @@ class InvenTreeStockItem extends InvenTreeModel {
* Return the Part thumbnail for this stock item. * Return the Part thumbnail for this stock item.
*/ */
String get partThumbnail { String get partThumbnail {
String thumb = ""; String thumb = "";
thumb = (jsondata["part_detail"]?["thumbnail"] ?? "") as String; thumb = (jsondata["part_detail"]?["thumbnail"] ?? "") as String;
@ -439,7 +423,8 @@ class InvenTreeStockItem extends InvenTreeModel {
String thumb = ""; String thumb = "";
if (jsondata.containsKey("supplier_part_detail")) { if (jsondata.containsKey("supplier_part_detail")) {
thumb = (jsondata["supplier_part_detail"]?["supplier_detail"]?["image"] ?? "") as String; thumb = (jsondata["supplier_part_detail"]?["supplier_detail"]?["image"] ??
"") as String;
} else if (jsondata.containsKey("supplier_detail")) { } else if (jsondata.containsKey("supplier_detail")) {
thumb = (jsondata["supplier_detail"]?["image"] ?? "") as String; thumb = (jsondata["supplier_detail"]?["image"] ?? "") as String;
} }
@ -447,7 +432,8 @@ class InvenTreeStockItem extends InvenTreeModel {
return thumb; return thumb;
} }
String get supplierName => getString("supplier_name", subKey: "supplier_detail"); String get supplierName =>
getString("supplier_name", subKey: "supplier_detail");
String get units => getString("units", subKey: "part_detail"); String get units => getString("units", subKey: "part_detail");
@ -457,8 +443,7 @@ class InvenTreeStockItem extends InvenTreeModel {
double get quantity => getDouble("quantity"); double get quantity => getDouble("quantity");
String quantityString({bool includeUnits = true}){ String quantityString({bool includeUnits = true}) {
String q = ""; String q = "";
if (allocated > 0) { if (allocated > 0) {
@ -494,8 +479,8 @@ class InvenTreeStockItem extends InvenTreeModel {
} }
String get locationName { String get locationName {
if (locationId == -1 || !jsondata.containsKey("location_detail"))
if (locationId == -1 || !jsondata.containsKey("location_detail")) return "Unknown Location"; return "Unknown Location";
String loc = getString("name", subKey: "location_detail"); String loc = getString("name", subKey: "location_detail");
@ -508,8 +493,8 @@ class InvenTreeStockItem extends InvenTreeModel {
} }
String get locationPathString { String get locationPathString {
if (locationId == -1 || !jsondata.containsKey("location_detail"))
if (locationId == -1 || !jsondata.containsKey("location_detail")) return L10().locationNotSet; return L10().locationNotSet;
String _loc = getString("pathstring", subKey: "location_detail"); String _loc = getString("pathstring", subKey: "location_detail");
if (_loc.isNotEmpty) { if (_loc.isNotEmpty) {
@ -536,7 +521,8 @@ class InvenTreeStockItem extends InvenTreeModel {
} }
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeStockItem.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeStockItem.fromJson(json);
/* /*
* Perform stocktake action: * Perform stocktake action:
@ -545,8 +531,8 @@ class InvenTreeStockItem extends InvenTreeModel {
* - Remove * - Remove
* - Count * - Count
*/ */
Future<bool> adjustStock(String endpoint, double q, {String? notes, int? location}) async { Future<bool> adjustStock(String endpoint, double q,
{String? notes, int? location}) async {
// Serialized stock cannot be adjusted (unless it is a "transfer") // Serialized stock cannot be adjusted (unless it is a "transfer")
if (isSerialized() && location == null) { if (isSerialized() && location == null) {
return false; return false;
@ -578,32 +564,30 @@ class InvenTreeStockItem extends InvenTreeModel {
body: data, body: data,
); );
return response.isValid() && (response.statusCode == 200 || response.statusCode == 201); return response.isValid() &&
(response.statusCode == 200 || response.statusCode == 201);
} }
Future<bool> countStock(double q, {String? notes}) async { Future<bool> countStock(double q, {String? notes}) async {
final bool result = await adjustStock("/stock/count/", q, notes: notes); final bool result = await adjustStock("/stock/count/", q, notes: notes);
return result; return result;
} }
Future<bool> addStock(double q, {String? notes}) async { Future<bool> addStock(double q, {String? notes}) async {
final bool result = await adjustStock("/stock/add/", q, notes: notes); final bool result = await adjustStock("/stock/add/", q, notes: notes);
return result; return result;
} }
Future<bool> removeStock(double q, {String? notes}) async { Future<bool> removeStock(double q, {String? notes}) async {
final bool result = await adjustStock("/stock/remove/", q, notes: notes); final bool result = await adjustStock("/stock/remove/", q, notes: notes);
return result; return result;
} }
Future<bool> transferStock(int location, {double? quantity, String? notes}) async { Future<bool> transferStock(int location,
{double? quantity, String? notes}) async {
double q = this.quantity; double q = this.quantity;
if (quantity != null) { if (quantity != null) {
@ -619,17 +603,16 @@ class InvenTreeStockItem extends InvenTreeModel {
return result; return result;
} }
} }
/* /*
* Class representing an attachment file against a StockItem object * Class representing an attachment file against a StockItem object
*/ */
class InvenTreeStockItemAttachment extends InvenTreeAttachment { class InvenTreeStockItemAttachment extends InvenTreeAttachment {
InvenTreeStockItemAttachment() : super(); InvenTreeStockItemAttachment() : super();
InvenTreeStockItemAttachment.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeStockItemAttachment.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get REFERENCE_FIELD => "stock_item"; String get REFERENCE_FIELD => "stock_item";
@ -638,18 +621,20 @@ class InvenTreeStockItemAttachment extends InvenTreeAttachment {
String get REF_MODEL_TYPE => "stockitem"; String get REF_MODEL_TYPE => "stockitem";
@override @override
String get URL => InvenTreeAPI().supportsModernAttachments ? "attachment/" : "stock/attachment/"; String get URL => InvenTreeAPI().supportsModernAttachments
? "attachment/"
: "stock/attachment/";
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeStockItemAttachment.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeStockItemAttachment.fromJson(json);
} }
class InvenTreeStockLocation extends InvenTreeModel { class InvenTreeStockLocation extends InvenTreeModel {
InvenTreeStockLocation() : super(); InvenTreeStockLocation() : super();
InvenTreeStockLocation.fromJson(Map<String, dynamic> json) : super.fromJson(json); InvenTreeStockLocation.fromJson(Map<String, dynamic> json)
: super.fromJson(json);
@override @override
String get URL => "stock/location/"; String get URL => "stock/location/";
@ -663,12 +648,8 @@ class InvenTreeStockLocation extends InvenTreeModel {
@override @override
Future<Object?> goToDetailPage(BuildContext context) async { Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push( return Navigator.push(context,
context, MaterialPageRoute(builder: (context) => LocationDisplayWidget(this)));
MaterialPageRoute(
builder: (context) => LocationDisplayWidget(this)
)
);
} }
@override @override
@ -684,7 +665,6 @@ class InvenTreeStockLocation extends InvenTreeModel {
} }
String get parentPathString { String get parentPathString {
List<String> psplit = pathstring.split("/"); List<String> psplit = pathstring.split("/");
if (psplit.isNotEmpty) { if (psplit.isNotEmpty) {
@ -703,6 +683,6 @@ class InvenTreeStockLocation extends InvenTreeModel {
int get itemcount => (jsondata["items"] ?? 0) as int; int get itemcount => (jsondata["items"] ?? 0) as int;
@override @override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeStockLocation.fromJson(json); InvenTreeModel createFromJson(Map<String, dynamic> json) =>
InvenTreeStockLocation.fromJson(json);
} }

3
lib/l10.dart
View File

@ -7,8 +7,7 @@ import "package:flutter/material.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
// Shortcut function to reduce boilerplate! // Shortcut function to reduce boilerplate!
I18N L10() I18N L10() {
{
// Testing mode - ignore context // Testing mode - ignore context
if (!hasContext()) { if (!hasContext()) {
return I18NEn(); return I18NEn();

49
lib/labels.dart
View File

@ -18,7 +18,6 @@ Future<void> selectAndPrintLabel(
String labelType, String labelType,
String labelQuery, String labelQuery,
) async { ) async {
if (!InvenTreeAPI().isConnected()) { if (!InvenTreeAPI().isConnected()) {
return; return;
} }
@ -63,7 +62,8 @@ Future<void> selectAndPrintLabel(
}); });
} }
String selectedPlugin = await InvenTreeAPI().getUserSetting("LABEL_DEFAULT_PRINTER"); String selectedPlugin =
await InvenTreeAPI().getUserSetting("LABEL_DEFAULT_PRINTER");
if (selectedPlugin.isNotEmpty) { if (selectedPlugin.isNotEmpty) {
initial_plugin = selectedPlugin; initial_plugin = selectedPlugin;
@ -88,13 +88,8 @@ Future<void> selectAndPrintLabel(
} }
}; };
launchApiForm( launchApiForm(context, L10().printLabel, "", fields,
context, icon: TablerIcons.printer, validate: (Map<String, dynamic> data) {
L10().printLabel,
"",
fields,
icon: TablerIcons.printer,
validate: (Map<String, dynamic> data) {
final template = data["label"]; final template = data["label"];
final plugin = data["plugin"]; final plugin = data["plugin"];
@ -115,30 +110,24 @@ Future<void> selectAndPrintLabel(
} }
return true; return true;
}, }, onSuccess: (Map<String, dynamic> data) async {
onSuccess: (Map<String, dynamic> data) async {
int labelId = (data["label"] ?? -1) as int; int labelId = (data["label"] ?? -1) as int;
var pluginKey = data["plugin"]; var pluginKey = data["plugin"];
bool result = false; bool result = false;
if (labelId != -1 && pluginKey != null) { if (labelId != -1 && pluginKey != null) {
showLoadingOverlay(); showLoadingOverlay();
if (InvenTreeAPI().supportsModernLabelPrinting) { if (InvenTreeAPI().supportsModernLabelPrinting) {
// Modern label printing API uses a POST request to a single API endpoint. // Modern label printing API uses a POST request to a single API endpoint.
await InvenTreeAPI().post( await InvenTreeAPI().post("/label/print/", body: {
"/label/print/",
body: {
"plugin": pluginKey, "plugin": pluginKey,
"template": labelId, "template": labelId,
"items": [instanceId] "items": [instanceId]
} }).then((APIResponse response) {
).then((APIResponse response) { if (response.isValid() &&
response.statusCode >= 200 &&
if (response.isValid() && response.statusCode >= 200 &&
response.statusCode <= 201) { response.statusCode <= 201) {
var data = response.asMap(); var data = response.asMap();
@ -154,11 +143,11 @@ Future<void> selectAndPrintLabel(
} }
} }
}); });
} else { } else {
// Legacy label printing API // Legacy label printing API
// Uses a GET request to a specially formed URL which depends on the parameters // Uses a GET request to a specially formed URL which depends on the parameters
String url = "/label/${labelType}/${labelId}/print/?${labelQuery}&plugin=${pluginKey}"; String url =
"/label/${labelType}/${labelId}/print/?${labelQuery}&plugin=${pluginKey}";
await InvenTreeAPI().get(url).then((APIResponse response) { await InvenTreeAPI().get(url).then((APIResponse response) {
if (response.isValid() && response.statusCode == 200) { if (response.isValid() && response.statusCode == 200) {
var data = response.asMap(); var data = response.asMap();
@ -176,10 +165,7 @@ Future<void> selectAndPrintLabel(
hideLoadingOverlay(); hideLoadingOverlay();
if (result) { if (result) {
showSnackIcon( showSnackIcon(L10().printLabelSuccess, success: true);
L10().printLabelSuccess,
success: true
);
} else { } else {
showSnackIcon( showSnackIcon(
L10().printLabelFailure, L10().printLabelFailure,
@ -190,7 +176,6 @@ Future<void> selectAndPrintLabel(
}); });
} }
/* /*
* Discover which label templates are available for a given item * Discover which label templates are available for a given item
*/ */
@ -198,8 +183,8 @@ Future<List<Map<String, dynamic>>> getLabelTemplates(
String labelType, String labelType,
Map<String, String> data, Map<String, String> data,
) async { ) async {
if (!InvenTreeAPI().isConnected() ||
if (!InvenTreeAPI().isConnected() || !InvenTreeAPI().supportsMixin("labels")) { !InvenTreeAPI().supportsMixin("labels")) {
return []; return [];
} }
@ -217,10 +202,12 @@ Future<List<Map<String, dynamic>>> getLabelTemplates(
List<Map<String, dynamic>> labels = []; List<Map<String, dynamic>> labels = [];
await InvenTreeAPI().get( await InvenTreeAPI()
.get(
url, url,
params: data, params: data,
).then((APIResponse response) { )
.then((APIResponse response) {
if (response.isValid() && response.statusCode == 200) { if (response.isValid() && response.statusCode == 200) {
for (var label in response.resultsList()) { for (var label in response.resultsList()) {
if (label is Map<String, dynamic>) { if (label is Map<String, dynamic>) {

36
lib/main.dart
View File

@ -18,15 +18,12 @@ import "package:inventree/l10n/collected/app_localizations.dart";
import "package:inventree/settings/release.dart"; import "package:inventree/settings/release.dart";
import "package:inventree/widget/home.dart"; import "package:inventree/widget/home.dart";
Future<void> main() async { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final savedThemeMode = await AdaptiveTheme.getThemeMode(); final savedThemeMode = await AdaptiveTheme.getThemeMode();
await runZonedGuarded<Future<void>>(() async { await runZonedGuarded<Future<void>>(() async {
PackageInfo info = await PackageInfo.fromPlatform(); PackageInfo info = await PackageInfo.fromPlatform();
String pkg = info.packageName; String pkg = info.packageName;
String version = info.version; String version = info.version;
@ -46,20 +43,18 @@ Future<void> main() async {
// Pass any flutter errors off to the Sentry reporting context! // Pass any flutter errors off to the Sentry reporting context!
FlutterError.onError = (FlutterErrorDetails details) async { FlutterError.onError = (FlutterErrorDetails details) async {
// Ensure that the error gets reported to sentry! // Ensure that the error gets reported to sentry!
await sentryReportError( await sentryReportError(
"FlutterError.onError", "FlutterError.onError", details.exception, details.stack,
details.exception, details.stack,
context: { context: {
"context": details.context.toString(), "context": details.context.toString(),
"summary": details.summary.toString(), "summary": details.summary.toString(),
"library": details.library ?? "null", "library": details.library ?? "null",
} });
);
}; };
final int orientation = await InvenTreeSettingsManager().getValue(INV_SCREEN_ORIENTATION, SCREEN_ORIENTATION_SYSTEM) as int; final int orientation = await InvenTreeSettingsManager()
.getValue(INV_SCREEN_ORIENTATION, SCREEN_ORIENTATION_SYSTEM) as int;
List<DeviceOrientation> orientations = []; List<DeviceOrientation> orientations = [];
@ -78,15 +73,11 @@ Future<void> main() async {
} }
SystemChrome.setPreferredOrientations(orientations).then((_) { SystemChrome.setPreferredOrientations(orientations).then((_) {
runApp( runApp(InvenTreeApp(savedThemeMode));
InvenTreeApp(savedThemeMode)
);
}); });
}, (Object error, StackTrace stackTrace) async { }, (Object error, StackTrace stackTrace) async {
sentryReportError("main.runZonedGuarded", error, stackTrace); sentryReportError("main.runZonedGuarded", error, stackTrace);
}); });
} }
class InvenTreeApp extends StatefulWidget { class InvenTreeApp extends StatefulWidget {
@ -99,13 +90,11 @@ class InvenTreeApp extends StatefulWidget {
@override @override
InvenTreeAppState createState() => InvenTreeAppState(savedThemeMode); InvenTreeAppState createState() => InvenTreeAppState(savedThemeMode);
static InvenTreeAppState? of(BuildContext context) => context.findAncestorStateOfType<InvenTreeAppState>(); static InvenTreeAppState? of(BuildContext context) =>
context.findAncestorStateOfType<InvenTreeAppState>();
} }
class InvenTreeAppState extends State<StatefulWidget> { class InvenTreeAppState extends State<StatefulWidget> {
InvenTreeAppState(this.savedThemeMode) : super(); InvenTreeAppState(this.savedThemeMode) : super();
// Custom _locale (default = null; use system default) // Custom _locale (default = null; use system default)
@ -123,13 +112,13 @@ class InvenTreeAppState extends State<StatefulWidget> {
// Run app init routines in the background // Run app init routines in the background
Future<void> runInitTasks() async { Future<void> runInitTasks() async {
// Set the app locale (language) // Set the app locale (language)
Locale? locale = await InvenTreeSettingsManager().getSelectedLocale(); Locale? locale = await InvenTreeSettingsManager().getSelectedLocale();
setLocale(locale); setLocale(locale);
// Display release notes if this is a new version // Display release notes if this is a new version
final String version = await InvenTreeSettingsManager().getValue("recentVersion", "") as String; final String version = await InvenTreeSettingsManager()
.getValue("recentVersion", "") as String;
final PackageInfo info = await PackageInfo.fromPlatform(); final PackageInfo info = await PackageInfo.fromPlatform();
@ -142,8 +131,7 @@ class InvenTreeAppState extends State<StatefulWidget> {
// Show the release notes // Show the release notes
OneContext().push( OneContext().push(
MaterialPageRoute(builder: (context) => ReleaseNotesWidget(notes)) MaterialPageRoute(builder: (context) => ReleaseNotesWidget(notes)));
);
} }
} }
@ -158,7 +146,6 @@ class InvenTreeAppState extends State<StatefulWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AdaptiveTheme( return AdaptiveTheme(
light: ThemeData( light: ThemeData(
brightness: Brightness.light, brightness: Brightness.light,
@ -188,7 +175,6 @@ class InvenTreeAppState extends State<StatefulWidget> {
], ],
supportedLocales: supported_locales, supportedLocales: supported_locales,
locale: _locale, locale: _locale,
) ));
);
} }
} }

10
lib/preferences.dart
View File

@ -6,7 +6,6 @@ import "package:path_provider/path_provider.dart";
import "package:sembast/sembast_io.dart"; import "package:sembast/sembast_io.dart";
import "package:path/path.dart"; import "package:path/path.dart";
// Settings key values // Settings key values
const String INV_HOME_SHOW_SUBSCRIBED = "homeShowSubscribed"; const String INV_HOME_SHOW_SUBSCRIBED = "homeShowSubscribed";
const String INV_HOME_SHOW_PO = "homeShowPo"; const String INV_HOME_SHOW_PO = "homeShowPo";
@ -62,7 +61,6 @@ const int BARCODE_CONTROLLER_WEDGE = 1;
* Class for storing InvenTree preferences in a NoSql DB * Class for storing InvenTree preferences in a NoSql DB
*/ */
class InvenTreePreferencesDB { class InvenTreePreferencesDB {
InvenTreePreferencesDB._(); InvenTreePreferencesDB._();
static final InvenTreePreferencesDB _singleton = InvenTreePreferencesDB._(); static final InvenTreePreferencesDB _singleton = InvenTreePreferencesDB._();
@ -74,7 +72,6 @@ class InvenTreePreferencesDB {
bool isOpen = false; bool isOpen = false;
Future<Database> get database async { Future<Database> get database async {
if (!isOpen) { if (!isOpen) {
// Calling _openDatabase will also complete the completer with database instance // Calling _openDatabase will also complete the completer with database instance
_openDatabase(); _openDatabase();
@ -101,13 +98,11 @@ class InvenTreePreferencesDB {
} }
} }
/* /*
* InvenTree setings manager class. * InvenTree setings manager class.
* Provides functions for loading and saving settings, with provision for default values * Provides functions for loading and saving settings, with provision for default values
*/ */
class InvenTreeSettingsManager { class InvenTreeSettingsManager {
factory InvenTreeSettingsManager() { factory InvenTreeSettingsManager() {
return _manager; return _manager;
} }
@ -144,7 +139,6 @@ class InvenTreeSettingsManager {
} }
Future<dynamic> getValue(String key, dynamic backup) async { Future<dynamic> getValue(String key, dynamic backup) async {
dynamic value = await store.record(key).get(await _db); dynamic value = await store.record(key).get(await _db);
// Retrieve value // Retrieve value
@ -174,7 +168,6 @@ class InvenTreeSettingsManager {
// Store a key:value pair in the database // Store a key:value pair in the database
Future<void> setValue(String key, dynamic value) async { Future<void> setValue(String key, dynamic value) async {
// Encode null values as strings // Encode null values as strings
value ??= "__null__"; value ??= "__null__";
@ -182,5 +175,6 @@ class InvenTreeSettingsManager {
} }
// Ensure we only ever create a single instance of this class // Ensure we only ever create a single instance of this class
static final InvenTreeSettingsManager _manager = InvenTreeSettingsManager._internal(); static final InvenTreeSettingsManager _manager =
InvenTreeSettingsManager._internal();
} }

151
lib/settings/about.dart
View File

@ -13,34 +13,26 @@ import "package:url_launcher/url_launcher.dart";
const String DOCS_URL = "https://docs.inventree.org/app"; const String DOCS_URL = "https://docs.inventree.org/app";
class InvenTreeAboutWidget extends StatelessWidget { class InvenTreeAboutWidget extends StatelessWidget {
const InvenTreeAboutWidget(this.info) : super(); const InvenTreeAboutWidget(this.info) : super();
final PackageInfo info; final PackageInfo info;
Future <void> _releaseNotes(BuildContext context) async { Future<void> _releaseNotes(BuildContext context) async {
// Load release notes from external file // Load release notes from external file
String notes = await rootBundle.loadString("assets/release_notes.md"); String notes = await rootBundle.loadString("assets/release_notes.md");
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => ReleaseNotesWidget(notes)));
MaterialPageRoute(builder: (context) => ReleaseNotesWidget(notes))
);
} }
Future <void> _credits(BuildContext context) async { Future<void> _credits(BuildContext context) async {
String notes = await rootBundle.loadString("assets/credits.md"); String notes = await rootBundle.loadString("assets/credits.md");
Navigator.push( Navigator.push(
context, context, MaterialPageRoute(builder: (context) => CreditsWidget(notes)));
MaterialPageRoute(builder: (context) => CreditsWidget(notes))
);
} }
Future <void> _openDocs() async { Future<void> _openDocs() async {
var docsUrl = Uri.parse(DOCS_URL); var docsUrl = Uri.parse(DOCS_URL);
if (await canLaunchUrl(docsUrl)) { if (await canLaunchUrl(docsUrl)) {
@ -48,8 +40,7 @@ class InvenTreeAboutWidget extends StatelessWidget {
} }
} }
Future <void> _reportBug(BuildContext context) async { Future<void> _reportBug(BuildContext context) async {
var url = Uri( var url = Uri(
scheme: "https", scheme: "https",
host: "github.com", host: "github.com",
@ -60,11 +51,9 @@ class InvenTreeAboutWidget extends StatelessWidget {
} }
} }
Future <void> _translate() async { Future<void> _translate() async {
var url = Uri( var url =
scheme: "https", Uri(scheme: "https", host: "crowdin.com", path: "/project/inventree");
host: "crowdin.com",
path: "/project/inventree");
if (await canLaunchUrl(url)) { if (await canLaunchUrl(url)) {
await launchUrl(url); await launchUrl(url);
@ -73,153 +62,126 @@ class InvenTreeAboutWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
tiles.add( tiles.add(ListTile(
ListTile(
title: Text( title: Text(
L10().serverDetails, L10().serverDetails,
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),
) ));
);
if (InvenTreeAPI().isConnected()) { if (InvenTreeAPI().isConnected()) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().address), title: Text(L10().address),
subtitle: Text(InvenTreeAPI().baseUrl.isNotEmpty ? InvenTreeAPI().baseUrl : L10().notConnected), subtitle: Text(InvenTreeAPI().baseUrl.isNotEmpty
? InvenTreeAPI().baseUrl
: L10().notConnected),
leading: Icon(TablerIcons.globe), leading: Icon(TablerIcons.globe),
trailing: InvenTreeAPI().isConnected() ? Icon(TablerIcons.circle_check, color: COLOR_SUCCESS) : Icon(TablerIcons.circle_x, color: COLOR_DANGER), trailing: InvenTreeAPI().isConnected()
) ? Icon(TablerIcons.circle_check, color: COLOR_SUCCESS)
); : Icon(TablerIcons.circle_x, color: COLOR_DANGER),
));
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().username), title: Text(L10().username),
subtitle: Text(InvenTreeAPI().username), subtitle: Text(InvenTreeAPI().username),
leading: InvenTreeAPI().username.isNotEmpty ? Icon(TablerIcons.user) : Icon(TablerIcons.user_cancel, color: COLOR_DANGER), leading: InvenTreeAPI().username.isNotEmpty
) ? Icon(TablerIcons.user)
); : Icon(TablerIcons.user_cancel, color: COLOR_DANGER),
));
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().version), title: Text(L10().version),
subtitle: Text(InvenTreeAPI().serverVersion.isNotEmpty ? InvenTreeAPI().serverVersion : L10().notConnected), subtitle: Text(InvenTreeAPI().serverVersion.isNotEmpty
? InvenTreeAPI().serverVersion
: L10().notConnected),
leading: Icon(TablerIcons.info_circle), leading: Icon(TablerIcons.info_circle),
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().serverInstance), title: Text(L10().serverInstance),
subtitle: Text(InvenTreeAPI().serverInstance.isNotEmpty ? InvenTreeAPI().serverInstance : L10().notConnected), subtitle: Text(InvenTreeAPI().serverInstance.isNotEmpty
? InvenTreeAPI().serverInstance
: L10().notConnected),
leading: Icon(TablerIcons.server), leading: Icon(TablerIcons.server),
) ));
);
// Display extra tile if the server supports plugins // Display extra tile if the server supports plugins
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().pluginSupport), title: Text(L10().pluginSupport),
subtitle: Text(L10().pluginSupportDetail), subtitle: Text(L10().pluginSupportDetail),
leading: Icon(TablerIcons.plug), leading: Icon(TablerIcons.plug),
) ));
);
} else { } else {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notConnected), title: Text(L10().notConnected),
subtitle: Text( subtitle: Text(
L10().serverNotConnected, L10().serverNotConnected,
style: TextStyle(fontStyle: FontStyle.italic), style: TextStyle(fontStyle: FontStyle.italic),
), ),
leading: Icon(TablerIcons.exclamation_circle) leading: Icon(TablerIcons.exclamation_circle)));
)
);
} }
tiles.add( tiles.add(ListTile(
ListTile(
title: Text( title: Text(
L10().appDetails, L10().appDetails,
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().packageName), title: Text(L10().packageName),
subtitle: Text("${info.packageName}"), subtitle: Text("${info.packageName}"),
leading: Icon(TablerIcons.box) leading: Icon(TablerIcons.box)));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().version), title: Text(L10().version),
subtitle: Text("${info.version} - Build ${info.buildNumber}"), subtitle: Text("${info.version} - Build ${info.buildNumber}"),
leading: Icon(TablerIcons.info_circle) leading: Icon(TablerIcons.info_circle)));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().releaseNotes), title: Text(L10().releaseNotes),
subtitle: Text(L10().appReleaseNotes), subtitle: Text(L10().appReleaseNotes),
leading: Icon(TablerIcons.file, color: COLOR_ACTION), leading: Icon(TablerIcons.file, color: COLOR_ACTION),
onTap: () { onTap: () {
_releaseNotes(context); _releaseNotes(context);
}, },
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().credits), title: Text(L10().credits),
subtitle: Text(L10().appCredits), subtitle: Text(L10().appCredits),
leading: Icon(TablerIcons.balloon, color: COLOR_ACTION), leading: Icon(TablerIcons.balloon, color: COLOR_ACTION),
onTap: () { onTap: () {
_credits(context); _credits(context);
} }));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().documentation), title: Text(L10().documentation),
subtitle: Text(DOCS_URL), subtitle: Text(DOCS_URL),
leading: Icon(TablerIcons.book, color: COLOR_ACTION), leading: Icon(TablerIcons.book, color: COLOR_ACTION),
onTap: () { onTap: () {
_openDocs(); _openDocs();
}, },
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().translate), title: Text(L10().translate),
subtitle: Text(L10().translateHelp), subtitle: Text(L10().translateHelp),
leading: Icon(TablerIcons.language, color: COLOR_ACTION), leading: Icon(TablerIcons.language, color: COLOR_ACTION),
onTap: () { onTap: () {
_translate(); _translate();
} }));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().reportBug), title: Text(L10().reportBug),
subtitle: Text(L10().reportBugDescription), subtitle: Text(L10().reportBugDescription),
leading: Icon(TablerIcons.bug, color: COLOR_ACTION), leading: Icon(TablerIcons.bug, color: COLOR_ACTION),
onTap: () { onTap: () {
_reportBug(context); _reportBug(context);
}, },
) ));
);
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
@ -231,7 +193,6 @@ class InvenTreeAboutWidget extends StatelessWidget {
context: context, context: context,
tiles: tiles, tiles: tiles,
).toList(), ).toList(),
) ));
);
} }
} }

93
lib/settings/app_settings.dart
View File

@ -16,17 +16,16 @@ import "package:inventree/preferences.dart";
import "package:inventree/widget/dialogs.dart"; import "package:inventree/widget/dialogs.dart";
import "package:inventree/widget/progress.dart"; import "package:inventree/widget/progress.dart";
class InvenTreeAppSettingsWidget extends StatefulWidget { class InvenTreeAppSettingsWidget extends StatefulWidget {
@override @override
_InvenTreeAppSettingsState createState() => _InvenTreeAppSettingsState(); _InvenTreeAppSettingsState createState() => _InvenTreeAppSettingsState();
} }
class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> { class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
_InvenTreeAppSettingsState(); _InvenTreeAppSettingsState();
final GlobalKey<_InvenTreeAppSettingsState> _settingsKey = GlobalKey<_InvenTreeAppSettingsState>(); final GlobalKey<_InvenTreeAppSettingsState> _settingsKey =
GlobalKey<_InvenTreeAppSettingsState>();
// Sound settings // Sound settings
bool barcodeSounds = true; bool barcodeSounds = true;
@ -48,16 +47,21 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
loadSettings(OneContext().context!); loadSettings(OneContext().context!);
} }
Future <void> loadSettings(BuildContext context) async { Future<void> loadSettings(BuildContext context) async {
showLoadingOverlay(); showLoadingOverlay();
barcodeSounds = await InvenTreeSettingsManager().getValue(INV_SOUNDS_BARCODE, true) as bool; barcodeSounds = await InvenTreeSettingsManager()
serverSounds = await InvenTreeSettingsManager().getValue(INV_SOUNDS_SERVER, true) as bool; .getValue(INV_SOUNDS_BARCODE, true) as bool;
reportErrors = await InvenTreeSettingsManager().getValue(INV_REPORT_ERRORS, true) as bool; serverSounds = await InvenTreeSettingsManager()
strictHttps = await InvenTreeSettingsManager().getValue(INV_STRICT_HTTPS, false) as bool; .getValue(INV_SOUNDS_SERVER, true) as bool;
screenOrientation = await InvenTreeSettingsManager().getValue(INV_SCREEN_ORIENTATION, SCREEN_ORIENTATION_SYSTEM) as int; reportErrors = await InvenTreeSettingsManager()
enableLabelPrinting = await InvenTreeSettingsManager().getValue(INV_ENABLE_LABEL_PRINTING, true) as bool; .getValue(INV_REPORT_ERRORS, true) as bool;
strictHttps = await InvenTreeSettingsManager()
.getValue(INV_STRICT_HTTPS, false) as bool;
screenOrientation = await InvenTreeSettingsManager()
.getValue(INV_SCREEN_ORIENTATION, SCREEN_ORIENTATION_SYSTEM) as int;
enableLabelPrinting = await InvenTreeSettingsManager()
.getValue(INV_ENABLE_LABEL_PRINTING, true) as bool;
darkMode = AdaptiveTheme.of(context).mode.isDark; darkMode = AdaptiveTheme.of(context).mode.isDark;
@ -71,7 +75,6 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
} }
Future<void> _selectLocale(BuildContext context) async { Future<void> _selectLocale(BuildContext context) async {
List<Map<String, dynamic>> options = [ List<Map<String, dynamic>> options = [
{ {
"display_name": L10().languageDefault, "display_name": L10().languageDefault,
@ -96,14 +99,9 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
} }
}; };
launchApiForm( launchApiForm(context, L10().languageSelect, "", fields,
context,
L10().languageSelect,
"",
fields,
icon: TablerIcons.circle_check, icon: TablerIcons.circle_check,
onSuccess: (Map<String, dynamic> data) async { onSuccess: (Map<String, dynamic> data) async {
String locale_name = (data["locale"] ?? "") as String; String locale_name = (data["locale"] ?? "") as String;
Locale? selected_locale; Locale? selected_locale;
@ -124,18 +122,16 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
// Clear the cached status label information // Clear the cached status label information
InvenTreeAPI().clearStatusCodeData(); InvenTreeAPI().clearStatusCodeData();
});
} }
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
String languageName = L10().languageDefault; String languageName = L10().languageDefault;
if (locale != null) { if (locale != null) {
languageName = LocaleNames.of(context)!.nameOf(locale.toString()) ?? L10().languageDefault; languageName = LocaleNames.of(context)!.nameOf(locale.toString()) ??
L10().languageDefault;
} }
IconData orientationIcon = Icons.screen_rotation; IconData orientationIcon = Icons.screen_rotation;
@ -156,12 +152,9 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
return Scaffold( return Scaffold(
key: _settingsKey, key: _settingsKey,
appBar: AppBar( appBar: AppBar(
title: Text(L10().appSettings), title: Text(L10().appSettings), backgroundColor: COLOR_APP_BAR),
backgroundColor: COLOR_APP_BAR
),
body: Container( body: Container(
child: ListView( child: ListView(children: [
children: [
/* Sound Settings */ /* Sound Settings */
Divider(height: 3), Divider(height: 3),
ListTile( ListTile(
@ -186,9 +179,7 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
setState(() { setState(() {
darkMode = value; darkMode = value;
}); });
} })),
)
),
GestureDetector( GestureDetector(
child: ListTile( child: ListTile(
title: Text(L10().orientation), title: Text(L10().orientation),
@ -197,31 +188,36 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
trailing: Icon(orientationIcon), trailing: Icon(orientationIcon),
), ),
onTap: () async { onTap: () async {
choiceDialog( choiceDialog(L10().orientation, [
L10().orientation,
[
ListTile( ListTile(
leading: Icon(Icons.screen_rotation, color: screenOrientation == SCREEN_ORIENTATION_SYSTEM ? COLOR_ACTION : null), leading: Icon(Icons.screen_rotation,
color: screenOrientation == SCREEN_ORIENTATION_SYSTEM
? COLOR_ACTION
: null),
title: Text(L10().orientationSystem), title: Text(L10().orientationSystem),
), ),
ListTile( ListTile(
leading: Icon(Icons.screen_lock_portrait, color: screenOrientation == SCREEN_ORIENTATION_PORTRAIT ? COLOR_ACTION : null), leading: Icon(Icons.screen_lock_portrait,
color: screenOrientation == SCREEN_ORIENTATION_PORTRAIT
? COLOR_ACTION
: null),
title: Text(L10().orientationPortrait), title: Text(L10().orientationPortrait),
), ),
ListTile( ListTile(
leading: Icon(Icons.screen_lock_landscape, color: screenOrientation == SCREEN_ORIENTATION_LANDSCAPE ? COLOR_ACTION : null), leading: Icon(Icons.screen_lock_landscape,
color: screenOrientation == SCREEN_ORIENTATION_LANDSCAPE
? COLOR_ACTION
: null),
title: Text(L10().orientationLandscape), title: Text(L10().orientationLandscape),
) )
], ], onSelected: (idx) async {
onSelected: (idx) async {
screenOrientation = idx as int; screenOrientation = idx as int;
InvenTreeSettingsManager().setValue(INV_SCREEN_ORIENTATION, screenOrientation); InvenTreeSettingsManager()
.setValue(INV_SCREEN_ORIENTATION, screenOrientation);
setState(() { setState(() {});
}); });
}
);
}, },
), ),
ListTile( ListTile(
@ -231,12 +227,12 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
trailing: Switch( trailing: Switch(
value: enableLabelPrinting, value: enableLabelPrinting,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_ENABLE_LABEL_PRINTING, value); InvenTreeSettingsManager()
.setValue(INV_ENABLE_LABEL_PRINTING, value);
setState(() { setState(() {
enableLabelPrinting = value; enableLabelPrinting = value;
}); });
} }),
),
), ),
ListTile( ListTile(
title: Text(L10().strictHttps), title: Text(L10().strictHttps),
@ -311,9 +307,6 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
), ),
), ),
Divider(height: 1), Divider(height: 1),
] ])));
)
)
);
} }
} }

63
lib/settings/barcode_settings.dart
View File

@ -7,22 +7,22 @@ import "package:inventree/app_colors.dart";
import "package:inventree/widget/dialogs.dart"; import "package:inventree/widget/dialogs.dart";
class InvenTreeBarcodeSettingsWidget extends StatefulWidget { class InvenTreeBarcodeSettingsWidget extends StatefulWidget {
@override @override
_InvenTreeBarcodeSettingsState createState() => _InvenTreeBarcodeSettingsState(); _InvenTreeBarcodeSettingsState createState() =>
_InvenTreeBarcodeSettingsState();
} }
class _InvenTreeBarcodeSettingsState
class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidget> { extends State<InvenTreeBarcodeSettingsWidget> {
_InvenTreeBarcodeSettingsState(); _InvenTreeBarcodeSettingsState();
int barcodeScanDelay = 500; int barcodeScanDelay = 500;
int barcodeScanType = BARCODE_CONTROLLER_CAMERA; int barcodeScanType = BARCODE_CONTROLLER_CAMERA;
bool barcodeScanSingle = false; bool barcodeScanSingle = false;
final TextEditingController _barcodeScanDelayController = TextEditingController(); final TextEditingController _barcodeScanDelayController =
TextEditingController();
@override @override
void initState() { void initState() {
@ -31,20 +31,21 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
} }
Future<void> loadSettings() async { Future<void> loadSettings() async {
barcodeScanDelay = await InvenTreeSettingsManager().getValue(INV_BARCODE_SCAN_DELAY, 500) as int; barcodeScanDelay = await InvenTreeSettingsManager()
barcodeScanType = await InvenTreeSettingsManager().getValue(INV_BARCODE_SCAN_TYPE, BARCODE_CONTROLLER_CAMERA) as int; .getValue(INV_BARCODE_SCAN_DELAY, 500) as int;
barcodeScanSingle = await InvenTreeSettingsManager().getBool(INV_BARCODE_SCAN_SINGLE, false); barcodeScanType = await InvenTreeSettingsManager()
.getValue(INV_BARCODE_SCAN_TYPE, BARCODE_CONTROLLER_CAMERA) as int;
barcodeScanSingle = await InvenTreeSettingsManager()
.getBool(INV_BARCODE_SCAN_SINGLE, false);
if (mounted) { if (mounted) {
setState(() { setState(() {});
});
} }
} }
// Callback function to edit the barcode scan delay value // Callback function to edit the barcode scan delay value
// TODO: Next time any new settings are added, refactor this into a generic function // TODO: Next time any new settings are added, refactor this into a generic function
Future<void> _editBarcodeScanDelay(BuildContext context) async { Future<void> _editBarcodeScanDelay(BuildContext context) async {
_barcodeScanDelayController.text = barcodeScanDelay.toString(); _barcodeScanDelayController.text = barcodeScanDelay.toString();
return showDialog( return showDialog(
@ -76,13 +77,15 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
textColor: Colors.white, textColor: Colors.white,
child: Text(L10().ok), child: Text(L10().ok),
onPressed: () async { onPressed: () async {
int delay = int.tryParse(_barcodeScanDelayController.text) ?? barcodeScanDelay; int delay = int.tryParse(_barcodeScanDelayController.text) ??
barcodeScanDelay;
// Apply limits // Apply limits
if (delay < 100) delay = 100; if (delay < 100) delay = 100;
if (delay > 2500) delay = 2500; if (delay > 2500) delay = 2500;
InvenTreeSettingsManager().setValue(INV_BARCODE_SCAN_DELAY, delay); InvenTreeSettingsManager()
.setValue(INV_BARCODE_SCAN_DELAY, delay);
setState(() { setState(() {
barcodeScanDelay = delay; barcodeScanDelay = delay;
Navigator.pop(context); Navigator.pop(context);
@ -91,13 +94,11 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
), ),
], ],
); );
} });
);
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// Construct an icon for the barcode scanner input // Construct an icon for the barcode scanner input
Widget? barcodeInputIcon; Widget? barcodeInputIcon;
@ -113,9 +114,7 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(L10().barcodeSettings), title: Text(L10().barcodeSettings), backgroundColor: COLOR_APP_BAR),
backgroundColor: COLOR_APP_BAR
),
body: Container( body: Container(
child: ListView( child: ListView(
children: [ children: [
@ -125,9 +124,7 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
leading: Icon(Icons.qr_code_scanner), leading: Icon(Icons.qr_code_scanner),
trailing: barcodeInputIcon, trailing: barcodeInputIcon,
onTap: () async { onTap: () async {
choiceDialog( choiceDialog(L10().barcodeScanController, [
L10().barcodeScanController,
[
ListTile( ListTile(
title: Text(L10().cameraInternal), title: Text(L10().cameraInternal),
subtitle: Text(L10().cameraInternalDetail), subtitle: Text(L10().cameraInternalDetail),
@ -138,17 +135,15 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
subtitle: Text(L10().scannerExternalDetail), subtitle: Text(L10().scannerExternalDetail),
leading: Icon(Icons.barcode_reader), leading: Icon(Icons.barcode_reader),
) )
], ], onSelected: (idx) async {
onSelected: (idx) async {
barcodeScanType = idx as int; barcodeScanType = idx as int;
InvenTreeSettingsManager().setValue(INV_BARCODE_SCAN_TYPE, barcodeScanType); InvenTreeSettingsManager()
.setValue(INV_BARCODE_SCAN_TYPE, barcodeScanType);
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
} });
); }),
}
),
ListTile( ListTile(
title: Text(L10().barcodeScanDelay), title: Text(L10().barcodeScanDelay),
subtitle: Text(L10().barcodeScanDelayDetail), subtitle: Text(L10().barcodeScanDelayDetail),
@ -167,7 +162,8 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
trailing: Switch( trailing: Switch(
value: barcodeScanSingle, value: barcodeScanSingle,
onChanged: (bool v) { onChanged: (bool v) {
InvenTreeSettingsManager().setValue(INV_BARCODE_SCAN_SINGLE, v); InvenTreeSettingsManager()
.setValue(INV_BARCODE_SCAN_SINGLE, v);
setState(() { setState(() {
barcodeScanSingle = v; barcodeScanSingle = v;
}); });
@ -175,9 +171,6 @@ class _InvenTreeBarcodeSettingsState extends State<InvenTreeBarcodeSettingsWidge
), ),
) )
], ],
) )));
)
);
} }
} }

50
lib/settings/home_settings.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
@ -12,10 +11,10 @@ class HomeScreenSettingsWidget extends StatefulWidget {
} }
class _HomeScreenSettingsState extends State<HomeScreenSettingsWidget> { class _HomeScreenSettingsState extends State<HomeScreenSettingsWidget> {
_HomeScreenSettingsState(); _HomeScreenSettingsState();
final GlobalKey<_HomeScreenSettingsState> _settingsKey = GlobalKey<_HomeScreenSettingsState>(); final GlobalKey<_HomeScreenSettingsState> _settingsKey =
GlobalKey<_HomeScreenSettingsState>();
// Home screen settings // Home screen settings
bool homeShowSubscribed = true; bool homeShowSubscribed = true;
@ -32,24 +31,27 @@ class _HomeScreenSettingsState extends State<HomeScreenSettingsWidget> {
loadSettings(); loadSettings();
} }
Future <void> loadSettings() async { Future<void> loadSettings() async {
// Load initial settings // Load initial settings
homeShowSubscribed = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SUBSCRIBED, true) as bool; homeShowSubscribed = await InvenTreeSettingsManager()
homeShowPo = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_PO, true) as bool; .getValue(INV_HOME_SHOW_SUBSCRIBED, true) as bool;
homeShowSo = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SO, true) as bool; homeShowPo = await InvenTreeSettingsManager()
homeShowManufacturers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_MANUFACTURERS, true) as bool; .getValue(INV_HOME_SHOW_PO, true) as bool;
homeShowCustomers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_CUSTOMERS, true) as bool; homeShowSo = await InvenTreeSettingsManager()
homeShowSuppliers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SUPPLIERS, true) as bool; .getValue(INV_HOME_SHOW_SO, true) as bool;
homeShowManufacturers = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_MANUFACTURERS, true) as bool;
homeShowCustomers = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_CUSTOMERS, true) as bool;
homeShowSuppliers = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_SUPPLIERS, true) as bool;
setState(() { setState(() {});
});
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
key: _settingsKey, key: _settingsKey,
appBar: AppBar( appBar: AppBar(
@ -57,8 +59,7 @@ class _HomeScreenSettingsState extends State<HomeScreenSettingsWidget> {
backgroundColor: COLOR_APP_BAR, backgroundColor: COLOR_APP_BAR,
), ),
body: Container( body: Container(
child: ListView( child: ListView(children: [
children: [
ListTile( ListTile(
title: Text(L10().homeShowSubscribed), title: Text(L10().homeShowSubscribed),
subtitle: Text(L10().homeShowSubscribedDescription), subtitle: Text(L10().homeShowSubscribedDescription),
@ -66,13 +67,13 @@ class _HomeScreenSettingsState extends State<HomeScreenSettingsWidget> {
trailing: Switch( trailing: Switch(
value: homeShowSubscribed, value: homeShowSubscribed,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_HOME_SHOW_SUBSCRIBED, value); InvenTreeSettingsManager()
.setValue(INV_HOME_SHOW_SUBSCRIBED, value);
setState(() { setState(() {
homeShowSubscribed = value; homeShowSubscribed = value;
}); });
}, },
) )),
),
ListTile( ListTile(
title: Text(L10().homeShowPo), title: Text(L10().homeShowPo),
subtitle: Text(L10().homeShowPoDescription), subtitle: Text(L10().homeShowPoDescription),
@ -108,7 +109,8 @@ class _HomeScreenSettingsState extends State<HomeScreenSettingsWidget> {
trailing: Switch( trailing: Switch(
value: homeShowSuppliers, value: homeShowSuppliers,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_HOME_SHOW_SUPPLIERS, value); InvenTreeSettingsManager()
.setValue(INV_HOME_SHOW_SUPPLIERS, value);
setState(() { setState(() {
homeShowSuppliers = value; homeShowSuppliers = value;
}); });
@ -140,16 +142,14 @@ class _HomeScreenSettingsState extends State<HomeScreenSettingsWidget> {
trailing: Switch( trailing: Switch(
value: homeShowCustomers, value: homeShowCustomers,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_HOME_SHOW_CUSTOMERS, value); InvenTreeSettingsManager()
.setValue(INV_HOME_SHOW_CUSTOMERS, value);
setState(() { setState(() {
homeShowCustomers = value; homeShowCustomers = value;
}); });
}, },
), ),
), ),
] ])));
)
)
);
} }
} }

32
lib/settings/login.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -9,21 +8,16 @@ import "package:inventree/api.dart";
import "package:inventree/widget/dialogs.dart"; import "package:inventree/widget/dialogs.dart";
import "package:inventree/widget/progress.dart"; import "package:inventree/widget/progress.dart";
class InvenTreeLoginWidget extends StatefulWidget { class InvenTreeLoginWidget extends StatefulWidget {
const InvenTreeLoginWidget(this.profile) : super(); const InvenTreeLoginWidget(this.profile) : super();
final UserProfile profile; final UserProfile profile;
@override @override
_InvenTreeLoginState createState() => _InvenTreeLoginState(); _InvenTreeLoginState createState() => _InvenTreeLoginState();
} }
class _InvenTreeLoginState extends State<InvenTreeLoginWidget> { class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
final formKey = GlobalKey<FormState>(); final formKey = GlobalKey<FormState>();
String username = ""; String username = "";
@ -35,14 +29,12 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
// Attempt login // Attempt login
Future<void> _doLogin(BuildContext context) async { Future<void> _doLogin(BuildContext context) async {
// Save form // Save form
formKey.currentState?.save(); formKey.currentState?.save();
bool valid = formKey.currentState?.validate() ?? false; bool valid = formKey.currentState?.validate() ?? false;
if (valid) { if (valid) {
// Dismiss the keyboard // Dismiss the keyboard
FocusScopeNode currentFocus = FocusScope.of(context); FocusScopeNode currentFocus = FocusScope.of(context);
@ -53,7 +45,8 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
showLoadingOverlay(); showLoadingOverlay();
// Attempt login // Attempt login
final response = await InvenTreeAPI().fetchToken(widget.profile, username, password); final response =
await InvenTreeAPI().fetchToken(widget.profile, username, password);
hideLoadingOverlay(); hideLoadingOverlay();
@ -75,12 +68,10 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
}); });
} }
} }
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Widget> before = [ List<Widget> before = [
ListTile( ListTile(
title: Text(L10().loginEnter), title: Text(L10().loginEnter),
@ -116,8 +107,7 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
_doLogin(context); _doLogin(context);
}, },
) )
] ]),
),
body: Form( body: Form(
key: formKey, key: formKey,
child: SingleChildScrollView( child: SingleChildScrollView(
@ -131,8 +121,7 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
decoration: InputDecoration( decoration: InputDecoration(
labelText: L10().username, labelText: L10().username,
labelStyle: TextStyle(fontWeight: FontWeight.bold), labelStyle: TextStyle(fontWeight: FontWeight.bold),
hintText: L10().enterUsername hintText: L10().enterUsername),
),
initialValue: "", initialValue: "",
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
onSaved: (value) { onSaved: (value) {
@ -152,7 +141,9 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
labelStyle: TextStyle(fontWeight: FontWeight.bold), labelStyle: TextStyle(fontWeight: FontWeight.bold),
hintText: L10().enterPassword, hintText: L10().enterPassword,
suffixIcon: IconButton( suffixIcon: IconButton(
icon: _obscured ? Icon(TablerIcons.eye) : Icon(TablerIcons.eye_off), icon: _obscured
? Icon(TablerIcons.eye)
: Icon(TablerIcons.eye_off),
onPressed: () { onPressed: () {
setState(() { setState(() {
_obscured = !_obscured; _obscured = !_obscured;
@ -172,16 +163,11 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
} }
return null; return null;
} }),
),
...after, ...after,
], ],
), ),
padding: EdgeInsets.all(16), padding: EdgeInsets.all(16),
) )));
)
);
} }
} }

55
lib/settings/part_settings.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -6,15 +5,12 @@ import "package:inventree/l10.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
import "package:inventree/preferences.dart"; import "package:inventree/preferences.dart";
class InvenTreePartSettingsWidget extends StatefulWidget { class InvenTreePartSettingsWidget extends StatefulWidget {
@override @override
_InvenTreePartSettingsState createState() => _InvenTreePartSettingsState(); _InvenTreePartSettingsState createState() => _InvenTreePartSettingsState();
} }
class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> { class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
_InvenTreePartSettingsState(); _InvenTreePartSettingsState();
bool partShowParameters = true; bool partShowParameters = true;
@ -32,16 +28,21 @@ class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
} }
Future<void> loadSettings() async { Future<void> loadSettings() async {
partShowParameters = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PARAMETERS, true); partShowParameters = await InvenTreeSettingsManager()
partShowBom = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_BOM, true); .getBool(INV_PART_SHOW_PARAMETERS, true);
partShowPricing = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PRICING, true); partShowBom =
stockShowHistory = await InvenTreeSettingsManager().getBool(INV_STOCK_SHOW_HISTORY, false); await InvenTreeSettingsManager().getBool(INV_PART_SHOW_BOM, true);
stockShowTests = await InvenTreeSettingsManager().getBool(INV_STOCK_SHOW_TESTS, true); partShowPricing =
stockConfirmScan = await InvenTreeSettingsManager().getBool(INV_STOCK_CONFIRM_SCAN, false); await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PRICING, true);
stockShowHistory =
await InvenTreeSettingsManager().getBool(INV_STOCK_SHOW_HISTORY, false);
stockShowTests =
await InvenTreeSettingsManager().getBool(INV_STOCK_SHOW_TESTS, true);
stockConfirmScan =
await InvenTreeSettingsManager().getBool(INV_STOCK_CONFIRM_SCAN, false);
if (mounted) { if (mounted) {
setState(() { setState(() {});
});
} }
} }
@ -49,12 +50,9 @@ class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(L10().partSettings), title: Text(L10().partSettings), backgroundColor: COLOR_APP_BAR),
backgroundColor: COLOR_APP_BAR
),
body: Container( body: Container(
child: ListView( child: ListView(children: [
children: [
ListTile( ListTile(
title: Text(L10().parameters), title: Text(L10().parameters),
subtitle: Text(L10().parametersSettingDetail), subtitle: Text(L10().parametersSettingDetail),
@ -62,7 +60,8 @@ class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
trailing: Switch( trailing: Switch(
value: partShowParameters, value: partShowParameters,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_PART_SHOW_PARAMETERS, value); InvenTreeSettingsManager()
.setValue(INV_PART_SHOW_PARAMETERS, value);
setState(() { setState(() {
partShowParameters = value; partShowParameters = value;
}); });
@ -90,7 +89,8 @@ class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
trailing: Switch( trailing: Switch(
value: partShowPricing, value: partShowPricing,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_PART_SHOW_PRICING, value); InvenTreeSettingsManager()
.setValue(INV_PART_SHOW_PRICING, value);
setState(() { setState(() {
partShowPricing = value; partShowPricing = value;
}); });
@ -105,7 +105,8 @@ class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
trailing: Switch( trailing: Switch(
value: stockShowHistory, value: stockShowHistory,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_STOCK_SHOW_HISTORY, value); InvenTreeSettingsManager()
.setValue(INV_STOCK_SHOW_HISTORY, value);
setState(() { setState(() {
stockShowHistory = value; stockShowHistory = value;
}); });
@ -119,7 +120,8 @@ class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
trailing: Switch( trailing: Switch(
value: stockShowTests, value: stockShowTests,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_STOCK_SHOW_TESTS, value); InvenTreeSettingsManager()
.setValue(INV_STOCK_SHOW_TESTS, value);
setState(() { setState(() {
stockShowTests = value; stockShowTests = value;
}); });
@ -133,16 +135,13 @@ class _InvenTreePartSettingsState extends State<InvenTreePartSettingsWidget> {
trailing: Switch( trailing: Switch(
value: stockConfirmScan, value: stockConfirmScan,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_STOCK_CONFIRM_SCAN, value); InvenTreeSettingsManager()
.setValue(INV_STOCK_CONFIRM_SCAN, value);
setState(() { setState(() {
stockConfirmScan = value; stockConfirmScan = value;
}); });
} }),
),
) )
] ])));
)
)
);
} }
} }

29
lib/settings/purchase_order_settings.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
@ -6,15 +5,14 @@ import "package:inventree/app_colors.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
import "package:inventree/preferences.dart"; import "package:inventree/preferences.dart";
class InvenTreePurchaseOrderSettingsWidget extends StatefulWidget { class InvenTreePurchaseOrderSettingsWidget extends StatefulWidget {
@override @override
_InvenTreePurchaseOrderSettingsState createState() => _InvenTreePurchaseOrderSettingsState(); _InvenTreePurchaseOrderSettingsState createState() =>
_InvenTreePurchaseOrderSettingsState();
} }
class _InvenTreePurchaseOrderSettingsState
class _InvenTreePurchaseOrderSettingsState extends State<InvenTreePurchaseOrderSettingsWidget> { extends State<InvenTreePurchaseOrderSettingsWidget> {
_InvenTreePurchaseOrderSettingsState(); _InvenTreePurchaseOrderSettingsState();
bool poEnable = true; bool poEnable = true;
@ -30,12 +28,13 @@ class _InvenTreePurchaseOrderSettingsState extends State<InvenTreePurchaseOrderS
Future<void> loadSettings() async { Future<void> loadSettings() async {
poEnable = await InvenTreeSettingsManager().getBool(INV_PO_ENABLE, true); poEnable = await InvenTreeSettingsManager().getBool(INV_PO_ENABLE, true);
poShowCamera = await InvenTreeSettingsManager().getBool(INV_PO_SHOW_CAMERA, true); poShowCamera =
poConfirmScan = await InvenTreeSettingsManager().getBool(INV_PO_CONFIRM_SCAN, true); await InvenTreeSettingsManager().getBool(INV_PO_SHOW_CAMERA, true);
poConfirmScan =
await InvenTreeSettingsManager().getBool(INV_PO_CONFIRM_SCAN, true);
if (mounted) { if (mounted) {
setState(() { setState(() {});
});
} }
} }
@ -47,8 +46,7 @@ class _InvenTreePurchaseOrderSettingsState extends State<InvenTreePurchaseOrderS
backgroundColor: COLOR_APP_BAR, backgroundColor: COLOR_APP_BAR,
), ),
body: Container( body: Container(
child: ListView( child: ListView(children: [
children: [
ListTile( ListTile(
title: Text(L10().purchaseOrderEnable), title: Text(L10().purchaseOrderEnable),
subtitle: Text(L10().purchaseOrderEnableDetail), subtitle: Text(L10().purchaseOrderEnableDetail),
@ -81,7 +79,7 @@ class _InvenTreePurchaseOrderSettingsState extends State<InvenTreePurchaseOrderS
title: Text(L10().purchaseOrderConfirmScan), title: Text(L10().purchaseOrderConfirmScan),
subtitle: Text(L10().purchaseOrderConfirmScanDetail), subtitle: Text(L10().purchaseOrderConfirmScanDetail),
leading: Icon(TablerIcons.barcode), leading: Icon(TablerIcons.barcode),
trailing: Switch ( trailing: Switch(
value: poConfirmScan, value: poConfirmScan,
onChanged: (bool value) { onChanged: (bool value) {
InvenTreeSettingsManager().setValue(INV_PO_CONFIRM_SCAN, value); InvenTreeSettingsManager().setValue(INV_PO_CONFIRM_SCAN, value);
@ -91,9 +89,6 @@ class _InvenTreePurchaseOrderSettingsState extends State<InvenTreePurchaseOrderS
}, },
), ),
) )
] ])));
)
)
);
} }
} }

15
lib/settings/release.dart
View File

@ -6,15 +6,13 @@ import "package:url_launcher/url_launcher.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
class ReleaseNotesWidget extends StatelessWidget { class ReleaseNotesWidget extends StatelessWidget {
const ReleaseNotesWidget(this.releaseNotes); const ReleaseNotesWidget(this.releaseNotes);
final String releaseNotes; final String releaseNotes;
@override @override
Widget build (BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(L10().releaseNotes), title: Text(L10().releaseNotes),
@ -29,21 +27,17 @@ class ReleaseNotesWidget extends StatelessWidget {
openLink(link); openLink(link);
} }
}, },
) ));
);
} }
} }
class CreditsWidget extends StatelessWidget { class CreditsWidget extends StatelessWidget {
const CreditsWidget(this.credits); const CreditsWidget(this.credits);
final String credits; final String credits;
// Callback function when a link is clicked in the markdown // Callback function when a link is clicked in the markdown
Future<void> openLink(String url) async { Future<void> openLink(String url) async {
final link = Uri.parse(url); final link = Uri.parse(url);
if (await canLaunchUrl(link)) { if (await canLaunchUrl(link)) {
@ -52,7 +46,7 @@ class CreditsWidget extends StatelessWidget {
} }
@override @override
Widget build (BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(L10().credits), title: Text(L10().credits),
@ -67,7 +61,6 @@ class CreditsWidget extends StatelessWidget {
openLink(link); openLink(link);
} }
}, },
) ));
);
} }
} }

24
lib/settings/sales_order_settings.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -6,15 +5,14 @@ import "package:inventree/l10.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
import "package:inventree/preferences.dart"; import "package:inventree/preferences.dart";
class InvenTreeSalesOrderSettingsWidget extends StatefulWidget { class InvenTreeSalesOrderSettingsWidget extends StatefulWidget {
@override @override
_InvenTreeSalesOrderSettingsState createState() => _InvenTreeSalesOrderSettingsState(); _InvenTreeSalesOrderSettingsState createState() =>
_InvenTreeSalesOrderSettingsState();
} }
class _InvenTreeSalesOrderSettingsState
class _InvenTreeSalesOrderSettingsState extends State<InvenTreeSalesOrderSettingsWidget> { extends State<InvenTreeSalesOrderSettingsWidget> {
_InvenTreeSalesOrderSettingsState(); _InvenTreeSalesOrderSettingsState();
bool soEnable = true; bool soEnable = true;
@ -29,11 +27,11 @@ class _InvenTreeSalesOrderSettingsState extends State<InvenTreeSalesOrderSetting
Future<void> loadSettings() async { Future<void> loadSettings() async {
soEnable = await InvenTreeSettingsManager().getBool(INV_SO_ENABLE, true); soEnable = await InvenTreeSettingsManager().getBool(INV_SO_ENABLE, true);
soShowCamera = await InvenTreeSettingsManager().getBool(INV_SO_SHOW_CAMERA, true); soShowCamera =
await InvenTreeSettingsManager().getBool(INV_SO_SHOW_CAMERA, true);
if (mounted) { if (mounted) {
setState(() { setState(() {});
});
} }
} }
@ -45,8 +43,7 @@ class _InvenTreeSalesOrderSettingsState extends State<InvenTreeSalesOrderSetting
backgroundColor: COLOR_APP_BAR, backgroundColor: COLOR_APP_BAR,
), ),
body: Container( body: Container(
child: ListView( child: ListView(children: [
children: [
ListTile( ListTile(
title: Text(L10().salesOrderEnable), title: Text(L10().salesOrderEnable),
subtitle: Text(L10().salesOrderEnableDetail), subtitle: Text(L10().salesOrderEnableDetail),
@ -75,9 +72,6 @@ class _InvenTreeSalesOrderSettingsState extends State<InvenTreeSalesOrderSetting
}, },
), ),
), ),
] ])));
)
)
);
} }
} }

129
lib/settings/select_server.dart
View File

@ -12,39 +12,35 @@ import "package:inventree/api.dart";
import "package:inventree/user_profile.dart"; import "package:inventree/user_profile.dart";
class InvenTreeSelectServerWidget extends StatefulWidget { class InvenTreeSelectServerWidget extends StatefulWidget {
@override @override
_InvenTreeSelectServerState createState() => _InvenTreeSelectServerState(); _InvenTreeSelectServerState createState() => _InvenTreeSelectServerState();
} }
class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> { class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
_InvenTreeSelectServerState() { _InvenTreeSelectServerState() {
_reload(); _reload();
} }
final GlobalKey<_InvenTreeSelectServerState> _loginKey = GlobalKey<_InvenTreeSelectServerState>(); final GlobalKey<_InvenTreeSelectServerState> _loginKey =
GlobalKey<_InvenTreeSelectServerState>();
List<UserProfile> profiles = []; List<UserProfile> profiles = [];
Future <void> _reload() async { Future<void> _reload() async {
profiles = await UserProfileDBManager().getAllProfiles(); profiles = await UserProfileDBManager().getAllProfiles();
if (!mounted) { if (!mounted) {
return; return;
} }
setState(() { setState(() {});
});
} }
/* /*
* Logout the selected profile (delete the stored token) * Logout the selected profile (delete the stored token)
*/ */
Future<void> _logoutProfile(BuildContext context, {UserProfile? userProfile}) async { Future<void> _logoutProfile(BuildContext context,
{UserProfile? userProfile}) async {
if (userProfile != null) { if (userProfile != null) {
userProfile.token = ""; userProfile.token = "";
await UserProfileDBManager().updateProfile(userProfile); await UserProfileDBManager().updateProfile(userProfile);
@ -54,26 +50,23 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
InvenTreeAPI().disconnectFromServer(); InvenTreeAPI().disconnectFromServer();
_reload(); _reload();
} }
/* /*
* Edit the selected profile * Edit the selected profile
*/ */
void _editProfile(BuildContext context, {UserProfile? userProfile, bool createNew = false}) { void _editProfile(BuildContext context,
{UserProfile? userProfile, bool createNew = false}) {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => ProfileEditWidget(userProfile) builder: (context) => ProfileEditWidget(userProfile)))
) .then((context) {
).then((context) {
_reload(); _reload();
}); });
} }
Future <void> _selectProfile(BuildContext context, UserProfile profile) async { Future<void> _selectProfile(BuildContext context, UserProfile profile) async {
// Disconnect InvenTree // Disconnect InvenTree
InvenTreeAPI().disconnectFromServer(); InvenTreeAPI().disconnectFromServer();
@ -94,9 +87,11 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
// First check if the profile has an associate token // First check if the profile has an associate token
if (!prf.hasToken) { if (!prf.hasToken) {
// Redirect user to login screen // Redirect user to login screen
Navigator.push(context, Navigator.push(
MaterialPageRoute(builder: (context) => InvenTreeLoginWidget(profile)) context,
).then((value) async { MaterialPageRoute(
builder: (context) => InvenTreeLoginWidget(profile)))
.then((value) async {
_reload(); _reload();
// Reload profile // Reload profile
prf = await UserProfileDBManager().getProfileByKey(key); prf = await UserProfileDBManager().getProfileByKey(key);
@ -125,8 +120,7 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
_reload(); _reload();
} }
Future <void> _deleteProfile(UserProfile profile) async { Future<void> _deleteProfile(UserProfile profile) async {
await UserProfileDBManager().deleteProfile(profile); await UserProfileDBManager().deleteProfile(profile);
if (!mounted) { if (!mounted) {
@ -135,13 +129,13 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
_reload(); _reload();
if (InvenTreeAPI().isConnected() && profile.key == (InvenTreeAPI().profile?.key ?? "")) { if (InvenTreeAPI().isConnected() &&
profile.key == (InvenTreeAPI().profile?.key ?? "")) {
InvenTreeAPI().disconnectFromServer(); InvenTreeAPI().disconnectFromServer();
} }
} }
Widget? _getProfileIcon(UserProfile profile) { Widget? _getProfileIcon(UserProfile profile) {
// Not selected? No icon for you! // Not selected? No icon for you!
if (!profile.selected) return null; if (!profile.selected) return null;
@ -152,10 +146,7 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
// Reflect the connection status of the server // Reflect the connection status of the server
if (InvenTreeAPI().isConnected()) { if (InvenTreeAPI().isConnected()) {
return Icon( return Icon(TablerIcons.circle_check, color: COLOR_SUCCESS);
TablerIcons.circle_check,
color: COLOR_SUCCESS
);
} else if (InvenTreeAPI().isConnecting()) { } else if (InvenTreeAPI().isConnecting()) {
return Spinner( return Spinner(
icon: TablerIcons.loader_2, icon: TablerIcons.loader_2,
@ -171,7 +162,6 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Widget> children = []; List<Widget> children = [];
if (profiles.isNotEmpty) { if (profiles.isNotEmpty) {
@ -182,16 +172,18 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
title: Text( title: Text(
profile.name, profile.name,
), ),
tileColor: profile.selected ? Theme.of(context).secondaryHeaderColor : null, tileColor:
profile.selected ? Theme.of(context).secondaryHeaderColor : null,
subtitle: Text("${profile.server}"), subtitle: Text("${profile.server}"),
leading: profile.hasToken ? Icon(TablerIcons.user_check, color: COLOR_SUCCESS) : Icon(TablerIcons.user_cancel, color: COLOR_WARNING), leading: profile.hasToken
? Icon(TablerIcons.user_check, color: COLOR_SUCCESS)
: Icon(TablerIcons.user_cancel, color: COLOR_WARNING),
trailing: _getProfileIcon(profile), trailing: _getProfileIcon(profile),
onTap: () { onTap: () {
_selectProfile(context, profile); _selectProfile(context, profile);
}, },
onLongPress: () { onLongPress: () {
OneContext().showDialog( OneContext().showDialog(builder: (BuildContext context) {
builder: (BuildContext context) {
return SimpleDialog( return SimpleDialog(
title: Text(profile.name), title: Text(profile.name),
children: <Widget>[ children: <Widget>[
@ -204,8 +196,7 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
child: ListTile( child: ListTile(
title: Text(L10().profileConnect), title: Text(L10().profileConnect),
leading: Icon(TablerIcons.server), leading: Icon(TablerIcons.server),
) )),
),
SimpleDialogOption( SimpleDialogOption(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -213,9 +204,7 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
}, },
child: ListTile( child: ListTile(
title: Text(L10().profileEdit), title: Text(L10().profileEdit),
leading: Icon(TablerIcons.edit) leading: Icon(TablerIcons.edit))),
)
),
SimpleDialogOption( SimpleDialogOption(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -224,42 +213,35 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
child: ListTile( child: ListTile(
title: Text(L10().profileLogout), title: Text(L10().profileLogout),
leading: Icon(TablerIcons.logout), leading: Icon(TablerIcons.logout),
) )),
),
Divider(), Divider(),
SimpleDialogOption( SimpleDialogOption(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
// Navigator.of(context, rootNavigator: true).pop(); // Navigator.of(context, rootNavigator: true).pop();
confirmationDialog( confirmationDialog(
L10().delete, L10().delete, L10().profileDelete + "?",
L10().profileDelete + "?",
color: Colors.red, color: Colors.red,
icon: TablerIcons.trash, icon: TablerIcons.trash, onAccept: () {
onAccept: () {
_deleteProfile(profile); _deleteProfile(profile);
} });
);
}, },
child: ListTile( child: ListTile(
title: Text(L10().profileDelete, style: TextStyle(color: Colors.red)), title: Text(L10().profileDelete,
style: TextStyle(color: Colors.red)),
leading: Icon(TablerIcons.trash, color: Colors.red), leading: Icon(TablerIcons.trash, color: Colors.red),
) ))
)
], ],
); );
} });
);
}, },
)); ));
} }
} else { } else {
// No profile available! // No profile available!
children.add( children.add(ListTile(
ListTile(
title: Text(L10().profileNone), title: Text(L10().profileNone),
) ));
);
} }
return Scaffold( return Scaffold(
@ -278,22 +260,17 @@ class _InvenTreeSelectServerState extends State<InvenTreeSelectServerWidget> {
), ),
body: Container( body: Container(
child: ListView( child: ListView(
children: ListTile.divideTiles( children:
context: context, ListTile.divideTiles(context: context, tiles: children).toList(),
tiles: children )),
).toList(),
)
),
); );
} }
} }
/* /*
* Widget for editing server details * Widget for editing server details
*/ */
class ProfileEditWidget extends StatefulWidget { class ProfileEditWidget extends StatefulWidget {
const ProfileEditWidget(this.profile) : super(); const ProfileEditWidget(this.profile) : super();
final UserProfile? profile; final UserProfile? profile;
@ -303,7 +280,6 @@ class ProfileEditWidget extends StatefulWidget {
} }
class _ProfileEditState extends State<ProfileEditWidget> { class _ProfileEditState extends State<ProfileEditWidget> {
_ProfileEditState() : super(); _ProfileEditState() : super();
final formKey = GlobalKey<FormState>(); final formKey = GlobalKey<FormState>();
@ -316,7 +292,8 @@ class _ProfileEditState extends State<ProfileEditWidget> {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: COLOR_APP_BAR, backgroundColor: COLOR_APP_BAR,
title: Text(widget.profile == null ? L10().profileAdd : L10().profileEdit), title: Text(
widget.profile == null ? L10().profileAdd : L10().profileEdit),
actions: [ actions: [
IconButton( IconButton(
icon: Icon(TablerIcons.circle_check), icon: Icon(TablerIcons.circle_check),
@ -334,7 +311,6 @@ class _ProfileEditState extends State<ProfileEditWidget> {
await UserProfileDBManager().addProfile(profile); await UserProfileDBManager().addProfile(profile);
} else { } else {
prf.name = name; prf.name = name;
prf.server = server; prf.server = server;
@ -346,8 +322,7 @@ class _ProfileEditState extends State<ProfileEditWidget> {
} }
}, },
) )
] ]),
),
body: Form( body: Form(
key: formKey, key: formKey,
child: SingleChildScrollView( child: SingleChildScrollView(
@ -373,8 +348,7 @@ class _ProfileEditState extends State<ProfileEditWidget> {
} }
return null; return null;
} }),
),
TextFormField( TextFormField(
decoration: InputDecoration( decoration: InputDecoration(
labelText: L10().server, labelText: L10().server,
@ -398,7 +372,8 @@ class _ProfileEditState extends State<ProfileEditWidget> {
return L10().invalidHost; return L10().invalidHost;
} }
if (!value.startsWith("http:") && !value.startsWith("https:")) { if (!value.startsWith("http:") &&
!value.startsWith("https:")) {
// return L10().serverStart; // return L10().serverStart;
} }
@ -410,7 +385,8 @@ class _ProfileEditState extends State<ProfileEditWidget> {
Uri uri = Uri.parse(value); Uri uri = Uri.parse(value);
if (uri.hasScheme) { if (uri.hasScheme) {
if (!["http", "https"].contains(uri.scheme.toLowerCase())) { if (!["http", "https"]
.contains(uri.scheme.toLowerCase())) {
return L10().serverStart; return L10().serverStart;
} }
} else { } else {
@ -422,12 +398,9 @@ class _ProfileEditState extends State<ProfileEditWidget> {
return null; return null;
}, },
), ),
] ]),
),
padding: EdgeInsets.all(16), padding: EdgeInsets.all(16),
), ),
) ));
);
} }
} }

62
lib/settings/settings.dart
View File

@ -16,15 +16,11 @@ import "package:inventree/settings/sales_order_settings.dart";
// InvenTree settings view // InvenTree settings view
class InvenTreeSettingsWidget extends StatefulWidget { class InvenTreeSettingsWidget extends StatefulWidget {
@override @override
_InvenTreeSettingsState createState() => _InvenTreeSettingsState(); _InvenTreeSettingsState createState() => _InvenTreeSettingsState();
} }
class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> { class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
final _scaffoldKey = GlobalKey<ScaffoldState>(); final _scaffoldKey = GlobalKey<ScaffoldState>();
/* /*
@ -46,14 +42,16 @@ class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
backgroundColor: COLOR_APP_BAR, backgroundColor: COLOR_APP_BAR,
), ),
body: Center( body: Center(
child: ListView( child: ListView(children: [
children: [
ListTile( ListTile(
title: Text(L10().server), title: Text(L10().server),
subtitle: Text(L10().configureServer), subtitle: Text(L10().configureServer),
leading: Icon(TablerIcons.server, color: COLOR_ACTION), leading: Icon(TablerIcons.server, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeSelectServerWidget())); Navigator.push(
context,
MaterialPageRoute(
builder: (context) => InvenTreeSelectServerWidget()));
}, },
), ),
Divider(), Divider(),
@ -62,39 +60,52 @@ class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
subtitle: Text(L10().appSettingsDetails), subtitle: Text(L10().appSettingsDetails),
leading: Icon(TablerIcons.settings, color: COLOR_ACTION), leading: Icon(TablerIcons.settings, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeAppSettingsWidget())); Navigator.push(
} context,
), MaterialPageRoute(
builder: (context) => InvenTreeAppSettingsWidget()));
}),
ListTile( ListTile(
title: Text(L10().homeScreen), title: Text(L10().homeScreen),
subtitle: Text(L10().homeScreenSettings), subtitle: Text(L10().homeScreenSettings),
leading: Icon(TablerIcons.home, color: COLOR_ACTION), leading: Icon(TablerIcons.home, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => HomeScreenSettingsWidget())); Navigator.push(
} context,
), MaterialPageRoute(
builder: (context) => HomeScreenSettingsWidget()));
}),
ListTile( ListTile(
title: Text(L10().barcodes), title: Text(L10().barcodes),
subtitle: Text(L10().barcodeSettings), subtitle: Text(L10().barcodeSettings),
leading: Icon(TablerIcons.barcode, color: COLOR_ACTION), leading: Icon(TablerIcons.barcode, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeBarcodeSettingsWidget())); Navigator.push(
} context,
), MaterialPageRoute(
builder: (context) =>
InvenTreeBarcodeSettingsWidget()));
}),
ListTile( ListTile(
title: Text(L10().part), title: Text(L10().part),
subtitle: Text(L10().partSettings), subtitle: Text(L10().partSettings),
leading: Icon(TablerIcons.box, color: COLOR_ACTION), leading: Icon(TablerIcons.box, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreePartSettingsWidget())); Navigator.push(
} context,
), MaterialPageRoute(
builder: (context) => InvenTreePartSettingsWidget()));
}),
ListTile( ListTile(
title: Text(L10().purchaseOrder), title: Text(L10().purchaseOrder),
subtitle: Text(L10().purchaseOrderSettings), subtitle: Text(L10().purchaseOrderSettings),
leading: Icon(TablerIcons.shopping_cart, color: COLOR_ACTION), leading: Icon(TablerIcons.shopping_cart, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreePurchaseOrderSettingsWidget())); Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InvenTreePurchaseOrderSettingsWidget()));
}, },
), ),
ListTile( ListTile(
@ -102,7 +113,11 @@ class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
subtitle: Text(L10().salesOrderSettings), subtitle: Text(L10().salesOrderSettings),
leading: Icon(TablerIcons.truck, color: COLOR_ACTION), leading: Icon(TablerIcons.truck, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeSalesOrderSettingsWidget())); Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InvenTreeSalesOrderSettingsWidget()));
}, },
), ),
Divider(), Divider(),
@ -111,9 +126,6 @@ class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
leading: Icon(TablerIcons.info_circle, color: COLOR_ACTION), leading: Icon(TablerIcons.info_circle, color: COLOR_ACTION),
onTap: _about, onTap: _about,
) )
] ])));
)
)
);
} }
} }

32
lib/user_profile.dart
View File

@ -1,11 +1,9 @@
import "package:sembast/sembast.dart"; import "package:sembast/sembast.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
import "package:inventree/preferences.dart"; import "package:inventree/preferences.dart";
class UserProfile { class UserProfile {
UserProfile({ UserProfile({
this.key, this.key,
this.name = "", this.name = "",
@ -14,7 +12,9 @@ class UserProfile {
this.selected = false, this.selected = false,
}); });
factory UserProfile.fromJson(int key, Map<String, dynamic> json, bool isSelected) => UserProfile( factory UserProfile.fromJson(
int key, Map<String, dynamic> json, bool isSelected) =>
UserProfile(
key: key, key: key,
name: (json["name"] ?? "") as String, name: (json["name"] ?? "") as String,
server: (json["server"] ?? "") as String, server: (json["server"] ?? "") as String,
@ -58,7 +58,6 @@ class UserProfile {
* Class for storing and managing user (server) profiles * Class for storing and managing user (server) profiles
*/ */
class UserProfileDBManager { class UserProfileDBManager {
final store = StoreRef("profiles"); final store = StoreRef("profiles");
Future<Database> get _db async => InvenTreePreferencesDB.instance.database; Future<Database> get _db async => InvenTreePreferencesDB.instance.database;
@ -67,7 +66,6 @@ class UserProfileDBManager {
* Check if a profile with the specified name exists in the database * Check if a profile with the specified name exists in the database
*/ */
Future<bool> profileNameExists(String name) async { Future<bool> profileNameExists(String name) async {
final profiles = await getAllProfiles(); final profiles = await getAllProfiles();
for (var prf in profiles) { for (var prf in profiles) {
@ -84,9 +82,9 @@ class UserProfileDBManager {
* Add a new UserProfile to the profiles database. * Add a new UserProfile to the profiles database.
*/ */
Future<bool> addProfile(UserProfile profile) async { Future<bool> addProfile(UserProfile profile) async {
if (profile.name.isEmpty) { if (profile.name.isEmpty) {
debug("addProfile() : Profile missing required values - not adding to database"); debug(
"addProfile() : Profile missing required values - not adding to database");
return false; return false;
} }
@ -113,7 +111,6 @@ class UserProfileDBManager {
* The unique integer <key> is used to determine if the profile already exists. * The unique integer <key> is used to determine if the profile already exists.
*/ */
Future<bool> updateProfile(UserProfile profile) async { Future<bool> updateProfile(UserProfile profile) async {
// Prevent invalid profile data from being updated // Prevent invalid profile data from being updated
if (profile.name.isEmpty) { if (profile.name.isEmpty) {
debug("updateProfile() : Profile missing required values - not updating"); debug("updateProfile() : Profile missing required values - not updating");
@ -144,15 +141,14 @@ class UserProfileDBManager {
* The key of the UserProfile should match the "selected" property * The key of the UserProfile should match the "selected" property
*/ */
Future<UserProfile?> getSelectedProfile() async { Future<UserProfile?> getSelectedProfile() async {
final selected = await store.record("selected").get(await _db); final selected = await store.record("selected").get(await _db);
final profiles = await store.find(await _db); final profiles = await store.find(await _db);
debug("getSelectedProfile() : ${profiles.length} profiles available - selected = ${selected}"); debug(
"getSelectedProfile() : ${profiles.length} profiles available - selected = ${selected}");
for (int idx = 0; idx < profiles.length; idx++) { for (int idx = 0; idx < profiles.length; idx++) {
if (profiles[idx].key is int && profiles[idx].key == selected) { if (profiles[idx].key is int && profiles[idx].key == selected) {
return UserProfile.fromJson( return UserProfile.fromJson(
profiles[idx].key! as int, profiles[idx].key! as int,
@ -169,7 +165,6 @@ class UserProfileDBManager {
* Return all user profile objects * Return all user profile objects
*/ */
Future<List<UserProfile>> getAllProfiles() async { Future<List<UserProfile>> getAllProfiles() async {
final selected = await store.record("selected").get(await _db); final selected = await store.record("selected").get(await _db);
final profiles = await store.find(await _db); final profiles = await store.find(await _db);
@ -177,25 +172,22 @@ class UserProfileDBManager {
List<UserProfile> profileList = []; List<UserProfile> profileList = [];
for (int idx = 0; idx < profiles.length; idx++) { for (int idx = 0; idx < profiles.length; idx++) {
if (profiles[idx].key is int) { if (profiles[idx].key is int) {
profileList.add( profileList.add(UserProfile.fromJson(
UserProfile.fromJson(
profiles[idx].key! as int, profiles[idx].key! as int,
profiles[idx].value! as Map<String, dynamic>, profiles[idx].value! as Map<String, dynamic>,
profiles[idx].key == selected, profiles[idx].key == selected,
) ));
);
} }
} }
// If there are no available profiles, create a demo profile // If there are no available profiles, create a demo profile
if (profileList.isEmpty) { if (profileList.isEmpty) {
bool added = await InvenTreeSettingsManager().getBool("demo_profile_added", false); bool added =
await InvenTreeSettingsManager().getBool("demo_profile_added", false);
// Don't add a new profile if we have added it previously // Don't add a new profile if we have added it previously
if (!added) { if (!added) {
await InvenTreeSettingsManager().setValue("demo_profile_added", true); await InvenTreeSettingsManager().setValue("demo_profile_added", true);
UserProfile demoProfile = UserProfile( UserProfile demoProfile = UserProfile(
@ -212,7 +204,6 @@ class UserProfileDBManager {
return profileList; return profileList;
} }
/* /*
* Retrieve a profile by key (or null if no match exists) * Retrieve a profile by key (or null if no match exists)
*/ */
@ -231,7 +222,6 @@ class UserProfileDBManager {
return prf; return prf;
} }
/* /*
* Retrieve a profile by name (or null if no match exists) * Retrieve a profile by name (or null if no match exists)
*/ */

84
lib/widget/attachment_widget.dart
View File

@ -1,4 +1,3 @@
import "dart:io"; import "dart:io";
import "package:flutter/material.dart"; import "package:flutter/material.dart";
@ -17,7 +16,6 @@ import "package:inventree/widget/progress.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
/* /*
* A generic widget for displaying a list of attachments. * A generic widget for displaying a list of attachments.
* *
@ -25,8 +23,9 @@ import "package:inventree/widget/refreshable_state.dart";
* we pass a subclassed instance of the InvenTreeAttachment model. * we pass a subclassed instance of the InvenTreeAttachment model.
*/ */
class AttachmentWidget extends StatefulWidget { class AttachmentWidget extends StatefulWidget {
const AttachmentWidget(this.attachmentClass, this.modelId, this.imagePrefix,
const AttachmentWidget(this.attachmentClass, this.modelId, this.imagePrefix, this.hasUploadPermission) : super(); this.hasUploadPermission)
: super();
final InvenTreeAttachment attachmentClass; final InvenTreeAttachment attachmentClass;
final int modelId; final int modelId;
@ -37,9 +36,7 @@ class AttachmentWidget extends StatefulWidget {
_AttachmentWidgetState createState() => _AttachmentWidgetState(); _AttachmentWidgetState createState() => _AttachmentWidgetState();
} }
class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> { class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
_AttachmentWidgetState(); _AttachmentWidgetState();
List<InvenTreeAttachment> attachments = []; List<InvenTreeAttachment> attachments = [];
@ -64,8 +61,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
refresh(context); refresh(context);
}); });
}); });
} }),
),
IconButton( IconButton(
icon: Icon(TablerIcons.file_upload), icon: Icon(TablerIcons.file_upload),
onPressed: () async { onPressed: () async {
@ -74,21 +70,17 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
refresh(context); refresh(context);
}); });
}); });
} })
)
]; ];
} }
Future<void> upload(BuildContext context, File? file) async { Future<void> upload(BuildContext context, File? file) async {
if (file == null) return; if (file == null) return;
showLoadingOverlay(); showLoadingOverlay();
final bool result = await widget.attachmentClass.uploadAttachment( final bool result =
file, await widget.attachmentClass.uploadAttachment(file, widget.modelId);
widget.modelId
);
hideLoadingOverlay(); hideLoadingOverlay();
@ -101,40 +93,33 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
refresh(context); refresh(context);
} }
Future<void> editAttachment(
Future<void> editAttachment(BuildContext context, InvenTreeAttachment attachment) async BuildContext context, InvenTreeAttachment attachment) async {
{ attachment
attachment.editForm(context, L10().editAttachment).then((result) => { .editForm(context, L10().editAttachment)
refresh(context) .then((result) => {refresh(context)});
});
} }
/* /*
* Delete the specified attachment * Delete the specified attachment
*/ */
Future<void> deleteAttachment(BuildContext context, InvenTreeAttachment attachment) async { Future<void> deleteAttachment(
BuildContext context, InvenTreeAttachment attachment) async {
final bool result = await attachment.delete(); final bool result = await attachment.delete();
showSnackIcon( showSnackIcon(result ? L10().deleteSuccess : L10().deleteFailed,
result ? L10().deleteSuccess : L10().deleteFailed, success: result);
success: result
);
refresh(context); refresh(context);
} }
/* /*
* Display an option context menu for the selected attachment * Display an option context menu for the selected attachment
*/ */
Future<void> showOptionsMenu(BuildContext context, InvenTreeAttachment attachment) async { Future<void> showOptionsMenu(
BuildContext context, InvenTreeAttachment attachment) async {
OneContext().showDialog( OneContext().showDialog(builder: (BuildContext ctx) {
builder: (BuildContext ctx) { return SimpleDialog(title: Text(L10().attachments), children: [
return SimpleDialog(
title: Text(L10().attachments),
children: [
Divider(), Divider(),
SimpleDialogOption( SimpleDialogOption(
onPressed: () async { onPressed: () async {
@ -144,8 +129,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
child: ListTile( child: ListTile(
title: Text(L10().edit), title: Text(L10().edit),
leading: Icon(TablerIcons.edit), leading: Icon(TablerIcons.edit),
) )),
),
SimpleDialogOption( SimpleDialogOption(
onPressed: () async { onPressed: () async {
OneContext().popDialog(); OneContext().popDialog();
@ -154,29 +138,24 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
child: ListTile( child: ListTile(
title: Text(L10().delete), title: Text(L10().delete),
leading: Icon(TablerIcons.trash, color: COLOR_DANGER), leading: Icon(TablerIcons.trash, color: COLOR_DANGER),
) ))
) ]);
] });
);
}
);
} }
@override @override
Future<void> request(BuildContext context) async { Future<void> request(BuildContext context) async {
Map<String, String> filters = {}; Map<String, String> filters = {};
if (InvenTreeAPI().supportsModernAttachments) { if (InvenTreeAPI().supportsModernAttachments) {
filters["model_type"] = widget.attachmentClass.REF_MODEL_TYPE; filters["model_type"] = widget.attachmentClass.REF_MODEL_TYPE;
filters["model_id"] = widget.modelId.toString(); filters["model_id"] = widget.modelId.toString();
} else { } else {
filters[widget.attachmentClass.REFERENCE_FIELD] = widget.modelId.toString(); filters[widget.attachmentClass.REFERENCE_FIELD] =
widget.modelId.toString();
} }
await widget.attachmentClass.list( await widget.attachmentClass.list(filters: filters).then((var results) {
filters: filters
).then((var results) {
attachments.clear(); attachments.clear();
for (var result in results) { for (var result in results) {
@ -186,18 +165,15 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
} }
}); });
setState(() { setState(() {});
});
} }
@override @override
List<Widget> getTiles(BuildContext context) { List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
// An "attachment" can either be a file, or a URL // An "attachment" can either be a file, or a URL
for (var attachment in attachments) { for (var attachment in attachments) {
if (attachment.filename.isNotEmpty) { if (attachment.filename.isNotEmpty) {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(attachment.filename), title: Text(attachment.filename),
@ -212,9 +188,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
showOptionsMenu(context, attachment); showOptionsMenu(context, attachment);
}, },
)); ));
} } else if (attachment.link.isNotEmpty) {
else if (attachment.link.isNotEmpty) {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(attachment.link), title: Text(attachment.link),
subtitle: Text(attachment.comment), subtitle: Text(attachment.comment),

1
lib/widget/back.dart
View File

@ -6,7 +6,6 @@ import "package:flutter/material.dart";
* Long-pressing on this will return the user to the home screen * Long-pressing on this will return the user to the home screen
*/ */
Widget backButton(BuildContext context, GlobalKey<ScaffoldState> key) { Widget backButton(BuildContext context, GlobalKey<ScaffoldState> key) {
return GestureDetector( return GestureDetector(
onLongPress: () { onLongPress: () {
// Display the menu // Display the menu

150
lib/widget/company/company_detail.dart
View File

@ -16,24 +16,19 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/company/supplier_part_list.dart"; import "package:inventree/widget/company/supplier_part_list.dart";
/* /*
* Widget for displaying detail view of a single Company instance * Widget for displaying detail view of a single Company instance
*/ */
class CompanyDetailWidget extends StatefulWidget { class CompanyDetailWidget extends StatefulWidget {
const CompanyDetailWidget(this.company, {Key? key}) : super(key: key); const CompanyDetailWidget(this.company, {Key? key}) : super(key: key);
final InvenTreeCompany company; final InvenTreeCompany company;
@override @override
_CompanyDetailState createState() => _CompanyDetailState(); _CompanyDetailState createState() => _CompanyDetailState();
} }
class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> { class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
_CompanyDetailState(); _CompanyDetailState();
int supplierPartCount = 0; int supplierPartCount = 0;
@ -59,15 +54,12 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
List<Widget> actions = []; List<Widget> actions = [];
if (InvenTreeCompany().canEdit) { if (InvenTreeCompany().canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().companyEdit, tooltip: L10().companyEdit,
onPressed: () { onPressed: () {
editCompany(context); editCompany(context);
} }));
)
);
} }
return actions; return actions;
@ -83,8 +75,7 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
label: L10().salesOrderCreate, label: L10().salesOrderCreate,
onTap: () async { onTap: () async {
_createSalesOrder(context); _createSalesOrder(context);
} }));
));
} }
if (widget.company.isSupplier && InvenTreePurchaseOrder().canCreate) { if (widget.company.isSupplier && InvenTreePurchaseOrder().canCreate) {
@ -93,8 +84,7 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
label: L10().purchaseOrderCreate, label: L10().purchaseOrderCreate,
onTap: () async { onTap: () async {
_createPurchaseOrder(context); _createPurchaseOrder(context);
} }));
));
} }
return actions; return actions;
@ -108,19 +98,15 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
fields["customer"]?["value"] = widget.company.pk; fields["customer"]?["value"] = widget.company.pk;
InvenTreeSalesOrder().createForm( InvenTreeSalesOrder().createForm(context, L10().salesOrderCreate,
context, fields: fields, onSuccess: (result) async {
L10().salesOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var order = InvenTreeSalesOrder.fromJson(data); var order = InvenTreeSalesOrder.fromJson(data);
order.goToDetailPage(context); order.goToDetailPage(context);
} }
} });
);
} }
Future<void> _createPurchaseOrder(BuildContext context) async { Future<void> _createPurchaseOrder(BuildContext context) async {
@ -131,19 +117,15 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
fields["supplier"]?["value"] = widget.company.pk; fields["supplier"]?["value"] = widget.company.pk;
InvenTreePurchaseOrder().createForm( InvenTreePurchaseOrder().createForm(context, L10().purchaseOrderCreate,
context, fields: fields, onSuccess: (result) async {
L10().purchaseOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var order = InvenTreePurchaseOrder.fromJson(data); var order = InvenTreePurchaseOrder.fromJson(data);
order.goToDetailPage(context); order.goToDetailPage(context);
} }
} });
);
} }
@override @override
@ -156,23 +138,22 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
return; return;
} }
outstandingPurchaseOrders = widget.company.isSupplier ? outstandingPurchaseOrders = widget.company.isSupplier
await InvenTreePurchaseOrder().count(filters: { ? await InvenTreePurchaseOrder().count(filters: {
"supplier": widget.company.pk.toString(), "supplier": widget.company.pk.toString(),
"outstanding": "true" "outstanding": "true"
}) : 0; })
: 0;
outstandingSalesOrders = widget.company.isCustomer ? outstandingSalesOrders = widget.company.isCustomer
await InvenTreeSalesOrder().count(filters: { ? await InvenTreeSalesOrder().count(filters: {
"customer": widget.company.pk.toString(), "customer": widget.company.pk.toString(),
"outstanding": "true" "outstanding": "true"
}) : 0; })
: 0;
InvenTreeSupplierPart().count( InvenTreeSupplierPart().count(
filters: { filters: {"supplier": widget.company.pk.toString()}).then((value) {
"supplier": widget.company.pk.toString()
}
).then((value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
supplierPartCount = value; supplierPartCount = value;
@ -180,7 +161,8 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
} }
}); });
InvenTreeCompanyAttachment().countAttachments(widget.company.pk) InvenTreeCompanyAttachment()
.countAttachments(widget.company.pk)
.then((value) { .then((value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
@ -190,16 +172,12 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
}); });
} }
Future <void> editCompany(BuildContext context) async { Future<void> editCompany(BuildContext context) async {
widget.company.editForm(context, L10().companyEdit,
widget.company.editForm(
context,
L10().companyEdit,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().companyUpdated, success: true); showSnackIcon(L10().companyUpdated, success: true);
} });
);
} }
/* /*
@ -207,7 +185,6 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
*/ */
@override @override
List<Widget> getTiles(BuildContext context) { List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
bool sep = false; bool sep = false;
@ -221,26 +198,12 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
)); ));
if (!widget.company.active) { if (!widget.company.active) {
tiles.add( tiles.add(ListTile(
ListTile( title: Text(L10().inactive, style: TextStyle(color: COLOR_DANGER)),
title: Text( subtitle:
L10().inactive, Text(L10().inactiveCompany, style: TextStyle(color: COLOR_DANGER)),
style: TextStyle( leading: Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER),
color: COLOR_DANGER ));
)
),
subtitle: Text(
L10().inactiveCompany,
style: TextStyle(
color: COLOR_DANGER
)
),
leading: Icon(
TablerIcons.exclamation_circle,
color: COLOR_DANGER
),
)
);
} }
if (widget.company.website.isNotEmpty) { if (widget.company.website.isNotEmpty) {
@ -297,10 +260,8 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
} }
if (widget.company.isSupplier) { if (widget.company.isSupplier) {
if (supplierPartCount > 0) { if (supplierPartCount > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().supplierParts), title: Text(L10().supplierParts),
leading: Icon(TablerIcons.building, color: COLOR_ACTION), leading: Icon(TablerIcons.building, color: COLOR_ACTION),
trailing: Text(supplierPartCount.toString()), trailing: Text(supplierPartCount.toString()),
@ -308,18 +269,12 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SupplierPartList({ builder: (context) => SupplierPartList(
"supplier": widget.company.pk.toString() {"supplier": widget.company.pk.toString()})));
}) }));
)
);
}
)
);
} }
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().purchaseOrders), title: Text(L10().purchaseOrders),
leading: Icon(TablerIcons.shopping_cart, color: COLOR_ACTION), leading: Icon(TablerIcons.shopping_cart, color: COLOR_ACTION),
trailing: Text("${outstandingPurchaseOrders}"), trailing: Text("${outstandingPurchaseOrders}"),
@ -328,15 +283,8 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget( builder: (context) => PurchaseOrderListWidget(
filters: { filters: {"supplier": "${widget.company.pk}"})));
"supplier": "${widget.company.pk}" }));
}
)
)
);
}
)
);
// TODO: Display "supplied parts" count (click through to list of supplier parts) // TODO: Display "supplied parts" count (click through to list of supplier parts)
/* /*
@ -355,8 +303,7 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
} }
if (widget.company.isCustomer) { if (widget.company.isCustomer) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().salesOrders), title: Text(L10().salesOrders),
leading: Icon(TablerIcons.truck, color: COLOR_ACTION), leading: Icon(TablerIcons.truck, color: COLOR_ACTION),
trailing: Text("${outstandingSalesOrders}"), trailing: Text("${outstandingSalesOrders}"),
@ -365,15 +312,8 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SalesOrderListWidget( builder: (context) => SalesOrderListWidget(
filters: { filters: {"customer": widget.company.pk.toString()})));
"customer": widget.company.pk.toString() }));
}
)
)
);
}
)
);
} }
if (widget.company.notes.isNotEmpty) { if (widget.company.notes.isNotEmpty) {
@ -384,7 +324,6 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
)); ));
} }
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().attachments), title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION), leading: Icon(TablerIcons.file, color: COLOR_ACTION),
@ -397,14 +336,9 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
InvenTreeCompanyAttachment(), InvenTreeCompanyAttachment(),
widget.company.pk, widget.company.pk,
widget.company.name, widget.company.name,
InvenTreeCompany().canEdit InvenTreeCompany().canEdit)));
) }));
)
);
}
));
return tiles; return tiles;
} }
} }

41
lib/widget/company/company_list.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart"; import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -12,13 +11,12 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/widget/paginator.dart"; import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
/* /*
* Widget for displaying a filterable list of Company instances * Widget for displaying a filterable list of Company instances
*/ */
class CompanyListWidget extends StatefulWidget { class CompanyListWidget extends StatefulWidget {
const CompanyListWidget(this.title, this.filters, {Key? key})
const CompanyListWidget(this.title, this.filters, {Key? key}) : super(key: key); : super(key: key);
final String title; final String title;
@ -28,29 +26,22 @@ class CompanyListWidget extends StatefulWidget {
_CompanyListWidgetState createState() => _CompanyListWidgetState(); _CompanyListWidgetState createState() => _CompanyListWidgetState();
} }
class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> { class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> {
_CompanyListWidgetState(); _CompanyListWidgetState();
@override @override
String getAppBarTitle() => widget.title; String getAppBarTitle() => widget.title;
Future<void> _addCompany(BuildContext context) async { Future<void> _addCompany(BuildContext context) async {
InvenTreeCompany().createForm(context, L10().companyAdd,
InvenTreeCompany().createForm( data: widget.filters, onSuccess: (result) async {
context,
L10().companyAdd,
data: widget.filters,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var company = InvenTreeCompany.fromJson(data); var company = InvenTreeCompany.fromJson(data);
company.goToDetailPage(context); company.goToDetailPage(context);
} }
} });
);
} }
@override @override
@ -58,15 +49,12 @@ class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (InvenTreeAPI().checkPermission("company", "add")) { if (InvenTreeAPI().checkPermission("company", "add")) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green), child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().companyAdd, label: L10().companyAdd,
onTap: () { onTap: () {
_addCompany(context); _addCompany(context);
} }));
)
);
} }
return actions; return actions;
@ -76,12 +64,11 @@ class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> {
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
return PaginatedCompanyList(widget.title, widget.filters); return PaginatedCompanyList(widget.title, widget.filters);
} }
} }
class PaginatedCompanyList extends PaginatedSearchWidget { class PaginatedCompanyList extends PaginatedSearchWidget {
const PaginatedCompanyList(this.companyTitle, Map<String, String> filters)
const PaginatedCompanyList(this.companyTitle, Map<String, String> filters) : super(filters: filters); : super(filters: filters);
final String companyTitle; final String companyTitle;
@ -93,12 +80,10 @@ class PaginatedCompanyList extends PaginatedSearchWidget {
} }
class _CompanyListState extends PaginatedSearchState<PaginatedCompanyList> { class _CompanyListState extends PaginatedSearchState<PaginatedCompanyList> {
_CompanyListState() : super(); _CompanyListState() : super();
@override @override
Map<String, Map<String, dynamic>> get filterOptions { Map<String, Map<String, dynamic>> get filterOptions {
Map<String, Map<String, dynamic>> filters = {}; Map<String, Map<String, dynamic>> filters = {};
if (InvenTreeAPI().supportsCompanyActiveStatus) { if (InvenTreeAPI().supportsCompanyActiveStatus) {
@ -113,16 +98,16 @@ class _CompanyListState extends PaginatedSearchState<PaginatedCompanyList> {
} }
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeCompany().listPaginated(limit, offset, filters: params); final page =
await InvenTreeCompany().listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeCompany company = model as InvenTreeCompany; InvenTreeCompany company = model as InvenTreeCompany;
return ListTile( return ListTile(

62
lib/widget/company/manufacturer_part_detail.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart"; import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -19,19 +18,18 @@ import "package:url_launcher/url_launcher.dart";
* Detail widget for viewing a single ManufacturerPart instance * Detail widget for viewing a single ManufacturerPart instance
*/ */
class ManufacturerPartDetailWidget extends StatefulWidget { class ManufacturerPartDetailWidget extends StatefulWidget {
const ManufacturerPartDetailWidget(this.manufacturerPart, {Key? key}) const ManufacturerPartDetailWidget(this.manufacturerPart, {Key? key})
: super(key: key); : super(key: key);
final InvenTreeManufacturerPart manufacturerPart; final InvenTreeManufacturerPart manufacturerPart;
@override @override
_ManufacturerPartDisplayState createState() => _ManufacturerPartDisplayState(); _ManufacturerPartDisplayState createState() =>
_ManufacturerPartDisplayState();
} }
class _ManufacturerPartDisplayState
class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDetailWidget> { extends RefreshableState<ManufacturerPartDetailWidget> {
_ManufacturerPartDisplayState(); _ManufacturerPartDisplayState();
@override @override
@ -48,14 +46,11 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
} }
Future<void> editManufacturerPart(BuildContext context) async { Future<void> editManufacturerPart(BuildContext context) async {
widget.manufacturerPart.editForm( widget.manufacturerPart.editForm(context, L10().manufacturerPartEdit,
context,
L10().manufacturerPartEdit,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().itemUpdated, success: true); showSnackIcon(L10().itemUpdated, success: true);
} });
);
} }
@override @override
@ -72,15 +67,12 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
List<Widget> actions = []; List<Widget> actions = [];
if (widget.manufacturerPart.canEdit) { if (widget.manufacturerPart.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().edit, tooltip: L10().edit,
onPressed: () { onPressed: () {
editManufacturerPart(context); editManufacturerPart(context);
} }));
)
);
} }
return actions; return actions;
@ -99,8 +91,7 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
} }
// Internal Part // Internal Part
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().internalPart), title: Text(L10().internalPart),
subtitle: Text(widget.manufacturerPart.partName), subtitle: Text(widget.manufacturerPart.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION), leading: Icon(TablerIcons.box, color: COLOR_ACTION),
@ -114,51 +105,44 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
part.goToDetailPage(context); part.goToDetailPage(context);
} }
}, },
) ));
);
// Manufacturer details // Manufacturer details
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().manufacturer), title: Text(L10().manufacturer),
subtitle: Text(widget.manufacturerPart.manufacturerName), subtitle: Text(widget.manufacturerPart.manufacturerName),
leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION), leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.manufacturerPart.manufacturerImage), trailing: InvenTreeAPI()
.getThumbnail(widget.manufacturerPart.manufacturerImage),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.manufacturerPart.manufacturerId); var supplier = await InvenTreeCompany()
.get(widget.manufacturerPart.manufacturerId);
hideLoadingOverlay(); hideLoadingOverlay();
if (supplier is InvenTreeCompany) { if (supplier is InvenTreeCompany) {
supplier.goToDetailPage(context); supplier.goToDetailPage(context);
} }
} }));
)
);
// MPN (part number) // MPN (part number)
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().manufacturerPartNumber), title: Text(L10().manufacturerPartNumber),
subtitle: Text(widget.manufacturerPart.MPN), subtitle: Text(widget.manufacturerPart.MPN),
leading: Icon(TablerIcons.hash), leading: Icon(TablerIcons.hash),
) ));
);
// Description // Description
if (widget.manufacturerPart.description.isNotEmpty) { if (widget.manufacturerPart.description.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().description), title: Text(L10().description),
subtitle: Text(widget.manufacturerPart.description), subtitle: Text(widget.manufacturerPart.description),
leading: Icon(TablerIcons.info_circle), leading: Icon(TablerIcons.info_circle),
) ));
);
} }
if (widget.manufacturerPart.link.isNotEmpty) { if (widget.manufacturerPart.link.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(widget.manufacturerPart.link), title: Text(widget.manufacturerPart.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION), leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async { onTap: () async {
@ -167,11 +151,9 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
await launchUrl(uri); await launchUrl(uri);
} }
}, },
) ));
);
} }
return tiles; return tiles;
} }
} }

148
lib/widget/company/supplier_part_detail.dart
View File

@ -17,13 +17,12 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/company/manufacturer_part_detail.dart"; import "package:inventree/widget/company/manufacturer_part_detail.dart";
/* /*
* Detail widget for viewing a single SupplierPart instance * Detail widget for viewing a single SupplierPart instance
*/ */
class SupplierPartDetailWidget extends StatefulWidget { class SupplierPartDetailWidget extends StatefulWidget {
const SupplierPartDetailWidget(this.supplierPart, {Key? key})
const SupplierPartDetailWidget(this.supplierPart, {Key? key}) : super(key: key); : super(key: key);
final InvenTreeSupplierPart supplierPart; final InvenTreeSupplierPart supplierPart;
@ -31,9 +30,8 @@ class SupplierPartDetailWidget extends StatefulWidget {
_SupplierPartDisplayState createState() => _SupplierPartDisplayState(); _SupplierPartDisplayState createState() => _SupplierPartDisplayState();
} }
class _SupplierPartDisplayState
class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidget> { extends RefreshableState<SupplierPartDetailWidget> {
_SupplierPartDisplayState(); _SupplierPartDisplayState();
@override @override
@ -43,14 +41,11 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
* Launch a form to edit the current SupplierPart instance * Launch a form to edit the current SupplierPart instance
*/ */
Future<void> editSupplierPart(BuildContext context) async { Future<void> editSupplierPart(BuildContext context) async {
widget.supplierPart.editForm( widget.supplierPart.editForm(context, L10().supplierPartEdit,
context,
L10().supplierPartEdit,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().supplierPartUpdated, success: true); showSnackIcon(L10().supplierPartUpdated, success: true);
} });
);
} }
@override @override
@ -58,14 +53,12 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (widget.supplierPart.canEdit) { if (widget.supplierPart.canEdit) {
actions.add( actions.add(customBarcodeAction(
customBarcodeAction( context,
context, this, this,
widget.supplierPart.customBarcode, widget.supplierPart.customBarcode,
"supplierpart", "supplierpart",
widget.supplierPart.pk widget.supplierPart.pk));
)
);
} }
return actions; return actions;
@ -76,15 +69,12 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
List<Widget> actions = []; List<Widget> actions = [];
if (widget.supplierPart.canEdit) { if (widget.supplierPart.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().edit, tooltip: L10().edit,
onPressed: () { onPressed: () {
editSupplierPart(context); editSupplierPart(context);
} }));
)
);
} }
return actions; return actions;
@ -92,7 +82,8 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
@override @override
Future<void> request(BuildContext context) async { Future<void> request(BuildContext context) async {
final bool result = widget.supplierPart.pk > 0 && await widget.supplierPart.reload(); final bool result =
widget.supplierPart.pk > 0 && await widget.supplierPart.reload();
if (!result) { if (!result) {
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -112,8 +103,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
} }
// Internal Part // Internal Part
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().internalPart), title: Text(L10().internalPart),
subtitle: Text(widget.supplierPart.partName), subtitle: Text(widget.supplierPart.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION), leading: Icon(TablerIcons.box, color: COLOR_ACTION),
@ -127,115 +117,99 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
part.goToDetailPage(context); part.goToDetailPage(context);
} }
}, },
) ));
);
if (!widget.supplierPart.active) { if (!widget.supplierPart.active) {
tiles.add( tiles.add(ListTile(
ListTile( title: Text(L10().inactive, style: TextStyle(color: COLOR_DANGER)),
title: Text( subtitle:
L10().inactive, Text(L10().inactiveDetail, style: TextStyle(color: COLOR_DANGER)),
style: TextStyle( leading: Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER),
color: COLOR_DANGER ));
)
),
subtitle: Text(
L10().inactiveDetail,
style: TextStyle(
color: COLOR_DANGER
)
),
leading: Icon(
TablerIcons.exclamation_circle,
color: COLOR_DANGER
),
)
);
} }
// Supplier details // Supplier details
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().supplier), title: Text(L10().supplier),
subtitle: Text(widget.supplierPart.supplierName), subtitle: Text(widget.supplierPart.supplierName),
leading: Icon(TablerIcons.building, color: COLOR_ACTION), leading: Icon(TablerIcons.building, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.supplierImage), trailing:
InvenTreeAPI().getThumbnail(widget.supplierPart.supplierImage),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.supplierPart.supplierId); var supplier =
await InvenTreeCompany().get(widget.supplierPart.supplierId);
hideLoadingOverlay(); hideLoadingOverlay();
if (supplier is InvenTreeCompany) { if (supplier is InvenTreeCompany) {
supplier.goToDetailPage(context); supplier.goToDetailPage(context);
} }
} }));
)
);
// SKU (part number) // SKU (part number)
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().supplierPartNumber), title: Text(L10().supplierPartNumber),
subtitle: Text(widget.supplierPart.SKU), subtitle: Text(widget.supplierPart.SKU),
leading: Icon(TablerIcons.hash), leading: Icon(TablerIcons.hash),
) ));
);
// Manufacturer information // Manufacturer information
if (widget.supplierPart.manufacturerPartId > 0) { if (widget.supplierPart.manufacturerPartId > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().manufacturer), title: Text(L10().manufacturer),
subtitle: Text(widget.supplierPart.manufacturerName), subtitle: Text(widget.supplierPart.manufacturerName),
leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION), leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.manufacturerImage), trailing: InvenTreeAPI()
.getThumbnail(widget.supplierPart.manufacturerImage),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.supplierPart.manufacturerId); var supplier = await InvenTreeCompany()
.get(widget.supplierPart.manufacturerId);
hideLoadingOverlay(); hideLoadingOverlay();
if (supplier is InvenTreeCompany) { if (supplier is InvenTreeCompany) {
supplier.goToDetailPage(context); supplier.goToDetailPage(context);
} }
} }));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().manufacturerPartNumber), title: Text(L10().manufacturerPartNumber),
subtitle: Text(widget.supplierPart.MPN), subtitle: Text(widget.supplierPart.MPN),
leading: Icon(TablerIcons.hash, color: COLOR_ACTION), leading: Icon(TablerIcons.hash, color: COLOR_ACTION),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
var manufacturerPart = await InvenTreeManufacturerPart().get(widget.supplierPart.manufacturerPartId); var manufacturerPart = await InvenTreeManufacturerPart()
.get(widget.supplierPart.manufacturerPartId);
hideLoadingOverlay(); hideLoadingOverlay();
if (manufacturerPart is InvenTreeManufacturerPart) { if (manufacturerPart is InvenTreeManufacturerPart) {
Navigator.push(context, MaterialPageRoute( Navigator.push(
builder: (context) => ManufacturerPartDetailWidget(manufacturerPart) context,
)); MaterialPageRoute(
builder: (context) =>
ManufacturerPartDetailWidget(manufacturerPart)));
} }
}, },
) ));
);
} }
// Packaging // Packaging
if (widget.supplierPart.packaging.isNotEmpty || widget.supplierPart.pack_quantity.isNotEmpty) { if (widget.supplierPart.packaging.isNotEmpty ||
tiles.add( widget.supplierPart.pack_quantity.isNotEmpty) {
ListTile( tiles.add(ListTile(
title: Text(L10().packaging), title: Text(L10().packaging),
subtitle: widget.supplierPart.packaging.isNotEmpty ? Text(widget.supplierPart.packaging) : null, subtitle: widget.supplierPart.packaging.isNotEmpty
? Text(widget.supplierPart.packaging)
: null,
leading: Icon(TablerIcons.package), leading: Icon(TablerIcons.package),
trailing: widget.supplierPart.pack_quantity.isNotEmpty ? Text(widget.supplierPart.pack_quantity) : null, trailing: widget.supplierPart.pack_quantity.isNotEmpty
) ? Text(widget.supplierPart.pack_quantity)
); : null,
));
} }
if (widget.supplierPart.link.isNotEmpty) { if (widget.supplierPart.link.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(widget.supplierPart.link), title: Text(widget.supplierPart.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION), leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async { onTap: () async {
@ -244,20 +218,16 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
await launchUrl(uri); await launchUrl(uri);
} }
}, },
) ));
);
} }
if (widget.supplierPart.note.isNotEmpty) { if (widget.supplierPart.note.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(widget.supplierPart.note), title: Text(widget.supplierPart.note),
leading: Icon(TablerIcons.pencil), leading: Icon(TablerIcons.pencil),
) ));
);
} }
return tiles; return tiles;
} }
} }

30
lib/widget/company/supplier_part_list.dart
View File

@ -10,12 +10,10 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/company/supplier_part_detail.dart"; import "package:inventree/widget/company/supplier_part_detail.dart";
/* /*
* Widget for displaying a list of Supplier Part instances * Widget for displaying a list of Supplier Part instances
*/ */
class SupplierPartList extends StatefulWidget { class SupplierPartList extends StatefulWidget {
const SupplierPartList(this.filters); const SupplierPartList(this.filters);
final Map<String, String> filters; final Map<String, String> filters;
@ -24,9 +22,7 @@ class SupplierPartList extends StatefulWidget {
_SupplierPartListState createState() => _SupplierPartListState(); _SupplierPartListState createState() => _SupplierPartListState();
} }
class _SupplierPartListState extends RefreshableState<SupplierPartList> { class _SupplierPartListState extends RefreshableState<SupplierPartList> {
@override @override
String getAppBarTitle() => L10().supplierParts; String getAppBarTitle() => L10().supplierParts;
@ -34,25 +30,22 @@ class _SupplierPartListState extends RefreshableState<SupplierPartList> {
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
return PaginatedSupplierPartList(widget.filters); return PaginatedSupplierPartList(widget.filters);
} }
} }
class PaginatedSupplierPartList extends PaginatedSearchWidget { class PaginatedSupplierPartList extends PaginatedSearchWidget {
const PaginatedSupplierPartList(Map<String, String> filters)
const PaginatedSupplierPartList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().supplierParts; String get searchTitle => L10().supplierParts;
@override @override
_PaginatedSupplierPartListState createState() => _PaginatedSupplierPartListState(); _PaginatedSupplierPartListState createState() =>
_PaginatedSupplierPartListState();
} }
class _PaginatedSupplierPartListState
class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupplierPartList> { extends PaginatedSearchState<PaginatedSupplierPartList> {
_PaginatedSupplierPartListState() : super(); _PaginatedSupplierPartListState() : super();
@override @override
@ -63,7 +56,6 @@ class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupp
@override @override
Map<String, Map<String, dynamic>> get filterOptions { Map<String, Map<String, dynamic>> get filterOptions {
Map<String, Map<String, dynamic>> filters = {}; Map<String, Map<String, dynamic>> filters = {};
if (InvenTreeAPI().supportsCompanyActiveStatus) { if (InvenTreeAPI().supportsCompanyActiveStatus) {
@ -78,8 +70,10 @@ class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupp
} }
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
final page = await InvenTreeSupplierPart().listPaginated(limit, offset, filters: params); int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSupplierPart()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@ -96,9 +90,7 @@ class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupp
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SupplierPartDetailWidget(supplierPart) builder: (context) => SupplierPartDetailWidget(supplierPart)));
)
);
}, },
); );
} }

126
lib/widget/dialogs.dart
View File

@ -9,17 +9,15 @@ import "package:inventree/l10.dart";
import "package:inventree/preferences.dart"; import "package:inventree/preferences.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
/* /*
* Launch a dialog allowing the user to select from a list of options * Launch a dialog allowing the user to select from a list of options
*/ */
Future<void> choiceDialog(String title, List<Widget> items, {Function? onSelected}) async { Future<void> choiceDialog(String title, List<Widget> items,
{Function? onSelected}) async {
List<Widget> choices = []; List<Widget> choices = [];
for (int idx = 0; idx < items.length; idx++) { for (int idx = 0; idx < items.length; idx++) {
choices.add( choices.add(GestureDetector(
GestureDetector(
child: items[idx], child: items[idx],
onTap: () { onTap: () {
OneContext().popDialog(); OneContext().popDialog();
@ -27,23 +25,20 @@ Future<void> choiceDialog(String title, List<Widget> items, {Function? onSelecte
onSelected(idx); onSelected(idx);
} }
}, },
) ));
);
} }
if (!hasContext()) { if (!hasContext()) {
return; return;
} }
OneContext().showDialog( OneContext().showDialog(builder: (BuildContext context) {
builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
title: Text(title), title: Text(title),
content: SingleChildScrollView( content: SingleChildScrollView(
child: Column( child: Column(
children: choices, children: choices,
) )),
),
actions: [ actions: [
TextButton( TextButton(
child: Text(L10().cancel), child: Text(L10().cancel),
@ -53,17 +48,19 @@ Future<void> choiceDialog(String title, List<Widget> items, {Function? onSelecte
) )
], ],
); );
} });
);
} }
/* /*
* Display a "confirmation" dialog allowing the user to accept or reject an action * Display a "confirmation" dialog allowing the user to accept or reject an action
*/ */
Future<void> confirmationDialog(String title, String text, {Color? color, IconData icon = TablerIcons.help_circle, String? acceptText, String? rejectText, Function? onAccept, Function? onReject}) async { Future<void> confirmationDialog(String title, String text,
{Color? color,
IconData icon = TablerIcons.help_circle,
String? acceptText,
String? rejectText,
Function? onAccept,
Function? onReject}) async {
String _accept = acceptText ?? L10().ok; String _accept = acceptText ?? L10().ok;
String _reject = rejectText ?? L10().cancel; String _reject = rejectText ?? L10().cancel;
@ -71,8 +68,7 @@ Future<void> confirmationDialog(String title, String text, {Color? color, IconDa
return; return;
} }
OneContext().showDialog( OneContext().showDialog(builder: (BuildContext context) {
builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
iconColor: color, iconColor: color,
title: ListTile( title: ListTile(
@ -90,8 +86,7 @@ Future<void> confirmationDialog(String title, String text, {Color? color, IconDa
if (onReject != null) { if (onReject != null) {
onReject(); onReject();
} }
} }),
),
TextButton( TextButton(
child: Text(_accept), child: Text(_accept),
onPressed: () { onPressed: () {
@ -103,13 +98,10 @@ Future<void> confirmationDialog(String title, String text, {Color? color, IconDa
} }
}, },
) )
] ]);
); });
}
);
} }
/* /*
* Construct an error dialog showing information to the user * Construct an error dialog showing information to the user
* *
@ -117,68 +109,56 @@ Future<void> confirmationDialog(String title, String text, {Color? color, IconDa
* @description = Simple string description of error * @description = Simple string description of error
* @data = Error response (e.g from server) * @data = Error response (e.g from server)
*/ */
Future<void> showErrorDialog(String title, {String description = "", APIResponse? response, IconData icon = TablerIcons.exclamation_circle, Function? onDismissed}) async { Future<void> showErrorDialog(String title,
{String description = "",
APIResponse? response,
IconData icon = TablerIcons.exclamation_circle,
Function? onDismissed}) async {
List<Widget> children = []; List<Widget> children = [];
if (description.isNotEmpty) { if (description.isNotEmpty) {
children.add( children.add(ListTile(
ListTile(
title: Text(description), title: Text(description),
) ));
);
} else if (response != null) { } else if (response != null) {
// Look for extra error information in the provided APIResponse object // Look for extra error information in the provided APIResponse object
switch (response.statusCode) { switch (response.statusCode) {
case 400: // Bad request (typically bad input) case 400: // Bad request (typically bad input)
if (response.data is Map<String, dynamic>) { if (response.data is Map<String, dynamic>) {
for (String field in response.asMap().keys) { for (String field in response.asMap().keys) {
dynamic error = response.data[field]; dynamic error = response.data[field];
if (error is List) { if (error is List) {
for (int ii = 0; ii < error.length; ii++) { for (int ii = 0; ii < error.length; ii++) {
children.add( children.add(ListTile(
ListTile(
title: Text(field), title: Text(field),
subtitle: Text(error[ii].toString()), subtitle: Text(error[ii].toString()),
) ));
);
} }
} else { } else {
children.add( children.add(ListTile(
ListTile(
title: Text(field), title: Text(field),
subtitle: Text(response.data[field].toString()), subtitle: Text(response.data[field].toString()),
) ));
);
} }
} }
} else { } else {
children.add( children.add(ListTile(
ListTile(
title: Text(L10().responseInvalid), title: Text(L10().responseInvalid),
subtitle: Text(response.data.toString()) subtitle: Text(response.data.toString())));
)
);
} }
break; break;
default: default:
// Unhandled server response // Unhandled server response
children.add( children.add(ListTile(
ListTile(
title: Text(L10().statusCode), title: Text(L10().statusCode),
subtitle: Text(response.statusCode.toString()), subtitle: Text(response.statusCode.toString()),
) ));
);
children.add( children.add(ListTile(
ListTile(
title: Text(L10().responseData), title: Text(L10().responseData),
subtitle: Text(response.data.toString()), subtitle: Text(response.data.toString()),
) ));
);
break; break;
} }
@ -188,15 +168,15 @@ Future<void> showErrorDialog(String title, {String description = "", APIResponse
return; return;
} }
OneContext().showDialog( OneContext()
.showDialog(
builder: (context) => SimpleDialog( builder: (context) => SimpleDialog(
title: ListTile( title: ListTile(
title: Text(title), title: Text(title),
leading: Icon(icon), leading: Icon(icon),
), ),
children: children children: children))
) .then((value) {
).then((value) {
if (onDismissed != null) { if (onDismissed != null) {
onDismissed(); onDismissed();
} }
@ -206,8 +186,8 @@ Future<void> showErrorDialog(String title, {String description = "", APIResponse
/* /*
* Display a message indicating the nature of a server / API error * Display a message indicating the nature of a server / API error
*/ */
Future<void> showServerError(String url, String title, String description) async { Future<void> showServerError(
String url, String title, String description) async {
if (!hasContext()) { if (!hasContext()) {
return; return;
} }
@ -222,7 +202,8 @@ Future<void> showServerError(String url, String title, String description) async
} }
// Play a sound // Play a sound
final bool tones = await InvenTreeSettingsManager().getValue(INV_SOUNDS_SERVER, true) as bool; final bool tones = await InvenTreeSettingsManager()
.getValue(INV_SOUNDS_SERVER, true) as bool;
if (tones) { if (tones) {
playAudioFile("sounds/server_error.mp3"); playAudioFile("sounds/server_error.mp3");
@ -230,25 +211,16 @@ Future<void> showServerError(String url, String title, String description) async
description += "\nURL: $url"; description += "\nURL: $url";
showSnackIcon( showSnackIcon(title, success: false, actionText: L10().details, onAction: () {
title, showErrorDialog(title, description: description, icon: TablerIcons.server);
success: false, });
actionText: L10().details,
onAction: () {
showErrorDialog(
title,
description: description,
icon: TablerIcons.server
);
}
);
} }
/* /*
* Displays an error indicating that the server returned an unexpected status code * Displays an error indicating that the server returned an unexpected status code
*/ */
Future<void> showStatusCodeError(String url, int status, {String details=""}) async { Future<void> showStatusCodeError(String url, int status,
{String details = ""}) async {
String msg = statusCodeToString(status); String msg = statusCodeToString(status);
String extra = url + "\n" + "${L10().statusCode}: ${status}"; String extra = url + "\n" + "${L10().statusCode}: ${status}";
@ -264,7 +236,6 @@ Future<void> showStatusCodeError(String url, int status, {String details=""}) as
); );
} }
/* /*
* Provide a human-readable descriptor for a particular error code * Provide a human-readable descriptor for a particular error code
*/ */
@ -299,7 +270,6 @@ String statusCodeToString(int status) {
} }
} }
/* /*
* Displays a message indicating that the server timed out on a certain request * Displays a message indicating that the server timed out on a certain request
*/ */

80
lib/widget/drawer.dart
View File

@ -16,12 +16,10 @@ import "package:inventree/widget/notifications.dart";
import "package:inventree/widget/order/purchase_order_list.dart"; import "package:inventree/widget/order/purchase_order_list.dart";
import "package:inventree/widget/stock/location_display.dart"; import "package:inventree/widget/stock/location_display.dart";
/* /*
* Custom "drawer" widget for the InvenTree app. * Custom "drawer" widget for the InvenTree app.
*/ */
class InvenTreeDrawer extends StatelessWidget { class InvenTreeDrawer extends StatelessWidget {
const InvenTreeDrawer(this.context); const InvenTreeDrawer(this.context);
final BuildContext context; final BuildContext context;
@ -52,10 +50,8 @@ class InvenTreeDrawer extends StatelessWidget {
_closeDrawer(); _closeDrawer();
if (_checkConnection()) { if (_checkConnection()) {
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)));
MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null))
);
} }
} }
@ -64,10 +60,8 @@ class InvenTreeDrawer extends StatelessWidget {
_closeDrawer(); _closeDrawer();
if (_checkConnection()) { if (_checkConnection()) {
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => LocationDisplayWidget(null)));
MaterialPageRoute(builder: (context) => LocationDisplayWidget(null))
);
} }
} }
@ -79,9 +73,7 @@ class InvenTreeDrawer extends StatelessWidget {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SalesOrderListWidget(filters: {}) builder: (context) => SalesOrderListWidget(filters: {})));
)
);
} }
} }
@ -93,9 +85,7 @@ class InvenTreeDrawer extends StatelessWidget {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget(filters: {}) builder: (context) => PurchaseOrderListWidget(filters: {})));
)
);
} }
} }
@ -112,7 +102,8 @@ class InvenTreeDrawer extends StatelessWidget {
// Load settings widget // Load settings widget
void _settings() { void _settings() {
_closeDrawer(); _closeDrawer();
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeSettingsWidget())); Navigator.push(context,
MaterialPageRoute(builder: (context) => InvenTreeSettingsWidget()));
} }
// Construct list of tiles to display in the "drawer" menu // Construct list of tiles to display in the "drawer" menu
@ -132,43 +123,35 @@ class InvenTreeDrawer extends StatelessWidget {
tiles.add(Divider()); tiles.add(Divider());
if (InvenTreePart().canView) { if (InvenTreePart().canView) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().parts), title: Text(L10().parts),
leading: Icon(TablerIcons.box, color: COLOR_ACTION), leading: Icon(TablerIcons.box, color: COLOR_ACTION),
onTap: _parts, onTap: _parts,
) ));
);
} }
if (InvenTreeStockLocation().canView) { if (InvenTreeStockLocation().canView) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().stock), title: Text(L10().stock),
leading: Icon(TablerIcons.package, color: COLOR_ACTION), leading: Icon(TablerIcons.package, color: COLOR_ACTION),
onTap: _stock, onTap: _stock,
) ));
);
} }
if (InvenTreePurchaseOrder().canView) { if (InvenTreePurchaseOrder().canView) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().purchaseOrders), title: Text(L10().purchaseOrders),
leading: Icon(TablerIcons.shopping_cart, color: COLOR_ACTION), leading: Icon(TablerIcons.shopping_cart, color: COLOR_ACTION),
onTap: _purchaseOrders, onTap: _purchaseOrders,
) ));
);
} }
if (InvenTreeSalesOrder().canView) { if (InvenTreeSalesOrder().canView) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().salesOrders), title: Text(L10().salesOrders),
leading: Icon(TablerIcons.truck_delivery, color: COLOR_ACTION), leading: Icon(TablerIcons.truck_delivery, color: COLOR_ACTION),
onTap: _salesOrders, onTap: _salesOrders,
) ));
);
} }
if (tiles.length > 2) { if (tiles.length > 2) {
@ -177,55 +160,44 @@ class InvenTreeDrawer extends StatelessWidget {
int notification_count = InvenTreeAPI().notification_counter; int notification_count = InvenTreeAPI().notification_counter;
tiles.add( tiles.add(ListTile(
ListTile(
leading: Icon(TablerIcons.bell, color: COLOR_ACTION), leading: Icon(TablerIcons.bell, color: COLOR_ACTION),
trailing: notification_count > 0 ? Text(notification_count.toString()) : null, trailing:
notification_count > 0 ? Text(notification_count.toString()) : null,
title: Text(L10().notifications), title: Text(L10().notifications),
onTap: _notifications, onTap: _notifications,
) ));
);
tiles.add(Divider()); tiles.add(Divider());
bool darkMode = AdaptiveTheme.of(context).mode.isDark; bool darkMode = AdaptiveTheme.of(context).mode.isDark;
tiles.add( tiles.add(ListTile(
ListTile(
onTap: () { onTap: () {
AdaptiveTheme.of(context).toggleThemeMode(); AdaptiveTheme.of(context).toggleThemeMode();
_closeDrawer(); _closeDrawer();
}, },
title: Text(L10().colorScheme), title: Text(L10().colorScheme),
subtitle: Text(L10().colorSchemeDetail), subtitle: Text(L10().colorSchemeDetail),
leading: Icon( leading: Icon(TablerIcons.sun_moon, color: COLOR_ACTION),
TablerIcons.sun_moon,
color: COLOR_ACTION
),
trailing: Icon( trailing: Icon(
darkMode ? TablerIcons.moon : TablerIcons.sun, darkMode ? TablerIcons.moon : TablerIcons.sun,
) )));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().settings), title: Text(L10().settings),
leading: Icon(Icons.settings, color: COLOR_ACTION), leading: Icon(Icons.settings, color: COLOR_ACTION),
onTap: _settings, onTap: _settings,
) ));
);
return tiles; return tiles;
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Drawer( return Drawer(
child: ListView( child: ListView(
children: drawerTiles(context), children: drawerTiles(context),
) ));
);
} }
} }

91
lib/widget/fields.dart
View File

@ -9,11 +9,8 @@ import "package:one_context/one_context.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
class FilePickerDialog { class FilePickerDialog {
static Future<File?> pickImageFromCamera() async { static Future<File?> pickImageFromCamera() async {
final picker = ImagePicker(); final picker = ImagePicker();
final pickedImage = await picker.pickImage(source: ImageSource.camera); final pickedImage = await picker.pickImage(source: ImageSource.camera);
@ -26,7 +23,6 @@ class FilePickerDialog {
} }
static Future<File?> pickImageFromGallery() async { static Future<File?> pickImageFromGallery() async {
final picker = ImagePicker(); final picker = ImagePicker();
final pickedImage = await picker.pickImage(source: ImageSource.gallery); final pickedImage = await picker.pickImage(source: ImageSource.gallery);
@ -39,7 +35,6 @@ class FilePickerDialog {
} }
static Future<File?> pickFileFromDevice() async { static Future<File?> pickFileFromDevice() async {
final FilePickerResult? result = await FilePicker.platform.pickFiles(); final FilePickerResult? result = await FilePicker.platform.pickFiles();
if (result != null) { if (result != null) {
@ -54,8 +49,11 @@ class FilePickerDialog {
} }
// Present a dialog to pick a file, either from local file system or from camera // Present a dialog to pick a file, either from local file system or from camera
static Future<void> pickFile({String message = "", bool allowImages = true, bool allowFiles = true, Function(File)? onPicked}) async { static Future<void> pickFile(
{String message = "",
bool allowImages = true,
bool allowFiles = true,
Function(File)? onPicked}) async {
String title = ""; String title = "";
if (allowImages && !allowFiles) { if (allowImages && !allowFiles) {
@ -65,26 +63,18 @@ class FilePickerDialog {
} }
// Construct actions // Construct actions
List<Widget> actions = [ List<Widget> actions = [];
];
if (message.isNotEmpty) { if (message.isNotEmpty) {
actions.add( actions.add(ListTile(title: Text(message)));
ListTile(
title: Text(message)
)
);
} }
actions.add( actions.add(SimpleDialogOption(
SimpleDialogOption(
child: ListTile( child: ListTile(
leading: Icon(TablerIcons.arrow_up), leading: Icon(TablerIcons.arrow_up),
title: Text(allowFiles ? L10().selectFile : L10().selectImage), title: Text(allowFiles ? L10().selectFile : L10().selectImage),
), ),
onPressed: () async { onPressed: () async {
// Close the dialog // Close the dialog
OneContext().popDialog(); OneContext().popDialog();
@ -101,12 +91,10 @@ class FilePickerDialog {
} }
} }
}, },
) ));
);
if (allowImages) { if (allowImages) {
actions.add( actions.add(SimpleDialogOption(
SimpleDialogOption(
child: ListTile( child: ListTile(
leading: Icon(TablerIcons.camera), leading: Icon(TablerIcons.camera),
title: Text(L10().takePicture), title: Text(L10().takePicture),
@ -122,24 +110,18 @@ class FilePickerDialog {
onPicked(file); onPicked(file);
} }
} }
} }));
)
);
} }
OneContext().showDialog( OneContext().showDialog(builder: (context) {
builder: (context) {
return SimpleDialog( return SimpleDialog(
title: Text(title), title: Text(title),
children: actions, children: actions,
); );
});
} }
);
}
} }
class CheckBoxField extends FormField<bool> { class CheckBoxField extends FormField<bool> {
CheckBoxField({ CheckBoxField({
String? label, String? label,
@ -149,32 +131,35 @@ class CheckBoxField extends FormField<bool> {
TextStyle? labelStyle, TextStyle? labelStyle,
String? helperText, String? helperText,
TextStyle? helperStyle, TextStyle? helperStyle,
}) : }) : super(
super(
onSaved: onSaved, onSaved: onSaved,
initialValue: initial, initialValue: initial,
builder: (FormFieldState<bool> state) { builder: (FormFieldState<bool> state) {
return CheckboxListTile( return CheckboxListTile(
title: label != null ? Text(label, style: labelStyle) : null, title: label != null ? Text(label, style: labelStyle) : null,
value: state.value, value: state.value,
tristate: tristate, tristate: tristate,
onChanged: state.didChange, onChanged: state.didChange,
subtitle: helperText != null ? Text(helperText, style: helperStyle) : null, subtitle: helperText != null
? Text(helperText, style: helperStyle)
: null,
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
); );
} });
);
} }
class StringField extends TextFormField { class StringField extends TextFormField {
StringField(
StringField({String label = "", String? hint, String? initial, Function(String?)? onSaved, Function(String?)? validator, bool allowEmpty = false, bool isEnabled = true}) : {String label = "",
super( String? hint,
String? initial,
Function(String?)? onSaved,
Function(String?)? validator,
bool allowEmpty = false,
bool isEnabled = true})
: super(
decoration: InputDecoration( decoration: InputDecoration(
labelText: allowEmpty ? label : label + "*", labelText: allowEmpty ? label : label + "*", hintText: hint),
hintText: hint
),
initialValue: initial, initialValue: initial,
onSaved: onSaved, onSaved: onSaved,
enabled: isEnabled, enabled: isEnabled,
@ -188,32 +173,34 @@ class StringField extends TextFormField {
} }
return null; return null;
} });
);
} }
/* /*
* Helper class for quantity values * Helper class for quantity values
*/ */
class QuantityField extends TextFormField { class QuantityField extends TextFormField {
QuantityField(
QuantityField({String label = "", String hint = "", double? max, TextEditingController? controller}) : {String label = "",
super( String hint = "",
double? max,
TextEditingController? controller})
: super(
decoration: InputDecoration( decoration: InputDecoration(
labelText: label, labelText: label,
hintText: hint, hintText: hint,
), ),
controller: controller, controller: controller,
keyboardType: TextInputType.numberWithOptions(signed: false, decimal: true), keyboardType:
TextInputType.numberWithOptions(signed: false, decimal: true),
validator: (value) { validator: (value) {
if (value != null && value.isEmpty) return L10().quantityEmpty; if (value != null && value.isEmpty) return L10().quantityEmpty;
double quantity = double.tryParse(value.toString()) ?? 0; double quantity = double.tryParse(value.toString()) ?? 0;
if (quantity <= 0) return L10().quantityPositive; if (quantity <= 0) return L10().quantityPositive;
if ((max != null) && (quantity > max)) return "Quantity must not exceed ${max}"; if ((max != null) && (quantity > max))
return "Quantity must not exceed ${max}";
return null; return null;
}, },

171
lib/widget/home.dart
View File

@ -26,18 +26,15 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/spinner.dart"; import "package:inventree/widget/spinner.dart";
import "package:inventree/widget/company/company_list.dart"; import "package:inventree/widget/company/company_list.dart";
class InvenTreeHomePage extends StatefulWidget { class InvenTreeHomePage extends StatefulWidget {
const InvenTreeHomePage({Key? key}) : super(key: key); const InvenTreeHomePage({Key? key}) : super(key: key);
@override @override
_InvenTreeHomePageState createState() => _InvenTreeHomePageState(); _InvenTreeHomePageState createState() => _InvenTreeHomePageState();
} }
class _InvenTreeHomePageState extends State<InvenTreeHomePage>
class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetProperties { with BaseWidgetProperties {
_InvenTreeHomePageState() : super() { _InvenTreeHomePageState() : super() {
// Load display settings // Load display settings
_loadSettings(); _loadSettings();
@ -46,7 +43,6 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
_loadProfile(); _loadProfile();
InvenTreeAPI().registerCallback(() { InvenTreeAPI().registerCallback(() {
if (mounted) { if (mounted) {
setState(() { setState(() {
// Reload the widget // Reload the widget
@ -70,26 +66,22 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
void _showParts(BuildContext context) { void _showParts(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return; if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null))); Navigator.push(context,
MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)));
} }
void _showStarredParts(BuildContext context) { void _showStarredParts(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return; if (!InvenTreeAPI().checkConnection()) return;
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => PartList({"starred": "true"})));
MaterialPageRoute(
builder: (context) => PartList({
"starred": "true"
})
)
);
} }
void _showStock(BuildContext context) { void _showStock(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return; if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => LocationDisplayWidget(null))); Navigator.push(context,
MaterialPageRoute(builder: (context) => LocationDisplayWidget(null)));
} }
void _showPurchaseOrders(BuildContext context) { void _showPurchaseOrders(BuildContext context) {
@ -98,9 +90,7 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget(filters: {}) builder: (context) => PurchaseOrderListWidget(filters: {})));
)
);
} }
void _showSalesOrders(BuildContext context) { void _showSalesOrders(BuildContext context) {
@ -109,15 +99,17 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SalesOrderListWidget(filters: {}) builder: (context) => SalesOrderListWidget(filters: {})));
)
);
} }
void _showSuppliers(BuildContext context) { void _showSuppliers(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return; if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CompanyListWidget(L10().suppliers, {"is_supplier": "true"}))); Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
CompanyListWidget(L10().suppliers, {"is_supplier": "true"})));
} }
/* /*
@ -131,39 +123,47 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
void _showCustomers(BuildContext context) { void _showCustomers(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return; if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CompanyListWidget(L10().customers, {"is_customer": "true"}))); Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
CompanyListWidget(L10().customers, {"is_customer": "true"})));
} }
void _selectProfile() { void _selectProfile() {
Navigator.push( Navigator.push(
context, MaterialPageRoute(builder: (context) => InvenTreeSelectServerWidget()) context,
).then((context) { MaterialPageRoute(
builder: (context) => InvenTreeSelectServerWidget()))
.then((context) {
// Once we return // Once we return
_loadProfile(); _loadProfile();
}); });
} }
Future <void> _loadSettings() async { Future<void> _loadSettings() async {
homeShowSubscribed = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_SUBSCRIBED, true) as bool;
homeShowPo = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_PO, true) as bool;
homeShowSo = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_SO, true) as bool;
homeShowManufacturers = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_MANUFACTURERS, true) as bool;
homeShowCustomers = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_CUSTOMERS, true) as bool;
homeShowSuppliers = await InvenTreeSettingsManager()
.getValue(INV_HOME_SHOW_SUPPLIERS, true) as bool;
homeShowSubscribed = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SUBSCRIBED, true) as bool; setState(() {});
homeShowPo = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_PO, true) as bool;
homeShowSo = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SO, true) as bool;
homeShowManufacturers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_MANUFACTURERS, true) as bool;
homeShowCustomers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_CUSTOMERS, true) as bool;
homeShowSuppliers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SUPPLIERS, true) as bool;
setState(() {
});
} }
Future <void> _loadProfile() async { Future<void> _loadProfile() async {
_profile = await UserProfileDBManager().getSelectedProfile(); _profile = await UserProfileDBManager().getSelectedProfile();
// A valid profile was loaded! // A valid profile was loaded!
if (_profile != null) { if (_profile != null) {
if (!InvenTreeAPI().isConnected() && !InvenTreeAPI().isConnecting()) { if (!InvenTreeAPI().isConnected() && !InvenTreeAPI().isConnecting()) {
// Attempt server connection // Attempt server connection
InvenTreeAPI().connectToServer(_profile!).then((result) { InvenTreeAPI().connectToServer(_profile!).then((result) {
if (mounted) { if (mounted) {
@ -176,8 +176,11 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
setState(() {}); setState(() {});
} }
Widget _listTile(BuildContext context, String label, IconData icon, {Function()? callback, String role = "", String permission = "", Widget? trailing}) { Widget _listTile(BuildContext context, String label, IconData icon,
{Function()? callback,
String role = "",
String permission = "",
Widget? trailing}) {
bool connected = InvenTreeAPI().isConnected(); bool connected = InvenTreeAPI().isConnected();
bool allowed = true; bool allowed = true;
@ -191,22 +194,17 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: Align( child: Align(
child: ListTile( child: ListTile(
leading: Icon( leading: Icon(icon,
icon,
size: 32, size: 32,
color: connected && allowed ? COLOR_ACTION : Colors.grey color: connected && allowed ? COLOR_ACTION : Colors.grey),
),
title: Text( title: Text(
label, label,
style: TextStyle( style: TextStyle(fontSize: 20),
fontSize: 20
),
), ),
trailing: trailing, trailing: trailing,
), ),
alignment: Alignment.center, alignment: Alignment.center,
) )),
),
onTap: () { onTap: () {
if (!allowed) { if (!allowed) {
showSnackIcon( showSnackIcon(
@ -228,7 +226,6 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
* Constructs a list of tiles for the main screen * Constructs a list of tiles for the main screen
*/ */
List<Widget> getListTiles(BuildContext context) { List<Widget> getListTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
// Parts // Parts
@ -245,61 +242,42 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
// Starred parts // Starred parts
if (homeShowSubscribed && InvenTreePart().canView) { if (homeShowSubscribed && InvenTreePart().canView) {
tiles.add(_listTile( tiles.add(_listTile(context, L10().partsStarred, TablerIcons.bell,
context,
L10().partsStarred,
TablerIcons.bell,
callback: () { callback: () {
_showStarredParts(context); _showStarredParts(context);
} }));
));
} }
// Stock button // Stock button
if (InvenTreeStockItem().canView) { if (InvenTreeStockItem().canView) {
tiles.add(_listTile( tiles.add(
context, _listTile(context, L10().stock, TablerIcons.package, callback: () {
L10().stock,
TablerIcons.package,
callback: () {
_showStock(context); _showStock(context);
} }));
));
} }
// Purchase orders // Purchase orders
if (homeShowPo && InvenTreePurchaseOrder().canView) { if (homeShowPo && InvenTreePurchaseOrder().canView) {
tiles.add(_listTile( tiles.add(
context, _listTile(context, L10().purchaseOrders, TablerIcons.shopping_cart,
L10().purchaseOrders,
TablerIcons.shopping_cart,
callback: () { callback: () {
_showPurchaseOrders(context); _showPurchaseOrders(context);
} }));
));
} }
if (homeShowSo && InvenTreeSalesOrder().canView) { if (homeShowSo && InvenTreeSalesOrder().canView) {
tiles.add(_listTile( tiles.add(_listTile(
context, context, L10().salesOrders, TablerIcons.truck_delivery, callback: () {
L10().salesOrders,
TablerIcons.truck_delivery,
callback: () {
_showSalesOrders(context); _showSalesOrders(context);
} }));
));
} }
// Suppliers // Suppliers
if (homeShowSuppliers && InvenTreePurchaseOrder().canView) { if (homeShowSuppliers && InvenTreePurchaseOrder().canView) {
tiles.add(_listTile( tiles.add(_listTile(context, L10().suppliers, TablerIcons.building,
context,
L10().suppliers,
TablerIcons.building,
callback: () { callback: () {
_showSuppliers(context); _showSuppliers(context);
} }));
));
} }
// TODO: Add these tiles back in once the features are fleshed out // TODO: Add these tiles back in once the features are fleshed out
@ -320,14 +298,10 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
*/ */
// Customers // Customers
if (homeShowCustomers) { if (homeShowCustomers) {
tiles.add(_listTile( tiles.add(_listTile(context, L10().customers, TablerIcons.building_store,
context,
L10().customers,
TablerIcons.building_store,
callback: () { callback: () {
_showCustomers(context); _showCustomers(context);
} }));
));
} }
return tiles; return tiles;
@ -338,10 +312,10 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
* display a connection status widget * display a connection status widget
*/ */
Widget _connectionStatusWidget(BuildContext context) { Widget _connectionStatusWidget(BuildContext context) {
String? serverAddress = InvenTreeAPI().serverAddress; String? serverAddress = InvenTreeAPI().serverAddress;
bool validAddress = serverAddress != null; bool validAddress = serverAddress != null;
bool connecting = !InvenTreeAPI().isConnected() && InvenTreeAPI().isConnecting(); bool connecting =
!InvenTreeAPI().isConnected() && InvenTreeAPI().isConnecting();
Widget leading = Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER); Widget leading = Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER);
Widget trailing = Icon(TablerIcons.server, color: COLOR_ACTION); Widget trailing = Icon(TablerIcons.server, color: COLOR_ACTION);
@ -357,8 +331,7 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
} }
return Center( return Center(
child: Column( child: Column(children: [
children: [
Spacer(), Spacer(),
Image.asset( Image.asset(
"assets/image/logo_transparent.png", "assets/image/logo_transparent.png",
@ -374,8 +347,7 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
leading: leading, leading: leading,
onTap: _selectProfile, onTap: _selectProfile,
) )
] ]),
),
); );
} }
@ -384,7 +356,6 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
*/ */
@override @override
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
if (!InvenTreeAPI().isConnected()) { if (!InvenTreeAPI().isConnected()) {
return _connectionStatusWidget(context); return _connectionStatusWidget(context);
} }
@ -408,12 +379,10 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
mainAxisSpacing: padding, mainAxisSpacing: padding,
padding: EdgeInsets.all(padding), padding: EdgeInsets.all(padding),
); );
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var connected = InvenTreeAPI().isConnected(); var connected = InvenTreeAPI().isConnected();
var connecting = !connected && InvenTreeAPI().isConnecting(); var connecting = !connected && InvenTreeAPI().isConnecting();
@ -426,7 +395,9 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
IconButton( IconButton(
icon: Icon( icon: Icon(
TablerIcons.server, TablerIcons.server,
color: connected ? COLOR_SUCCESS : (connecting ? COLOR_PROGRESS: COLOR_DANGER), color: connected
? COLOR_SUCCESS
: (connecting ? COLOR_PROGRESS : COLOR_DANGER),
), ),
onPressed: _selectProfile, onPressed: _selectProfile,
) )
@ -434,7 +405,9 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
), ),
drawer: InvenTreeDrawer(context), drawer: InvenTreeDrawer(context),
body: getBody(context), body: getBody(context),
bottomNavigationBar: InvenTreeAPI().isConnected() ? buildBottomAppBar(context, homeKey) : null, bottomNavigationBar: InvenTreeAPI().isConnected()
? buildBottomAppBar(context, homeKey)
: null,
); );
} }
} }

24
lib/widget/notes_widget.dart
View File

@ -5,7 +5,6 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:flutter_markdown/flutter_markdown.dart"; import "package:flutter_markdown/flutter_markdown.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
/* /*
* A widget for displaying the notes associated with a given model. * A widget for displaying the notes associated with a given model.
* We need to pass in the following parameters: * We need to pass in the following parameters:
@ -14,7 +13,6 @@ import "package:inventree/l10.dart";
* - Title for the app bar * - Title for the app bar
*/ */
class NotesWidget extends StatefulWidget { class NotesWidget extends StatefulWidget {
const NotesWidget(this.model, {Key? key}) : super(key: key); const NotesWidget(this.model, {Key? key}) : super(key: key);
final InvenTreeModel model; final InvenTreeModel model;
@ -23,12 +21,10 @@ class NotesWidget extends StatefulWidget {
_NotesState createState() => _NotesState(); _NotesState createState() => _NotesState();
} }
/* /*
* Class representing the state of the NotesWidget * Class representing the state of the NotesWidget
*/ */
class _NotesState extends RefreshableState<NotesWidget> { class _NotesState extends RefreshableState<NotesWidget> {
_NotesState(); _NotesState();
@override @override
@ -41,30 +37,21 @@ class _NotesState extends RefreshableState<NotesWidget> {
@override @override
List<Widget> appBarActions(BuildContext context) { List<Widget> appBarActions(BuildContext context) {
List<Widget> actions = []; List<Widget> actions = [];
if (widget.model.canEdit) { if (widget.model.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().edit, tooltip: L10().edit,
onPressed: () { onPressed: () {
widget.model.editForm( widget.model.editForm(context, L10().editNotes, fields: {
context,
L10().editNotes,
fields: {
"notes": { "notes": {
"multiline": true, "multiline": true,
} }
}, }, onSuccess: (data) async {
onSuccess: (data) async {
refresh(context); refresh(context);
} });
); }));
}
)
);
} }
return actions; return actions;
@ -77,5 +64,4 @@ class _NotesState extends RefreshableState<NotesWidget> {
data: widget.model.notes, data: widget.model.notes,
); );
} }
} }

35
lib/widget/notifications.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -8,17 +7,12 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/notification.dart"; import "package:inventree/inventree/notification.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
class NotificationWidget extends StatefulWidget { class NotificationWidget extends StatefulWidget {
@override @override
_NotificationState createState() => _NotificationState(); _NotificationState createState() => _NotificationState();
} }
class _NotificationState extends RefreshableState<NotificationWidget> { class _NotificationState extends RefreshableState<NotificationWidget> {
_NotificationState() : super(); _NotificationState() : super();
List<InvenTreeNotification> notifications = []; List<InvenTreeNotification> notifications = [];
@ -29,8 +23,7 @@ class _NotificationState extends RefreshableState<NotificationWidget> {
String getAppBarTitle() => L10().notifications; String getAppBarTitle() => L10().notifications;
@override @override
Future<void> request (BuildContext context) async { Future<void> request(BuildContext context) async {
final results = await InvenTreeNotification().list(); final results = await InvenTreeNotification().list();
notifications.clear(); notifications.clear();
@ -45,8 +38,8 @@ class _NotificationState extends RefreshableState<NotificationWidget> {
/* /*
* Dismiss an individual notification entry (mark it as "read") * Dismiss an individual notification entry (mark it as "read")
*/ */
Future<void> dismissNotification(BuildContext context, InvenTreeNotification notification) async { Future<void> dismissNotification(
BuildContext context, InvenTreeNotification notification) async {
if (mounted) { if (mounted) {
setState(() { setState(() {
isDismissing = true; isDismissing = true;
@ -71,36 +64,34 @@ class _NotificationState extends RefreshableState<NotificationWidget> {
*/ */
@override @override
List<Widget> getTiles(BuildContext context) { List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
tiles.add( tiles.add(ListTile(
ListTile(
title: Text( title: Text(
L10().notifications, L10().notifications,
), ),
subtitle: notifications.isEmpty ? Text(L10().notificationsEmpty) : null, subtitle: notifications.isEmpty ? Text(L10().notificationsEmpty) : null,
leading: notifications.isEmpty ? Icon(TablerIcons.bell_exclamation) : Icon(TablerIcons.bell), leading: notifications.isEmpty
? Icon(TablerIcons.bell_exclamation)
: Icon(TablerIcons.bell),
trailing: Text("${notifications.length}"), trailing: Text("${notifications.length}"),
) ));
);
for (var notification in notifications) { for (var notification in notifications) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(notification.name), title: Text(notification.name),
subtitle: Text(notification.message), subtitle: Text(notification.message),
trailing: IconButton( trailing: IconButton(
icon: Icon(TablerIcons.bookmark), icon: Icon(TablerIcons.bookmark),
onPressed: isDismissing ? null : () async { onPressed: isDismissing
? null
: () async {
dismissNotification(context, notification); dismissNotification(context, notification);
}, },
), ),
) ));
);
} }
return tiles; return tiles;
} }
} }

52
lib/widget/order/extra_line_detail.dart
View File

@ -8,7 +8,6 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/inventree/orders.dart"; import "package:inventree/inventree/orders.dart";
class ExtraLineDetailWidget extends StatefulWidget { class ExtraLineDetailWidget extends StatefulWidget {
const ExtraLineDetailWidget(this.item, {Key? key}) : super(key: key); const ExtraLineDetailWidget(this.item, {Key? key}) : super(key: key);
@ -18,8 +17,8 @@ class ExtraLineDetailWidget extends StatefulWidget {
_ExtraLineDetailWidgetState createState() => _ExtraLineDetailWidgetState(); _ExtraLineDetailWidgetState createState() => _ExtraLineDetailWidgetState();
} }
class _ExtraLineDetailWidgetState extends RefreshableState<ExtraLineDetailWidget> { class _ExtraLineDetailWidgetState
extends RefreshableState<ExtraLineDetailWidget> {
_ExtraLineDetailWidgetState(); _ExtraLineDetailWidgetState();
@override @override
@ -30,14 +29,11 @@ class _ExtraLineDetailWidgetState extends RefreshableState<ExtraLineDetailWidget
List<Widget> actions = []; List<Widget> actions = [];
if (widget.item.canEdit) { if (widget.item.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
onPressed: () { onPressed: () {
_editLineItem(context); _editLineItem(context);
} }));
)
);
} }
return actions; return actions;
@ -53,58 +49,42 @@ class _ExtraLineDetailWidgetState extends RefreshableState<ExtraLineDetailWidget
Future<void> _editLineItem(BuildContext context) async { Future<void> _editLineItem(BuildContext context) async {
var fields = widget.item.formFields(); var fields = widget.item.formFields();
widget.item.editForm( widget.item.editForm(context, L10().editLineItem, fields: fields,
context,
L10().editLineItem,
fields: fields,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true); showSnackIcon(L10().lineItemUpdated, success: true);
} });
);
} }
@override @override
List<Widget> getTiles(BuildContext context) { List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().reference), title: Text(L10().reference),
trailing: Text(widget.item.reference), trailing: Text(widget.item.reference),
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().description), title: Text(L10().description),
trailing: Text(widget.item.description), trailing: Text(widget.item.description),
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().quantity), title: Text(L10().quantity),
trailing: Text(widget.item.quantity.toString()), trailing: Text(widget.item.quantity.toString()),
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().unitPrice), title: Text(L10().unitPrice),
trailing: Text( trailing: Text(
renderCurrency(widget.item.price, widget.item.priceCurrency) renderCurrency(widget.item.price, widget.item.priceCurrency))));
)
)
);
if (widget.item.notes.isNotEmpty) { if (widget.item.notes.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notes), title: Text(L10().notes),
subtitle: Text(widget.item.notes), subtitle: Text(widget.item.notes),
) ));
);
} }
return tiles; return tiles;

50
lib/widget/order/po_extra_line_list.dart
View File

@ -9,41 +9,36 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
class POExtraLineListWidget extends StatefulWidget { class POExtraLineListWidget extends StatefulWidget {
const POExtraLineListWidget(this.order, {this.filters = const {}, Key? key})
const POExtraLineListWidget(this.order, {this.filters = const {}, Key? key}) : super(key: key); : super(key: key);
final InvenTreePurchaseOrder order; final InvenTreePurchaseOrder order;
final Map<String, String> filters; final Map<String, String> filters;
@override @override
_PurchaseOrderExtraLineListWidgetState createState() => _PurchaseOrderExtraLineListWidgetState(); _PurchaseOrderExtraLineListWidgetState createState() =>
_PurchaseOrderExtraLineListWidgetState();
} }
class _PurchaseOrderExtraLineListWidgetState extends RefreshableState<POExtraLineListWidget> { class _PurchaseOrderExtraLineListWidgetState
extends RefreshableState<POExtraLineListWidget> {
_PurchaseOrderExtraLineListWidgetState(); _PurchaseOrderExtraLineListWidgetState();
@override @override
String getAppBarTitle() => L10().extraLineItems; String getAppBarTitle() => L10().extraLineItems;
Future<void> _addLineItem(BuildContext context) async { Future<void> _addLineItem(BuildContext context) async {
var fields = InvenTreePOExtraLineItem().formFields(); var fields = InvenTreePOExtraLineItem().formFields();
fields["order"]?["value"] = widget.order.pk; fields["order"]?["value"] = widget.order.pk;
InvenTreePOExtraLineItem().createForm( InvenTreePOExtraLineItem().createForm(context, L10().lineItemAdd,
context, fields: fields, onSuccess: (data) async {
L10().lineItemAdd,
fields: fields,
onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true); showSnackIcon(L10().lineItemUpdated, success: true);
} });
);
} }
@override @override
@ -51,15 +46,12 @@ class _PurchaseOrderExtraLineListWidgetState extends RefreshableState<POExtraLin
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (widget.order.canEdit) { if (widget.order.canEdit) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green), child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd, label: L10().lineItemAdd,
onTap: () { onTap: () {
_addLineItem(context); _addLineItem(context);
} }));
)
);
} }
return actions; return actions;
@ -71,35 +63,35 @@ class _PurchaseOrderExtraLineListWidgetState extends RefreshableState<POExtraLin
} }
} }
class PaginatedPOExtraLineList extends PaginatedSearchWidget { class PaginatedPOExtraLineList extends PaginatedSearchWidget {
const PaginatedPOExtraLineList(Map<String, String> filters)
const PaginatedPOExtraLineList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().extraLineItems; String get searchTitle => L10().extraLineItems;
@override @override
_PaginatedPOExtraLineListState createState() => _PaginatedPOExtraLineListState(); _PaginatedPOExtraLineListState createState() =>
_PaginatedPOExtraLineListState();
} }
class _PaginatedPOExtraLineListState extends PaginatedSearchState<PaginatedPOExtraLineList> { class _PaginatedPOExtraLineListState
extends PaginatedSearchState<PaginatedPOExtraLineList> {
_PaginatedPOExtraLineListState() : super(); _PaginatedPOExtraLineListState() : super();
@override @override
String get prefix => "po_extra_line_"; String get prefix => "po_extra_line_";
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
final page = await InvenTreePOExtraLineItem().listPaginated(limit, offset, filters: params); int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePOExtraLineItem()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePOExtraLineItem line = model as InvenTreePOExtraLineItem; InvenTreePOExtraLineItem line = model as InvenTreePOExtraLineItem;
return ListTile( return ListTile(

104
lib/widget/order/po_line_detail.dart
View File

@ -21,22 +21,18 @@ import "package:inventree/widget/company/supplier_part_detail.dart";
* Widget for displaying detail view of a single PurchaseOrderLineItem * Widget for displaying detail view of a single PurchaseOrderLineItem
*/ */
class POLineDetailWidget extends StatefulWidget { class POLineDetailWidget extends StatefulWidget {
const POLineDetailWidget(this.item, {Key? key}) : super(key: key); const POLineDetailWidget(this.item, {Key? key}) : super(key: key);
final InvenTreePOLineItem item; final InvenTreePOLineItem item;
@override @override
_POLineDetailWidgetState createState() => _POLineDetailWidgetState(); _POLineDetailWidgetState createState() => _POLineDetailWidgetState();
} }
/* /*
* State for the POLineDetailWidget * State for the POLineDetailWidget
*/ */
class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> { class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
_POLineDetailWidgetState(); _POLineDetailWidgetState();
InvenTreeStockLocation? destination; InvenTreeStockLocation? destination;
@ -49,14 +45,12 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
List<Widget> actions = []; List<Widget> actions = [];
if (widget.item.canEdit) { if (widget.item.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
onPressed: () { onPressed: () {
_editLineItem(context); _editLineItem(context);
}, },
) ));
);
} }
return actions; return actions;
@ -69,15 +63,12 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
if (widget.item.canCreate) { if (widget.item.canCreate) {
// Receive items // Receive items
if (!widget.item.isComplete) { if (!widget.item.isComplete) {
buttons.add( buttons.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.transition_right, color: Colors.blue), child: Icon(TablerIcons.transition_right, color: Colors.blue),
label: L10().receiveItem, label: L10().receiveItem,
onTap: () async { onTap: () async {
receiveLineItem(context); receiveLineItem(context);
} }));
)
);
} }
} }
@ -89,7 +80,9 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
await widget.item.reload(); await widget.item.reload();
if (widget.item.destinationId > 0) { if (widget.item.destinationId > 0) {
InvenTreeStockLocation().get(widget.item.destinationId).then((InvenTreeModel? loc) { InvenTreeStockLocation()
.get(widget.item.destinationId)
.then((InvenTreeModel? loc) {
if (mounted) { if (mounted) {
if (loc != null && loc is InvenTreeStockLocation) { if (loc != null && loc is InvenTreeStockLocation) {
setState(() { setState(() {
@ -109,33 +102,26 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
}); });
} }
} }
} }
// Callback to edit this line item // Callback to edit this line item
Future<void> _editLineItem(BuildContext context) async { Future<void> _editLineItem(BuildContext context) async {
var fields = widget.item.formFields(); var fields = widget.item.formFields();
widget.item.editForm( widget.item.editForm(context, L10().editLineItem, fields: fields,
context,
L10().editLineItem,
fields: fields,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true); showSnackIcon(L10().lineItemUpdated, success: true);
} });
);
} }
// Launch a form to 'receive' this line item // Launch a form to 'receive' this line item
Future<void> receiveLineItem(BuildContext context) async { Future<void> receiveLineItem(BuildContext context) async {
widget.item.receive( widget.item.receive(context,
context,
onSuccess: () => { onSuccess: () => {
showSnackIcon(L10().receivedItem, success: true), showSnackIcon(L10().receivedItem, success: true),
refresh(context) refresh(context)
} });
);
} }
@override @override
@ -143,8 +129,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
List<Widget> tiles = []; List<Widget> tiles = [];
// Reference to the part // Reference to the part
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().internalPart), title: Text(L10().internalPart),
subtitle: Text(widget.item.partName), subtitle: Text(widget.item.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION), leading: Icon(TablerIcons.box, color: COLOR_ACTION),
@ -158,26 +143,27 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
part.goToDetailPage(context); part.goToDetailPage(context);
} }
}, },
) ));
);
// Reference to the supplier part // Reference to the supplier part
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().supplierPart), title: Text(L10().supplierPart),
subtitle: Text(widget.item.SKU), subtitle: Text(widget.item.SKU),
leading: Icon(TablerIcons.building, color: COLOR_ACTION), leading: Icon(TablerIcons.building, color: COLOR_ACTION),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
var part = await InvenTreeSupplierPart().get(widget.item.supplierPartId); var part =
await InvenTreeSupplierPart().get(widget.item.supplierPartId);
hideLoadingOverlay(); hideLoadingOverlay();
if (part is InvenTreeSupplierPart) { if (part is InvenTreeSupplierPart) {
Navigator.push(context, MaterialPageRoute(builder: (context) => SupplierPartDetailWidget(part))); Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SupplierPartDetailWidget(part)));
} }
}, },
) ));
);
// Destination // Destination
if (destination != null) { if (destination != null) {
@ -185,75 +171,57 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
title: Text(L10().destination), title: Text(L10().destination),
subtitle: Text(destination!.name), subtitle: Text(destination!.name),
leading: Icon(TablerIcons.map_pin, color: COLOR_ACTION), leading: Icon(TablerIcons.map_pin, color: COLOR_ACTION),
onTap: () => { onTap: () => {destination!.goToDetailPage(context)}));
destination!.goToDetailPage(context)
}
));
} }
// Received quantity // Received quantity
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().received), title: Text(L10().received),
subtitle: ProgressBar(widget.item.progressRatio), subtitle: ProgressBar(widget.item.progressRatio),
trailing: Text( trailing: Text(widget.item.progressString,
widget.item.progressString,
style: TextStyle( style: TextStyle(
color: widget.item.isComplete ? COLOR_SUCCESS: COLOR_WARNING color: widget.item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
)
),
leading: Icon(TablerIcons.progress), leading: Icon(TablerIcons.progress),
) ));
);
// Reference // Reference
if (widget.item.reference.isNotEmpty) { if (widget.item.reference.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().reference), title: Text(L10().reference),
subtitle: Text(widget.item.reference), subtitle: Text(widget.item.reference),
leading: Icon(TablerIcons.hash), leading: Icon(TablerIcons.hash),
) ));
);
} }
// Pricing information // Pricing information
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().unitPrice), title: Text(L10().unitPrice),
leading: Icon(TablerIcons.currency_dollar), leading: Icon(TablerIcons.currency_dollar),
trailing: Text( trailing: Text(renderCurrency(
renderCurrency(widget.item.purchasePrice, widget.item.purchasePriceCurrency) widget.item.purchasePrice, widget.item.purchasePriceCurrency)),
), ));
)
);
// Note // Note
if (widget.item.notes.isNotEmpty) { if (widget.item.notes.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notes), title: Text(L10().notes),
subtitle: Text(widget.item.notes), subtitle: Text(widget.item.notes),
leading: Icon(TablerIcons.note), leading: Icon(TablerIcons.note),
) ));
);
} }
// External link // External link
if (widget.item.link.isNotEmpty) { if (widget.item.link.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().link), title: Text(L10().link),
subtitle: Text(widget.item.link), subtitle: Text(widget.item.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION), leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async { onTap: () async {
await openLink(widget.item.link); await openLink(widget.item.link);
}, },
) ));
);
} }
return tiles; return tiles;
} }
} }

29
lib/widget/order/po_line_list.dart
View File

@ -16,22 +16,21 @@ import "package:inventree/widget/progress.dart";
* Paginated widget class for displaying a list of purchase order line items * Paginated widget class for displaying a list of purchase order line items
*/ */
class PaginatedPOLineList extends PaginatedSearchWidget { class PaginatedPOLineList extends PaginatedSearchWidget {
const PaginatedPOLineList(Map<String, String> filters)
const PaginatedPOLineList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().lineItems; String get searchTitle => L10().lineItems;
@override @override
_PaginatedPOLineListState createState() => _PaginatedPOLineListState(); _PaginatedPOLineListState createState() => _PaginatedPOLineListState();
} }
/* /*
* State class for PaginatedPOLineList * State class for PaginatedPOLineList
*/ */
class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList> { class _PaginatedPOLineListState
extends PaginatedSearchState<PaginatedPOLineList> {
_PaginatedPOLineListState() : super(); _PaginatedPOLineListState() : super();
@override @override
@ -59,9 +58,10 @@ class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList
}; };
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePOLineItem().listPaginated(limit, offset, filters: params); final page = await InvenTreePOLineItem()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@ -71,24 +71,29 @@ class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList
InvenTreeSupplierPart? supplierPart = item.supplierPart; InvenTreeSupplierPart? supplierPart = item.supplierPart;
if (supplierPart != null) { if (supplierPart != null) {
return ListTile( return ListTile(
title: Text(supplierPart.SKU), title: Text(supplierPart.SKU),
subtitle: Text(item.partName), subtitle: Text(item.partName),
trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)), trailing: Text(item.progressString,
style: TextStyle(
color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
leading: InvenTreeAPI().getThumbnail(supplierPart.partImage), leading: InvenTreeAPI().getThumbnail(supplierPart.partImage),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
await item.reload(); await item.reload();
hideLoadingOverlay(); hideLoadingOverlay();
Navigator.push(context, MaterialPageRoute(builder: (context) => POLineDetailWidget(item))); Navigator.push(
context,
MaterialPageRoute(
builder: (context) => POLineDetailWidget(item)));
}, },
); );
} else { } else {
// Return an error tile // Return an error tile
return ListTile( return ListTile(
title: Text(L10().error), title: Text(L10().error),
subtitle: Text("supplier part not defined", style: TextStyle(color: COLOR_DANGER)), subtitle: Text("supplier part not defined",
style: TextStyle(color: COLOR_DANGER)),
); );
} }
} }

210
lib/widget/order/purchase_order_detail.dart
View File

@ -18,7 +18,6 @@ import "package:inventree/widget/order/po_extra_line_list.dart";
import "package:inventree/widget/stock/location_display.dart"; import "package:inventree/widget/stock/location_display.dart";
import "package:inventree/widget/order/po_line_list.dart"; import "package:inventree/widget/order/po_line_list.dart";
import "package:inventree/widget/attachment_widget.dart"; import "package:inventree/widget/attachment_widget.dart";
import "package:inventree/widget/notes_widget.dart"; import "package:inventree/widget/notes_widget.dart";
import "package:inventree/widget/progress.dart"; import "package:inventree/widget/progress.dart";
@ -27,13 +26,11 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/stock/stock_list.dart"; import "package:inventree/widget/stock/stock_list.dart";
import "package:inventree/preferences.dart"; import "package:inventree/preferences.dart";
/* /*
* Widget for viewing a single PurchaseOrder instance * Widget for viewing a single PurchaseOrder instance
*/ */
class PurchaseOrderDetailWidget extends StatefulWidget { class PurchaseOrderDetailWidget extends StatefulWidget {
const PurchaseOrderDetailWidget(this.order, {Key? key}) : super(key: key);
const PurchaseOrderDetailWidget(this.order, {Key? key}): super(key: key);
final InvenTreePurchaseOrder order; final InvenTreePurchaseOrder order;
@ -41,9 +38,8 @@ class PurchaseOrderDetailWidget extends StatefulWidget {
_PurchaseOrderDetailState createState() => _PurchaseOrderDetailState(); _PurchaseOrderDetailState createState() => _PurchaseOrderDetailState();
} }
class _PurchaseOrderDetailState
class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidget> { extends RefreshableState<PurchaseOrderDetailWidget> {
_PurchaseOrderDetailState(); _PurchaseOrderDetailState();
List<InvenTreePOLineItem> lines = []; List<InvenTreePOLineItem> lines = [];
@ -73,15 +69,12 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
List<Widget> actions = []; List<Widget> actions = [];
if (widget.order.canEdit) { if (widget.order.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().purchaseOrderEdit, tooltip: L10().purchaseOrderEdit,
onPressed: () { onPressed: () {
editOrder(context); editOrder(context);
} }));
)
);
} }
return actions; return actions;
@ -92,51 +85,38 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (showCameraShortcut && widget.order.canEdit) { if (showCameraShortcut && widget.order.canEdit) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.camera, color: Colors.blue), child: Icon(TablerIcons.camera, color: Colors.blue),
label: L10().takePicture, label: L10().takePicture,
onTap: () async { onTap: () async {
_uploadImage(context); _uploadImage(context);
} }));
)
);
} }
if (widget.order.canCreate) { if (widget.order.canCreate) {
if (widget.order.isPending) { if (widget.order.isPending) {
actions.add(SpeedDialChild(
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green), child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd, label: L10().lineItemAdd,
onTap: () async { onTap: () async {
_addLineItem(context); _addLineItem(context);
} }));
)
);
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.send, color: Colors.blue), child: Icon(TablerIcons.send, color: Colors.blue),
label: L10().issueOrder, label: L10().issueOrder,
onTap: () async { onTap: () async {
_issueOrder(context); _issueOrder(context);
} }));
)
);
} }
if (widget.order.isOpen) { if (widget.order.isOpen) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_x, color: Colors.red), child: Icon(TablerIcons.circle_x, color: Colors.red),
label: L10().cancelOrder, label: L10().cancelOrder,
onTap: () async { onTap: () async {
_cancelOrder(context); _cancelOrder(context);
} }));
)
);
} }
} }
@ -145,67 +125,53 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
/// Add a new line item to this order /// Add a new line item to this order
Future<void> _addLineItem(BuildContext context) async { Future<void> _addLineItem(BuildContext context) async {
var fields = InvenTreePOLineItem().formFields(); var fields = InvenTreePOLineItem().formFields();
// Update part field definition // Update part field definition
fields["part"]?["hidden"] = false; fields["part"]?["hidden"] = false;
fields["part"]?["filters"] = { fields["part"]?["filters"] = {"supplier": widget.order.supplierId};
"supplier": widget.order.supplierId
};
fields["order"]?["value"] = widget.order.pk; fields["order"]?["value"] = widget.order.pk;
InvenTreePOLineItem().createForm( InvenTreePOLineItem().createForm(context, L10().lineItemAdd, fields: fields,
context,
L10().lineItemAdd,
fields: fields,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true); showSnackIcon(L10().lineItemUpdated, success: true);
} });
);
} }
/// Upload an image against the current PurchaseOrder /// Upload an image against the current PurchaseOrder
Future<void> _uploadImage(BuildContext context) async { Future<void> _uploadImage(BuildContext context) async {
InvenTreePurchaseOrderAttachment()
InvenTreePurchaseOrderAttachment().uploadImage( .uploadImage(
widget.order.pk, widget.order.pk,
prefix: widget.order.reference, prefix: widget.order.reference,
).then((result) => refresh(context)); )
.then((result) => refresh(context));
} }
/// Issue this order /// Issue this order
Future<void> _issueOrder(BuildContext context) async { Future<void> _issueOrder(BuildContext context) async {
confirmationDialog(L10().issueOrder, "",
confirmationDialog(
L10().issueOrder, "",
icon: TablerIcons.send, icon: TablerIcons.send,
color: Colors.blue, color: Colors.blue,
acceptText: L10().issue, acceptText: L10().issue, onAccept: () async {
onAccept: () async {
widget.order.issueOrder().then((dynamic) { widget.order.issueOrder().then((dynamic) {
refresh(context); refresh(context);
}); });
} });
);
} }
/// Cancel this order /// Cancel this order
Future<void> _cancelOrder(BuildContext context) async { Future<void> _cancelOrder(BuildContext context) async {
confirmationDialog(L10().cancelOrder, "",
confirmationDialog(
L10().cancelOrder, "",
icon: TablerIcons.circle_x, icon: TablerIcons.circle_x,
color: Colors.red, color: Colors.red,
acceptText: L10().cancel, acceptText: L10().cancel, onAccept: () async {
onAccept: () async {
widget.order.cancelOrder().then((dynamic) { widget.order.cancelOrder().then((dynamic) {
refresh(context); refresh(context);
}); });
} });
);
} }
@override @override
@ -213,11 +179,10 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (api.supportsBarcodePOReceiveEndpoint && widget.order.isPlaced) { if (api.supportsBarcodePOReceiveEndpoint && widget.order.isPlaced) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(Icons.barcode_reader), child: Icon(Icons.barcode_reader),
label: L10().scanReceivedParts, label: L10().scanReceivedParts,
onTap:() async { onTap: () async {
scanBarcode( scanBarcode(
context, context,
handler: POReceiveBarcodeHandler(purchaseOrder: widget.order), handler: POReceiveBarcodeHandler(purchaseOrder: widget.order),
@ -225,13 +190,11 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
refresh(context); refresh(context);
}); });
}, },
) ));
);
} }
if (widget.order.isPending && api.supportsBarcodePOAddLineEndpoint) { if (widget.order.isPending && api.supportsBarcodePOAddLineEndpoint) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: COLOR_SUCCESS), child: Icon(TablerIcons.circle_plus, color: COLOR_SUCCESS),
label: L10().lineItemAdd, label: L10().lineItemAdd,
onTap: () async { onTap: () async {
@ -239,15 +202,12 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
context, context,
handler: POAllocateBarcodeHandler(purchaseOrder: widget.order), handler: POAllocateBarcodeHandler(purchaseOrder: widget.order),
); );
} }));
)
);
} }
return actions; return actions;
} }
@override @override
Future<void> request(BuildContext context) async { Future<void> request(BuildContext context) async {
await widget.order.reload(); await widget.order.reload();
@ -256,8 +216,11 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
lines = await widget.order.getLineItems(); lines = await widget.order.getLineItems();
showCameraShortcut = await InvenTreeSettingsManager().getBool(INV_PO_SHOW_CAMERA, true); showCameraShortcut =
supportProjectCodes = api.supportsProjectCodes && await api.getGlobalBooleanSetting("PROJECT_CODES_ENABLED", backup: true); await InvenTreeSettingsManager().getBool(INV_PO_SHOW_CAMERA, true);
supportProjectCodes = api.supportsProjectCodes &&
await api.getGlobalBooleanSetting("PROJECT_CODES_ENABLED",
backup: true);
completedLines = 0; completedLines = 0;
@ -267,7 +230,9 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
} }
} }
InvenTreePurchaseOrderAttachment().countAttachments(widget.order.pk).then((int value) { InvenTreePurchaseOrderAttachment()
.countAttachments(widget.order.pk)
.then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
attachmentCount = value; attachmentCount = value;
@ -275,8 +240,11 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
} }
}); });
if (api.supportsPurchaseOrderDestination && widget.order.destinationId > 0) { if (api.supportsPurchaseOrderDestination &&
InvenTreeStockLocation().get(widget.order.destinationId).then((InvenTreeModel? loc) { widget.order.destinationId > 0) {
InvenTreeStockLocation()
.get(widget.order.destinationId)
.then((InvenTreeModel? loc) {
if (mounted) { if (mounted) {
if (loc != null && loc is InvenTreeStockLocation) { if (loc != null && loc is InvenTreeStockLocation) {
setState(() { setState(() {
@ -298,7 +266,8 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
} }
// Count number of "extra line items" against this order // Count number of "extra line items" against this order
InvenTreePOExtraLineItem().count(filters: {"order": widget.order.pk.toString() }).then((int value) { InvenTreePOExtraLineItem().count(
filters: {"order": widget.order.pk.toString()}).then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
extraLineCount = value; extraLineCount = value;
@ -308,7 +277,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
} }
// Edit the currently displayed PurchaseOrder // Edit the currently displayed PurchaseOrder
Future <void> editOrder(BuildContext context) async { Future<void> editOrder(BuildContext context) async {
var fields = widget.order.formFields(); var fields = widget.order.formFields();
// Cannot edit supplier field from here // Cannot edit supplier field from here
@ -324,39 +293,30 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
fields.remove("project_code"); fields.remove("project_code");
} }
widget.order.editForm( widget.order.editForm(context, L10().purchaseOrderEdit, fields: fields,
context,
L10().purchaseOrderEdit,
fields: fields,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().purchaseOrderUpdated, success: true); showSnackIcon(L10().purchaseOrderUpdated, success: true);
} });
);
} }
Widget headerTile(BuildContext context) { Widget headerTile(BuildContext context) {
InvenTreeCompany? supplier = widget.order.supplier; InvenTreeCompany? supplier = widget.order.supplier;
return Card( return Card(
child: ListTile( child: ListTile(
title: Text(widget.order.reference), title: Text(widget.order.reference),
subtitle: Text(widget.order.description), subtitle: Text(widget.order.description),
leading: supplier == null ? null : api.getThumbnail(supplier.thumbnail), leading:
supplier == null ? null : api.getThumbnail(supplier.thumbnail),
trailing: Text( trailing: Text(
api.PurchaseOrderStatus.label(widget.order.status), api.PurchaseOrderStatus.label(widget.order.status),
style: TextStyle( style: TextStyle(
color: api.PurchaseOrderStatus.color(widget.order.status) color: api.PurchaseOrderStatus.color(widget.order.status)),
), )));
)
)
);
} }
List<Widget> orderTiles(BuildContext context) { List<Widget> orderTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
InvenTreeCompany? supplier = widget.order.supplier; InvenTreeCompany? supplier = widget.order.supplier;
@ -366,7 +326,8 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
if (supportProjectCodes && widget.order.hasProjectCode) { if (supportProjectCodes && widget.order.hasProjectCode) {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().projectCode), title: Text(L10().projectCode),
subtitle: Text("${widget.order.projectCode} - ${widget.order.projectCodeDescription}"), subtitle: Text(
"${widget.order.projectCode} - ${widget.order.projectCodeDescription}"),
leading: Icon(TablerIcons.list), leading: Icon(TablerIcons.list),
)); ));
} }
@ -400,14 +361,14 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => LocationDisplayWidget(destination) builder: (context) =>
) LocationDisplayWidget(destination)))
) }));
}
));
} }
Color lineColor = completedLines < widget.order.lineItemCount ? COLOR_WARNING : COLOR_SUCCESS; Color lineColor = completedLines < widget.order.lineItemCount
? COLOR_WARNING
: COLOR_SUCCESS;
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().lineItems), title: Text(L10().lineItems),
@ -416,7 +377,8 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
maximum: widget.order.lineItemCount.toDouble(), maximum: widget.order.lineItemCount.toDouble(),
), ),
leading: Icon(TablerIcons.clipboard_check), leading: Icon(TablerIcons.clipboard_check),
trailing: Text("${completedLines} / ${widget.order.lineItemCount}", style: TextStyle(color: lineColor)), trailing: Text("${completedLines} / ${widget.order.lineItemCount}",
style: TextStyle(color: lineColor)),
)); ));
// Extra line items // Extra line items
@ -428,18 +390,16 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => POExtraLineListWidget(widget.order, filters: {"order": widget.order.pk.toString()}) builder: (context) => POExtraLineListWidget(widget.order,
) filters: {"order": widget.order.pk.toString()})))
)
}, },
)); ));
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().totalPrice), title: Text(L10().totalPrice),
leading: Icon(TablerIcons.currency_dollar), leading: Icon(TablerIcons.currency_dollar),
trailing: Text( trailing: Text(renderCurrency(
renderCurrency(widget.order.totalPrice, widget.order.totalPriceCurrency) widget.order.totalPrice, widget.order.totalPriceCurrency)),
),
)); ));
if (widget.order.issueDate.isNotEmpty) { if (widget.order.issueDate.isNotEmpty) {
@ -475,33 +435,28 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
} }
// Responsible "owner" // Responsible "owner"
if (widget.order.responsibleName.isNotEmpty && widget.order.responsibleLabel.isNotEmpty) { if (widget.order.responsibleName.isNotEmpty &&
widget.order.responsibleLabel.isNotEmpty) {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().responsible), title: Text(L10().responsible),
leading: Icon(widget.order.responsibleLabel == "group" ? TablerIcons.users : TablerIcons.user), leading: Icon(widget.order.responsibleLabel == "group"
trailing: Text(widget.order.responsibleName) ? TablerIcons.users
)); : TablerIcons.user),
trailing: Text(widget.order.responsibleName)));
} }
// Notes tile // Notes tile
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notes), title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION), leading: Icon(TablerIcons.note, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => NotesWidget(widget.order)));
MaterialPageRoute(
builder: (context) => NotesWidget(widget.order)
)
);
}, },
) ));
);
// Attachments // Attachments
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().attachments), title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION), leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null, trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null,
@ -513,16 +468,11 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
InvenTreePurchaseOrderAttachment(), InvenTreePurchaseOrderAttachment(),
widget.order.pk, widget.order.pk,
widget.order.reference, widget.order.reference,
widget.order.canEdit widget.order.canEdit)));
)
)
);
}, },
) ));
);
return tiles; return tiles;
} }
@override @override

63
lib/widget/order/purchase_order_list.dart
View File

@ -16,18 +16,18 @@ import "package:inventree/inventree/purchase_order.dart";
* Widget class for displaying a list of Purchase Orders * Widget class for displaying a list of Purchase Orders
*/ */
class PurchaseOrderListWidget extends StatefulWidget { class PurchaseOrderListWidget extends StatefulWidget {
const PurchaseOrderListWidget({this.filters = const {}, Key? key})
const PurchaseOrderListWidget({this.filters = const {}, Key? key}) : super(key: key); : super(key: key);
final Map<String, String> filters; final Map<String, String> filters;
@override @override
_PurchaseOrderListWidgetState createState() => _PurchaseOrderListWidgetState(); _PurchaseOrderListWidgetState createState() =>
_PurchaseOrderListWidgetState();
} }
class _PurchaseOrderListWidgetState
class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWidget> { extends RefreshableState<PurchaseOrderListWidget> {
_PurchaseOrderListWidgetState(); _PurchaseOrderListWidgetState();
@override @override
@ -38,15 +38,12 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (InvenTreePurchaseOrder().canCreate) { if (InvenTreePurchaseOrder().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus), child: Icon(TablerIcons.circle_plus),
label: L10().purchaseOrderCreate, label: L10().purchaseOrderCreate,
onTap: () { onTap: () {
_createPurchaseOrder(context); _createPurchaseOrder(context);
} }));
)
);
} }
return actions; return actions;
@ -59,19 +56,15 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
// Cannot set contact until company is locked in // Cannot set contact until company is locked in
fields.remove("contact"); fields.remove("contact");
InvenTreePurchaseOrder().createForm( InvenTreePurchaseOrder().createForm(context, L10().purchaseOrderCreate,
context, fields: fields, onSuccess: (result) async {
L10().purchaseOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var order = InvenTreePurchaseOrder.fromJson(data); var order = InvenTreePurchaseOrder.fromJson(data);
order.goToDetailPage(context); order.goToDetailPage(context);
} }
} });
);
} }
@override @override
@ -79,18 +72,16 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (api.supportsBarcodePOReceiveEndpoint) { if (api.supportsBarcodePOReceiveEndpoint) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(Icons.barcode_reader), child: Icon(Icons.barcode_reader),
label: L10().scanReceivedParts, label: L10().scanReceivedParts,
onTap:() async { onTap: () async {
scanBarcode( scanBarcode(
context, context,
handler: POReceiveBarcodeHandler(), handler: POReceiveBarcodeHandler(),
); );
}, },
) ));
);
} }
return actions; return actions;
@ -102,22 +93,20 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
} }
} }
class PaginatedPurchaseOrderList extends PaginatedSearchWidget { class PaginatedPurchaseOrderList extends PaginatedSearchWidget {
const PaginatedPurchaseOrderList(Map<String, String> filters)
const PaginatedPurchaseOrderList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().purchaseOrders; String get searchTitle => L10().purchaseOrders;
@override @override
_PaginatedPurchaseOrderListState createState() => _PaginatedPurchaseOrderListState(); _PaginatedPurchaseOrderListState createState() =>
_PaginatedPurchaseOrderListState();
} }
class _PaginatedPurchaseOrderListState
class _PaginatedPurchaseOrderListState extends PaginatedSearchState<PaginatedPurchaseOrderList> { extends PaginatedSearchState<PaginatedPurchaseOrderList> {
_PaginatedPurchaseOrderListState() : super(); _PaginatedPurchaseOrderListState() : super();
@override @override
@ -151,17 +140,17 @@ class _PaginatedPurchaseOrderListState extends PaginatedSearchState<PaginatedPur
}; };
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
await InvenTreeAPI().PurchaseOrderStatus.load(); await InvenTreeAPI().PurchaseOrderStatus.load();
final page = await InvenTreePurchaseOrder().listPaginated(limit, offset, filters: params); final page = await InvenTreePurchaseOrder()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePurchaseOrder order = model as InvenTreePurchaseOrder; InvenTreePurchaseOrder order = model as InvenTreePurchaseOrder;
InvenTreeCompany? supplier = order.supplier; InvenTreeCompany? supplier = order.supplier;
@ -169,7 +158,9 @@ class _PaginatedPurchaseOrderListState extends PaginatedSearchState<PaginatedPur
return ListTile( return ListTile(
title: Text(order.reference), title: Text(order.reference),
subtitle: Text(order.description), subtitle: Text(order.description),
leading: supplier == null ? null : InvenTreeAPI().getThumbnail(supplier.thumbnail), leading: supplier == null
? null
: InvenTreeAPI().getThumbnail(supplier.thumbnail),
trailing: Text( trailing: Text(
InvenTreeAPI().PurchaseOrderStatus.label(order.status), InvenTreeAPI().PurchaseOrderStatus.label(order.status),
style: TextStyle( style: TextStyle(

219
lib/widget/order/sales_order_detail.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart"; import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -25,7 +24,6 @@ import "package:inventree/widget/progress.dart";
* Widget for viewing a single SalesOrder instance * Widget for viewing a single SalesOrder instance
*/ */
class SalesOrderDetailWidget extends StatefulWidget { class SalesOrderDetailWidget extends StatefulWidget {
const SalesOrderDetailWidget(this.order, {Key? key}) : super(key: key); const SalesOrderDetailWidget(this.order, {Key? key}) : super(key: key);
final InvenTreeSalesOrder order; final InvenTreeSalesOrder order;
@ -34,9 +32,7 @@ class SalesOrderDetailWidget extends StatefulWidget {
_SalesOrderDetailState createState() => _SalesOrderDetailState(); _SalesOrderDetailState createState() => _SalesOrderDetailState();
} }
class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> { class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
_SalesOrderDetailState(); _SalesOrderDetailState();
List<InvenTreeSOLineItem> lines = []; List<InvenTreeSOLineItem> lines = [];
@ -62,14 +58,12 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
List<Widget> actions = []; List<Widget> actions = [];
if (widget.order.canEdit) { if (widget.order.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
onPressed: () { onPressed: () {
editOrder(context); editOrder(context);
}, },
) ));
);
} }
return actions; return actions;
@ -77,21 +71,15 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
// Add a new shipment against this sales order // Add a new shipment against this sales order
Future<void> _addShipment(BuildContext context) async { Future<void> _addShipment(BuildContext context) async {
var fields = InvenTreeSalesOrderShipment().formFields(); var fields = InvenTreeSalesOrderShipment().formFields();
fields["order"]?["value"] = widget.order.pk; fields["order"]?["value"] = widget.order.pk;
fields["order"]?["hidden"] = true; fields["order"]?["hidden"] = true;
InvenTreeSalesOrderShipment().createForm( InvenTreeSalesOrderShipment().createForm(context, L10().shipmentAdd,
context, fields: fields, onSuccess: (result) async {
L10().shipmentAdd,
fields: fields,
onSuccess: (result) async {
refresh(context); refresh(context);
} });
);
} }
// Add a new line item to this sales order // Add a new line item to this sales order
@ -101,54 +89,44 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
fields["order"]?["value"] = widget.order.pk; fields["order"]?["value"] = widget.order.pk;
fields["order"]?["hidden"] = true; fields["order"]?["hidden"] = true;
InvenTreeSOLineItem().createForm( InvenTreeSOLineItem().createForm(context, L10().lineItemAdd, fields: fields,
context,
L10().lineItemAdd,
fields: fields,
onSuccess: (result) async { onSuccess: (result) async {
refresh(context); refresh(context);
} });
);
} }
/// Upload an image for this order /// Upload an image for this order
Future<void> _uploadImage(BuildContext context) async { Future<void> _uploadImage(BuildContext context) async {
InvenTreeSalesOrderAttachment().uploadImage( InvenTreeSalesOrderAttachment()
.uploadImage(
widget.order.pk, widget.order.pk,
prefix: widget.order.reference, prefix: widget.order.reference,
).then((result) => refresh(context)); )
.then((result) => refresh(context));
} }
/// Issue this order /// Issue this order
Future<void> _issueOrder(BuildContext context) async { Future<void> _issueOrder(BuildContext context) async {
confirmationDialog(L10().issueOrder, "",
confirmationDialog(
L10().issueOrder, "",
icon: TablerIcons.send, icon: TablerIcons.send,
color: Colors.blue, color: Colors.blue,
acceptText: L10().issue, acceptText: L10().issue, onAccept: () async {
onAccept: () async {
widget.order.issueOrder().then((dynamic) { widget.order.issueOrder().then((dynamic) {
refresh(context); refresh(context);
}); });
} });
);
} }
/// Cancel this order /// Cancel this order
Future<void> _cancelOrder(BuildContext context) async { Future<void> _cancelOrder(BuildContext context) async {
confirmationDialog(L10().cancelOrder, "",
confirmationDialog(
L10().cancelOrder, "",
icon: TablerIcons.circle_x, icon: TablerIcons.circle_x,
color: Colors.red, color: Colors.red,
acceptText: L10().cancel, acceptText: L10().cancel, onAccept: () async {
onAccept: () async {
await widget.order.cancelOrder().then((dynamic) { await widget.order.cancelOrder().then((dynamic) {
refresh(context); refresh(context);
}); });
} });
);
} }
@override @override
@ -156,62 +134,48 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (showCameraShortcut && widget.order.canEdit) { if (showCameraShortcut && widget.order.canEdit) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.camera, color: Colors.blue), child: Icon(TablerIcons.camera, color: Colors.blue),
label: L10().takePicture, label: L10().takePicture,
onTap: () async { onTap: () async {
_uploadImage(context); _uploadImage(context);
} }));
)
);
} }
if (widget.order.isPending) { if (widget.order.isPending) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.send, color: Colors.blue), child: Icon(TablerIcons.send, color: Colors.blue),
label: L10().issueOrder, label: L10().issueOrder,
onTap: () async { onTap: () async {
_issueOrder(context); _issueOrder(context);
} }));
)
);
} }
if (widget.order.isOpen) { if (widget.order.isOpen) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_x, color: Colors.red), child: Icon(TablerIcons.circle_x, color: Colors.red),
label: L10().cancelOrder, label: L10().cancelOrder,
onTap: () async { onTap: () async {
_cancelOrder(context); _cancelOrder(context);
} }));
)
);
} }
// Add line item // Add line item
if ((widget.order.isPending || widget.order.isInProgress) && InvenTreeSOLineItem().canCreate) { if ((widget.order.isPending || widget.order.isInProgress) &&
actions.add( InvenTreeSOLineItem().canCreate) {
SpeedDialChild( actions.add(SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green), child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd, label: L10().lineItemAdd,
onTap: () async { onTap: () async {
_addLineItem(context); _addLineItem(context);
} }));
)
);
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green), child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().shipmentAdd, label: L10().shipmentAdd,
onTap: () async { onTap: () async {
_addShipment(context); _addShipment(context);
} }));
)
);
} }
return actions; return actions;
@ -221,9 +185,9 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
List<SpeedDialChild> barcodeButtons(BuildContext context) { List<SpeedDialChild> barcodeButtons(BuildContext context) {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if ((widget.order.isInProgress || widget.order.isPending) && InvenTreeSOLineItem().canCreate) { if ((widget.order.isInProgress || widget.order.isPending) &&
actions.add( InvenTreeSOLineItem().canCreate) {
SpeedDialChild( actions.add(SpeedDialChild(
child: Icon(Icons.barcode_reader), child: Icon(Icons.barcode_reader),
label: L10().lineItemAdd, label: L10().lineItemAdd,
onTap: () async { onTap: () async {
@ -231,25 +195,18 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
context, context,
handler: SOAddItemBarcodeHandler(salesOrder: widget.order), handler: SOAddItemBarcodeHandler(salesOrder: widget.order),
); );
} }));
)
);
if (api.supportsBarcodeSOAllocateEndpoint) { if (api.supportsBarcodeSOAllocateEndpoint) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.transition_right), child: Icon(TablerIcons.transition_right),
label: L10().allocateStock, label: L10().allocateStock,
onTap: () async { onTap: () async {
scanBarcode( scanBarcode(context,
context,
handler: SOAllocateStockHandler( handler: SOAllocateStockHandler(
salesOrder: widget.order, salesOrder: widget.order,
) ));
); }));
}
)
);
} }
} }
@ -261,10 +218,15 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
await widget.order.reload(); await widget.order.reload();
await api.SalesOrderStatus.load(); await api.SalesOrderStatus.load();
supportsProjectCodes = api.supportsProjectCodes && await api.getGlobalBooleanSetting("PROJECT_CODES_ENABLED", backup: true); supportsProjectCodes = api.supportsProjectCodes &&
showCameraShortcut = await InvenTreeSettingsManager().getBool(INV_SO_SHOW_CAMERA, true); await api.getGlobalBooleanSetting("PROJECT_CODES_ENABLED",
backup: true);
showCameraShortcut =
await InvenTreeSettingsManager().getBool(INV_SO_SHOW_CAMERA, true);
InvenTreeSalesOrderAttachment().countAttachments(widget.order.pk).then((int value) { InvenTreeSalesOrderAttachment()
.countAttachments(widget.order.pk)
.then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
attachmentCount = value; attachmentCount = value;
@ -273,7 +235,8 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
}); });
// Count number of "extra line items" against this order // Count number of "extra line items" against this order
InvenTreeSOExtraLineItem().count(filters: {"order": widget.order.pk.toString() }).then((int value) { InvenTreeSOExtraLineItem().count(
filters: {"order": widget.order.pk.toString()}).then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
extraLineCount = value; extraLineCount = value;
@ -298,15 +261,11 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
fields.remove("project_code"); fields.remove("project_code");
} }
widget.order.editForm( widget.order.editForm(context, L10().salesOrderEdit, fields: fields,
context,
L10().salesOrderEdit,
fields: fields,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().salesOrderUpdated, success: true); showSnackIcon(L10().salesOrderUpdated, success: true);
} });
);
} }
// Construct header tile // Construct header tile
@ -320,26 +279,22 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
leading: customer == null ? null : api.getThumbnail(customer.thumbnail), leading: customer == null ? null : api.getThumbnail(customer.thumbnail),
trailing: Text( trailing: Text(
api.SalesOrderStatus.label(widget.order.status), api.SalesOrderStatus.label(widget.order.status),
style: TextStyle( style:
color: api.SalesOrderStatus.color(widget.order.status) TextStyle(color: api.SalesOrderStatus.color(widget.order.status)),
), ),
), ));
)
);
} }
List<Widget> orderTiles(BuildContext context) { List<Widget> orderTiles(BuildContext context) {
List<Widget> tiles = [headerTile(context)];
List<Widget> tiles = [
headerTile(context)
];
InvenTreeCompany? customer = widget.order.customer; InvenTreeCompany? customer = widget.order.customer;
if (supportsProjectCodes && widget.order.hasProjectCode) { if (supportsProjectCodes && widget.order.hasProjectCode) {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().projectCode), title: Text(L10().projectCode),
subtitle: Text("${widget.order.projectCode} - ${widget.order.projectCodeDescription}"), subtitle: Text(
"${widget.order.projectCode} - ${widget.order.projectCodeDescription}"),
leading: Icon(TablerIcons.list), leading: Icon(TablerIcons.list),
)); ));
} }
@ -351,8 +306,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
leading: Icon(TablerIcons.user, color: COLOR_ACTION), leading: Icon(TablerIcons.user, color: COLOR_ACTION),
onTap: () { onTap: () {
customer.goToDetailPage(context); customer.goToDetailPage(context);
} }));
));
} }
if (widget.order.customerReference.isNotEmpty) { if (widget.order.customerReference.isNotEmpty) {
@ -367,12 +321,12 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().lineItems), title: Text(L10().lineItems),
subtitle: ProgressBar( subtitle: ProgressBar(widget.order.completedLineItemCount.toDouble(),
widget.order.completedLineItemCount.toDouble(), maximum: widget.order.lineItemCount.toDouble()),
maximum: widget.order.lineItemCount.toDouble()
),
leading: Icon(TablerIcons.clipboard_check), leading: Icon(TablerIcons.clipboard_check),
trailing: Text("${widget.order.completedLineItemCount} / ${widget.order.lineItemCount}", style: TextStyle(color: lineColor)), trailing: Text(
"${widget.order.completedLineItemCount} / ${widget.order.lineItemCount}",
style: TextStyle(color: lineColor)),
)); ));
// Extra line items // Extra line items
@ -384,9 +338,8 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SOExtraLineListWidget(widget.order, filters: {"order": widget.order.pk.toString()}) builder: (context) => SOExtraLineListWidget(widget.order,
) filters: {"order": widget.order.pk.toString()})))
)
}, },
)); ));
@ -394,12 +347,12 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
if (widget.order.shipmentCount > 0) { if (widget.order.shipmentCount > 0) {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().shipments), title: Text(L10().shipments),
subtitle: ProgressBar( subtitle: ProgressBar(widget.order.completedShipmentCount.toDouble(),
widget.order.completedShipmentCount.toDouble(), maximum: widget.order.shipmentCount.toDouble()),
maximum: widget.order.shipmentCount.toDouble()
),
leading: Icon(TablerIcons.truck_delivery), leading: Icon(TablerIcons.truck_delivery),
trailing: Text("${widget.order.completedShipmentCount} / ${widget.order.shipmentCount}", style: TextStyle(color: lineColor)), trailing: Text(
"${widget.order.completedShipmentCount} / ${widget.order.shipmentCount}",
style: TextStyle(color: lineColor)),
)); ));
} }
@ -430,33 +383,28 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
} }
// Responsible "owner" // Responsible "owner"
if (widget.order.responsibleName.isNotEmpty && widget.order.responsibleLabel.isNotEmpty) { if (widget.order.responsibleName.isNotEmpty &&
widget.order.responsibleLabel.isNotEmpty) {
tiles.add(ListTile( tiles.add(ListTile(
title: Text(L10().responsible), title: Text(L10().responsible),
leading: Icon(widget.order.responsibleLabel == "group" ? TablerIcons.users : TablerIcons.user), leading: Icon(widget.order.responsibleLabel == "group"
trailing: Text(widget.order.responsibleName) ? TablerIcons.users
)); : TablerIcons.user),
trailing: Text(widget.order.responsibleName)));
} }
// Notes tile // Notes tile
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notes), title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION), leading: Icon(TablerIcons.note, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => NotesWidget(widget.order)));
MaterialPageRoute(
builder: (context) => NotesWidget(widget.order)
)
);
}, },
) ));
);
// Attachments // Attachments
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().attachments), title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION), leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null, trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null,
@ -468,13 +416,9 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
InvenTreeSalesOrderAttachment(), InvenTreeSalesOrderAttachment(),
widget.order.pk, widget.order.pk,
widget.order.reference, widget.order.reference,
widget.order.canEdit widget.order.canEdit)));
)
)
);
}, },
) ));
);
return tiles; return tiles;
} }
@ -496,5 +440,4 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
PaginatedSOShipmentList({"order": widget.order.pk.toString()}), PaginatedSOShipmentList({"order": widget.order.pk.toString()}),
]; ];
} }
} }

66
lib/widget/order/sales_order_list.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart"; import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -12,20 +11,18 @@ import "package:inventree/api.dart";
import "package:inventree/inventree/company.dart"; import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/model.dart"; import "package:inventree/inventree/model.dart";
class SalesOrderListWidget extends StatefulWidget { class SalesOrderListWidget extends StatefulWidget {
const SalesOrderListWidget({this.filters = const {}, Key? key})
const SalesOrderListWidget({this.filters = const {}, Key? key}) : super(key: key); : super(key: key);
final Map<String, String> filters; final Map<String, String> filters;
@override @override
_SalesOrderListWidgetState createState() => _SalesOrderListWidgetState(); _SalesOrderListWidgetState createState() => _SalesOrderListWidgetState();
} }
class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget> { class _SalesOrderListWidgetState
extends RefreshableState<SalesOrderListWidget> {
_SalesOrderListWidgetState(); _SalesOrderListWidgetState();
@override @override
@ -36,15 +33,12 @@ class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget>
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (InvenTreeSalesOrder().canCreate) { if (InvenTreeSalesOrder().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus), child: Icon(TablerIcons.circle_plus),
label: L10().salesOrderCreate, label: L10().salesOrderCreate,
onTap: () { onTap: () {
_createSalesOrder(context); _createSalesOrder(context);
} }));
)
);
} }
return actions; return actions;
@ -57,19 +51,15 @@ class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget>
// Cannot set contact until company is locked in // Cannot set contact until company is locked in
fields.remove("contact"); fields.remove("contact");
InvenTreeSalesOrder().createForm( InvenTreeSalesOrder().createForm(context, L10().salesOrderCreate,
context, fields: fields, onSuccess: (result) async {
L10().salesOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var order = InvenTreeSalesOrder.fromJson(data); var order = InvenTreeSalesOrder.fromJson(data);
order.goToDetailPage(context); order.goToDetailPage(context);
} }
} });
);
} }
@override @override
@ -82,25 +72,22 @@ class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget>
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
return PaginatedSalesOrderList(widget.filters); return PaginatedSalesOrderList(widget.filters);
} }
} }
class PaginatedSalesOrderList extends PaginatedSearchWidget { class PaginatedSalesOrderList extends PaginatedSearchWidget {
const PaginatedSalesOrderList(Map<String, String> filters)
const PaginatedSalesOrderList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().salesOrders; String get searchTitle => L10().salesOrders;
@override @override
_PaginatedSalesOrderListState createState() => _PaginatedSalesOrderListState(); _PaginatedSalesOrderListState createState() =>
_PaginatedSalesOrderListState();
} }
class _PaginatedSalesOrderListState
class _PaginatedSalesOrderListState extends PaginatedSearchState<PaginatedSalesOrderList> { extends PaginatedSearchState<PaginatedSalesOrderList> {
_PaginatedSalesOrderListState() : super(); _PaginatedSalesOrderListState() : super();
@override @override
@ -134,17 +121,17 @@ class _PaginatedSalesOrderListState extends PaginatedSearchState<PaginatedSalesO
}; };
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
await InvenTreeAPI().SalesOrderStatus.load(); await InvenTreeAPI().SalesOrderStatus.load();
final page = await InvenTreeSalesOrder().listPaginated(limit, offset, filters: params); final page = await InvenTreeSalesOrder()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeSalesOrder order = model as InvenTreeSalesOrder; InvenTreeSalesOrder order = model as InvenTreeSalesOrder;
InvenTreeCompany? customer = order.customer; InvenTreeCompany? customer = order.customer;
@ -152,18 +139,15 @@ class _PaginatedSalesOrderListState extends PaginatedSearchState<PaginatedSalesO
return ListTile( return ListTile(
title: Text(order.reference), title: Text(order.reference),
subtitle: Text(order.description), subtitle: Text(order.description),
leading: customer == null ? null : InvenTreeAPI().getThumbnail(customer.thumbnail), leading: customer == null
trailing: Text( ? null
InvenTreeAPI().SalesOrderStatus.label(order.status), : InvenTreeAPI().getThumbnail(customer.thumbnail),
trailing: Text(InvenTreeAPI().SalesOrderStatus.label(order.status),
style: TextStyle( style: TextStyle(
color: InvenTreeAPI().SalesOrderStatus.color(order.status), color: InvenTreeAPI().SalesOrderStatus.color(order.status),
) )),
),
onTap: () async { onTap: () async {
order.goToDetailPage(context); order.goToDetailPage(context);
});
} }
);
}
} }

50
lib/widget/order/so_extra_line_list.dart
View File

@ -11,41 +11,36 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
class SOExtraLineListWidget extends StatefulWidget { class SOExtraLineListWidget extends StatefulWidget {
const SOExtraLineListWidget(this.order, {this.filters = const {}, Key? key})
const SOExtraLineListWidget(this.order, {this.filters = const {}, Key? key}) : super(key: key); : super(key: key);
final InvenTreeSalesOrder order; final InvenTreeSalesOrder order;
final Map<String, String> filters; final Map<String, String> filters;
@override @override
_SalesOrderExtraLineListWidgetState createState() => _SalesOrderExtraLineListWidgetState(); _SalesOrderExtraLineListWidgetState createState() =>
_SalesOrderExtraLineListWidgetState();
} }
class _SalesOrderExtraLineListWidgetState extends RefreshableState<SOExtraLineListWidget> { class _SalesOrderExtraLineListWidgetState
extends RefreshableState<SOExtraLineListWidget> {
_SalesOrderExtraLineListWidgetState(); _SalesOrderExtraLineListWidgetState();
@override @override
String getAppBarTitle() => L10().extraLineItems; String getAppBarTitle() => L10().extraLineItems;
Future<void> _addLineItem(BuildContext context) async { Future<void> _addLineItem(BuildContext context) async {
var fields = InvenTreeSOExtraLineItem().formFields(); var fields = InvenTreeSOExtraLineItem().formFields();
fields["order"]?["value"] = widget.order.pk; fields["order"]?["value"] = widget.order.pk;
InvenTreeSOExtraLineItem().createForm( InvenTreeSOExtraLineItem().createForm(context, L10().lineItemAdd,
context, fields: fields, onSuccess: (data) async {
L10().lineItemAdd,
fields: fields,
onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true); showSnackIcon(L10().lineItemUpdated, success: true);
} });
);
} }
@override @override
@ -53,15 +48,12 @@ class _SalesOrderExtraLineListWidgetState extends RefreshableState<SOExtraLineLi
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (widget.order.canEdit) { if (widget.order.canEdit) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green), child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd, label: L10().lineItemAdd,
onTap: () { onTap: () {
_addLineItem(context); _addLineItem(context);
} }));
)
);
} }
return actions; return actions;
@ -73,35 +65,35 @@ class _SalesOrderExtraLineListWidgetState extends RefreshableState<SOExtraLineLi
} }
} }
class PaginatedSOExtraLineList extends PaginatedSearchWidget { class PaginatedSOExtraLineList extends PaginatedSearchWidget {
const PaginatedSOExtraLineList(Map<String, String> filters)
const PaginatedSOExtraLineList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().extraLineItems; String get searchTitle => L10().extraLineItems;
@override @override
_PaginatedSOExtraLineListState createState() => _PaginatedSOExtraLineListState(); _PaginatedSOExtraLineListState createState() =>
_PaginatedSOExtraLineListState();
} }
class _PaginatedSOExtraLineListState extends PaginatedSearchState<PaginatedSOExtraLineList> { class _PaginatedSOExtraLineListState
extends PaginatedSearchState<PaginatedSOExtraLineList> {
_PaginatedSOExtraLineListState() : super(); _PaginatedSOExtraLineListState() : super();
@override @override
String get prefix => "so_extra_line_"; String get prefix => "so_extra_line_";
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
final page = await InvenTreeSOExtraLineItem().listPaginated(limit, offset, filters: params); int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSOExtraLineItem()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeSOExtraLineItem line = model as InvenTreeSOExtraLineItem; InvenTreeSOExtraLineItem line = model as InvenTreeSOExtraLineItem;
return ListTile( return ListTile(

113
lib/widget/order/so_line_detail.dart
View File

@ -1,5 +1,3 @@
/* /*
* Widget for displaying detail view of a single SalesOrderLineItem * Widget for displaying detail view of a single SalesOrderLineItem
*/ */
@ -22,21 +20,16 @@ import "package:inventree/l10.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
import "package:inventree/api_form.dart"; import "package:inventree/api_form.dart";
class SoLineDetailWidget extends StatefulWidget { class SoLineDetailWidget extends StatefulWidget {
const SoLineDetailWidget(this.item, {Key? key}) : super(key: key); const SoLineDetailWidget(this.item, {Key? key}) : super(key: key);
final InvenTreeSOLineItem item; final InvenTreeSOLineItem item;
@override @override
_SOLineDetailWidgetState createState() => _SOLineDetailWidgetState(); _SOLineDetailWidgetState createState() => _SOLineDetailWidgetState();
} }
class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> { class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
_SOLineDetailWidgetState(); _SOLineDetailWidgetState();
InvenTreeSalesOrder? order; InvenTreeSalesOrder? order;
@ -62,7 +55,6 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
} }
Future<void> _allocateStock(BuildContext context) async { Future<void> _allocateStock(BuildContext context) async {
if (order == null) { if (order == null) {
return; return;
} }
@ -76,22 +68,13 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
"part": widget.item.partId.toString() "part": widget.item.partId.toString()
}; };
fields["quantity"]?["value"] = widget.item.unallocatedQuantity.toString(); fields["quantity"]?["value"] = widget.item.unallocatedQuantity.toString();
fields["shipment"]?["filters"] = { fields["shipment"]?["filters"] = {"order": order!.pk.toString()};
"order": order!.pk.toString()
};
launchApiForm( launchApiForm(context, L10().allocateStock, order!.allocate_url, fields,
context,
L10().allocateStock,
order!.allocate_url,
fields,
method: "POST", method: "POST",
icon: TablerIcons.transition_right, icon: TablerIcons.transition_right, onSuccess: (data) async {
onSuccess: (data) async {
refresh(context); refresh(context);
} });
);
} }
Future<void> _editLineItem(BuildContext context) async { Future<void> _editLineItem(BuildContext context) async {
@ -102,32 +85,24 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
fields["part"]?["hidden"] = true; fields["part"]?["hidden"] = true;
} }
widget.item.editForm( widget.item.editForm(context, L10().editLineItem, fields: fields,
context,
L10().editLineItem,
fields: fields,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true); showSnackIcon(L10().lineItemUpdated, success: true);
} });
);
} }
@override @override
List<SpeedDialChild> actionButtons(BuildContext context) { List<SpeedDialChild> actionButtons(BuildContext context) {
List<SpeedDialChild> buttons = []; List<SpeedDialChild> buttons = [];
if (order != null && order!.isOpen) { if (order != null && order!.isOpen) {
buttons.add( buttons.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.transition_right, color: Colors.blue), child: Icon(TablerIcons.transition_right, color: Colors.blue),
label: L10().allocateStock, label: L10().allocateStock,
onTap: () async { onTap: () async {
_allocateStock(context); _allocateStock(context);
} }));
)
);
} }
return buttons; return buttons;
@ -138,23 +113,15 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (order != null && order!.isOpen && InvenTreeSOLineItem().canCreate) { if (order != null && order!.isOpen && InvenTreeSOLineItem().canCreate) {
if (api.supportsBarcodeSOAllocateEndpoint) { if (api.supportsBarcodeSOAllocateEndpoint) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.transition_right), child: Icon(TablerIcons.transition_right),
label: L10().allocateStock, label: L10().allocateStock,
onTap: () async { onTap: () async {
scanBarcode( scanBarcode(context,
context,
handler: SOAllocateStockHandler( handler: SOAllocateStockHandler(
salesOrder: order, salesOrder: order, lineItem: widget.item));
lineItem: widget.item }));
)
);
}
)
);
} }
} }
@ -179,8 +146,7 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
List<Widget> tiles = []; List<Widget> tiles = [];
// Reference to the part // Reference to the part
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().part), title: Text(L10().part),
subtitle: Text(widget.item.partName), subtitle: Text(widget.item.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION), leading: Icon(TablerIcons.box, color: COLOR_ACTION),
@ -193,83 +159,62 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
if (part is InvenTreePart) { if (part is InvenTreePart) {
part.goToDetailPage(context); part.goToDetailPage(context);
} }
} }));
)
);
// Available quantity // Available quantity
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().availableStock), title: Text(L10().availableStock),
leading: Icon(TablerIcons.packages), leading: Icon(TablerIcons.packages),
trailing: Text(simpleNumberString(widget.item.availableStock)) trailing: Text(simpleNumberString(widget.item.availableStock))));
)
);
// Allocated quantity // Allocated quantity
tiles.add( tiles.add(ListTile(
ListTile(
leading: Icon(TablerIcons.clipboard_check), leading: Icon(TablerIcons.clipboard_check),
title: Text(L10().allocated), title: Text(L10().allocated),
subtitle: ProgressBar(widget.item.allocatedRatio), subtitle: ProgressBar(widget.item.allocatedRatio),
trailing: Text( trailing: Text(widget.item.allocatedString,
widget.item.allocatedString,
style: TextStyle( style: TextStyle(
color: widget.item.isAllocated ? COLOR_SUCCESS : COLOR_WARNING color:
) widget.item.isAllocated ? COLOR_SUCCESS : COLOR_WARNING))));
)
)
);
// Shipped quantity // Shipped quantity
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().shipped), title: Text(L10().shipped),
subtitle: ProgressBar(widget.item.progressRatio), subtitle: ProgressBar(widget.item.progressRatio),
trailing: Text( trailing: Text(
widget.item.progressString, widget.item.progressString,
style: TextStyle( style: TextStyle(
color: widget.item.isComplete ? COLOR_SUCCESS : COLOR_WARNING color: widget.item.isComplete ? COLOR_SUCCESS : COLOR_WARNING),
), ),
), leading: Icon(TablerIcons.truck)));
leading: Icon(TablerIcons.truck)
)
);
// Reference // Reference
if (widget.item.reference.isNotEmpty) { if (widget.item.reference.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().reference), title: Text(L10().reference),
subtitle: Text(widget.item.reference), subtitle: Text(widget.item.reference),
leading: Icon(TablerIcons.hash) leading: Icon(TablerIcons.hash)));
)
);
} }
// Note // Note
if (widget.item.notes.isNotEmpty) { if (widget.item.notes.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notes), title: Text(L10().notes),
subtitle: Text(widget.item.notes), subtitle: Text(widget.item.notes),
leading: Icon(TablerIcons.note), leading: Icon(TablerIcons.note),
) ));
);
} }
// External link // External link
if (widget.item.link.isNotEmpty) { if (widget.item.link.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().link), title: Text(L10().link),
subtitle: Text(widget.item.link), subtitle: Text(widget.item.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION), leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async { onTap: () async {
await openLink(widget.item.link); await openLink(widget.item.link);
}, },
) ));
);
} }
return tiles; return tiles;

34
lib/widget/order/so_line_list.dart
View File

@ -9,28 +9,26 @@ import "package:inventree/api.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
import "package:inventree/widget/progress.dart"; import "package:inventree/widget/progress.dart";
/* /*
* Paginated widget class for displaying a list of sales order line items * Paginated widget class for displaying a list of sales order line items
*/ */
class PaginatedSOLineList extends PaginatedSearchWidget { class PaginatedSOLineList extends PaginatedSearchWidget {
const PaginatedSOLineList(Map<String, String> filters) : super(filters: filters); const PaginatedSOLineList(Map<String, String> filters)
: super(filters: filters);
@override @override
String get searchTitle => L10().lineItems; String get searchTitle => L10().lineItems;
@override @override
_PaginatedSOLineListState createState() => _PaginatedSOLineListState(); _PaginatedSOLineListState createState() => _PaginatedSOLineListState();
} }
/* /*
* State class for PaginatedSOLineList * State class for PaginatedSOLineList
*/ */
class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList> { class _PaginatedSOLineListState
extends PaginatedSearchState<PaginatedSOLineList> {
_PaginatedSOLineListState() : super(); _PaginatedSOLineListState() : super();
@override @override
@ -43,13 +41,13 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
}; };
@override @override
Map<String, Map<String, dynamic>> get filterOptions => { Map<String, Map<String, dynamic>> get filterOptions => {};
};
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
final page = await InvenTreeSOLineItem().listPaginated(limit, offset, filters: params); int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSOLineItem()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@ -63,7 +61,9 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
title: Text(part.name), title: Text(part.name),
subtitle: Text(part.description), subtitle: Text(part.description),
leading: InvenTreeAPI().getThumbnail(part.thumbnail), leading: InvenTreeAPI().getThumbnail(part.thumbnail),
trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)), trailing: Text(item.progressString,
style: TextStyle(
color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
await item.reload(); await item.reload();
@ -71,16 +71,14 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SoLineDetailWidget(item)) builder: (context) => SoLineDetailWidget(item)));
); });
}
);
} else { } else {
return ListTile( return ListTile(
title: Text(L10().error), title: Text(L10().error),
subtitle: Text("Missing part detail", style: TextStyle(color: COLOR_DANGER)), subtitle:
Text("Missing part detail", style: TextStyle(color: COLOR_DANGER)),
); );
} }
} }
} }

28
lib/widget/order/so_shipment_list.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
@ -9,19 +8,19 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
class PaginatedSOShipmentList extends PaginatedSearchWidget { class PaginatedSOShipmentList extends PaginatedSearchWidget {
const PaginatedSOShipmentList(Map<String, String> filters)
const PaginatedSOShipmentList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().shipments; String get searchTitle => L10().shipments;
@override @override
_PaginatedSOShipmentListState createState() => _PaginatedSOShipmentListState(); _PaginatedSOShipmentListState createState() =>
_PaginatedSOShipmentListState();
} }
class _PaginatedSOShipmentListState
class _PaginatedSOShipmentListState extends PaginatedSearchState<PaginatedSOShipmentList> { extends PaginatedSearchState<PaginatedSOShipmentList> {
_PaginatedSOShipmentListState() : super(); _PaginatedSOShipmentListState() : super();
@override @override
@ -34,22 +33,23 @@ class _PaginatedSOShipmentListState extends PaginatedSearchState<PaginatedSOShip
Map<String, Map<String, dynamic>> get filterOptions => {}; Map<String, Map<String, dynamic>> get filterOptions => {};
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
final page = await InvenTreeSalesOrderShipment().listPaginated(limit, offset, filters: params); int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSalesOrderShipment()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeSalesOrderShipment shipment = model as InvenTreeSalesOrderShipment; InvenTreeSalesOrderShipment shipment = model as InvenTreeSalesOrderShipment;
return ListTile( return ListTile(
title: Text(shipment.reference), title: Text(shipment.reference),
subtitle: Text(shipment.tracking_number), subtitle: Text(shipment.tracking_number),
leading: shipment.shipped ? Icon(TablerIcons.calendar_check, color: COLOR_SUCCESS) : Icon(TablerIcons.calendar_cancel, color: COLOR_WARNING), leading: shipment.shipped
trailing: shipment.shipped ? Text(shipment.shipment_date ?? "") : null ? Icon(TablerIcons.calendar_check, color: COLOR_SUCCESS)
); : Icon(TablerIcons.calendar_cancel, color: COLOR_WARNING),
trailing: shipment.shipped ? Text(shipment.shipment_date ?? "") : null);
} }
} }

93
lib/widget/paginator.dart
View File

@ -15,12 +15,10 @@ import "package:inventree/preferences.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
/* /*
* Abstract base widget class for rendering a PaginatedSearchState * Abstract base widget class for rendering a PaginatedSearchState
*/ */
abstract class PaginatedSearchWidget extends StatefulWidget { abstract class PaginatedSearchWidget extends StatefulWidget {
const PaginatedSearchWidget({this.filters = const {}, this.title = ""}); const PaginatedSearchWidget({this.filters = const {}, this.title = ""});
final String title; final String title;
@ -30,12 +28,11 @@ abstract class PaginatedSearchWidget extends StatefulWidget {
final Map<String, String> filters; final Map<String, String> filters;
} }
/* /*
* Generic stateful widget for displaying paginated data retrieved via the API * Generic stateful widget for displaying paginated data retrieved via the API
*/ */
abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends State<T> with BaseWidgetProperties { abstract class PaginatedSearchState<T extends PaginatedSearchWidget>
extends State<T> with BaseWidgetProperties {
static const _pageSize = 25; static const _pageSize = 25;
bool showSearchWidget = false; bool showSearchWidget = false;
@ -73,7 +70,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Construct the boolean filter options for this list // Construct the boolean filter options for this list
Future<Map<String, String>> constructFilters() async { Future<Map<String, String>> constructFilters() async {
Map<String, String> f = {}; Map<String, String> f = {};
for (String k in filterOptions.keys) { for (String k in filterOptions.keys) {
@ -95,7 +91,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Return the selected ordering "field" for this list widget // Return the selected ordering "field" for this list widget
Future<String> orderingField() async { Future<String> orderingField() async {
dynamic field = await InvenTreeSettingsManager().getValue("${prefix}ordering_field", null); dynamic field = await InvenTreeSettingsManager()
.getValue("${prefix}ordering_field", null);
if (field != null && orderingOptions.containsKey(field.toString())) { if (field != null && orderingOptions.containsKey(field.toString())) {
// A valid ordering field has been found // A valid ordering field has been found
@ -110,7 +107,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Return the selected ordering "order" ("+" or "-") for this list widget // Return the selected ordering "order" ("+" or "-") for this list widget
Future<String> orderingOrder() async { Future<String> orderingOrder() async {
dynamic order = await InvenTreeSettingsManager().getValue("${prefix}ordering_order", "+"); dynamic order = await InvenTreeSettingsManager()
.getValue("${prefix}ordering_order", "+");
return order == "+" ? "+" : "-"; return order == "+" ? "+" : "-";
} }
@ -137,10 +135,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Construct the 'ordering' options // Construct the 'ordering' options
List<Map<String, dynamic>> _opts = []; List<Map<String, dynamic>> _opts = [];
orderingOptions.forEach((k, v) => _opts.add({ orderingOptions.forEach((k, v) =>
"value": k.toString(), _opts.add({"value": k.toString(), "display_name": v.toString()}));
"display_name": v.toString()
}));
if (_field == null && _opts.isNotEmpty) { if (_field == null && _opts.isNotEmpty) {
_field = _opts.first["value"]; _field = _opts.first["value"];
@ -212,14 +208,9 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
} }
// Launch an interactive form for the user to select options // Launch an interactive form for the user to select options
launchApiForm( launchApiForm(context, L10().filteringOptions, "", fields,
context,
L10().filteringOptions,
"",
fields,
icon: TablerIcons.circle_check, icon: TablerIcons.circle_check,
onSuccess: (Map<String, dynamic> data) async { onSuccess: (Map<String, dynamic> data) async {
// Extract data from the processed form // Extract data from the processed form
String f = (data["ordering_field"] ?? _field) as String; String f = (data["ordering_field"] ?? _field) as String;
String o = (data["ordering_order"] ?? _order) as String; String o = (data["ordering_order"] ?? _order) as String;
@ -235,8 +226,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Refresh data from the server // Refresh data from the server
_pagingController.refresh(); _pagingController.refresh();
} });
);
} }
// Search query term // Search query term
@ -245,7 +235,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
int resultCount = 0; int resultCount = 0;
String resultsString() { String resultsString() {
if (resultCount <= 0) { if (resultCount <= 0) {
return noResultsText; return noResultsText;
} else { } else {
@ -260,7 +249,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
Timer? _debounceTimer; Timer? _debounceTimer;
// Pagination controller // Pagination controller
final PagingController<int, InvenTreeModel> _pagingController = PagingController(firstPageKey: 0); final PagingController<int, InvenTreeModel> _pagingController =
PagingController(firstPageKey: 0);
void refresh() { void refresh() {
_pagingController.refresh(); _pagingController.refresh();
@ -286,8 +276,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
* Each implementing class must override this function, * Each implementing class must override this function,
* and return an InvenTreePageResponse object with the correct data format * and return an InvenTreePageResponse object with the correct data format
*/ */
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
// Default implementation returns null - must be overridden // Default implementation returns null - must be overridden
return null; return null;
} }
@ -301,7 +291,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Include user search term // Include user search term
if (searchTerm.isNotEmpty) { if (searchTerm.isNotEmpty) {
String _search = searchTerm; String _search = searchTerm;
// Include original search in search test // Include original search in search test
@ -329,11 +318,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
params.addAll(f); params.addAll(f);
} }
final page = await requestPage( final page = await requestPage(_pageSize, pageKey, params);
_pageSize,
pageKey,
params
);
// We may have disposed of the widget while the request was in progress // We may have disposed of the widget while the request was in progress
// If this is the case, abort // If this is the case, abort
@ -369,14 +354,14 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
sentryReportError( sentryReportError(
"paginator.fetchPage", "paginator.fetchPage",
error, stackTrace, error,
stackTrace,
); );
} }
} }
// Callback function when the search term is updated // Callback function when the search term is updated
void updateSearchTerm() { void updateSearchTerm() {
if (searchTerm == searchController.text) { if (searchTerm == searchController.text) {
// No change // No change
return; return;
@ -410,7 +395,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Function to construct a single paginated item // Function to construct a single paginated item
// Must be overridden in an implementing subclass // Must be overridden in an implementing subclass
Widget buildItem(BuildContext context, InvenTreeModel item) { Widget buildItem(BuildContext context, InvenTreeModel item) {
// This method must be overridden by the child class // This method must be overridden by the child class
return ListTile( return ListTile(
title: Text("*** UNIMPLEMENTED ***"), title: Text("*** UNIMPLEMENTED ***"),
@ -423,8 +407,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
String get noResultsText => L10().noResults; String get noResultsText => L10().noResults;
@override @override
Widget build (BuildContext context) { Widget build(BuildContext context) {
List<Widget> children = [ List<Widget> children = [
buildTitleWidget(context), buildTitleWidget(context),
Divider(), Divider(),
@ -434,8 +417,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
children.add(buildSearchInput(context)); children.add(buildSearchInput(context));
} }
children.add( children.add(Expanded(
Expanded(
child: CustomScrollView( child: CustomScrollView(
shrinkWrap: true, shrinkWrap: true,
physics: AlwaysScrollableScrollPhysics(), physics: AlwaysScrollableScrollPhysics(),
@ -446,17 +428,12 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
builderDelegate: PagedChildBuilderDelegate<InvenTreeModel>( builderDelegate: PagedChildBuilderDelegate<InvenTreeModel>(
itemBuilder: (ctx, item, index) { itemBuilder: (ctx, item, index) {
return buildItem(ctx, item); return buildItem(ctx, item);
}, }, noItemsFoundIndicatorBuilder: (context) {
noItemsFoundIndicatorBuilder: (context) {
return NoResultsWidget(noResultsText); return NoResultsWidget(noResultsText);
} }),
),
separatorBuilder: (context, item) => const Divider(height: 1), separatorBuilder: (context, item) => const Divider(height: 1),
) )
] ])));
)
)
);
return RefreshIndicator( return RefreshIndicator(
child: Column( child: Column(
@ -473,7 +450,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
* Build the title widget for this list * Build the title widget for this list
*/ */
Widget buildTitleWidget(BuildContext context) { Widget buildTitleWidget(BuildContext context) {
const double icon_size = 32; const double icon_size = 32;
List<Widget> _icons = []; List<Widget> _icons = [];
@ -483,8 +459,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
onPressed: () async { onPressed: () async {
_setOrderingOptions(context); _setOrderingOptions(context);
}, },
icon: Icon(Icons.filter_alt, size: icon_size) icon: Icon(Icons.filter_alt, size: icon_size)));
));
} }
_icons.add(IconButton( _icons.add(IconButton(
@ -493,8 +468,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
showSearchWidget = !showSearchWidget; showSearchWidget = !showSearchWidget;
}); });
}, },
icon: Icon(showSearchWidget ? Icons.zoom_out : Icons.search, size: icon_size) icon: Icon(showSearchWidget ? Icons.zoom_out : Icons.search,
)); size: icon_size)));
// _icons.add(IconButton( // _icons.add(IconButton(
// onPressed: () async { // onPressed: () async {
@ -512,9 +487,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
), ),
subtitle: Text( subtitle: Text(
"${L10().results}: ${resultCount}", "${L10().results}: ${resultCount}",
style: TextStyle( style: TextStyle(fontStyle: FontStyle.italic),
fontStyle: FontStyle.italic
),
), ),
trailing: Row( trailing: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -530,8 +503,11 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
return ListTile( return ListTile(
trailing: GestureDetector( trailing: GestureDetector(
child: Icon( child: Icon(
searchController.text.isEmpty ? TablerIcons.search : TablerIcons.backspace, searchController.text.isEmpty
color: searchController.text.isNotEmpty ? COLOR_DANGER : COLOR_ACTION, ? TablerIcons.search
: TablerIcons.backspace,
color:
searchController.text.isNotEmpty ? COLOR_DANGER : COLOR_ACTION,
), ),
onTap: () { onTap: () {
if (searchController.text.isNotEmpty) { if (searchController.text.isNotEmpty) {
@ -548,21 +524,17 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
decoration: InputDecoration( decoration: InputDecoration(
hintText: L10().search, hintText: L10().search,
), ),
) ));
);
} }
} }
class NoResultsWidget extends StatelessWidget { class NoResultsWidget extends StatelessWidget {
const NoResultsWidget(this.description); const NoResultsWidget(this.description);
final String description; final String description;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ListTile( return ListTile(
title: Text( title: Text(
description, description,
@ -571,5 +543,4 @@ class NoResultsWidget extends StatelessWidget {
leading: Icon(TablerIcons.exclamation_circle, color: COLOR_WARNING), leading: Icon(TablerIcons.exclamation_circle, color: COLOR_WARNING),
); );
} }
} }

36
lib/widget/part/bom_list.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -14,13 +13,13 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/progress.dart"; import "package:inventree/widget/progress.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
/* /*
* Widget for displaying a Bill of Materials for a specified Part instance * Widget for displaying a Bill of Materials for a specified Part instance
*/ */
class BillOfMaterialsWidget extends StatefulWidget { class BillOfMaterialsWidget extends StatefulWidget {
const BillOfMaterialsWidget(this.part,
const BillOfMaterialsWidget(this.part, {this.isParentComponent = true, Key? key}) : super(key: key); {this.isParentComponent = true, Key? key})
: super(key: key);
final InvenTreePart part; final InvenTreePart part;
@ -58,7 +57,6 @@ class _BillOfMaterialsState extends RefreshableState<BillOfMaterialsWidget> {
@override @override
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
Map<String, String> filters = {}; Map<String, String> filters = {};
if (widget.isParentComponent) { if (widget.isParentComponent) {
@ -72,7 +70,9 @@ class _BillOfMaterialsState extends RefreshableState<BillOfMaterialsWidget> {
ListTile( ListTile(
leading: InvenTreeAPI().getThumbnail(widget.part.thumbnail), leading: InvenTreeAPI().getThumbnail(widget.part.thumbnail),
title: Text(widget.part.fullname), title: Text(widget.part.fullname),
subtitle: Text(widget.isParentComponent ? L10().billOfMaterials : L10().usedInDetails), subtitle: Text(widget.isParentComponent
? L10().billOfMaterials
: L10().usedInDetails),
trailing: Text(L10().quantity), trailing: Text(L10().quantity),
), ),
Divider(thickness: 1.25), Divider(thickness: 1.25),
@ -87,13 +87,13 @@ class _BillOfMaterialsState extends RefreshableState<BillOfMaterialsWidget> {
} }
} }
/* /*
* Create a paginated widget displaying a list of BomItem objects * Create a paginated widget displaying a list of BomItem objects
*/ */
class PaginatedBomList extends PaginatedSearchWidget { class PaginatedBomList extends PaginatedSearchWidget {
const PaginatedBomList(Map<String, String> filters,
const PaginatedBomList(Map<String, String> filters, {this.isParentPart = true}) : super(filters: filters); {this.isParentPart = true})
: super(filters: filters);
final bool isParentPart; final bool isParentPart;
@ -104,9 +104,7 @@ class PaginatedBomList extends PaginatedSearchWidget {
_PaginatedBomListState createState() => _PaginatedBomListState(); _PaginatedBomListState createState() => _PaginatedBomListState();
} }
class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> { class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
_PaginatedBomListState() : super(); _PaginatedBomListState() : super();
@override @override
@ -127,19 +125,20 @@ class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
}; };
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeBomItem().listPaginated(limit, offset, filters: params); final page =
await InvenTreeBomItem().listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeBomItem bomItem = model as InvenTreeBomItem; InvenTreeBomItem bomItem = model as InvenTreeBomItem;
InvenTreePart? subPart = widget.isParentPart ? bomItem.subPart : bomItem.part; InvenTreePart? subPart =
widget.isParentPart ? bomItem.subPart : bomItem.part;
String title = subPart?.fullname ?? "error - no name"; String title = subPart?.fullname ?? "error - no name";
@ -151,8 +150,9 @@ class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),
leading: InvenTreeAPI().getThumbnail(subPart?.thumbnail ?? ""), leading: InvenTreeAPI().getThumbnail(subPart?.thumbnail ?? ""),
onTap: subPart == null ? null : () async { onTap: subPart == null
? null
: () async {
showLoadingOverlay(); showLoadingOverlay();
var part = await InvenTreePart().get(subPart.pk); var part = await InvenTreePart().get(subPart.pk);
hideLoadingOverlay(); hideLoadingOverlay();

92
lib/widget/part/category_display.dart
View File

@ -13,9 +13,7 @@ import "package:inventree/widget/progress.dart";
import "package:inventree/widget/snacks.dart"; import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
class CategoryDisplayWidget extends StatefulWidget { class CategoryDisplayWidget extends StatefulWidget {
const CategoryDisplayWidget(this.category, {Key? key}) : super(key: key); const CategoryDisplayWidget(this.category, {Key? key}) : super(key: key);
final InvenTreePartCategory? category; final InvenTreePartCategory? category;
@ -24,9 +22,7 @@ class CategoryDisplayWidget extends StatefulWidget {
_CategoryDisplayState createState() => _CategoryDisplayState(); _CategoryDisplayState createState() => _CategoryDisplayState();
} }
class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> { class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
_CategoryDisplayState(); _CategoryDisplayState();
@override @override
@ -38,15 +34,13 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
if (widget.category != null) { if (widget.category != null) {
if (InvenTreePartCategory().canEdit) { if (InvenTreePartCategory().canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().editCategory, tooltip: L10().editCategory,
onPressed: () { onPressed: () {
_editCategoryDialog(context); _editCategoryDialog(context);
}, },
) ));
);
} }
} }
@ -58,25 +52,20 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (InvenTreePart().canCreate) { if (InvenTreePart().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.box), child: Icon(TablerIcons.box),
label: L10().partCreateDetail, label: L10().partCreateDetail,
onTap: _newPart, onTap: _newPart,
) ));
);
} }
if (InvenTreePartCategory().canCreate) { if (InvenTreePartCategory().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.sitemap), child: Icon(TablerIcons.sitemap),
label: L10().categoryCreateDetail, label: L10().categoryCreateDetail,
onTap: () { onTap: () {
_newCategory(context); _newCategory(context);
} }));
)
);
} }
return actions; return actions;
@ -90,14 +79,10 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
return; return;
} }
_cat.editForm( _cat.editForm(context, L10().editCategory, onSuccess: (data) async {
context,
L10().editCategory,
onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().categoryUpdated, success: true); showSnackIcon(L10().categoryUpdated, success: true);
} });
);
} }
@override @override
@ -107,7 +92,6 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
@override @override
Future<void> request(BuildContext context) async { Future<void> request(BuildContext context) async {
// Update the category // Update the category
if (widget.category != null) { if (widget.category != null) {
final bool result = await widget.category?.reload() ?? false; final bool result = await widget.category?.reload() ?? false;
@ -126,24 +110,20 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
title: Text( title: Text(
L10().partCategoryTopLevel, L10().partCategoryTopLevel,
style: TextStyle(fontStyle: FontStyle.italic), style: TextStyle(fontStyle: FontStyle.italic),
) )));
)
);
} else { } else {
List<Widget> children = [ List<Widget> children = [
ListTile( ListTile(
title: Text("${widget.category?.name}", title: Text("${widget.category?.name}",
style: TextStyle(fontWeight: FontWeight.bold) style: TextStyle(fontWeight: FontWeight.bold)),
),
subtitle: Text("${widget.category?.description}"), subtitle: Text("${widget.category?.description}"),
leading: widget.category!.customIcon != null ? Icon(widget.category!.customIcon) : Icon(TablerIcons.sitemap) leading: widget.category!.customIcon != null
), ? Icon(widget.category!.customIcon)
: Icon(TablerIcons.sitemap)),
]; ];
if (extra) { if (extra) {
children.add( children.add(ListTile(
ListTile(
title: Text(L10().parentCategory), title: Text(L10().parentCategory),
subtitle: Text("${widget.category?.parentPathString}"), subtitle: Text("${widget.category?.parentPathString}"),
leading: Icon( leading: Icon(
@ -151,13 +131,14 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
color: COLOR_ACTION, color: COLOR_ACTION,
), ),
onTap: () async { onTap: () async {
int parentId = widget.category?.parentId ?? -1; int parentId = widget.category?.parentId ?? -1;
if (parentId < 0) { if (parentId < 0) {
Navigator.push(context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null))); Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CategoryDisplayWidget(null)));
} else { } else {
showLoadingOverlay(); showLoadingOverlay();
var cat = await InvenTreePartCategory().get(parentId); var cat = await InvenTreePartCategory().get(parentId);
hideLoadingOverlay(); hideLoadingOverlay();
@ -167,21 +148,17 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
} }
} }
}, },
) ));
);
} }
return Card( return Card(
child: Column( child: Column(children: children),
children: children
),
); );
} }
} }
@override @override
List<Widget> getTabIcons(BuildContext context) { List<Widget> getTabIcons(BuildContext context) {
return [ return [
Tab(text: L10().details), Tab(text: L10().details),
Tab(text: L10().parts), Tab(text: L10().parts),
@ -198,7 +175,6 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
// Construct the "details" panel // Construct the "details" panel
List<Widget> detailTiles() { List<Widget> detailTiles() {
Map<String, String> filters = {}; Map<String, String> filters = {};
int? parent = widget.category?.pk; int? parent = widget.category?.pk;
@ -225,7 +201,6 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
// Construct the "parts" panel // Construct the "parts" panel
List<Widget> partsTiles() { List<Widget> partsTiles() {
Map<String, String> filters = { Map<String, String> filters = {
"category": widget.category?.pk.toString() ?? "null", "category": widget.category?.pk.toString() ?? "null",
}; };
@ -239,17 +214,11 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
} }
Future<void> _newCategory(BuildContext context) async { Future<void> _newCategory(BuildContext context) async {
int pk = widget.category?.pk ?? -1; int pk = widget.category?.pk ?? -1;
InvenTreePartCategory().createForm( InvenTreePartCategory().createForm(context, L10().categoryCreate, data: {
context,
L10().categoryCreate,
data: {
"parent": (pk > 0) ? pk : null, "parent": (pk > 0) ? pk : null,
}, }, onSuccess: (result) async {
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
@ -260,29 +229,20 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
} else { } else {
refresh(context); refresh(context);
} }
} });
);
} }
Future<void> _newPart() async { Future<void> _newPart() async {
int pk = widget.category?.pk ?? -1; int pk = widget.category?.pk ?? -1;
InvenTreePart().createForm( InvenTreePart().createForm(context, L10().partCreate,
context, data: {"category": (pk > 0) ? pk : null}, onSuccess: (result) async {
L10().partCreate,
data: {
"category": (pk > 0) ? pk : null
},
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var part = InvenTreePart.fromJson(data); var part = InvenTreePart.fromJson(data);
part.goToDetailPage(context); part.goToDetailPage(context);
} }
} });
);
} }
} }

26
lib/widget/part/category_list.dart
View File

@ -9,19 +9,15 @@ import "package:inventree/api.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
class PartCategoryList extends StatefulWidget { class PartCategoryList extends StatefulWidget {
const PartCategoryList(this.filters); const PartCategoryList(this.filters);
final Map<String, String> filters; final Map<String, String> filters;
@override @override
_PartCategoryListState createState() => _PartCategoryListState(); _PartCategoryListState createState() => _PartCategoryListState();
} }
class _PartCategoryListState extends RefreshableState<PartCategoryList> { class _PartCategoryListState extends RefreshableState<PartCategoryList> {
_PartCategoryListState(); _PartCategoryListState();
@override @override
@ -34,19 +30,20 @@ class _PartCategoryListState extends RefreshableState<PartCategoryList> {
} }
class PaginatedPartCategoryList extends PaginatedSearchWidget { class PaginatedPartCategoryList extends PaginatedSearchWidget {
const PaginatedPartCategoryList(Map<String, String> filters,
const PaginatedPartCategoryList(Map<String, String> filters, {String title = ""}) : super(filters: filters, title: title); {String title = ""})
: super(filters: filters, title: title);
@override @override
String get searchTitle => title.isNotEmpty ? title : L10().partCategories; String get searchTitle => title.isNotEmpty ? title : L10().partCategories;
@override @override
_PaginatedPartCategoryListState createState() => _PaginatedPartCategoryListState(); _PaginatedPartCategoryListState createState() =>
_PaginatedPartCategoryListState();
} }
class _PaginatedPartCategoryListState
class _PaginatedPartCategoryListState extends PaginatedSearchState<PaginatedPartCategoryList> { extends PaginatedSearchState<PaginatedPartCategoryList> {
// _PaginatedPartCategoryListState(Map<String, String> filters, bool searchEnabled) : super(filters, searchEnabled); // _PaginatedPartCategoryListState(Map<String, String> filters, bool searchEnabled) : super(filters, searchEnabled);
@override @override
@ -64,7 +61,6 @@ class _PaginatedPartCategoryListState extends PaginatedSearchState<PaginatedPart
@override @override
Map<String, String> get orderingOptions { Map<String, String> get orderingOptions {
Map<String, String> options = { Map<String, String> options = {
"name": L10().name, "name": L10().name,
"level": L10().level, "level": L10().level,
@ -81,16 +77,16 @@ class _PaginatedPartCategoryListState extends PaginatedSearchState<PaginatedPart
} }
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePartCategory().listPaginated(limit, offset, filters: params); final page = await InvenTreePartCategory()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePartCategory category = model as InvenTreePartCategory; InvenTreePartCategory category = model as InvenTreePartCategory;
return ListTile( return ListTile(

329
lib/widget/part/part_detail.dart
View File

@ -27,24 +27,19 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/stock/stock_list.dart"; import "package:inventree/widget/stock/stock_list.dart";
import "package:inventree/widget/company/supplier_part_list.dart"; import "package:inventree/widget/company/supplier_part_list.dart";
/* /*
* Widget for displaying a detail view of a single Part instance * Widget for displaying a detail view of a single Part instance
*/ */
class PartDetailWidget extends StatefulWidget { class PartDetailWidget extends StatefulWidget {
const PartDetailWidget(this.part, {Key? key}) : super(key: key); const PartDetailWidget(this.part, {Key? key}) : super(key: key);
final InvenTreePart part; final InvenTreePart part;
@override @override
_PartDisplayState createState() => _PartDisplayState(part); _PartDisplayState createState() => _PartDisplayState(part);
} }
class _PartDisplayState extends RefreshableState<PartDetailWidget> { class _PartDisplayState extends RefreshableState<PartDetailWidget> {
_PartDisplayState(this.part); _PartDisplayState(this.part);
InvenTreePart part; InvenTreePart part;
@ -75,15 +70,12 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
List<Widget> actions = []; List<Widget> actions = [];
if (InvenTreePart().canEdit) { if (InvenTreePart().canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().editPart, tooltip: L10().editPart,
onPressed: () { onPressed: () {
_editPartDialog(context); _editPartDialog(context);
} }));
)
);
} }
return actions; return actions;
} }
@ -93,13 +85,8 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (InvenTreePart().canEdit) { if (InvenTreePart().canEdit) {
actions.add( actions.add(customBarcodeAction(
customBarcodeAction( context, this, widget.part.customBarcode, "part", widget.part.pk));
context, this,
widget.part.customBarcode, "part",
widget.part.pk
)
);
} }
return actions; return actions;
@ -110,33 +97,22 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (InvenTreeStockItem().canCreate) { if (InvenTreeStockItem().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.packages), child: Icon(TablerIcons.packages),
label: L10().stockItemCreate, label: L10().stockItemCreate,
onTap: () { onTap: () {
_newStockItem(context); _newStockItem(context);
} }));
)
);
} }
if (labels.isNotEmpty) { if (labels.isNotEmpty) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.printer), child: Icon(TablerIcons.printer),
label: L10().printLabel, label: L10().printLabel,
onTap: () async { onTap: () async {
selectAndPrintLabel( selectAndPrintLabel(context, labels, widget.part.pk, "part",
context, "part=${widget.part.pk}");
labels, }));
widget.part.pk,
"part",
"part=${widget.part.pk}"
);
}
)
);
} }
return actions; return actions;
@ -153,14 +129,16 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
@override @override
Future<void> request(BuildContext context) async { Future<void> request(BuildContext context) async {
final bool result = await part.reload(); final bool result = await part.reload();
// Load page settings from local storage // Load page settings from local storage
showPricing = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PRICING, true); showPricing =
showParameters = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PARAMETERS, true); await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PRICING, true);
showParameters = await InvenTreeSettingsManager()
.getBool(INV_PART_SHOW_PARAMETERS, true);
showBom = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_BOM, true); showBom = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_BOM, true);
allowLabelPrinting = await InvenTreeSettingsManager().getBool(INV_ENABLE_LABEL_PRINTING, true); allowLabelPrinting = await InvenTreeSettingsManager()
.getBool(INV_ENABLE_LABEL_PRINTING, true);
if (!result || part.pk == -1) { if (!result || part.pk == -1) {
// Part could not be loaded, for some reason // Part could not be loaded, for some reason
@ -211,11 +189,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
} }
// Request the number of BOM items // Request the number of BOM items
InvenTreePart().count( InvenTreePart().count(filters: {
filters: {
"in_bom_for": part.pk.toString(), "in_bom_for": part.pk.toString(),
} }).then((int value) {
).then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
bomCount = value; bomCount = value;
@ -224,11 +200,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
}); });
// Request number of "used in" parts // Request number of "used in" parts
InvenTreeBomItem().count( InvenTreeBomItem().count(filters: {
filters: {
"uses": part.pk.toString(), "uses": part.pk.toString(),
} }).then((int value) {
).then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
usedInCount = value; usedInCount = value;
@ -237,11 +211,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
}); });
// Request the number of variant items // Request the number of variant items
InvenTreePart().count( InvenTreePart().count(filters: {
filters: {
"variant_of": part.pk.toString(), "variant_of": part.pk.toString(),
} }).then((int value) {
).then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
variantCount = value; variantCount = value;
@ -253,16 +225,12 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
allowLabelPrinting &= api.supportsMixin("labels"); allowLabelPrinting &= api.supportsMixin("labels");
if (allowLabelPrinting) { if (allowLabelPrinting) {
String model_type =
String model_type = api.supportsModernLabelPrinting ? InvenTreePart.MODEL_TYPE : "part"; api.supportsModernLabelPrinting ? InvenTreePart.MODEL_TYPE : "part";
String item_key = api.supportsModernLabelPrinting ? "items" : "part"; String item_key = api.supportsModernLabelPrinting ? "items" : "part";
_labels = await getLabelTemplates( _labels = await getLabelTemplates(
model_type, model_type, {item_key: widget.part.pk.toString()});
{
item_key: widget.part.pk.toString()
}
);
} }
if (mounted) { if (mounted) {
@ -273,15 +241,10 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
} }
void _editPartDialog(BuildContext context) { void _editPartDialog(BuildContext context) {
part.editForm(context, L10().editPart, onSuccess: (data) async {
part.editForm(
context,
L10().editPart,
onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().partEdited, success: true); showSnackIcon(L10().partEdited, success: true);
} });
);
} }
Widget headerTile() { Widget headerTile() {
@ -289,21 +252,18 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
child: ListTile( child: ListTile(
title: Text(part.fullname), title: Text(part.fullname),
subtitle: Text(part.description), subtitle: Text(part.description),
trailing: Text( trailing: Text(part.stockString(),
part.stockString(),
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
) )),
),
leading: GestureDetector( leading: GestureDetector(
child: api.getImage(part.thumbnail), child: api.getImage(part.thumbnail),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PartImageWidget(part) builder: (context) => PartImageWidget(part)))
) .then((value) {
).then((value) {
refresh(context); refresh(context);
}); });
}), }),
@ -315,13 +275,10 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
* Build a list of tiles to display under the part description * Build a list of tiles to display under the part description
*/ */
List<Widget> partTiles() { List<Widget> partTiles() {
List<Widget> tiles = []; List<Widget> tiles = [];
// Image / name / description // Image / name / description
tiles.add( tiles.add(headerTile());
headerTile()
);
if (loading) { if (loading) {
tiles.add(progressIndicator()); tiles.add(progressIndicator());
@ -329,31 +286,16 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
} }
if (!part.isActive) { if (!part.isActive) {
tiles.add( tiles.add(ListTile(
ListTile( title: Text(L10().inactive, style: TextStyle(color: COLOR_DANGER)),
title: Text( subtitle:
L10().inactive, Text(L10().inactiveDetail, style: TextStyle(color: COLOR_DANGER)),
style: TextStyle( leading: Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER),
color: COLOR_DANGER ));
)
),
subtitle: Text(
L10().inactiveDetail,
style: TextStyle(
color: COLOR_DANGER
)
),
leading: Icon(
TablerIcons.exclamation_circle,
color: COLOR_DANGER
),
)
);
} }
if (parentPart != null) { if (parentPart != null) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().templatePart), title: Text(L10().templatePart),
subtitle: Text(parentPart!.fullname), subtitle: Text(parentPart!.fullname),
leading: api.getImage( leading: api.getImage(
@ -363,21 +305,17 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
), ),
onTap: () { onTap: () {
parentPart?.goToDetailPage(context); parentPart?.goToDetailPage(context);
} }));
)
);
} }
// Category information // Category information
if (part.categoryName.isNotEmpty) { if (part.categoryName.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().partCategory), title: Text(L10().partCategory),
subtitle: Text("${part.categoryName}"), subtitle: Text("${part.categoryName}"),
leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION), leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION),
onTap: () async { onTap: () async {
if (part.categoryId > 0) { if (part.categoryId > 0) {
showLoadingOverlay(); showLoadingOverlay();
var cat = await InvenTreePartCategory().get(part.categoryId); var cat = await InvenTreePartCategory().get(part.categoryId);
hideLoadingOverlay(); hideLoadingOverlay();
@ -387,26 +325,24 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
} }
} }
}, },
) ));
);
} else { } else {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().partCategory), title: Text(L10().partCategory),
subtitle: Text(L10().partCategoryTopLevel), subtitle: Text(L10().partCategoryTopLevel),
leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION), leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute( Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CategoryDisplayWidget(null))); builder: (context) => CategoryDisplayWidget(null)));
}, },
) ));
);
} }
// Display number of "variant" parts if any exist // Display number of "variant" parts if any exist
if (variantCount > 0) { if (variantCount > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().variants), title: Text(L10().variants),
leading: Icon(TablerIcons.versions, color: COLOR_ACTION), leading: Icon(TablerIcons.versions, color: COLOR_ACTION),
trailing: Text(variantCount.toString()), trailing: Text(variantCount.toString()),
@ -414,17 +350,11 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PartList( builder: (context) => PartList({
{
"variant_of": part.pk.toString(), "variant_of": part.pk.toString(),
}, title: L10().variants)));
}, },
title: L10().variants ));
)
)
);
},
)
);
} }
tiles.add( tiles.add(
@ -442,12 +372,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
); );
if (showPricing && partPricing != null) { if (showPricing && partPricing != null) {
String pricing = formatPriceRange( String pricing = formatPriceRange(
partPricing?.overallMin, partPricing?.overallMin, partPricing?.overallMax,
partPricing?.overallMax, currency: partPricing?.currency);
currency: partPricing?.currency
);
tiles.add( tiles.add(
ListTile( ListTile(
@ -463,7 +390,8 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PartPricingWidget(part: part, partPricing: partPricing), builder: (context) =>
PartPricingWidget(part: part, partPricing: partPricing),
), ),
); );
}, },
@ -473,10 +401,8 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
// Tiles for "purchaseable" parts // Tiles for "purchaseable" parts
if (part.isPurchaseable) { if (part.isPurchaseable) {
// On order // On order
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().onOrder), title: Text(L10().onOrder),
subtitle: Text(L10().onOrderDetails), subtitle: Text(L10().onOrderDetails),
leading: Icon(TablerIcons.shopping_cart), leading: Icon(TablerIcons.shopping_cart),
@ -484,47 +410,41 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
onTap: () { onTap: () {
// TODO - Order views // TODO - Order views
}, },
) ));
);
} }
// Tiles for an "assembly" part // Tiles for an "assembly" part
if (part.isAssembly) { if (part.isAssembly) {
if (showBom && bomCount > 0) { if (showBom && bomCount > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().billOfMaterials), title: Text(L10().billOfMaterials),
leading: Icon(TablerIcons.list_tree, color: COLOR_ACTION), leading: Icon(TablerIcons.list_tree, color: COLOR_ACTION),
trailing: Text(bomCount.toString()), trailing: Text(bomCount.toString()),
onTap: () { onTap: () {
Navigator.push(context, MaterialPageRoute( Navigator.push(
builder: (context) => BillOfMaterialsWidget(part, isParentComponent: true) context,
)); MaterialPageRoute(
builder: (context) =>
BillOfMaterialsWidget(part, isParentComponent: true)));
}, },
) ));
);
} }
if (part.building > 0) { if (part.building > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().building), title: Text(L10().building),
leading: Icon(TablerIcons.tools), leading: Icon(TablerIcons.tools),
trailing: Text("${simpleNumberString(part.building)}"), trailing: Text("${simpleNumberString(part.building)}"),
onTap: () { onTap: () {
// TODO // TODO
}, },
) ));
);
} }
} }
if (part.isComponent) { if (part.isComponent) {
if (showBom && usedInCount > 0) { if (showBom && usedInCount > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().usedIn), title: Text(L10().usedIn),
subtitle: Text(L10().usedInDetails), subtitle: Text(L10().usedInDetails),
leading: Icon(TablerIcons.stack_2, color: COLOR_ACTION), leading: Icon(TablerIcons.stack_2, color: COLOR_ACTION),
@ -533,43 +453,34 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => BillOfMaterialsWidget(part, isParentComponent: false) builder: (context) => BillOfMaterialsWidget(part,
) isParentComponent: false)));
); }));
}
)
);
} }
} }
// Keywords? // Keywords?
if (part.keywords.isNotEmpty) { if (part.keywords.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text("${part.keywords}"), title: Text("${part.keywords}"),
leading: Icon(TablerIcons.tags), leading: Icon(TablerIcons.tags),
) ));
);
} }
// External link? // External link?
if (part.link.isNotEmpty) { if (part.link.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text("${part.link}"), title: Text("${part.link}"),
leading: Icon(TablerIcons.link, color: COLOR_ACTION), leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () { onTap: () {
part.openLink(); part.openLink();
}, },
) ));
);
} }
// Tiles for "component" part // Tiles for "component" part
if (part.isComponent && part.usedInCount > 0) { if (part.isComponent && part.usedInCount > 0) {
tiles.add(ListTile(
tiles.add(
ListTile(
title: Text(L10().usedIn), title: Text(L10().usedIn),
subtitle: Text(L10().usedInDetails), subtitle: Text(L10().usedInDetails),
leading: Icon(TablerIcons.sitemap), leading: Icon(TablerIcons.sitemap),
@ -577,48 +488,38 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
onTap: () { onTap: () {
// TODO // TODO
}, },
) ));
);
} }
if (part.isPurchaseable) { if (part.isPurchaseable) {
if (part.supplierCount > 0) { if (part.supplierCount > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().suppliers), title: Text(L10().suppliers),
leading: Icon(TablerIcons.building_factory, color: COLOR_ACTION), leading: Icon(TablerIcons.building_factory, color: COLOR_ACTION),
trailing: Text("${part.supplierCount}"), trailing: Text("${part.supplierCount}"),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => SupplierPartList({ MaterialPageRoute(
"part": part.pk.toString() builder: (context) =>
})) SupplierPartList({"part": part.pk.toString()})));
);
}, },
) ));
);
} }
} }
// Notes field // Notes field
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notes), title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION), leading: Icon(TablerIcons.note, color: COLOR_ACTION),
trailing: Text(""), trailing: Text(""),
onTap: () { onTap: () {
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => NotesWidget(part)));
MaterialPageRoute(builder: (context) => NotesWidget(part))
);
}, },
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().attachments), title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION), leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null, trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null,
@ -630,16 +531,11 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
InvenTreePartAttachment(), InvenTreePartAttachment(),
part.pk, part.pk,
L10().part, L10().part,
part.canEdit part.canEdit)));
)
)
);
}, },
) ));
);
return tiles; return tiles;
} }
// Return tiles for each stock item // Return tiles for each stock item
@ -648,16 +544,16 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
tiles.add(headerTile()); tiles.add(headerTile());
tiles.add( tiles.add(ListTile(
ListTile(
title: Text( title: Text(
L10().stockItems, L10().stockItems,
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),
subtitle: part.stockItems.isEmpty ? Text(L10().stockItemsNotAvailable) : null, subtitle:
trailing: part.stockItems.isNotEmpty ? Text("${part.stockItems.length}") : null, part.stockItems.isEmpty ? Text(L10().stockItemsNotAvailable) : null,
) trailing:
); part.stockItems.isNotEmpty ? Text("${part.stockItems.length}") : null,
));
return tiles; return tiles;
} }
@ -666,7 +562,6 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
* Launch a form to create a new StockItem for this part * Launch a form to create a new StockItem for this part
*/ */
Future<void> _newStockItem(BuildContext context) async { Future<void> _newStockItem(BuildContext context) async {
var fields = InvenTreeStockItem().formFields(); var fields = InvenTreeStockItem().formFields();
// Serial number cannot be directly edited here // Serial number cannot be directly edited here
@ -677,9 +572,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
int? default_location = part.defaultLocation; int? default_location = part.defaultLocation;
Map<String, dynamic> data = { Map<String, dynamic> data = {"part": part.pk.toString()};
"part": part.pk.toString()
};
if (default_location != null) { if (default_location != null) {
data["location"] = default_location; data["location"] = default_location;
@ -688,15 +581,18 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (part.isTrackable) { if (part.isTrackable) {
// read the next available serial number // read the next available serial number
showLoadingOverlay(); showLoadingOverlay();
var response = await api.get("/api/part/${part.pk}/serial-numbers/", expectedStatusCode: null); var response = await api.get("/api/part/${part.pk}/serial-numbers/",
expectedStatusCode: null);
hideLoadingOverlay(); hideLoadingOverlay();
if (response.isValid() && response.statusCode == 200) { if (response.isValid() && response.statusCode == 200) {
data["serial_numbers"] = response.data["next"] ?? response.data["latest"]; data["serial_numbers"] =
response.data["next"] ?? response.data["latest"];
} }
print("response: " + response.statusCode.toString() + response.data.toString()); print("response: " +
response.statusCode.toString() +
response.data.toString());
} else { } else {
// Cannot set serial numbers for non-trackable parts // Cannot set serial numbers for non-trackable parts
fields.remove("serial_numbers"); fields.remove("serial_numbers");
@ -704,29 +600,20 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
print("data: ${data.toString()}"); print("data: ${data.toString()}");
InvenTreeStockItem().createForm( InvenTreeStockItem().createForm(context, L10().stockItemCreate,
context, fields: fields, data: data, onSuccess: (result) async {
L10().stockItemCreate,
fields: fields,
data: data,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var item = InvenTreeStockItem.fromJson(data); var item = InvenTreeStockItem.fromJson(data);
item.goToDetailPage(context); item.goToDetailPage(context);
} }
} });
);
} }
@override @override
List<Widget> getTabIcons(BuildContext context) { List<Widget> getTabIcons(BuildContext context) {
List<Widget> icons = [ List<Widget> icons = [Tab(text: L10().details), Tab(text: L10().stock)];
Tab(text: L10().details),
Tab(text: L10().stock)
];
if (showParameters) { if (showParameters) {
icons.add(Tab(text: L10().parameters)); icons.add(Tab(text: L10().parameters));
@ -742,8 +629,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
physics: AlwaysScrollableScrollPhysics(), physics: AlwaysScrollableScrollPhysics(),
child: Column( child: Column(
children: partTiles(), children: partTiles(),
) )),
),
PaginatedStockItemList({"part": part.pk.toString()}) PaginatedStockItemList({"part": part.pk.toString()})
]; ];
@ -753,5 +639,4 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
return tabs; return tabs;
} }
} }

21
lib/widget/part/part_image_widget.dart
View File

@ -11,19 +11,15 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
class PartImageWidget extends StatefulWidget { class PartImageWidget extends StatefulWidget {
const PartImageWidget(this.part, {Key? key}) : super(key: key); const PartImageWidget(this.part, {Key? key}) : super(key: key);
final InvenTreePart part; final InvenTreePart part;
@override @override
_PartImageState createState() => _PartImageState(part); _PartImageState createState() => _PartImageState(part);
} }
class _PartImageState extends RefreshableState<PartImageWidget> { class _PartImageState extends RefreshableState<PartImageWidget> {
_PartImageState(this.part); _PartImageState(this.part);
final InvenTreePart part; final InvenTreePart part;
@ -38,19 +34,14 @@ class _PartImageState extends RefreshableState<PartImageWidget> {
@override @override
List<Widget> appBarActions(BuildContext context) { List<Widget> appBarActions(BuildContext context) {
List<Widget> actions = []; List<Widget> actions = [];
if (part.canEdit) { if (part.canEdit) {
// File upload // File upload
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.file_upload), icon: Icon(TablerIcons.file_upload),
onPressed: () async { onPressed: () async {
FilePickerDialog.pickFile(onPicked: (File file) async {
FilePickerDialog.pickFile(
onPicked: (File file) async {
final result = await part.uploadImage(file); final result = await part.uploadImage(file);
if (!result) { if (!result) {
@ -58,12 +49,9 @@ class _PartImageState extends RefreshableState<PartImageWidget> {
} }
refresh(context); refresh(context);
} });
);
}, },
) ));
);
} }
return actions; return actions;
@ -73,5 +61,4 @@ class _PartImageState extends RefreshableState<PartImageWidget> {
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
return InvenTreeAPI().getImage(part.image); return InvenTreeAPI().getImage(part.image);
} }
} }

28
lib/widget/part/part_list.dart
View File

@ -9,9 +9,7 @@ import "package:inventree/inventree/part.dart";
import "package:inventree/widget/paginator.dart"; import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
class PartList extends StatefulWidget { class PartList extends StatefulWidget {
const PartList(this.filters, {this.title = ""}); const PartList(this.filters, {this.title = ""});
final String title; final String title;
@ -22,9 +20,7 @@ class PartList extends StatefulWidget {
_PartListState createState() => _PartListState(filters, title); _PartListState createState() => _PartListState(filters, title);
} }
class _PartListState extends RefreshableState<PartList> { class _PartListState extends RefreshableState<PartList> {
_PartListState(this.filters, this.title); _PartListState(this.filters, this.title);
final String title; final String title;
@ -40,13 +36,11 @@ class _PartListState extends RefreshableState<PartList> {
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
return PaginatedPartList(filters); return PaginatedPartList(filters);
} }
} }
class PaginatedPartList extends PaginatedSearchWidget { class PaginatedPartList extends PaginatedSearchWidget {
const PaginatedPartList(Map<String, String> filters)
const PaginatedPartList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().parts; String get searchTitle => L10().parts;
@ -55,9 +49,7 @@ class PaginatedPartList extends PaginatedSearchWidget {
_PaginatedPartListState createState() => _PaginatedPartListState(); _PaginatedPartListState createState() => _PaginatedPartListState();
} }
class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> { class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
_PaginatedPartListState() : super(); _PaginatedPartListState() : super();
@override @override
@ -109,26 +101,22 @@ class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
}; };
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
final page = await InvenTreePart().listPaginated(limit, offset, filters: params); int limit, int offset, Map<String, String> params) async {
final page =
await InvenTreePart().listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePart part = model as InvenTreePart; InvenTreePart part = model as InvenTreePart;
return ListTile( return ListTile(
title: Text(part.fullname), title: Text(part.fullname),
subtitle: Text(part.description), subtitle: Text(part.description),
trailing: Text( trailing: Text(part.stockString(),
part.stockString(), style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold
)
),
leading: InvenTreeAPI().getThumbnail(part.thumbnail), leading: InvenTreeAPI().getThumbnail(part.thumbnail),
onTap: () { onTap: () {
part.goToDetailPage(context); part.goToDetailPage(context);

58
lib/widget/part/part_parameter_widget.dart
View File

@ -11,7 +11,6 @@ import "package:inventree/widget/refreshable_state.dart";
* Widget for displaying a list of parameters associated with a given Part instance * Widget for displaying a list of parameters associated with a given Part instance
*/ */
class PartParameterWidget extends StatefulWidget { class PartParameterWidget extends StatefulWidget {
const PartParameterWidget(this.part); const PartParameterWidget(this.part);
final InvenTreePart part; final InvenTreePart part;
@ -20,7 +19,6 @@ class PartParameterWidget extends StatefulWidget {
_ParameterWidgetState createState() => _ParameterWidgetState(); _ParameterWidgetState createState() => _ParameterWidgetState();
} }
class _ParameterWidgetState extends RefreshableState<PartParameterWidget> { class _ParameterWidgetState extends RefreshableState<PartParameterWidget> {
_ParameterWidgetState(); _ParameterWidgetState();
@ -36,28 +34,20 @@ class _ParameterWidgetState extends RefreshableState<PartParameterWidget> {
@override @override
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
Map<String, String> filters = {"part": widget.part.pk.toString()};
Map<String, String> filters = {
"part": widget.part.pk.toString()
};
return Column( return Column(
children: [ children: [Expanded(child: PaginatedParameterList(filters))],
Expanded(
child: PaginatedParameterList(filters)
)
],
); );
} }
} }
/* /*
* Widget for displaying a paginated list of Part parameters * Widget for displaying a paginated list of Part parameters
*/ */
class PaginatedParameterList extends PaginatedSearchWidget { class PaginatedParameterList extends PaginatedSearchWidget {
const PaginatedParameterList(Map<String, String> filters)
const PaginatedParameterList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().parameters; String get searchTitle => L10().parameters;
@ -66,18 +56,15 @@ class PaginatedParameterList extends PaginatedSearchWidget {
_PaginatedParameterState createState() => _PaginatedParameterState(); _PaginatedParameterState createState() => _PaginatedParameterState();
} }
class _PaginatedParameterState
class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterList> { extends PaginatedSearchState<PaginatedParameterList> {
_PaginatedParameterState() : super(); _PaginatedParameterState() : super();
@override @override
String get prefix => "parameters_"; String get prefix => "parameters_";
@override @override
Map<String, String> get orderingOptions => { Map<String, String> get orderingOptions => {};
};
@override @override
Map<String, Map<String, dynamic>> get filterOptions => { Map<String, Map<String, dynamic>> get filterOptions => {
@ -85,32 +72,27 @@ class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterLi
}; };
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePartParameter().listPaginated(limit, offset, filters: params); final page = await InvenTreePartParameter()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
Future<void> editParameter(InvenTreePartParameter parameter) async { Future<void> editParameter(InvenTreePartParameter parameter) async {
// Checkbox values are handled separately // Checkbox values are handled separately
if (parameter.is_checkbox) { if (parameter.is_checkbox) {
return; return;
} else { } else {
parameter.editForm( parameter.editForm(context, L10().editParameter, onSuccess: (data) async {
context,
L10().editParameter,
onSuccess: (data) async {
updateSearchTerm(); updateSearchTerm();
} });
);
} }
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePartParameter parameter = model as InvenTreePartParameter; InvenTreePartParameter parameter = model as InvenTreePartParameter;
String title = parameter.name; String title = parameter.name;
@ -128,18 +110,18 @@ class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterLi
onChanged: (bool value) { onChanged: (bool value) {
if (parameter.canEdit) { if (parameter.canEdit) {
showLoadingOverlay(); showLoadingOverlay();
parameter.update( parameter.update(values: {"data": value.toString()}).then(
values: { (value) async {
"data": value.toString()
}
).then((value) async{
hideLoadingOverlay(); hideLoadingOverlay();
updateSearchTerm(); updateSearchTerm();
}); });
} }
}, },
) : Text(parameter.value), )
onTap: parameter.is_checkbox ? null : () async { : Text(parameter.value),
onTap: parameter.is_checkbox
? null
: () async {
if (parameter.canEdit) { if (parameter.canEdit) {
editParameter(parameter); editParameter(parameter);
} }

170
lib/widget/part/part_pricing.dart
View File

@ -7,8 +7,9 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
class PartPricingWidget extends StatefulWidget { class PartPricingWidget extends StatefulWidget {
const PartPricingWidget(
const PartPricingWidget({Key? key, required this.part, required this.partPricing}) : super(key: key); {Key? key, required this.part, required this.partPricing})
: super(key: key);
final InvenTreePart part; final InvenTreePart part;
final InvenTreePartPricing? partPricing; final InvenTreePartPricing? partPricing;
@ -17,7 +18,6 @@ class PartPricingWidget extends StatefulWidget {
} }
class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> { class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
@override @override
String getAppBarTitle() { String getAppBarTitle() {
return L10().partPricing; return L10().partPricing;
@ -25,174 +25,108 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
@override @override
List<Widget> getTiles(BuildContext context) { List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = [ List<Widget> tiles = [
Card( Card(
child: ListTile( child: ListTile(
title: Text(widget.part.fullname), title: Text(widget.part.fullname),
subtitle: Text(widget.part.description), subtitle: Text(widget.part.description),
leading: api.getThumbnail(widget.part.thumbnail) leading: api.getThumbnail(widget.part.thumbnail))),
)
),
]; ];
if (widget.partPricing == null) { if (widget.partPricing == null) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().noPricingAvailable), title: Text(L10().noPricingAvailable),
subtitle: Text(L10().noPricingDataFound), subtitle: Text(L10().noPricingDataFound),
) ));
);
return tiles; return tiles;
} }
final pricing = widget.partPricing!; final pricing = widget.partPricing!;
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().currency), title: Text(L10().currency),
trailing: Text(pricing.currency), trailing: Text(pricing.currency),
) ));
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().priceRange), title: Text(L10().priceRange),
trailing: Text( trailing: Text(formatPriceRange(pricing.overallMin, pricing.overallMax,
formatPriceRange( currency: pricing.currency)),
pricing.overallMin, ));
pricing.overallMax,
currency: pricing.currency
)
),
)
);
if (pricing.overallMin != null) { if (pricing.overallMin != null) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().priceOverrideMin), title: Text(L10().priceOverrideMin),
trailing: Text( trailing: Text(renderCurrency(
renderCurrency(pricing.overallMin, pricing.overrideMinCurrency) pricing.overallMin, pricing.overrideMinCurrency))));
)
)
);
} }
if (pricing.overrideMax != null) { if (pricing.overrideMax != null) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().priceOverrideMax), title: Text(L10().priceOverrideMax),
trailing: Text( trailing: Text(renderCurrency(
renderCurrency(pricing.overallMax, pricing.overrideMaxCurrency) pricing.overallMax, pricing.overrideMaxCurrency))));
)
)
);
} }
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().internalCost), title: Text(L10().internalCost),
trailing: Text( trailing: Text(formatPriceRange(
formatPriceRange( pricing.internalCostMin, pricing.internalCostMax,
pricing.internalCostMin, currency: pricing.currency)),
pricing.internalCostMax, ));
currency: pricing.currency
)
),
)
);
if (widget.part.isTemplate) { if (widget.part.isTemplate) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().variantCost), title: Text(L10().variantCost),
trailing: Text( trailing: Text(formatPriceRange(
formatPriceRange( pricing.variantCostMin, pricing.variantCostMax,
pricing.variantCostMin, currency: pricing.currency)),
pricing.variantCostMax, ));
currency: pricing.currency
)
),
)
);
} }
if (widget.part.isAssembly) { if (widget.part.isAssembly) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().bomCost), title: Text(L10().bomCost),
trailing: Text( trailing: Text(formatPriceRange(
formatPriceRange( pricing.bomCostMin, pricing.bomCostMax,
pricing.bomCostMin, currency: pricing.currency))));
pricing.bomCostMax,
currency: pricing.currency
)
)
)
);
} }
if (widget.part.isPurchaseable) { if (widget.part.isPurchaseable) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().purchasePrice), title: Text(L10().purchasePrice),
trailing: Text( trailing: Text(formatPriceRange(
formatPriceRange( pricing.purchaseCostMin, pricing.purchaseCostMax,
pricing.purchaseCostMin, currency: pricing.currency)),
pricing.purchaseCostMax, ));
currency: pricing.currency
)
),
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().supplierPricing), title: Text(L10().supplierPricing),
trailing: Text( trailing: Text(formatPriceRange(
formatPriceRange( pricing.supplierPriceMin, pricing.supplierPriceMax,
pricing.supplierPriceMin, currency: pricing.currency)),
pricing.supplierPriceMax, ));
currency: pricing.currency
)
),
)
);
} }
if (widget.part.isSalable) { if (widget.part.isSalable) {
tiles.add(Divider()); tiles.add(Divider());
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().salePrice), title: Text(L10().salePrice),
trailing: Text( trailing: Text(formatPriceRange(
formatPriceRange( pricing.salePriceMin, pricing.salePriceMax,
pricing.salePriceMin, currency: pricing.currency)),
pricing.salePriceMax, ));
currency: pricing.currency
)
),
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().saleHistory), title: Text(L10().saleHistory),
trailing: Text( trailing: Text(formatPriceRange(
formatPriceRange( pricing.saleHistoryMin, pricing.saleHistoryMax,
pricing.saleHistoryMin, currency: pricing.currency)),
pricing.saleHistoryMax, ));
currency: pricing.currency
)
),
)
);
} }
return tiles; return tiles;
} }
} }

6
lib/widget/part/part_suppliers.dart
View File

@ -10,19 +10,15 @@ import "package:inventree/inventree/company.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
class PartSupplierWidget extends StatefulWidget { class PartSupplierWidget extends StatefulWidget {
const PartSupplierWidget(this.part, {Key? key}) : super(key: key); const PartSupplierWidget(this.part, {Key? key}) : super(key: key);
final InvenTreePart part; final InvenTreePart part;
@override @override
_PartSupplierState createState() => _PartSupplierState(part); _PartSupplierState createState() => _PartSupplierState(part);
} }
class _PartSupplierState extends RefreshableState<PartSupplierWidget> { class _PartSupplierState extends RefreshableState<PartSupplierWidget> {
_PartSupplierState(this.part); _PartSupplierState(this.part);
final InvenTreePart part; final InvenTreePart part;
@ -46,7 +42,6 @@ class _PartSupplierState extends RefreshableState<PartSupplierWidget> {
} }
Widget _supplierPartTile(BuildContext context, int index) { Widget _supplierPartTile(BuildContext context, int index) {
InvenTreeSupplierPart _part = _supplierParts[index]; InvenTreeSupplierPart _part = _supplierParts[index];
return ListTile( return ListTile(
@ -73,5 +68,4 @@ class _PartSupplierState extends RefreshableState<PartSupplierWidget> {
itemBuilder: _supplierPartTile, itemBuilder: _supplierPartTile,
); );
} }
} }

26
lib/widget/progress.dart
View File

@ -1,5 +1,3 @@
import "dart:io"; import "dart:io";
import "package:flutter/material.dart"; import "package:flutter/material.dart";
@ -7,17 +5,11 @@ import "package:flutter_overlay_loader/flutter_overlay_loader.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
import "package:one_context/one_context.dart"; import "package:one_context/one_context.dart";
/* /*
* A simplified linear progress bar widget, * A simplified linear progress bar widget,
* with standardized color depiction * with standardized color depiction
*/ */
Widget ProgressBar( Widget ProgressBar(double value, {double maximum = 1.0}) {
double value,
{
double maximum = 1.0
}) {
double v = 0; double v = 0;
if (value <= 0 || maximum <= 0) { if (value <= 0 || maximum <= 0) {
@ -33,20 +25,14 @@ Widget ProgressBar(
); );
} }
/* /*
* Construct a circular progress indicator * Construct a circular progress indicator
*/ */
Widget progressIndicator() { Widget progressIndicator() {
return Center(child: CircularProgressIndicator());
return Center(
child: CircularProgressIndicator()
);
} }
void showLoadingOverlay() { void showLoadingOverlay() {
// Do not show overlay if running unit tests // Do not show overlay if running unit tests
if (Platform.environment.containsKey("FLUTTER_TEST")) { if (Platform.environment.containsKey("FLUTTER_TEST")) {
return; return;
@ -58,13 +44,11 @@ void showLoadingOverlay() {
return; return;
} }
Loader.show( Loader.show(context,
context, themeData:
themeData: Theme.of(context).copyWith(colorScheme: ColorScheme.fromSwatch()) Theme.of(context).copyWith(colorScheme: ColorScheme.fromSwatch()));
);
} }
void hideLoadingOverlay() { void hideLoadingOverlay() {
if (Loader.isShown) { if (Loader.isShown) {
Loader.hide(); Loader.hide();

53
lib/widget/refreshable_state.dart
View File

@ -10,12 +10,10 @@ import "package:inventree/widget/back.dart";
import "package:inventree/widget/drawer.dart"; import "package:inventree/widget/drawer.dart";
import "package:inventree/widget/search.dart"; import "package:inventree/widget/search.dart";
/* /*
* Simple mixin class which defines simple methods for defining widget properties * Simple mixin class which defines simple methods for defining widget properties
*/ */
mixin BaseWidgetProperties { mixin BaseWidgetProperties {
/* /*
* Return a list of appBar actions * Return a list of appBar actions
* By default, no appBar actions are available * By default, no appBar actions are available
@ -23,7 +21,9 @@ mixin BaseWidgetProperties {
List<Widget> appBarActions(BuildContext context) => []; List<Widget> appBarActions(BuildContext context) => [];
// Return a title for the appBar (placeholder) // Return a title for the appBar (placeholder)
String getAppBarTitle() { return "--- app bar ---"; } String getAppBarTitle() {
return "--- app bar ---";
}
// Function to construct a drawer (override if needed) // Function to construct a drawer (override if needed)
Widget getDrawer(BuildContext context) { Widget getDrawer(BuildContext context) {
@ -38,7 +38,6 @@ mixin BaseWidgetProperties {
// Function to construct a body // Function to construct a body
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
// Default implementation is to return a ListView // Default implementation is to return a ListView
// Override getTiles to replace the internal context // Override getTiles to replace the internal context
return ListView( return ListView(
@ -51,7 +50,6 @@ mixin BaseWidgetProperties {
* Construct the top AppBar for this view * Construct the top AppBar for this view
*/ */
AppBar? buildAppBar(BuildContext context, GlobalKey<ScaffoldState> key) { AppBar? buildAppBar(BuildContext context, GlobalKey<ScaffoldState> key) {
List<Widget> tabs = getTabIcons(context); List<Widget> tabs = getTabIcons(context);
return AppBar( return AppBar(
@ -70,8 +68,8 @@ mixin BaseWidgetProperties {
* - Button to access global search * - Button to access global search
* - Button to access barcode scan * - Button to access barcode scan
*/ */
BottomAppBar? buildBottomAppBar(BuildContext context, GlobalKey<ScaffoldState> key) { BottomAppBar? buildBottomAppBar(
BuildContext context, GlobalKey<ScaffoldState> key) {
const double iconSize = 40; const double iconSize = 40;
List<Widget> icons = [ List<Widget> icons = [
@ -89,12 +87,8 @@ mixin BaseWidgetProperties {
iconSize: iconSize, iconSize: iconSize,
onPressed: () { onPressed: () {
if (InvenTreeAPI().checkConnection()) { if (InvenTreeAPI().checkConnection()) {
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (context) => SearchWidget(true)));
MaterialPageRoute(
builder: (context) => SearchWidget(true)
)
);
} }
}, },
), ),
@ -125,9 +119,7 @@ mixin BaseWidgetProperties {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: icons, children: icons,
) )));
)
);
} }
/* /*
@ -146,7 +138,6 @@ mixin BaseWidgetProperties {
* Build out action buttons for a given widget * Build out action buttons for a given widget
*/ */
Widget? buildSpeedDial(BuildContext context) { Widget? buildSpeedDial(BuildContext context) {
final actions = actionButtons(context); final actions = actionButtons(context);
final barcodeActions = barcodeButtons(context); final barcodeActions = barcodeButtons(context);
@ -157,29 +148,25 @@ mixin BaseWidgetProperties {
List<Widget> children = []; List<Widget> children = [];
if (barcodeActions.isNotEmpty) { if (barcodeActions.isNotEmpty) {
children.add( children.add(SpeedDial(
SpeedDial(
icon: Icons.qr_code_scanner, icon: Icons.qr_code_scanner,
activeIcon: Icons.close, activeIcon: Icons.close,
children: barcodeActions, children: barcodeActions,
spacing: 14, spacing: 14,
childPadding: const EdgeInsets.all(5), childPadding: const EdgeInsets.all(5),
spaceBetweenChildren: 15, spaceBetweenChildren: 15,
) ));
);
} }
if (actions.isNotEmpty) { if (actions.isNotEmpty) {
children.add( children.add(SpeedDial(
SpeedDial(
icon: Icons.more_horiz, icon: Icons.more_horiz,
activeIcon: Icons.close, activeIcon: Icons.close,
children: actions, children: actions,
spacing: 14, spacing: 14,
childPadding: const EdgeInsets.all(5), childPadding: const EdgeInsets.all(5),
spaceBetweenChildren: 15, spaceBetweenChildren: 15,
) ));
);
} }
return Wrap( return Wrap(
@ -191,18 +178,16 @@ mixin BaseWidgetProperties {
// Return list of "tabs" for this widget // Return list of "tabs" for this widget
List<Widget> getTabIcons(BuildContext context) => []; List<Widget> getTabIcons(BuildContext context) => [];
} }
/* /*
* Abstract base class which provides generic "refresh" functionality. * Abstract base class which provides generic "refresh" functionality.
* *
* - Drag down and release to 'refresh' the widget * - Drag down and release to 'refresh' the widget
* - Define some method which runs to 'refresh' the widget state * - Define some method which runs to 'refresh' the widget state
*/ */
abstract class RefreshableState<T extends StatefulWidget> extends State<T> with BaseWidgetProperties { abstract class RefreshableState<T extends StatefulWidget> extends State<T>
with BaseWidgetProperties {
final scaffoldKey = GlobalKey<ScaffoldState>(); final scaffoldKey = GlobalKey<ScaffoldState>();
final refreshKey = GlobalKey<RefreshIndicatorState>(); final refreshKey = GlobalKey<RefreshIndicatorState>();
@ -235,7 +220,6 @@ abstract class RefreshableState<T extends StatefulWidget> extends State<T> with
// Refresh the widget - handler for custom request() method // Refresh the widget - handler for custom request() method
Future<void> refresh(BuildContext context) async { Future<void> refresh(BuildContext context) async {
// Escape if the widget is no longer loaded // Escape if the widget is no longer loaded
if (!mounted) { if (!mounted) {
return; return;
@ -259,13 +243,14 @@ abstract class RefreshableState<T extends StatefulWidget> extends State<T> with
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// Save the context for future use // Save the context for future use
_context = context; _context = context;
List<Widget> tabs = getTabIcons(context); List<Widget> tabs = getTabIcons(context);
Widget body = tabs.isEmpty ? getBody(context) : TabBarView(children: getTabs(context)); Widget body = tabs.isEmpty
? getBody(context)
: TabBarView(children: getTabs(context));
Scaffold view = Scaffold( Scaffold view = Scaffold(
key: scaffoldKey, key: scaffoldKey,
@ -278,12 +263,10 @@ abstract class RefreshableState<T extends StatefulWidget> extends State<T> with
notificationPredicate: (ScrollNotification notification) { notificationPredicate: (ScrollNotification notification) {
return true; return true;
}, },
onRefresh: () async { onRefresh: () async {
refresh(context); refresh(context);
}, },
child: body child: body),
),
bottomNavigationBar: buildBottomAppBar(context, scaffoldKey), bottomNavigationBar: buildBottomAppBar(context, scaffoldKey),
); );

259
lib/widget/search.dart
View File

@ -23,21 +23,17 @@ import "package:inventree/widget/order/sales_order_list.dart";
import "package:inventree/widget/company/company_list.dart"; import "package:inventree/widget/company/company_list.dart";
import "package:inventree/widget/company/supplier_part_list.dart"; import "package:inventree/widget/company/supplier_part_list.dart";
// Widget for performing database-wide search // Widget for performing database-wide search
class SearchWidget extends StatefulWidget { class SearchWidget extends StatefulWidget {
const SearchWidget(this.hasAppbar); const SearchWidget(this.hasAppbar);
final bool hasAppbar; final bool hasAppbar;
@override @override
_SearchDisplayState createState() => _SearchDisplayState(hasAppbar); _SearchDisplayState createState() => _SearchDisplayState(hasAppbar);
} }
class _SearchDisplayState extends RefreshableState<SearchWidget> { class _SearchDisplayState extends RefreshableState<SearchWidget> {
_SearchDisplayState(this.hasAppBar) : super(); _SearchDisplayState(this.hasAppBar) : super();
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
@ -80,7 +76,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
* Determine if the search is still running * Determine if the search is still running
*/ */
bool isSearching() { bool isSearching() {
if (searchController.text.isEmpty) { if (searchController.text.isEmpty) {
return false; return false;
} }
@ -128,7 +123,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Callback when the text is being edited // Callback when the text is being edited
// Incorporates a debounce timer to restrict search frequency // Incorporates a debounce timer to restrict search frequency
void onSearchTextChanged(String text, {bool immediate = false}) { void onSearchTextChanged(String text, {bool immediate = false}) {
if (debounceTimer?.isActive ?? false) { if (debounceTimer?.isActive ?? false) {
debounceTimer!.cancel(); debounceTimer!.cancel();
} }
@ -151,8 +145,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
* } * }
* } * }
*/ */
int getSearchResultCount(Map <String, dynamic> results, String key) { int getSearchResultCount(Map<String, dynamic> results, String key) {
dynamic result = results[key]; dynamic result = results[key];
if (result == null || result is! Map) { if (result == null || result is! Map) {
@ -170,16 +163,13 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Actually perform the search query // Actually perform the search query
Future<void> _perform_search(Map<String, dynamic> body) async { Future<void> _perform_search(Map<String, dynamic> body) async {
InvenTreeAPI().post( InvenTreeAPI()
"search/", .post("search/", body: body, expectedStatusCode: 200)
body: body, .then((APIResponse response) {
expectedStatusCode: 200).then((APIResponse response) {
String searchTerm = (body["search"] ?? "").toString(); String searchTerm = (body["search"] ?? "").toString();
// Only update if the results correspond to the current search term // Only update if the results correspond to the current search term
if (searchTerm == searchController.text && mounted) { if (searchTerm == searchController.text && mounted) {
decrementPendingSearches(); decrementPendingSearches();
Map<String, dynamic> results = {}; Map<String, dynamic> results = {};
@ -188,19 +178,29 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
results = response.data as Map<String, dynamic>; results = response.data as Map<String, dynamic>;
setState(() { setState(() {
nPartResults = getSearchResultCount(results, InvenTreePart.MODEL_TYPE); nPartResults =
nCategoryResults = getSearchResultCount(results, InvenTreePartCategory.MODEL_TYPE); getSearchResultCount(results, InvenTreePart.MODEL_TYPE);
nStockResults = getSearchResultCount(results, InvenTreeStockItem.MODEL_TYPE); nCategoryResults =
nLocationResults = getSearchResultCount(results, InvenTreeStockLocation.MODEL_TYPE); getSearchResultCount(results, InvenTreePartCategory.MODEL_TYPE);
nPurchaseOrderResults = getSearchResultCount(results, InvenTreePurchaseOrder.MODEL_TYPE); nStockResults =
nSalesOrderResults = getSearchResultCount(results, InvenTreeSalesOrder.MODEL_TYPE); getSearchResultCount(results, InvenTreeStockItem.MODEL_TYPE);
nSupplierPartResults = getSearchResultCount(results, InvenTreeSupplierPart.MODEL_TYPE); nLocationResults = getSearchResultCount(
nManufacturerPartResults = getSearchResultCount(results, InvenTreeManufacturerPart.MODEL_TYPE); results, InvenTreeStockLocation.MODEL_TYPE);
nCompanyResults = getSearchResultCount(results, InvenTreeCompany.MODEL_TYPE); nPurchaseOrderResults = getSearchResultCount(
results, InvenTreePurchaseOrder.MODEL_TYPE);
nSalesOrderResults =
getSearchResultCount(results, InvenTreeSalesOrder.MODEL_TYPE);
nSupplierPartResults =
getSearchResultCount(results, InvenTreeSupplierPart.MODEL_TYPE);
nManufacturerPartResults = getSearchResultCount(
results, InvenTreeManufacturerPart.MODEL_TYPE);
nCompanyResults =
getSearchResultCount(results, InvenTreeCompany.MODEL_TYPE);
// Special case for company search results // Special case for company search results
nCustomerResults = getSearchResultCount(results, "customer"); nCustomerResults = getSearchResultCount(results, "customer");
nManufacturerResults = getSearchResultCount(results, "manufacturer"); nManufacturerResults =
getSearchResultCount(results, "manufacturer");
nSupplierResults = getSearchResultCount(results, "supplier"); nSupplierResults = getSearchResultCount(results, "supplier");
}); });
} else { } else {
@ -237,11 +237,9 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Consolidated search allows us to perform *all* searches in a single query // Consolidated search allows us to perform *all* searches in a single query
if (api.supportsConsolidatedSearch) { if (api.supportsConsolidatedSearch) {
Map<String, dynamic> body = { Map<String, dynamic> body = {
"limit": 1, "limit": 1,
"search": term, "search": term,
InvenTreePart.MODEL_TYPE: {}, InvenTreePart.MODEL_TYPE: {},
InvenTreePartCategory.MODEL_TYPE: {}, InvenTreePartCategory.MODEL_TYPE: {},
InvenTreeStockItem.MODEL_TYPE: {}, InvenTreeStockItem.MODEL_TYPE: {},
@ -262,7 +260,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
} }
if (body.isNotEmpty) { if (body.isNotEmpty) {
if (mounted) { if (mounted) {
setState(() { setState(() {
nPendingSearches = 1; nPendingSearches = 1;
@ -272,7 +269,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
_perform_search(body), _perform_search(body),
); );
} }
} }
} else { } else {
legacySearch(term); legacySearch(term);
@ -283,7 +279,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
* Perform "legacy" search (without consolidated search API endpoint * Perform "legacy" search (without consolidated search API endpoint
*/ */
Future<void> legacySearch(String term) async { Future<void> legacySearch(String term) async {
// Search parts // Search parts
if (InvenTreePart().canView) { if (InvenTreePart().canView) {
nPendingSearches++; nPendingSearches++;
@ -302,7 +297,11 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Search part categories // Search part categories
if (InvenTreePartCategory().canView) { if (InvenTreePartCategory().canView) {
nPendingSearches++; nPendingSearches++;
InvenTreePartCategory().count(searchQuery: term,).then((int n) { InvenTreePartCategory()
.count(
searchQuery: term,
)
.then((int n) {
if (term == searchController.text) { if (term == searchController.text) {
if (mounted) { if (mounted) {
decrementPendingSearches(); decrementPendingSearches();
@ -348,11 +347,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
if (InvenTreePurchaseOrder().canView) { if (InvenTreePurchaseOrder().canView) {
nPendingSearches++; nPendingSearches++;
InvenTreePurchaseOrder().count( InvenTreePurchaseOrder().count(
searchQuery: term, searchQuery: term, filters: {"outstanding": "true"}).then((int n) {
filters: {
"outstanding": "true"
}
).then((int n) {
if (term == searchController.text) { if (term == searchController.text) {
if (mounted) { if (mounted) {
decrementPendingSearches(); decrementPendingSearches();
@ -367,12 +362,10 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
@override @override
List<Widget> getTiles(BuildContext context) { List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
// Search input // Search input
tiles.add( tiles.add(ListTile(
ListTile(
title: TextFormField( title: TextFormField(
decoration: InputDecoration( decoration: InputDecoration(
hintText: L10().queryEmpty, hintText: L10().queryEmpty,
@ -385,12 +378,13 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
onChanged: (String text) { onChanged: (String text) {
onSearchTextChanged(text); onSearchTextChanged(text);
}, },
onFieldSubmitted: (String text) { onFieldSubmitted: (String text) {},
},
), ),
trailing: GestureDetector( trailing: GestureDetector(
child: Icon( child: Icon(
searchController.text.isEmpty ? TablerIcons.search : TablerIcons.backspace, searchController.text.isEmpty
? TablerIcons.search
: TablerIcons.backspace,
color: searchController.text.isEmpty ? COLOR_ACTION : COLOR_DANGER, color: searchController.text.isEmpty ? COLOR_ACTION : COLOR_DANGER,
), ),
onTap: () { onTap: () {
@ -398,9 +392,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
onSearchTextChanged("", immediate: true); onSearchTextChanged("", immediate: true);
}, },
), ),
) ));
);
String query = searchController.text; String query = searchController.text;
@ -408,8 +400,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Part Results // Part Results
if (nPartResults > 0) { if (nPartResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().parts), title: Text(L10().parts),
leading: Icon(TablerIcons.box), leading: Icon(TablerIcons.box),
trailing: Text("${nPartResults}"), trailing: Text("${nPartResults}"),
@ -417,22 +408,14 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PartList( builder: (context) =>
{ PartList({"original_search": query})));
"original_search": query }));
}
)
)
);
}
)
);
} }
// Part Category Results // Part Category Results
if (nCategoryResults > 0) { if (nCategoryResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().partCategories), title: Text(L10().partCategories),
leading: Icon(TablerIcons.sitemap), leading: Icon(TablerIcons.sitemap),
trailing: Text("${nCategoryResults}"), trailing: Text("${nCategoryResults}"),
@ -440,22 +423,15 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PartCategoryList( builder: (context) =>
{ PartCategoryList({"original_search": query})));
"original_search": query
}
)
)
);
}, },
) ));
);
} }
// Stock Item Results // Stock Item Results
if (nStockResults > 0) { if (nStockResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().stockItems), title: Text(L10().stockItems),
leading: Icon(TablerIcons.package), leading: Icon(TablerIcons.package),
trailing: Text("${nStockResults}"), trailing: Text("${nStockResults}"),
@ -463,22 +439,16 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => StockItemList( builder: (context) => StockItemList({
{
"original_search": query, "original_search": query,
} })));
)
)
);
}, },
) ));
);
} }
// Stock location results // Stock location results
if (nLocationResults > 0) { if (nLocationResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().stockLocations), title: Text(L10().stockLocations),
leading: Icon(TablerIcons.location), leading: Icon(TablerIcons.location),
trailing: Text("${nLocationResults}"), trailing: Text("${nLocationResults}"),
@ -486,22 +456,15 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => StockLocationList( builder: (context) =>
{ StockLocationList({"original_search": query})));
"original_search": query
}
)
)
);
}, },
) ));
);
} }
// Purchase orders // Purchase orders
if (nPurchaseOrderResults > 0) { if (nPurchaseOrderResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().purchaseOrders), title: Text(L10().purchaseOrders),
leading: Icon(TablerIcons.shopping_cart), leading: Icon(TablerIcons.shopping_cart),
trailing: Text("${nPurchaseOrderResults}"), trailing: Text("${nPurchaseOrderResults}"),
@ -510,21 +473,14 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget( builder: (context) => PurchaseOrderListWidget(
filters: { filters: {"original_search": query})));
"original_search": query
}
)
)
);
}, },
) ));
);
} }
// Sales orders // Sales orders
if (nSalesOrderResults > 0) { if (nSalesOrderResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().salesOrders), title: Text(L10().salesOrders),
leading: Icon(TablerIcons.shopping_cart), leading: Icon(TablerIcons.shopping_cart),
trailing: Text("${nSalesOrderResults}"), trailing: Text("${nSalesOrderResults}"),
@ -533,21 +489,14 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SalesOrderListWidget( builder: (context) => SalesOrderListWidget(
filters: { filters: {"original_search": query})));
"original_search": query
}
)
)
);
}, },
) ));
);
} }
// Company results // Company results
if (nCompanyResults > 0) { if (nCompanyResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().companies), title: Text(L10().companies),
leading: Icon(TablerIcons.building), leading: Icon(TablerIcons.building),
trailing: Text("${nCompanyResults}"), trailing: Text("${nCompanyResults}"),
@ -556,22 +505,14 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => CompanyListWidget( builder: (context) => CompanyListWidget(
L10().companies, L10().companies, {"original_search": query})));
{
"original_search": query
}
)
)
);
}, },
) ));
);
} }
// Customer results // Customer results
if (nCustomerResults > 0) { if (nCustomerResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().customers), title: Text(L10().customers),
leading: Icon(TablerIcons.building_store), leading: Icon(TablerIcons.building_store),
trailing: Text("${nCustomerResults}"), trailing: Text("${nCustomerResults}"),
@ -579,24 +520,15 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => CompanyListWidget( builder: (context) => CompanyListWidget(L10().customers,
L10().customers, {"original_search": query, "is_customer": "true"})));
{
"original_search": query,
"is_customer": "true"
}
)
)
);
}, },
) ));
);
} }
// Manufacturer results // Manufacturer results
if (nManufacturerResults > 0) { if (nManufacturerResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().manufacturers), title: Text(L10().manufacturers),
leading: Icon(TablerIcons.building_factory_2), leading: Icon(TablerIcons.building_factory_2),
trailing: Text("${nManufacturerResults}"), trailing: Text("${nManufacturerResults}"),
@ -604,24 +536,15 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => CompanyListWidget( builder: (context) => CompanyListWidget(L10().manufacturers,
L10().manufacturers, {"original_search": query, "is_manufacturer": "true"})));
{
"original_search": query,
"is_manufacturer": "true"
}
)
)
);
}, },
) ));
);
} }
// Supplier results // Supplier results
if (nSupplierResults > 0) { if (nSupplierResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().suppliers), title: Text(L10().suppliers),
leading: Icon(TablerIcons.building_store), leading: Icon(TablerIcons.building_store),
trailing: Text("${nSupplierResults}"), trailing: Text("${nSupplierResults}"),
@ -629,24 +552,15 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => CompanyListWidget( builder: (context) => CompanyListWidget(L10().suppliers,
L10().suppliers, {"original_search": query, "is_supplier": "true"})));
{
"original_search": query,
"is_supplier": "true"
}
)
)
);
}, },
) ));
);
} }
// Supplier part results // Supplier part results
if (nSupplierPartResults > 0) { if (nSupplierPartResults > 0) {
results.add( results.add(ListTile(
ListTile(
title: Text(L10().supplierParts), title: Text(L10().supplierParts),
leading: Icon(TablerIcons.box), leading: Icon(TablerIcons.box),
trailing: Text("${nSupplierPartResults}"), trailing: Text("${nSupplierPartResults}"),
@ -654,38 +568,28 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => SupplierPartList( builder: (context) =>
{ SupplierPartList({"original_search": query})));
"original_search": query
}
)
)
);
}, },
) ));
);
} }
if (isSearching()) { if (isSearching()) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().searching), title: Text(L10().searching),
leading: Icon(TablerIcons.search), leading: Icon(TablerIcons.search),
trailing: CircularProgressIndicator(), trailing: CircularProgressIndicator(),
) ));
);
} }
if (!isSearching() && results.isEmpty && searchController.text.isNotEmpty) { if (!isSearching() && results.isEmpty && searchController.text.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text( title: Text(
L10().queryNoResults, L10().queryNoResults,
style: TextStyle(fontStyle: FontStyle.italic), style: TextStyle(fontStyle: FontStyle.italic),
), ),
leading: Icon(TablerIcons.zoom_cancel), leading: Icon(TablerIcons.zoom_cancel),
) ));
);
} else { } else {
for (Widget result in results) { for (Widget result in results) {
tiles.add(result); tiles.add(result);
@ -694,5 +598,4 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
return tiles; return tiles;
} }
} }

23
lib/widget/snacks.dart
View File

@ -8,8 +8,8 @@ import "package:inventree/l10.dart";
/* /*
* Display a configurable 'snackbar' at the bottom of the screen * Display a configurable 'snackbar' at the bottom of the screen
*/ */
void showSnackIcon(String text, {IconData? icon, Function()? onAction, bool? success, String? actionText}) { void showSnackIcon(String text,
{IconData? icon, Function()? onAction, bool? success, String? actionText}) {
debug("showSnackIcon: '${text}'"); debug("showSnackIcon: '${text}'");
// Escape quickly if we do not have context // Escape quickly if we do not have context
@ -34,7 +34,6 @@ void showSnackIcon(String text, {IconData? icon, Function()? onAction, bool? suc
if (icon == null && onAction == null) { if (icon == null && onAction == null) {
icon = TablerIcons.circle_check; icon = TablerIcons.circle_check;
} }
} else if (success != null && success == false) { } else if (success != null && success == false) {
backgroundColor = Colors.deepOrange; backgroundColor = Colors.deepOrange;
@ -54,26 +53,24 @@ void showSnackIcon(String text, {IconData? icon, Function()? onAction, bool? suc
childs.add(Icon(icon)); childs.add(Icon(icon));
} }
OneContext().showSnackBar(builder: (context) => SnackBar( OneContext().showSnackBar(
builder: (context) => SnackBar(
content: GestureDetector( content: GestureDetector(
child: Row( child: Row(children: childs),
children: childs
),
onTap: () { onTap: () {
ScaffoldMessenger.of(context!).hideCurrentSnackBar(); ScaffoldMessenger.of(context!).hideCurrentSnackBar();
}, },
), ),
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
action: onAction == null ? null : SnackBarAction( action: onAction == null
? null
: SnackBarAction(
label: _action, label: _action,
onPressed: () { onPressed: () {
// Immediately dismiss the notification // Immediately dismiss the notification
ScaffoldMessenger.of(context!).hideCurrentSnackBar(); ScaffoldMessenger.of(context!).hideCurrentSnackBar();
onAction(); onAction();
} }),
),
duration: Duration(seconds: onAction == null ? 5 : 10), duration: Duration(seconds: onAction == null ? 5 : 10),
) ));
);
} }

9
lib/widget/spinner.dart
View File

@ -2,7 +2,6 @@ import "package:flutter/material.dart";
import "package:inventree/app_colors.dart"; import "package:inventree/app_colors.dart";
class Spinner extends StatefulWidget { class Spinner extends StatefulWidget {
const Spinner({ const Spinner({
this.color = COLOR_GRAY_LIGHT, this.color = COLOR_GRAY_LIGHT,
Key? key, Key? key,
@ -27,12 +26,8 @@ class _SpinnerState extends State<Spinner> with SingleTickerProviderStateMixin {
_controller = AnimationController( _controller = AnimationController(
vsync: this, vsync: this,
duration: Duration(milliseconds: 2000), duration: Duration(milliseconds: 2000),
) )..repeat();
..repeat(); _child = Icon(widget.icon, color: widget.color);
_child = Icon(
widget.icon,
color: widget.color
);
super.initState(); super.initState();
} }

156
lib/widget/stock/location_display.dart
View File

@ -18,12 +18,10 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/stock/stock_list.dart"; import "package:inventree/widget/stock/stock_list.dart";
import "package:inventree/labels.dart"; import "package:inventree/labels.dart";
/* /*
* Widget for displaying detail view for a single StockLocation instance * Widget for displaying detail view for a single StockLocation instance
*/ */
class LocationDisplayWidget extends StatefulWidget { class LocationDisplayWidget extends StatefulWidget {
LocationDisplayWidget(this.location, {Key? key}) : super(key: key); LocationDisplayWidget(this.location, {Key? key}) : super(key: key);
final InvenTreeStockLocation? location; final InvenTreeStockLocation? location;
@ -35,7 +33,6 @@ class LocationDisplayWidget extends StatefulWidget {
} }
class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> { class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
_LocationDisplayState(this.location); _LocationDisplayState(this.location);
final InvenTreeStockLocation? location; final InvenTreeStockLocation? location;
@ -53,30 +50,23 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
// Add "locate" button // Add "locate" button
if (location != null && api.supportsMixin("locate")) { if (location != null && api.supportsMixin("locate")) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(Icons.travel_explore), icon: Icon(Icons.travel_explore),
tooltip: L10().locateLocation, tooltip: L10().locateLocation,
onPressed: () async { onPressed: () async {
api.locateItemOrLocation(context, location: location!.pk); api.locateItemOrLocation(context, location: location!.pk);
} }));
)
);
} }
// Add "edit" button // Add "edit" button
if (location != null && InvenTreeStockLocation().canEdit) { if (location != null && InvenTreeStockLocation().canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().editLocation, tooltip: L10().editLocation,
onPressed: () { onPressed: () {
_editLocationDialog(context); _editLocationDialog(context);
}));
} }
)
);
}
return actions; return actions;
} }
@ -88,8 +78,7 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
if (location != null) { if (location != null) {
// Scan items into this location // Scan items into this location
if (InvenTreeStockItem().canEdit) { if (InvenTreeStockItem().canEdit) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.qrcode), child: Icon(TablerIcons.qrcode),
label: L10().barcodeScanItem, label: L10().barcodeScanItem,
onTap: () { onTap: () {
@ -99,30 +88,25 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
).then((value) { ).then((value) {
refresh(context); refresh(context);
}); });
} }));
)
);
} }
if (api.supportsBarcodePOReceiveEndpoint) { if (api.supportsBarcodePOReceiveEndpoint) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(Icons.barcode_reader), child: Icon(Icons.barcode_reader),
label: L10().scanReceivedParts, label: L10().scanReceivedParts,
onTap:() async { onTap: () async {
scanBarcode( scanBarcode(
context, context,
handler: POReceiveBarcodeHandler(location: location), handler: POReceiveBarcodeHandler(location: location),
); );
}, },
) ));
);
} }
// Scan this location into another one // Scan this location into another one
if (InvenTreeStockLocation().canEdit) { if (InvenTreeStockLocation().canEdit) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.qrcode), child: Icon(TablerIcons.qrcode),
label: L10().transferStockLocation, label: L10().transferStockLocation,
onTap: () { onTap: () {
@ -132,19 +116,12 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
).then((value) { ).then((value) {
refresh(context); refresh(context);
}); });
} }));
)
);
} }
// Assign or un-assign barcodes // Assign or un-assign barcodes
actions.add( actions.add(customBarcodeAction(context, this, location!.customBarcode,
customBarcodeAction( "stocklocation", location!.pk));
context, this,
location!.customBarcode, "stocklocation",
location!.pk
)
);
} }
return actions; return actions;
@ -156,46 +133,32 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
// Create new location // Create new location
if (InvenTreeStockLocation().canCreate) { if (InvenTreeStockLocation().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.sitemap), child: Icon(TablerIcons.sitemap),
label: L10().locationCreate, label: L10().locationCreate,
onTap: () async { onTap: () async {
_newLocation(context); _newLocation(context);
} }));
)
);
} }
// Create new item // Create new item
if (InvenTreeStockItem().canCreate) { if (InvenTreeStockItem().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.packages), child: Icon(TablerIcons.packages),
label: L10().stockItemCreate, label: L10().stockItemCreate,
onTap: () async { onTap: () async {
_newStockItem(context); _newStockItem(context);
} }));
)
);
} }
if (widget.location != null && labels.isNotEmpty) { if (widget.location != null && labels.isNotEmpty) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.printer), child: Icon(TablerIcons.printer),
label: L10().printLabel, label: L10().printLabel,
onTap: () async { onTap: () async {
selectAndPrintLabel( selectAndPrintLabel(context, labels, widget.location!.pk,
context, "location", "location=${widget.location!.pk}");
labels, }));
widget.location!.pk,
"location",
"location=${widget.location!.pk}"
);
}
)
);
} }
return actions; return actions;
@ -211,14 +174,10 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
return; return;
} }
_loc.editForm( _loc.editForm(context, L10().editLocation, onSuccess: (data) async {
context,
L10().editLocation,
onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().locationUpdated, success: true); showSnackIcon(L10().locationUpdated, success: true);
} });
);
} }
@override @override
@ -238,22 +197,20 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
} }
List<Map<String, dynamic>> _labels = []; List<Map<String, dynamic>> _labels = [];
bool allowLabelPrinting = await InvenTreeSettingsManager().getBool(INV_ENABLE_LABEL_PRINTING, true); bool allowLabelPrinting = await InvenTreeSettingsManager()
.getBool(INV_ENABLE_LABEL_PRINTING, true);
allowLabelPrinting &= api.supportsMixin("labels"); allowLabelPrinting &= api.supportsMixin("labels");
if (allowLabelPrinting) { if (allowLabelPrinting) {
if (widget.location != null) { if (widget.location != null) {
String model_type = api.supportsModernLabelPrinting
String model_type = api.supportsModernLabelPrinting ? InvenTreeStockLocation.MODEL_TYPE : "location"; ? InvenTreeStockLocation.MODEL_TYPE
String item_key = api.supportsModernLabelPrinting ? "items" : "location"; : "location";
String item_key =
api.supportsModernLabelPrinting ? "items" : "location";
_labels = await getLabelTemplates( _labels = await getLabelTemplates(
model_type, model_type, {item_key: widget.location!.pk.toString()});
{
item_key: widget.location!.pk.toString()
}
);
} }
} }
@ -267,28 +224,22 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
Future<void> _newLocation(BuildContext context) async { Future<void> _newLocation(BuildContext context) async {
int pk = location?.pk ?? -1; int pk = location?.pk ?? -1;
InvenTreeStockLocation().createForm( InvenTreeStockLocation().createForm(context, L10().locationCreate, data: {
context,
L10().locationCreate,
data: {
"parent": (pk > 0) ? pk : null, "parent": (pk > 0) ? pk : null,
}, }, onSuccess: (result) async {
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var loc = InvenTreeStockLocation.fromJson(data); var loc = InvenTreeStockLocation.fromJson(data);
loc.goToDetailPage(context); loc.goToDetailPage(context);
} }
} });
);
} }
/* /*
* Launch a dialog form to create a new stock item * Launch a dialog form to create a new stock item
*/ */
Future<void> _newStockItem(BuildContext context) async { Future<void> _newStockItem(BuildContext context) async {
var fields = InvenTreeStockItem().formFields(); var fields = InvenTreeStockItem().formFields();
// Serial number field is not required here // Serial number field is not required here
@ -300,45 +251,37 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
data["location"] = location!.pk; data["location"] = location!.pk;
} }
InvenTreeStockItem().createForm( InvenTreeStockItem().createForm(context, L10().stockItemCreate,
context, data: data, fields: fields, onSuccess: (result) async {
L10().stockItemCreate,
data: data,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>; Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) { if (data.containsKey("pk")) {
var item = InvenTreeStockItem.fromJson(data); var item = InvenTreeStockItem.fromJson(data);
item.goToDetailPage(context); item.goToDetailPage(context);
} }
} });
);
} }
Widget locationDescriptionCard({bool includeActions = true}) { Widget locationDescriptionCard({bool includeActions = true}) {
if (location == null) { if (location == null) {
return Card( return Card(
child: ListTile( child: ListTile(
title: Text( title: Text(L10().stockTopLevel,
L10().stockTopLevel, style: TextStyle(fontStyle: FontStyle.italic)),
style: TextStyle(fontStyle: FontStyle.italic)
),
leading: Icon(TablerIcons.packages), leading: Icon(TablerIcons.packages),
) ));
);
} else { } else {
List<Widget> children = [ List<Widget> children = [
ListTile( ListTile(
title: Text("${location!.name}"), title: Text("${location!.name}"),
subtitle: Text("${location!.description}"), subtitle: Text("${location!.description}"),
leading: location!.customIcon == null ? Icon(TablerIcons.packages) : Icon(location!.customIcon) leading: location!.customIcon == null
), ? Icon(TablerIcons.packages)
: Icon(location!.customIcon)),
]; ];
if (includeActions) { if (includeActions) {
children.add( children.add(ListTile(
ListTile(
title: Text(L10().parentLocation), title: Text(L10().parentLocation),
subtitle: Text("${location!.parentPathString}"), subtitle: Text("${location!.parentPathString}"),
leading: Icon(TablerIcons.arrow_move_up, color: COLOR_ACTION), leading: Icon(TablerIcons.arrow_move_up, color: COLOR_ACTION),
@ -346,7 +289,9 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
int parentId = location?.parentId ?? -1; int parentId = location?.parentId ?? -1;
if (parentId < 0) { if (parentId < 0) {
Navigator.push(context, MaterialPageRoute( Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LocationDisplayWidget(null))); builder: (context) => LocationDisplayWidget(null)));
} else { } else {
showLoadingOverlay(); showLoadingOverlay();
@ -358,15 +303,13 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
} }
} }
}, },
) ));
);
} }
return Card( return Card(
child: Column( child: Column(
children: children, children: children,
) ));
);
} }
} }
@ -388,7 +331,6 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
// Construct the "details" panel // Construct the "details" panel
List<Widget> detailTiles() { List<Widget> detailTiles() {
Map<String, String> filters = {}; Map<String, String> filters = {};
int? parent = location?.pk; int? parent = location?.pk;

26
lib/widget/stock/location_list.dart
View File

@ -7,9 +7,7 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
class StockLocationList extends StatefulWidget { class StockLocationList extends StatefulWidget {
const StockLocationList(this.filters); const StockLocationList(this.filters);
final Map<String, String> filters; final Map<String, String> filters;
@ -18,9 +16,7 @@ class StockLocationList extends StatefulWidget {
_StockLocationListState createState() => _StockLocationListState(filters); _StockLocationListState createState() => _StockLocationListState(filters);
} }
class _StockLocationListState extends RefreshableState<StockLocationList> { class _StockLocationListState extends RefreshableState<StockLocationList> {
_StockLocationListState(this.filters); _StockLocationListState(this.filters);
final Map<String, String> filters; final Map<String, String> filters;
@ -34,21 +30,21 @@ class _StockLocationListState extends RefreshableState<StockLocationList> {
} }
} }
class PaginatedStockLocationList extends PaginatedSearchWidget { class PaginatedStockLocationList extends PaginatedSearchWidget {
const PaginatedStockLocationList(Map<String, String> filters,
const PaginatedStockLocationList(Map<String, String> filters, {String title = ""}) : super(filters: filters, title: title); {String title = ""})
: super(filters: filters, title: title);
@override @override
String get searchTitle => title.isNotEmpty ? title : L10().stockLocations; String get searchTitle => title.isNotEmpty ? title : L10().stockLocations;
@override @override
_PaginatedStockLocationListState createState() => _PaginatedStockLocationListState(); _PaginatedStockLocationListState createState() =>
_PaginatedStockLocationListState();
} }
class _PaginatedStockLocationListState
class _PaginatedStockLocationListState extends PaginatedSearchState<PaginatedStockLocationList> { extends PaginatedSearchState<PaginatedStockLocationList> {
_PaginatedStockLocationListState() : super(); _PaginatedStockLocationListState() : super();
@override @override
@ -68,16 +64,16 @@ class _PaginatedStockLocationListState extends PaginatedSearchState<PaginatedSto
}; };
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeStockLocation().listPaginated(limit, offset, filters: params); final page = await InvenTreeStockLocation()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeStockLocation location = model as InvenTreeStockLocation; InvenTreeStockLocation location = model as InvenTreeStockLocation;
return ListTile( return ListTile(

402
lib/widget/stock/stock_detail.dart
View File

@ -28,9 +28,7 @@ import "package:inventree/widget/stock/stock_item_history.dart";
import "package:inventree/widget/stock/stock_item_test_results.dart"; import "package:inventree/widget/stock/stock_item_test_results.dart";
import "package:inventree/widget/notes_widget.dart"; import "package:inventree/widget/notes_widget.dart";
class StockDetailWidget extends StatefulWidget { class StockDetailWidget extends StatefulWidget {
const StockDetailWidget(this.item, {Key? key}) : super(key: key); const StockDetailWidget(this.item, {Key? key}) : super(key: key);
final InvenTreeStockItem item; final InvenTreeStockItem item;
@ -39,9 +37,7 @@ class StockDetailWidget extends StatefulWidget {
_StockItemDisplayState createState() => _StockItemDisplayState(); _StockItemDisplayState createState() => _StockItemDisplayState();
} }
class _StockItemDisplayState extends RefreshableState<StockDetailWidget> { class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
_StockItemDisplayState(); _StockItemDisplayState();
@override @override
@ -61,27 +57,21 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
List<Widget> actions = []; List<Widget> actions = [];
if (api.supportsMixin("locate")) { if (api.supportsMixin("locate")) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(Icons.travel_explore), icon: Icon(Icons.travel_explore),
tooltip: L10().locateItem, tooltip: L10().locateItem,
onPressed: () async { onPressed: () async {
api.locateItemOrLocation(context, item: widget.item.pk); api.locateItemOrLocation(context, item: widget.item.pk);
} }));
)
);
} }
if (widget.item.canEdit) { if (widget.item.canEdit) {
actions.add( actions.add(IconButton(
IconButton(
icon: Icon(TablerIcons.edit), icon: Icon(TablerIcons.edit),
tooltip: L10().editItem, tooltip: L10().editItem,
onPressed: () { onPressed: () {
_editStockItem(context); _editStockItem(context);
} }));
)
);
} }
return actions; return actions;
@ -89,79 +79,56 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
@override @override
List<SpeedDialChild> actionButtons(BuildContext context) { List<SpeedDialChild> actionButtons(BuildContext context) {
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (widget.item.canEdit) { if (widget.item.canEdit) {
// Stock adjustment actions available if item is *not* serialized // Stock adjustment actions available if item is *not* serialized
if (!widget.item.isSerialized()) { if (!widget.item.isSerialized()) {
actions.add(SpeedDialChild(
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_check, color: Colors.blue), child: Icon(TablerIcons.circle_check, color: Colors.blue),
label: L10().countStock, label: L10().countStock,
onTap: _countStockDialog, onTap: _countStockDialog,
) ));
);
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_minus, color: Colors.red), child: Icon(TablerIcons.circle_minus, color: Colors.red),
label: L10().removeStock, label: L10().removeStock,
onTap: _removeStockDialog, onTap: _removeStockDialog,
) ));
);
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green), child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().addStock, label: L10().addStock,
onTap: _addStockDialog, onTap: _addStockDialog,
) ));
);
} }
// Transfer item // Transfer item
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.transfer), child: Icon(TablerIcons.transfer),
label: L10().transferStock, label: L10().transferStock,
onTap: () { onTap: () {
_transferStockDialog(context); _transferStockDialog(context);
} }));
)
);
} }
if (labels.isNotEmpty) { if (labels.isNotEmpty) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.printer), child: Icon(TablerIcons.printer),
label: L10().printLabel, label: L10().printLabel,
onTap: () async { onTap: () async {
selectAndPrintLabel( selectAndPrintLabel(context, labels, widget.item.pk, "stock",
context, "item=${widget.item.pk}");
labels, }));
widget.item.pk,
"stock",
"item=${widget.item.pk}"
);
}
)
);
} }
if (widget.item.canDelete) { if (widget.item.canDelete) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.trash, color: Colors.red), child: Icon(TablerIcons.trash, color: Colors.red),
label: L10().stockItemDelete, label: L10().stockItemDelete,
onTap: () { onTap: () {
_deleteItem(context); _deleteItem(context);
} }));
)
);
} }
return actions; return actions;
@ -173,28 +140,19 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
if (widget.item.canEdit) { if (widget.item.canEdit) {
// Scan item into location // Scan item into location
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(Icons.qr_code_scanner), child: Icon(Icons.qr_code_scanner),
label: L10().scanIntoLocation, label: L10().scanIntoLocation,
onTap: () { onTap: () {
scanBarcode( scanBarcode(context,
context, handler: StockItemScanIntoLocationHandler(widget.item))
handler: StockItemScanIntoLocationHandler(widget.item) .then((ctx) {
).then((ctx) {
refresh(context); refresh(context);
}); });
} }));
)
);
actions.add( actions.add(customBarcodeAction(context, this, widget.item.customBarcode,
customBarcodeAction( "stockitem", widget.item.pk));
context, this,
widget.item.customBarcode,
"stockitem", widget.item.pk
)
);
} }
return actions; return actions;
@ -217,8 +175,10 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
@override @override
Future<void> request(BuildContext context) async { Future<void> request(BuildContext context) async {
await api.StockStatus.load(); await api.StockStatus.load();
stockShowHistory = await InvenTreeSettingsManager().getValue(INV_STOCK_SHOW_HISTORY, false) as bool; stockShowHistory = await InvenTreeSettingsManager()
stockShowTests = await InvenTreeSettingsManager().getValue(INV_STOCK_SHOW_TESTS, true) as bool; .getValue(INV_STOCK_SHOW_HISTORY, false) as bool;
stockShowTests = await InvenTreeSettingsManager()
.getValue(INV_STOCK_SHOW_TESTS, true) as bool;
final bool result = widget.item.pk > 0 && await widget.item.reload(); final bool result = widget.item.pk > 0 && await widget.item.reload();
@ -238,7 +198,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
// Request test results (async) // Request test results (async)
if (stockShowTests) { if (stockShowTests) {
widget.item.getTestResults().then((value) { widget.item.getTestResults().then((value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
// Update // Update
@ -248,7 +207,9 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
} }
// Request the number of attachments // Request the number of attachments
InvenTreeStockItemAttachment().countAttachments(widget.item.pk).then((int value) { InvenTreeStockItemAttachment()
.countAttachments(widget.item.pk)
.then((int value) {
if (mounted) { if (mounted) {
setState(() { setState(() {
attachmentCount = value; attachmentCount = value;
@ -259,7 +220,8 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
// Request SalesOrder information // Request SalesOrder information
if (widget.item.hasSalesOrder) { if (widget.item.hasSalesOrder) {
InvenTreeSalesOrder().get(widget.item.salesOrderId).then((instance) => { InvenTreeSalesOrder().get(widget.item.salesOrderId).then((instance) => {
if (mounted) { if (mounted)
{
setState(() { setState(() {
salesOrder = instance as InvenTreeSalesOrder?; salesOrder = instance as InvenTreeSalesOrder?;
}) })
@ -276,7 +238,8 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
// Request Customer information // Request Customer information
if (widget.item.hasCustomer) { if (widget.item.hasCustomer) {
InvenTreeCompany().get(widget.item.customerId).then((instance) => { InvenTreeCompany().get(widget.item.customerId).then((instance) => {
if (mounted) { if (mounted)
{
setState(() { setState(() {
customer = instance as InvenTreeCompany?; customer = instance as InvenTreeCompany?;
}) })
@ -291,22 +254,20 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
} }
List<Map<String, dynamic>> _labels = []; List<Map<String, dynamic>> _labels = [];
bool allowLabelPrinting = await InvenTreeSettingsManager().getBool(INV_ENABLE_LABEL_PRINTING, true); bool allowLabelPrinting = await InvenTreeSettingsManager()
.getBool(INV_ENABLE_LABEL_PRINTING, true);
allowLabelPrinting &= api.supportsMixin("labels"); allowLabelPrinting &= api.supportsMixin("labels");
// Request information on labels available for this stock item // Request information on labels available for this stock item
if (allowLabelPrinting) { if (allowLabelPrinting) {
String model_type = api.supportsModernLabelPrinting
String model_type = api.supportsModernLabelPrinting ? InvenTreeStockItem.MODEL_TYPE : "stock"; ? InvenTreeStockItem.MODEL_TYPE
: "stock";
String item_key = api.supportsModernLabelPrinting ? "items" : "item"; String item_key = api.supportsModernLabelPrinting ? "items" : "item";
// Clear the existing labels list // Clear the existing labels list
_labels = await getLabelTemplates( _labels = await getLabelTemplates(
model_type, model_type, {item_key: widget.item.pk.toString()});
{
item_key: widget.item.pk.toString()
}
);
} }
if (mounted) { if (mounted) {
@ -318,7 +279,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
/// Delete the stock item from the database /// Delete the stock item from the database
Future<void> _deleteItem(BuildContext context) async { Future<void> _deleteItem(BuildContext context) async {
confirmationDialog( confirmationDialog(
L10().stockItemDelete, L10().stockItemDelete,
L10().stockItemDeleteConfirm, L10().stockItemDeleteConfirm,
@ -336,11 +296,9 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
} }
}, },
); );
} }
Future <void> _editStockItem(BuildContext context) async { Future<void> _editStockItem(BuildContext context) async {
var fields = InvenTreeStockItem().formFields(); var fields = InvenTreeStockItem().formFields();
// Some fields we don't want to edit! // Some fields we don't want to edit!
@ -353,23 +311,17 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
fields.remove("serial"); fields.remove("serial");
} }
widget.item.editForm( widget.item.editForm(context, L10().editItem, fields: fields,
context,
L10().editItem,
fields: fields,
onSuccess: (data) async { onSuccess: (data) async {
refresh(context); refresh(context);
showSnackIcon(L10().stockItemUpdated, success: true); showSnackIcon(L10().stockItemUpdated, success: true);
} });
);
} }
/* /*
* Launch a dialog to 'add' quantity to this StockItem * Launch a dialog to 'add' quantity to this StockItem
*/ */
Future <void> _addStockDialog() async { Future<void> _addStockDialog() async {
Map<String, dynamic> fields = { Map<String, dynamic> fields = {
"pk": { "pk": {
"parent": "items", "parent": "items",
@ -386,21 +338,14 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
}; };
launchApiForm( launchApiForm(
context, context, L10().addStock, InvenTreeStockItem.addStockUrl(), fields,
L10().addStock, method: "POST", icon: TablerIcons.circle_plus, onSuccess: (data) async {
InvenTreeStockItem.addStockUrl(),
fields,
method: "POST",
icon: TablerIcons.circle_plus,
onSuccess: (data) async {
_stockUpdateMessage(true); _stockUpdateMessage(true);
refresh(context); refresh(context);
} });
);
} }
void _stockUpdateMessage(bool result) { void _stockUpdateMessage(bool result) {
if (result) { if (result) {
showSnackIcon(L10().stockItemUpdated, success: true); showSnackIcon(L10().stockItemUpdated, success: true);
} }
@ -410,7 +355,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
* Launch a dialog to 'remove' quantity from this StockItem * Launch a dialog to 'remove' quantity from this StockItem
*/ */
void _removeStockDialog() { void _removeStockDialog() {
Map<String, dynamic> fields = { Map<String, dynamic> fields = {
"pk": { "pk": {
"parent": "items", "parent": "items",
@ -427,21 +371,15 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
}; };
launchApiForm( launchApiForm(
context, context, L10().removeStock, InvenTreeStockItem.removeStockUrl(), fields,
L10().removeStock,
InvenTreeStockItem.removeStockUrl(),
fields,
method: "POST", method: "POST",
icon: TablerIcons.circle_minus, icon: TablerIcons.circle_minus, onSuccess: (data) async {
onSuccess: (data) async {
_stockUpdateMessage(true); _stockUpdateMessage(true);
refresh(context); refresh(context);
} });
);
} }
Future <void> _countStockDialog() async { Future<void> _countStockDialog() async {
Map<String, dynamic> fields = { Map<String, dynamic> fields = {
"pk": { "pk": {
"parent": "items", "parent": "items",
@ -458,59 +396,39 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
}; };
launchApiForm( launchApiForm(
context, context, L10().countStock, InvenTreeStockItem.countStockUrl(), fields,
L10().countStock,
InvenTreeStockItem.countStockUrl(),
fields,
method: "POST", method: "POST",
icon: TablerIcons.clipboard_check, icon: TablerIcons.clipboard_check, onSuccess: (data) async {
onSuccess: (data) async {
_stockUpdateMessage(true); _stockUpdateMessage(true);
refresh(context); refresh(context);
} });
);
} }
/* /*
* Launches an API Form to transfer this stock item to a new location * Launches an API Form to transfer this stock item to a new location
*/ */
Future <void> _transferStockDialog(BuildContext context) async { Future<void> _transferStockDialog(BuildContext context) async {
Map<String, dynamic> fields = widget.item.transferFields(); Map<String, dynamic> fields = widget.item.transferFields();
launchApiForm( launchApiForm(context, L10().transferStock,
context, InvenTreeStockItem.transferStockUrl(), fields,
L10().transferStock, method: "POST", icon: TablerIcons.transfer, onSuccess: (data) async {
InvenTreeStockItem.transferStockUrl(),
fields,
method: "POST",
icon: TablerIcons.transfer,
onSuccess: (data) async {
_stockUpdateMessage(true); _stockUpdateMessage(true);
refresh(context); refresh(context);
} });
);
} }
Widget headerTile() { Widget headerTile() {
Widget? trailing; Widget? trailing;
if (!widget.item.isInStock) { if (!widget.item.isInStock) {
trailing = Text( trailing = Text(L10().unavailable, style: TextStyle(color: COLOR_DANGER));
L10().unavailable,
style: TextStyle(
color: COLOR_DANGER
)
);
} else if (!widget.item.isSerialized()) { } else if (!widget.item.isSerialized()) {
trailing = Text( trailing = Text(widget.item.quantityString(),
widget.item.quantityString(),
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
color: api.StockStatus.color(widget.item.status), color: api.StockStatus.color(widget.item.status),
) ));
);
} }
return Card( return Card(
@ -521,7 +439,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
trailing: trailing, trailing: trailing,
onTap: () async { onTap: () async {
if (widget.item.partId > 0) { if (widget.item.partId > 0) {
showLoadingOverlay(); showLoadingOverlay();
var part = await InvenTreePart().get(widget.item.partId); var part = await InvenTreePart().get(widget.item.partId);
hideLoadingOverlay(); hideLoadingOverlay();
@ -532,8 +449,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
} }
}, },
//trailing: Text(item.serialOrQuantityDisplay()), //trailing: Text(item.serialOrQuantityDisplay()),
) ));
);
} }
/* /*
@ -564,9 +480,9 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
), ),
onTap: () async { onTap: () async {
if (widget.item.locationId > 0) { if (widget.item.locationId > 0) {
showLoadingOverlay(); showLoadingOverlay();
var loc = await InvenTreeStockLocation().get(widget.item.locationId); var loc =
await InvenTreeStockLocation().get(widget.item.locationId);
hideLoadingOverlay(); hideLoadingOverlay();
if (loc is InvenTreeStockLocation) { if (loc is InvenTreeStockLocation) {
@ -577,37 +493,32 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
), ),
); );
} else { } else {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().stockLocation), title: Text(L10().stockLocation),
leading: Icon(TablerIcons.location), leading: Icon(TablerIcons.location),
subtitle: Text(L10().locationNotSet), subtitle: Text(L10().locationNotSet),
) ));
);
} }
// Quantity information // Quantity information
if (widget.item.isSerialized()) { if (widget.item.isSerialized()) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().serialNumber), title: Text(L10().serialNumber),
leading: Icon(TablerIcons.hash), leading: Icon(TablerIcons.hash),
subtitle: Text("${widget.item.serialNumber}"), subtitle: Text("${widget.item.serialNumber}"),
) ));
);
} else if (widget.item.isInStock) { } else if (widget.item.isInStock) {
tiles.add( tiles.add(ListTile(
ListTile( title: widget.item.allocated > 0
title: widget.item.allocated > 0 ? Text(L10().quantityAvailable) : Text(L10().quantity), ? Text(L10().quantityAvailable)
: Text(L10().quantity),
leading: Icon(TablerIcons.packages), leading: Icon(TablerIcons.packages),
trailing: Text("${widget.item.quantityString()}"), trailing: Text("${widget.item.quantityString()}"),
) ));
);
} }
if (!widget.item.isInStock) { if (!widget.item.isInStock) {
tiles.add( tiles.add(ListTile(
ListTile(
leading: Icon(TablerIcons.box_off), leading: Icon(TablerIcons.box_off),
title: Text( title: Text(
L10().unavailable, L10().unavailable,
@ -616,84 +527,65 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
subtitle: Text( subtitle: Text(L10().unavailableDetail,
L10().unavailableDetail, style: TextStyle(color: COLOR_DANGER))));
style: TextStyle(
color: COLOR_DANGER
)
)
)
);
} }
// Stock item status information // Stock item status information
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().status), title: Text(L10().status),
leading: Icon(TablerIcons.help_circle), leading: Icon(TablerIcons.help_circle),
trailing: Text( trailing: Text(api.StockStatus.label(widget.item.status),
api.StockStatus.label(widget.item.status),
style: TextStyle( style: TextStyle(
color: api.StockStatus.color(widget.item.status), color: api.StockStatus.color(widget.item.status),
) ))));
)
)
);
// Supplier part information (if available) // Supplier part information (if available)
if (widget.item.supplierPartId > 0) { if (widget.item.supplierPartId > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().supplierPart), title: Text(L10().supplierPart),
subtitle: Text(widget.item.supplierSKU), subtitle: Text(widget.item.supplierSKU),
leading: Icon(TablerIcons.building, color: COLOR_ACTION), leading: Icon(TablerIcons.building, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.item.supplierImage, hideIfNull: true), trailing: InvenTreeAPI()
.getThumbnail(widget.item.supplierImage, hideIfNull: true),
onTap: () async { onTap: () async {
showLoadingOverlay(); showLoadingOverlay();
var sp = await InvenTreeSupplierPart().get( var sp =
widget.item.supplierPartId); await InvenTreeSupplierPart().get(widget.item.supplierPartId);
hideLoadingOverlay(); hideLoadingOverlay();
if (sp is InvenTreeSupplierPart) { if (sp is InvenTreeSupplierPart) {
Navigator.push( Navigator.push(
context, MaterialPageRoute( context,
builder: (context) => SupplierPartDetailWidget(sp)) MaterialPageRoute(
); builder: (context) => SupplierPartDetailWidget(sp)));
} }
} }));
)
);
} }
if (widget.item.isBuilding) { if (widget.item.isBuilding) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().inProduction), title: Text(L10().inProduction),
leading: Icon(TablerIcons.tools), leading: Icon(TablerIcons.tools),
subtitle: Text(L10().inProductionDetail), subtitle: Text(L10().inProductionDetail),
onTap: () { onTap: () {
// TODO: Click through to the "build order" // TODO: Click through to the "build order"
}, },
) ));
);
} }
if (widget.item.hasSalesOrder && salesOrder != null) { if (widget.item.hasSalesOrder && salesOrder != null) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().salesOrder), title: Text(L10().salesOrder),
subtitle: Text(salesOrder?.description ?? ""), subtitle: Text(salesOrder?.description ?? ""),
leading: Icon(TablerIcons.truck_delivery, color: COLOR_ACTION), leading: Icon(TablerIcons.truck_delivery, color: COLOR_ACTION),
trailing: Text(salesOrder?.reference ?? ""), trailing: Text(salesOrder?.reference ?? ""),
onTap: () { onTap: () {
salesOrder?.goToDetailPage(context); salesOrder?.goToDetailPage(context);
} }));
)
);
} }
if (widget.item.hasCustomer && customer != null) { if (widget.item.hasCustomer && customer != null) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().customer), title: Text(L10().customer),
subtitle: Text(customer?.description ?? ""), subtitle: Text(customer?.description ?? ""),
leading: Icon(TablerIcons.building_store, color: COLOR_ACTION), leading: Icon(TablerIcons.building_store, color: COLOR_ACTION),
@ -701,88 +593,72 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onTap: () { onTap: () {
customer?.goToDetailPage(context); customer?.goToDetailPage(context);
}, },
) ));
);
} }
if (widget.item.batch.isNotEmpty) { if (widget.item.batch.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().batchCode), title: Text(L10().batchCode),
subtitle: Text(widget.item.batch), subtitle: Text(widget.item.batch),
leading: Icon(TablerIcons.clipboard_text), leading: Icon(TablerIcons.clipboard_text),
) ));
);
} }
if (widget.item.packaging.isNotEmpty) { if (widget.item.packaging.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().packaging), title: Text(L10().packaging),
subtitle: Text(widget.item.packaging), subtitle: Text(widget.item.packaging),
leading: Icon(TablerIcons.package), leading: Icon(TablerIcons.package),
) ));
);
} }
if (expiryEnabled && widget.item.expiryDate != null) { if (expiryEnabled && widget.item.expiryDate != null) {
Widget? _expiryIcon; Widget? _expiryIcon;
if (widget.item.expired) { if (widget.item.expired) {
_expiryIcon = Text(L10().expiryExpired, style: TextStyle(color: COLOR_DANGER)); _expiryIcon =
Text(L10().expiryExpired, style: TextStyle(color: COLOR_DANGER));
} else if (widget.item.stale) { } else if (widget.item.stale) {
_expiryIcon = Text(L10().expiryStale, style: TextStyle(color: COLOR_WARNING)); _expiryIcon =
Text(L10().expiryStale, style: TextStyle(color: COLOR_WARNING));
} }
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().expiryDate), title: Text(L10().expiryDate),
subtitle: Text(widget.item.expiryDateString), subtitle: Text(widget.item.expiryDateString),
leading: Icon(TablerIcons.calendar_x), leading: Icon(TablerIcons.calendar_x),
trailing: _expiryIcon, trailing: _expiryIcon,
) ));
);
} }
// Last update? // Last update?
if (widget.item.updatedDateString.isNotEmpty) { if (widget.item.updatedDateString.isNotEmpty) {
tiles.add(ListTile(
tiles.add(
ListTile(
title: Text(L10().lastUpdated), title: Text(L10().lastUpdated),
subtitle: Text(widget.item.updatedDateString), subtitle: Text(widget.item.updatedDateString),
leading: Icon(TablerIcons.calendar) leading: Icon(TablerIcons.calendar)));
)
);
} }
// Stocktake? // Stocktake?
if (widget.item.stocktakeDateString.isNotEmpty) { if (widget.item.stocktakeDateString.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().lastStocktake), title: Text(L10().lastStocktake),
subtitle: Text(widget.item.stocktakeDateString), subtitle: Text(widget.item.stocktakeDateString),
leading: Icon(TablerIcons.calendar) leading: Icon(TablerIcons.calendar)));
)
);
} }
if (widget.item.link.isNotEmpty) { if (widget.item.link.isNotEmpty) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text("${widget.item.link}"), title: Text("${widget.item.link}"),
leading: Icon(TablerIcons.link, color: COLOR_ACTION), leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () { onTap: () {
widget.item.openLink(); widget.item.openLink();
}, },
) ));
);
} }
if (stockShowTests || (widget.item.testResultCount > 0)) { if (stockShowTests || (widget.item.testResultCount > 0)) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().testResults), title: Text(L10().testResults),
leading: Icon(TablerIcons.list_check, color: COLOR_ACTION), leading: Icon(TablerIcons.list_check, color: COLOR_ACTION),
trailing: Text("${widget.item.testResultCount}"), trailing: Text("${widget.item.testResultCount}"),
@ -790,32 +666,25 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => StockItemTestResultsWidget(widget.item)) builder: (context) =>
).then((ctx) { StockItemTestResultsWidget(widget.item))).then((ctx) {
refresh(context); refresh(context);
}); });
} }));
)
);
} }
if (widget.item.hasPurchasePrice) { if (widget.item.hasPurchasePrice) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().purchasePrice), title: Text(L10().purchasePrice),
leading: Icon(TablerIcons.currency_dollar), leading: Icon(TablerIcons.currency_dollar),
trailing: Text( trailing: Text(renderCurrency(
renderCurrency(widget.item.purchasePrice, widget.item.purchasePriceCurrency) widget.item.purchasePrice, widget.item.purchasePriceCurrency))));
)
)
);
} }
// TODO - Is this stock item linked to a PurchaseOrder? // TODO - Is this stock item linked to a PurchaseOrder?
if (stockShowHistory && widget.item.trackingItemCount > 0) { if (stockShowHistory && widget.item.trackingItemCount > 0) {
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().history), title: Text(L10().history),
leading: Icon(TablerIcons.history, color: COLOR_ACTION), leading: Icon(TablerIcons.history, color: COLOR_ACTION),
trailing: Text("${widget.item.trackingItemCount}"), trailing: Text("${widget.item.trackingItemCount}"),
@ -823,31 +692,26 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => StockItemHistoryWidget(widget.item)) builder: (context) =>
).then((ctx) { StockItemHistoryWidget(widget.item))).then((ctx) {
refresh(context); refresh(context);
}); });
}, },
) ));
);
} }
// Notes field // Notes field
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().notes), title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION), leading: Icon(TablerIcons.note, color: COLOR_ACTION),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => NotesWidget(widget.item)) MaterialPageRoute(
); builder: (context) => NotesWidget(widget.item)));
} }));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().attachments), title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION), leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null, trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null,
@ -860,14 +724,10 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
widget.item.pk, widget.item.pk,
L10().stockItem, L10().stockItem,
widget.item.canEdit, widget.item.canEdit,
) )));
)
);
}, },
) ));
);
return tiles; return tiles;
} }
} }

13
lib/widget/stock/stock_item_history.dart
View File

@ -14,10 +14,12 @@ class StockItemHistoryWidget extends StatefulWidget {
final InvenTreeStockItem item; final InvenTreeStockItem item;
@override @override
_StockItemHistoryDisplayState createState() => _StockItemHistoryDisplayState(item); _StockItemHistoryDisplayState createState() =>
_StockItemHistoryDisplayState(item);
} }
class _StockItemHistoryDisplayState extends RefreshableState<StockItemHistoryWidget> { class _StockItemHistoryDisplayState
extends RefreshableState<StockItemHistoryWidget> {
_StockItemHistoryDisplayState(this.item); _StockItemHistoryDisplayState(this.item);
final InvenTreeStockItem item; final InvenTreeStockItem item;
@ -36,14 +38,14 @@ class _StockItemHistoryDisplayState extends RefreshableState<StockItemHistoryWid
return PaginatedStockHistoryList(filters); return PaginatedStockHistoryList(filters);
} }
} }
/* /*
* Widget which displays a paginated stock history list * Widget which displays a paginated stock history list
*/ */
class PaginatedStockHistoryList extends PaginatedSearchWidget { class PaginatedStockHistoryList extends PaginatedSearchWidget {
const PaginatedStockHistoryList(Map<String, String> filters) : super(filters: filters); const PaginatedStockHistoryList(Map<String, String> filters)
: super(filters: filters);
@override @override
String get searchTitle => L10().stockItemHistory; String get searchTitle => L10().stockItemHistory;
@ -75,7 +77,8 @@ class _PaginatedStockHistoryState
int limit, int offset, Map<String, String> params) async { int limit, int offset, Map<String, String> params) async {
await InvenTreeAPI().StockHistoryStatus.load(); await InvenTreeAPI().StockHistoryStatus.load();
final page = await InvenTreeStockItemHistory().listPaginated(limit, offset, filters: params); final page = await InvenTreeStockItemHistory()
.listPaginated(limit, offset, filters: params);
return page; return page;
} }

62
lib/widget/stock/stock_item_test_results.dart
View File

@ -13,20 +13,18 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/widget/progress.dart"; import "package:inventree/widget/progress.dart";
import "package:inventree/widget/refreshable_state.dart"; import "package:inventree/widget/refreshable_state.dart";
class StockItemTestResultsWidget extends StatefulWidget { class StockItemTestResultsWidget extends StatefulWidget {
const StockItemTestResultsWidget(this.item, {Key? key}) : super(key: key); const StockItemTestResultsWidget(this.item, {Key? key}) : super(key: key);
final InvenTreeStockItem item; final InvenTreeStockItem item;
@override @override
_StockItemTestResultDisplayState createState() => _StockItemTestResultDisplayState(item); _StockItemTestResultDisplayState createState() =>
_StockItemTestResultDisplayState(item);
} }
class _StockItemTestResultDisplayState
class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestResultsWidget> { extends RefreshableState<StockItemTestResultsWidget> {
_StockItemTestResultDisplayState(this.item); _StockItemTestResultDisplayState(this.item);
@override @override
@ -40,15 +38,12 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
List<SpeedDialChild> actions = []; List<SpeedDialChild> actions = [];
if (InvenTreeStockItemTestResult().canCreate) { if (InvenTreeStockItemTestResult().canCreate) {
actions.add( actions.add(SpeedDialChild(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus), child: Icon(TablerIcons.circle_plus),
label: L10().testResultAdd, label: L10().testResultAdd,
onTap: () { onTap: () {
addTestResult(context); addTestResult(context);
} }));
)
);
} }
return actions; return actions;
@ -62,9 +57,16 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
final InvenTreeStockItem item; final InvenTreeStockItem item;
Future <void> addTestResult(BuildContext context, {int templateId = 0, String name = "", bool nameIsEditable = true, bool result = false, String value = "", bool valueRequired = false, bool attachmentRequired = false}) async { Future<void> addTestResult(BuildContext context,
{int templateId = 0,
Map<String, Map<String, dynamic>> fields = InvenTreeStockItemTestResult().formFields(); String name = "",
bool nameIsEditable = true,
bool result = false,
String value = "",
bool valueRequired = false,
bool attachmentRequired = false}) async {
Map<String, Map<String, dynamic>> fields =
InvenTreeStockItemTestResult().formFields();
// Add additional filters // Add additional filters
fields["template"]?["filters"]?["part"] = "${item.partId}"; fields["template"]?["filters"]?["part"] = "${item.partId}";
@ -102,7 +104,6 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
bool match = false; bool match = false;
for (var ii = 0; ii < outputs.length; ii++) { for (var ii = 0; ii < outputs.length; ii++) {
// Check against templates // Check against templates
if (outputs[ii] is InvenTreePartTestTemplate) { if (outputs[ii] is InvenTreePartTestTemplate) {
var template = outputs[ii] as InvenTreePartTestTemplate; var template = outputs[ii] as InvenTreePartTestTemplate;
@ -137,23 +138,16 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
List<Widget> getTiles(BuildContext context) { List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = []; List<Widget> tiles = [];
tiles.add( tiles.add(Card(
Card(
child: ListTile( child: ListTile(
title: Text(item.partName), title: Text(item.partName),
subtitle: Text(item.partDescription), subtitle: Text(item.partDescription),
leading: InvenTreeAPI().getThumbnail(item.partImage), leading: InvenTreeAPI().getThumbnail(item.partImage),
) )));
)
);
tiles.add( tiles.add(ListTile(
ListTile(
title: Text(L10().testResults, title: Text(L10().testResults,
style: TextStyle(fontWeight: FontWeight.bold) style: TextStyle(fontWeight: FontWeight.bold))));
)
)
);
if (loading) { if (loading) {
tiles.add(progressIndicator()); tiles.add(progressIndicator());
@ -172,7 +166,6 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
} }
for (var item in results) { for (var item in results) {
bool _hasResult = false; bool _hasResult = false;
bool _required = false; bool _required = false;
String _test = ""; String _test = "";
@ -214,26 +207,23 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
} }
tiles.add(ListTile( tiles.add(ListTile(
title: Text(_test, style: TextStyle( title: Text(_test,
style: TextStyle(
fontWeight: _required ? FontWeight.bold : FontWeight.normal, fontWeight: _required ? FontWeight.bold : FontWeight.normal,
fontStyle: _hasResult ? FontStyle.normal : FontStyle.italic fontStyle: _hasResult ? FontStyle.normal : FontStyle.italic)),
)),
subtitle: Text(_value), subtitle: Text(_value),
trailing: Text(_date), trailing: Text(_date),
leading: _icon, leading: _icon,
onTap: () { onTap: () {
if (InvenTreeStockItemTestResult().canCreate) { if (InvenTreeStockItemTestResult().canCreate) {
addTestResult( addTestResult(context,
context,
name: _test, name: _test,
templateId: _templateId, templateId: _templateId,
nameIsEditable: !_required, nameIsEditable: !_required,
valueRequired: _valueRequired, valueRequired: _valueRequired,
attachmentRequired: _attachmentRequired attachmentRequired: _attachmentRequired);
);
} }
} }));
));
} }
if (tiles.isEmpty) { if (tiles.isEmpty) {

32
lib/widget/stock/stock_list.dart
View File

@ -7,9 +7,7 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/l10.dart"; import "package:inventree/l10.dart";
import "package:inventree/api.dart"; import "package:inventree/api.dart";
class StockItemList extends StatefulWidget { class StockItemList extends StatefulWidget {
const StockItemList(this.filters); const StockItemList(this.filters);
final Map<String, String> filters; final Map<String, String> filters;
@ -18,9 +16,7 @@ class StockItemList extends StatefulWidget {
_StockListState createState() => _StockListState(filters); _StockListState createState() => _StockListState(filters);
} }
class _StockListState extends RefreshableState<StockItemList> { class _StockListState extends RefreshableState<StockItemList> {
_StockListState(this.filters); _StockListState(this.filters);
final Map<String, String> filters; final Map<String, String> filters;
@ -35,20 +31,18 @@ class _StockListState extends RefreshableState<StockItemList> {
} }
class PaginatedStockItemList extends PaginatedSearchWidget { class PaginatedStockItemList extends PaginatedSearchWidget {
const PaginatedStockItemList(Map<String, String> filters)
const PaginatedStockItemList(Map<String, String> filters) : super(filters: filters); : super(filters: filters);
@override @override
String get searchTitle => L10().stockItems; String get searchTitle => L10().stockItems;
@override @override
_PaginatedStockItemListState createState() => _PaginatedStockItemListState(); _PaginatedStockItemListState createState() => _PaginatedStockItemListState();
} }
class _PaginatedStockItemListState
class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockItemList> { extends PaginatedSearchState<PaginatedStockItemList> {
_PaginatedStockItemListState() : super(); _PaginatedStockItemListState() : super();
@override @override
@ -111,23 +105,19 @@ class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockIt
} }
@override @override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async { Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
// Ensure StockStatus codes are loaded // Ensure StockStatus codes are loaded
await InvenTreeAPI().StockStatus.load(); await InvenTreeAPI().StockStatus.load();
final page = await InvenTreeStockItem().listPaginated( final page = await InvenTreeStockItem()
limit, .listPaginated(limit, offset, filters: params);
offset,
filters: params
);
return page; return page;
} }
@override @override
Widget buildItem(BuildContext context, InvenTreeModel model) { Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeStockItem item = model as InvenTreeStockItem; InvenTreeStockItem item = model as InvenTreeStockItem;
return ListTile( return ListTile(
@ -136,14 +126,14 @@ class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockIt
leading: InvenTreeAPI().getThumbnail(item.partThumbnail), leading: InvenTreeAPI().getThumbnail(item.partThumbnail),
trailing: SizedBox( trailing: SizedBox(
width: 48, width: 48,
child: Text("${item.displayQuantity}", child: Text(
"${item.displayQuantity}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize: 14,
color: InvenTreeAPI().StockStatus.color(item.status), color: InvenTreeAPI().StockStatus.color(item.status),
), ),
) )),
),
onTap: () { onTap: () {
item.goToDetailPage(context); item.goToDetailPage(context);
}, },

8
tasks.py
View File

@ -41,7 +41,13 @@ def android(c):
@task @task
def format(c, analyze=False, dry_run=False): def format(c, analyze=False, dry_run=False):
"""Format Dart code.""" """Format Dart code."""
c.run(f"dart format .{" --output=none" if dry_run else ''}")
cmd = "dart format ."
if dry_run:
cmd += " --output=none"
c.run(cmd)
if analyze: if analyze:
c.run("flutter analyze") c.run("flutter analyze")

11
test/api_test.dart
View File

@ -10,23 +10,19 @@ import "package:inventree/user_profile.dart";
import "setup.dart"; import "setup.dart";
void main() { void main() {
setupTestEnv(); setupTestEnv();
setUp(() async { setUp(() async {
await setupServerProfile(select: true); await setupServerProfile(select: true);
// Ensure the profile is selected // Ensure the profile is selected
assert(! await UserProfileDBManager().selectProfileByName("Missing Profile")); assert(
!await UserProfileDBManager().selectProfileByName("Missing Profile"));
assert(await UserProfileDBManager().selectProfileByName(testServerName)); assert(await UserProfileDBManager().selectProfileByName(testServerName));
}); });
group("Login Tests:", () { group("Login Tests:", () {
test("Disconnected", () async { test("Disconnected", () async {
// Test that calling disconnect() does the right thing // Test that calling disconnect() does the right thing
var api = InvenTreeAPI(); var api = InvenTreeAPI();
@ -37,7 +33,6 @@ void main() {
expect(api.isConnected(), equals(false)); expect(api.isConnected(), equals(false));
expect(api.isConnecting(), equals(false)); expect(api.isConnecting(), equals(false));
expect(api.hasToken, equals(false)); expect(api.hasToken, equals(false));
}); });
test("Login Failure", () async { test("Login Failure", () async {
@ -66,7 +61,6 @@ void main() {
debugContains("Token request failed: STATUS 401"); debugContains("Token request failed: STATUS 401");
debugContains("showSnackIcon: 'Not Connected'"); debugContains("showSnackIcon: 'Not Connected'");
}); });
test("Bad Token", () async { test("Bad Token", () async {
@ -125,6 +119,5 @@ void main() {
debugContains("Received token from server"); debugContains("Received token from server");
debugContains("showSnackIcon: 'Connected to Server'"); debugContains("showSnackIcon: 'Connected to Server'");
}); });
}); });
} }

26
test/barcode_test.dart
View File

@ -18,7 +18,6 @@ import "package:inventree/inventree/stock.dart";
import "setup.dart"; import "setup.dart";
void main() { void main() {
setupTestEnv(); setupTestEnv();
@ -64,14 +63,12 @@ void main() {
debugContains("showSnackIcon: 'No match for barcode'"); debugContains("showSnackIcon: 'No match for barcode'");
assert(debugMessageCount() == 3); assert(debugMessageCount() == 3);
}); });
}); });
group("Test StockItemScanIntoLocationHandler:", () { group("Test StockItemScanIntoLocationHandler:", () {
// Tests for scanning a stock item into a location // Tests for scanning a stock item into a location
test("Scan Into Location", () async { test("Scan Into Location", () async {
final item = await InvenTreeStockItem().get(1) as InvenTreeStockItem?; final item = await InvenTreeStockItem().get(1) as InvenTreeStockItem?;
assert(item != null); assert(item != null);
@ -90,7 +87,6 @@ void main() {
await handler.processBarcode('{"stocklocation": 1}'); await handler.processBarcode('{"stocklocation": 1}');
await item.reload(); await item.reload();
assert(item.locationId == 1); assert(item.locationId == 1);
}); });
}); });
@ -98,7 +94,8 @@ void main() {
// Tests for scanning items into a stock location // Tests for scanning items into a stock location
test("Scan In Items", () async { test("Scan In Items", () async {
final location = await InvenTreeStockLocation().get(1) as InvenTreeStockLocation?; final location =
await InvenTreeStockLocation().get(1) as InvenTreeStockLocation?;
assert(location != null); assert(location != null);
assert(location!.pk == 1); assert(location!.pk == 1);
@ -115,7 +112,6 @@ void main() {
assert(item!.pk == id); assert(item!.pk == id);
assert(item!.locationId == 1); assert(item!.locationId == 1);
} }
}); });
}); });
@ -123,7 +119,8 @@ void main() {
// Tests for scanning a location into a parent location // Tests for scanning a location into a parent location
test("Scan Parent", () async { test("Scan Parent", () async {
final location = await InvenTreeStockLocation().get(7) as InvenTreeStockLocation?; final location =
await InvenTreeStockLocation().get(7) as InvenTreeStockLocation?;
assert(location != null); assert(location != null);
assert(location!.pk == 7); assert(location!.pk == 7);
@ -146,14 +143,10 @@ void main() {
}); });
group("Test PartBarcodes:", () { group("Test PartBarcodes:", () {
// Assign a custom barcode to a Part instance // Assign a custom barcode to a Part instance
test("Assign Barcode", () async { test("Assign Barcode", () async {
// Unlink barcode first // Unlink barcode first
await InvenTreeAPI().unlinkBarcode({ await InvenTreeAPI().unlinkBarcode({"part": "2"});
"part": "2"
});
final part = await InvenTreePart().get(2) as InvenTreePart?; final part = await InvenTreePart().get(2) as InvenTreePart?;
@ -164,19 +157,14 @@ void main() {
assert(part!.customBarcode.isEmpty); assert(part!.customBarcode.isEmpty);
// Assign custom barcode data to the part // Assign custom barcode data to the part
await InvenTreeAPI().linkBarcode({ await InvenTreeAPI().linkBarcode({"part": "2", "barcode": "xyz-123"});
"part": "2",
"barcode": "xyz-123"
});
await part!.reload(); await part!.reload();
assert(part.customBarcode.isNotEmpty); assert(part.customBarcode.isNotEmpty);
// Check we can de-register a barcode also // Check we can de-register a barcode also
// Unlink barcode first // Unlink barcode first
await InvenTreeAPI().unlinkBarcode({ await InvenTreeAPI().unlinkBarcode({"part": "2"});
"part": "2"
});
await part.reload(); await part.reload();
assert(part.customBarcode.isEmpty); assert(part.customBarcode.isEmpty);

28
test/models_test.dart
View File

@ -10,7 +10,6 @@ import "package:inventree/inventree/part.dart";
import "setup.dart"; import "setup.dart";
void main() { void main() {
setupTestEnv(); setupTestEnv();
@ -35,18 +34,15 @@ void main() {
} }
// Filter by parent category // Filter by parent category
results = await InvenTreePartCategory().list( results = await InvenTreePartCategory().list(filters: {
filters: {
"parent": "1", "parent": "1",
} });
);
assert(results.length == 3); assert(results.length == 3);
}); });
}); });
group("Part Tests:", () { group("Part Tests:", () {
test("Basics", () async { test("Basics", () async {
assert(InvenTreePart().URL == "part/"); assert(InvenTreePart().URL == "part/");
}); });
@ -68,11 +64,9 @@ void main() {
} }
// Filter by category // Filter by category
results = await InvenTreePart().list( results = await InvenTreePart().list(filters: {
filters: {
"category": "2", "category": "2",
} });
);
assert(results.length == 2); assert(results.length == 2);
}); });
@ -99,7 +93,6 @@ void main() {
assert(part.unallocatedStockString == "9000"); assert(part.unallocatedStockString == "9000");
assert(part.inStockString == "9000"); assert(part.inStockString == "9000");
} }
}); });
test("Part Adjust", () async { test("Part Adjust", () async {
@ -117,11 +110,9 @@ void main() {
// Change the name to something else // Change the name to something else
response = await part.update( response = await part.update(values: {
values: {
"name": "Woogle", "name": "Woogle",
} });
);
assert(response.isValid()); assert(response.isValid());
assert(response.statusCode == 200); assert(response.statusCode == 200);
@ -130,11 +121,7 @@ void main() {
assert(part.name == "Woogle"); assert(part.name == "Woogle");
// And change it back again // And change it back again
response = await part.update( response = await part.update(values: {"name": "M2x4 LPHS"});
values: {
"name": "M2x4 LPHS"
}
);
assert(response.isValid()); assert(response.isValid());
assert(response.statusCode == 200); assert(response.statusCode == 200);
@ -144,5 +131,4 @@ void main() {
} }
}); });
}); });
} }

25
test/preferences_test.dart
View File

@ -10,23 +10,26 @@ import "setup.dart";
void main() { void main() {
setupTestEnv(); setupTestEnv();
setUp(() async { setUp(() async {});
});
group("Settings Tests:", () { group("Settings Tests:", () {
test("Default Values", () async { test("Default Values", () async {
// Boolean values // Boolean values
expect(await InvenTreeSettingsManager().getBool("test", false), equals(false)); expect(await InvenTreeSettingsManager().getBool("test", false),
expect(await InvenTreeSettingsManager().getBool("test", true), equals(true)); equals(false));
expect(
await InvenTreeSettingsManager().getBool("test", true), equals(true));
// String values // String values
expect(await InvenTreeSettingsManager().getValue("test", "x"), equals("x")); expect(
await InvenTreeSettingsManager().getValue("test", "x"), equals("x"));
}); });
test("Set value", () async { test("Set value", () async {
await InvenTreeSettingsManager().setValue("abc", "xyz"); await InvenTreeSettingsManager().setValue("abc", "xyz");
expect(await InvenTreeSettingsManager().getValue("abc", "123"), equals("xyz")); expect(await InvenTreeSettingsManager().getValue("abc", "123"),
equals("xyz"));
}); });
test("Booleans", () async { test("Booleans", () async {
@ -36,16 +39,18 @@ void main() {
// Use default values when a setting does not exist // Use default values when a setting does not exist
assert(await InvenTreeSettingsManager().getBool("chicken", true) == true); assert(await InvenTreeSettingsManager().getBool("chicken", true) == true);
assert(await InvenTreeSettingsManager().getBool("chicken", false) == false); assert(
await InvenTreeSettingsManager().getBool("chicken", false) == false);
// Explicitly set to true // Explicitly set to true
await InvenTreeSettingsManager().setValue("chicken", true); await InvenTreeSettingsManager().setValue("chicken", true);
assert(await InvenTreeSettingsManager().getBool("chicken", false) == true); assert(
await InvenTreeSettingsManager().getBool("chicken", false) == true);
// Explicitly set to false // Explicitly set to false
await InvenTreeSettingsManager().setValue("chicken", false); await InvenTreeSettingsManager().setValue("chicken", false);
assert(await InvenTreeSettingsManager().getBool("chicken", true) == false); assert(
await InvenTreeSettingsManager().getBool("chicken", true) == false);
}); });
}); });
} }

31
test/setup.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/services.dart"; import "package:flutter/services.dart";
import "package:flutter_test/flutter_test.dart"; import "package:flutter_test/flutter_test.dart";
import "package:inventree/api.dart"; import "package:inventree/api.dart";
@ -16,7 +15,8 @@ void setupTestEnv() {
CustomBinding(); CustomBinding();
// Mock the path provider // Mock the path provider
const MethodChannel channel = MethodChannel("plugins.flutter.io/path_provider"); const MethodChannel channel =
MethodChannel("plugins.flutter.io/path_provider");
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler(channel, (MethodCall methodCall) async { .setMockMethodCallHandler(channel, (MethodCall methodCall) async {
return "."; return ".";
@ -29,41 +29,36 @@ const String testServerName = "Test Server";
const String testUsername = "testuser"; const String testUsername = "testuser";
const String testPassword = "testpassword"; const String testPassword = "testpassword";
/* /*
* Request an API token for the given profile * Request an API token for the given profile
*/ */
Future<bool> fetchProfileToken({ Future<bool> fetchProfileToken(
UserProfile? profile, {UserProfile? profile,
String username = testUsername, String username = testUsername,
String password = testPassword String password = testPassword}) async {
}) async {
profile ??= await UserProfileDBManager().getProfileByName(testServerName); profile ??= await UserProfileDBManager().getProfileByName(testServerName);
assert(profile != null); assert(profile != null);
final response = await InvenTreeAPI().fetchToken(profile!, username, password); final response =
await InvenTreeAPI().fetchToken(profile!, username, password);
return response.successful(); return response.successful();
} }
/* /*
* Setup a valid profile, and return it * Setup a valid profile, and return it
*/ */
Future<UserProfile> setupServerProfile({bool select = true, bool fetchToken = false}) async { Future<UserProfile> setupServerProfile(
{bool select = true, bool fetchToken = false}) async {
// Setup a valid server profile // Setup a valid server profile
UserProfile? profile = await UserProfileDBManager().getProfileByName(testServerName); UserProfile? profile =
await UserProfileDBManager().getProfileByName(testServerName);
if (profile == null) { if (profile == null) {
// Profile does not already exist - create it! // Profile does not already exist - create it!
bool result = await UserProfileDBManager().addProfile( bool result = await UserProfileDBManager().addProfile(
UserProfile( UserProfile(server: testServerAddress, name: testServerName));
server: testServerAddress,
name: testServerName
)
);
assert(result); assert(result);
} }
@ -84,12 +79,10 @@ Future<UserProfile> setupServerProfile({bool select = true, bool fetchToken = fa
return profile!; return profile!;
} }
/* /*
* Complete all steps necessary to login to the server * Complete all steps necessary to login to the server
*/ */
Future<void> connectToTestServer() async { Future<void> connectToTestServer() async {
// Setup profile, and fetch user token as necessary // Setup profile, and fetch user token as necessary
final profile = await setupServerProfile(fetchToken: true); final profile = await setupServerProfile(fetchToken: true);

18
test/user_profile_test.dart
View File

@ -56,21 +56,16 @@ void main() {
// Run a set of tests for user profile functionality // Run a set of tests for user profile functionality
group("Profile Tests:", () { group("Profile Tests:", () {
test("Add Invalid Profiles", () async { test("Add Invalid Profiles", () async {
// Add a profile with missing data // Add a profile with missing data
bool result = await UserProfileDBManager().addProfile( bool result = await UserProfileDBManager().addProfile(UserProfile());
UserProfile()
);
expect(result, equals(false)); expect(result, equals(false));
// Add a profile with a new name // Add a profile with a new name
result = await UserProfileDBManager().addProfile( result = await UserProfileDBManager().addProfile(UserProfile(
UserProfile(
name: "Another Test Profile", name: "Another Test Profile",
) ));
);
expect(result, equals(true)); expect(result, equals(true));
@ -81,7 +76,8 @@ void main() {
}); });
test("Profile Name Check", () async { test("Profile Name Check", () async {
bool result = await UserProfileDBManager().profileNameExists("doesnotexist"); bool result =
await UserProfileDBManager().profileNameExists("doesnotexist");
expect(result, equals(false)); expect(result, equals(false));
result = await UserProfileDBManager().profileNameExists("Test Server"); result = await UserProfileDBManager().profileNameExists("Test Server");
@ -100,7 +96,8 @@ void main() {
expect(p.name, equals(testServerName)); expect(p.name, equals(testServerName));
expect(p.server, equals(testServerAddress)); expect(p.server, equals(testServerAddress));
expect(p.toString(), equals("<${p.key}> Test Server : http://localhost:8000/")); expect(p.toString(),
equals("<${p.key}> Test Server : http://localhost:8000/"));
// Test that we can update the profile // Test that we can update the profile
p.name = "different name"; p.name = "different name";
@ -110,5 +107,4 @@ void main() {
} }
}); });
}); });
} }

10
test/wedge_scanner_test.dart
View File

@ -1,5 +1,3 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter/services.dart"; import "package:flutter/services.dart";
import "package:flutter_test/flutter_test.dart"; import "package:flutter_test/flutter_test.dart";
@ -7,15 +5,10 @@ import "package:inventree/barcode/barcode.dart";
import "package:inventree/barcode/wedge_controller.dart"; import "package:inventree/barcode/wedge_controller.dart";
import "package:inventree/helpers.dart"; import "package:inventree/helpers.dart";
void main() { void main() {
testWidgets("Wedge Scanner Test", (tester) async { testWidgets("Wedge Scanner Test", (tester) async {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(home: WedgeBarcodeController(BarcodeScanHandler())));
home: WedgeBarcodeController(BarcodeScanHandler())
)
);
// Generate some keyboard data // Generate some keyboard data
await simulateKeyDownEvent(LogicalKeyboardKey.keyA); await simulateKeyDownEvent(LogicalKeyboardKey.keyA);
@ -27,6 +20,5 @@ void main() {
debugContains("scanned: abc"); debugContains("scanned: abc");
debugContains("No match for barcode"); debugContains("No match for barcode");
debugContains("Server Error"); debugContains("Server Error");
}); });
} }