fix: syntax errors

#23 small adjustments
#23 added constructor in Task class, implemented SevereWeather, WeatherService, WeatherGradenTaskPlanner
2022-11-25 12:39:10 +01:00 · 2022-11-22 14:48:09 +01:00 · 2022-11-22 14:44:56 +01:00
8 changed files with 121 additions and 215 deletions
@@ -11,9 +11,6 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import javafx.stage.WindowEvent;

 import java.io.IOException;
 import java.util.logging.Level;
@@ -43,9 +40,6 @@ public class MainFXMLController {
    @FXML
    private Button tutorial_button;

-    private final Stage tutorialModal = new Stage();
-
-
    /**
     * go to home pane
     */
@@ -101,23 +95,11 @@ public class MainFXMLController {
    }

    /**
-     * Show the tutorial window
+     * go to Tutorial pane
     */
-    public void showTutorial() {
-        if (!tutorialModal.isShowing()) {
-            if (tutorialModal.getScene() == null) {
-                try {
-                    appLoader.loadSceneToStage("Tutorial.fxml", tutorialModal);
-                    tutorialModal.initModality(Modality.NONE);
-                    tutorialModal.setResizable(false);
-                    tutorialModal.sizeToScene();
-                } catch (IOException e) {
-                    LOG.log(Level.SEVERE, "Could not load Tutorial");
-                }
-            }
-            tutorialModal.show();
-        }
-        tutorialModal.requestFocus();
+    public void goToTutorial() {
+        showPaneAsMainView("Tutorial.fxml");
+        styleChangeButton(tutorial_button);
    }

    /**
@@ -150,6 +132,7 @@ public class MainFXMLController {
        appLoader.loadAndCacheFxml("MyGarden.fxml");
        appLoader.loadAndCacheFxml("MySchedule.fxml");
        appLoader.loadAndCacheFxml("Plants.fxml");
+        appLoader.loadAndCacheFxml("Tutorial.fxml");
    }

    private void styleChangeButton(Button button) {
@@ -170,14 +153,12 @@ public class MainFXMLController {
        } catch (IOException e) {
            LOG.log(Level.SEVERE, "Failed to load FXML-Pane!", e);
        }
-        mainPane.getScene().getWindow().setOnCloseRequest(this::closeWindowHandler);
        setIconToButton(home_button, "homeIcon.png");
        setIconToButton(settings_button, "settingsIcon.png");
-        tutorial_button.visibleProperty().bind(Settings.getInstance().getShowTutorialProperty());
-    }
-
-    private void closeWindowHandler(WindowEvent windowEvent) {
-        tutorialModal.close();
+        Settings.getInstance().getShowTutorialProperty().addListener((observable, oldValue, newValue) -> {
+            tutorial_button.setVisible(newValue);
+        });
+        tutorial_button.setVisible(Settings.getInstance().getShowTutorial());
    }

    /**
@@ -192,4 +173,7 @@ public class MainFXMLController {
        imageView.setPreserveRatio(true);
        button.setGraphic(imageView);
    }
+
+
 }
+
@@ -1,61 +1,6 @@
 package ch.zhaw.gartenverwaltung;


-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
 public class TutorialController {

-    @FXML
-    public Button previousPageButton;
-    @FXML
-    public Button nextPageButton;
-    @FXML
-    public StackPane tourPages;
-    public ImageView imgAddNewPlant;
-    public ImageView imgTaskList;
-    public ImageView imgSelectDate;
-
-    private int page = 0;
-
-    @FXML
-    public void initialize() {
-        switchViews();
-        setButtonAbilities();
-
-        Image placeholder = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-        imgAddNewPlant.setImage(placeholder);
-        imgSelectDate.setImage(placeholder);
-        imgTaskList.setImage(placeholder);
-    }
-
-    public void viewNextPage() {
-        page++;
-        switchViews();
-        setButtonAbilities();
-    }
-    public void viewPreviousPage() {
-        page--;
-        switchViews();
-        setButtonAbilities();
-    }
-
-    private void setButtonAbilities() {
-        previousPageButton.setDisable(page <= 0);
-        nextPageButton.setDisable(page >= tourPages.getChildren().size() - 1);
-    }
-
-    private void switchViews() {
-        tourPages.getChildren().forEach(node -> node.setOpacity(0));
-        tourPages.getChildren().get(page).setOpacity(1);
-    }
-
-    public void closeTutorial() {
-        Stage root = (Stage) tourPages.getScene().getWindow();
-        root.close();
-    }
 }
@@ -0,0 +1,5 @@
+package ch.zhaw.gartenverwaltung.io;
+
+public enum SevereWeather {
+    FROST,SNOW,HAIL,NO_SEVERE_WEATHER
+}
@@ -0,0 +1,64 @@
+package ch.zhaw.gartenverwaltung.io;
+
+import ch.zhaw.gartenverwaltung.types.Crop;
+import ch.zhaw.gartenverwaltung.types.Task;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.List;
+
+public class WeatherGradenTaskPlanner {
+    private final TaskList taskList;
+    WeatherService weatherService;
+    private final LocalDate dateSevereWeather = LocalDate.of(22,12,15);
+
+    public WeatherGradenTaskPlanner(TaskList taskList) {
+        this.taskList = taskList;
+        weatherService = new WeatherService();
+    }
+
+    public void getWeatherEvents() 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();
+        }
+    }
+
+    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 calculateRainAmount(){
+
+    }
+
+    public void adjustWateringTask(List<Crop> crops){
+
+    }
+}
@@ -0,0 +1,14 @@
+package ch.zhaw.gartenverwaltung.io;
+
+public class WeatherService {
+
+    public SevereWeather causeSevereWeather(int randomWeather) {
+        return switch (randomWeather) {
+            case 1 -> SevereWeather.HAIL;
+            case 2 -> SevereWeather.SNOW;
+            case 3 -> SevereWeather.FROST;
+            default -> null;
+        };
+
+    }
+}
@@ -33,6 +33,14 @@ public class Task {
        this.startDate = startDate;
        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) {
        this.name = name;
@@ -12,7 +12,7 @@
            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="40.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="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="#goToTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
            <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" />
         </children>
@@ -1,141 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.text.TextFlow?>

-<BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
-   <bottom>
-      <HBox alignment="CENTER" prefHeight="0.0" prefWidth="724.0" BorderPane.alignment="CENTER">
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
   <children>
-            <CheckBox mnemonicParsing="false" text="Don't show again" />
-            <Separator prefWidth="50.0" visible="false" HBox.hgrow="ALWAYS" />
-            <ButtonBar prefHeight="40.0" prefWidth="200.0">
-              <buttons>
-                  <Button cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" text="Close" onAction="#closeTutorial"/>
-                <Button fx:id="previousPageButton" mnemonicParsing="false" text="Previous" onAction="#viewPreviousPage"/>
-                  <Button fx:id="nextPageButton" defaultButton="true" mnemonicParsing="false" text="Next" onAction="#viewNextPage" />
-              </buttons>
-            </ButtonBar>
+      <VBox layoutX="7.0" layoutY="8.0" prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <Label text="Tutorial">
+               <font>
+                  <Font size="18.0" />
+               </font>
+            </Label>
+            <Label text="To be added" />
         </children>
         <padding>
-            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
         </padding>
-      </HBox>
-   </bottom>
-   <center>
-      <StackPane fx:id="tourPages" prefHeight="150.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-         <children>
-            <VBox layoutX="30.0" layoutY="26.0" opacity="0.0" prefHeight="200.0" prefWidth="100.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Crops">
-                     <font>
-                        <Font size="24.0" />
-                     </font>
-                  </Text>
-                  <Separator prefWidth="200.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="10.0" />
-                     </VBox.margin>
-                  </Separator>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="In the &quot;My Garden&quot; tab, you can see all of the plants you're planning on growing.">
-                     <VBox.margin>
-                        <Insets bottom="20.0" />
-                     </VBox.margin>
-                  </Text>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="90.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="To get started, click on the &quot;Add new Plant&quot; button in the bottom left. This will open a list of all the plants you can grow.&#10;Use the search bar at the top, the filters on the left, or simply browse the list until you've found a plant you want to grow in your garden." wrappingWidth="345.80316162109375" />
-                           </children>
-                           <HBox.margin>
-                              <Insets bottom="20.0" />
-                           </HBox.margin>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgAddNewPlant" fitHeight="98.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children>
-                  </HBox>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="200.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Once you've found what you're looking for, click the &quot;Select Sow/Harvest Date&quot; button at the bottom of the window.&#10;In the subsequently shown dialog, you can select the date you'd like to sow or harvest the crop. The date selector shows possible dates in green. Confirm your selection with the &quot;Save&quot; button." />
-                           </children>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgSelectDate" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children>
-                  </HBox>
-               </children>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-            </VBox>
-            <VBox prefHeight="200.0" prefWidth="100.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Tasks">
-                     <font>
-                        <Font size="24.0" />
-                     </font>
-                  </Text>
-                  <Separator prefWidth="200.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="10.0" />
-                     </VBox.margin>
-                  </Separator>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="In the &quot;My Schedule&quot; tab, you can see all of the tasks you need to complete for a successful harvest.">
-                     <VBox.margin>
-                        <Insets bottom="20.0" />
-                     </VBox.margin>
-                  </Text>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="90.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="You can view the tasks for a specific crop by selecting it from the left sidebar.&#10;To see all tasks again, click the &quot;Clear Filter&quot; button at the bottom." wrappingWidth="345.80316162109375" />
-                           </children>
-                           <HBox.margin>
-                              <Insets bottom="20.0" />
-                           </HBox.margin>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgTaskList" fitHeight="98.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children>
-                  </HBox>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="200.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="You can also add your own custom tasks, by clicking the &quot;Add Task&quot; button.&#10;In the subsequently shown dialog, you can enter the corresponding details.&#10;&#10;Note: If you want to make a task recurring, you need to set both an interval (in days) AND an end date, so the task won't repeat for all eternity." />
-                           </children>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children></HBox>
-               </children>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
      </VBox>
   </children>
-         <BorderPane.margin>
-            <Insets />
-         </BorderPane.margin>
-         <padding>
-            <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-         </padding>
-      </StackPane>
-   </center>
-</BorderPane>
+</AnchorPane>
Author	SHA1	Message	Date
David Guler	07569b83e1	fix: syntax errors	2022-11-25 12:39:10 +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