Merge branch 'master' into feature/Anrechnungen_NEU

application/models/organisation/Geschaeftsjahr_model.php

@@ -20,8 +20,8 @@ class Geschaeftsjahr_model extends DB_Model
 	{
 		$query = 'SELECT *
 					FROM public.tbl_geschaeftsjahr
-					WHERE start <= now()
-					AND ende >= now()
+					WHERE start <= CURRENT_DATE
+					AND ende >= CURRENT_DATE
 					ORDER BY start DESC
 					LIMIT 1';
 

application/views/organisation/reihungstest/ReihungstestUebersichtData.php

@@ -106,7 +106,7 @@
 				public.tbl_reihungstest
 				LEFT JOIN public.tbl_studiengang using(studiengang_kz)
 			WHERE
-				datum>now()-'5 months'::interval
+				datum>now()-'12 months'::interval
 			ORDER BY datum desc
 		) data
 		",