inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-12-04 03:09:56 +00:00
Code Activity

Attachments refactor (#737)

Browse Source 
* refactor attachment code into its own file

* Add getters

* Remove custom models for each type of attachment

* Refactor existing widgets

* Fix double camera open bug

* Remove dead code

* Remove unused imports

* Refactor common code

* format

* Update release notes
This commit is contained in:
Oliver
2025-11-28 23:53:10 +11:00
committed by GitHub
parent bb10117f01
commit 346b1a150f
15 changed files with 381 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import "package:inventree/app_colors.dart";
import "package:inventree/barcode/barcode.dart";
import "package:inventree/barcode/purchase_order.dart";
import "package:inventree/helpers.dart";
import "package:inventree/inventree/attachment.dart";
import "package:inventree/l10.dart";
import "package:inventree/inventree/model.dart";
@@ -174,8 +175,12 @@ class _PurchaseOrderDetailState
/// Upload an image against the current PurchaseOrder
Future<void> _uploadImage(BuildContext context) async {
InvenTreePurchaseOrderAttachment()
.uploadImage(widget.order.pk, prefix: widget.order.reference)
InvenTreeAttachment()
.uploadImage(
InvenTreePurchaseOrder.MODEL_TYPE,
widget.order.pk,
prefix: widget.order.reference,
)
.then((result) => refresh(context));
}
@@ -295,15 +300,15 @@ class _PurchaseOrderDetailState
}
}
InvenTreePurchaseOrderAttachment().countAttachments(widget.order.pk).then((
int value,
) {
if (mounted) {
setState(() {
attachmentCount = value;
InvenTreeAttachment()
.countAttachments(InvenTreePurchaseOrder.MODEL_TYPE, widget.order.pk)
.then((int value) {
if (mounted) {
setState(() {
attachmentCount = value;
});
}
});
}
});
if (api.supportsPurchaseOrderDestination &&
widget.order.destinationId > 0) {
@@ -565,30 +570,19 @@ class _PurchaseOrderDetailState
),
);
// Attachments
tiles.add(
ListTile(
title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: LinkIcon(
text: attachmentCount > 0 ? attachmentCount.toString() : null,
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreePurchaseOrderAttachment(),
widget.order.pk,
widget.order.reference,
widget.order.canEdit,
),
),
);
},
),
ListTile? attachmentTile = ShowAttachmentsItem(
context,
InvenTreePurchaseOrder.MODEL_TYPE,
widget.order.pk,
widget.order.reference,
attachmentCount,
widget.order.canEdit,
);
if (attachmentTile != null) {
tiles.add(attachmentTile);
}
return tiles;
}

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

@@ -3,6 +3,7 @@ import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/barcode/barcode.dart";
import "package:inventree/barcode/sales_order.dart";
import "package:inventree/inventree/attachment.dart";
import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/sales_order.dart";
import "package:inventree/preferences.dart";
@@ -108,8 +109,12 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
/// Upload an image for this order
Future<void> _uploadImage(BuildContext context) async {
InvenTreeSalesOrderAttachment()
.uploadImage(widget.order.pk, prefix: widget.order.reference)
InvenTreeAttachment()
.uploadImage(
InvenTreeSalesOrder.MODEL_TYPE,
widget.order.pk,
prefix: widget.order.reference,
)
.then((result) => refresh(context));
}
@@ -266,15 +271,15 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
true,
);
InvenTreeSalesOrderAttachment().countAttachments(widget.order.pk).then((
int value,
) {
if (mounted) {
setState(() {
attachmentCount = value;
InvenTreeAttachment()
.countAttachments(InvenTreeSalesOrder.MODEL_TYPE, widget.order.pk)
.then((int value) {
if (mounted) {
setState(() {
attachmentCount = value;
});
}
});
}
});
// Count number of "extra line items" against this order
InvenTreeSOExtraLineItem()
@@ -492,30 +497,19 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
),
);
// Attachments
tiles.add(
ListTile(
title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: LinkIcon(
text: attachmentCount > 0 ? attachmentCount.toString() : null,
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreeSalesOrderAttachment(),
widget.order.pk,
widget.order.reference,
widget.order.canEdit,
),
),
);
},
),
ListTile? attachmentTile = ShowAttachmentsItem(
context,
InvenTreeSalesOrder.MODEL_TYPE,
widget.order.pk,
widget.order.reference,
attachmentCount,
widget.order.canEdit,
);
if (attachmentTile != null) {
tiles.add(attachmentTile);
}
return tiles;
}

49
lib/widget/order/so_shipment_detail.dart
View File

@@ -8,6 +8,7 @@ import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/api.dart";
import "package:inventree/api_form.dart";
import "package:inventree/app_colors.dart";
import "package:inventree/inventree/attachment.dart";
import "package:inventree/inventree/sales_order.dart";
import "package:inventree/l10.dart";
import "package:inventree/preferences.dart";
@@ -91,8 +92,11 @@ class _SOShipmentDetailWidgetState
});
}
InvenTreeSalesOrderShipmentAttachment()
.countAttachments(widget.shipment.pk)
InvenTreeAttachment()
.countAttachments(
InvenTreeSalesOrderShipment.MODEL_TYPE,
widget.shipment.pk,
)
.then((int value) {
if (mounted) {
setState(() {
@@ -104,8 +108,12 @@ class _SOShipmentDetailWidgetState
/// Upload an image for this shipment
Future<void> _uploadImage(BuildContext context) async {
InvenTreeSalesOrderShipmentAttachment()
.uploadImage(widget.shipment.pk, prefix: widget.shipment.reference)
InvenTreeAttachment()
.uploadImage(
InvenTreeSalesOrderShipment.MODEL_TYPE,
widget.shipment.pk,
prefix: widget.shipment.reference,
)
.then((result) => refresh(context));
}
@@ -339,30 +347,19 @@ class _SOShipmentDetailWidgetState
),
);
// Attachments
tiles.add(
ListTile(
title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: LinkIcon(
text: attachmentCount > 0 ? attachmentCount.toString() : null,
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreeSalesOrderShipmentAttachment(),
widget.shipment.pk,
widget.shipment.reference,
widget.shipment.canEdit,
),
),
);
},
),
ListTile? attachmentTile = ShowAttachmentsItem(
context,
InvenTreeSalesOrderShipment.MODEL_TYPE,
widget.shipment.pk,
widget.shipment.reference,
attachmentCount,
widget.shipment.canEdit,
);
if (attachmentTile != null) {
tiles.add(attachmentTile);
}
return tiles;
}