Compare commits

...
Author SHA1 Message Date
Gian-Andrea Hutter 5e42cae290 #23 bugfix adjust task 2022-11-29 21:55:42 +01:00
schrom01 028bc0240d Merged Notification Branch with Weather Branch 2022-11-29 12:25:54 +01:00
schrom01 8ecc14db91 Merged Notification Branch with Weather Branch 2022-11-29 12:19:45 +01:00
Gian-Andrea Hutter c16f99aabc Merge remote-tracking branch 'origin/feature_weather' into feature_weather 2022-11-29 12:13:01 +01:00
Gian-Andrea Hutter 6ec0ccaeaa #23 bugfix GardenScheduleTest and PlantTest 2022-11-29 12:12:18 +01:00
schrom01 55f92f92bd Merged Notification Branch with Weather Branch 2022-11-29 12:12:16 +01:00
schrom01 fd28ca7cc2 Merged Notification Branch with Weather Branch 2022-11-29 11:55:49 +01:00
schrom01 1faf1c10de Merge branch 'feature_notification_m3' into feature_weather
# Conflicts:
#	src/main/java/ch/zhaw/gartenverwaltung/bootstrap/AppLoader.java
2022-11-29 11:41:28 +01:00
Gian-Andrea Hutter f43bfeebd2 #23 bugfix plantdb.json 2022-11-29 11:32:20 +01:00
schrom01 220d138185 fixed saving Task after editing 2022-11-28 19:31:08 +01:00
Gian-Andrea Hutter aa87a23f7d Merge branch 'dev' into feature_weather
# Conflicts:
#	src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
2022-11-28 13:54:47 +01:00
Gian-Andrea Hutter eccb519bfb #23 watering task refactor 2022-11-28 13:53:47 +01:00
giavaphiandGitHub Enterprise 21643e5d63 Merge pull request #70 from schrom01/tests_and_fixes_M3
Tests and fixes m3
2022-11-28 13:36:47 +01:00
giavaphiandGitHub Enterprise e9fbbf2f9f Merge pull request #73 from schrom01/feature_guiOverhaul_M3
fix nullpointer exception check date garden schedule
2022-11-28 13:11:18 +01:00
giavaphiandGitHub Enterprise ce8bdaba7e Merge branch 'dev' into feature_guiOverhaul_M3 2022-11-28 13:10:50 +01:00
giavaphi 7e5730a19f fix nullpointer exception check date garden schedule 2022-11-28 13:09:59 +01:00
giavaphi ec42a6e75a fix nullpointer exception check date garden schedule 2022-11-28 12:38:29 +01:00
gulerdavandGitHub Enterprise 2452e42b72 Merge pull request #71 from schrom01/feature_guiOverhaul_M3
Feature_OverhaulGUI_Scheduler_M3
2022-11-28 11:58:26 +01:00
giavaphi 3d36c85941 temp style css 2022-11-28 11:57:28 +01:00
giavaphi 84df4c07a1 temp style css 2022-11-28 11:53:02 +01:00
giavaphiandGitHub Enterprise 4ae9eec9f7 Merge pull request #72 from schrom01/refactor_javadoc-and-apploader_M3
refactor: javadoc and dependencies in HashMap
2022-11-28 11:43:18 +01:00
David Guler d0959f535b refactor: javadoc and dependencies in HashMap 2022-11-28 11:35:17 +01:00
Gian-Andrea Hutter cae6f950ad #23 comments added 2022-11-28 10:20:00 +01:00
schrom01 fd184e1248 implemented Exception handling in EMailSender 2022-11-28 09:11:37 +01:00
schrom01 fbf1700c34 implemented EMailSender 2022-11-28 08:00:31 +01:00
giavaphi 129a26e1a9 ui display task schedule 2022-11-28 02:49:55 +01:00
giavaphi e9258fb238 fix of zero interval 2022-11-28 00:50:41 +01:00
Gian-Andrea Hutter 233ce6b088 #23 add Task generation watertask 2022-11-27 23:42:29 +01:00
giavaphi 6d24687f7b Merge remote-tracking branch 'origin/feature_guiOverhaul_M3' into feature_guiOverhaul_M3 2022-11-27 21:56:37 +01:00
giavaphi 2ec37114de quick fix task end date can not be null + test data 2022-11-27 21:56:12 +01:00
giavaphi aedcfe2be9 update json files for crop and task with ui 2022-11-27 20:39:37 +01:00
giavaphi b3f839e4a3 update json files for crop and task with ui 2022-11-27 20:38:38 +01:00
Gian-Andrea Hutter 4072308ae6 #23 Implementation of Gardenschedule for wateringtask adjustment 2022-11-27 10:13:11 +01:00
Elias Csomor 1dc2ad1774 Extended testcoverage for classes 2022-11-26 14:30:16 +01:00
Elias Csomor e75ececedb Refactored AllSEASONS to ALLSEASONS and added tests 2022-11-26 14:29:49 +01:00
Elias Csomor 560cea2ff9 Extended coverage for tests 2022-11-26 12:49:42 +01:00
Gian-Andrea Hutter 65b15b6a4c Merge remote-tracking branch 'origin/feature_weather' into feature_weather 2022-11-26 11:59:06 +01:00
Gian-Andrea Hutter 9424c8713f Merge branch 'dev' into feature_weather 2022-11-26 11:57:34 +01:00
Elias Csomor 4e720c2ddc finished tests for Plant, added fix for Plant 2022-11-26 11:54:47 +01:00
Elias Csomor 77541c282c fixed RemoveTasksForCrop 2022-11-26 11:22:27 +01:00
David Guler c79386ec88 feature: made TaskList observable 2022-11-25 20:03:32 +01:00
gulerdavandGitHub Enterprise f36826ef29 Merge pull request #62 from schrom01/feature_taskList_m2
completed Tests for GardenScheduleTest and new Structure of Task
2022-11-25 13:28:33 +01:00
schrom01 c9ba9c1234 created sortByNextExecution Comparator 2022-11-25 13:01:38 +01:00
schrom01 2d88c9ea91 implemented multithreading 2022-11-25 12:58:03 +01:00
David Guler 07569b83e1 fix: syntax errors 2022-11-25 12:39:10 +01:00
huttegiaandGitHub Enterprise 04e4ea1dea Merge pull request #69 from schrom01/feature_tutorial_M3
feature: added tutorial window
2022-11-25 12:34:03 +01:00
gulerdavandGitHub Enterprise 9b08113ff9 Merge pull request #67 from schrom01/feature_guiOverhaul_M3
Feature gui overhaul m3
2022-11-25 12:11:07 +01:00
schrom01 e48be29d59 Merge branch 'feature_taskList_m2' into feature_notification_m3 2022-11-25 11:14:47 +01:00
schrom01 f389cfcdfd adapted GardenSchedule and GardenScheduleTest to new Structure of Task 2022-11-25 11:13:45 +01:00
giavaphi e22cb0b24d init css file and bind with app 2022-11-25 02:29:07 +01:00
giavaphi 1c83fc4694 add disable properties to dialog save buttons 2022-11-25 02:00:13 +01:00
giavaphi df19edb25a delete tasks 2022-11-24 23:55:54 +01:00
schrom01 a437236788 created Class Notifier 2022-11-24 23:45:33 +01:00
giavaphi 6b7a6f095d dialog pane for location and area of crop 2022-11-24 23:18:14 +01:00
schrom01 b2c0886e46 new Structure of taskdb.json 2022-11-24 22:27:16 +01:00
schrom01 775e35a70b new Structure of Task 2022-11-24 22:18:08 +01:00
schrom01 d7b9095050 Merge branch 'dev' into feature_taskList_m2 2022-11-24 21:55:52 +01:00
Gian-Andrea Hutter d2b8fe4ba2 #23 small adjustments 2022-11-22 14:48:09 +01:00
Gian-Andrea Hutter 670938ef85 #23 added constructor in Task class, implemented SevereWeather, WeatherService, WeatherGradenTaskPlanner 2022-11-22 14:44:56 +01:00
gulerdavandGitHub Enterprise 8e3af2ba32 Merge branch 'dev' into feature_taskList_m2 2022-11-18 12:27:33 +01:00
schrom01 165dc6d901 implemented Method getGrowphaseGroupForDate 2022-11-18 12:21:21 +01:00
schrom01 384dc2d853 completed Tests for GardenScheduleTest 2022-11-18 11:34:53 +01:00
65 changed files with 1834 additions and 590 deletions
+3 -1
View File
@@ -26,7 +26,7 @@ tasks.withType(JavaCompile) {
application { application {
mainModule = 'ch.zhaw.gartenverwaltung' mainModule = 'ch.zhaw.gartenverwaltung'
mainClass = 'ch.zhaw.gartenverwaltung.HelloApplication' mainClass = 'ch.zhaw.gartenverwaltung.Main'
} }
javafx { javafx {
@@ -42,6 +42,8 @@ dependencies {
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4'
testImplementation 'org.mockito:mockito-core:4.3.+' testImplementation 'org.mockito:mockito-core:4.3.+'
implementation 'com.sun.mail:javax.mail:1.6.2'
} }
test { test {
@@ -22,6 +22,7 @@ import javafx.scene.control.*;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.layout.Priority; import javafx.scene.layout.Priority;
import javafx.stage.Stage; import javafx.stage.Stage;
@@ -87,7 +88,7 @@ public class CropDetailController {
private ListView<Pest> pests_listView; private ListView<Pest> pests_listView;
@FXML @FXML
void addTask() throws IOException { void addTask() throws IOException, HardinessZoneNotSetException {
createTaskDialog(true, null); createTaskDialog(true, null);
} }
@@ -104,16 +105,16 @@ public class CropDetailController {
* open dialog to set area * open dialog to set area
*/ */
@FXML @FXML
void setArea() { void setArea() throws IOException {
openTextFieldDialog("set Text Area", "Text Area", area_label.getText(), false);
} }
/** /**
* open dialog to set location * open dialog to set location
*/ */
@FXML @FXML
void setLocation() { void setLocation() throws IOException {
openTextFieldDialog("set Location", "Location", location_label.getText(), true);
} }
/** /**
@@ -136,7 +137,7 @@ public class CropDetailController {
if (plant.image() != null) { if (plant.image() != null) {
imageView.setImage(plant.image()); imageView.setImage(plant.image());
} }
area_label.setText(""); area_label.setText(String.valueOf(crop.getArea()));
location_label.setText(""); location_label.setText("");
setTaskListProperty(crop); setTaskListProperty(crop);
@@ -205,21 +206,28 @@ public class CropDetailController {
} }
private HBox createTaskHBox(Task task) { private HBox createTaskHBox(Task task) {
HBox hBox = new HBox(); HBox hBox = new HBox(10);
Label taskName = new Label(task.getName()+": "); Label taskName = new Label(task.getName()+": ");
taskName.setMinWidth(100);
taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
taskName.setStyle("-fx-font-weight: bold"); taskName.setStyle("-fx-font-weight: bold");
Label taskDescription = new Label(task.getDescription()); Label taskDescription = new Label(task.getDescription());
taskDescription.setWrapText(true); taskDescription.setWrapText(true);
taskDescription.setMaxWidth(2000); taskDescription.setMaxSize(600, Double.MAX_VALUE);
HBox.setHgrow(taskDescription, Priority.ALWAYS); Pane puffer = new Pane();
HBox.setHgrow(puffer, Priority.ALWAYS);
Button edit = new Button(); Button edit = new Button();
Button delete = new Button(); Button delete = new Button();
HBox.setHgrow(edit, Priority.NEVER);
HBox.setHgrow(delete, Priority.NEVER);
setIconToButton(edit, "editIcon.png"); setIconToButton(edit, "editIcon.png");
setIconToButton(delete, "deleteIcon.png"); setIconToButton(delete, "deleteIcon.png");
edit.setOnAction(getEditTaskEvent(task)); edit.setOnAction(getEditTaskEvent(task));
delete.setOnAction(deleteTask(task));
hBox.getChildren().addAll(taskName, taskDescription, edit, delete); hBox.getChildren().addAll(taskName, taskDescription, puffer, edit, delete);
return hBox; return hBox;
} }
@@ -228,12 +236,15 @@ public class CropDetailController {
label.setStyle("-fx-font-weight: bold"); label.setStyle("-fx-font-weight: bold");
HBox hBox = new HBox(); HBox hBox = new HBox();
hBox.fillHeightProperty(); hBox.fillHeightProperty();
Label label1 = new Label(pest.description()); Label description = new Label(pest.description());
label1.setAlignment(Pos.TOP_LEFT); description.setAlignment(Pos.TOP_LEFT);
label1.setWrapText(true); description.setWrapText(true);
label1.setMaxWidth(600); description.setMaxWidth(600);
Pane puffer = new Pane();
HBox.setHgrow(puffer, Priority.ALWAYS);
Button button = new Button("Get Counter Measures"); Button button = new Button("Get Counter Measures");
hBox.getChildren().addAll(label, label1, button); HBox.setHgrow(button, Priority.NEVER);
hBox.getChildren().addAll(label, description, puffer, button);
return hBox; return hBox;
} }
@@ -254,13 +265,19 @@ public class CropDetailController {
return (event) -> { return (event) -> {
try { try {
createTaskDialog(false, task); createTaskDialog(false, task);
} catch (IOException e) { } catch (IOException | HardinessZoneNotSetException e) {
e.printStackTrace(); e.printStackTrace();
} }
}; };
} }
private void createTaskDialog(boolean newTask, Task givenTask) throws IOException { private EventHandler<ActionEvent> deleteTask(Task task) {
return (event) -> {
showDeleteTask(task);
};
}
private void createTaskDialog(boolean newTask, Task givenTask) throws IOException, HardinessZoneNotSetException {
Dialog<Task> dialog = new Dialog<>(); Dialog<Task> dialog = new Dialog<>();
dialog.setTitle("Set Task"); dialog.setTitle("Set Task");
dialog.setHeaderText("Add/Edit Task:"); dialog.setHeaderText("Add/Edit Task:");
@@ -278,10 +295,11 @@ public class CropDetailController {
if (appLoader.loadPaneToDialog("TaskFormular.fxml", dialogPane) instanceof TaskFormularController controller) { if (appLoader.loadPaneToDialog("TaskFormular.fxml", dialogPane) instanceof TaskFormularController controller) {
controller.setCorp(this.crop); controller.setCorp(this.crop);
controller.initSaveButton((Button) dialogPane.lookupButton(saveTask));
if (!newTask) { if (!newTask) {
controller.setTaskValue(givenTask); controller.setTaskValue(givenTask);
} }
dialog.setResultConverter(button -> button.equals(saveTask) ? controller.returnResult() : null); dialog.setResultConverter(button -> button.equals(saveTask) ? controller.returnResult(this.crop) : null);
dialog.showAndWait() dialog.showAndWait()
.ifPresent(task -> { .ifPresent(task -> {
@@ -300,4 +318,59 @@ public class CropDetailController {
} }
} }
private void openTextFieldDialog(String title, String labelDescription, String value, boolean isLocation) throws IOException {
Dialog<String> dialog = new Dialog<>();
dialog.setTitle(title);
dialog.setHeaderText(title);
dialog.setResizable(false);
DialogPane dialogPane = dialog.getDialogPane();
ButtonType save = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
dialogPane.getButtonTypes().addAll(save, ButtonType.CANCEL);
if (appLoader.loadPaneToDialog("TextFieldFormular.fxml", dialogPane) instanceof TextFieldFormularController controller) {
controller.setDescription_label(labelDescription);
controller.setValueTextArea(value);
controller.initSaveButton((Button) dialogPane.lookupButton(save));
dialog.setResultConverter(button -> button.equals(save) ? controller.getValue() : null);
dialog.showAndWait()
.ifPresent(string -> {
if (isLocation) {
System.out.println(string);
//ToDo method to set location
location_label.setText(string);
} else {
try {
garden.updateCrop(this.crop.withArea(Double.parseDouble(string)));
} catch (IOException e) {
e.printStackTrace();
}
area_label.setText(string);
}
});
}
}
private void showDeleteTask(Task task) {
Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
alert.setTitle("Delete " + task.getName());
alert.setHeaderText("Are you sure want to delete this Task?");
alert.showAndWait()
.ifPresent(buttonType -> {
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);
}
}
});
}
} }
@@ -1,23 +0,0 @@
package ch.zhaw.gartenverwaltung;
import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
import javafx.application.Application;
import javafx.stage.Stage;
import java.io.IOException;
public class HelloApplication extends Application {
@Override
public void start(Stage stage) throws IOException {
AppLoader appLoader = new AppLoader();
appLoader.loadSceneToStage("MainFXML.fxml", stage);
stage.setTitle("Gartenverwaltung");
stage.show();
}
public static void main(String[] args) {
launch();
}
}
@@ -1,14 +0,0 @@
package ch.zhaw.gartenverwaltung;
import javafx.fxml.FXML;
import javafx.scene.control.Label;
public class HelloController {
@FXML
private Label welcomeText;
@FXML
protected void onHelloButtonClick() {
welcomeText.setText("Welcome to JavaFX Application!");
}
}
@@ -0,0 +1,41 @@
package ch.zhaw.gartenverwaltung;
import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
import ch.zhaw.gartenverwaltung.backgroundtasks.BackgroundTasks;
import ch.zhaw.gartenverwaltung.io.CropList;
import ch.zhaw.gartenverwaltung.io.PlantList;
import ch.zhaw.gartenverwaltung.io.TaskList;
import ch.zhaw.gartenverwaltung.models.Garden;
import ch.zhaw.gartenverwaltung.types.Crop;
import javafx.application.Application;
import javafx.stage.Stage;
import java.io.IOException;
import java.util.Timer;
public class Main extends Application {
Timer backGroundTaskTimer = new Timer();
BackgroundTasks backgroundTasks;
@Override
public void start(Stage stage) throws IOException {
AppLoader appLoader = new AppLoader();
backgroundTasks = new BackgroundTasks((TaskList) appLoader.getAppDependency(TaskList.class),(CropList) appLoader.getAppDependency(CropList.class), (PlantList) appLoader.getAppDependency(PlantList.class));
backGroundTaskTimer.scheduleAtFixedRate(backgroundTasks, 0, 1000);
appLoader.loadSceneToStage("MainFXML.fxml", stage);
stage.setTitle("Gartenverwaltung");
stage.show();
}
@Override
public void stop(){
backGroundTaskTimer.cancel();
}
public static void main(String[] args) {
launch();
}
}
@@ -51,7 +51,6 @@ public class MyGardenController {
@AfterInject @AfterInject
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void init() { public void init() {
System.out.println("once");
setIconToButton(addPlant_button, "addIcon.png"); setIconToButton(addPlant_button, "addIcon.png");
myGarden_listView.itemsProperty().bind(garden.getPlantedCrops()); myGarden_listView.itemsProperty().bind(garden.getPlantedCrops());
setCellFactory(); setCellFactory();
@@ -9,11 +9,14 @@ import ch.zhaw.gartenverwaltung.models.GardenSchedule;
import ch.zhaw.gartenverwaltung.types.Crop; import ch.zhaw.gartenverwaltung.types.Crop;
import ch.zhaw.gartenverwaltung.types.Plant; import ch.zhaw.gartenverwaltung.types.Plant;
import ch.zhaw.gartenverwaltung.types.Task; import ch.zhaw.gartenverwaltung.types.Task;
import javafx.beans.property.ListProperty;
import javafx.beans.property.SimpleListProperty;
import javafx.collections.FXCollections;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Label; import javafx.scene.control.*;
import javafx.scene.control.ListCell; import javafx.scene.layout.HBox;
import javafx.scene.control.ListView;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import java.io.IOException; import java.io.IOException;
@@ -24,6 +27,7 @@ import java.util.logging.Logger;
public class MyScheduleController { public class MyScheduleController {
private static final Logger LOG = Logger.getLogger(MyScheduleController.class.getName()); private static final Logger LOG = Logger.getLogger(MyScheduleController.class.getName());
private final ListProperty<List<Task>> taskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
private Crop selectedCrop = null; private Crop selectedCrop = null;
@@ -35,46 +39,7 @@ public class MyScheduleController {
private PlantList plantList; private PlantList plantList;
@FXML @FXML
private Label day1_label; private ListView<List<Task>> week_listView;
@FXML
private Pane day1_pane;
@FXML
private Label day2_label;
@FXML
private Pane day2_pane;
@FXML
private Label day3_label;
@FXML
private Pane day3_pane;
@FXML
private Label day4_label;
@FXML
private Pane day4_pane;
@FXML
private Label day5_label;
@FXML
private Pane day5_pane;
@FXML
private Label day6_label;
@FXML
private Pane day6_pane;
@FXML
private Label day7_label;
@FXML
private Pane day7_pane;
@FXML @FXML
private Label information_label; private Label information_label;
@@ -85,10 +50,11 @@ public class MyScheduleController {
@AfterInject @AfterInject
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void init() { public void init() {
setCellFactoryListView(); setCellFactoryCropListView();
setCellFactoryTaskListView();
scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops()); scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
week_listView.itemsProperty().bind(taskListProperty);
lookForSelectedListEntries(); lookForSelectedListEntries();
setDayLabels();
information_label.setText(""); information_label.setText("");
try { try {
loadTaskList(); loadTaskList();
@@ -108,18 +74,7 @@ public class MyScheduleController {
}); });
} }
private void setDayLabels() { private void setCellFactoryCropListView() {
LocalDate today = LocalDate.now();
day1_label.setText(today.getDayOfWeek().toString());
day2_label.setText(today.plusDays(1).getDayOfWeek().toString());
day3_label.setText(today.plusDays(2).getDayOfWeek().toString());
day4_label.setText(today.plusDays(3).getDayOfWeek().toString());
day5_label.setText(today.plusDays(4).getDayOfWeek().toString());
day6_label.setText(today.plusDays(5).getDayOfWeek().toString());
day7_label.setText(today.plusDays(6).getDayOfWeek().toString());
}
private void setCellFactoryListView() {
scheduledPlants_listview.setCellFactory(param -> new ListCell<>() { scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
@Override @Override
protected void updateItem(Crop crop, boolean empty) { protected void updateItem(Crop crop, boolean empty) {
@@ -141,6 +96,23 @@ public class MyScheduleController {
}); });
} }
private void setCellFactoryTaskListView() {
week_listView.setCellFactory(param -> new ListCell<>() {
@Override
protected void updateItem(List<Task> taskList, boolean empty) {
super.updateItem(taskList, empty);
if (empty || taskList == null) {
setGraphic(null);
setText(null);
} else {
setText("");
setGraphic(weekTaskVBox(taskList, this.getIndex()));
}
}
});
}
private void loadTaskList() throws IOException { private void loadTaskList() throws IOException {
List<List<Task>> taskLists; List<List<Task>> taskLists;
if (selectedCrop != null) { if (selectedCrop != null) {
@@ -148,25 +120,66 @@ public class MyScheduleController {
} else { } else {
taskLists = gardenSchedule.getTasksUpcomingWeek(); taskLists = gardenSchedule.getTasksUpcomingWeek();
} }
if (!taskLists.isEmpty()) { taskListProperty.clear();
viewTaskListOfDay(day1_pane, taskLists.get(0)); taskListProperty.addAll(taskLists);
viewTaskListOfDay(day2_pane, taskLists.get(1));
viewTaskListOfDay(day3_pane, taskLists.get(2));
viewTaskListOfDay(day4_pane, taskLists.get(3));
viewTaskListOfDay(day5_pane, taskLists.get(4));
viewTaskListOfDay(day6_pane, taskLists.get(5));
viewTaskListOfDay(day7_pane, taskLists.get(6));
}
} }
private void viewTaskListOfDay(Pane pane, List<Task> tasks) { private VBox weekTaskVBox(List<Task> tasks, int dayIndex) {
//ToDo update pane with task list VBox vBox = new VBox(10);
VBox vBox = new VBox(); LocalDate today = LocalDate.now();
Label weekDay = new Label(today.plusDays(dayIndex).getDayOfWeek().toString());
weekDay.setStyle("-fx-font-weight: bold; -fx-underline: true");
vBox.getChildren().add(weekDay);
for (Task task : tasks) { for (Task task : tasks) {
Label label = new Label(task.getDescription()); HBox hBox = new HBox(10);
vBox.getChildren().add(label); Label taskName = new Label(task.getName() + ":");
taskName.setStyle("-fx-font-weight: bold");
taskName.setMinWidth(100);
taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
hBox.getChildren().addAll(taskName);
HBox hBoxDescription = new HBox();
Label taskDescription = new Label(task.getDescription());
taskDescription.setWrapText(true);
taskDescription.setMaxSize(600, Double.MAX_VALUE);
Pane puffer = new Pane();
HBox.setHgrow(puffer, Priority.ALWAYS);
CheckBox checkBox = new CheckBox("Task completed?");
checkBox.selectedProperty().addListener((observable, oldValue, newValue) -> {
if (newValue) {
showConfirmation(task, checkBox);
}
});
HBox.setHgrow(checkBox, Priority.NEVER);
hBoxDescription.getChildren().addAll(taskDescription, puffer, checkBox);
vBox.getChildren().addAll(hBox, hBoxDescription);
} }
pane.getChildren().add(vBox); return vBox;
}
/**
* Alert to confirm that task has been completed.
* @param task {@link Task} which is selected
*/
private void showConfirmation(Task task, CheckBox checkBox) {
Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
alert.setTitle("Task Completed?");
alert.setHeaderText("Are you sure you have completed this task?");
alert.setContentText("Confirming that you have completed the task will remove it from the schedule.");
alert.showAndWait()
.ifPresent(buttonType -> {
if (buttonType == ButtonType.OK) {
task.done();
try {
loadTaskList();
} catch (IOException e) {
e.printStackTrace();
}
} else {
checkBox.setSelected(false);
}
});
} }
@@ -233,11 +233,11 @@ public class PlantsController {
RadioButton radioButton = new RadioButton(season.getName()); RadioButton radioButton = new RadioButton(season.getName());
radioButton.setToggleGroup(seasonGroup); radioButton.setToggleGroup(seasonGroup);
radioButton.setPadding(new Insets(0, 0, 10, 0)); radioButton.setPadding(new Insets(0, 0, 10, 0));
if (season.equals(Seasons.AllSEASONS)) { if (season.equals(Seasons.ALLSEASONS)) {
radioButton.setSelected(true); radioButton.setSelected(true);
} }
radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> { radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
if (season.equals(Seasons.AllSEASONS)) { if (season.equals(Seasons.ALLSEASONS)) {
fillPlantListWithHardinessZone(); fillPlantListWithHardinessZone();
} else { } else {
try { try {
@@ -1,13 +1,23 @@
package ch.zhaw.gartenverwaltung; package ch.zhaw.gartenverwaltung;
import ch.zhaw.gartenverwaltung.backgroundtasks.email.SmtpCredentials;
import ch.zhaw.gartenverwaltung.types.HardinessZone; import ch.zhaw.gartenverwaltung.types.HardinessZone;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import java.util.List;
public class Settings { public class Settings {
private static final Settings instance;
private HardinessZone currentHardinessZone = HardinessZone.ZONE_8A; private HardinessZone currentHardinessZone = HardinessZone.ZONE_8A;
private static Settings instance;
private final BooleanProperty showTutorial = new SimpleBooleanProperty(false); private final BooleanProperty showTutorial = new SimpleBooleanProperty(false);
private SmtpCredentials smtpCredentials = new SmtpCredentials("imap.gmail.com", "587", "pm3.hs22.it21b.win.team1@gmail.com", "pm3.hs22.it21b.win.team1@gmail.com", "bisefhhjtrrhtoqr", true);
// Gmail Address: pm3.hs22.it21b.win.team1@gmail.com
// Gmail Passwort: Gartenverwaltung.PM3.2022
// E-Mail Inbox: https://www.mailinator.com/v4/public/inboxes.jsp?to=pm3.hs22.it21b.win.team1
private String mailNotificationReceivers = "pm3.hs22.it21b.win.team1@mailinator.com";
private String mailNotificationSubjectTemplate = "Task %s is due!"; // {0} = Task Name
private String mailNotificationTextTemplate = "Dear user\nYour gardentask %s for plant %s is due at %tF. Don't forget to confirm in your application if the task is done.\nTask description:\n%s"; // {0} = Task Name, {1} = plantname, {2} = nextExecution, {3} = Task description
static { static {
instance = new Settings(); instance = new Settings();
@@ -38,4 +48,20 @@ public class Settings {
public boolean getShowTutorial() { public boolean getShowTutorial() {
return this.showTutorial.get(); return this.showTutorial.get();
} }
public SmtpCredentials getSmtpCredentials() {
return smtpCredentials;
}
public String getMailNotificationReceivers() {
return mailNotificationReceivers;
}
public String getMailNotificationSubjectTemplate() {
return mailNotificationSubjectTemplate;
}
public String getMailNotificationTextTemplate() {
return mailNotificationTextTemplate;
}
} }
@@ -1,21 +1,35 @@
package ch.zhaw.gartenverwaltung; package ch.zhaw.gartenverwaltung;
import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
import ch.zhaw.gartenverwaltung.bootstrap.Inject;
import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
import ch.zhaw.gartenverwaltung.io.PlantList;
import ch.zhaw.gartenverwaltung.models.Garden;
import ch.zhaw.gartenverwaltung.models.GardenSchedule;
import ch.zhaw.gartenverwaltung.types.Crop; import ch.zhaw.gartenverwaltung.types.Crop;
import ch.zhaw.gartenverwaltung.types.Plant;
import ch.zhaw.gartenverwaltung.types.Task; import ch.zhaw.gartenverwaltung.types.Task;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.DateCell; import javafx.scene.control.*;
import javafx.scene.control.DatePicker;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javafx.util.Callback; import javafx.util.Callback;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ResourceBundle; import java.util.ResourceBundle;
public class TaskFormularController implements Initializable { public class TaskFormularController implements Initializable {
private Crop crop; private Crop crop;
private Plant plant;
private Task task = null;
@Inject
private GardenSchedule gardenSchedule;
@Inject
private Garden garden;
@Inject
private PlantList plantList;
@FXML @FXML
private TextArea description_area; private TextArea description_area;
@@ -32,19 +46,28 @@ public class TaskFormularController implements Initializable {
@FXML @FXML
private TextField taskName_field; private TextField taskName_field;
@AfterInject
@SuppressWarnings("unused")
public Task returnResult() { public Task returnResult(Crop crop) {
int interval = 0;
if (!(interval_field.getText().isEmpty() || interval_field.getText().equals(""))) {
interval = Integer.parseInt(interval_field.getText());
}
Task task = new Task(taskName_field.getText(), description_area.getText(), Task task = new Task(taskName_field.getText(), description_area.getText(),
start_datePicker.getValue(), end_datePicker.getValue(), start_datePicker.getValue(), end_datePicker.getValue(),
Integer.parseInt(interval_field.getText()), crop.getCropId().get()); interval, crop.getCropId().get());
if (this.task != null) return this.task.updateTask(task);
return task; return task;
} }
public void setCorp(Crop crop) { public void setCorp(Crop crop) throws HardinessZoneNotSetException, IOException {
this.crop = crop; this.crop = crop;
this.plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
} }
public void setTaskValue(Task task) { public void setTaskValue(Task task) {
this.task = task;
taskName_field.setText(task.getName()); taskName_field.setText(task.getName());
description_area.setText(task.getDescription()); description_area.setText(task.getDescription());
start_datePicker.setValue(task.getStartDate()); start_datePicker.setValue(task.getStartDate());
@@ -56,7 +79,7 @@ public class TaskFormularController implements Initializable {
} }
} }
private Callback<DatePicker, DateCell> getDayCellFactory() { private Callback<DatePicker, DateCell> getDayCellFactoryStartDate() {
return (datePicker) -> new DateCell() { return (datePicker) -> new DateCell() {
private final LocalDate today = LocalDate.now(); private final LocalDate today = LocalDate.now();
@@ -67,20 +90,61 @@ public class TaskFormularController implements Initializable {
setDisable(true); setDisable(true);
setStyle("-fx-background-color: #ffc0cb;"); setStyle("-fx-background-color: #ffc0cb;");
if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0) { if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 0) {
setDisable(false); setDisable(false);
setStyle("-fx-background-color: #32CD32;"); setStyle("-fx-background-color: #32CD32;");
} }
if (end_datePicker.getValue() != null && item.compareTo(end_datePicker.getValue()) > 0) {
setDisable(true);
setStyle("-fx-background-color: #ffc0cb;");
}
} }
}; };
} }
private Callback<DatePicker, DateCell> getDayCellFactoryEndDate() {
return (datePicker) -> new DateCell() {
private final LocalDate today = LocalDate.now();
@Override
public void updateItem(LocalDate item, boolean empty) {
super.updateItem(item, empty);
setDisable(true);
setStyle("-fx-background-color: #ffc0cb;");
if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 0) {
setDisable(false);
setStyle("-fx-background-color: #32CD32;");
}
if (start_datePicker.getValue() != null && item.compareTo(start_datePicker.getValue()) < 0) {
setDisable(true);
setStyle("-fx-background-color: #ffc0cb;");
}
}
};
}
public void initSaveButton(Button button) {
interval_field.textProperty().addListener((observable, oldValue, newValue) -> {
if (!newValue.matches("\\d*")) {
interval_field.setText(newValue.replaceAll("[^\\d]", ""));
}
});
button.disableProperty().bind(start_datePicker.valueProperty().isNull()
.or(taskName_field.textProperty().isEmpty())
.or(description_area.textProperty().isEmpty()));
}
@Override @Override
public void initialize(URL location, ResourceBundle resources) { public void initialize(URL location, ResourceBundle resources) {
start_datePicker.setDayCellFactory(getDayCellFactory()); start_datePicker.setDayCellFactory(getDayCellFactoryStartDate());
start_datePicker.setEditable(false); start_datePicker.setEditable(false);
end_datePicker.setDayCellFactory(getDayCellFactory()); end_datePicker.setDayCellFactory(getDayCellFactoryEndDate());
end_datePicker.setEditable(false); end_datePicker.setEditable(false);
} }
} }
@@ -0,0 +1,41 @@
package ch.zhaw.gartenverwaltung;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
public class TextFieldFormularController {
@FXML
private Label description_label;
@FXML
private TextField text_area;
public void setDescription_label(String string) {
description_label.setText(string);
}
public void setValueTextArea(String string) {
text_area.setText(string);
}
public String getValue() {
return text_area.getText();
}
public void initSaveButton(Button button) {
text_area.textProperty().addListener((observable, oldValue, newValue) -> {
if (newValue.matches("\\d*\\.?\\d*")) {
text_area.setText(newValue);
} else {
text_area.setText(oldValue);
}
});
button.disableProperty().bind(text_area.textProperty().isEmpty());
}
}
@@ -0,0 +1,45 @@
package ch.zhaw.gartenverwaltung.backgroundtasks;
import ch.zhaw.gartenverwaltung.backgroundtasks.weather.WeatherGradenTaskPlanner;
import ch.zhaw.gartenverwaltung.io.CropList;
import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
import ch.zhaw.gartenverwaltung.io.PlantList;
import ch.zhaw.gartenverwaltung.io.TaskList;
import ch.zhaw.gartenverwaltung.models.Garden;
import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
import javax.mail.MessagingException;
import java.io.IOException;
import java.util.TimerTask;
public class BackgroundTasks extends TimerTask {
private final Notifier notifier;
private final WeatherGradenTaskPlanner weatherGardenTaskPlaner;
public BackgroundTasks(TaskList taskList, CropList cropList, PlantList plantList) {
notifier = new Notifier(taskList, plantList, cropList);
weatherGardenTaskPlaner = new WeatherGradenTaskPlanner(taskList, plantList, cropList);
}
@Override
public void run() {
try {
weatherGardenTaskPlaner.refreshTasks();
} catch (IOException | HardinessZoneNotSetException | PlantNotFoundException e) {
e.printStackTrace();
// TODO logger
}
try {
try {
notifier.sendNotifications();
} catch (MessagingException e) {
e.printStackTrace();
// TODO logger
}
} catch (IOException e) {
e.printStackTrace();
// TODO logger
}
}
}
@@ -0,0 +1,60 @@
package ch.zhaw.gartenverwaltung.backgroundtasks;
import ch.zhaw.gartenverwaltung.Settings;
import ch.zhaw.gartenverwaltung.backgroundtasks.email.EMailSender;
import ch.zhaw.gartenverwaltung.io.CropList;
import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
import ch.zhaw.gartenverwaltung.io.PlantList;
import ch.zhaw.gartenverwaltung.io.TaskList;
import ch.zhaw.gartenverwaltung.types.Crop;
import ch.zhaw.gartenverwaltung.types.Task;
import javax.mail.MessagingException;
import java.io.IOException;
import java.time.LocalDate;
public class Notifier {
private final TaskList taskList;
private final CropList cropList;
private final PlantList plantList;
private final EMailSender eMailSender = new EMailSender();
public Notifier(TaskList taskList, PlantList plantList, CropList cropList) {
this.taskList = taskList;
this.cropList = cropList;
this.plantList = plantList;
}
private void sendNotification(Task task) {
String plantName = "unkown plant";
try {
if(cropList.getCropById((task.getCropId())).isPresent()){
Crop crop = cropList.getCropById(task.getCropId()).get();
if(plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).isPresent()) {
plantName = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get().name();
}
}
} catch (IOException | HardinessZoneNotSetException e) {
e.printStackTrace();
// TODO logger
}
String messageSubject = String.format(Settings.getInstance().getMailNotificationSubjectTemplate(), task.getName());
String messageText = String.format(Settings.getInstance().getMailNotificationTextTemplate(), task.getName(), plantName, task.getNextExecution(), task.getDescription());
try {
eMailSender.sendMails(Settings.getInstance().getMailNotificationReceivers(), messageSubject, messageText);
} catch (MessagingException e) {
e.printStackTrace();
// TODO Logger
}
}
public void sendNotifications() throws IOException, MessagingException {
for (Task task : taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)) {
if (task.getNextNotification() != null && task.getNextNotification().isBefore(LocalDate.now().minusDays(1))) {
sendNotification(task);
task.setNextNotification(LocalDate.now().plusDays(1));
taskList.saveTask(task);
}
}
}
}
@@ -0,0 +1,40 @@
package ch.zhaw.gartenverwaltung.backgroundtasks.email;
import ch.zhaw.gartenverwaltung.Settings;
import javax.mail.*;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
public class EMailSender {
public EMailSender(){
}
public void sendMails(String recipients, String subject, String text) throws MessagingException {
// TODO replace printMail with implementation
printMail(recipients, subject, text); // TODO Remove Printing E-Mail to console to test it
MimeMessage message = new MimeMessage(Settings.getInstance().getSmtpCredentials().getSession());
message.addHeader("Content-type", "text/HTML; charset=UTF-8");
message.addHeader("format", "flowed");
message.addHeader("Content-Transfer-Encoding", "8bit");
message.setFrom(new InternetAddress(Settings.getInstance().getSmtpCredentials().fromAddress()));
message.setReplyTo(InternetAddress.parse(Settings.getInstance().getSmtpCredentials().fromAddress(), false));
message.setSubject(subject);
message.setText(text);
message.setSentDate(new Date());
message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(recipients, false));
Transport.send(message);
}
private void printMail(String receiver, String subject, String text){
System.out.printf("\nSending E-Mail:\nTo: %s\nSubject: %s\nMessage:\n%s\n", receiver, subject, text);
}
}
@@ -0,0 +1,41 @@
package ch.zhaw.gartenverwaltung.backgroundtasks.email;
import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import java.net.Authenticator;
import java.util.Properties;
public record SmtpCredentials(
String host,
String port,
String fromAddress,
String username,
String password,
boolean startTLS
) {
private Properties getProperties() {
Properties properties = new Properties();
properties.put("mail.smtp.host", host);
properties.put("mail.smtp.port", port);
properties.put("mail.smtp.auth", "true");
properties.put("mail.smtp.starttls.enable", startTLS ? "true" : "false");
return properties;
}
private javax.mail.Authenticator getAuthenticator() {
return new javax.mail.Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(username, password);
}
};
}
public Session getSession() {
return Session.getInstance(getProperties(), getAuthenticator());
}
}
@@ -0,0 +1,5 @@
package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
public enum SevereWeather {
FROST,SNOW,HAIL,NO_SEVERE_WEATHER,RAIN
}
@@ -0,0 +1,94 @@
package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
import ch.zhaw.gartenverwaltung.io.CropList;
import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
import ch.zhaw.gartenverwaltung.io.PlantList;
import ch.zhaw.gartenverwaltung.io.TaskList;
import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
import ch.zhaw.gartenverwaltung.types.*;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
public class WeatherGradenTaskPlanner {
private final TaskList taskList;
private final PlantList plantList;
private final CropList cropList;
WeatherService weatherService;
private final LocalDate dateSevereWeather = LocalDate.of(22,12,15);
public WeatherGradenTaskPlanner(TaskList taskList, PlantList plantList, CropList cropList) {
this.taskList = taskList;
this.plantList = plantList;
this.cropList = cropList;
weatherService = new WeatherService();
}
public void refreshTasks() throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
getSevereWeatherEvents();
getRainAmount();
}
private void getSevereWeatherEvents() throws IOException {
SevereWeather actualWeather = weatherService.causeSevereWeather(0);
if (SevereWeather.HAIL.equals(actualWeather)) {
createPreHail();
} else if (SevereWeather.FROST.equals(actualWeather)) {
createPreFrost();
} else if (SevereWeather.SNOW.equals(actualWeather)) {
createPreSnow();
}
}
private void getRainAmount() throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
int rainAmount = weatherService.causeRainAmount(3);
adjustWateringTask(rainAmount);
}
public void createPreHail() throws IOException {
Task preHailTask = new Task("Hail",
"During a summer Thunderstorm it could hail heavily. THe Hail could damage the crops. To prevent damage cover the plants with a strong tarpaulin",
dateSevereWeather.minusDays(1L));
preHailTask.withId(Long.MAX_VALUE);
taskList.saveTask(preHailTask);
}
public void createPreFrost() throws IOException {
Task preFrostTask = new Task("Frost",
"The temperatur falls below zero degrees, cover especially the root with wool",
dateSevereWeather.minusDays(1L));
preFrostTask.withId(Long.MAX_VALUE);
taskList.saveTask(preFrostTask);
}
public void createPreSnow() throws IOException {
Task preSnowTask = new Task("Snow",
"The weather brings little snowfall. Cover your crops",
dateSevereWeather.minusDays(1L));
preSnowTask.withId(Long.MAX_VALUE);
taskList.saveTask(preSnowTask);
}
public void adjustWateringTask(int rainAmount) throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
for (Crop crop : cropList.getCrops()) {
Plant plant = plantList.getPlantById(HardinessZone.ZONE_8A,crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
if(plant.wateringCycle().litersPerSqM() < rainAmount){
adjustNextExecutionOfWateringTask(taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(7)));
}
}
}
// vom startdatum abhängig,
private void adjustNextExecutionOfWateringTask(List<Task> cropTaskList){
for(Task task : cropTaskList){
if(task.getName().equals("water plant")){
task.setNextExecution(task.getNextExecution().plusDays(task.getInterval().orElse(1)));
}
}
}
}
@@ -0,0 +1,29 @@
package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
public class WeatherService {
private static final int NO_RAIN = 0;
private static final int LITTLE_RAIN = 15;
private static final int RAIN = 25;
private static final int HEAVY_RAIN = 50;
public SevereWeather causeSevereWeather(int randomWeather) {
return switch (randomWeather) {
case 1 -> SevereWeather.HAIL;
case 2 -> SevereWeather.SNOW;
case 3 -> SevereWeather.FROST;
default -> null;
};
}
public int causeRainAmount(int randomRainAmount) {
return switch (randomRainAmount) {
case 1 -> NO_RAIN;
case 2 -> LITTLE_RAIN;
case 3 -> RAIN;
case 4 -> HEAVY_RAIN;
default -> -1;
};
}
}
@@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* Annotates a method to be executed after all dependencies annotates with {@link Inject} * Annotates a method to be executed after all dependencies annotated with {@link Inject}
* have been injected. * have been injected.
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@@ -1,12 +1,7 @@
package ch.zhaw.gartenverwaltung.bootstrap; package ch.zhaw.gartenverwaltung.bootstrap;
import ch.zhaw.gartenverwaltung.HelloApplication; import ch.zhaw.gartenverwaltung.Main;
import ch.zhaw.gartenverwaltung.io.CropList; import ch.zhaw.gartenverwaltung.io.*;
import ch.zhaw.gartenverwaltung.io.JsonCropList;
import ch.zhaw.gartenverwaltung.io.JsonPlantList;
import ch.zhaw.gartenverwaltung.io.JsonTaskList;
import ch.zhaw.gartenverwaltung.io.PlantList;
import ch.zhaw.gartenverwaltung.io.TaskList;
import ch.zhaw.gartenverwaltung.models.Garden; import ch.zhaw.gartenverwaltung.models.Garden;
import ch.zhaw.gartenverwaltung.models.GardenSchedule; import ch.zhaw.gartenverwaltung.models.GardenSchedule;
import ch.zhaw.gartenverwaltung.models.PlantListModel; import ch.zhaw.gartenverwaltung.models.PlantListModel;
@@ -23,6 +18,10 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
/**
* Class responsible for bootstrapping the application wide dependencies
* and injecting them into JavaFX Controllers.
*/
public class AppLoader { public class AppLoader {
/** /**
* Caching the panes * Caching the panes
@@ -32,17 +31,24 @@ public class AppLoader {
/** /**
* Application-wide dependencies * Application-wide dependencies
*/ */
private final PlantList plantList = new JsonPlantList(); private final Map<String, Object> dependencies = new HashMap<>();
private final CropList cropList = new JsonCropList();
private final TaskList taskList = new JsonTaskList();
private final GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
private final Garden garden = new Garden(gardenSchedule, cropList);
public AppLoader() throws IOException { public AppLoader() throws IOException {
} PlantList plantList = new JsonPlantList();
CropList cropList = new JsonCropList();
TaskList taskList = new JsonTaskList();
GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
dependencies.put(PlantList.class.getSimpleName(), plantList);
dependencies.put(CropList.class.getSimpleName(), cropList);
dependencies.put(TaskList.class.getSimpleName(), taskList);
dependencies.put(PlantListModel.class.getSimpleName(), new PlantListModel(plantList));
dependencies.put(GardenSchedule.class.getSimpleName(), gardenSchedule);
dependencies.put(Garden.class.getSimpleName(), new Garden(gardenSchedule, cropList));
dependencies.put(AppLoader.class.getSimpleName(), this);
}
/** /**
* Loads and returns a {@link Pane} (cached). * Loads and returns a {@link Pane} (cached).
@@ -71,9 +77,12 @@ public class AppLoader {
* @throws IOException if the file could not be loaded * @throws IOException if the file could not be loaded
*/ */
public Object loadSceneToStage(String fxmlFile, Stage appendee) throws IOException { public Object loadSceneToStage(String fxmlFile, Stage appendee) throws IOException {
FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile))); FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
Pane root = loader.load(); Pane root = loader.load();
appendee.setScene(new Scene(root)); Scene scene = new Scene(root);
String css = Objects.requireNonNull(this.getClass().getResource("styles.css")).toExternalForm();
appendee.setScene(scene);
scene.getStylesheets().add(css);
Object controller = loader.getController(); Object controller = loader.getController();
annotationInject(controller); annotationInject(controller);
return controller; return controller;
@@ -90,7 +99,7 @@ public class AppLoader {
* @throws IOException if the file could not be loaded * @throws IOException if the file could not be loaded
*/ */
public Object loadPaneToDialog(String fxmlFile, DialogPane appendee) throws IOException { public Object loadPaneToDialog(String fxmlFile, DialogPane appendee) throws IOException {
FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile))); FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
appendee.setContent(loader.load()); appendee.setContent(loader.load());
Object controller = loader.getController(); Object controller = loader.getController();
annotationInject(controller); annotationInject(controller);
@@ -105,7 +114,7 @@ public class AppLoader {
* @throws IOException if the file could not be loaded * @throws IOException if the file could not be loaded
*/ */
public void loadAndCacheFxml(String fxmlFile) throws IOException { public void loadAndCacheFxml(String fxmlFile) throws IOException {
FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile))); FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
Pane pane = loader.load(); Pane pane = loader.load();
panes.put(fxmlFile, pane); panes.put(fxmlFile, pane);
annotationInject(loader.getController()); annotationInject(loader.getController());
@@ -132,26 +141,18 @@ public class AppLoader {
}); });
Arrays.stream(controller.getClass().getMethods()) Arrays.stream(controller.getClass().getMethods())
.filter(method -> method.isAnnotationPresent(AfterInject.class)) .filter(method -> method.isAnnotationPresent(AfterInject.class) && method.getParameterCount() == 0)
.forEach(afterInjectMethod -> { .forEach(afterInjectMethod -> {
if (afterInjectMethod.getParameterCount() == 0) { try {
try { afterInjectMethod.invoke(controller);
afterInjectMethod.invoke(controller); } catch (IllegalAccessException | InvocationTargetException e) {
} catch (IllegalAccessException | InvocationTargetException e) { // TODO: Log
e.printStackTrace(); e.printStackTrace();
}
} }
}); });
} }
private Object getAppDependency(Class<?> type) { public Object getAppDependency(Class<?> type) {
return switch (type.getSimpleName()) { return dependencies.get(type.getSimpleName());
case "Garden" -> garden;
case "PlantList" -> plantList;
case "PlantListModel" -> new PlantListModel(plantList);
case "GardenSchedule" -> gardenSchedule;
case "AppLoader" -> this;
default -> null;
};
} }
} }
@@ -3,11 +3,20 @@ package ch.zhaw.gartenverwaltung.bootstrap;
import javafx.event.Event; import javafx.event.Event;
import javafx.event.EventType; import javafx.event.EventType;
/**
* Represents an event that should lead to a view being changed.
*/
public class ChangeViewEvent extends Event { public class ChangeViewEvent extends Event {
private final String view; private final String view;
public static final EventType<ChangeViewEvent> CHANGE_MAIN_VIEW = new EventType<>("CHANGE_MAIN_VIEW"); public static final EventType<ChangeViewEvent> CHANGE_MAIN_VIEW = new EventType<>("CHANGE_MAIN_VIEW");
/**
* Creates an Event that should lead to the main view being changed.
*
* @param eventType The {@link EventType<ChangeViewEvent>} specifying which view should be changed.
* @param view The filename of the View to be changed to
*/
public ChangeViewEvent(EventType<? extends Event> eventType, String view) { public ChangeViewEvent(EventType<? extends Event> eventType, String view) {
super(eventType); super(eventType);
this.view = view; this.view = view;
@@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* Annotates a Field to be injected from the application-dependencies * Annotates a Field to be injected from the application-dependencies.
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
@@ -6,6 +6,10 @@ import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
/**
* Represents a List of {@link Crop}s.
* The interface specifies the operations to add/update and remove entries.
*/
public interface CropList { public interface CropList {
/** /**
* Yields a list of all {@link Crop}s in the database. * Yields a list of all {@link Crop}s in the database.
@@ -1,10 +1,18 @@
package ch.zhaw.gartenverwaltung.io; package ch.zhaw.gartenverwaltung.io;
/**
* Provides an sequential ID starting from the given initial Value.
*/
public class IdProvider { public class IdProvider {
private long currentId; private long currentId;
public IdProvider(long initialValue) { public IdProvider(long initialValue) {
currentId = initialValue; currentId = initialValue;
} }
/**
* Yields the next ID in the sequence.
* @return The next ID
*/
public long incrementAndGet() { public long incrementAndGet() {
return ++currentId; return ++currentId;
} }
@@ -19,6 +19,11 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
/**
* Implements the {@link CropList} interface for reading and writing {@link Crop} objects
* from and to a local JSON file.
* The reads are cached to minimize file-io operations.
*/
public class JsonCropList implements CropList { public class JsonCropList implements CropList {
private final URL dataSource; private final URL dataSource;
@@ -40,7 +45,7 @@ public class JsonCropList implements CropList {
} }
/** /**
* Default constructor * Default constructor. Uses a file from the app resources.
*/ */
public JsonCropList() { public JsonCropList() {
this.dataSource = getClass().getResource("user-crops.json"); this.dataSource = getClass().getResource("user-crops.json");
@@ -20,8 +20,8 @@ import java.util.Map;
import java.util.Optional; import java.util.Optional;
/** /**
* Implements the {@link PlantList} interface for loading {@link Plant} objects * Implements the {@link PlantList} interface for reading {@link Plant} objects
* from a JSON file. * from a local JSON file.
* The reads are cached to minimize file-io operations. * The reads are cached to minimize file-io operations.
*/ */
public class JsonPlantList implements PlantList { public class JsonPlantList implements PlantList {
@@ -44,9 +44,17 @@ public class JsonPlantList implements PlantList {
imageModule.addDeserializer(Image.class, new PlantImageDeserializer()); imageModule.addDeserializer(Image.class, new PlantImageDeserializer());
} }
/**
* Default constructor. Uses a file from the app resources.
*/
public JsonPlantList() { public JsonPlantList() {
this.dataSource = getClass().getResource("plantdb.json"); this.dataSource = getClass().getResource("plantdb.json");
} }
/**
* Constructor to use a specified {@link URL} as a {@link #dataSource}
* @param dataSource A {@link URL} to the file to be used as a data source
*/
public JsonPlantList(URL dataSource) { public JsonPlantList(URL dataSource) {
this.dataSource = dataSource; this.dataSource = dataSource;
} }
@@ -67,7 +75,7 @@ public class JsonPlantList implements PlantList {
} }
/** /**
* @see PlantList#getPlantById(long) * @see PlantList#getPlantById(HardinessZone, long)
*/ */
@Override @Override
public Optional<Plant> getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException { public Optional<Plant> getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException {
@@ -13,14 +13,15 @@ import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* Implements the {@link TaskList} interface for loading and writing {@link Task} objects * Implements the {@link TaskList} interface for reading and writing {@link Task} objects
* from and to a JSON file. * from and to a local JSON file.
* The reads are cached to minimize file-io operations. * The reads are cached to minimize file-io operations.
*/ */
public class JsonTaskList implements TaskList { public class JsonTaskList implements TaskList {
@@ -29,6 +30,7 @@ public class JsonTaskList implements TaskList {
private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!"; private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!";
private Map<Long, Task> taskMap = Collections.emptyMap(); private Map<Long, Task> taskMap = Collections.emptyMap();
private final List<TaskListObserver> subscribers = new ArrayList<>();
/** /**
* Creating constant objects required to deserialize the {@link LocalDate} classes * Creating constant objects required to deserialize the {@link LocalDate} classes
@@ -43,9 +45,17 @@ public class JsonTaskList implements TaskList {
timeModule.addSerializer(LocalDate.class, dateSerializer); timeModule.addSerializer(LocalDate.class, dateSerializer);
} }
/**
* Default constructor. Uses a file from the app resources.
*/
public JsonTaskList() { public JsonTaskList() {
this.dataSource = getClass().getResource("taskdb.json"); this.dataSource = getClass().getResource("taskdb.json");
} }
/**
* Constructor to use a specified {@link URL} as a {@link #dataSource}
* @param dataSource A {@link URL} to the file to be used as a data source
*/
public JsonTaskList(URL dataSource) { public JsonTaskList(URL dataSource) {
this.dataSource = dataSource; this.dataSource = dataSource;
} }
@@ -86,7 +96,9 @@ public class JsonTaskList implements TaskList {
if(taskMap.isEmpty()) { if(taskMap.isEmpty()) {
loadTaskListFromFile(); loadTaskListFromFile();
} }
taskMap.values().removeIf(task -> task.getCropId() == cropId); taskMap.entrySet().removeIf(entry -> entry.getValue().getCropId() == cropId);
writeTaskListToFile();
notifySubscribers();
} }
/** /**
@@ -107,6 +119,7 @@ public class JsonTaskList implements TaskList {
taskMap.put(id, task.withId(id)); taskMap.put(id, task.withId(id));
writeTaskListToFile(); writeTaskListToFile();
notifySubscribers();
} }
/** /**
@@ -126,6 +139,25 @@ public class JsonTaskList implements TaskList {
taskMap.remove(taskId); taskMap.remove(taskId);
writeTaskListToFile(); writeTaskListToFile();
} }
notifySubscribers();
}
/**
* {@inheritDoc}
* @param observer The change handler
*/
@Override
public void subscribe(TaskListObserver observer) {
subscribers.add(observer);
}
/**
* Calls the change handler method on all registered observers.
*/
private void notifySubscribers() {
for (TaskListObserver subscriber : subscribers) {
subscriber.onChange(taskMap.values().stream().toList());
}
} }
/** /**
@@ -8,7 +8,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
/** /**
* A database of {@link Plant}s. * A List of {@link Plant}s.
* The interface specifies the minimal required operations. * The interface specifies the minimal required operations.
*/ */
public interface PlantList { public interface PlantList {
@@ -7,8 +7,8 @@ import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
* A database of {@link Task}s. * Represents a List of {@link Task}s.
* The interface specifies the minimal required operations. * The interface specifies the operations to add/update and remove entries.
*/ */
public interface TaskList { public interface TaskList {
/** /**
@@ -51,4 +51,22 @@ public interface TaskList {
* @throws IOException If the database cannot be accessed * @throws IOException If the database cannot be accessed
*/ */
void removeTask(Task task) throws IOException; void removeTask(Task task) throws IOException;
/**
* Registers an observer to be notified of Changes in the TaskList
* @param observer The change handler
*/
void subscribe(TaskListObserver observer);
/**
* Specifies an observer for a TaskList
*/
@FunctionalInterface
interface TaskListObserver {
/**
* Method which will be called when changes occur.
* @param newTaskList The new values
*/
void onChange(List<Task> newTaskList);
}
} }
@@ -7,6 +7,9 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import java.io.IOException; import java.io.IOException;
/**
* Used by the Jackson Library to deserialize a String to a {@link GrowthPhaseType}
*/
public class GrowthPhaseTypeDeserializer extends StdDeserializer<GrowthPhaseType> { public class GrowthPhaseTypeDeserializer extends StdDeserializer<GrowthPhaseType> {
public GrowthPhaseTypeDeserializer(Class<?> vc) { public GrowthPhaseTypeDeserializer(Class<?> vc) {
super(vc); super(vc);
@@ -7,6 +7,9 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import java.io.IOException; import java.io.IOException;
/**
* Used by the Jackson Library to deserialize a String to a {@link HardinessZone}
*/
public class HardinessZoneDeserializer extends StdDeserializer<HardinessZone> { public class HardinessZoneDeserializer extends StdDeserializer<HardinessZone> {
public HardinessZoneDeserializer(Class<?> vc) { public HardinessZoneDeserializer(Class<?> vc) {
super(vc); super(vc);
@@ -13,6 +13,9 @@ import java.io.InputStream;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
/**
* Used by the Jackson Library to deserialize a String to a {@link Image}
*/
public class PlantImageDeserializer extends JsonDeserializer<Image> { public class PlantImageDeserializer extends JsonDeserializer<Image> {
@Override @Override
@@ -70,6 +70,19 @@ public class Garden {
plantedCrops.clear(); plantedCrops.clear();
plantedCrops.addAll(cropList.getCrops()); plantedCrops.addAll(cropList.getCrops());
} }
/**
* Updates the {@link Crop} from the file and the cache
*
* @param crop The crop which is being updated
* @throws IOException If the database cannot be accessed
*/
public void updateCrop(Crop crop) throws IOException {
cropList.saveCrop(crop);
plantedCrops.clear();
plantedCrops.addAll(cropList.getCrops());
}
/** /**
* Returns a list of {@link Crop}s which are currently in the gardenplan. * Returns a list of {@link Crop}s which are currently in the gardenplan.
* *
@@ -19,6 +19,7 @@ public class GardenSchedule {
* Comparators to create sorted Task List * Comparators to create sorted Task List
*/ */
static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate); static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate);
static final Comparator<Task> sortByNextExecution = Comparator.comparing(Task::getNextExecution);
/** /**
* Constructor to create Database Objects. * Constructor to create Database Objects.
@@ -46,7 +47,12 @@ public class GardenSchedule {
*/ */
public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException { public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new); Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
for (GrowthPhase growthPhase : plant.lifecycle()) { int growPhaseGroup = plant.getGrowphaseGroupForDate(crop.getStartDate());
addTask(new Task("watering Task", "pour water over the plant circa : "+ plant.wateringCycle().litersPerSqM() +" per square meter",
crop.getStartDate(), crop.getStartDate().plusDays(plant.timeToHarvest(0)),
plant.wateringCycle().interval(), crop.getCropId().orElse(0L)));
for (GrowthPhase growthPhase : plant.lifecycleForGroup(growPhaseGroup)) {
for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) { for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L))); addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
} }
@@ -135,10 +141,27 @@ public class GardenSchedule {
* @throws IOException If the database cannot be accessed * @throws IOException If the database cannot be accessed
*/ */
public List<List<Task>> getTasksUpcomingWeek() throws IOException { public List<List<Task>> getTasksUpcomingWeek() throws IOException {
final int listLength = 7;
List<Task> weekTasks = taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(listLength - 1));
List<List<Task>> dayTaskList = new ArrayList<>(); List<List<Task>> dayTaskList = new ArrayList<>();
for(int i = 0; i < 7; i++) { for(int i = 0; i < listLength; i++) {
LocalDate date = LocalDate.now().plusDays(i); LocalDate date = LocalDate.now().plusDays(i);
dayTaskList.add(taskList.getTaskList(date, date)); dayTaskList.add(new ArrayList<>());
final int finalI = i;
weekTasks.forEach(task -> {
if (task.getNextExecution() == null) {
task.isDone();
} else {
LocalDate checkDate = task.getNextExecution();
do {
if (date.equals(checkDate) && !date.isAfter(task.getEndDate().orElse(LocalDate.MIN))) {
dayTaskList.get(finalI).add(task);
}
checkDate = checkDate.plusDays(task.getInterval().orElse(0));
} while (!(task.getInterval().orElse(0) == 0) && checkDate.isBefore(LocalDate.now().plusDays(listLength)));
}
});
} }
return dayTaskList; return dayTaskList;
} }
@@ -149,11 +172,8 @@ public class GardenSchedule {
* @throws IOException If the database cannot be accessed * @throws IOException If the database cannot be accessed
*/ */
public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException { public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
List<List<Task>> dayTaskList = new ArrayList<>(); List<List<Task>> dayTaskList = getTasksUpcomingWeek();
for(int i = 0; i < 7; i++) { dayTaskList.forEach(taskList -> taskList.removeIf(task -> task.getCropId() != cropId));
LocalDate date = LocalDate.now().plusDays(i);
dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId));
}
return dayTaskList; return dayTaskList;
} }
@@ -165,7 +185,7 @@ public class GardenSchedule {
* @throws IOException If the database cannot be accessed * @throws IOException If the database cannot be accessed
*/ */
public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException { public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException {
return getSortedTaskList(taskList.getTaskList(start, end), sortByStartDate); return getSortedTaskList(taskList.getTaskList(start, end), sortByNextExecution);
} }
/** /**
@@ -175,6 +195,6 @@ public class GardenSchedule {
* @return a sorted coppy of the given Tasklist * @return a sorted coppy of the given Tasklist
*/ */
private List<Task> getSortedTaskList(List<Task> taskList, Comparator<Task> comparator) { private List<Task> getSortedTaskList(List<Task> taskList, Comparator<Task> comparator) {
return taskList.stream().sorted(comparator).collect(Collectors.toList()); return taskList.stream().filter(task -> task.getNextExecution() != null).sorted(comparator).collect(Collectors.toList());
} }
} }
@@ -1,5 +1,8 @@
package ch.zhaw.gartenverwaltung.types; package ch.zhaw.gartenverwaltung.types;
import ch.zhaw.gartenverwaltung.io.JsonPlantList;
import ch.zhaw.gartenverwaltung.io.PlantList;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@@ -12,7 +12,6 @@ public record GrowthPhase(
MonthDay startDate, MonthDay startDate,
MonthDay endDate, MonthDay endDate,
int group, int group,
WateringCycle wateringCycle,
@JsonDeserialize(using = GrowthPhaseTypeDeserializer.class) GrowthPhaseType type, @JsonDeserialize(using = GrowthPhaseTypeDeserializer.class) GrowthPhaseType type,
@JsonDeserialize(using = HardinessZoneDeserializer.class) HardinessZone zone, @JsonDeserialize(using = HardinessZoneDeserializer.class) HardinessZone zone,
List<TaskTemplate> taskTemplates) { List<TaskTemplate> taskTemplates) {
@@ -18,6 +18,7 @@ public record Plant(
int light, int light,
String soil, String soil,
List<Pest> pests, List<Pest> pests,
WateringCycle wateringCycle,
List<GrowthPhase> lifecycle) { List<GrowthPhase> lifecycle) {
/** /**
@@ -39,6 +40,16 @@ public record Plant(
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
public int getGrowphaseGroupForDate(LocalDate date) {
for(GrowthPhase growthPhase : lifecycle){
MonthDay plantingDate = MonthDay.of(date.getMonth().getValue(), date.getDayOfMonth());
if(plantingDate.isAfter(growthPhase.startDate()) && plantingDate.isBefore(growthPhase.endDate())){
return growthPhase.group();
}
}
return 0; // TODO implement
}
/** /**
* get sow date from given harvest day from lifecycle group * get sow date from given harvest day from lifecycle group
* @param harvestDate date of the harvest * @param harvestDate date of the harvest
@@ -56,16 +67,16 @@ public record Plant(
public int timeToHarvest(int group) { public int timeToHarvest(int group) {
List<GrowthPhase> activeLifecycle = lifecycleForGroup(group); List<GrowthPhase> activeLifecycle = lifecycleForGroup(group);
GrowthPhase sow = activeLifecycle.stream() GrowthPhase sow = activeLifecycle.stream()
.filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.SOW)) .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.SOW))
.findFirst() .findFirst()
.orElseThrow(); .orElseThrow();
GrowthPhase harvest = activeLifecycle.stream() GrowthPhase harvest = activeLifecycle.stream()
.filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.HARVEST)) .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST))
.findFirst() .findFirst()
.orElseThrow(); .orElseThrow();
int currentYear = LocalDate.now().getYear(); 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) { public int lifecycleGroupFromHarvestDate(LocalDate harvestDate) {
@@ -3,7 +3,7 @@ package ch.zhaw.gartenverwaltung.types;
import java.time.MonthDay; import java.time.MonthDay;
public enum Seasons { public enum Seasons {
AllSEASONS("--01-01", "--12-31", "All Seasons"), ALLSEASONS("--01-01", "--12-31", "All Seasons"),
SPRING("--03-01", "--05-30", "Spring"), SPRING("--03-01", "--05-30", "Spring"),
SUMMER("--06-01", "--08-30", "Summer"), SUMMER("--06-01", "--08-30", "Summer"),
AUTUMN("--09-01", "--11-30", "Autumn"), AUTUMN("--09-01", "--11-30", "Autumn"),
@@ -10,12 +10,15 @@ import java.util.Optional;
*/ */
public class Task { public class Task {
private Long id; private Long id;
private final String name; private String name;
private final String description; private String description;
private final LocalDate startDate; private LocalDate startDate;
private Integer interval; private Integer interval;
private LocalDate endDate; private LocalDate endDate;
private LocalDate nextExecution;
private LocalDate nextNotification;
private long cropId; private long cropId;
private boolean done;
/** /**
* default constructor * default constructor
@@ -25,19 +28,33 @@ public class Task {
name= ""; name= "";
description= ""; description= "";
startDate = LocalDate.now(); startDate = LocalDate.now();
endDate = startDate;
nextExecution = startDate;
} }
public Task(String name, String description, LocalDate startDate, long cropId) { public Task(String name, String description, LocalDate startDate, long cropId) {
this.name = name; this.name = name;
this.description = description; this.description = description;
this.startDate = startDate; this.startDate = startDate;
this.endDate = startDate;
nextExecution = startDate;
this.cropId = cropId; this.cropId = cropId;
} }
/**
* Constructor for weather events
*/
public Task(String name, String description, LocalDate startDate) {
this.name = name;
this.description = description;
this.startDate = startDate;
}
public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) { public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) {
this.name = name; this.name = name;
this.description = description; this.description = description;
this.startDate = startDate; this.startDate = startDate;
nextExecution = startDate;
this.endDate = endDate; this.endDate = endDate;
this.interval = interval; this.interval = interval;
this.cropId = cropId; this.cropId = cropId;
@@ -58,10 +75,34 @@ public class Task {
} }
public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){ public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){
return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate); return endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
}
public void done(){
if(interval != null && interval != 0 && !nextExecution.plusDays(interval).isAfter(endDate)){
nextExecution = nextExecution.plusDays(interval);
nextNotification = nextExecution;
} else {
nextExecution = null;
nextNotification = null;
}
}
public boolean isDone(){
return nextExecution == null;
}
public void setNextExecution(LocalDate nextExecution) {
this.nextExecution = nextExecution;
}
public void setNextNotification(LocalDate nextNotification) {
this.nextNotification = nextNotification;
} }
// Getters // Getters
public LocalDate getNextNotification() { return nextNotification; }
public LocalDate getNextExecution() { return nextExecution; }
public Optional<Long> getId() { return Optional.ofNullable(id); } public Optional<Long> getId() { return Optional.ofNullable(id); }
public String getName() { return name; } public String getName() { return name; }
public String getDescription() { return description; } public String getDescription() { return description; }
@@ -74,4 +115,14 @@ public class Task {
public Optional<LocalDate> getEndDate() { public Optional<LocalDate> getEndDate() {
return Optional.ofNullable(endDate); return Optional.ofNullable(endDate);
} }
public Task updateTask(Task task) {
this.name = task.getName();
this.description = task.getDescription();
this.startDate = task.getStartDate();
this.endDate = task.getEndDate().orElse(null);
this.interval = task.getInterval().orElse(0);
this.cropId = task.getCropId();
return this;
}
} }
@@ -16,10 +16,6 @@ public class TaskTemplate {
@JsonProperty @JsonProperty
private Integer interval; private Integer interval;
// TODO: reconsider if we need this
@JsonProperty
private boolean isOptional = false;
/** /**
* Default constructor * Default constructor
* (Used by deserializer) * (Used by deserializer)
@@ -46,7 +42,11 @@ public class TaskTemplate {
} }
public Task generateTask(LocalDate realStartDate, long cropId) { public Task generateTask(LocalDate realStartDate, long cropId) {
LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null; LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : realStartDate;
if (interval == null) {
this.interval = 0;
}
return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId) return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId)
.withInterval(interval) .withInterval(interval)
+6
View File
@@ -5,6 +5,8 @@ module ch.zhaw.gartenverwaltung {
requires com.fasterxml.jackson.datatype.jsr310; requires com.fasterxml.jackson.datatype.jsr310;
requires com.fasterxml.jackson.datatype.jdk8; requires com.fasterxml.jackson.datatype.jdk8;
requires java.logging; requires java.logging;
requires java.mail;
opens ch.zhaw.gartenverwaltung to javafx.fxml; opens ch.zhaw.gartenverwaltung to javafx.fxml;
opens ch.zhaw.gartenverwaltung.types to com.fasterxml.jackson.databind; opens ch.zhaw.gartenverwaltung.types to com.fasterxml.jackson.databind;
@@ -13,4 +15,8 @@ module ch.zhaw.gartenverwaltung {
exports ch.zhaw.gartenverwaltung.types; exports ch.zhaw.gartenverwaltung.types;
exports ch.zhaw.gartenverwaltung.models; exports ch.zhaw.gartenverwaltung.models;
exports ch.zhaw.gartenverwaltung.json; exports ch.zhaw.gartenverwaltung.json;
exports ch.zhaw.gartenverwaltung.backgroundtasks;
opens ch.zhaw.gartenverwaltung.backgroundtasks to javafx.fxml;
exports ch.zhaw.gartenverwaltung.backgroundtasks.email;
opens ch.zhaw.gartenverwaltung.backgroundtasks.email to javafx.fxml;
} }
@@ -107,7 +107,7 @@
<Insets right="60.0" /> <Insets right="60.0" />
</HBox.margin> </HBox.margin>
</Label> </Label>
<Label fx:id="area_label" text="Label"> <Label fx:id="area_label" minWidth="-Infinity" prefWidth="50.0" text="Label">
<HBox.margin> <HBox.margin>
<Insets right="10.0" /> <Insets right="10.0" />
</HBox.margin> </HBox.margin>
@@ -125,7 +125,7 @@
<Insets right="40.0" /> <Insets right="40.0" />
</HBox.margin> </HBox.margin>
</Label> </Label>
<Label fx:id="location_label" text="Label"> <Label fx:id="location_label" minHeight="-Infinity" prefWidth="50.0" text="Label">
<HBox.margin> <HBox.margin>
<Insets right="10.0" /> <Insets right="10.0" />
</HBox.margin> </HBox.margin>
@@ -7,14 +7,14 @@
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="938.0" prefWidth="1110.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MainFXMLController"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="938.0" prefWidth="1110.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MainFXMLController">
<children> <children>
<HBox maxWidth="35.0" minHeight="35.0" prefHeight="38.0" prefWidth="1110.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <HBox fx:id="menubar" maxWidth="35.0" minHeight="40.0" prefHeight="38.0" prefWidth="1110.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children> <children>
<Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" /> <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="38.0" HBox.hgrow="NEVER" />
<Button fx:id="myGarden_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="My Garden" /> <Button fx:id="myGarden_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="My Garden" />
<Button fx:id="mySchedule_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMySchedule" prefHeight="38.0" prefWidth="121.0" text="My Schedule" /> <Button fx:id="mySchedule_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMySchedule" prefHeight="38.0" prefWidth="121.0" text="My Schedule" />
<Button fx:id="tutorial_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#showTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" /> <Button fx:id="tutorial_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#showTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
<Pane maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" /> <Pane fx:id="menu_pane" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
<Button fx:id="settings_button" maxHeight="1.7976931348623157E308" mnemonicParsing="false" onAction="#openSettings" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" /> <Button fx:id="settings_button" mnemonicParsing="false" onAction="#openSettings" prefHeight="38.0" prefWidth="38.0" HBox.hgrow="NEVER" />
</children> </children>
</HBox> </HBox>
<AnchorPane fx:id="mainPane" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="35.0" /> <AnchorPane fx:id="mainPane" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="35.0" />
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?> <?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="572.0" prefWidth="867.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyScheduleController">
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="572.0" prefWidth="867.0"
xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyScheduleController">
<children> <children>
<Label layoutX="14.0" layoutY="14.0" text="MySchedule"> <Label layoutX="14.0" layoutY="14.0" text="MySchedule">
<font> <font>
@@ -22,41 +18,18 @@
</Label> </Label>
<HBox layoutY="31.0" prefHeight="541.0" prefWidth="867.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="50.0"> <HBox layoutY="31.0" prefHeight="541.0" prefWidth="867.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="50.0">
<children> <children>
<ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="365.0" HBox.hgrow="NEVER" /> <ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="271.0" HBox.hgrow="NEVER">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin></ListView>
<VBox maxWidth="1.7976931348623157E308" prefHeight="537.0" prefWidth="650.0" HBox.hgrow="ALWAYS"> <VBox maxWidth="1.7976931348623157E308" prefHeight="537.0" prefWidth="650.0" HBox.hgrow="ALWAYS">
<children> <children>
<GridPane alignment="CENTER_LEFT" gridLinesVisible="true" maxWidth="1.7976931348623157E308" prefHeight="403.0" prefWidth="575.0" VBox.vgrow="ALWAYS"> <ListView fx:id="week_listView" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<columnConstraints> <VBox.margin>
<ColumnConstraints fillWidth="false" hgrow="NEVER" maxWidth="278.0" minWidth="100.0" prefWidth="173.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
<ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="402.0" /> </VBox.margin>
</columnConstraints> </ListView>
<rowConstraints> <Pane prefHeight="131.0" prefWidth="593.0" VBox.vgrow="NEVER">
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label fx:id="day1_label" alignment="CENTER" prefHeight="32.0" prefWidth="173.0" text="Label" />
<Label fx:id="day2_label" alignment="CENTER" prefHeight="29.0" prefWidth="173.0" text="Label" GridPane.rowIndex="1" />
<Label fx:id="day3_label" alignment="CENTER" prefHeight="32.0" prefWidth="172.0" text="Label" GridPane.rowIndex="2" />
<Label fx:id="day4_label" alignment="CENTER" prefHeight="35.0" prefWidth="173.0" text="Label" GridPane.rowIndex="3" />
<Label fx:id="day5_label" alignment="CENTER" prefHeight="31.0" prefWidth="173.0" text="Label" GridPane.rowIndex="4" />
<Label fx:id="day6_label" alignment="CENTER" prefHeight="31.0" prefWidth="173.0" text="Label" GridPane.rowIndex="5" />
<Label fx:id="day7_label" alignment="CENTER" prefHeight="35.0" prefWidth="173.0" text="Label" GridPane.rowIndex="6" />
<Pane fx:id="day1_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" />
<Pane fx:id="day2_pane" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Pane fx:id="day3_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Pane fx:id="day4_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Pane fx:id="day5_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Pane fx:id="day6_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5" />
<Pane fx:id="day7_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
</children>
</GridPane>
<Pane prefHeight="119.0" prefWidth="575.0" VBox.vgrow="NEVER">
<children> <children>
<Label alignment="TOP_LEFT" layoutX="14.0" layoutY="14.0" prefHeight="17.0" prefWidth="550.0" text="Importants Information:" wrapText="true"> <Label alignment="TOP_LEFT" layoutX="14.0" layoutY="14.0" prefHeight="17.0" prefWidth="550.0" text="Importants Information:" wrapText="true">
<font> <font>
@@ -65,6 +38,9 @@
</Label> </Label>
<Label fx:id="information_label" alignment="TOP_LEFT" layoutX="14.0" layoutY="31.0" maxWidth="1.7976931348623157E308" prefHeight="82.0" prefWidth="550.0" text="Label" wrapText="true" /> <Label fx:id="information_label" alignment="TOP_LEFT" layoutX="14.0" layoutY="31.0" maxWidth="1.7976931348623157E308" prefHeight="82.0" prefWidth="550.0" text="Label" wrapText="true" />
</children> </children>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</Pane> </Pane>
</children> </children>
</VBox> </VBox>
@@ -9,9 +9,7 @@
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="259.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TaskFormularController">
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="259.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/17"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TaskFormularController">
<children> <children>
<VBox layoutX="14.0" layoutY="14.0" prefHeight="272.0" prefWidth="390.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <VBox layoutX="14.0" layoutY="14.0" prefHeight="272.0" prefWidth="390.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<padding> <padding>
@@ -27,7 +25,7 @@
<HBox prefHeight="77.0" prefWidth="350.0"> <HBox prefHeight="77.0" prefWidth="350.0">
<children> <children>
<Label maxWidth="1.7976931348623157E308" text="Description:" HBox.hgrow="ALWAYS" /> <Label maxWidth="1.7976931348623157E308" text="Description:" HBox.hgrow="ALWAYS" />
<TextArea fx:id="description_area" prefHeight="73.0" prefWidth="206.0" promptText="Description" /> <TextArea fx:id="description_area" prefHeight="73.0" prefWidth="206.0" promptText="Description" wrapText="true" />
</children> </children>
</HBox> </HBox>
<HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0"> <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0">
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="64.0" prefWidth="298.0" xmlns="http://javafx.com/javafx/17"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TextFieldFormularController">
<children>
<HBox alignment="CENTER" layoutX="153.0" layoutY="33.0" prefHeight="100.0" prefWidth="200.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<Label fx:id="description_label" maxWidth="1.7976931348623157E308" text="Label" HBox.hgrow="ALWAYS" />
<TextField fx:id="text_area" HBox.hgrow="NEVER" />
</children>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</HBox>
</children>
</AnchorPane>
@@ -0,0 +1,25 @@
/*
#home_button, #myGarden_button,
#mySchedule_button, #settings_button,
#tutorial_button, #menu_pane {
-fx-text-fill: white;
-fx-background-color: rgb(0,128,0);
}
#menubar {
-fx-background-color: rgb(0,128,0);
}
#home_button:hover, #myGarden_button:hover,
#mySchedule_button:hover, #settings_button:hover,
#tutorial_button:hover,
#home_button:focused, #myGarden_button:focused,
#mySchedule_button:focused, #settings_button:focused,
#tutorial_button:focused{
-fx-background-color: darkgreen;
}
.root, .split-pane {
-fx-background-color: linear-gradient(green 0%, lawngreen 33%, lightgreen 66%, #eee 100%);
}./
@@ -14,6 +14,11 @@
"measures": "Less water." "measures": "Less water."
} }
], ],
"wateringCycle": {
"litersPerSqM": 25,
"interval": null,
"notes": []
},
"lifecycle": [ "lifecycle": [
{ {
"startDate": "03-10", "startDate": "03-10",
@@ -21,19 +26,13 @@
"type": "SOW", "type": "SOW",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Germinate", "name": "Germinate",
"relativeStartDate": -14, "relativeStartDate": -14,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.", "description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
}, },
@@ -43,19 +42,13 @@
"type": "PLANT", "type": "PLANT",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 25,
"interval": 7,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.", "description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.",
"interval": 21, "interval": 21
"isOptional": false
} }
] ]
}, },
@@ -65,19 +58,13 @@
"type": "HARVEST", "type": "HARVEST",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Harvest", "name": "Harvest",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.", "description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
} }
@@ -88,6 +75,11 @@
"name": "Early Carrot", "name": "Early Carrot",
"description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.", "description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
"image": "carrot.jpg", "image": "carrot.jpg",
"wateringCycle": {
"litersPerSqM": 15,
"interval": 3,
"notes": []
},
"lifecycle": [ "lifecycle": [
{ {
"startDate": "02-20", "startDate": "02-20",
@@ -95,19 +87,14 @@
"zone": "ZONE_8A", "zone": "ZONE_8A",
"type": "SOW", "type": "SOW",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 15,
"interval": 3,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 0, "relativeEndDate": 0,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ", "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": null, "interval": null
"isOptional": false
} }
] ]
}, },
@@ -117,21 +104,13 @@
"zone": "ZONE_8A", "zone": "ZONE_8A",
"type": "PLANT", "type": "PLANT",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 25,
"interval": 3,
"notes": [
"Be careful not to pour water over the leaves, as this will lead to sunburn."
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ", "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": 15, "interval": 15
"isOptional": true
} }
] ]
}, },
@@ -141,19 +120,13 @@
"zone": "ZONE_8A", "zone": "ZONE_8A",
"type": "HARVEST", "type": "HARVEST",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Harvesting", "name": "Harvesting",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 14, "relativeEndDate": 14,
"description": "When the leaves turn to a yellowish brown. Do not harvest earlier. The plant will show when it's ready.", "description": "When the leaves turn to a yellowish brown. Do not harvest earlier. The plant will show when it's ready.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
} }
@@ -173,6 +146,12 @@
"name": "Summertime Onion", "name": "Summertime Onion",
"description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.", "description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
"image": "onion.jpg", "image": "onion.jpg",
"wateringCycle": {
"litersPerSqM": 15,
"interval": 4,
"notes": [
]
},
"lifecycle": [ "lifecycle": [
{ {
"startDate": "03-15", "startDate": "03-15",
@@ -180,20 +159,13 @@
"type": "SOW", "type": "SOW",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 15,
"interval": 4,
"notes": [
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Plant Sets", "name": "Plant Sets",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 0, "relativeEndDate": 0,
"description": "Plant the sets about 5cm deep into the soil.", "description": "Plant the sets about 5cm deep into the soil.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
}, },
@@ -203,21 +175,13 @@
"type": "PLANT", "type": "PLANT",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 25,
"interval": 3,
"notes": [
""
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ", "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": 15, "interval": 15
"isOptional": true
} }
] ]
}, },
@@ -227,20 +191,13 @@
"type": "HARVEST", "type": "HARVEST",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": [
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Harvesting", "name": "Harvesting",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 14, "relativeEndDate": 14,
"description": "When ready for harvest, the leaves on your onion plants will start to flop over. This happens at the \"neck\" of the onion and it signals that the plant has stopped growing and is ready for storage. Onions should be harvested soon thereafter", "description": "When ready for harvest, the leaves on your onion plants will start to flop over. This happens at the \"neck\" of the onion and it signals that the plant has stopped growing and is ready for storage. Onions should be harvested soon thereafter",
"interval": null, "interval": null
"isOptional": false
} }
] ]
} }
@@ -254,5 +211,77 @@
"measures": "less water" "measures": "less water"
} }
] ]
},
{
"id": 3,
"name": "Test Potato",
"description": "The potato is a tuber, round or oval, with small white roots called 'eyes', that are growth buds. The size varies depending on the variety; the colour of the skin can be white, yellow or even purple.",
"light": 6,
"spacing": "35",
"soil": "sandy",
"image": "potato.jpg",
"pests": [
{
"name": "Rot",
"description": "Rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
"measures": "Less water."
}
],
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": []
},
"lifecycle": [
{
"startDate": "12-01",
"endDate": "12-02",
"type": "SOW",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "Germinate",
"relativeStartDate": -3,
"relativeEndDate": 0,
"description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.",
"interval": null
}
]
},
{
"startDate": "12-03",
"endDate": "12-15",
"type": "PLANT",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "hilling",
"relativeStartDate": 0,
"relativeEndDate": 10,
"description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.",
"interval": 1
}
]
},
{
"startDate": "12-16",
"endDate": "12-18",
"type": "HARVEST",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "Harvest",
"relativeStartDate": 0,
"relativeEndDate": 4,
"description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.",
"interval": null
}
]
}
]
} }
] ]
@@ -4,16 +4,20 @@
"name": "sow plant", "name": "sow plant",
"description": "Plant the seeds, crops in de bed.", "description": "Plant the seeds, crops in de bed.",
"startDate": "2022-05-01", "startDate": "2022-05-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate": "2022-05-01", "endDate": "2022-05-01",
"interval": 0, "interval": null,
"cropId": 0 "cropId": 0
}, },
{ {
"id": 2, "id": 2,
"name": "water plant", "name": "water plant",
"description": "water the plant, so that the soil is wet around the plant.", "description": "water the plant, so that the soil is wet around the plant.",
"startDate": "2022-05-01", "startDate": "2022-10-29",
"endDate": "2022-09-01", "nextExecution": "2022-11-30",
"nextNotification": "2022-05-01",
"endDate": "2022-12-31",
"interval": 2, "interval": 2,
"cropId": 0 "cropId": 0
}, },
@@ -22,6 +26,8 @@
"name": "fertilize plant", "name": "fertilize plant",
"description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture", "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
"startDate": "2022-06-01", "startDate": "2022-06-01",
"nextExecution": "2022-06-01",
"nextNotification": "2022-06-01",
"endDate": "2022-08-01", "endDate": "2022-08-01",
"interval": 28, "interval": 28,
"cropId": 0 "cropId": 0
@@ -31,8 +37,10 @@
"name": "covering plant", "name": "covering plant",
"description": "Take a big enough coverage for the plants. Cover the whole plant with a bit space between the plant and the coverage", "description": "Take a big enough coverage for the plants. Cover the whole plant with a bit space between the plant and the coverage",
"startDate": "2022-07-01", "startDate": "2022-07-01",
"nextExecution": "2022-07-01",
"nextNotification": "2022-07-01",
"endDate": "2022-07-01", "endDate": "2022-07-01",
"interval": 0, "interval": null,
"cropId": 0 "cropId": 0
}, },
{ {
@@ -40,6 +48,8 @@
"name": "look after plant", "name": "look after plant",
"description": "Look for pest or illness at the leaves of the plant. Check the soil around the plant, if the roots are enough covered with soil", "description": "Look for pest or illness at the leaves of the plant. Check the soil around the plant, if the roots are enough covered with soil",
"startDate": "2022-05-01", "startDate": "2022-05-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate": "2022-09-01", "endDate": "2022-09-01",
"interval": 5, "interval": 5,
"cropId": 0 "cropId": 0
@@ -49,8 +59,10 @@
"name": "harvest plant", "name": "harvest plant",
"description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ", "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
"startDate": "2022-09-01", "startDate": "2022-09-01",
"nextExecution": "2022-09-01",
"nextNotification": "2022-09-01",
"endDate": "2022-09-01", "endDate": "2022-09-01",
"interval": 0, "interval": null,
"cropId": 0 "cropId": 0
} }
] ]
@@ -30,6 +30,7 @@ public class JsonCropListTest {
*/ */
private final URL dbDataSource = this.getClass().getResource("test-user-crops.json"); private final URL dbDataSource = this.getClass().getResource("test-user-crops.json");
private final URL testFile = this.getClass().getResource("template-user-crops.json"); private final URL testFile = this.getClass().getResource("template-user-crops.json");
private final URL corruptTestFile = this.getClass().getResource("corrupt-template-user-crops.json");
@BeforeEach @BeforeEach
void connectToDb() throws URISyntaxException, IOException { void connectToDb() throws URISyntaxException, IOException {
@@ -101,5 +102,13 @@ public class JsonCropListTest {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@Test
void detectCorruptJsonResource(){
JsonCropList tL = new JsonCropList(corruptTestFile);
Assertions.assertThrows(InvalidJsonException.class, () -> {
tL.getCrops();
});
}
} }
@@ -15,6 +15,7 @@ import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class JsonPlantListTest { public class JsonPlantListTest {
private final URL testFile = this.getClass().getResource("test-plantdb.json"); private final URL testFile = this.getClass().getResource("test-plantdb.json");
@@ -62,6 +63,8 @@ public class JsonPlantListTest {
void getPlantByIdAndZone() { void getPlantByIdAndZone() {
Optional<Plant> testPlant; Optional<Plant> testPlant;
try { try {
assertThrows(HardinessZoneNotSetException.class, () -> testDatabase.getPlantById(null,1).get());
testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A, 1); testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A, 1);
} catch (IOException | HardinessZoneNotSetException e) { } catch (IOException | HardinessZoneNotSetException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -95,5 +98,16 @@ public class JsonPlantListTest {
} }
@Test
void testDefaultConstructor(){
JsonPlantList db = new JsonPlantList();
try {
assertNotNull(db.getPlantList(HardinessZone.ZONE_8A));
} catch (IOException | HardinessZoneNotSetException e) {
throw new RuntimeException(e);
}
}
} }
@@ -2,6 +2,8 @@ package ch.zhaw.gartenverwaltung.io;
import ch.zhaw.gartenverwaltung.types.Task; import ch.zhaw.gartenverwaltung.types.Task;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -14,6 +16,8 @@ import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
public class JsonTaskListTest { public class JsonTaskListTest {
@@ -47,17 +51,16 @@ public class JsonTaskListTest {
} }
@Disabled("disabled until adding works.")
@Test @Test
@DisplayName("Add task.") @DisplayName("Add task.")
void addTask() { void addTask() {
Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("01.05.2022", formatter), 1); Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("2022-05-01", formatter), 1);
try { try {
testDatabase.saveTask(task); testDatabase.saveTask(task);
List<Task> taskList; List<Task> taskList;
try { try {
taskList = testDatabase.getTaskList(LocalDate.parse("30.04.2022", formatter), taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
LocalDate.parse("31.05.2022", formatter)); LocalDate.parse("2022-05-31", formatter));
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@@ -72,8 +75,7 @@ public class JsonTaskListTest {
@Test @Test
@DisplayName("Remove task.") @DisplayName("Remove task.")
void removeTask() { void removeTask() {
Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1) Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1).withId(2);
.withId(2);
try { try {
testDatabase.removeTask(task); testDatabase.removeTask(task);
List<Task> taskList; List<Task> taskList;
@@ -102,7 +104,7 @@ public class JsonTaskListTest {
} }
@Disabled("Disabled until removing works")
@Test @Test
void removeTasksForCrop() { void removeTasksForCrop() {
List<Task> taskList; List<Task> taskList;
@@ -115,4 +117,27 @@ public class JsonTaskListTest {
Assertions.assertEquals(0, taskList.size()); Assertions.assertEquals(0, taskList.size());
} }
@Test
void testDefaultConstructor(){
JsonTaskList db = new JsonTaskList();
try {
assertNotNull(db.getTaskForCrop(0));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
@Test
void testSubscription() {
TaskList.TaskListObserver mockObs = Mockito.mock(TaskList.TaskListObserver.class);
testDatabase.subscribe(mockObs);
try {
testDatabase.removeTasksForCrop(0);
} catch (IOException e) {
throw new RuntimeException(e);
}
verify(mockObs, times(1)).onChange(ArgumentMatchers.anyList());
}
} }
@@ -49,11 +49,12 @@ public class GardenPlanModelTest {
0, 0,
"sandy to loamy, loose soil, free of stones", "sandy to loamy, loose soil, free of stones",
new ArrayList<>(), new ArrayList<>(),
List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()), new WateringCycle(15, 0, null),
new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()), List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()), new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()), new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()))); new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2023, 3, 1)) exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2023, 3, 1))
.withId(3); .withId(3);
@@ -66,7 +67,8 @@ public class GardenPlanModelTest {
0, 0,
"sandy to loamy, loose soil, free of stones", "sandy to loamy, loose soil, free of stones",
new ArrayList<>(), new ArrayList<>(),
List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()))); new WateringCycle(25, 0, null),
List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now()) exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now())
.withId(5); .withId(5);
@@ -0,0 +1,225 @@
package ch.zhaw.gartenverwaltung.models;
import ch.zhaw.gartenverwaltung.io.*;
import ch.zhaw.gartenverwaltung.models.GardenSchedule;
import ch.zhaw.gartenverwaltung.types.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
import java.time.MonthDay;
import java.time.format.DateTimeFormatter;
import java.util.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
class GardenScheduleTest {
LocalDate exampleStartDate = LocalDate.of(2020, 2, 2);
TaskList taskList;
PlantList plantList;
List<Plant> examplePlantList;
List<Task> exampleTaskList;
List<TaskTemplate> exampleTaskTemplateList;
GardenSchedule model;
@BeforeEach
void setUp() throws IOException, HardinessZoneNotSetException {
createExampleTaskList();
createExampleTaskTemplateList();
createExamplePlantList();
taskList = mockTaskDatabase(exampleTaskList);
plantList = mockPlantDatabase(examplePlantList);
model = new GardenSchedule(taskList, plantList);
}
PlantList mockPlantDatabase(List<Plant> plantList) throws HardinessZoneNotSetException, IOException {
PlantList plantDatabase = mock(JsonPlantList.class);
when(plantDatabase.getPlantList(HardinessZone.ZONE_8A)).thenReturn(plantList);
when(plantDatabase.getPlantById(HardinessZone.ZONE_8A,20)).thenReturn(Optional.of(examplePlantList.get(0)));
return plantDatabase;
}
private TaskList mockTaskDatabase(List<Task> exampleTaskList) throws IOException {
TaskList taskList = mock(JsonTaskList.class);
when(taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList);
when(taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(7 - 1))).thenReturn(exampleTaskList);
when(taskList.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
List<Task> pastTasks = new ArrayList<>();
pastTasks.add(exampleTaskList.get(0));
pastTasks.add(exampleTaskList.get(2));
pastTasks.add(exampleTaskList.get(4));
when(taskList.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
when(taskList.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
when(taskList.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
when(taskList.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
return taskList;
}
void createExampleTaskTemplateList(){
exampleTaskTemplateList = new ArrayList<>();
exampleTaskTemplateList.add(mock(TaskTemplate.class));
exampleTaskTemplateList.add(mock(TaskTemplate.class));
exampleTaskTemplateList.add(mock(TaskTemplate.class));
exampleTaskTemplateList.add(mock(TaskTemplate.class));
when(exampleTaskTemplateList.get(0).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(0));
when(exampleTaskTemplateList.get(1).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(1));
when(exampleTaskTemplateList.get(2).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(2));
when(exampleTaskTemplateList.get(3).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(3));
}
void createExamplePlantList(){
examplePlantList = new ArrayList<>();
examplePlantList.add(new Plant(
20,
"summertime onion",
"Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
null,
"15,30,2",
0,
"sandy to loamy, loose soil, free of stones",
new ArrayList<>(),
new WateringCycle(15, 0, null),
List.of(
new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, List.of(
exampleTaskTemplateList.get(0),
exampleTaskTemplateList.get(1)
)),
new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, List.of(
exampleTaskTemplateList.get(2),
exampleTaskTemplateList.get(3)
)),
new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.SOW, HardinessZone.ZONE_8A, List.of(
))
)));
}
void createExampleTaskList() {
exampleTaskList = new ArrayList<>();
exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(1), 1L));
exampleTaskList.add(new Task("name", "description", LocalDate.now().plusDays(1), 2L));
exampleTaskList.add(new Task("name", "description", LocalDate.now(), 1L));
exampleTaskList.add(new Task("name", "description", LocalDate.of(9019, 5, 5), 1L));
exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(10), LocalDate.now().plusDays(4),2, 2L));
}
@Test
void addTask() throws IOException {
Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
model.addTask(taskToAdd);
verify(taskList, times(1)).saveTask(taskToAdd);
}
@Test
void removeTask() throws IOException {
Task taskToRemove = new Task("name", "description", LocalDate.now(), 1L);
model.removeTask(taskToRemove);
verify(taskList, times(1)).removeTask(taskToRemove);
}
@Test
void getTaskList() throws IOException {
List<Task> listToCheck = model.getTaskList();
assertEquals(5, listToCheck.size());
assertEquals(exampleTaskList.get(4), listToCheck.get(0));
assertEquals(exampleTaskList.get(0), listToCheck.get(1));
assertEquals(exampleTaskList.get(2), listToCheck.get(2));
assertEquals(exampleTaskList.get(1), listToCheck.get(3));
assertEquals(exampleTaskList.get(3), listToCheck.get(4));
}
@Test
void getFutureTasks() throws IOException {
List<Task> listToCheck = model.getFutureTasks();
assertEquals(3, listToCheck.size());
assertEquals(exampleTaskList.get(2), listToCheck.get(0));
assertEquals(exampleTaskList.get(1), listToCheck.get(1));
assertEquals(exampleTaskList.get(3), listToCheck.get(2));
}
@Test
void getPastTasks() throws IOException {
List<Task> listToCheck = model.getPastTasks();
assertEquals(3, listToCheck.size());
assertEquals(exampleTaskList.get(4), listToCheck.get(0));
assertEquals(exampleTaskList.get(0), listToCheck.get(1));
assertEquals(exampleTaskList.get(2), listToCheck.get(2));
}
@Test
void getTasksUpcomingWeek() throws IOException {
List<List<Task>> dayList = model.getTasksUpcomingWeek();
assertEquals(7, dayList.size());
//Check day 0
assertEquals(2, dayList.get(0).size());
assertTrue(dayList.get(0).contains(exampleTaskList.get(2)));
assertTrue(dayList.get(0).contains(exampleTaskList.get(4)));
//Check day 1
assertEquals(1, dayList.get(1).size());
assertTrue(dayList.get(1).contains(exampleTaskList.get(1)));
//Check day 2
assertEquals(1, dayList.get(2).size());
assertTrue(dayList.get(2).contains(exampleTaskList.get(4)));
//Check day 3
assertEquals(0, dayList.get(3).size());
//Check day 4
assertEquals(1, dayList.get(4).size());
assertTrue(dayList.get(4).contains(exampleTaskList.get(4)));
//Check day 5
assertEquals(0, dayList.get(5).size());
//Check day 6
assertEquals(0, dayList.get(6).size());
}
@Test
void removeTasksForCrop() throws IOException {
model.removeTasksForCrop(1L);
verify(taskList, times(1)).removeTasksForCrop(1L);
}
@Test
void planTasksForCrop() throws HardinessZoneNotSetException, PlantNotFoundException, IOException, URISyntaxException {
model.planTasksForCrop(new Crop(20, exampleStartDate).withId(30));
verify(exampleTaskTemplateList.get(0), times(1)).generateTask(exampleStartDate, 30);
verify(exampleTaskTemplateList.get(1), times(1)).generateTask(exampleStartDate, 30);
verify(exampleTaskTemplateList.get(2), times(1)).generateTask(exampleStartDate, 30);
verify(exampleTaskTemplateList.get(3), times(1)).generateTask(exampleStartDate, 30);
verify(taskList, times(1)).saveTask(exampleTaskList.get(0));
verify(taskList, times(1)).saveTask(exampleTaskList.get(1));
verify(taskList, times(1)).saveTask(exampleTaskList.get(2));
verify(taskList, times(1)).saveTask(exampleTaskList.get(3));
final URL dbDataSource = this.getClass().getResource("test-taskdb.json");
final URL testFile = this.getClass().getResource("template-taskdb.json");
Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
JsonTaskList testTaskList = new JsonTaskList(dbDataSource);
model = spy(new GardenSchedule(testTaskList,plantList));
model.planTasksForCrop(new Crop(20, exampleStartDate).withId(30));
assertEquals(5,testTaskList.getTaskList(LocalDate.MIN,LocalDate.MAX).size());
testTaskList.getTaskList(LocalDate.MIN,LocalDate.MAX).get(0);
}
}
@@ -49,11 +49,12 @@ class PlantListModelTest {
0, 0,
"sandy to loamy, loose soil, free of stones", "sandy to loamy, loose soil, free of stones",
new ArrayList<>(), new ArrayList<>(),
List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()), new WateringCycle(25, 0, null),
new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()), List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()), new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()), new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()))) new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
); );
examplePlantList.add(new Plant( examplePlantList.add(new Plant(
0, 0,
@@ -64,8 +65,9 @@ class PlantListModelTest {
6, 6,
"sandy", "sandy",
new ArrayList<>(), new ArrayList<>(),
List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()), new WateringCycle(0, 0, null),
new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()))) List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
); );
examplePlantList.add(new Plant( examplePlantList.add(new Plant(
1, 1,
@@ -76,7 +78,8 @@ class PlantListModelTest {
0, 0,
"sandy to loamy, loose soil, free of stones", "sandy to loamy, loose soil, free of stones",
new ArrayList<>(), new ArrayList<>(),
List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()))) new WateringCycle(25, 0, null),
List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
); );
} }
@@ -1,159 +0,0 @@
package ch.zhaw.gartenverwaltung.taskList;
import ch.zhaw.gartenverwaltung.io.*;
import ch.zhaw.gartenverwaltung.models.GardenSchedule;
import ch.zhaw.gartenverwaltung.types.HardinessZone;
import ch.zhaw.gartenverwaltung.types.Plant;
import ch.zhaw.gartenverwaltung.types.Task;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.time.LocalDate;
import java.util.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
class GardenScheduleTest {
TaskList taskList;
PlantList plantList;
List<Task> exampleTaskList;
Map<Long, Plant> examplePlantMap;
GardenSchedule model;
@BeforeEach
void setUp() throws IOException {
createExampleTaskList();
taskList = mockTaskDatabase(exampleTaskList);
plantList = mockPlantDatabase(examplePlantMap);
model = new GardenSchedule(taskList, plantList);
}
private TaskList mockTaskDatabase(List<Task> exampleTaskList) throws IOException {
TaskList taskList = mock(JsonTaskList.class);
when(taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList);
when(taskList.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
List<Task> pastTasks = new ArrayList<>();
pastTasks.add(exampleTaskList.get(0));
pastTasks.add(exampleTaskList.get(2));
pastTasks.add(exampleTaskList.get(4));
when(taskList.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
when(taskList.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
when(taskList.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
when(taskList.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
when(taskList.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
return taskList;
}
private PlantList mockPlantDatabase(Map<Long, Plant> examplePlantMap) {
return new PlantList() {
@Override
public List<Plant> getPlantList(HardinessZone zone) {
return null;
}
@Override
public Optional<Plant> getPlantById(HardinessZone zone, long id) {
return Optional.ofNullable(examplePlantMap.get(id));
}
};
}
void createExampleTaskList() {
exampleTaskList = new ArrayList<>();
exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(1), 1L));
exampleTaskList.add(new Task("name", "description", LocalDate.now().plusDays(1), 2L));
exampleTaskList.add(new Task("name", "description", LocalDate.now(), 1L));
exampleTaskList.add(new Task("name", "description", LocalDate.of(9019, 5, 5), 1L));
exampleTaskList.add(new Task("name", "description", LocalDate.of(2019, 5, 5), 2L));
}
void createExamplePlantMap() {
examplePlantMap = new HashMap<>();
}
@Test
void addTask() throws IOException {
Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
model.addTask(taskToAdd);
verify(taskList, times(1)).saveTask(taskToAdd);
}
@Test
void removeTask() throws IOException {
Task taskToRemove = new Task("name", "description", LocalDate.now(), 1L);
model.removeTask(taskToRemove);
verify(taskList, times(1)).removeTask(taskToRemove);
}
@Test
void getTaskList() throws IOException {
List<Task> listToCheck = model.getTaskList();
assertEquals(5, listToCheck.size());
assertEquals(exampleTaskList.get(4), listToCheck.get(0));
assertEquals(exampleTaskList.get(0), listToCheck.get(1));
assertEquals(exampleTaskList.get(2), listToCheck.get(2));
assertEquals(exampleTaskList.get(1), listToCheck.get(3));
assertEquals(exampleTaskList.get(3), listToCheck.get(4));
}
@Test
void getFutureTasks() throws IOException {
List<Task> listToCheck = model.getFutureTasks();
assertEquals(3, listToCheck.size());
assertEquals(exampleTaskList.get(2), listToCheck.get(0));
assertEquals(exampleTaskList.get(1), listToCheck.get(1));
assertEquals(exampleTaskList.get(3), listToCheck.get(2));
}
@Test
void getPastTasks() throws IOException {
List<Task> listToCheck = model.getPastTasks();
assertEquals(3, listToCheck.size());
assertEquals(exampleTaskList.get(4), listToCheck.get(0));
assertEquals(exampleTaskList.get(0), listToCheck.get(1));
assertEquals(exampleTaskList.get(2), listToCheck.get(2));
}
@Test
void getTasksUpcomingWeek() throws IOException {
List<List<Task>> dayList = model.getTasksUpcomingWeek();
assertEquals(7, dayList.size());
//Check day 0
assertEquals(1, dayList.get(0).size());
assertEquals(exampleTaskList.get(2), dayList.get(0).get(0));
//Check day 1
assertEquals(1, dayList.get(1).size());
assertEquals(exampleTaskList.get(1), dayList.get(1).get(0));
//Check day 2
assertEquals(0, dayList.get(2).size());
//Check day 3
assertEquals(0, dayList.get(3).size());
//Check day 4
assertEquals(0, dayList.get(4).size());
//Check day 5
assertEquals(0, dayList.get(5).size());
//Check day 6
assertEquals(0, dayList.get(6).size());
}
@Test
void removeTasksForCrop() throws IOException {
model.removeTasksForCrop(1L);
verify(taskList, times(1)).removeTasksForCrop(1L);
}
}
@@ -0,0 +1,98 @@
package ch.zhaw.gartenverwaltung.types;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.time.LocalDate;
import java.time.MonthDay;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
class PlantTest {
Plant testPlant;
@BeforeEach
void setUp() {
List<GrowthPhase> growthPhases = new ArrayList<>();
growthPhases.add(new GrowthPhase(MonthDay.of(2, 1), MonthDay.of(4, 4), 0, GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(4, 2), MonthDay.of(6, 5), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(6, 3), MonthDay.of(8, 6), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(3, 1), MonthDay.of(5, 4), 1, GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(5, 2), MonthDay.of(7, 5), 1, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(7, 3), MonthDay.of(9, 6), 1, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(4, 1), MonthDay.of(6, 4), 0, GrowthPhaseType.SOW, HardinessZone.ZONE_1A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(6, 2), MonthDay.of(8, 5), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(7, 2), MonthDay.of(9, 5), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
growthPhases.add(new GrowthPhase(MonthDay.of(8, 3), MonthDay.of(10, 6), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_1A, new ArrayList<>()));
testPlant = new Plant(
20,
"summertime onion",
"Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
null,
"15,30,2",
0,
"sandy to loamy, loose soil, free of stones",
new ArrayList<>(),
new WateringCycle(25, 0, null),
growthPhases);
}
@AfterEach
void tearDown() {
}
@Test
void inZone() {
assertEquals(7,testPlant.lifecycleForGroup(0).size());
testPlant.inZone(HardinessZone.ZONE_8A);
assertEquals(3,testPlant.lifecycleForGroup(0).size());
assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
testPlant.inZone(HardinessZone.ZONE_1A);
assertEquals(0,testPlant.lifecycleForGroup(0).size());
}
@Test
void lifecycleForGroup() {
assertEquals(Arrays.asList(2,4,6,4,6,7,8),testPlant.lifecycleForGroup(0).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
}
@Test
void sowDateFromHarvestDate() {
assertEquals(LocalDate.of(2022,8,1),
testPlant.sowDateFromHarvestDate(LocalDate.of(2022,12,1))
);
}
@Test
void timeToHarvest() {
testPlant.inZone(HardinessZone.ZONE_8A);
assertEquals(122,testPlant.timeToHarvest(0));
}
@Test
void lifecycleGroupFromHarvestDate() {
testPlant.inZone(HardinessZone.ZONE_8A);
assertEquals(0,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,6,30)));
assertEquals(1,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,8,30)));
}
@Test
void isDateInPhase() {
assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.HARVEST));
assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,8,30),GrowthPhaseType.HARVEST));
assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,2,1),GrowthPhaseType.SOW));
assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,4,2),GrowthPhaseType.PLANT));
assertFalse(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.SOW));
}
}
@@ -0,0 +1,38 @@
package ch.zhaw.gartenverwaltung.types;
import org.junit.jupiter.api.Test;
import java.time.MonthDay;
import static org.junit.jupiter.api.Assertions.*;
class SeasonsTest {
@Test
void getStartDate() {
assertEquals(MonthDay.of(1,1), Seasons.ALLSEASONS.getStartDate());
assertEquals(MonthDay.of(3,1), Seasons.SPRING.getStartDate());
assertEquals(MonthDay.of(6,1), Seasons.SUMMER.getStartDate());
assertEquals(MonthDay.of(9,1), Seasons.AUTUMN.getStartDate());
assertEquals(MonthDay.of(12,1), Seasons.WINTER.getStartDate());
}
@Test
void getEndDate() {
assertEquals(MonthDay.of(12,31), Seasons.ALLSEASONS.getEndDate());
assertEquals(MonthDay.of(5,30), Seasons.SPRING.getEndDate());
assertEquals(MonthDay.of(8,30), Seasons.SUMMER.getEndDate());
assertEquals(MonthDay.of(11,30), Seasons.AUTUMN.getEndDate());
assertEquals(MonthDay.of(2,28), Seasons.WINTER.getEndDate());
}
@Test
void getName() {
assertEquals("All Seasons", Seasons.ALLSEASONS.getName());
assertEquals("Spring", Seasons.SPRING.getName());
assertEquals("Summer", Seasons.SUMMER.getName());
assertEquals("Autumn", Seasons.AUTUMN.getName());
assertEquals("Winter", Seasons.WINTER.getName());
}
}
@@ -0,0 +1,7 @@
[
{
"plantId": 1,
"startDate": "2023-02-25",
"area": 0.5
}
]
@@ -0,0 +1,215 @@
[
{
"id": 0,
"name": "Potato",
"description": "The potato is a tuber, round or oval, with small white roots called 'eyes', that are growth buds. The size varies depending on the variety; the colour of the skin can be white, yellow or even purple.",
"light": 6,
"spacing": "35",
"soil": "sandy",
"image": "potato.jpg",
"pests": [
{
"name": "Rot",
"description": "Rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
"measures": "Less water."
}
],
"wateringCycle": {
"litersPerSqM": 25,
"interval": null,
"notes": []
},
"lifecycle": [
{
"startDate": "03-10",
"endDate": "04-10",
"type": "SOW",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "Germinate",
"relativeStartDate": -14,
"relativeEndDate": null,
"description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.",
"interval": null
}
]
},
{
"startDate": "04-10",
"endDate": "07-10",
"type": "PLANT",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "hilling",
"relativeStartDate": 0,
"relativeEndDate": null,
"description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.",
"interval": 21
}
]
},
{
"startDate": "06-10",
"endDate": "08-10",
"type": "HARVEST",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "Harvest",
"relativeStartDate": 0,
"relativeEndDate": null,
"description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.",
"interval": null
}
]
}
]
},
{
"id": 1,
"name": "Early Carrot",
"description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
"image": "carrot.jpg",
"wateringCycle": {
"litersPerSqM": 15,
"interval": 3,
"notes": []
},
"lifecycle": [
{
"startDate": "02-20",
"endDate": "03-10",
"zone": "ZONE_8A",
"type": "SOW",
"group": 0,
"taskTemplates": [
{
"name": "hilling",
"relativeStartDate": 0,
"relativeEndDate": 0,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": null
}
]
},
{
"startDate": "03-10",
"endDate": "05-10",
"zone": "ZONE_8A",
"type": "PLANT",
"group": 0,
"taskTemplates": [
{
"name": "hilling",
"relativeStartDate": 0,
"relativeEndDate": null,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": 15
}
]
},
{
"startDate": "05-10",
"endDate": "05-20",
"zone": "ZONE_8A",
"type": "HARVEST",
"group": 0,
"taskTemplates": [
{
"name": "Harvesting",
"relativeStartDate": 0,
"relativeEndDate": 14,
"description": "When the leaves turn to a yellowish brown. Do not harvest earlier. The plant will show when it's ready.",
"interval": null
}
]
}
],
"soil": "sandy to loamy, loose soil, free of stones",
"spacing": "5,35,2.5",
"pests": [
{
"name": "Rot",
"description": "rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
"measures": "less water"
}
]
},
{
"id": 2,
"name": "Summertime Onion",
"description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
"image": "onion.jpg",
"wateringCycle": {
"litersPerSqM": 15,
"interval": 4,
"notes": [
]
},
"lifecycle": [
{
"startDate": "03-15",
"endDate": "04-10",
"type": "SOW",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "Plant Sets",
"relativeStartDate": 0,
"relativeEndDate": 0,
"description": "Plant the sets about 5cm deep into the soil.",
"interval": null
}
]
},
{
"startDate": "04-10",
"endDate": "07-10",
"type": "PLANT",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "hilling",
"relativeStartDate": 0,
"relativeEndDate": null,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": 15
}
]
},
{
"startDate": "07-10",
"endDate": "09-20",
"type": "HARVEST",
"zone": "ZONE_8A",
"group": 0,
"taskTemplates": [
{
"name": "Harvesting",
"relativeStartDate": 0,
"relativeEndDate": 14,
"description": "When ready for harvest, the leaves on your onion plants will start to flop over. This happens at the \"neck\" of the onion and it signals that the plant has stopped growing and is ready for storage. Onions should be harvested soon thereafter",
"interval": null
}
]
}
],
"soil": "sandy to loamy, loose soil, free of stones",
"spacing": "15,30,2",
"pests": [
{
"name": "Rot",
"description": "rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
"measures": "less water"
}
]
}
]
@@ -4,6 +4,8 @@
"name" : "sow plant", "name" : "sow plant",
"description": "Plant the seeds, crops in de bed.", "description": "Plant the seeds, crops in de bed.",
"startDate" : "2022-05-01", "startDate" : "2022-05-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate" : "2022-05-01", "endDate" : "2022-05-01",
"interval" : 0, "interval" : 0,
"cropId" : 0 "cropId" : 0
@@ -13,6 +15,8 @@
"name" : "water plant", "name" : "water plant",
"description": "water the plant, so that the soil is wet around the plant.", "description": "water the plant, so that the soil is wet around the plant.",
"startDate" : "2022-05-01", "startDate" : "2022-05-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate" : "2022-09-01", "endDate" : "2022-09-01",
"interval" : 2, "interval" : 2,
"cropId" : 0 "cropId" : 0
@@ -22,6 +26,8 @@
"name" : "fertilize plant", "name" : "fertilize plant",
"description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture", "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
"startDate" : "2022-06-01", "startDate" : "2022-06-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate" : "2022-08-01", "endDate" : "2022-08-01",
"interval" : 28, "interval" : 28,
"cropId" : 0 "cropId" : 0
@@ -31,6 +37,8 @@
"name" : "covering plant", "name" : "covering plant",
"description": "Take a big enough coverage for the plants. Cover the whole plant with a bit space between the plant and the coverage", "description": "Take a big enough coverage for the plants. Cover the whole plant with a bit space between the plant and the coverage",
"startDate" : "2022-07-01", "startDate" : "2022-07-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate" : "2022-07-01", "endDate" : "2022-07-01",
"interval" : 0, "interval" : 0,
"cropId" : 0 "cropId" : 0
@@ -40,6 +48,8 @@
"name" : "look after plant", "name" : "look after plant",
"description": "Look for pest or illness at the leaves of the plant. Check the soil around the plant, if the roots are enough covered with soil", "description": "Look for pest or illness at the leaves of the plant. Check the soil around the plant, if the roots are enough covered with soil",
"startDate" : "2022-05-01", "startDate" : "2022-05-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate" : "2022-09-01", "endDate" : "2022-09-01",
"interval" : 5, "interval" : 5,
"cropId" : 0 "cropId" : 0
@@ -49,6 +59,8 @@
"name" : "harvest plant", "name" : "harvest plant",
"description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ", "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
"startDate" : "2022-09-01", "startDate" : "2022-09-01",
"nextExecution": "2022-05-01",
"nextNotification": "2022-05-01",
"endDate" : "2022-09-01", "endDate" : "2022-09-01",
"interval" : 0, "interval" : 0,
"cropId" : 0 "cropId" : 0
@@ -14,6 +14,11 @@
"measures": "Less water." "measures": "Less water."
} }
], ],
"wateringCycle": {
"litersPerSqM": 25,
"interval": null,
"notes": []
},
"lifecycle": [ "lifecycle": [
{ {
"startDate": "03-10", "startDate": "03-10",
@@ -21,19 +26,13 @@
"type": "SOW", "type": "SOW",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Germinate", "name": "Germinate",
"relativeStartDate": -14, "relativeStartDate": -14,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.", "description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
}, },
@@ -43,19 +42,13 @@
"type": "PLANT", "type": "PLANT",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 25,
"interval": 7,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.", "description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.",
"interval": 21, "interval": 21
"isOptional": false
} }
] ]
}, },
@@ -65,19 +58,13 @@
"type": "HARVEST", "type": "HARVEST",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Harvest", "name": "Harvest",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.", "description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
} }
@@ -88,6 +75,11 @@
"name": "Early Carrot", "name": "Early Carrot",
"description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.", "description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
"image": "carrot.jpg", "image": "carrot.jpg",
"wateringCycle": {
"litersPerSqM": 15,
"interval": 3,
"notes": []
},
"lifecycle": [ "lifecycle": [
{ {
"startDate": "02-20", "startDate": "02-20",
@@ -95,19 +87,14 @@
"zone": "ZONE_8A", "zone": "ZONE_8A",
"type": "SOW", "type": "SOW",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 15,
"interval": 3,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 0, "relativeEndDate": 0,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ", "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": null, "interval": null
"isOptional": false
} }
] ]
}, },
@@ -117,21 +104,13 @@
"zone": "ZONE_8A", "zone": "ZONE_8A",
"type": "PLANT", "type": "PLANT",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 25,
"interval": 3,
"notes": [
"Be careful not to pour water over the leaves, as this will lead to sunburn."
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ", "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": 15, "interval": 15
"isOptional": true
} }
] ]
}, },
@@ -141,19 +120,13 @@
"zone": "ZONE_8A", "zone": "ZONE_8A",
"type": "HARVEST", "type": "HARVEST",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": []
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Harvesting", "name": "Harvesting",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 14, "relativeEndDate": 14,
"description": "When the leaves turn to a yellowish brown. Do not harvest earlier. The plant will show when it's ready.", "description": "When the leaves turn to a yellowish brown. Do not harvest earlier. The plant will show when it's ready.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
} }
@@ -173,6 +146,12 @@
"name": "Summertime Onion", "name": "Summertime Onion",
"description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.", "description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
"image": "onion.jpg", "image": "onion.jpg",
"wateringCycle": {
"litersPerSqM": 15,
"interval": 4,
"notes": [
]
},
"lifecycle": [ "lifecycle": [
{ {
"startDate": "03-15", "startDate": "03-15",
@@ -180,21 +159,13 @@
"type": "SOW", "type": "SOW",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 15,
"interval": 4,
"notes": [
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "Plant Sets",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 0, "relativeEndDate": 0,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ", "description": "Plant the sets about 5cm deep into the soil.",
"interval": null, "interval": null
"isOptional": false
} }
] ]
}, },
@@ -204,21 +175,13 @@
"type": "PLANT", "type": "PLANT",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 25,
"interval": 3,
"notes": [
""
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "hilling", "name": "hilling",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": null, "relativeEndDate": null,
"description": "Mound up the soil around the plant until just the top few leaves show above the soil. ", "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
"interval": 15, "interval": 15
"isOptional": true
} }
] ]
}, },
@@ -228,21 +191,13 @@
"type": "HARVEST", "type": "HARVEST",
"zone": "ZONE_8A", "zone": "ZONE_8A",
"group": 0, "group": 0,
"wateringCycle": {
"litersPerSqM": 0,
"interval": null,
"notes": [
]
},
"taskTemplates": [ "taskTemplates": [
{ {
"name": "Harvesting", "name": "Harvesting",
"relativeStartDate": 0, "relativeStartDate": 0,
"relativeEndDate": 14, "relativeEndDate": 14,
"description": "When ready for harvest, the leaves on your onion plants will start to flop over. This happens at the \"neck\" of the onion and it signals that the plant has stopped growing and is ready for storage. Onions should be harvested soon thereafter", "description": "When ready for harvest, the leaves on your onion plants will start to flop over. This happens at the \"neck\" of the onion and it signals that the plant has stopped growing and is ready for storage. Onions should be harvested soon thereafter",
"interval": null, "interval": null
"isOptional": false
} }
] ]
} }
@@ -0,0 +1,2 @@
[
]