diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php index f0d261e4d..af623ab98 100644 --- a/cis/private/profile/studienplan.php +++ b/cis/private/profile/studienplan.php @@ -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 '

'.$p->t('studienplan/studienplan').": $studienplan->bezeichnung ($stud echo ' - + '; foreach($stsem_arr as $stsem) { - echo ''; } echo ' @@ -454,12 +480,12 @@ function drawTree($tree, $depth) $tdclass[]='angebot'; if($angemeldet) { - $tdinhalt.= ''; + $tdinhalt.= ''; } else { if($anmeldungmoeglich) - $tdinhalt.= ''; + $tdinhalt.= ''; else $tdinhalt.= '-'; @@ -501,6 +527,10 @@ echo '

'.$p->t('studienplan/legende').':
 + + + + diff --git a/include/mantis.class.php b/include/mantis.class.php index 95082d901..595892295 100755 --- a/include/mantis.class.php +++ b/include/mantis.class.php @@ -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; diff --git a/skin/images/anmelden.png b/skin/images/anmelden.png new file mode 100644 index 000000000..2ad912cfa Binary files /dev/null and b/skin/images/anmelden.png differ diff --git a/skin/styles/tw.css b/skin/styles/tw.css index 79d78ca5d..bb9d345c6 100644 --- a/skin/styles/tw.css +++ b/skin/styles/tw.css @@ -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; } /* diff --git a/vilesci/lehre/studienordnung.js b/vilesci/lehre/studienordnung.js index e84a20ce1..7d9bb3803 100644 --- a/vilesci/lehre/studienordnung.js +++ b/vilesci/lehre/studienordnung.js @@ -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"}, diff --git a/vilesci/lehre/studienordnung.php b/vilesci/lehre/studienordnung.php index 0d3d9b8b8..8ced6bec5 100644 --- a/vilesci/lehre/studienordnung.php +++ b/vilesci/lehre/studienordnung.php @@ -220,7 +220,7 @@ echo'

Lehrveranstaltungen

-
+
Keine Einträge gefunden!
'.$p->t('global/lehrveranstaltung').' '.$p->t('studienplan/ects').' '.$p->t('studienplan/status').''.$stsem; + echo ''; + echo $stsem; $konto = new konto(); $cp = $konto->getCreditPoints($uid, $stsem); if($cp!==false) - echo ''; - + echo '
Information'; echo '		       '.$p->t('studienplan/legendeLVwirdAngeboten').'
'.$p->t('studienplan/Anmeldung').'
'.$p->t('studienplan/legendeLock').'