New Feature: Added output volume column to the industry jobs tool (Is…

…sue #418)
GoldenGnu · Sep 21, 2023 · c24ed4e · c24ed4e
1 parent 8042132
commit c24ed4e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyIndustryJob.java b/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyIndustryJob.java
@@ -440,6 +440,14 @@ public String getOutputType() {
 		return output.getTypeName();
 	}
 
+	public double getOutputVolume() {
+		if (isCopying()) {
+			return output.getVolumePackaged() * getRuns(); // Volume of the output blueprints (bp runs should not be counted)
+		} else {
+			return output.getVolumePackaged() * outputCount;
+		}
+	}
+
 	public String getInstaller() {
 		return installer;
 	}

diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/jobs/IndustryJobTableFormat.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/jobs/IndustryJobTableFormat.java
@@ -200,6 +200,20 @@ public Object getColumnValue(final MyIndustryJob from) {
 			return from.getOutputValue();
 		}
 	},
+	OUTPUT_VOLUME(Double.class, GlazedLists.comparableComparator()) {
+		@Override
+		public String getColumnName() {
+			return TabsJobs.get().columnOutputVolume();
+		}
+		@Override
+		public String getColumnToolTip() {
+			return TabsJobs.get().columnOutputVolumeToolTip();
+		}
+		@Override
+		public Object getColumnValue(final MyIndustryJob from) {
+			return from.getOutputVolume();
+		}
+	},
 	OUTPUT_TYPE(String.class, GlazedLists.comparableComparator()) {
 		@Override
 		public String getColumnName() {

diff --git a/src/main/java/net/nikr/eve/jeveasset/i18n/TabsJobs.java b/src/main/java/net/nikr/eve/jeveasset/i18n/TabsJobs.java
@@ -62,6 +62,8 @@ public TabsJobs(final Locale locale) {
 	public abstract String columnRuns();
 	public abstract String columnOutputCount();
 	public abstract String columnOutputValue();
+	public abstract String columnOutputVolume();
+	public abstract String columnOutputVolumeToolTip();
 	public abstract String columnOutputType();
 	public abstract String columnBPO();
 	public abstract String columnMaterialEfficiency();

diff --git a/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsJobs.properties b/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsJobs.properties
@@ -26,6 +26,8 @@ columnPauseDate=Paused Date
 columnRuns=Runs
 columnOutputCount=Output Count
 columnOutputValue=Output Value
+columnOutputVolume=Output Volume
+columnOutputVolumeToolTip=Total packaged volume of output items
 columnOutputType=Output Type
 columnBPO=BPO
 columnMaterialEfficiency=ME