Merge pull request #55 from schrom01/feature_savePlantToCropGUI_M2

savePlantToCropGUI m2

src/main/java/ch/zhaw/gartenverwaltung/PlantsController.java

@@ -5,7 +5,6 @@ import ch.zhaw.gartenverwaltung.plantList.PlantListModel;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Seasons;
-import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.value.ChangeListener;
@@ -13,18 +12,22 @@ import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.geometry.Insets;
-import javafx.geometry.Bounds;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.VBox;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
+import java.util.Objects;
 import java.util.ResourceBundle;
 
 public class PlantsController implements Initializable {
@@ -33,7 +36,6 @@ public class PlantsController implements Initializable {
     private final HardinessZone DEFAULT_HARDINESS_ZONE = HardinessZone.ZONE_8A;
 
     // TODO: move to model
-
     private final ListProperty<Plant> plantListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
@@ -52,18 +54,27 @@ public class PlantsController implements Initializable {
     private ListView<Plant> list_plants;
 
     @FXML
-    private Button saveToMyPlant_button;
+    private Button selectSowDay_button;
 
     @FXML
     private TextField search_plants;
 
     /**
-     * saves the current selected plant in new JSON database
+     * open new window to select sow or harvest day to save the crop
      * @param event event
      */
     @FXML
-    void saveToMyPlant(ActionEvent event) {
+    void selectSowDate(ActionEvent event) throws IOException {
-        //ToDo model save selectedPlant to mySelectedPlant(IO)
+        Parent root;
+        FXMLLoader fxmlLoader = new FXMLLoader(Objects.requireNonNull(getClass().getResource("SelectSowDay.fxml")));
+        root = fxmlLoader.load();
+        SelectSowDayController controller = fxmlLoader.getController();
+        controller.getSelectedPlant(selectedPlant);
+        Stage stage = new Stage();
+        stage.setScene(new Scene(root));
+        stage.initModality(Modality.APPLICATION_MODAL);
+        stage.setResizable(false);
+        stage.showAndWait();
     }
 
     /**
@@ -80,7 +91,7 @@ public class PlantsController implements Initializable {
         list_plants.itemsProperty().bind(plantListProperty);
 
         description_plant.setText("");
-        saveToMyPlant_button.setDisable(true);
+        selectSowDay_button.setDisable(true);
 
         createFilterSeasons();
         createFilterHardinessZone();
@@ -190,7 +201,7 @@ public class PlantsController implements Initializable {
     private void createFilterSeasons() {
         ToggleGroup seasonGroup = new ToggleGroup();
         for (Seasons season : Seasons.values()) {
-            RadioButton radioButton = new RadioButton(season.name());
+            RadioButton radioButton = new RadioButton(season.getName());
             radioButton.setToggleGroup(seasonGroup);
             radioButton.setPadding(new Insets(0,0,10,0));
             if (season.equals(Seasons.AllSEASONS)) {
@@ -221,13 +232,18 @@ public class PlantsController implements Initializable {
      * image of the plant
      */
     private void lookForSelectedListEntry() {
+        selectedPlant = null;
+        description_plant.setText("");
+        selectSowDay_button.setDisable(true);
+        Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+        img_plant.setImage(img);
         list_plants.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Plant>() {
             @Override
             public void changed(ObservableValue<? extends Plant> observable, Plant oldValue, Plant newValue) {
                 if(newValue != null) {
                     selectedPlant = newValue;
                     description_plant.setText(selectedPlant.description());
-                    saveToMyPlant_button.setDisable(false);
+                    selectSowDay_button.setDisable(false);
                     Image img;
                     if(selectedPlant.image() != null) {
                         img = selectedPlant.image();
@@ -235,12 +251,10 @@ public class PlantsController implements Initializable {
                         img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
                     }
                     img_plant.setImage(img);
-
-
                 } else {
                     selectedPlant = null;
                     description_plant.setText("");
-                    saveToMyPlant_button.setDisable(true);
+                    selectSowDay_button.setDisable(true);
                     Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
                     img_plant.setImage(img);
                 }

src/main/java/ch/zhaw/gartenverwaltung/SelectSowDayController.java

@@ -0,0 +1,167 @@
+package ch.zhaw.gartenverwaltung;
+
+import ch.zhaw.gartenverwaltung.types.GrowthPhaseType;
+import ch.zhaw.gartenverwaltung.types.Plant;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.*;
+import javafx.stage.Stage;
+import javafx.util.Callback;
+
+import java.net.URL;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.ResourceBundle;
+
+public class SelectSowDayController implements Initializable {
+    private Plant selectedPlant = null;
+
+    @FXML
+    private DatePicker datepicker;
+
+    @FXML
+    private Label popup_label;
+
+    @FXML
+    private Button save_button;
+
+    @FXML
+    private RadioButton sow_radio;
+
+    /**
+     * close the date selector window
+     * @param event event
+     */
+    @FXML
+    void cancel(ActionEvent event) {
+        closeWindow();
+    }
+
+    /**
+     * get sow date from datePicker or calculate sow date from harvest date
+     * save selected plant and sow date
+     * @param event event
+     */
+    @FXML
+    void save(ActionEvent event) {
+        //ToDo save plant and sow date to crop/gardenplan model
+        LocalDate sowDate;
+        if (sow_radio.isSelected()) {
+            sowDate = datepicker.getValue();
+        } else {
+            //ToDo method to get current lifecycle group in plant
+            sowDate = selectedPlant.sowDateFromHarvestDate(datepicker.getValue(), 0);
+        }
+        System.out.println(sowDate);
+        System.out.println(selectedPlant);
+        closeWindow();
+    }
+
+    /**
+     * save the plant which will be planted and update label
+     * @param plant Plant
+     */
+    public void getSelectedPlant(Plant plant) {
+        selectedPlant = plant;
+        popup_label.setText("Select Harvest/Sow Date for" + selectedPlant.name());
+    }
+
+    /**
+     * add listener and set default values
+     * {@inheritDoc}
+     * @param location location
+     * @param resources resources
+     */
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        clearDatePickerEntries();
+
+        Callback<DatePicker, DateCell> dayCellFactory= getDayCellFactory();
+        datepicker.setDayCellFactory(dayCellFactory);
+        datepicker.getEditor().setEditable(false);
+
+        enableDisableSaveButton();
+    }
+
+    /**
+     * clear date picker editor when radio button is changed
+     */
+    private void clearDatePickerEntries() {
+        sow_radio.selectedProperty().addListener(new ChangeListener<Boolean>() {
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean isNowSelected) {
+                datepicker.getEditor().clear();
+            }
+        });
+    }
+
+    /**
+     * date picker disable/enable dates according to selected plant: sow or harvest day
+     * @return cellFactory of datePicker
+     */
+    private Callback<DatePicker, DateCell> getDayCellFactory() {
+
+        final Callback<DatePicker, DateCell> dayCellFactory = new Callback<DatePicker, DateCell>() {
+
+            @Override
+            public DateCell call(final DatePicker datePicker) {
+                return new DateCell() {
+                    @Override
+                    public void updateItem(LocalDate item, boolean empty) {
+                        super.updateItem(item, empty);
+                        setDisable(true);
+                        setStyle("-fx-background-color: #ffc0cb;");
+                        List<LocalDate> dates;
+                        LocalDate today = LocalDate.now();
+                        if (sow_radio.isSelected()) {
+                            dates = selectedPlant.getDateListOfGrowthPhase(GrowthPhaseType.SOW);
+                        } else {
+                            dates = selectedPlant.getDateListOfGrowthPhase(GrowthPhaseType.HARVEST);
+                        }
+                        for (LocalDate date : dates) {
+                            if (item.getMonth() == date.getMonth()
+                                    && item.getDayOfMonth() == date.getDayOfMonth()
+                                    && item.compareTo(today) > 0) {
+                                setDisable(false);
+                                setStyle("-fx-background-color: #32CD32;");
+                            }
+                        }
+                        if ((!sow_radio.isSelected() && selectedPlant.sowDateFromHarvestDate(item, 0).compareTo(today) < 0)) {
+                            setDisable(true);
+                            setStyle("-fx-background-color: #ffc0cb;");
+                        }
+                    }
+                };
+            }
+        };
+        return dayCellFactory;
+    }
+
+    /**
+     * close date picker window
+     */
+    private void closeWindow() {
+        Stage stage = (Stage) save_button.getScene().getWindow();
+        stage.close();
+    }
+
+    /**
+     * disable save button, when there is no date selected in date picker
+     */
+    private void enableDisableSaveButton() {
+        save_button.setDisable(true);
+        datepicker.getEditor().textProperty().addListener(new ChangeListener<String>() {
+            @Override
+            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                if (newValue == null || newValue.equals("")) {
+                    save_button.setDisable(true);
+                } else {
+                    save_button.setDisable(false);
+                }
+            }
+        });
+    }
+}

src/main/java/ch/zhaw/gartenverwaltung/types/Plant.java

@@ -3,6 +3,7 @@ package ch.zhaw.gartenverwaltung.types;
 import javafx.scene.image.Image;
 
 import java.time.LocalDate;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,20 +20,40 @@ public record Plant(
         List<Pest> pests,
         List<GrowthPhase> lifecycle) {
 
+    /**
+     * remove all growthPhase which do not belong to the hardiness zone
+     * @param zone hardiness zone
+     */
     public void inZone(HardinessZone zone) {
         lifecycle.removeIf(growthPhase -> !growthPhase.zone().equals(zone));
     }
 
+    /**
+     * get all growthPhases of lifecycle group
+     * @param group lifecycle group
+     * @return list of growthPhases
+     */
     public List<GrowthPhase> lifecycleForGroup(int group) {
         return lifecycle.stream()
-                .filter(growthPhase -> growthPhase.group() != group)
+                .filter(growthPhase -> growthPhase.group() == group)
                 .collect(Collectors.toList());
     }
 
+    /**
+     * get sow date from given harvest day from lifecycle group
+     * @param harvestDate date of the harvest
+     * @param group lifecycle group
+     * @return LocaleDate of sow date
+     */
     public LocalDate sowDateFromHarvestDate(LocalDate harvestDate, int group) {
         return harvestDate.minusDays(timeToHarvest(group));
     }
 
+    /**
+     * calculate the days between sow and harvest day for lifecycle group
+     * @param group the lifecycle group
+     * @return Integer number of dates between sow and harvest day
+     */
     public int timeToHarvest(int group) {
         List<GrowthPhase> activeLifecycle = lifecycleForGroup(group);
         GrowthPhase sow = activeLifecycle.stream()
@@ -47,4 +68,38 @@ public record Plant(
         int currentYear = LocalDate.now().getYear();
         return (int) DAYS.between(harvest.startDate().atYear(currentYear), sow.startDate().atYear(currentYear));
     }
+
+    /**
+     * filter out the given growthPhase out of the lifecycle
+     * create list of dates for this growthPhase and return it
+     * @param growthPhase the wanted growthPhase
+     * @return a list of dates of the current year
+     */
+    public List<LocalDate> getDateListOfGrowthPhase(GrowthPhaseType growthPhase) {
+        List<LocalDate> dates = new LinkedList<>();
+        for (GrowthPhase growth : lifecycle) {
+            if (growth.type().equals(growthPhase)) {
+                dates = addDatesFromMonthDay(growth);
+            }
+        }
+        return dates;
+    }
+
+    /**
+     * transform monthDay value of the given growthPhase to localDate
+     * return a list of dates from start to end of growth phase
+     * @param growthPhase the current growthPhase
+     * @return a list of dates of the current year
+     */
+    private List<LocalDate> addDatesFromMonthDay(GrowthPhase growthPhase) {
+        List<LocalDate> dates = new LinkedList<>();
+        LocalDate today = LocalDate.now();
+        LocalDate start = growthPhase.startDate().atYear(today.getYear());
+        LocalDate end = growthPhase.endDate().atYear(today.getYear());
+        while (!start.isAfter(end)) {
+            dates.add(start);
+            start = start.plusDays(1);
+        }
+        return dates;
+    }
 }

src/main/java/ch/zhaw/gartenverwaltung/types/Seasons.java

@@ -3,18 +3,20 @@ package ch.zhaw.gartenverwaltung.types;
 import java.time.MonthDay;
 
 public enum Seasons {
-    AllSEASONS("--01-01", "--12-31"),
+    AllSEASONS("--01-01", "--12-31", "All Seasons"),
-    SPRING("--03-01", "--05-30"),
+    SPRING("--03-01", "--05-30", "Spring"),
-    SOMMER("--06-01", "--08-30"),
+    SUMMER("--06-01", "--08-30", "Summer"),
-    AUTUM("--09-01", "--11-30"),
+    AUTUMN("--09-01", "--11-30", "Autumn"),
-    WINTER("--12-01", "--02-28");
+    WINTER("--12-01", "--02-28", "Winter");
 
     public final String startDate;
     public final String endDate;
+    public final String name;
 
-    Seasons(String startDate, String endDate) {
+    Seasons(String startDate, String endDate, String name) {
         this.startDate = startDate;
         this.endDate = endDate;
+        this.name = name;
     }
 
     public MonthDay getStartDate() {
@@ -23,4 +25,7 @@ public enum Seasons {
     public MonthDay getEndDate() {
         return MonthDay.parse(this.endDate);
     }
+    public String getName() {
+        return this.name;
+    }
 }

src/main/resources/ch/zhaw/gartenverwaltung/Plants.fxml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.geometry.Rectangle2D?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.TitledPane?>
-<?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
@@ -33,15 +31,8 @@
                         <TextField fx:id="search_plants" promptText="Search for Plant Name" />
                         <HBox alignment="CENTER_LEFT" prefHeight="480.0" prefWidth="881.0" VBox.vgrow="ALWAYS">
                            <children>
-                              <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="580.0" HBox.hgrow="ALWAYS" />
+                              <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="400.0" HBox.hgrow="ALWAYS" />
-                              <ImageView fx:id="img_plant" fitHeight="322.0" fitWidth="861.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
+                              <ImageView fx:id="img_plant" fitWidth="300" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
-                                 <viewport>
-                                    <Rectangle2D height="300.0" width="300.0" />
-                                 </viewport>
-                                 <image>
-                                    <Image url="@placeholder.png" />
-                                 </image>
-                              </ImageView>
                            </children>
                         </HBox>
                         <Label prefHeight="33.0" prefWidth="919.0" text="Plant Information:">
@@ -57,7 +48,7 @@
                               <Insets bottom="10.0" top="10.0" />
                            </padding>
                         </Label>
-                        <Button fx:id="saveToMyPlant_button" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#saveToMyPlant" prefHeight="38.0" prefWidth="917.0" text="Save to MyPlants" />
+                        <Button fx:id="selectSowDay_button" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#selectSowDate" prefHeight="38.0" prefWidth="917.0" text="Select Harvest/Sow Day" />
                      </children>
                   </VBox>
                </children>

src/main/resources/ch/zhaw/gartenverwaltung/SelectSowDay.fxml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.DatePicker?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0"
+            prefWidth="308.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.SelectSowDayController">
+   <children>
+      <VBox maxWidth="1.7976931348623157E308" prefHeight="408.0" prefWidth="640.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <Label fx:id="popup_label" text="Label" />
+            <HBox alignment="CENTER" prefHeight="293.0" prefWidth="631.0">
+               <children>
+                  <VBox alignment="CENTER_LEFT" prefHeight="88.0" prefWidth="155.0">
+                     <children>
+                        <RadioButton fx:id="sow_radio" mnemonicParsing="false" selected="true" text="Sow">
+                           <VBox.margin>
+                              <Insets bottom="10.0" />
+                           </VBox.margin>
+                           <toggleGroup>
+                              <ToggleGroup fx:id="group" />
+                           </toggleGroup>
+                        </RadioButton>
+                        <RadioButton fx:id="harvest_radio" mnemonicParsing="false" text="Harvest" toggleGroup="$group" />
+                     </children>
+                     <HBox.margin>
+                        <Insets top="10.0" />
+                     </HBox.margin>
+                  </VBox>
+                  <DatePicker fx:id="datepicker" />
+               </children>
+            </HBox>
+            <HBox fillHeight="false" prefHeight="54.0" prefWidth="631.0" VBox.vgrow="NEVER">
+               <children>
+                  <Button fx:id="save_button" mnemonicParsing="false" onAction="#save" prefHeight="25.0" prefWidth="53.0" text="Save">
+                     <HBox.margin>
+                        <Insets right="10.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="cancel_button" mnemonicParsing="false" onAction="#cancel" text="Cancel" />
+               </children>
+            </HBox>
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </VBox>
+   </children>
+</AnchorPane>

src/main/resources/ch/zhaw/gartenverwaltung/io/plantdb.json

@@ -94,6 +94,7 @@
         "endDate": "03-10",
         "zone": "ZONE_8A",
         "type": "SOW",
+        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 15,
           "interval": 3,
@@ -115,6 +116,7 @@
         "endDate": "05-10",
         "zone": "ZONE_8A",
         "type": "PLANT",
+        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 25,
           "interval": 3,
@@ -138,6 +140,7 @@
         "endDate": "05-20",
         "zone": "ZONE_8A",
         "type": "HARVEST",
+        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 0,
           "interval": null,