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

Infocenter: Anzeige gesperrte Nationen als disabled im Dropdown ZGVNation

Browse Source
This commit is contained in:
ma0068
2022-08-30 09:41:45 +02:00
parent 54a1c486c5
commit 8fd69ccd26
4 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfoCenter.php
+1
View File
@@ -160,6 +160,7 @@ class InfoCenter extends Auth_Controller
$this->load->model('system/Filters_model', 'FiltersModel');
$this->load->model('system/PersonLock_model', 'PersonLockModel');
$this->load->model('codex/Zgv_model', 'ZgvModel');
$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
+1 -1
View File
@@ -17,7 +17,7 @@ class Zgv_model extends DB_Model
*/
public function getAllZgv()
{
$allZgv = 'SELECT * FROM bis.tbl_zgv;';
$allZgv = 'SELECT * FROM bis.tbl_zgv ORDER BY zgv_bez ASC;';
return $this->execQuery($allZgv);
}
application/views/system/infocenter/zgvpruefungen.php
+27 -33
View File
@@ -128,9 +128,7 @@
<form action="javascript:void(0);" class="zgvform" id="zgvform_<?php echo $zgvpruefung->prestudent_id ?>">
<input type="hidden" name="prestudentid" value="<?php echo $zgvpruefung->prestudent_id ?>" class="prestudentidinput">
<div class="row">
<div class="col-lg-<?php echo $columns[0] ?>">
<div class="form-group">
<label><?php echo ucfirst($this->p->t('global', 'letzterStatus')) . ':' ?></label>
<?php
@@ -148,7 +146,6 @@
</div>
</div>
<div class="col-lg-<?php echo $columns[2] ?>">
<div class="form-group form-inline">
<label><?php echo ucfirst($this->p->t('lehre', 'ausbildungssemester')) . ':' ?></label>
<?php if (isset($zgvpruefung->prestudentstatus->ausbildungssemester)): ?>
@@ -180,14 +177,12 @@
</div>
</div>
<div class="row">
<div class="col-lg-<?php echo $columns[0] ?>">
<div class="form-group">
<div class="row">
<?php if ($infoonly): ?>
<div class="col-xs-8">
<label><?php echo $this->p->t('infocenter', 'zgv') . ':' ?></label>
<?php echo $zgvpruefung->zgv_bez; ?>
</div>
<?php else: ?>
@@ -201,32 +196,28 @@
<a href="javascript:void(0)"><i class="fa fa-info-circle"></i> <?php echo $this->p->t('infocenter', 'zgv') ?> <?php echo $studiengangkurzbz ?></a>
</div>
</div>
<?php if (!$infoonly)
//dropdown als Werte vom ZgvModel, um nicht aktive Werte als disabled anzuzeigen
$alleZGV = $this->ZgvModel->getAllZgv();
echo '<select id= "zgv_'.$zgvpruefung->prestudent_id.'" name="zgv">';
echo '<select id= "zgv_'.$zgvpruefung->prestudent_id.'" name="zgv">';
$zgvpruefung->zgv_bez != '' ? $default = "selected" : $default = "";
$zgvpruefung->zgv_bez != '' ? $default = "selected" : $default = "";
echo '<option '. $selected.' value = "null">--Bitte Eintrag wählen--</option>';
echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
//echo '<option value = "null">--Bitte Eintrag wählen--</option>';
foreach ($alleZGV->retval as $zgv):
$zgv->aktiv == 'true' ? $style = '' : $style = 'disabled="disabled"';
$zgv->zgv_code == $zgvpruefung->zgv_code ? $selected = "selected" : $selected = "";
echo '<option '. $selected.' value= "'.$zgv->zgv_code.'" '.$style.'>'.$zgv->zgv_bez.'</option>';
endforeach;
echo "</select>";
foreach ($alleZGV->retval as $zgv):
$zgv->aktiv == 'true' ? $style = '' : $style = 'disabled="disabled"';
$zgv->zgv_code == $zgvpruefung->zgv_code ? $selected = "selected" : $selected = "";
echo '<option '. $selected.' value= "'.$zgv->zgv_code.'" '.$style.'>'.$zgv->zgv_bez.'</option>';
endforeach;
echo "</select>";
?>
?>
</div>
</div>
<div class="col-lg-<?php echo $columns[1] ?>">
<div class="form-group">
<label><?php echo $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person', 'ort') . ':'?></label>
<?php if ($infoonly):
echo html_escape($zgvpruefung->zgvort);
else:
@@ -256,14 +247,21 @@
<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 als disabled 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):
$nation->sperre != 'true' ? $style = '' : $style = 'disabled="disabled"';
$nation->nation_code == $zgvpruefung->zgvnation ? $selected = "selected" : $selected = "";
echo '<option '. $selected.' value= "'.$nation->nation_code.'" '.$style.'>'.$nation->langtext.'</option>';
endforeach;
echo "</select>";
?>
</div>
</div>
</div>
@@ -354,11 +352,7 @@
</div>
</div>
<?php endif; ?>
<br />
<?php
if (isset($zgvpruefung->prestudentUdfs))
{