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

Usability: Added 'ZGV' to STGL and lectors Detail site

Browse Source 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
This commit is contained in:
Cris
2021-04-06 14:48:08 +02:00
committed by cris-technikum
parent 5dafb3447b
commit 7c875d5f80
7 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
+1 -1
View File
@@ -86,7 +86,7 @@ class approveAnrechnungDetail extends Auth_Controller
// Get Antrag data
$antragData = $this->anrechnunglib->getAntragData(
$student_uid = $this->StudentModel->getUID($anrechnungData->prestudent_id),
$anrechnungData->prestudent_id,
$anrechnungData->studiensemester_kurzbz,
$anrechnungData->lehrveranstaltung_id
);
application/controllers/lehre/anrechnung/RequestAnrechnung.php
+1 -1
View File
@@ -86,7 +86,7 @@ class requestAnrechnung extends Auth_Controller
$anrechnungData = $this->anrechnunglib->getAnrechnungDataByLv($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id);
// Get Antrag data
$antragData = $this->anrechnunglib->getAntragData($this->_uid, $studiensemester_kurzbz, $lehrveranstaltung_id);
$antragData = $this->anrechnunglib->getAntragData($prestudent_id, $studiensemester_kurzbz, $lehrveranstaltung_id);
$viewData = array(
'antragData' => $antragData,
application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
+1 -1
View File
@@ -82,7 +82,7 @@ class reviewAnrechnungDetail extends Auth_Controller
// Get Antrag data
$antragData = $this->anrechnunglib->getAntragData(
$student_uid = $this->StudentModel->getUID($anrechnungData->prestudent_id),
$anrechnungData->prestudent_id,
$anrechnungData->studiensemester_kurzbz,
$anrechnungData->lehrveranstaltung_id
);
application/libraries/AnrechnungLib.php
+12 -3
View File
@@ -23,6 +23,7 @@ class AnrechnungLib
$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->ci->load->model('crm/Student_model', 'StudentModel');
$this->ci->load->model('content/DmsVersion_model', 'DmsVersionModel');
$this->ci->load->model('crm/Prestudent_model', 'PrestudentModel');
$this->ci->load->library('DmsLib');
}
@@ -34,16 +35,19 @@ class AnrechnungLib
* @param $lv_id
* @return StdClass
*/
public function getAntragData($uid, $studiensemester_kurzbz, $lv_id)
public function getAntragData($prestudent_id, $studiensemester_kurzbz, $lv_id)
{
$antrag_data = new StdClass();
// Get students UID.
$uid = $this->ci->StudentModel->getUID($prestudent_id);
// Get lehrveranstaltung data. Break, if course is not assigned to student.
if(!$lv = getData($this->ci->LehrveranstaltungModel->getLvByStudent($uid, $studiensemester_kurzbz, $lv_id))[0])
{
show_error('You are not assigned to this course yet.');
}
// Get the students personal data
if (!$person = getData($this->ci->PersonModel->getByUid($uid))[0])
{
@@ -71,6 +75,10 @@ class AnrechnungLib
$lv_lektoren_arr = hasData($result) ? getData($result) : array();
// Get latest ZGV
$result = $this->ci->PrestudentModel->getLatestZGVBezeichnung($prestudent_id);
$latest_zgv_bezeichnung = hasData($result) ? getData($result)[0]->bezeichnung : '';
// Set the given studiensemester
$antrag_data->lv_id = $lv_id;
$antrag_data->lv_bezeichnung = $lv->bezeichnung;
@@ -81,6 +89,7 @@ class AnrechnungLib
$antrag_data->matrikelnr = $student->matrikelnr;
$antrag_data->stg_bezeichnung = $studiengang->bezeichnung;
$antrag_data->lektoren = $lv_lektoren_arr;
$antrag_data->zgv = $latest_zgv_bezeichnung;
return $antrag_data;
}
application/models/crm/Prestudent_model.php
+29
View File
@@ -581,4 +581,33 @@ class Prestudent_model extends DB_Model
return $this->execQuery($query, array($person_id));
}
/**
* Get latest ZGV Bezeichnung of Prestudent.
*
* @param $prestudent_id
*/
public function getLatestZGVBezeichnung($prestudent_id)
{
if (!is_numeric($prestudent_id))
{
show_error('Prestudent_id is not numeric.');
}
$language_index = getUserLanguage() == 'German' ? 0 : 1;
$this->addSelect('
COALESCE(
array_to_json(zgvmaster.bezeichnung::varchar[])->>' . $language_index . ',
array_to_json(zgv.bezeichnung::varchar[])->>' . $language_index . '
) AS bezeichnung'
);
$this->addJoin('bis.tbl_zgv zgv', 'zgv_code', 'LEFT');
$this->addJoin('bis.tbl_zgvmaster zgvmaster', 'zgvmas_code', 'LEFT');
return $this->loadWhere(array(
'prestudent_id' => $prestudent_id
));
}
}
application/views/lehre/anrechnung/approveAnrechnungDetail.php
+4
View File
@@ -123,6 +123,10 @@ $this->load->view(
<?php endforeach; ?>
</td>
</tr>
<tr>
<td class="col-xs-4"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></td>
<td><?php echo $antragData->zgv ?></td>
</tr>
<tr>
<td><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></td>
<td><?php echo $anrechnungData->anmerkung ?></td>
application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+5 -1
View File
@@ -118,7 +118,11 @@ $this->load->view(
</td>
</tr>
<tr>
<td><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></td>
<td class="col-xs-4"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></td>
<td><?php echo $antragData->zgv ?></td>
</tr>
<tr>
<td class="col-xs-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></td>
<td><?php echo $anrechnungData->anmerkung ?></td>
</tr>
<tr>