Roman_Schenk
/
PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
273 Commits 18 Branches 2 Tags 8.5 MiB
Commit Graph

273 Commits

Author SHA1 Message Date
giavaphi 083d934472 Merge pull request #85 from schrom01/feature_weather 
#23 bugfix testclass WeatherGradenTaskPlannerTest and bugfix Task and…
 2022-12-10 13:58:26 +01:00
Gian-Andrea Hutter 3bda390708 #23 bugfix testclass WeatherGradenTaskPlannerTest and bugfix Task and WeatherGradenTaskPlanner 2022-12-10 13:47:54 +01:00
Roman Schenk c6952aba55 Merge pull request #81 from schrom01/feature_updaeTaskListViewOnUpdate_M3 
show all tasks in scheduler
 2022-12-10 13:41:04 +01:00
Roman Schenk 807a9017ad Merge pull request #82 from schrom01/fix_tasklist_filteringPastTasks 
Fix tasklist filtering past tasks
 2022-12-10 13:40:55 +01:00
Roman Schenk c134025408 Merge pull request #83 from schrom01/tests_extended_M3 
extending tests and adding integration test
 2022-12-10 13:40:46 +01:00
Roman Schenk 1e95e0ff30 Merge pull request #84 from schrom01/feature_tutorial-screenshots_M3 
added screenshots to tutorial
 2022-12-10 13:40:38 +01:00
David Guler fb21797040 added screenshots to tutorial 2022-12-10 13:22:40 +01:00
Elias Csomor 76197a19df extending tests and adding integration test 
and better precision when comparing results
 2022-12-10 12:48:06 +01:00
schrom01 5f7d690875 fixed not showing past tasks 2022-12-09 21:27:13 +01:00
giavaphi 96dc0ad827 fix show all tasks 2022-12-09 19:38:22 +01:00
Elias Csomor 56020a7529 Setup Platform for runLater in GardenSchedule 
Otherwise Test planTaskForCrop crashes due to unitialized Platform
 2022-12-09 17:35:41 +01:00
Elias Csomor 5830ee5180 fixing execution and notification dates in test db 2022-12-09 17:13:05 +01:00
David Guler b3c7dd67e8 fix: remove "done" field from json serialisation 2022-12-09 15:27:21 +01:00
giavaphi 59c5d4be5a Merge pull request #80 from schrom01/feature_guiOverhaul_M3 
css style update
 2022-12-09 14:20:02 +01:00
giavaphi 035f5d7fcd Merge pull request #79 from schrom01/feature_updaeTaskListViewOnUpdate_M3 
update tasks with subscription from JsonTaskList
 2022-12-09 14:18:56 +01:00
giavaphi 4d2057d0df fix update scheduler 2022-12-09 14:16:12 +01:00
gulerdav ccaff13df3 Merge pull request #78 from schrom01/feature_weather 
Feature weather
 2022-12-09 12:59:53 +01:00
gulerdav c9baf4dfb1 Merge branch 'dev' into feature_weather 2022-12-09 12:59:43 +01:00
giavaphi f54b39b1f2 updated style 2022-12-09 06:59:37 +01:00
giavaphi 45035e565c update tasks with subscription from JsonTaskList 2022-12-09 01:27:37 +01:00
Gian-Andrea Hutter 00be979863 #23 implemented test class for WeatherGradenTaskPlanner 2022-12-09 00:08:32 +01:00
Gian-Andrea Hutter 86386d8a91 #23 implemented test class for WeatherGradenTaskPlanner 2022-12-09 00:02:21 +01:00
David Guler c7b23335b5 doc: javadoc for types 2022-12-05 15:26:10 +01:00
gulerdav 7c015d78f4 Merge pull request #76 from schrom01/feature_guiOverhaul_M3 
changesFXMLFile_and_JavaDocControllerFiles
 2022-12-05 13:15:36 +01:00
gulerdav dd09fad581 Merge branch 'dev' into feature_guiOverhaul_M3 2022-12-05 13:08:47 +01:00
gulerdav 952a6a16d2 Merge pull request #77 from schrom01/feature_weather 
Feature Background Tasks (weather and Notifications)
 2022-12-05 13:05:28 +01:00
Gian-Andrea Hutter d119fd1331 Merge branch 'dev' into feature_weather 2022-12-05 11:40:53 +01:00
Gian-Andrea Hutter 28f76e7a04 #23 documentation 2022-12-05 11:40:09 +01:00
Gian-Andrea Hutter 0fa2b81427 #23 bugfix adjust task 2022-12-05 11:02:15 +01:00
gulerdav 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
giavaphi d725367f4d JavaDoc for controller classes 2022-12-05 01:56:15 +01:00
giavaphi 0257dd9bf0 fxml files changes + first style 2022-12-05 01:12:18 +01:00
Gian-Andrea Hutter d0c6525d7a Merge remote-tracking branch 'origin/feature_weather' into feature_weather 2022-12-04 16:32:51 +01:00
Gian-Andrea Hutter a29066ed05 #23 bugfix adjust task 2022-12-04 16:32:30 +01:00
Elias Csomor c64339c945 fixed image loading when app is packed as jar 
https://stackoverflow.com/questions/2308188/getresourceasstream-vs-fileinputstream
 2022-12-02 12:04:51 +01:00
schrom01 564cecd4ff Merge remote-tracking branch 'origin/feature_weather' into feature_weather 2022-12-01 23:46:08 +01:00
schrom01 2f5440696f Cleanup of Class BackgroundTasks, added Logger 2022-12-01 23:45:53 +01:00
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
giavaphi 21643e5d63 Merge pull request #70 from schrom01/tests_and_fixes_M3 
Tests and fixes m3
 2022-11-28 13:36:47 +01:00