f389cfcdfd
adapted GardenSchedule and GardenScheduleTest to new Structure of Task
2022-11-25 11:13:45 +01:00
b2c0886e46
new Structure of taskdb.json
2022-11-24 22:27:16 +01:00
775e35a70b
new Structure of Task
2022-11-24 22:18:08 +01:00
d7b9095050
Merge branch 'dev' into feature_taskList_m2
2022-11-24 21:55:52 +01:00
f7105f041c
Merge pull request #66 from schrom01/feature_guiOverhaul_M3
...
Feature gui overhaul m3
2022-11-21 12:56:57 +01:00
b0369e3174
fix error edit task list
2022-11-21 12:53:28 +01:00
8c20dcaadb
Merge pull request #65 from schrom01/refactor_task-id-semantics_M3
...
refactor: Made Task::id nullable/Optional for semantic reasons
2022-11-21 12:43:04 +01:00
95b0f7e13d
refactor: Made Task::id nullable/Optional for semantic reasons
...
better use of builder semantics in task and crop creation
2022-11-21 09:45:58 +01:00
2312149256
Merge pull request #64 from schrom01/fix_tasklist-not-updated_M3
...
fix: Properly saving tasks
2022-11-21 09:21:26 +01:00
ffc7f5174e
fix: Properly saving tasks
...
Tasks were not properly saved by the JsonTaskList, resulting in the newly created tasks being discarded immediately. Fixed by putting them into the taskMap in saveTask()
2022-11-21 09:15:29 +01:00
8d3fbc06ad
added task list editor date cell factory
2022-11-21 07:03:45 +01:00
dcb97f1c55
add and edit task list
2022-11-21 06:47:27 +01:00
ee67c83b22
update plant information plant fxml file
2022-11-21 00:03:19 +01:00
2963872237
update my garden from VBox to ListView
2022-11-20 23:38:24 +01:00
7920bdff28
new home screen, tutorial fxml file and missing javadoc
2022-11-20 21:10:55 +01:00
e96280cd0c
overhaul gui icons + settings
2022-11-20 17:39:18 +01:00
bfe3fcfb79
fix: pre-copying test files
...
By some accursed class loading magic, files in the test-resources with the same name as one in the main resources were read/written in the main resources, causing some problems.
Renamed all of the test files to fix this.
2022-11-20 08:53:56 +01:00
8e3af2ba32
Merge branch 'dev' into feature_taskList_m2
2022-11-18 12:27:33 +01:00
b70a758099
Merge pull request #61 from schrom01/refactor_gui_M3
...
Refactor gui m3
2022-11-18 12:22:13 +01:00
3a69119eb7
refactor: bind croplist in schedule
2022-11-18 12:21:50 +01:00
165dc6d901
implemented Method getGrowphaseGroupForDate
2022-11-18 12:21:21 +01:00
384dc2d853
completed Tests for GardenScheduleTest
2022-11-18 11:34:53 +01:00
2f69c48800
refactor: dedicated loadPaneToDialog function replacing the previous workaround
2022-11-16 20:37:07 +01:00
86a9eeaf2e
Merge pull request #60 from schrom01/refactor_dependency-injection_M3
...
Refactor: dependency injection M3
2022-11-16 15:30:43 +01:00
9ba252b828
refactor: fixed and simplified dayCellFactory even more
...
Added method to check if a date is within a GrowthPhaseType to plant, thus removing the need for the ugly getMinDate methods and moving knowledge of the phase-internals to the Plant class.
Also removed the need to specify the lifecycle-group to the sowDateFromHarvest method
2022-11-15 22:45:01 +01:00
90d2de65de
refactor: simplified dayCellFactory for date selector
...
Instead of generating a list of dates for every single visible date and checking if it is contained in that list, we now use a (admittedly scary-looking) predicate to compare the date to the start and enddates
2022-11-15 15:25:51 +01:00
05e7bcc2e8
fix: Made GardenPlanModelTest independent from json content.
...
isolated GardenPlanModelTests by pre-copying files. Tests pass now.
2022-11-15 11:28:48 +01:00
09e582b8a2
refactor: converted SelectSowDay popup to proper JFX Dialog
2022-11-15 11:03:36 +01:00
2b7cec7e6a
refactor: removed MainFXMLController from dependencies
...
Replaced MainFXMLController-based scene-changing with event-based scene-changing to remove cyclic dependency
2022-11-15 08:40:42 +01:00
5ef3f6c587
refactor: annotation-based dependency-injection
2022-11-14 21:15:27 +01:00
15279838b7
refactor: first attempt at dependency injection
...
also some more renaming and improving date-picker dialog
2022-11-14 20:00:01 +01:00
4f80a0a3e0
refactor: renamed everything
2022-11-14 13:47:22 +01:00
a5e1acc7c3
Merge pull request #59 from schrom01/test_complete_M2
...
Task Test Copied over from dev
2022-11-14 12:13:15 +01:00
a8efa8fc2b
Merge branch 'dev' into test_complete_M2
2022-11-14 12:09:37 +01:00
6737e67cda
Task Test Copied over from dev
2022-11-13 16:30:53 +01:00
a7fa58344c
Continued testing for TaskDatabase
...
Moved from branch and extended
2022-11-12 16:45:18 +01:00
6523e1d791
added jacoco
2022-11-12 16:13:02 +01:00
c653005652
Merge pull request #58 from schrom01/dev
...
Merge for Hand-in M2
2022-11-11 12:40:03 +01:00
bee517317a
Merge pull request #57 from schrom01/feature_cropsAndTaskGUI_M2
...
Feature crops and task gui m2
2022-11-11 12:28:17 +01:00
2be9df6094
Merge branch 'dev' into feature_cropsAndTaskGUI_M2
2022-11-11 12:21:05 +01:00
5faf61089a
Merge pull request #56 from schrom01/feature_logger_M2
...
Include Logger
2022-11-11 12:19:04 +01:00
8e23124c6b
display List of Crops, get detail of crop and display taskList
2022-11-10 22:50:49 +01:00
78a27499a8
#27 gardenplanmodelTest bugfixed
2022-11-08 23:11:38 +01:00
0e40bc6304
Merge remote-tracking branch 'origin/feature_cropsAndTaskGUI_M2' into feature_cropsAndTaskGUI_M2
...
# Conflicts:
# src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
# src/main/java/ch/zhaw/gartenverwaltung/MyPlantsController.java
# src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java
# src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml
2022-11-08 21:08:23 +01:00
ced2645bd7
connection task list model and garden plan model with controllers
2022-11-08 21:03:01 +01:00
802f238d69
gui details of crop basics
2022-11-08 19:26:08 +01:00
096abfd148
#48 and #47 basics of gui
2022-11-08 19:26:08 +01:00
590049b9cf
feat: Added logging and refactored code to accommodate
2022-11-08 07:36:31 +01:00
ad05e9e95a
refactor: remove exception-based control-flow
2022-11-08 07:31:04 +01:00
60c6dcd0d9
Merge pull request #49 from schrom01/feature_gardenplan-model_M2
...
Feature gardenplan model m2
2022-11-07 11:57:40 +01:00
schrom01
gulerdav
giavaphi
Elias Csomor
Gian-Andrea Hutter