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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2016-07-08 17:53:25 +02:00
parent a5c29fa2f7 5de98911ec
commit 0950eebca6
6 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/profile/lva_liste.php
+25
View File
@@ -35,6 +35,7 @@ require_once('../../../include/studiensemester.class.php');
require_once('../../../include/datum.class.php');
require_once('../../../include/datum.class.php');
require_once('../../../include/lvangebot.class.php');
require_once('../../../include/addon.class.php');
if (!$db = new basis_db())
@@ -57,6 +58,12 @@ require_once('../../../include/lvangebot.class.php');
$datum = new datum();
$addon = new addon();
if(in_array('lvinfo',$addon->aktive_addons))
$lvinfo=true;
else
$lvinfo=false;
//Studiensemester abfragen. Letzten 5, aktuelles und naechstes.
$sql_query='SELECT * FROM public.tbl_studiensemester WHERE (start<=(now()::date+240) AND ende>=(now()::date-900)) ORDER BY start';
$result_stdsem=$db->db_query($sql_query);
@@ -161,6 +168,11 @@ require_once('../../../include/lvangebot.class.php');
<tr>';
if(!defined('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN') || CIS_LVALISTE_NOTENEINGABE_ANZEIGEN)
echo '<th>'.$p->t('lvaliste/gesamtnote').'</th>';
if($lvinfo)
echo '<th>'.$p->t('lvaliste/lvinfo').'</th>';
echo '
<th>'.$p->t('lvaliste/lehrfach').'</th>
<th>'.$p->t('lvaliste/lehrform').'</th>
@@ -192,6 +204,10 @@ require_once('../../../include/lvangebot.class.php');
echo '<tr>';
if(!defined('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN') || CIS_LVALISTE_NOTENEINGABE_ANZEIGEN)
echo '<td nowrap><a href="../lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.$row->lehrveranstaltung_id.'&stsem='.$stdsem.'">'.$p->t('lvaliste/gesamtnote').'</a></td>';
if($lvinfo)
echo '<td><a href="../../../addons/lvinfo/cis/lvinfo.php?lv_id='.$row->lehrveranstaltung_id.'&studiensemester_kurzbz='.$stdsem.'" target="_blank">'.$p->t('lvaliste/lvinfo').'</a></td>';
echo '<td>'.$row->lehrfach.'</td>';
echo '<td>'.$row->le_lehrform_kurzbz.'</td>';
if ($row->lehrfach_bez!=$row->lv_bezeichnung)
@@ -228,6 +244,11 @@ require_once('../../../include/lvangebot.class.php');
echo '<td>'.$datum->formatDatum($lvangebot->result[0]->anmeldefenster_start, "d.m.Y").'</td>';
echo '<td>'.$datum->formatDatum($lvangebot->result[0]->anmeldefenster_ende, "d.m.Y").'</td>';
}
else
{
echo '<td>&nbsp;</td>
<td>&nbsp;</td>';
}
//echo '<td>'.$row->le_anmerkung.'</td>'; Lektoren sollen die Anmerkung dzt. nicht sehen, da nur für intern gedacht
echo '</tr>';
@@ -238,8 +259,12 @@ require_once('../../../include/lvangebot.class.php');
echo '<tr>';
if(!defined('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN') || CIS_LVALISTE_NOTENEINGABE_ANZEIGEN)
echo '<td>&nbsp;</td>';
if($lvinfo)
echo '<td>&nbsp;</td>';
echo '<td>&nbsp;</td>';
echo '<td>&nbsp;</td>';
echo '<td>&nbsp;</td>';
echo '<td>&nbsp;</td>';
echo '<td>&nbsp;</td>';
cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
+8 -8
View File
@@ -131,7 +131,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
<tr>
<td class="tdwrap">
Studiensemester<br>
<select name="stsem" onChange="MM_jumpMenu(\'self\',this,0)" style="width:150px">';
<select name="stsem" onChange="MM_jumpMenu(\'self\',this,0)" style="width:100%">';
//Anzeigen des DropDown Menues mit Studiensemester
$studiensemester = new studiensemester();
@@ -165,7 +165,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
<tr>
<td class="nowrap">
Studiengang<br>
<select name="course" onChange="MM_jumpMenu(\'self\',this,0)" style="width:150px">';
<select name="course" onChange="MM_jumpMenu(\'self\',this,0)" style="width:100%">';
$stg_obj = new studiengang();
$stg_obj->loadStudiengangFromStudiensemester($studiensemester_kurzbz);
@@ -201,7 +201,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
<tr>
<td class="nowrap">
Semester<br>
<select name="term" onChange="MM_jumpMenu(\'self\',this,0)" style="width:150px">';
<select name="term" onChange="MM_jumpMenu(\'self\',this,0)" style="width:100%">';
$vorhandenesemester=array();
@@ -241,7 +241,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
<tr>
<td class="nowrap">
Studienplan<br>
<select name="studienplan_id" onChange="MM_jumpMenu(\'self\',this,0)" style="width:150px">';
<select name="studienplan_id" onChange="MM_jumpMenu(\'self\',this,0)" style="width:100%">';
// Studienplan
$studienplan_obj = new studienplan();
@@ -309,7 +309,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
if($lv_obj->loadLehrveranstaltungStudienplan($studienplan_id, $semester,'bezeichnung'))
{
$tree = $lv_obj->getLehrveranstaltungTree();
$this->printTree($tree, $sprache);
$this->printTree($tree, $sprache, $studiensemester_kurzbz);
}
$this->output();
@@ -318,7 +318,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
/**
* Stellt die Lehrveranstaltungen in einer Baumstruktur dar.
*/
private function printTree($tree, $sprache)
private function printTree($tree, $sprache, $studiensemester_kurzbz)
{
$this->block.='<ul>';
foreach ($tree as $row)
@@ -329,9 +329,9 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
$bold='font-weight:bold;';
else
$bold='';
$this->block.= "<li style='display:inline-block;white-space: nowrap;padding: 0px; margin:0px; $bold'><a title=\"".$row->bezeichnung_arr[$sprache]."\" href=\"private/lehre/lesson.php?lvid=$row->lehrveranstaltung_id\" target=\"content\">".$this->CutString($row->bezeichnung_arr[$sprache], 21).' '.$row->lehrform_kurzbz."</a></li>";
$this->block.= "<li style='display:inline-block;white-space: nowrap;padding: 0px; margin:0px; $bold'><a title=\"".$row->bezeichnung_arr[$sprache]."\" href=\"private/lehre/lesson.php?lvid=$row->lehrveranstaltung_id&studiensemester_kurzbz=$studiensemester_kurzbz\" target=\"content\">".$this->CutString($row->bezeichnung_arr[$sprache], 21).' '.$row->lehrform_kurzbz."</a></li>";
if(isset($row->childs))
$this->printTree($row->childs, $sprache);
$this->printTree($row->childs, $sprache, $studiensemester_kurzbz);
}
$this->block.="</ul>";
}
include/functions.inc.php
+1 -1
View File
@@ -366,7 +366,7 @@ function getStudiensemesterFromDatum($datum, $naechstes=true)
$qry = "SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE";
if($naechstes)
$qry.= " ende>".$db->db_add_param($datum)." ORDER BY ende ASC ";
$qry.= " ende>=".$db->db_add_param($datum)." ORDER BY ende ASC ";
else
$qry.= " start<".$db->db_add_param($datum)." ORDER BY ende DESC ";
include/studienplan.class.php
+1 -1
View File
@@ -861,7 +861,7 @@ class studienplan extends basis_db
WHERE
tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER)."
AND EXISTS (
SELECT 1 FROM lehre.tbl_studienordnung_semester
SELECT 1 FROM lehre.tbl_studienplan_semester
WHERE studienordnung_id=tbl_studienplan.studienordnung_id
AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
AND semester = tbl_studienplan_lehrveranstaltung.semester)
locale/de-AT/lvaliste.php
+1
View File
@@ -30,3 +30,4 @@ $this->phrasen['lvaliste/koordination']='Koordination';
$this->phrasen['lvaliste/gesamtnote']='Noten eintragen';
$this->phrasen['lvaliste/anzahl']='Anzahl';
$this->phrasen['lvaliste/summe']='Summe';
$this->phrasen['lvaliste/lvinfo']='LV-Info';
vilesci/personen/aliquote_reduktion.php
+7 -7
View File
@@ -245,7 +245,7 @@
aqr.studenten.forEach(function(j)
{
if((j.applicant || j.selected))
if(j.rt_gesamtpunkte !== null && j.rt_gesamtpunkte > 0)
allCountedStudents.push(j);
});
@@ -253,33 +253,31 @@
if(applicantCount > allCountedStudents.length)
applicantCount = allCountedStudents.length;
zgvs.forEach(function(i)
{
var applicantsFromZGV = [];
aqr.studenten.forEach(function(j)
{
if((j.applicant || j.selected) && j.bezeichnung === i)
if((j.rt_gesamtpunkte !== null && j.rt_gesamtpunkte > 0) && j.bezeichnung === i)
applicantsFromZGV.push(j);
});
// calculate the aliquote reduction for every ZGV
var percent = applicantsFromZGV.length / allCountedStudents.length * 100;
var neededFromZGV = (applicantCount / 100 * percent);
var neededFromZGV = (applicantCount / 100 * percent) - aqr.getAcceptedCount(i);
if(neededFromZGV < 0)
neededFromZGV = 0;
zgvElems.push({name:i, needed:neededFromZGV, percent:percent, accepted: aqr.getAcceptedCount(i), overallNeeded: (applicantCount / 100 * percent) + aqr.getAcceptedCount(i)});
zgvElems.push({name:i, needed:neededFromZGV, percent:percent, accepted: aqr.getAcceptedCount(i), overallNeeded: neededFromZGV + aqr.getAcceptedCount(i)});
});
aqr.zgvElems = JSON.parse(JSON.stringify(zgvElems));
// calculate the already distributed students
var residual = 0;
zgvElems.forEach(function(i)
{
residual += i.needed;
residual += parseInt(i.needed);
});
// calculate the difference from needed to already distributed
@@ -292,11 +290,13 @@
{
if(resDiff > 0)
{
i.overallNeeded ++;
i.needed ++;
resDiff --;
}
});
}
aqr.zgvElems = JSON.parse(JSON.stringify(zgvElems));
aqr.recursiveChoose(neededStudentsCount, zgvElems);
}
}