blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-11 12:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

FASO

Browse Source 
- Bei Lehrveranstaltungsuebersicht werden nun FBK angezeigt
- Neu Anlegen der LE funktioniert nun wieder
- Anpassungen beim Prestudent-Modul
This commit is contained in:
Andreas Österreicher
2007-05-04 12:43:50 +00:00
parent 663a8a7bf9
commit f5450fc771
12 changed files with 131 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/lvplanung/lehrveranstaltungoverlay.js.php
+1 -1
View File
@@ -219,7 +219,7 @@ function LeNeu()
LeDetailReset();
//Detail Tab als aktiv setzen
document.getElementById('lehrveranstaltung-tabs').selectedItem = document.getElementById('lehrveranstaltung-tab-detail');
document.getElementById('lehrveranstaltung-tabbox').selectedIndex=0;
//Lektor-Tab und GruppenTree ausblenden
document.getElementById('lehrveranstaltung-detail-tree-lehreinheitgruppe').hidden=true;
content/student/interessentdetailoverlay.xul.php
+13 -2
View File
@@ -264,10 +264,21 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</menulist>
</row>
<row>
<vbox>
<label value="Anmerkung" control="interessent-prestudent-textbox-anmerkung"/>
<spacer flex="1" />
</vbox>
<textbox id="interessent-prestudent-textbox-anmerkung" multiline="true" disabled="true"/>
<label value="Facheinschlaegig berufstaetig" control="interessent-prestudent-checkbox-facheinschlberuf"/>
<checkbox id="interessent-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
<vbox>
<checkbox id="interessent-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
<spacer flex="1"/>
</vbox>
<label value="Bismelden" control="interessent-prestudent-checkbox-bismelden"/>
<checkbox id="interessent-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
<vbox>
<checkbox id="interessent-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
<spacer flex="1"/>
</vbox>
</row>
</rows>
</grid>
content/student/interessentenoverlay.xul.php
+6
View File
@@ -111,6 +111,10 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdetailoverlay.x
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/interessent/rdf#geschlecht" />
<splitter class="tree-splitter"/>
<treecol id="interessent-treecol-status" label="Status" flex="1" hidden="true"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/interessent/rdf#status" />
<splitter class="tree-splitter"/>
<treecol id="interessent-treecol-studiengang_kz" label="StudiengangKz" flex="1" hidden="true"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/interessent/rdf#studiengang_kz" />
@@ -118,6 +122,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdetailoverlay.x
<treecol id="interessent-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="true"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/interessent/rdf#prestudent_id" />
<splitter class="tree-splitter"/>
<treecol id="interessent-treecol-person_id" label="PersonID" flex="1" hidden="true"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/interessent/rdf#person_id" />
@@ -138,6 +143,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdetailoverlay.x
<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#svnr" />
<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#ersatzkennzeichen" />
<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#geschlecht" />
<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#status" />
<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#studiengang_kz" />
<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#prestudent_id" />
<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#person_id" />
content/student/interessentoverlay.js.php
+5
View File
@@ -416,6 +416,7 @@ function InteressentAuswahl()
reihungstestangetreten = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstestangetreten" ));
punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
document.getElementById('interessent-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
document.getElementById('interessent-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
@@ -448,6 +449,7 @@ function InteressentAuswahl()
document.getElementById('interessent-prestudent-textbox-prestudent_id').value=prestudent_id;
document.getElementById('interessent-prestudent-checkbox-new').checked=false;
document.getElementById('interessent-prestudent-menulist-studiengang_kz').value=studiengang_kz;
document.getElementById('interessent-prestudent-textbox-anmerkung').value=anmerkung;
rollentree = document.getElementById('interessent-prestudent-tree-rolle');
url='<?php echo APP_ROOT;?>rdf/prestudentrolle.rdf.php?prestudent_id='+prestudent_id+"&"+gettimestamp();
@@ -490,6 +492,7 @@ function InteressentPrestudentDisableFields(val)
document.getElementById('interessent-prestudent-checkbox-bismelden').disabled=val;
document.getElementById('interessent-prestudent-button-anmeldungreihungstest-heute').disabled=val;
document.getElementById('interessent-prestudent-button-save').disabled=val;
document.getElementById('interessent-prestudent-textbox-anmerkung').disabled=val;
}
// ****
@@ -517,6 +520,7 @@ function InteressentPrestudentSave()
prestudent_id = document.getElementById('interessent-prestudent-textbox-prestudent_id').value;
neu = document.getElementById('interessent-prestudent-checkbox-new').checked;
studiengang_kz = document.getElementById('interessent-prestudent-menulist-studiengang_kz').value;
anmerkung = document.getElementById('interessent-prestudent-textbox-anmerkung').value;
var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
var req = new phpRequest(url,'','');
@@ -548,6 +552,7 @@ function InteressentPrestudentSave()
req.add('person_id', person_id);
req.add('prestudent_id', prestudent_id);
req.add('studiengang_kz', studiengang_kz);
req.add('anmerkung', anmerkung);
var response = req.executePOST();
content/student/studentDBDML.php
+3 -2
View File
@@ -209,8 +209,8 @@ if(!$error)
$prestudent->studiengang_kz = $_POST['studiengang_kz'];
$prestudent->berufstaetigkeit_code = $_POST['berufstaetigkeit_code'];
$prestudent->ausbildungcode = $_POST['ausbildungcode'];
$presutdent->zgv_code = $_POST['zgv_code'];
$presutdent->zgvort = $_POST['zgvort'];
$prestudent->zgv_code = $_POST['zgv_code'];
$prestudent->zgvort = $_POST['zgvort'];
$prestudent->zgvdatum = $_POST['zgvdatum'];
$prestudent->zgvmas_code = $_POST['zgvmas_code'];
$prestudent->zgvmaort = $_POST['zgvmaort'];
@@ -222,6 +222,7 @@ if(!$error)
$prestudent->reihungstestangetreten = ($_POST['reihungstestangetreten']=='true'?true:false);
$prestudent->punkte = $_POST['punkte'];
$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
$prestudent->anmerkung = $_POST['anmerkung'];
//$prestudent->insertamum = date('Y-m-d H:i:s');
//$prestudent->insertvon = $user;
$prestudent->updateamum = date('Y-m-d H:i:s');
content/student/studentdetailoverlay.xul.php
+27 -2
View File
@@ -293,10 +293,35 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</menupopup>
</template>
</menulist>
<label value="Studiengang" control="student-prestudent-menulist-studiengang_kz"/>
<menulist id="student-prestudent-menulist-studiengang_kz" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
ref="http://www.technikum-wien.at/studiengang/liste" >
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
uri="rdf:*"/>
</menupopup>
</template>
</menulist>
</row>
<row>
<vbox>
<label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
<spacer flex="1" />
</vbox>
<textbox id="student-prestudent-textbox-anmerkung" multiline="true" disabled="true"/>
<label value="Facheinschlaegig berufstaetig" control="student-prestudent-checkbox-facheinschlberuf"/>
<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
<vbox>
<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
<spacer flex="1"/>
</vbox>
<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
<vbox>
<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
<spacer flex="1"/>
</vbox>
</row>
</rows>
</grid>
content/student/studentoverlay.js.php
+9 -3
View File
@@ -517,6 +517,7 @@ function StudentAuswahl()
reihungstestangetreten = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstestangetreten" ));
punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
document.getElementById('student-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
document.getElementById('student-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
@@ -548,7 +549,8 @@ function StudentAuswahl()
document.getElementById('student-prestudent-textbox-person_id').value=person_id;
document.getElementById('student-prestudent-textbox-prestudent_id').value=prestudent_id;
document.getElementById('student-prestudent-checkbox-new').checked=false;
document.getElementById('student-prestudent-textbox-studiengang_kz').value=studiengang_kz;
document.getElementById('student-prestudent-menulist-studiengang_kz').value=studiengang_kz;
document.getElementById('student-prestudent-textbox-anmerkung').value=anmerkung;
rollentree = document.getElementById('student-prestudent-tree-rolle');
@@ -591,6 +593,8 @@ function StudentPrestudentDisableFields(val)
document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
document.getElementById('student-prestudent-button-anmeldungreihungstest-heute').disabled=val;
document.getElementById('student-prestudent-button-save').disabled=val;
document.getElementById('student-prestudent-menulist-studiengang_kz').disabled=val;
document.getElementById('student-prestudent-textbox-anmerkung').disabled=val;
}
// ****
@@ -617,7 +621,8 @@ function StudentPrestudentSave()
person_id = document.getElementById('student-prestudent-textbox-person_id').value;
prestudent_id = document.getElementById('student-prestudent-textbox-prestudent_id').value;
neu = document.getElementById('student-prestudent-checkbox-new').checked;
studiengang_kz = document.getElementById('student-prestudent-textbox-studiengang_kz').value;
studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
anmerkung = document.getElementById('student-prestudent-textbox-anmerkung').value;
var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
var req = new phpRequest(url,'','');
@@ -649,6 +654,7 @@ function StudentPrestudentSave()
req.add('person_id', person_id);
req.add('prestudent_id', prestudent_id);
req.add('studiengang_kz', studiengang_kz);
req.add('anmerkung', anmerkung);
var response = req.executePOST();
@@ -665,7 +671,7 @@ function StudentPrestudentSave()
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
StudentSelectUid=val.dbdml_data;
StudentSelectUid=document.getElementById('student-detail-textbox-uid').value;
StudentTreeDatasource.Refresh(false); //non blocking
SetStatusBarText('Daten wurden gespeichert');
}
content/tempus.js.php
+9 -1
View File
@@ -10,7 +10,15 @@ function closeWindow()
function onLoad()
{
initLektorTree();
try
{
initLektorTree();
//Studenten Tab beim starten markieren
document.getElementById('tabbox-main').selectedIndex="1";
}
catch(e)
{
}
}
function loadRightFrame()
include/prestudent.class.php
+32
View File
@@ -444,6 +444,7 @@ class prestudent extends person
$ps->reihungstest_id = $row->reihungstest_id;
$ps->punkte = $row->punkte;
$ps->bismelden = ($row->bismelden=='t'?true:false);
$ps->anmerkung = $row->anmerkung;
$ps->rolle_kurzbz = $row->rolle_kurzbz;
$ps->studiensemester_kurzbz = $row->studiensemester_kurzbz;
@@ -552,5 +553,36 @@ class prestudent extends person
return false;
}
}
function getLastStatus($prestudent_id)
{
$qry = "SELECT * FROM tbl_prestudentrolle WHERE prestudent_id='$prestudent_id' ORDER BY datum DESC LIMIT 1";
if($result = pg_query($this->conn, $qry))
{
if($row = pg_fetch_object($result))
{
$this->prestudent_id = $row->prestudent_id;
$this->rolle_kurzbz = $row->rolle_kurzbz;
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->ausbildungssemester = $row->ausbildungssemester;
$this->datum = $row->datum;
$this->insertamum = $row->insertamum;
$this->insertvon = $row->insertvon;
$this->updateamum = $row->updateamum;
$this->updatevon = $row->updatevon;
return true;
}
else
{
$this->errormsg = 'Keine Rolle vorhanden';
return false;
}
}
else
{
$this->errormsg = 'Fehler beim laden der PrestudentDaten';
return false;
}
}
}
?>
rdf/interessentenbewerber.rdf.php
+5 -1
View File
@@ -102,7 +102,9 @@ else
function DrawInteressent($row)
{
global $rdf_url;
global $rdf_url, $conn;
$ps = new prestudent($conn);
$ps->getLastStatus($row->prestudent_id);
?>
<RDF:li>
<RDF:Description id="<?php echo $row->prestudent_id; ?>" about="<?php echo $rdf_url.'/'.$row->prestudent_id; ?>" >
@@ -150,6 +152,8 @@ function DrawInteressent($row)
<PRESTD:reihungstestangetreten><![CDATA[<?php echo ($row->reihungstestangetreten?'true':'false'); ?>]]></PRESTD:reihungstestangetreten>
<PRESTD:punkte><![CDATA[<?php echo $row->punkte; ?>]]></PRESTD:punkte>
<PRESTD:bismelden><![CDATA[<?php echo ($row->bismelden?'true':'false'); ?>]]></PRESTD:bismelden>
<PRESTD:anmerkung><![CDATA[<?php echo $row->anmerkung; ?>]]></PRESTD:anmerkung>
<PRESTD:status><![CDATA[<?php echo $ps->rolle_kurzbz; ?>]]></PRESTD:status>
</RDF:Description>
</RDF:li>
<?php
rdf/lehrveranstaltung_einheiten.rdf.php
+20 -2
View File
@@ -109,7 +109,25 @@ if(!$result = pg_query($conn, $qry))
//foreach ($lvaDAO->lehrveranstaltungen as $row_lva)
while($row_lva = pg_fetch_object($result))
{
{
//Fachbereichskoordinatoren laden
$qry_fbk = "SELECT distinct tbl_mitarbeiter.kurzbz as kurzbz FROM lehre.tbl_lehreinheit, lehre.tbl_lehrfach, public.tbl_mitarbeiter, public.tbl_benutzerfunktion
WHERE tbl_lehreinheit.lehrveranstaltung_id='$row_lva->lehrveranstaltung_id' AND
tbl_lehreinheit.lehrfach_id = tbl_lehrfach.lehrfach_id AND
tbl_lehrfach.fachbereich_kurzbz = tbl_benutzerfunktion.fachbereich_kurzbz AND
tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzerfunktion.uid AND
tbl_benutzerfunktion.funktion_kurzbz='fbk' AND
tbl_benutzerfunktion.studiengang_kz='$row_lva->studiengang_kz'";
$result_fbk = pg_query($conn, $qry_fbk);
$fbk='';
while($row_fbk = pg_fetch_object($result_fbk))
{
$fbk.=$row_fbk->kurzbz.' ';
}
if($fbk!='')
$fbk='FBK: '.$fbk;
//Lehrveranstaltung
echo "
<RDF:Description id=\"".$row_lva->lehrveranstaltung_id."\" about=\"".$rdf_url.'/'.$row_lva->lehrveranstaltung_id."\" >
@@ -138,7 +156,7 @@ if(!$result = pg_query($conn, $qry))
<LVA:raumtyp></LVA:raumtyp>
<LVA:raumtypalternativ></LVA:raumtypalternativ>
<LVA:gruppen></LVA:gruppen>
<LVA:lektoren></LVA:lektoren>
<LVA:lektoren>$fbk</LVA:lektoren>
<LVA:fachbereich></LVA:fachbereich>
</RDF:Description>";
rdf/prestudent.rdf.php
+1
View File
@@ -79,6 +79,7 @@ if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
<PRESTD:reihungstestangetreten><![CDATA[<?php echo ($prestd->reihungstestangetreten?'true':'false'); ?>]]></PRESTD:reihungstestangetreten>
<PRESTD:punkte><![CDATA[<?php echo $prestd->punkte; ?>]]></PRESTD:punkte>
<PRESTD:bismelden><![CDATA[<?php echo ($prestd->bismelden?'true':'false'); ?>]]></PRESTD:bismelden>
<PRESTD:anmerkung><![CDATA[<?php echo $prestd->anmerkung; ?>]]></PRESTD:anmerkung>
</RDF:Description>
</RDF:li>
<?php