Roman_Schenk/PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70 from schrom01/tests_and_fixes_M3

Browse Source 
Tests and fixes m3
This commit is contained in:
giavaphi
2022-11-28 13:36:47 +01:00
committed by GitHub Enterprise
parent e9fbbf2f9f 1dc2ad1774
commit 21643e5d63
11 changed files with 206 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/zhaw/gartenverwaltung/PlantsController.java
+2 -2
View File
@@ -233,11 +233,11 @@ public class PlantsController {
RadioButton radioButton = new RadioButton(season.getName());
radioButton.setToggleGroup(seasonGroup);
radioButton.setPadding(new Insets(0, 0, 10, 0));
if (season.equals(Seasons.AllSEASONS)) {
if (season.equals(Seasons.ALLSEASONS)) {
radioButton.setSelected(true);
}
radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
if (season.equals(Seasons.AllSEASONS)) {
if (season.equals(Seasons.ALLSEASONS)) {
fillPlantListWithHardinessZone();
} else {
try {
src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskList.java
+2 -1
View File
@@ -96,7 +96,8 @@ public class JsonTaskList implements TaskList {
if(taskMap.isEmpty()) {
loadTaskListFromFile();
}
taskMap.values().removeIf(task -> task.getCropId() == cropId);
taskMap.entrySet().removeIf(entry -> entry.getValue().getCropId() == cropId);
writeTaskListToFile();
notifySubscribers();
}
src/main/java/ch/zhaw/gartenverwaltung/types/Plant.java
+3 -3
View File
@@ -66,16 +66,16 @@ public record Plant(
public int timeToHarvest(int group) {
List<GrowthPhase> activeLifecycle = lifecycleForGroup(group);
GrowthPhase sow = activeLifecycle.stream()
.filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.SOW))
.filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.SOW))
.findFirst()
.orElseThrow();
GrowthPhase harvest = activeLifecycle.stream()
.filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.HARVEST))
.filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST))
.findFirst()
.orElseThrow();
int currentYear = LocalDate.now().getYear();
return (int) DAYS.between(harvest.startDate().atYear(currentYear), sow.startDate().atYear(currentYear));
return (int) DAYS.between(sow.startDate().atYear(currentYear),harvest.startDate().atYear(currentYear));
}
public int lifecycleGroupFromHarvestDate(LocalDate harvestDate) {
src/main/java/ch/zhaw/gartenverwaltung/types/Seasons.java
+1 -1
View File
@@ -3,7 +3,7 @@ package ch.zhaw.gartenverwaltung.types;
import java.time.MonthDay;
public enum Seasons {
AllSEASONS("--01-01", "--12-31", "All Seasons"),
ALLSEASONS("--01-01", "--12-31", "All Seasons"),
SPRING("--03-01", "--05-30", "Spring"),
SUMMER("--06-01", "--08-30", "Summer"),
AUTUMN("--09-01", "--11-30", "Autumn"),