diff --git a/application/controllers/system/infocenter/InfocenterDetails.php b/application/controllers/system/infocenter/InfocenterDetails.php index acb72efc5..288588bb8 100644 --- a/application/controllers/system/infocenter/InfocenterDetails.php +++ b/application/controllers/system/infocenter/InfocenterDetails.php @@ -124,6 +124,11 @@ class InfocenterDetails extends VileSci_Controller $zgvpruefung = $prestudent->retval[0]; + $position = strpos($zgvpruefung->prestudentstatus->anmerkung, 'Alt:'); + + //parse Anmerkung for Alternative (Prio is given in orgform and sprache anyway) + $zgvpruefung->prestudentstatus->alternative = is_numeric($position) ? substr($zgvpruefung->prestudentstatus->anmerkung, $position) : null; + //if prestudent is not interessent or is already bestaetigt, then show only as information, non-editable $zgvpruefung->infoonly = !isset($zgvpruefung->prestudentstatus) || isset($zgvpruefung->prestudentstatus->bestaetigtam) || $zgvpruefung->prestudentstatus->status_kurzbz != 'Interessent'; diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index ff4dd95a4..a56592467 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -201,8 +201,8 @@ class Prestudent_model extends DB_Model */ public function getPrestudentWithZgv($prestudent_id) { - $this->addSelect('tbl_prestudent.*, tbl_studiengang.kurzbzlang as studiengang, tbl_studiengang.typ as studiengangtyp, tbl_zgv.zgv_code, tbl_zgv.zgv_bez, - tbl_prestudent.zgvort, tbl_prestudent.zgvdatum, tbl_prestudent.zgvnation as zgvnation_code, zgvnat.kurztext as zgvnation_kurzbez, zgvnat.langtext as zgvnation_bez, zgvnat.engltext as zgvnation_englbez, + $this->addSelect('tbl_prestudent.*, tbl_studiengang.kurzbzlang as studiengang, tbl_studiengang.bezeichnung as studiengangbezeichnung, tbl_studiengang.english as studiengangenglish, tbl_studiengang.typ as studiengangtyp, + tbl_zgv.zgv_code, tbl_zgv.zgv_bez, tbl_prestudent.zgvort, tbl_prestudent.zgvdatum, tbl_prestudent.zgvnation as zgvnation_code, zgvnat.kurztext as zgvnation_kurzbez, zgvnat.langtext as zgvnation_bez, zgvnat.engltext as zgvnation_englbez, tbl_zgvmaster.zgvmas_code, tbl_zgvmaster.zgvmas_bez, tbl_prestudent.zgvmaort, tbl_prestudent.zgvmadatum, tbl_prestudent.zgvmanation as zgvmanation_code, zgvmanat.kurztext as zgvmanation_kurzbez, zgvmanat.langtext as zgvmanation_bez, zgvmanat.engltext as zgvmanation_englbez'); $this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT'); $this->addJoin('bis.tbl_zgv', 'zgv_code', 'LEFT'); @@ -224,7 +224,15 @@ class Prestudent_model extends DB_Model } if(count($lastStatus->retval) > 0) + { + $this->load->model('system/sprache_model', 'SpracheModel'); + $language = $this->SpracheModel->load($lastStatus->retval[0]->sprache); + if($language->error) + return error($language->retval); + if(count($language->retval) > 0) + $lastStatus->retval[0]->sprachedetails = $language->retval[0]; $prestudent->retval[0]->prestudentstatus = $lastStatus->retval[0]; + } return success($prestudent->retval); } diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index 75f0269c5..27f09289a 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -26,9 +26,13 @@ class Prestudentstatus_model extends DB_Model $query = 'SELECT tbl_prestudentstatus.*, bezeichnung AS studienplan_bezeichnung, - tbl_status.bezeichnung_mehrsprachig + tbl_studienplan.orgform_kurzbz as orgform, + sprache, + tbl_status.bezeichnung_mehrsprachig, + tbl_status_grund.bezeichnung_mehrsprachig as bezeichnung_statusgrund FROM public.tbl_prestudentstatus LEFT JOIN lehre.tbl_studienplan USING (studienplan_id) JOIN public.tbl_status USING (status_kurzbz) + LEFT JOIN public.tbl_status_grund USING (statusgrund_id) WHERE tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz AND prestudent_id = ?'; diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index 8f6216c40..48a0a4f1d 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -137,7 +137,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',

Dokumentenprüfung

- +
@@ -222,13 +222,27 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
- infoonly; ?> + infoonly; + //set bootstrap columns + if($infoonly) + { + $firstcolumns = array(3, 2, 2, 2, 3); + $columns = array(3, 2, 2, 2); + } + else + { + $firstcolumns = array(3, 2, 2, 2, 3); + $columns = array(4, 3, 2, 3); + } + + ?>

Studiengang studiengang ?> + href="#collapseprestudent_id ?>">studiengang.' - '.$zgvpruefung->studiengangbezeichnung ?>

load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
-
+
prestudentstatus->bestaetigtam) ? "ja" : "nein" ?>
-
+
- prestudentstatus->status_kurzbz) ? $zgvpruefung->prestudentstatus->status_kurzbz : '' ?> + prestudentstatus->status_kurzbz)) + { + echo $zgvpruefung->prestudentstatus->status_kurzbz.($zgvpruefung->prestudentstatus->status_kurzbz === 'Abgewiesener' ? ' ('.$zgvpruefung->prestudentstatus->bezeichnung_statusgrund[0].')' : ''); + } + ?>
-
+
prestudentstatus->studiensemester_kurzbz) ? $zgvpruefung->prestudentstatus->studiensemester_kurzbz : '' ?>
-
+
- + prestudentstatus->ausbildungssemester) ? $zgvpruefung->prestudentstatus->ausbildungssemester : '' ?>
+
+
+ + + prestudentstatus->orgform)) ? ', ' : ''; + echo (isset($zgvpruefung->prestudentstatus->orgform) ? $zgvpruefung->prestudentstatus->orgform : '') + .(isset($zgvpruefung->prestudentstatus->sprachedetails->bezeichnung) ? $separator.$zgvpruefung->prestudentstatus->sprachedetails->bezeichnung[0] : '') + .(isset($zgvpruefung->prestudentstatus->alternative) ? ' ('.$zgvpruefung->prestudentstatus->alternative.')' : '') ?> + +
+
-
+
load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', ); ?>
-
+
load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
-
+
load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
-
+
load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', studiengangtyp === 'm') : ?>
-
+
load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', ); ?>
-
+
load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
-
+
load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
-
+
Name Typ