Bug Fix: Delivered industry jobs was included in assets and stockpile…

…s (Issue #480)
GoldenGnu · Oct 27, 2024 · 6d1cbc8 · 6d1cbc8
1 parent 0511258
commit 6d1cbc8
Showing 1 changed file with 4 additions and 5 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
@@ -288,18 +288,17 @@ public final boolean isDone() {
 	}
 
 	public final boolean isNotDeliveredToAssets() {
-		return getStatus() != IndustryJobStatus.ARCHIVED //if ARCHIVED  -> unknown if delivered or not -> false
+		return !isDone() //if not done ->  not delivered to assets -> true
 				&& (owner.getAssetLastUpdate() == null //if null -> never updated -> not delivered to assets -> true
 				|| getCompletedDate() == null //if null -> not completed -> not delivered to assets -> true
-				|| owner.getAssetLastUpdate().before(getCompletedDate() //if assets last updated before completed date -> not delivered to assets -> true
-				));
+				|| owner.getAssetLastUpdate().before(getCompletedDate()) //if assets last updated before completed date -> not delivered to assets -> true
+				);
 	}
 
 	public final boolean isRemovedFromAssets() {
 		return owner.getAssetLastUpdate() != null //if null -> never updated -> not removed from assets -> false
 				&& getStartDate() != null //if null -> not started -> not removed from assets -> false
-				&& owner.getAssetLastUpdate().after(getStartDate() //if assets last updated after started date -> removed from assets -> true
-				);
+				&& owner.getAssetLastUpdate().after(getStartDate()); //if assets last updated after started date -> removed from assets -> true
 	}
 
 	public final boolean isManufacturing() {