Roman_Schenk/PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
294 Commits 18 Branches 2 Tags
95748c79b1129409ec70d7c02231bd39c6658a50
Commit Graph
72 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Guler 06c4c47e44 added screenshot pngs 2022-12-11 09:23:53 +01:00
David Guler fb21797040 added screenshots to tutorial 2022-12-10 13:22:40 +01:00
David Guler b3c7dd67e8 fix: remove "done" field from json serialisation 2022-12-09 15:27:21 +01:00
gulerdavandGitHub Enterprise ccaff13df3 Merge pull request #78 from schrom01/feature_weather 
Feature weather
 2022-12-09 12:59:53 +01:00
gulerdavandGitHub Enterprise c9baf4dfb1 Merge branch 'dev' into feature_weather 2022-12-09 12:59:43 +01:00
David Guler c7b23335b5 doc: javadoc for types 2022-12-05 15:26:10 +01:00
gulerdavandGitHub Enterprise 7c015d78f4 Merge pull request #76 from schrom01/feature_guiOverhaul_M3 
changesFXMLFile_and_JavaDocControllerFiles
 2022-12-05 13:15:36 +01:00
gulerdavandGitHub Enterprise dd09fad581 Merge branch 'dev' into feature_guiOverhaul_M3 2022-12-05 13:08:47 +01:00
gulerdavandGitHub Enterprise 952a6a16d2 Merge pull request #77 from schrom01/feature_weather 
Feature Background Tasks (weather and Notifications)
 2022-12-05 13:05:28 +01:00
gulerdavandGitHub Enterprise 92ee656a5d Merge pull request #75 from schrom01/fix_imageLoad_M3 
fixed image loading when app is packed as jar
 2022-12-05 10:59:41 +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
David Guler d0959f535b refactor: javadoc and dependencies in HashMap 2022-11-28 11:35:17 +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
David Guler 07569b83e1 fix: syntax errors 2022-11-25 12:39:10 +01:00
David Guler 1f049f86ab fix: fixed fxml version warning 2022-11-25 12:31:27 +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
David Guler bcb36b89c7 feature: added tutorial window 2022-11-23 21:55:35 +01:00
gulerdavandGitHub Enterprise f7105f041c Merge pull request #66 from schrom01/feature_guiOverhaul_M3 
Feature gui overhaul m3
 2022-11-21 12:56:57 +01:00
gulerdavandGitHub Enterprise 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
David Guler 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
David Guler 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
David Guler 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
gulerdavandGitHub Enterprise 8e3af2ba32 Merge branch 'dev' into feature_taskList_m2 2022-11-18 12:27:33 +01:00
gulerdavandGitHub Enterprise b70a758099 Merge pull request #61 from schrom01/refactor_gui_M3 
Refactor gui m3
 2022-11-18 12:22:13 +01:00
David Guler 3a69119eb7 refactor: bind croplist in schedule 2022-11-18 12:21:50 +01:00
David Guler 2f69c48800 refactor: dedicated loadPaneToDialog function replacing the previous workaround 2022-11-16 20:37:07 +01:00
gulerdavandGitHub Enterprise 86a9eeaf2e Merge pull request #60 from schrom01/refactor_dependency-injection_M3 
Refactor: dependency injection M3
 2022-11-16 15:30:43 +01:00
David Guler 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
David Guler 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
David Guler 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
David Guler 09e582b8a2 refactor: converted SelectSowDay popup to proper JFX Dialog 2022-11-15 11:03:36 +01:00
David Guler 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
David Guler 5ef3f6c587 refactor: annotation-based dependency-injection 2022-11-14 21:15:27 +01:00
David Guler 15279838b7 refactor: first attempt at dependency injection 
also some more renaming and improving date-picker dialog
 2022-11-14 20:00:01 +01:00
David Guler 4f80a0a3e0 refactor: renamed everything 2022-11-14 13:47:22 +01:00
gulerdavandGitHub Enterprise c653005652 Merge pull request #58 from schrom01/dev 
Merge for Hand-in M2
 2022-11-11 12:40:03 +01:00
David Guler 590049b9cf feat: Added logging and refactored code to accommodate 2022-11-08 07:36:31 +01:00
David Guler ad05e9e95a refactor: remove exception-based control-flow 2022-11-08 07:31:04 +01:00
David Guler f6ec411b7a doc: design class diagram "dcd" 2022-11-05 09:50:35 +01:00
gulerdavandGitHub Enterprise fb0c50a715 Merge branch 'dev' into feature_json-gardenplan_M2 2022-11-03 14:31:23 +01:00
David Guler 83bc011870 #26 added fixed test files, made Crop class testable 2022-11-03 14:28:26 +01:00
David Guler ce93531ab8 Made tests pass for plants not in zone 2022-11-03 14:25:25 +01:00
gulerdavandGitHub Enterprise 3afeb8a22d Merge branch 'dev' into feature_controllerPlantList_M2 2022-10-31 13:05:49 +01:00
gulerdavandGitHub Enterprise 88f9bf7990 Merge pull request #44 from schrom01/feature_plantlist-gui_M2 
Display images in gui and fix image deserialise with spaces
 2022-10-31 12:59:06 +01:00
David Guler 7a060be84a case insensitive serarch, images 2022-10-31 10:06:17 +01:00
gulerdavandGitHub Enterprise 6c00b7f182 Merge pull request #41 from schrom01/feature_plantList_M2 
fixed Method getFilteredPlantListByString
 2022-10-31 08:01:43 +01:00
gulerdavandGitHub Enterprise f452b73233 Merge pull request #40 from schrom01/feature_plantList_M2 
Feature plant list m2
 2022-10-30 10:36:07 +01:00
David Guler 5b860e0ff4 #10 doc: layer-diagram 2022-10-29 10:17:51 +02:00
David Guler b6b5138e9f fix: adjust fxml-api version to remove warnings 2022-10-29 09:54:55 +02:00
gulerdavandGitHub Enterprise 554c560832 Merge pull request #37 from schrom01/feature_json-task-db_M2 
Feature json task db m2
 2022-10-29 09:47:17 +02:00
gulerdavandGitHub Enterprise 8120071348 Merge branch 'dev' into feature_json-task-db_M2 2022-10-29 09:46:50 +02:00
David Guler bfbda8d753 #36 Added images to Plant database 2022-10-29 09:44:02 +02:00
gulerdavandGitHub Enterprise 1e14a07ef8 Merge branch 'dev' into feature_json-gardenplan_M2 2022-10-28 11:43:45 +02:00
David Guler 629e64143b Fixed serialisation of cropId and startDate 2022-10-26 20:32:01 +02:00
gulerdavandGitHub Enterprise b851c11f7d Merge pull request #33 from schrom01/feature_plantList_M2 
Feature plant list model m2
 2022-10-24 21:40:30 +02:00
David Guler 72b0d029d5 #25 Initial implementation of the JsonGardenPlan 
Updated and renamed the Crop type to accommodate storage
 2022-10-24 19:20:08 +02:00
David Guler a29f8c7db7 Added IdProvider 2022-10-24 13:42:31 +02:00
gulerdavandGitHub Enterprise 0d99ee219d #11 Merge pull request #32 from schrom01/feature_json-plant-db_M2 
#4 Feature json plant db m2
 2022-10-24 12:41:18 +02:00
David Guler 0d24bcc2ad Moved null-check to loading method 2022-10-24 12:32:28 +02:00
David Guler 2c61cd3393 Implemented simple caching for JsonPlantDatabase 
Also added Javadoc for the PlantDatabase interface
 2022-10-23 11:11:52 +02:00
David Guler 7355ce563f Added WateringCycle and Pest types 2022-10-23 09:54:56 +02:00
David Guler 429ac16d98 filtering lifecycle based on hardiness-zone 
- Added 2 more plants to test db
- Db filters plant lifecycles based on hardiness-zones
- getPlantById implemented
- Added methods to Plant for calculating sowDates and accounting for multiple lifecycles
 2022-10-23 09:49:22 +02:00
gulerdavandGitHub Enterprise 99e8f305e1 Merge pull request #31 from schrom01/feature_json-plant-db_M2 
Feature json plant db m2
 2022-10-21 12:20:06 +02:00
David Guler bf4d56e759 removed test code 2022-10-21 12:16:15 +02:00
David Guler 6d13bede7a Minimum viable deserialization 
Added TaskTemplate type
Added dummy data with (probably) usable format
Used the java.time classes instead of the legacy util.Date
 2022-10-20 21:46:00 +02:00
gulerdavandGitHub Enterprise 56fac84e12 Merge pull request #29 from dev 
Documents from teams and project setup
 2022-10-18 15:24:11 +02:00
David Guler 5f53bb86c6 #11 Very basic implementation with dummy data 2022-10-17 17:01:50 +02:00
David Guler 9a29499c39 feat: GardenPlan types and interfaces 
Created the type and interface relating to the GardenPlan
 2022-10-14 21:15:42 +02:00
David Guler 6d1fdd05ab feat: TaskDB types and interfaces 
Created the types and interfaces relating to the TaskDatabase
 2022-10-14 21:15:42 +02:00
gulerdavandGitHub Enterprise 9ad62d72cc Update README.md 2022-10-14 15:27:49 +02:00
David Guler bd53d0644a feat: PlantDB types and interfaces 
Created the types and interfaces relating to the PlantDatabase
 2022-10-14 15:16:27 +02:00