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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 
						
							 
							
							
							
							
								
							
							
								6ec0ccaeaa 
								
							 
						 
						
							
							
								
								#23  bugfix GardenScheduleTest and PlantTest  
							
							 
							
							
							
						 
						
							2022-11-29 12:12:18 +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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								1dc2ad1774 
								
							 
						 
						
							
							
								
								Extended testcoverage for classes  
							
							 
							
							
							
						 
						
							2022-11-26 14:30:16 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								e75ececedb 
								
							 
						 
						
							
							
								
								Refactored AllSEASONS to ALLSEASONS and added tests  
							
							 
							
							
							
						 
						
							2022-11-26 14:29:49 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								560cea2ff9 
								
							 
						 
						
							
							
								
								Extended coverage for tests  
							
							 
							
							
							
						 
						
							2022-11-26 12:49:42 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								4e720c2ddc 
								
							 
						 
						
							
							
								
								finished tests for Plant, added fix for Plant  
							
							 
							
							
							
						 
						
							2022-11-26 11:54:47 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								77541c282c 
								
							 
						 
						
							
							
								
								fixed RemoveTasksForCrop  
							
							 
							
							
							
						 
						
							2022-11-26 11:22:27 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								e48be29d59 
								
							 
						 
						
							
							
								
								Merge branch 'feature_taskList_m2' into feature_notification_m3  
							
							 
							
							
							
						 
						
							2022-11-25 11:14:47 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								f389cfcdfd 
								
							 
						 
						
							
							
								
								adapted GardenSchedule and GardenScheduleTest to new Structure of Task  
							
							 
							
							
							
						 
						
							2022-11-25 11:13:45 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								a437236788 
								
							 
						 
						
							
							
								
								created Class Notifier  
							
							 
							
							
							
						 
						
							2022-11-24 23:45:33 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								d7b9095050 
								
							 
						 
						
							
							
								
								Merge branch 'dev' into feature_taskList_m2  
							
							 
							
							
							
						 
						
							2022-11-24 21:55:52 +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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								384dc2d853 
								
							 
						 
						
							
							
								
								completed Tests for GardenScheduleTest  
							
							 
							
							
							
						 
						
							2022-11-18 11:34:53 +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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								6737e67cda 
								
							 
						 
						
							
							
								
								Task Test Copied over from dev  
							
							 
							
							
							
						 
						
							2022-11-13 16:30:53 +01:00  
						
					 
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 
						
							 
							
							
							
							
								
							
							
								78a27499a8 
								
							 
						 
						
							
							
								
								#27  gardenplanmodelTest bugfixed  
							
							 
							
							
							
						 
						
							2022-11-08 23:11:38 +01:00  
						
					 
				
					
						
							
							
								 
								Roman Schenk
							
						 
						
							 
							
							
							
							
								
							
							
								00db602904 
								
							 
						 
						
							
							
								
								Merge branch 'dev' into feature_gardenplan-model_M2  
							
							 
							
							
							
						 
						
							2022-11-06 18:22:33 +01:00  
						
					 
				
					
						
							
							
								 
								giavaphi
							
						 
						
							 
							
							
							
							
								
							
							
								5e206ace39 
								
							 
						 
						
							
							
								
								Merge pull request  #51  from schrom01/feature_taskList_m2  
							
							 
							
							... 
							
							
							
							TaskListModel 
							
						 
						
							2022-11-06 17:50:30 +01:00  
						
					 
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 
						
							 
							
							
							
							
								
							
							
								8408af175d 
								
							 
						 
						
							
							
								
								#27  gardenplanmodelTest bugfixed  
							
							 
							
							
							
						 
						
							2022-11-04 15:46:11 +01:00  
						
					 
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 
						
							 
							
							
							
							
								
							
							
								e91773b360 
								
							 
						 
						
							
							
								
								#27  gardenplanmodelTest bugfixed  
							
							 
							
							
							
						 
						
							2022-11-04 15:35:45 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								38288f8561 
								
							 
						 
						
							
							
								
								finished Tests for TaskListModel  
							
							 
							
							
							
						 
						
							2022-11-04 14:20:58 +01:00  
						
					 
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 
						
							 
							
							
							
							
								
							
							
								d45b8e116e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java 
							
						 
						
							2022-11-04 07:39:57 +01:00  
						
					 
				
					
						
							
							
								 
								gulerdav
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 
						
							 
							
							
							
							
								
							
							
								b1e4e51d68 
								
							 
						 
						
							
							
								
								#27  gardenplanmodelTest first version implemented  
							
							 
							
							
							
						 
						
							2022-11-02 13:08:23 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								eea530931e 
								
							 
						 
						
							
							
								
								created Some TaskListModelTests  
							
							 
							
							
							
						 
						
							2022-10-31 21:01:25 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								541217c281 
								
							 
						 
						
							
							
								
								prepaired Tests for new Methods in JsonTaskDatabase  
							
							 
							
							
							
						 
						
							2022-10-31 16:36:24 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								5c6528a038 
								
							 
						 
						
							
							
								
								Update JsonTaskDatabaseTest.java  
							
							 
							
							
							
						 
						
							2022-10-31 12:54:52 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								2510608117 
								
							 
						 
						
							
							
								
								Extended taskDb tests  
							
							 
							
							
							
						 
						
							2022-10-31 11:55:20 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								82eab6d5cd 
								
							 
						 
						
							
							
								
								continue GardenPlan tests  
							
							 
							
							
							
						 
						
							2022-10-31 11:21:45 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								5411ac69ae 
								
							 
						 
						
							
							
								
								initial GardenPlan tests  
							
							 
							
							
							
						 
						
							2022-10-31 11:15:27 +01:00  
						
					 
				
					
						
							
							
								 
								Elias Csomor
							
						 
						
							 
							
							
							
							
								
							
							
								146c43d5d9 
								
							 
						 
						
							
							
								
								extended tests for Zones  
							
							 
							
							
							
						 
						
							2022-10-31 10:07:06 +01:00  
						
					 
				
					
						
							
							
								 
								gulerdav
							
						 
						
							 
							
							
							
							
								
							
							
								6c00b7f182 
								
							 
						 
						
							
							
								
								Merge pull request  #41  from schrom01/feature_plantList_M2  
							
							 
							
							... 
							
							
							
							fixed Method getFilteredPlantListByString 
							
						 
						
							2022-10-31 08:01:43 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								98ff259d95 
								
							 
						 
						
							
							
								
								fixed Method getFilteredPlantListByString for case if SearchString is empty.  
							
							 
							
							
							
						 
						
							2022-10-30 10:38:46 +01:00  
						
					 
				
					
						
							
							
								 
								gulerdav
							
						 
						
							 
							
							
							
							
								
							
							
								f452b73233 
								
							 
						 
						
							
							
								
								Merge pull request  #40  from schrom01/feature_plantList_M2  
							
							 
							
							... 
							
							
							
							Feature plant list m2 
							
						 
						
							2022-10-30 10:36:07 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								4e794a8a93 
								
							 
						 
						
							
							
								
								implemented Methods and tests:  
							
							 
							
							... 
							
							
							
							getFilteredPlantListByHarvestSaison
getFilteredPlantListByPlantingSaison
#12  
							
						 
						
							2022-10-30 10:31:09 +01:00  
						
					 
				
					
						
							
							
								 
								schrom01
							
						 
						
							 
							
							
							
							
								
							
							
								3e586093ba 
								
							 
						 
						
							
							
								
								implemented Method getFilteredPlantListByString in PlantListModel  
							
							 
							
							
							
						 
						
							2022-10-30 09:32:55 +01:00  
						
					 
				
					
						
							
							
								 
								Roman Schenk
							
						 
						
							 
							
							
							
							
								
							
							
								246fed7826 
								
							 
						 
						
							
							
								
								Merge pull request  #39  from schrom01/feature_json-plant-db_M2  
							
							 
							
							... 
							
							
							
							#36  Added images to Plant database 
							
						 
						
							2022-10-29 11:36:14 +02:00  
						
					 
				
					
						
							
							
								 
								David Guler
							
						 
						
							 
							
							
							
							
								
							
							
								bfbda8d753 
								
							 
						 
						
							
							
								
								#36  Added images to Plant database  
							
							 
							
							
							
						 
						
							2022-10-29 09:44:02 +02:00  
						
					 
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 
						
							 
							
							
							
							
								
							
							
								bd2aa60128 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	build.gradle 
							
						 
						
							2022-10-28 11:52:49 +02:00