From 12e531532bb631865fe5c344c86f477a9dfa27b5 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 May 2021 13:19:40 +0200
Subject: [PATCH] Changed checking Application Deadline by checking
 start-/enddate

Now checking start-/enddate in the config entries.
If not provided, start-/endedate of Studiensemester will be used.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
---
 application/config/anrechnung.php             |  4 ++
 .../lehre/anrechnung/RequestAnrechnung.php    | 47 +++++++++++++------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/application/config/anrechnung.php b/application/config/anrechnung.php
index 9e209e559..d1f4f0958 100644
--- a/application/config/anrechnung.php
+++ b/application/config/anrechnung.php
@@ -6,6 +6,10 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 // Deadline for Application given as Time-Interval after Semesterstart.
 $config['interval_blocking_application'] = 'P1M';
 
+// Application submission period given by start- and enddate.
+$config['submit_application_start'] = '01.02.2021';
+$config['submit_application_end'] = '22.02.2021';
+
 // Lehrveranstaltungen with these grades will be blocked for application
 $config['grades_blocking_application'] = array(
 	5,  // nicht genügend
diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
index 0e81f3831..45a770cf5 100644
--- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php
+++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
@@ -80,8 +80,11 @@ class requestAnrechnung extends Auth_Controller
 		$prestudent_id = getData($result)[0]->prestudent_id;
 		
 		// Check if application deadline is expired
-		// $is_expired = self::_checkAntragDeadline($studiensemester_kurzbz);
-		$is_expired = false;
+		$is_expired = self::_checkAntragDeadline(
+			$this->config->item('submit_application_start'),
+			$this->config->item('submit_application_end'),
+			$studiensemester_kurzbz
+		);
 		
 		// Check if Lehrveranstaltung was already graded with application blocking grades
 		$is_blocked = self::_LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id);
@@ -216,28 +219,42 @@ class requestAnrechnung extends Auth_Controller
 		
 		if (!$this->_uid) show_error('User authentification failed');
 	}
-
+	
 	/**
 	 * Check if application deadline is expired.
 	 *
+	 * @param $start Start date for application submission.
+	 * @param $ende End date for application submission.
 	 * @param $studiensemester_kurzbz
-	 * @return bool True if semester start is more then 1 week ago
+	 * @return bool True if today is not during the start- and ending deadlines (= if is expired)
 	 * @throws Exception
 	 */
-	private function _checkAntragDeadline($studiensemester_kurzbz)
+	private function _checkAntragDeadline($start, $ende, $studiensemester_kurzbz)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->StudiensemesterModel->addSelect('start');
-		if (!$start = getData($this->StudiensemesterModel->load($studiensemester_kurzbz)))
-		{
-			show_error(getError($start));
-		}
-
-		$start = new DateTime($start[0]->start);
-		$today = new DateTime('today midnight');
 		
-		// True if today > application deadline
-		return ($today > $start->add((new DateInterval($this->config->item('interval_blocking_application')))));
+		// If start is not given, set to Semesterstart.
+		if (!isset($start) || isEmptyString($start))
+		{
+			$this->StudiensemesterModel->addSelect('start');
+			$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+			$start = getData($result)[0]->start;
+		}
+		
+		// If ende is not given, set to Semesterende.
+		if (!isset($ende) || isEmptyString($ende))
+		{
+			$this->StudiensemesterModel->addSelect('ende');
+			$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+			$ende = getData($result)[0]->ende;
+		}
+		
+		$today = new DateTime('today midnight');
+		$start = new DateTime($start);
+		$ende = new DateTime($ende);
+		
+		// True if today is not during the start- and ending deadlines (= if is expired)
+		return ($today <= $start || $today >= $ende);
 	}
 	
 	/**