inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-06-13 18:55:34 +00:00
Code Activity

Merge branch 'master' into create-part

Browse Source
This commit is contained in:
Oliver
2021-08-10 08:14:44 +10:00
parent f8e007e07d 140687c386
commit 92a7a73408
21 changed files with 316 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/widget/category_display.dart
View File

@ -399,7 +399,7 @@ class _PaginatedPartListState extends State<PaginatedPartList> {
params["search"] = _searchTerm;
final bool cascade = await InvenTreeSettingsManager().getValue("partSubcategory", false);
final bool cascade = await InvenTreeSettingsManager().getValue("partSubcategory", true);
params["cascade"] = "${cascade}";
final page = await InvenTreePart().listPaginated(_pageSize, pageKey, filters: params);

2
lib/widget/home.dart
View File

@ -3,7 +3,7 @@ import 'package:inventree/user_profile.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'file:///C:/inventree-app/lib/l10.dart';
import 'package:inventree/l10.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';

2
lib/widget/location_display.dart
View File

@ -438,7 +438,7 @@ class _PaginatedStockListState extends State<PaginatedStockList> {
params["search"] = "${_searchTerm}";
// Do we include stock items from sub-locations?
final bool cascade = await InvenTreeSettingsManager().getValue("stockSublocation", false);
final bool cascade = await InvenTreeSettingsManager().getValue("stockSublocation", true);
params["cascade"] = "${cascade}";
final page = await InvenTreeStockItem().listPaginated(_pageSize, pageKey, filters: params);

2
lib/widget/refreshable_state.dart
View File

@ -97,7 +97,7 @@ abstract class RefreshableState<T extends StatefulWidget> extends State<T> {
return Scaffold(
key: refreshableKey,
appBar: getAppBar(context),
drawer: getDrawer(context),
drawer: null, // getDrawer(context),
floatingActionButton: getFab(context),
body: Builder(
builder: (BuildContext context) {

32
lib/widget/stock_detail.dart
View File

@ -458,28 +458,44 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
);
}
// Last update?
var update_date = item.updatedDateString;
if (item.batch.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().batchCode),
subtitle: Text(item.batch),
leading: FaIcon(FontAwesomeIcons.layerGroup),
)
);
}
if (update_date != null) {
if (item.packaging.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().packaging),
subtitle: Text(item.packaging),
leading: FaIcon(FontAwesomeIcons.box),
)
);
}
// Last update?
if (item.updatedDateString.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().lastUpdated),
subtitle: Text(update_date),
subtitle: Text(item.updatedDateString),
leading: FaIcon(FontAwesomeIcons.calendarAlt)
)
);
}
// Stocktake?
var stocktake_date = item.stocktakeDateString;
if (stocktake_date != null) {
if (item.stocktakeDateString.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().lastStocktake),
subtitle: Text(stocktake_date),
subtitle: Text(item.stocktakeDateString),
leading: FaIcon(FontAwesomeIcons.calendarAlt)
)
);