Merge branch 'feature/infocenter_anpassungen'

application/controllers/system/infocenter/InfoCenter.php

@@ -297,6 +297,13 @@ class InfoCenter extends Auth_Controller
 		}
 
 		$persondata = $this->_loadPersonData($person_id);
+
+		$checkPerson = $this->PersonModel->checkDuplicate($person_id);
+
+		if (isError($checkPerson)) show_error(getError($checkPerson));
+
+		$duplicate = array('duplicated' => getData($checkPerson));
+
 		$prestudentdata = $this->_loadPrestudentData($person_id);
 
 		$this->DokumentModel->addOrder('bezeichnung');
@@ -305,7 +312,8 @@ class InfoCenter extends Auth_Controller
 		$data = array_merge(
 			$persondata,
 			$prestudentdata,
-			$dokumentdata
+			$dokumentdata,
+			$duplicate
 		);
 
 		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -734,7 +742,7 @@ class InfoCenter extends Auth_Controller
 
 		if (hasData($lastStatus) && hasData($statusgrresult))
 		{
-			//check if still Interessent
+			//check if still Interessent, Bewerber or Wartender
 			if ($lastStatus->retval[0]->status_kurzbz === self::INTERESSENTSTATUS
 				|| $lastStatus->retval[0]->status_kurzbz === self::BEWERBERSTATUS
 				|| $lastStatus->retval[0]->status_kurzbz === self::WARTENDER)
@@ -2134,17 +2142,18 @@ class InfoCenter extends Auth_Controller
 	{
 		$statusgrund = $this->input->post('statusgrund');
 		$studiengang = $this->input->post('studiengang');
+		$abgeschickt = $this->input->post('abgeschickt');
 		$personen = $this->input->post('personen');
 		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
 
-		if ($statusgrund === 'null' || $studiengang === 'null' || empty($personen))
-			$this->terminateWithJsonError("Bitte Statusgrund, Studiengang und Personen auswählen.");
+		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
+			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
 
 		foreach($personen as $person)
 		{
-			$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester);
+			$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt);
 
-			if(!hasData($prestudent))
+			if (!hasData($prestudent))
 				continue;
 
 			$prestudentData = getData($prestudent);

application/libraries/UDFLib.php

@@ -312,10 +312,10 @@ class UDFLib
 			{
 				$resultElement->{$columnName} = $columnValue;
 			}
-		}
 
-		// And finally remove the UDFs column
-		unset($resultElement->{self::COLUMN_NAME});
+			// And finally remove the UDFs column
+			unset($resultElement->{self::COLUMN_NAME});
+		}
 	}
 
 	/**

application/models/crm/Prestudent_model.php

@@ -611,7 +611,7 @@ class Prestudent_model extends DB_Model
 		));
 	}
 
-	public function getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester)
+	public function getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt)
 	{
 		$query = "SELECT ps.prestudent_id
 					FROM public.tbl_prestudentstatus pss
@@ -621,7 +621,17 @@ class Prestudent_model extends DB_Model
 					WHERE ps.person_id = ?
 					AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?
 					AND pss.studiensemester_kurzbz = ?
-					";
+					AND";
+
+		if ($abgeschickt === 'true')
+			$query .= " EXISTS";
+		else
+			$query .= " NOT EXISTS";
+
+		$query .= " (SELECT 1 FROM public.tbl_prestudentstatus spss
+					JOIN public.tbl_prestudent sps USING(prestudent_id) 
+					WHERE sps.prestudent_id = ps.prestudent_id
+					AND spss.bewerbung_abgeschicktamum IS NOT NULL)";
 
 		return $this->execQuery($query, array($person, $studiengang, $studienSemester));
 	}

application/models/person/Person_model.php

@@ -265,4 +265,19 @@ class Person_model extends DB_Model
 		
 		return success($result->vorname. ' '. $result->nachname);
 	}
+
+	public function checkDuplicate($person_id)
+	{
+		$qry = "SELECT sp.person_id
+		FROM public.tbl_person p 
+		LEFT JOIN public.tbl_person sp ON p.vorname = sp.vorname
+			AND p.nachname = sp.nachname 
+			AND p.gebdatum = sp.gebdatum 
+		JOIN public.tbl_prestudent ps ON sp.person_id = ps.person_id
+		JOIN public.tbl_prestudentstatus pss ON ps.prestudent_id = pss.prestudent_id
+		WHERE p.person_id = ? AND sp.person_id != ? AND pss.status_kurzbz = ?";
+
+
+		return $this->execQuery($qry, array($person_id, $person_id, 'Abbrecher'));
+	}
 }

application/views/system/infocenter/infocenterData.php

@@ -6,7 +6,7 @@
 	$INTERESSENT_STATUS = '\'Interessent\'';
 	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
-	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\', \'Interessent rejected\'';
+	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'Interessent rejected\'';
 	$LOGDATA_NAME_PARKED = '\'Parked\'';
 	$LOGDATA_NAME_ONHOLD = '\'Onhold\'';
 	$LOGTYPE_KURZBZ = '\'Processstate\'';
@@ -14,6 +14,7 @@
 	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
 	$AKTE_TYP = '\'identity\', \'zgv_bakk\'';
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
+	$ORG_NAME = '\'InfoCenter\'';
 
 	$query = '
 		SELECT
@@ -33,7 +34,7 @@
 				 WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "LastAction",
 			(
@@ -42,7 +43,7 @@
 				 WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "LastActionType",
 			(
@@ -59,7 +60,7 @@
 				 WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "User/Operator",
 			(
@@ -254,13 +255,14 @@
 				JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
 				WHERE (tbl_benutzerfunktion.datum_von IS NULL OR tbl_benutzerfunktion.datum_von <= now()) 
 				AND (tbl_benutzerfunktion.datum_bis IS NULL OR tbl_benutzerfunktion.datum_bis >= now())
+				AND tbl_organisationseinheit.bezeichnung = '.$ORG_NAME.'
 				AND tbl_benutzerfunktion.uid = (
 					SELECT l.insertvon
 					FROM system.tbl_log l
 					WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
 					AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 					AND l.person_id = p.person_id
-					ORDER BY l.zeitpunkt DESC
+					ORDER BY l.log_id DESC
 					LIMIT 1
 				)
 				LIMIT 1 
@@ -439,13 +441,13 @@
 				$datasetRaw->{'ZGVMNation'} = '-';
 			}
 
-			if ($datasetRaw->{'InfoCenterMitarbeiter'} === 'InfoCenter')
+			if ($datasetRaw->{'InfoCenterMitarbeiter'} === null)
 			{
-				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
 			}
 			else
 			{
-				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
 			}
 
 			return $datasetRaw;

application/views/system/infocenter/infocenterDetails.php

@@ -101,6 +101,22 @@
 					</div>
 				</div>
 			</div>
+			<?php if (!is_null($duplicated)): ?>
+				<div class="row alert-warning">
+					<h3 class="header col-lg-12">
+						<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
+					</h3>
+					<div class="text-left col-lg-12">
+						<?php
+						foreach ($duplicated as $duplicate)
+						{
+							echo  'Person ID: ' . $duplicate->person_id . '<br />';
+						}
+						?>
+					</div>
+
+				</div>
+			<?php endif; ?>
 			<br/>
 			<section>
 				<div class="row">

application/views/system/infocenter/infocenterFreigegebenData.php

@@ -5,13 +5,14 @@
 	$INTERESSENT_STATUS = '\'Interessent\'';
 	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
-	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
+	$LOGDATA_NAME = '\'Login with code\', \'Login with user\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
 	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
+	$ORG_NAME = '\'InfoCenter\'';
 
-	$query = '
+$query = '
 		SELECT
 			p.person_id AS "PersonId",
 			p.vorname AS "Vorname",
@@ -27,7 +28,7 @@
 				 WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "LastAction",
 			(
@@ -36,7 +37,7 @@
 				 WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "LastActionType",
 			(
@@ -45,7 +46,7 @@
 				 WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "User/Operator",
 			(
@@ -231,13 +232,14 @@
 				JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
 				WHERE (tbl_benutzerfunktion.datum_von IS NULL OR tbl_benutzerfunktion.datum_von <= now()) 
 				AND (tbl_benutzerfunktion.datum_bis IS NULL OR tbl_benutzerfunktion.datum_bis >= now())
+				AND tbl_organisationseinheit.bezeichnung = '.$ORG_NAME.'
 				AND tbl_benutzerfunktion.uid = (
 					SELECT l.insertvon
 					FROM system.tbl_log l
 					WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
 					AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 					AND l.person_id = p.person_id
-					ORDER BY l.zeitpunkt DESC
+					ORDER BY l.log_id DESC
 					LIMIT 1
 				)
 				LIMIT 1 
@@ -410,13 +412,13 @@
 				$datasetRaw->{'ZGVMNation'} = '-';
 			}
 
-			if ($datasetRaw->{'InfoCenterMitarbeiter'} === 'InfoCenter')
+			if ($datasetRaw->{'InfoCenterMitarbeiter'} === null)
 			{
-				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
 			}
 			else
 			{
-				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
 			}
 
 			return $datasetRaw;

application/views/system/infocenter/infocenterReihungstestAbsolviertData.php

@@ -5,11 +5,12 @@
 	$INTERESSENT_STATUS = '\'Interessent\'';
 	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
-	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
+	$LOGDATA_NAME = '\'Login with code\', \'Login with user\'';
 	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
+	$ORG_NAME = '\'InfoCenter\'';
 
-	$query = '
+$query = '
 		SELECT
 			p.person_id AS "PersonId",
 			p.vorname AS "Vorname",
@@ -25,7 +26,7 @@
 				 WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "LastAction",
 			(
@@ -34,7 +35,7 @@
 				 WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
 				   AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 				   AND l.person_id = p.person_id
-			  ORDER BY l.zeitpunkt DESC
+			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "User/Operator",
 			(
@@ -182,13 +183,14 @@
 				JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
 				WHERE (tbl_benutzerfunktion.datum_von IS NULL OR tbl_benutzerfunktion.datum_von <= now()) 
 				AND (tbl_benutzerfunktion.datum_bis IS NULL OR tbl_benutzerfunktion.datum_bis >= now())
+				AND tbl_organisationseinheit.bezeichnung = '.$ORG_NAME.'
 				AND tbl_benutzerfunktion.uid = (
 					SELECT l.insertvon
 					FROM system.tbl_log l
 					WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
 					AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
 					AND l.person_id = p.person_id
-					ORDER BY l.zeitpunkt DESC
+					ORDER BY l.log_id DESC
 					LIMIT 1
 				)
 				LIMIT 1 
@@ -347,13 +349,13 @@
 				$datasetRaw->{'ZGVMNation'} = '-';
 			}
 
-			if ($datasetRaw->{'InfoCenterMitarbeiter'} === 'InfoCenter')
+			if ($datasetRaw->{'InfoCenterMitarbeiter'} === null)
 			{
-				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
 			}
 			else
 			{
-				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
 			}
 
 			return $datasetRaw;

public/js/infocenter/infocenterPersonDataset.js

@@ -49,6 +49,11 @@ var InfocenterPersonDataset = {
 			'<select class="form-control auswahlAbsageStg" style="width:auto; float:left;">' +
 			'<option value="null" selected="selected"> Studiengang </option>' +
 			'</select>' +
+			'<select class="form-control auswahlAbsageAbgeschickt" style="width:auto; float:left;">' +
+			'<option value="null" selected="selected"> Bewerbung abgeschickt? </option>' +
+			'<option value="true"> Ja </option>' +
+			'<option value="false"> Nein </option>' +
+			'</select>' +
 			'<button class="btn btn-default auswahlAbsageBtn" style="float:left"> Absage </button>';
 
 		InfocenterPersonDataset.getAbsageData();
@@ -327,6 +332,7 @@ var InfocenterPersonDataset = {
 
 		var statusgrund = $('.absgstatusgrund').val();
 		var studiengang = $('.auswahlAbsageStg').val();
+		var abgeschickt = $('.auswahlAbsageAbgeschickt').val();
 
 		var personen = [];
 
@@ -340,7 +346,8 @@ var InfocenterPersonDataset = {
 			{
 				'statusgrund': statusgrund,
 				'studiengang': studiengang,
-				'personen' : personen
+				'personen' : personen,
+				'abgeschickt' : abgeschickt
 			},
 			{
 				successCallback: function(data, textStatus, jqXHR) {

system/phrasesupdate.php

@@ -888,6 +888,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'bewerberVorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'BewerberIn bereits vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Applicant already available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',