mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 12:19:28 +00:00
- Encoding Bugfix Lehrveranstaltungsverwaltung
- Sortierung im Tempus bleibt erhalten - Gruppenbezeichnung wird in den Tempusdetails angezeigt
This commit is contained in:
Andreas Österreicher
@@ -61,76 +61,85 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<treecols>
|
||||
<treecol id="lehreinheit_id" label="LE_ID" flex="2" primary="false"
|
||||
class="sortDirectionIndicator" sortActive="true" sortDirection="ascending"
|
||||
persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#lehreinheit_id" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplLektor" label="Lektor" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#lektor" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplLehrfachKurzbz" label="Fach" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#lehrfach" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplLehrform" label="Form" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
<treecol id="stplLehrform" label="Form" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#lehrform" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplLehrfachBezeichnung" label="Lehrfach" flex="20" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
<treecol id="stplLehrfachBezeichnung" label="Lehrfach" flex="20" hidden="false"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#lehrfach_bez" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl_studiengang" label="Studiengang" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
<treecol id="stpl_studiengang" label="Studiengang" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#studiengang" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplSemester" label="S" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#sem" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplVerband" label="V" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#ver" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="gruppe" label="G" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#grp" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl_einheit" label="SpzGrp" flex="3" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#gruppe" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplOrt" label="Ort" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#ort_kurzbz" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl_datum" label="Datum" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl_datum" label="Datum" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#datum" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl_stunde" label="Std" flex="1" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#stunde" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stplUNR" label="UNR" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#unr" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stundenplan_id" label="StundenplanID" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#id" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="anzahlstudenten" label="AnzahlStudenten" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#anzahlstudenten" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl-details-overlay-lehrstunde-anmerkung" label="Anmerkung" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#anmerkung" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl-details-overlay-lehrstunde-titel" label="Titel" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#titel" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl-details-overlay-lehrstunde-gruppe_bezeichnung" label="Gruppe Bezeichnung" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#gruppe_bezeichnung" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="stpl-details-overlay-lehrstunde-gruppe_beschreibung" label="Gruppe Beschreibung" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator" persist="hidden, width, ordinal"
|
||||
sort="rdf:http://www.technikum-wien.at/lehrstunde/rdf#gruppe_beschreibung" />
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -156,6 +165,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lehrstunde/rdf#anzahlstudenten" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lehrstunde/rdf#anmerkung" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lehrstunde/rdf#titel" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lehrstunde/rdf#gruppe_bezeichnung" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lehrstunde/rdf#gruppe_beschreibung" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
@@ -163,5 +174,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
</template>
|
||||
</tree>
|
||||
</vbox>
|
||||
|
||||
</overlay>
|
||||
</overlay>
|
||||
@@ -63,11 +63,40 @@ function onLVAFilter()
|
||||
vboxLehrveranstalungPlanung.setAttribute('datasources',datasources);
|
||||
}
|
||||
|
||||
// Liefert die Sortierreihenfolge der Lehrstunden
|
||||
function LehrstundeGetSortOrder()
|
||||
{
|
||||
var toolbar = document.getElementById('toolbarTimeTableSort');
|
||||
var tbbuttons = toolbar.getElementsByTagName('toolbarbutton');
|
||||
|
||||
for each(var button in tbbuttons)
|
||||
{
|
||||
if(button.getAttribute('checked')=='true')
|
||||
{
|
||||
return button.getAttribute('value');
|
||||
}
|
||||
}
|
||||
return 'stundenDESC';
|
||||
}
|
||||
|
||||
// LVA-Panel filtern
|
||||
function onLVASort(order)
|
||||
function onLVASort(item)
|
||||
{
|
||||
var vorher='';
|
||||
var nachher='';
|
||||
var order=item.getAttribute('value');
|
||||
|
||||
//Sortiermarkierung von allen entfernen
|
||||
var toolbar = document.getElementById('toolbarTimeTableSort');
|
||||
var tbbuttons = toolbar.getElementsByTagName('toolbarbutton');
|
||||
|
||||
for each(var button in tbbuttons)
|
||||
{
|
||||
if(button.id)
|
||||
button.setAttribute('checked','false');
|
||||
}
|
||||
//Element als gedrueckt markieren
|
||||
item.setAttribute('checked','true');
|
||||
|
||||
// LVAs
|
||||
var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung');
|
||||
|
||||
@@ -200,32 +200,45 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-details-overlay.xul
|
||||
<toolbar id="toolbarTimeTableSort" tbautostretch="always" persist="collapsed">
|
||||
<toolbarbutton
|
||||
image="../skin/images/down.png"
|
||||
oncommand="onLVASort('lfDESC');"
|
||||
oncommand="onLVASort(this);"
|
||||
value="lfDESC"
|
||||
id="toolbarTimeTableSort-lfDESC"
|
||||
tooltiptext="Lehrfach absteigend"
|
||||
/>
|
||||
<toolbarbutton
|
||||
image="../skin/images/up.png"
|
||||
oncommand="onLVASort('lfASC');"
|
||||
oncommand="onLVASort(this);"
|
||||
value="lfASC"
|
||||
id="toolbarTimeTableSort-lfASC"
|
||||
tooltiptext="Lehrfach aufsteigend"
|
||||
/>
|
||||
<toolbarbutton
|
||||
image="../skin/images/user_down.png"
|
||||
oncommand="onLVASort('lektorDESC');"
|
||||
oncommand="onLVASort(this);"
|
||||
value="lektorDESC"
|
||||
id="toolbarTimeTableSort-lektorDESC"
|
||||
tooltiptext="Lektor absteigend"
|
||||
/>
|
||||
<toolbarbutton
|
||||
image="../skin/images/user_up.png"
|
||||
oncommand="onLVASort('lektorASC');"
|
||||
oncommand="onLVASort(this);"
|
||||
value="lektorASC"
|
||||
id="toolbarTimeTableSort-lektorASC"
|
||||
tooltiptext="Lektor aufsteigend"
|
||||
/>
|
||||
<toolbarbutton
|
||||
image="../skin/images/clock_down.png"
|
||||
oncommand="onLVASort('stundenDESC');"
|
||||
oncommand="onLVASort(this);"
|
||||
value="stundenDESC"
|
||||
checked="true"
|
||||
id="toolbarTimeTableSort-stundenDESC"
|
||||
tooltiptext="Offene Stunden absteigend"
|
||||
/>
|
||||
<toolbarbutton
|
||||
image="../skin/images/clock_up.png"
|
||||
oncommand="onLVASort('stundenASC');"
|
||||
oncommand="onLVASort(this);"
|
||||
value="stundenASC"
|
||||
id="toolbarTimeTableSort-stundenASC"
|
||||
tooltiptext="Offenen Stunden aufsteigend"
|
||||
/>
|
||||
|
||||
|
||||
+37
-102
@@ -98,122 +98,56 @@ function onVerbandSelect()
|
||||
contentFrame.setAttribute('src', url);
|
||||
}
|
||||
|
||||
|
||||
var order = LehrstundeGetSortOrder();
|
||||
// LVAs
|
||||
var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung');
|
||||
var attribute='../rdf/lehreinheit-lvplan.rdf.php'+type+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
|
||||
var attribute='../rdf/lehreinheit-lvplan.rdf.php'+type+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe+"&order="+order;
|
||||
|
||||
vboxLehrveranstalungPlanung.setAttribute('datasources',attribute);
|
||||
|
||||
// Studenten
|
||||
//var treeStudenten=document.getElementById('treeStudenten');
|
||||
//attribute="<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
|
||||
//treeStudenten.setAttribute('datasources',attribute);
|
||||
|
||||
// Studenten
|
||||
if(typ=='')
|
||||
// -------------- Studenten --------------------------
|
||||
try
|
||||
{
|
||||
stsem = getStudiensemester();
|
||||
url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?studiengang_kz="+stg_kz+"&semester="+sem+"&verband="+ver+"&gruppe="+grp+"&gruppe_kurzbz="+gruppe+"&studiensemester_kurzbz="+stsem+"&typ=student&"+gettimestamp();
|
||||
var treeStudent=document.getElementById('student-tree');
|
||||
|
||||
try
|
||||
//Alte DS entfernen
|
||||
var oldDatasources = treeStudent.database.GetDataSources();
|
||||
while(oldDatasources.hasMoreElements())
|
||||
{
|
||||
//Bei Ansicht von Ab-/Unterbrecher den Button "->Student" anzeigen
|
||||
if(sem=='0')
|
||||
document.getElementById('student-toolbar-student').hidden=false;
|
||||
else
|
||||
document.getElementById('student-toolbar-student').hidden=true;
|
||||
treeStudent.database.RemoveDataSource(oldDatasources.getNext());
|
||||
}
|
||||
catch(e){}
|
||||
|
||||
// -------------- Studenten --------------------------
|
||||
try
|
||||
{
|
||||
stsem = getStudiensemester();
|
||||
url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?studiengang_kz="+stg_kz+"&semester="+sem+"&verband="+ver+"&gruppe="+grp+"&gruppe_kurzbz="+gruppe+"&studiensemester_kurzbz="+stsem+"&typ=student&"+gettimestamp();
|
||||
var treeStudent=document.getElementById('student-tree');
|
||||
|
||||
//Alte DS entfernen
|
||||
var oldDatasources = treeStudent.database.GetDataSources();
|
||||
while(oldDatasources.hasMoreElements())
|
||||
{
|
||||
treeStudent.database.RemoveDataSource(oldDatasources.getNext());
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
StudentTreeDatasource.removeXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeStudent.builder.removeListener(StudentTreeListener);
|
||||
}
|
||||
catch(e)
|
||||
{}
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
StudentTreeDatasource = rdfService.GetDataSource(url);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
|
||||
treeStudent.database.AddDataSource(StudentTreeDatasource);
|
||||
StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeStudent.builder.addListener(StudentTreeListener);
|
||||
|
||||
//Detailfelder Deaktivieren
|
||||
StudentDetailReset();
|
||||
StudentDetailDisableFields(true);
|
||||
StudentPrestudentDisableFields(true);
|
||||
StudentKontoDisableFields(true);
|
||||
StudentAkteDisableFields(true);
|
||||
StudentIODisableFields(true);
|
||||
StudentNoteDisableFields(true);
|
||||
document.getElementById('student-kontakt').setAttribute('src','');
|
||||
document.getElementById('student-betriebsmittel').setAttribute('src','');
|
||||
StudentAbschlusspruefungDisableFields(true);
|
||||
}
|
||||
catch(e){}
|
||||
}
|
||||
else
|
||||
{
|
||||
// -------------- Interessenten / Bewerber --------------------------
|
||||
try
|
||||
{
|
||||
if(stsem=='' && typ=='')
|
||||
stsem='aktuelles';
|
||||
url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"studiengang_kz="+stg_kz+"&semester="+sem+"&typ="+typ+"&studiensemester_kurzbz="+stsem+"&"+gettimestamp();
|
||||
var treeInt=document.getElementById('student-tree');
|
||||
|
||||
//Alte DS entfernen
|
||||
var oldDatasources = treeInt.database.GetDataSources();
|
||||
while(oldDatasources.hasMoreElements())
|
||||
{
|
||||
treeInt.database.RemoveDataSource(oldDatasources.getNext());
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
StudentTreeDatasource.removeXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeInt.builder.removeListener(StudentTreeListener);
|
||||
}
|
||||
catch(e)
|
||||
{}
|
||||
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
StudentTreeDatasource = rdfService.GetDataSource(url);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
|
||||
treeInt.database.AddDataSource(StudentTreeDatasource);
|
||||
StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeInt.builder.addListener(StudentTreeListener);
|
||||
|
||||
//Detailfelder Deaktivieren
|
||||
StudentDetailReset();
|
||||
StudentDetailDisableFields(true);
|
||||
StudentPrestudentDisableFields(true);
|
||||
StudentKontoDisableFields(true);
|
||||
StudentAkteDisableFields(true);
|
||||
StudentIODisableFields(true);
|
||||
StudentNoteDisableFields(true);
|
||||
document.getElementById('student-kontakt').setAttribute('src','');
|
||||
document.getElementById('student-betriebsmittel').setAttribute('src','');
|
||||
StudentAbschlusspruefungDisableFields(true);
|
||||
StudentTreeDatasource.removeXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeStudent.builder.removeListener(StudentTreeListener);
|
||||
}
|
||||
catch(e)
|
||||
{}
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
StudentTreeDatasource = rdfService.GetDataSource(url);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
|
||||
treeStudent.database.AddDataSource(StudentTreeDatasource);
|
||||
StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeStudent.builder.addListener(StudentTreeListener);
|
||||
|
||||
//Detailfelder Deaktivieren
|
||||
StudentDetailReset();
|
||||
StudentDetailDisableFields(true);
|
||||
StudentPrestudentDisableFields(true);
|
||||
StudentKontoDisableFields(true);
|
||||
StudentAkteDisableFields(true);
|
||||
StudentIODisableFields(true);
|
||||
StudentNoteDisableFields(true);
|
||||
document.getElementById('student-kontakt').setAttribute('src','');
|
||||
document.getElementById('student-betriebsmittel').setAttribute('src','');
|
||||
StudentAbschlusspruefungDisableFields(true);
|
||||
}
|
||||
catch(e){}
|
||||
|
||||
|
||||
// Lehrveranstaltung
|
||||
try
|
||||
@@ -316,9 +250,10 @@ function onLektorSelect(event)
|
||||
contentFrame.setAttribute('src', url);
|
||||
}
|
||||
|
||||
var order = LehrstundeGetSortOrder();
|
||||
// LVAs
|
||||
var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung');
|
||||
vboxLehrveranstalungPlanung.setAttribute('datasources','../rdf/lehreinheit-lvplan.rdf.php?'+"type=lektor&lektor="+uid+"&"+gettimestamp());
|
||||
vboxLehrveranstalungPlanung.setAttribute('datasources','../rdf/lehreinheit-lvplan.rdf.php?'+"type=lektor&lektor="+uid+"&order="+order+"&"+gettimestamp());
|
||||
|
||||
var tree=document.getElementById('tree-lektor');
|
||||
//Wenn nichts markiert wurde -> beenden
|
||||
|
||||
@@ -235,9 +235,11 @@ if ($anz>0)
|
||||
|
||||
if($filter!='')
|
||||
{
|
||||
if(!mb_strstr(mb_strtolower($lektor), mb_strtolower($filter)) &&
|
||||
!mb_strstr(mb_strtolower($lehrfach), mb_strtolower($filter)) &&
|
||||
!mb_strstr(mb_strtolower($l->lehrfach_bez[0]), mb_strtolower($filter)))
|
||||
$filter = mb_strtolower($filter);
|
||||
if(!mb_strstr(mb_strtolower($lektor), $filter) &&
|
||||
!mb_strstr(mb_strtolower($lehrfach), $filter) &&
|
||||
!mb_strstr(mb_strtolower($l->lehrfach_bez[0]), $filter) &&
|
||||
!mb_strstr(mb_strtolower(implode('',$l->stg)), $filter))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -37,6 +37,8 @@ require_once('../config/vilesci.config.inc.php');
|
||||
require_once('../include/functions.inc.php');
|
||||
require_once('../include/datum.class.php');
|
||||
require_once('../include/lehrstunde.class.php');
|
||||
require_once('../include/lehrverband.class.php');
|
||||
require_once('../include/gruppe.class.php');
|
||||
|
||||
$datumObj=new datum();
|
||||
|
||||
@@ -175,6 +177,24 @@ if (is_array($lehrstunden->lehrstunden))
|
||||
//Anzahl der Studenten in der Gruppe ermitteln
|
||||
$stsem = getStudiensemesterFromDatum($ls->datum);
|
||||
$anzahl = getAnzahl($ls->studiengang_kz, $ls->sem, $ls->ver, $ls->grp, $ls->gruppe_kurzbz, $stsem);
|
||||
$gruppenbezeichnung = '';
|
||||
|
||||
if($ls->gruppe_kurzbz!='')
|
||||
{
|
||||
$obj = new gruppe();
|
||||
if(!$obj->load($ls->gruppe_kurzbz))
|
||||
die($obj->errormsg);
|
||||
$gruppenbezeichnung = $obj->bezeichnung;
|
||||
$gruppenbeschreibung = $obj->beschreibung;
|
||||
}
|
||||
else
|
||||
{
|
||||
$obj = new lehrverband();
|
||||
if(!$obj->load($ls->studiengang_kz, $ls->sem, $ls->ver, $ls->grp))
|
||||
die($obj->errormsg);
|
||||
$gruppenbezeichnung = $obj->bezeichnung;
|
||||
$gruppenbeschreibung = '';
|
||||
}
|
||||
?>
|
||||
<RDF:li>
|
||||
<RDF:Description id="<?php echo $ls->stundenplan_id; ?>" about="<?php echo $rdf_url.'/'. $ls->stundenplan_id; ?>" >
|
||||
@@ -198,6 +218,8 @@ if (is_array($lehrstunden->lehrstunden))
|
||||
<LEHRSTUNDE:anmerkung><![CDATA[<?php echo $ls->anmerkung; ?>]]></LEHRSTUNDE:anmerkung>
|
||||
<LEHRSTUNDE:titel><![CDATA[<?php echo $ls->titel; ?>]]></LEHRSTUNDE:titel>
|
||||
<LEHRSTUNDE:anzahlstudenten><![CDATA[<?php echo $anzahl; ?>]]></LEHRSTUNDE:anzahlstudenten>
|
||||
<LEHRSTUNDE:gruppe_bezeichnung><![CDATA[<?php echo $gruppenbezeichnung; ?>]]></LEHRSTUNDE:gruppe_bezeichnung>
|
||||
<LEHRSTUNDE:gruppe_beschreibung><![CDATA[<?php echo $gruppenbeschreibung; ?>]]></LEHRSTUNDE:gruppe_beschreibung>
|
||||
</RDF:Description>
|
||||
</RDF:li>
|
||||
<?php
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
}
|
||||
|
||||
$htmlstr .= "<br><div class='kopf'>Lehrveranstaltung</div>\n";
|
||||
$htmlstr .= "<form accept-charset='UTF-8' action='lehrveranstaltung_details.php' method='POST'>\n";
|
||||
$htmlstr .= "<form action='lehrveranstaltung_details.php' method='POST'>\n";
|
||||
$htmlstr .= "<input type='hidden' name='lv_id' value='".$lv->lehrveranstaltung_id."'>\n";
|
||||
|
||||
$htmlstr .= "<table class='detail' style='padding-top:10px;'>\n";
|
||||
@@ -149,7 +149,7 @@
|
||||
$htmlstr .= " <td>Kurzbz</td>";
|
||||
$htmlstr .= " <td><input type='text' name='kurzbz' value='$lv->kurzbz'\n</td>";
|
||||
$htmlstr .= " <td>Bezeichnung</td>";
|
||||
$htmlstr .= " <td colspan='3'><input type='text' name='bezeichnung' value='".htmlentities($lv->bezeichnung, ENT_QUOTES)."' size='60' maxlength='128'></td>\n";
|
||||
$htmlstr .= " <td colspan='3'><input type='text' name='bezeichnung' value='".htmlentities($lv->bezeichnung, ENT_QUOTES, 'UTF-8')."' size='60' maxlength='128'></td>\n";
|
||||
|
||||
$htmlstr .= "</tr>";
|
||||
$htmlstr .= "<tr>";
|
||||
@@ -166,7 +166,7 @@
|
||||
}
|
||||
$htmlstr .= " </select></td>\n";
|
||||
$htmlstr .= " <td>Bezeichnung English</td>";
|
||||
$htmlstr .= " <td colspan='3'><input type='text' name='bezeichnung_english' value='".htmlentities($lv->bezeichnung_english,ENT_QUOTES)."' size='60' maxlength='256'></td>\n";
|
||||
$htmlstr .= " <td colspan='3'><input type='text' name='bezeichnung_english' value='".htmlentities($lv->bezeichnung_english, ENT_QUOTES, 'UTF-8')."' size='60' maxlength='256'></td>\n";
|
||||
|
||||
$htmlstr .= "</tr>";
|
||||
$htmlstr .= "<tr>";
|
||||
@@ -285,11 +285,11 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<title>Lehrveranstaltung - Details</title>
|
||||
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
|
||||
<script src="../../include/js/mailcheck.js"></script>
|
||||
<script src="../../include/js/datecheck.js"></script>
|
||||
<script type="text/javascript" src="../../include/js/mailcheck.js"></script>
|
||||
<script type="text/javascript" src="../../include/js/datecheck.js"></script>
|
||||
</head>
|
||||
<body style="background-color:#eeeeee;">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user