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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
schrom01 2022-12-11 17:49:44 +01:00
parent 95748c79b1 3a50c2655d
commit aa9c543624
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
View File

@ -212,7 +212,6 @@ public class CropDetailController {
taskListProperty.clear();
taskListProperty.addAll(taskList);
} catch (IOException e) {
// TODO: Alert
LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
}
});
@ -421,9 +420,7 @@ public class CropDetailController {
if (buttonType == ButtonType.OK) {
try {
gardenSchedule.removeTask(task);
//setTaskListProperty(this.crop);
} catch (IOException e) {
// TODO: Show error alert
LOG.log(Level.SEVERE, "Could not remove crop.", e);
}
}

2
src/main/java/ch/zhaw/gartenverwaltung/MyGardenController.java
View File

@ -173,7 +173,6 @@ public class MyGardenController {
stage.setResizable(true);
stage.showAndWait();
} catch (IOException | PlantNotFoundException e) {
// TODO: show error alert
LOG.log(Level.SEVERE, "Could not load plant details.", e);
}
};
@ -219,7 +218,6 @@ public class MyGardenController {
try {
garden.removeCrop(crop);
} catch (IOException e) {
// TODO: Show error alert
LOG.log(Level.SEVERE, "Could not remove crop.", e);
}
}

2
src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java
View File

@ -50,8 +50,6 @@ public class Garden {
*/
public void plantAsCrop(Plant plant, LocalDate plantingDate) throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
Crop crop = new Crop(plant.id(), plantingDate);
//TODO Add Area to Plant
//crop.withArea(0);
cropList.saveCrop(crop);
gardenSchedule.planTasksForCrop(crop);
plantedCrops.clear();