Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp

application/libraries/issues/PlausicheckDefinitionLib.php

@@ -33,7 +33,8 @@ class PlausicheckDefinitionLib
 		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
 		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
 		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher'
+		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
+		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
 		//'StudienplanUngueltig' => 'StudienplanUngueltig'
 	);
 

application/libraries/issues/PlausicheckProducerLib.php

@@ -12,8 +12,7 @@ class PlausicheckProducerLib
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_app; // name of application
-	private $_konfiguration = array(); // konfigratio parameters
+	private $_konfiguration = array(); // configuration parameters
 
 	public function __construct($params = null)
 	{

application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php

@@ -0,0 +1,143 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('PlausiChecker.php');
+
+/**
+ *
+ */
+class DualesStudiumOhneMarkierung extends PlausiChecker
+{
+	public function executePlausiCheck($params)
+	{
+		$results = array();
+
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+		// pass parameters needed for plausicheck
+		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
+		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+
+		// get all students failing the plausicheck
+		$prestudentRes = $this->getDualesStudiumOhneMarkierung(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
+
+		if (isError($prestudentRes)) return $prestudentRes;
+
+		if (hasData($prestudentRes))
+		{
+			$prestudents = getData($prestudentRes);
+
+			// populate results with data necessary for writing issues
+			foreach ($prestudents as $prestudent)
+			{
+				$results[] = array(
+					'person_id' => $prestudent->person_id,
+					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studienplan' => $prestudent->studienplan
+					),
+					'resolution_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
+					)
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
+
+	/**
+	 * All prestudents in dual Studiengang should have set the dual flag to true.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getDualesStudiumOhneMarkierung(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT pre.person_id, pre.prestudent_id,
+				stpl.bezeichnung AS studienplan,
+				status.studiensemester_kurzbz,
+				status.ausbildungssemester,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_person USING(person_id)
+				JOIN lehre.tbl_studienplan stpl USING(studienplan_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+			WHERE
+				(stpl.orgform_kurzbz = 'DUA' OR status.orgform_kurzbz = 'DUA')
+				AND pre.dual = FALSE
+				AND status.studiensemester_kurzbz=?
+				AND pre.bismelden
+				AND stg.melderelevant
+				AND NOT EXISTS (
+					SELECT 1
+					FROM
+						public.tbl_prestudentstatus
+						JOIN lehre.tbl_studienplan USING(studienplan_id)
+						JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+					WHERE
+						prestudent_id = pre.prestudent_id
+						AND
+						(
+							-- if there is a newer non-dual status, dual has not to be set
+							(
+								(
+									tbl_studienplan.orgform_kurzbz <> stpl.orgform_kurzbz
+									OR status.orgform_kurzbz <> tbl_prestudentstatus.orgform_kurzbz
+								)
+								AND
+								(
+									tbl_studiensemester.ende::date > sem.ende::date
+									OR (tbl_studiensemester.ende::date = sem.ende::date AND tbl_prestudentstatus.datum::date > status.datum::date)
+								)
+							)
+							OR
+								-- exclude Abgewiesene - they are not reported
+								tbl_prestudentstatus.status_kurzbz = 'Abgewiesener'
+						)
+				)";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
+}

application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php

@@ -67,6 +67,7 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 		$prestudent_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
+		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 		$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
 
 		if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes;

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php

@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Student in dual Studiengang should have set the dual flag to true.
+ */
+class CORE_STUDENTSTATUS_0016 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
+			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
+
+		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
+			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->library('issues/plausichecks/DualesStudiumOhneMarkierung');
+
+		// check if issue persists
+		$checkRes = $this->_ci->dualesstudiumohnemarkierung->getDualesStudiumOhneMarkierung(
+			$params['studiensemester_kurzbz'],
+			null,
+			$params['prestudent_id']
+		);
+
+		if (isError($checkRes)) return $checkRes;
+
+		if (hasData($checkRes))
+			return success(false); // not resolved if issue is still present
+		else
+			return success(true); // resolved otherwise
+	}
+}

application/libraries/vertragsbestandteil/Dienstverhaeltnis.php

@@ -29,6 +29,9 @@ class Dienstverhaeltnis extends AbstractBestandteil {
 	protected $updateamum;
 	protected $updatevon;
 
+	protected $dvendegrund_kurzbz;
+	protected $dvendegrund_anmerkung;
+
 	public function __construct()
 	{
 		parent::__construct();
@@ -49,6 +52,8 @@ class Dienstverhaeltnis extends AbstractBestandteil {
 		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
 		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
 		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
+		isset($data->dvendegrund_kurzbz) && $this->setDvendegrund_kurzbz($data->dvendegrund_kurzbz);
+		isset($data->dvendegrund_anmerkung) && $this->setDvendegrund_anmerkung($data->dvendegrund_anmerkung);
 		$this->fromdb = false;
 	}
 	
@@ -64,7 +69,9 @@ class Dienstverhaeltnis extends AbstractBestandteil {
 			'insertamum' => $this->getInsertamum(),
 			'insertvon' => $this->getInsertvon(),
 			'updateamum' => $this->getUpdateamum(),
-			'updatevon' => $this->getUpdatevon()
+			'updatevon' => $this->getUpdatevon(), 
+			'dvendegrund_kurzbz' => $this->getDvendegrund_kurzbz(), 
+			'dvendegrund_anmerkung' => $this->getDvendegrund_anmerkung()
 		);
 		
 		$tmp = array_filter($tmp, function($k) {
@@ -139,6 +146,16 @@ EOTXT;
 		return $this->updatevon;
 	}
 
+	public function getDvendegrund_kurzbz()
+	{
+	    return $this->dvendegrund_kurzbz;
+	}
+
+	public function getDvendegrund_anmerkung()
+	{
+	    return $this->dvendegrund_anmerkung;
+	}
+
 	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
 	{
 		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
@@ -214,6 +231,20 @@ EOTXT;
 		return $this;
 	}
 	
+	public function setDvendegrund_kurzbz($dvendegrund_kurzbz)
+	{
+	    $this->markDirty('dvendegrund_kurzbz', $this->dvendegrund_kurzbz, $dvendegrund_kurzbz);
+	    $this->dvendegrund_kurzbz = $dvendegrund_kurzbz;
+	    return $this;
+	}
+
+	public function setDvendegrund_anmerkung($dvendegrund_anmerkung)
+	{
+	    $this->markDirty('dvendegrund_anmerkung', $this->dvendegrund_anmerkung, $dvendegrund_anmerkung);
+	    $this->dvendegrund_anmerkung = $dvendegrund_anmerkung;
+	    return $this;
+	}
+
 	public function validate() {		
 		//do Validation here
 		$ci = get_instance();

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -435,7 +435,7 @@ class VertragsbestandteilLib
 	    return $result;
 	}
 
-	public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate)
+	public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate, $dvendegrund_kurzbz=null, $dvendegrund_anmerkung=null)
 	{
 		if( $dv->getBis() !== null && $dv->getBis() < $enddate )
 		{
@@ -460,6 +460,14 @@ class VertragsbestandteilLib
 					$this->endVertragsbestandteil($vb, $enddate);
 				}
 
+				if( $dvendegrund_kurzbz !== null )
+				{
+				    $dv->setDvendegrund_kurzbz($dvendegrund_kurzbz);
+				}
+				if( $dvendegrund_anmerkung !== null )
+				{
+				    $dv->setDvendegrund_anmerkung($dvendegrund_anmerkung);
+				}
 				$dv->setBis($enddate);
 				$this->updateDienstverhaeltnis($dv);