From 81ca197020c6ec6fb9c46894fb70659736b13d22 Mon Sep 17 00:00:00 2001 From: Andreas Moik Date: Thu, 30 Jun 2016 16:15:05 +0200 Subject: [PATCH 1/5] bugfix --- vilesci/personen/aliquote_reduktion.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vilesci/personen/aliquote_reduktion.php b/vilesci/personen/aliquote_reduktion.php index b06069349..8aa9aa2a4 100644 --- a/vilesci/personen/aliquote_reduktion.php +++ b/vilesci/personen/aliquote_reduktion.php @@ -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); } } From c96b6de669c453cbac5345aa5dbd19546524e210 Mon Sep 17 00:00:00 2001 From: oesi Date: Fri, 1 Jul 2016 08:57:10 +0200 Subject: [PATCH 2/5] Fehler behoben wodurch der letzte Tag des Studiensemesters nicht korrekt dem Studiensemester zugeordnet wurde --- include/functions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/functions.inc.php b/include/functions.inc.php index fc465035b..fe9d3ee92 100755 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -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 "; From be79ca299ca38f3affd1793de1c29dde0af340ad Mon Sep 17 00:00:00 2001 From: oesi Date: Mon, 4 Jul 2016 09:19:56 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Breite=20der=20DropDowns=20auf=20100%=20ge?= =?UTF-8?q?=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...addon_lehrveranstaltungen_studienplan.inc.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php b/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php index df4da04ea..a9d11ccfd 100644 --- a/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php +++ b/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php @@ -131,7 +131,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon Studiensemester
- '; //Anzeigen des DropDown Menues mit Studiensemester $studiensemester = new studiensemester(); @@ -165,7 +165,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon Studiengang
- '; $stg_obj = new studiengang(); $stg_obj->loadStudiengangFromStudiensemester($studiensemester_kurzbz); @@ -201,7 +201,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon Semester
- '; $vorhandenesemester=array(); @@ -241,7 +241,7 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon Studienplan
- '; // 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.='"; } From 9707c523e0de3985cee43456f79fc785676a0c78 Mon Sep 17 00:00:00 2001 From: oesi Date: Mon, 4 Jul 2016 18:31:25 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Studienordnung=5Fsemester=20auf=20Studienpl?= =?UTF-8?q?an=5Fsemester=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/studienplan.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/studienplan.class.php b/include/studienplan.class.php index f71c37d2a..36227cc79 100644 --- a/include/studienplan.class.php +++ b/include/studienplan.class.php @@ -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) From 5de98911ec844e0e4464257abaa3569400d80625 Mon Sep 17 00:00:00 2001 From: oesi Date: Tue, 5 Jul 2016 13:57:26 +0200 Subject: [PATCH 5/5] =?UTF-8?q?Link=20zu=20LV-Infos=20zur=20Lehrveranstalt?= =?UTF-8?q?ungs=C3=BCbersicht=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/profile/lva_liste.php | 25 +++++++++++++++++++++++++ locale/de-AT/lvaliste.php | 1 + 2 files changed, 26 insertions(+) diff --git a/cis/private/profile/lva_liste.php b/cis/private/profile/lva_liste.php index 04889e6a5..ee30987a4 100644 --- a/cis/private/profile/lva_liste.php +++ b/cis/private/profile/lva_liste.php @@ -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'); '; if(!defined('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN') || CIS_LVALISTE_NOTENEINGABE_ANZEIGEN) echo ''.$p->t('lvaliste/gesamtnote').''; + + + if($lvinfo) + echo ''.$p->t('lvaliste/lvinfo').''; + echo ' '.$p->t('lvaliste/lehrfach').' '.$p->t('lvaliste/lehrform').' @@ -192,6 +204,10 @@ require_once('../../../include/lvangebot.class.php'); echo ''; if(!defined('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN') || CIS_LVALISTE_NOTENEINGABE_ANZEIGEN) echo ''.$p->t('lvaliste/gesamtnote').''; + + if($lvinfo) + echo ''.$p->t('lvaliste/lvinfo').''; + echo ''.$row->lehrfach.''; echo ''.$row->le_lehrform_kurzbz.''; if ($row->lehrfach_bez!=$row->lv_bezeichnung) @@ -228,6 +244,11 @@ require_once('../../../include/lvangebot.class.php'); echo ''.$datum->formatDatum($lvangebot->result[0]->anmeldefenster_start, "d.m.Y").''; echo ''.$datum->formatDatum($lvangebot->result[0]->anmeldefenster_ende, "d.m.Y").''; } + else + { + echo '  +  '; + } //echo ''.$row->le_anmerkung.''; Lektoren sollen die Anmerkung dzt. nicht sehen, da nur für intern gedacht echo ''; @@ -238,8 +259,12 @@ require_once('../../../include/lvangebot.class.php'); echo ''; if(!defined('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN') || CIS_LVALISTE_NOTENEINGABE_ANZEIGEN) echo ' '; + if($lvinfo) + echo ' '; + echo ' '; echo ' '; + echo ' '; echo ' '; echo ' '; diff --git a/locale/de-AT/lvaliste.php b/locale/de-AT/lvaliste.php index 46b7e3750..aa4087528 100755 --- a/locale/de-AT/lvaliste.php +++ b/locale/de-AT/lvaliste.php @@ -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';