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

Scrollbalken bei Studienplan hinzugefügt; Strict Warnings in Mantis Klasse entfernt

Browse Source
This commit is contained in:
Andreas Österreicher
2014-02-14 12:09:30 +00:00
parent 09c3496a7b
commit 9738d32f07
6 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/profile/studienplan.php
+37 -7
View File
@@ -226,16 +226,42 @@ $lehrveranstaltung->loadLehrveranstaltungStudienplan($studienplan_id);
$tree = $lehrveranstaltung->getLehrveranstaltungTree();
/*
Vom Semesterstart des Studierenden ausgehend werden die Studiensemester geladen.
Es werden mindestens so viele Studiensemester geladen wie die Regelstudiendauer des
Studienplanes angibt.
*/
// Angezeigte Studiensemester holen
$stsem = new studiensemester();
$stsem_arr[0]=$studiensemester_start;
$studiensemester_prev=$studiensemester_start;
for($i=1;$i<=$studienplan->regelstudiendauer;$i++)
for($i=1;$i<$studienplan->regelstudiendauer;$i++)
{
$stsem_arr[$i]=$stsem->getNextFrom($studiensemester_prev);
$studiensemester_prev=$stsem_arr[$i];
}
/*
Wenn Studierende ueber der Regelstudiendauer hinaus studierenen, wird das aktuelle Studiensemester
nicht angezeigt. Deshalb wird in solchen faellen immer bis zum aktuellen+2 Studiensemester geladen.
*/
$stsem_obj = new studiensemester();
$aktornext = $stsem_obj->getaktorNext();
$stsemToShow = $stsem_obj->jump($aktornext,2);
if(!in_array($stsemToShow,$stsem_arr))
{
for($i=count($stsem_arr);$i<50;$i++)
{
$stsem_arr[$i]=$stsem->getNextFrom($studiensemester_prev);
$studiensemester_prev=$stsem_arr[$i];
if($stsemToShow==$studiensemester_prev)
{
break;
}
}
}
// Noten des Studierenden holen
$noten_arr=array();
$zeugnisnote = new zeugnisnote();
@@ -272,20 +298,20 @@ echo '<h1>'.$p->t('studienplan/studienplan').": $studienplan->bezeichnung ($stud
echo '<table style="border: 1px solid black">
<thead>
<tr>
<tr valign="top">
<th>'.$p->t('global/lehrveranstaltung').'</th>
<th>'.$p->t('studienplan/ects').'</th>
<th>'.$p->t('studienplan/status').'</th>';
foreach($stsem_arr as $stsem)
{
echo '<th>'.$stsem;
echo '<th>';
echo $stsem;
$konto = new konto();
$cp = $konto->getCreditPoints($uid, $stsem);
if($cp!==false)
echo '<img src="../../../skin/images/information.png" title="'.$p->t('studienplan/reduzierteCP',array($cp)).'" />';
echo '<span title="'.$p->t('studienplan/reduzierteCP',array($cp)).'" ><br><img src="../../../skin/images/information.png" alt="Information"/></span>';
echo '</th>';
}
echo '
@@ -454,12 +480,12 @@ function drawTree($tree, $depth)
$tdclass[]='angebot';
if($angemeldet)
{
$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/ok.png" height="12px" title="angemeldet" /></a>';
$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/anmelden.png" title="angemeldet" /></a>';
}
else
{
if($anmeldungmoeglich)
$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/plus.png" title="'.$p->t('studienplan/anmelden').'" height="15px" /></a>';
$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/anmelden.png" title="'.$p->t('studienplan/anmelden').'" height="15px" /></a>';
else
$tdinhalt.= '<span title="'.$anmeldeinformation.'">-</a>';
@@ -501,6 +527,10 @@ echo '<br><br>'.$p->t('studienplan/legende').':<br>
<td><span class="angebot">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>
<td>'.$p->t('studienplan/legendeLVwirdAngeboten').'</td>
</tr>
<tr>
<td align="center"><img src="../../../skin/images/anmelden.png"></td>
<td>'.$p->t('studienplan/Anmeldung').'</td>
</tr>
<tr>
<td align="center"><img src="../../../skin/images/not-available.png"></td>
<td>'.$p->t('studienplan/legendeLock').'</td>
include/mantis.class.php
+12 -1
View File
@@ -132,31 +132,41 @@ class mantis extends basis_db
$result = $this->soapClient->__soapCall('mc_issue_get',$params);
$this->issue_id = $result->id;
$this->issue_view_state = new stdclass();
$this->issue_view_state->id = $result->view_state->id;
$this->issue_view_state->name = $result->view_state->name;
$this->issue_last_updated = $result->last_updated;
$this->issue_project = new stdclass();
$this->issue_project->id = $result->project->id;
$this->issue_project->name = $result->project->name;
$this->issue_category = $result->category;
$this->issue_priority = new stdclass();
$this->issue_priority->id = $result->priority->id;
$this->issue_priority->name = $result->priority->name;
$this->issue_severity = new stdclass();
$this->issue_severity->id = $result->severity->id;
$this->issue_severity->name = $result->severity->name;
$this->issue_status = new stdclass();
$this->issue_status->id = $result->status->id;
$this->issue_status->name = $result->status->name;
$this->issue_reporter = new stdclass();
$this->issue_reporter->id = $result->reporter->id;
$this->issue_reporter->name = $result->reporter->name;
$this->issue_reporter->real_name = $result->reporter->real_name;
$this->issue_reporter->email = $result->reporter->email;
$this->issue_summary = $result->summary;
$this->issue_reproducibility = new stdclass();
$this->issue_reproducibility->id = $result->reproducibility->id;
$this->issue_reproducibility->name = $result->reproducibility->name;
$this->issue_date_submitted = $result->date_submitted;
$this->issue_sponsorship_total = $result->sponsorship_total;
$this->issue_projection = new stdclass();
$this->issue_projection->id = $result->projection->id;
$this->issue_projection->name = $result->projection->name;
$this->issue_eta = new stdclass();
$this->issue_eta->id = $result->eta->id;
$this->issue_eta->name = $result->eta->name;
$this->issue_resolution = new stdclass();
$this->issue_resolution->id = $result->resolution->id;
$this->issue_resolution->name = $result->resolution->name;
$this->issue_description = $result->description;
@@ -164,7 +174,7 @@ class mantis extends basis_db
$this->issue_due_date = $result->due_date;
$this->issue_steps_to_reproduce = (isset($result->steps_to_reproduce)?$result->steps_to_reproduce:'');
$this->issue_additional_information = (isset($result->additional_information)?$result->additional_information:'');
return true;
}
catch (SoapFault $fault)
@@ -189,6 +199,7 @@ class mantis extends basis_db
foreach($result as $row)
{
$obj = new mantis();
$obj->issue_project = new stdclass();
$obj->issue_project->name = $row->name;
$obj->issue_project->id = $row->id;
skin/images/anmelden.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

skin/styles/tw.css
+2 -2
View File
@@ -931,13 +931,13 @@ ul.menu
/* LV Angebot im Studienplan */
.angebot
{
border: 3px solid #edd400;
border: 1px solid #edd400;
}
/* Empfehlung im Studienplan */
.empfehlung
{
border: 3px solid green;
border: 1px solid green;
}
/*
vilesci/lehre/studienordnung.js
+1 -1
View File
@@ -773,7 +773,7 @@ function showLVTree(data)
},
grid: {
columns: [
{width: 260, header: "Lehrveranstaltung", value: "bezeichnung", source: "metadata"},
{width: 250, header: "Lehrveranstaltung", value: "bezeichnung", source: "metadata"},
{width: 50, header: "ECTS", value: "ects", source: "metadata"},
{width: 80, header: "Lehrform", value: "lehrform_kurzbz", source: "metadata"},
{width: 80, header: "Semester", value: "semester", source: "metadata"},
vilesci/lehre/studienordnung.php
+1 -1
View File
@@ -220,7 +220,7 @@ echo'
</div>
<h2>Lehrveranstaltungen</h2>
<div style="margin:0px;padding:5px;">
<div id="filteredLVs" style="width: 400px;">
<div id="filteredLVs" style="width: 400px; max-height:500px; overflow: auto;">
<div id="lvListe">
Keine Einträge gefunden!
</div>