blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

added Studienplan Orgform and alternative Orgform (in "Anmerkung" field), Studienplansprache for display, Statusgrund Bezeichnung for Abgewiesener

Browse Source
This commit is contained in:
alex
2018-01-22 17:43:13 +01:00
parent 5725cc2dfe
commit 5a0082ec11
4 changed files with 69 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfocenterDetails.php
+5
View File
@@ -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';
application/models/crm/Prestudent_model.php
+10 -2
View File
@@ -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);
}
application/models/crm/Prestudentstatus_model.php
+5 -1
View File
@@ -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 = ?';
application/views/system/infocenter/infocenterDetails.php
+49 -18
View File
@@ -137,7 +137,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<a name="DokPruef"></a><!-- anchor for jumping to the section -->
<div class="panel-heading text-center"><h4>Dokumentenpr&uuml;fung</h4></div>
<div class="panel-body">
<table id="doctable" class="table table-striped table-bordered">
<table id="doctable" class="table table-striped table-bordered table-condensed">
<thead>
<th>Name</th>
<th>Typ</th>
@@ -222,13 +222,27 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
</div>
<div class="panel-body">
<div class="panel-group">
<?php foreach ($zgvpruefungen as $zgvpruefung):
$infoonly = $zgvpruefung->infoonly; ?>
<?php
foreach ($zgvpruefungen as $zgvpruefung):
$infoonly = $zgvpruefung->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);
}
?>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse"
href="#collapse<?php echo $zgvpruefung->prestudent_id ?>">Studiengang <?php echo $zgvpruefung->studiengang ?></a>
href="#collapse<?php echo $zgvpruefung->prestudent_id ?>"><?php echo $zgvpruefung->studiengang.' - '.$zgvpruefung->studiengangbezeichnung ?></a>
</h4>
</div>
<div id="collapse<?php echo $zgvpruefung->prestudent_id ?>"
@@ -237,33 +251,50 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<form method="post"
action="../saveZgvPruefung/<?php echo $zgvpruefung->prestudent_id ?>">
<div class="row">
<div class="col-lg-4">
<div class="col-lg-<?php echo $firstcolumns[0] ?>">
<div class="form-group">
<label>Freigegeben an Studiengang: </label>
<?php echo isset($zgvpruefung->prestudentstatus->bestaetigtam) ? "ja" : "nein" ?>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-<?php echo $firstcolumns[1] ?>">
<div class="form-group">
<label>Letzter Status: </label>
<?php echo isset($zgvpruefung->prestudentstatus->status_kurzbz) ? $zgvpruefung->prestudentstatus->status_kurzbz : '' ?>
<?php
if(isset($zgvpruefung->prestudentstatus->status_kurzbz))
{
echo $zgvpruefung->prestudentstatus->status_kurzbz.($zgvpruefung->prestudentstatus->status_kurzbz === 'Abgewiesener' ? ' ('.$zgvpruefung->prestudentstatus->bezeichnung_statusgrund[0].')' : '');
}
?>
</div>
</div>
<div class="col-lg-2">
<div class="col-lg-<?php echo $firstcolumns[2] ?>">
<div class="form-group">
<label>Studiensemester: </label>
<?php echo isset($zgvpruefung->prestudentstatus->studiensemester_kurzbz) ? $zgvpruefung->prestudentstatus->studiensemester_kurzbz : '' ?>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-<?php echo $firstcolumns[3] ?>">
<div class="form-group">
<label>Ausbildungssemester: </label>
<label><span style="display: inline-block">Ausbildungs</span><span style="display: inline-block">semester: </span></label>
<?php echo isset($zgvpruefung->prestudentstatus->ausbildungssemester) ? $zgvpruefung->prestudentstatus->ausbildungssemester : '' ?>
</div>
</div>
<div class="col-lg-<?php echo $firstcolumns[4] ?>">
<div class="form-group">
<label>Orgform: </label>
<span style="display: inline-block">
<?php
$separator = (isset($zgvpruefung->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.')' : '') ?>
</span>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-4">
<div class="col-lg-<?php echo $columns[0] ?>">
<div class="form-group">
<label>ZGV: </label>
<?php if ($infoonly)
@@ -276,7 +307,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
); ?>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-<?php echo $columns[1] ?>">
<div class="form-group">
<label>ZGV Ort: </label>
<?php if ($infoonly):
@@ -289,7 +320,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<?php endif; ?>
</div>
</div>
<div class="col-lg-2">
<div class="col-lg-<?php echo $columns[2] ?>">
<div class="form-group">
<label>ZGV Datum: </label>
<?php if ($infoonly):
@@ -303,7 +334,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<?php endif; ?>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-<?php echo $columns[3] ?>">
<div class="form-group">
<label>ZGV Nation: </label>
<?php if ($infoonly)
@@ -320,7 +351,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<!-- show only master zgv if master studiengang - start -->
<?php if ($zgvpruefung->studiengangtyp === 'm') : ?>
<div class="row">
<div class="col-lg-4">
<div class="col-lg-<?php echo $columns[0] ?>">
<div class="form-group"><label>ZGV Master: </label>
<?php
if ($infoonly)
@@ -333,7 +364,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
); ?>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-<?php echo $columns[1] ?>">
<div class="form-group">
<label>ZGV Master Ort: </label>
<?php if ($infoonly):
@@ -346,7 +377,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<?php endif; ?>
</div>
</div>
<div class="col-lg-2">
<div class="col-lg-<?php echo $columns[2] ?>">
<div class="form-group">
<label>ZGV Master Datum: </label>
<?php if ($infoonly):
@@ -360,7 +391,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
<?php endif; ?>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-<?php echo $columns[3] ?>">
<div class="form-group"><label>ZGV Master
Nation: </label>
<?php