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

Merge branch 'feature-23977/ZGVNeueKodextabellen'

Browse Source
This commit is contained in:
Andreas Österreicher
2022-09-12 13:06:07 +02:00
parent 9afd03d630 d1bb1b9666
commit d6a35603e1
12 changed files with 274 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/codex/Zgv.php
+8
View File
@@ -45,6 +45,14 @@ class Zgv extends API_Controller
}
}
/**
* @return zgv
*/
public function getAllZgv()
{
$this->response($this->Zgv_model->getAllZgv(), REST_Controller::HTTP_OK);
}
/**
* @return void
*/
application/controllers/api/v1/codex/Zgvmaster.php
+8
View File
@@ -45,6 +45,14 @@ class Zgvmaster extends API_Controller
}
}
/**
* @return zgvmaster
*/
public function getAllZgvmaster()
{
$this->response($this->Zgvmaster_model->getAllZgvmaster(), REST_Controller::HTTP_OK);
}
/**
* @return void
*/
application/controllers/system/infocenter/InfoCenter.php
+3
View File
@@ -169,6 +169,9 @@ class InfoCenter extends Auth_Controller
$this->load->model('system/Filters_model', 'FiltersModel');
$this->load->model('system/PersonLock_model', 'PersonLockModel');
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->load->model('codex/Zgv_model', 'ZgvModel');
$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
$this->load->model('codex/Nation_model', 'NationModel');
// Loads libraries
$this->load->library('PersonLogLib');
application/models/codex/Nation_model.php
+12 -2
View File
@@ -3,7 +3,7 @@
class Nation_model extends DB_Model
{
/**
*
*
*/
public function __construct()
{
@@ -11,4 +11,14 @@ class Nation_model extends DB_Model
$this->dbTable = 'bis.tbl_nation';
$this->pk = 'nation_code';
}
}
/**
* getAllForStyled Dropdown
*/
public function getAll()
{
$allNations = 'SELECT * FROM bis.tbl_nation ORDER BY bis.tbl_nation.langtext ASC;';
return $this->execQuery($allNations);
}
}
application/models/codex/Zgv_model.php
+12
View File
@@ -11,4 +11,16 @@ class Zgv_model extends DB_Model
$this->dbTable = 'bis.tbl_zgv';
$this->pk = 'zgv_code';
}
/**
* getAllForStyled Dropdown
*/
public function getAllZgv()
{
$allZgv = 'SELECT * FROM bis.tbl_zgv ORDER BY zgv_bez ASC;';
return $this->execQuery($allZgv);
}
}
application/models/codex/Zgvmaster_model.php
+10
View File
@@ -11,4 +11,14 @@ class Zgvmaster_model extends DB_Model
$this->dbTable = 'bis.tbl_zgvmaster';
$this->pk = 'zgvmas_code';
}
/**
* getAllForStyled Dropdown
*/
public function getAllZgvmaster()
{
$allZgvMaster = 'SELECT * FROM bis.tbl_zgvmaster ORDER BY zgvmas_bez ASC;';
return $this->execQuery($allZgvMaster);
}
}
application/views/system/infocenter/zgvpruefungen.php
+67 -32
View File
@@ -223,11 +223,21 @@
</div>
</div>
<?php if (!$infoonly)
echo $this->widgetlib->widget(
'Zgv_widget',
array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgv_code),
array('name' => 'zgv', 'id' => 'zgv_'.$zgvpruefung->prestudent_id)
); ?>
//dropdown als Werte vom ZgvModel, um nicht aktive Werte mit Zusatz anzuzeigen
$alleZGV = $this->ZgvModel->getAllZgv();
echo '<select id= "zgv_'.$zgvpruefung->prestudent_id.'" name="zgv">';
$zgvpruefung->zgv_bez != '' ? $default = "selected" : $default = "";
echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
//echo '<option value = "null">--Bitte Eintrag wählen--</option>';
foreach ($alleZGV->retval as $zgv):
//zusatz
$zgv->aktiv == 'true' ? $zusatz = '' : $zusatz = ' --- nicht (länger) aktiv ---';
$zgv->zgv_code == $zgvpruefung->zgv_code ? $selected = "selected" : $selected = "";
echo '<option '. $selected.' value= "'.$zgv->zgv_code.'">'.$zgv->zgv_bez. $zusatz .'</option>';
endforeach;
echo "</select>";
?>
</div>
</div>
<div class="col-lg-<?php echo $columns[1] ?>">
@@ -262,14 +272,22 @@
<div class="col-lg-<?php echo $columns[3] ?>">
<div class="form-group">
<label><?php echo $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person', 'nation') . ':'?></label>
<?php if ($infoonly)
echo $zgvpruefung->zgvnation_bez;
else
echo $this->widgetlib->widget(
'Nation_widget',
array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvnation_code),
array('name' => 'zgvnation', 'id' => 'zgvnation_'.$zgvpruefung->prestudent_id)
); ?>
<?php if (!$infoonly)
//dropdown als Werte vom NationModel, um nicht aktive Werte mit Zusatz anzuzeigen
$allNations = $this->NationModel->getAll();
echo '<select id= "zgvnation_'.$zgvpruefung->prestudent_id.'" name="zgvnation">';
$zgvpruefung->nation_code != '' ? $default = "selected" : $default = "";
echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
foreach ($allNations->retval as $nation):
//zusatz
$nation->sperre != 'true' ? $zusatz = ' ' : $zusatz = ' --- Nation/Staat nicht existent ---';
$nation->nation_code == $zgvpruefung->zgvnation ? $selected = "selected" : $selected = "";
echo '<option '. $selected.' value= "'.$nation->nation_code.'">'. $nation->langtext . $zusatz.'</option>';
endforeach;
echo "</select>";
?>
</div>
</div>
</div>
@@ -278,15 +296,23 @@
<div class="row">
<div class="col-lg-<?php echo $columns[0] ?>">
<div class="form-group"><label><?php echo $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ':'?></label>
<?php
if ($infoonly)
echo $zgvpruefung->zgvmas_bez;
else
echo $this->widgetlib->widget(
'Zgvmaster_widget',
array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmas_code),
array('name' => 'zgvmas', 'id' => 'zgvmas_'.$zgvpruefung->prestudent_id)
); ?>
<?php if (!$infoonly)
//dropdown als Werte vom ZgvmasterModel, um nicht aktive Werte mit Zusatz anzuzeigen
$alleZGVmaster = $this->ZgvmasterModel->getAllZgvmaster();
echo '<select id= "zgvmas_'.$zgvpruefung->prestudent_id.'" name="zgvmas">';
$zgvpruefung->zgvmas_bez != '' ? $default = "selected" : $default = "";
echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
foreach ($alleZGVmaster->retval as $zgvmaster):
//zusatz
$zgvmaster->aktiv == 'true' ? $zusatz = '' : $zusatz = ' --- nicht (länger) aktiv ---';
$zgvmaster->zgvmas_code == $zgvpruefung->zgvmas_code ? $selected = "selected" : $selected = "";
echo '<option '. $selected.' value= "'.$zgvmaster->zgvmas_code.'">'.$zgvmaster->zgvmas_bez. $zusatz .'</option>';
endforeach;
echo "</select>";
?>
</div>
</div>
<div class="col-lg-<?php echo $columns[1] ?>">
@@ -322,15 +348,25 @@
</div>
<div class="col-lg-<?php echo $columns[3] ?>">
<div class="form-group"><label><?php echo $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre', 'master') . ' ' . $this->p->t('person', 'nation') . ':'?></label>
<?php
if ($infoonly)
echo $zgvpruefung->zgvmanation_bez;
else
echo $this->widgetlib->widget(
'Nation_widget',
array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmanation_code),
array('name' => 'zgvmanation', 'id' => 'zgvmanation_'.$zgvpruefung->prestudent_id)
); ?>
<?php if (!$infoonly)
//dropdown als Werte vom NationModel, um nicht aktive Werte mit Zusatz anzuzeigen
$allNations = $this->NationModel->getAll();
echo '<select id= "zgvmanation_'.$zgvpruefung->prestudent_id.'" name="zgvmanation">';
$zgvpruefung->zgvmanation_code != '' ? $default = "selected" : $default = "";
echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
foreach ($allNations->retval as $nation):
//zusatz
$nation->sperre != 'true' ? $zusatz = ' ' : $zusatz = ' --- Nation/Staat nicht existent ---';
$nation->nation_code == $zgvpruefung->zgvmanation_code ? $selected = "selected" : $selected = "";
echo '<option '. $selected.' value= "'.$nation->nation_code.'">'. $nation->langtext . $zusatz.'</option>';
endforeach;
echo "</select>";
?>
</div>
</div>
</div>
@@ -566,4 +602,3 @@
endforeach; // end foreach zgvpruefungen
?>
</div><!-- /.panel-group -->