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

Bugfix Pruefungvewaltung

Browse Source
This commit is contained in:
Stefan Puraner
2014-04-01 13:26:48 +00:00
parent 84cfee023a
commit 792acc05b5
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/pruefung/pruefung.js
+2 -2
View File
@@ -829,9 +829,9 @@ function loadPruefungStudiengang(studiengang_kz)
var liste = "";
data.result.forEach(function(e){
liste += "<ul><li>"+e.bezeichnung+"<ul>";
e.pruefung.termine.forEach(function(d){
e.pruefung[0].termine.forEach(function(d){
liste += "<li> <a onclick='showAnmeldungen(\""+d.pruefungstermin_id+"\", \""+e.lehrveranstaltung_id+"\");'>"+convertDateTime(d.von)+" "+convertDateTime(d.von, "time")+" - "+convertDateTime(d.bis, "time")+"</a></li>";
})
});
liste += "</li></ul></ul>";
});
$("#pruefungenListe").append(liste);
cis/private/lehre/pruefung/pruefungsanmeldung.json.php
+9 -4
View File
@@ -5,7 +5,7 @@ header( 'Cache-Control: no-store, no-cache, must-revalidate' );
header( 'Pragma: no-cache' );
header('Content-Type: text/html;charset=UTF-8');
require_once('../../../../config/vilesci.config.inc.php');
require_once('../../../../config/cis.config.inc.php');
require_once('../../../../include/functions.inc.php');
require_once('../../../../include/pruefungCis.class.php');
require_once('../../../../include/lehrveranstaltung.class.php');
@@ -611,11 +611,16 @@ function getPruefungenStudiengang()
{
$pruefung = new pruefungCis();
$pruefung->getPruefungByLv($lv->lehrveranstaltung_id);
if($pruefung->lehrveranstaltungen[0]->pruefung_id !== null)
if((!empty($pruefung->lehrveranstaltungen)))
{
$pruefung->load($pruefung->lehrveranstaltungen[0]->pruefung_id);
$lv->pruefung = array();
foreach ($pruefung->lehrveranstaltungen as $prf)
{
$pruefung->load($prf->pruefung_id);
$pruefung->getTermineByPruefung();
$lv->pruefung = $pruefung;
array_push($lv->pruefung, $pruefung);
}
array_push($result, $lv);
}
}