diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php index da2182e68..533e3122e 100644 --- a/content/fasoverlay.js.php +++ b/content/fasoverlay.js.php @@ -1775,13 +1775,13 @@ function PrintStudienblatt(event) var studienplan_id = ""; for (var v=0; v < items; v++) { - var stsem = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', v); - if(stsem == ss) - { - studienplan_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-studienplan_id', v); - if(studienplan_id!='') - break; - } + var stsem = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', v); + if(stsem == ss) + { + studienplan_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-studienplan_id', v); + if(studienplan_id!='') + break; + } } } catch(e) @@ -1851,7 +1851,7 @@ function PrintStudienblatt(event) { if(error>0) alert(error+' der ausgewaehlten Personen haben keinen Account'); - action = 'content/pdfExport.php?xsl=Studienblatt&xml=studienblatt.xml.php&output='+output+'&&uid='+data+"&ss="+ss; + action = 'content/pdfExport.php?xsl=Studienblatt&xml=studienblatt.xml.php&output='+output+'&uid='+data+"&ss="+ss; window.open(action,'Studienblatt','height=520,width=500,left=350,top=350,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); } else @@ -1866,6 +1866,7 @@ function PrintStudienblatt(event) function PrintStudienblattEnglisch(event) { var tree = document.getElementById('student-prestudent-tree-rolle'); + var ss = document.getElementById('statusbarpanel-semester').label; var items = tree.view.rowCount; try @@ -1873,12 +1874,14 @@ function PrintStudienblattEnglisch(event) var studienplan_id = ""; for (var v=0; v < items; v++) { - var stsem = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', v); - if(stsem == ss) - { - studienplan_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-studienplan_id', v); + var stsem = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', v); + if(stsem == ss) + { + studienplan_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-studienplan_id', v); + if(studienplan_id!='') + break; + } } - } } catch(e) { @@ -1947,7 +1950,7 @@ function PrintStudienblattEnglisch(event) { if(error>0) alert(error+' der ausgewaehlten Personen haben keinen Account'); - action = 'content/pdfExport.php?xsl=StudienblattEng&xml=studienblatt.xml.php&output='+output+'&&uid='+data; + action = 'content/pdfExport.php?xsl=StudienblattEng&xml=studienblatt.xml.php&output='+output+'&uid='+data+'&ss='+ss; window.open(action,'StudienblattEng','height=520,width=500,left=350,top=350,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); } else diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php index 1145a19dd..a3da0ea05 100644 --- a/rdf/studienblatt.xml.php +++ b/rdf/studienblatt.xml.php @@ -94,7 +94,7 @@ foreach($uid_arr as $uid) $datum_aktuell = date('d.m.Y'); $gebdatum = date('d.m.Y',strtotime($student->gebdatum)); $prestudent = new prestudent($student->prestudent_id); - $prestudent->getLastStatus($student->prestudent_id,$studiensemester,'Student'); + $prestudent->getLastStatus($student->prestudent_id,$studiensemester); $studienordnung = new studienordnung(); $studienordnung->getStudienordnungFromStudienplan($prestudent->studienplan_id); $studiengang = new studiengang(); @@ -180,7 +180,7 @@ foreach($uid_arr as $uid) echo "\t\t".$studiensemester_beginn->bezeichnung.""; echo "\t\t".date('d.m.Y',strtotime($studiensemester_beginn->start)).""; - $prestudent->getLastStatus($student->prestudent_id,$studiensemester,'Student'); + $prestudent->getLastStatus($student->prestudent_id,$studiensemester); $studiensemester_abschluss = new studiensemester(); $abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester); $studiensemester_abschluss->load($abschluss); @@ -306,7 +306,7 @@ foreach($uid_arr as $uid) } } $prestudent = new prestudent(); - $prestudent->getLastStatus($student->prestudent_id, null, 'Student'); + $prestudent->getLastStatus($student->prestudent_id, null); if($prestudent->orgform_kurzbz!='') $orgform = $prestudent->orgform_kurzbz;