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

MyLV Verbesserungen & cleanup

Browse Source
This commit is contained in:
cgfhtw
2023-02-06 08:42:42 +01:00
parent 034bed6580
commit d1f69d4696
8 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/Cis/Mylv.php
+1 -6
View File
@@ -3,12 +3,7 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller operates between (interface) the JS (GUI) and the FilterCmptLib (back-end)
* Provides data to the ajax get calls about the filter component
* Listens to ajax post calls to change the filter data
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
* NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterCmpt has its
* own permissions check
*
*/
class Mylv extends Auth_Controller
{
application/models/education/Lehrveranstaltung_model.php
+5 -1
View File
@@ -276,7 +276,7 @@ class Lehrveranstaltung_model extends DB_Model
*/
// TODO(chris): module or kf
#$this->addSelect($this->dbTable . '.*');
$this->addSelect('v.*');
#$this->addSelect('v.*');
$this->addSelect($this->dbTable . '.benotung');
$this->addSelect($this->dbTable . '.lvinfo');
$this->addSelect($this->dbTable . '.farbe');
@@ -288,6 +288,7 @@ class Lehrveranstaltung_model extends DB_Model
$this->addSelect('v.sprache');
$this->addSelect('v.ects');
$this->addSelect('znn.positiv');
#$this->addSelect('splv.module');
$this->addSelect($lvbezeichnung . ' AS bezeichnung');
@@ -297,6 +298,7 @@ class Lehrveranstaltung_model extends DB_Model
$this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
$this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
// TODO(chris): Potentielle Anpassung "Eine UID"
$this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
$this->addJoin('public.tbl_studiengang sg', $this->dbTable . '.studiengang_kz = sg.studiengang_kz');
$this->db->where("v.lehreverzeichnis<>''");
@@ -307,6 +309,8 @@ class Lehrveranstaltung_model extends DB_Model
$this->addJoin('lehre.tbl_zeugnisnote zn', 'zn.lehrveranstaltung_id=v.lehrveranstaltung_id AND zn.student_uid=v.uid AND zn.studiensemester_kurzbz=v.studiensemester_kurzbz', 'LEFT');
$this->addJoin('lehre.tbl_note znn', 'zn.note=znn.note', 'LEFT');
$this->addOrder('bezeichnung');
/*if (!defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") || !CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN) {
$modulebezeichnung = str_replace('v.', 'm.', $lvbezeichnung);
$modulesql = '
application/models/education/Pruefung_model.php
+2 -1
View File
@@ -42,12 +42,13 @@ class Pruefung_model extends DB_Model
*
* @param string $uid
* @param string $lehrveranstaltung_id
* @param string|null $lehrveranstaltung_id
* @param string|null $sprache
*
* @return object
*/
public function getByStudentAndLv($uid, $lehrveranstaltung_id, $sprache = null)
{
// TODO(chris): Potentielle Anpassung "Eine UID"
$this->dbTable = 'lehre.tbl_pruefung';
if ($sprache) {
application/models/organisation/Studiensemester_model.php
+1
View File
@@ -215,6 +215,7 @@ class Studiensemester_model extends DB_Model
$this->addDistinct();
$this->addSelect($this->dbTable . '.*');
// TODO(chris): Potentielle Anpassung "Eine UID"
$this->addJoin('campus.vw_student_lehrveranstaltung v', 'studiensemester_kurzbz');
$this->db->where("v.lehreverzeichnis<>''");