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

NotenTab: Use Points

Browse Source
This commit is contained in:
cgfhtw
2024-12-03 09:27:38 +01:00
parent cf6cc97475
commit 446a5732d2
7 changed files with 148 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Notenschluesselaufteilung_model.php
+2 -2
View File
@@ -19,7 +19,7 @@ class Notenschluesselaufteilung_model extends DB_Model
* @param integer $lehrveranstaltung_id
* @param string $studiensemester_kurzbz
*
* @return stdClass
* @return stdClass returns success(null) if no entry is found
*/
public function getNote($points, $lehrveranstaltung_id, $studiensemester_kurzbz)
{
@@ -38,7 +38,7 @@ class Notenschluesselaufteilung_model extends DB_Model
if (isError($result))
return $result;
if (!hasData($result))
return error("Es wurde kein passender eintrag gefunden"); // TODO(chris): phrase
return success(null);
return success(current(getData($result))->note);
}
}
application/models/education/Notenschluesselzuordnung_model.php
+2 -1
View File
@@ -26,7 +26,8 @@ class Notenschluesselzuordnung_model extends DB_Model
$this->db->where("lehrveranstaltung_id", $lehrveranstaltung_id);
if ($studiensemester_kurzbz) {
$this->db->where_in("studiensemester_kurzbz", [$studiensemester_kurzbz, null]);
$this->db->where("studiensemester_kurzbz", $studiensemester_kurzbz);
$this->db->or_where("studiensemester_kurzbz", null);
} else {
$this->db->where("studiensemester_kurzbz", null);
}