diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php
index 44081da16..d197f8458 100644
--- a/application/controllers/system/Messages.php
+++ b/application/controllers/system/Messages.php
@@ -329,8 +329,8 @@ class Messages extends Auth_Controller
$this->uid
);
- return success($msg->retval);
}
+ return success('success');
}
}
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index f96f6ff12..901ac4c73 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -1390,11 +1390,16 @@ class InfoCenter extends Auth_Controller
$interessentbez = $person->geschlecht == 'm' ? 'Ein Interessent' : 'Eine Interessentin';
$sprache = $prestudentstatus->sprachedetails->bezeichnung[0];
$orgform = $prestudentstatus->orgform != '' ? ' ('.$prestudentstatus->orgform.')' : '';
- $geschlecht = $person->geschlecht == 'm' ? 'männlich' : 'weiblich';
- $geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
- $zgvort = !isEmptyString($prestudent->zgvort) ? ' in '.$prestudent->zgvort : '';
+ $statusgrund = isset($prestudentstatus->statusgrund_id) ?
+ '
+ | Statusgrund |
+ '.$prestudentstatus->bezeichnung_statusgrund[0].' |
+
' : '';
+ //$geschlecht = $person->geschlecht == 'm' ? 'männlich' : 'weiblich';
+ //$geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
+ /*$zgvort = !isEmptyString($prestudent->zgvort) ? ' in '.$prestudent->zgvort : '';
$zgvnation = !isEmptyString($prestudent->zgvnation_bez) ? ', '.$prestudent->zgvnation_bez : '';
- $zgvdatum = !isEmptyString($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : '';
+ $zgvdatum = !isEmptyString($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : '';*/
$dokumenteNachzureichenMail = $dokumenteMail = array();
//convert documents to array so they can be parsed, and keeping only needed fields
@@ -1425,16 +1430,6 @@ class InfoCenter extends Auth_Controller
}
$notizentext .= '';
- $mailadresse = '';
- foreach ($person->kontakte as $kontakt)
- {
- if ($kontakt->kontakttyp === 'email')
- {
- $mailadresse = $kontakt->kontakt;
- break;
- }
- }
-
$data = array
(
'interessentbez' => $interessentbez,
@@ -1442,20 +1437,21 @@ class InfoCenter extends Auth_Controller
'studiengangtypbez' => $prestudent->studiengangtyp_bez,
'orgform' => $orgform,
'studiensemester' => $prestudentstatus->studiensemester_kurzbz,
+ 'ausbildungssemester' => $prestudentstatus->ausbildungssemester,
'sprache' => $sprache,
- 'geschlecht' => $geschlecht,
'vorname' => $person->vorname,
'nachname' => $person->nachname,
- 'gebdatum' => $geburtsdatum,
- 'mailadresse' => $mailadresse,
'prestudentid' => $prestudent_id,
- 'zgvbez' => $prestudent->zgv_bez,
+ 'statusgrund' => $statusgrund,
+ /*'zgvbez' => $prestudent->zgv_bez,
'zgvort' => $zgvort,
'zgvdatum' => $zgvdatum,
'zgvnation' => $zgvnation,
+ */
'notizentext' => $notizentext,
'dokumente' => $dokumenteMail,
- 'dokumente_nachgereicht' => $dokumenteNachzureichenMail
+ 'dokumente_nachgereicht' => $dokumenteNachzureichenMail,
+ 'persondetailslink' => APP_ROOT.'vilesci/personen/personendetails.php?id='.$person_id
);
$this->load->library('LogLib');
diff --git a/application/libraries/FiltersLib.php b/application/libraries/FiltersLib.php
index 1e3a591ac..48f6c413a 100644
--- a/application/libraries/FiltersLib.php
+++ b/application/libraries/FiltersLib.php
@@ -313,6 +313,8 @@ class FiltersLib
if ($datasetQuery != null)
{
+ $this->_ci->load->model('system/Filters_model', 'FiltersModel');
+
// Execute the given SQL statement suppressing error messages
$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
}
@@ -715,7 +717,7 @@ class FiltersLib
$filter->description[0], // description
sprintf(
'%s?%s=%s',
- site_url($this->_ci->router->directory.$this->_ci->router->class.'/'.$this->_ci->router->method),
+ site_url($navigationPage),
self::FILTER_ID,
$filter->filter_id
) // link
@@ -816,6 +818,8 @@ class FiltersLib
{
$condition = ''; // starts building the condition
+ $this->_ci->load->model('system/Filters_model', 'FiltersModel');
+
// "operation" is a required property for the applied filter definition
if (!isEmptyString($filterDefinition->operation))
{
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index ccc1e2719..8df400933 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -154,6 +154,7 @@ class Notiz_model extends DB_Model
{
// Join with the table public.tbl_notizzuordnung using notiz_id
$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+ $this->addOrder('insertamum', 'DESC');
return $this->loadWhere(array('person_id' => $person_id, 'titel' => $titel));
}
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 6715705ad..f1a5ae8fd 100755
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -56,7 +56,12 @@
AND pss.bestaetigtam IS NULL
AND ps.person_id = p.person_id
AND sg.typ IN ('.$STUDIENGANG_TYP.')
- AND pss.studiensemester_kurzbz IN (SELECT cnss.studiensemester_kurzbz FROM currentOrNextStudiensemester cnss)
+ AND NOT EXISTS (
+ SELECT 1
+ FROM tbl_prestudentstatus spss
+ WHERE spss.prestudent_id = ps.prestudent_id
+ AND spss.status_kurzbz = '.$REJECTED_STATUS.'
+ )
ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
LIMIT 1
) AS "Studiensemester",
@@ -206,7 +211,6 @@
WHERE spss.prestudent_id = sps.prestudent_id
AND spss.status_kurzbz = '.$INTERESSENT_STATUS.'
AND spss.bestaetigtam IS NULL
- AND spss.bewerbung_abgeschicktamum IS NOT NULL
AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
)
)
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 616afa6cf..08797586d 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -5,6 +5,7 @@
$STUDIENGANG_TYP = '\'b\'';
$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
$LOGDATA_NAME = '\'Login with code\', \'New application\'';
+ $REJECTED_STATUS = '\'Abgewiesener\'';
$query = '
SELECT
@@ -42,6 +43,7 @@
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
AND ps.person_id = p.person_id
AND sg.typ IN ('.$STUDIENGANG_TYP.')
+ AND pss.bestaetigtam is not null
AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
LIMIT 1
@@ -69,13 +71,20 @@
AND ps.person_id = p.person_id
AND sg.typ IN ('.$STUDIENGANG_TYP.')
AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+ AND NOT EXISTS (
+ SELECT 1
+ FROM tbl_prestudentstatus spss
+ WHERE spss.prestudent_id = ps.prestudent_id
+ AND spss.status_kurzbz = '.$REJECTED_STATUS.'
+ )
LIMIT 1
) AS "AnzahlAbgeschickt",
(
- SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sg.orgform_kurzbz)), \', \')
+ SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sp.orgform_kurzbz)), \', \')
FROM public.tbl_prestudentstatus pss
JOIN public.tbl_prestudent ps USING(prestudent_id)
JOIN public.tbl_studiengang sg USING(studiengang_kz)
+ JOIN lehre.tbl_studienplan sp USING(studienplan_id)
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
AND pss.bewerbung_abgeschicktamum IS NOT NULL
AND ps.person_id = p.person_id
@@ -158,6 +167,12 @@
AND pss.bestaetigtam IS NOT NULL
AND pss.bewerbung_abgeschicktamum IS NOT NULL
AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+ AND NOT EXISTS (
+ SELECT 1
+ FROM tbl_prestudentstatus spss
+ WHERE spss.prestudent_id = ps.prestudent_id
+ AND spss.status_kurzbz = '.$REJECTED_STATUS.'
+ )
)
)
ORDER BY "LastAction" DESC';
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 4c2958d62..a26c94177 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -97,7 +97,10 @@