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

Browse Source
This commit is contained in:
Andreas Österreicher
2007-04-27 11:15:36 +00:00
parent b5394bbeeb
commit 5300335b42
7 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/fasoverlay.js.php
+1 -1
View File
@@ -199,7 +199,7 @@ function onVerbandSelect(event)
// Studenten
try
{
url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe+"&"+gettimestamp();
url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe+"&stsem=true&"+gettimestamp();
var treeStudent=document.getElementById('student-tree');
//Alte DS entfernen
content/student/studentDBDML.php
+2 -2
View File
@@ -90,14 +90,14 @@ if(!$error)
$student->gebdatum = $_POST['geburtsdatum'];
$student->gebort = $_POST['geburtsort'];
$student->gebzeit = $_POST['geburtszeit'];
$student->anmerkung = $_POST['anmerkung'];
$student->anmerkungen = $_POST['anmerkung'];
$student->homepage = $_POST['homepage'];
$student->svnr = $_POST['svnr'];
$student->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
$student->familienstand = $_POST['familienstand'];
$student->geschlecht = $_POST['geschlecht'];
$student->aktiv = ($_POST['aktiv']=='true'?true:false);
$student->anzahlderkinder = $_POST['anzahlderkinder'];
$student->anzahlkinder = $_POST['anzahlderkinder'];
$student->staatsbuergerschaft = $_POST['staatsbuergerschaft'];
$student->geburtsnation = $_POST['geburtsnation'];
$student->sprache = $_POST['sprache'];
content/student/studentdetailoverlay.xul.php
+15 -15
View File
@@ -57,7 +57,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<rows>
<row>
<label value="UID" control="student-detail-textbox-uid"/>
<textbox id="student-detail-textbox-uid" disabled="true"/>
<hbox><textbox id="student-detail-textbox-uid" disabled="true" maxlength="16" size="16"/></hbox>
<spacer />
<spacer />
<label value="Aktiv" control="student-detail-checkbox-aktiv"/>
@@ -65,7 +65,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</row>
<row>
<label value="Anrede" control="student-detail-textbox-anrede"/>
<textbox id="student-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/>
<hbox><textbox id="student-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/></hbox>
<label value="TitelPre" control="student-detail-textbox-titelpre"/>
<textbox id="student-detail-textbox-titelpre" disabled="true" maxlength="64"/>
<label value="TitelPost" control="student-detail-textbox-titelpost"/>
@@ -81,17 +81,17 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</row>
<row>
<label value="Geburtsdatum" control="student-detail-textbox-geburtsdatum"/>
<textbox id="student-detail-textbox-geburtsdatum" disabled="true" maxlength="10"/>
<hbox><textbox id="student-detail-textbox-geburtsdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/></hbox>
<label value="Geburtsort" control="student-detail-textbox-geburtsort"/>
<textbox id="student-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
<label value="Geburtszeit" control="student-detail-textbox-geburtszeit"/>
<textbox id="student-detail-textbox-geburtszeit" disabled="true" maxlength="5"/>
<hbox><textbox id="student-detail-textbox-geburtszeit" disabled="true" maxlength="5" size="5" tooltiptext="Format: hh:mm Beispiel: 10:30"/></hbox>
</row>
<row>
<label value="SVNR" control="student-detail-textbox-svnr"/>
<textbox id="student-detail-textbox-svnr" disabled="true" maxlength="10"/>
<hbox><textbox id="student-detail-textbox-svnr" disabled="true" maxlength="10" size="10"/></hbox>
<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
<textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10"/>
<hbox><textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10" size="10"/></hbox>
</row>
<row>
<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
@@ -185,7 +185,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<rows>
<row>
<label value="Matrikelnummer" control="student-detail-textbox-matrikelnummer"/>
<textbox id="student-detail-textbox-matrikelnummer" disabled="true" maxlength="15"/>
<hbox><textbox id="student-detail-textbox-matrikelnummer" disabled="true" maxlength="15" size="15"/></hbox>
<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>
<menulist id="student-detail-menulist-studiengang_kz" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
@@ -201,11 +201,11 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</row>
<row>
<label value="Semester" control="student-detail-textbox-semester"/>
<textbox id="student-detail-textbox-semester" disabled="true" maxlength="1"/>
<hbox><textbox id="student-detail-textbox-semester" disabled="true" maxlength="1" size="1"/></hbox>
<label value="Verband" control="student-detail-textbox-verband"/>
<textbox id="student-detail-textbox-verband" disabled="true" maxlength="1"/>
<hbox><textbox id="student-detail-textbox-verband" disabled="true" maxlength="1" size="1"/></hbox>
<label value="Gruppe" control="student-detail-textbox-gruppe"/>
<textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1"/>
<hbox><textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1" size="1"/></hbox>
</row>
</rows>
</grid>
@@ -329,7 +329,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<label value="ZGV Ort" control="student-prestudent-textbox-zgvort"/>
<textbox id="student-prestudent-textbox-zgvort" disabled="true" maxlength="64"/>
<label value="ZGV Datum" control="student-prestudent-textbox-zgvdatum"/>
<textbox id="student-prestudent-textbox-zgvdatum" disabled="true" maxlength="10"/>
<hbox><textbox id="student-prestudent-textbox-zgvdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/></hbox>
</row>
<row>
<label value="ZGV Master" control="student-prestudent-menulist-zgvmastercode"/>
@@ -347,7 +347,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<label value="ZGV Master Ort" control="student-prestudent-textbox-zgvmasterort"/>
<textbox id="student-prestudent-textbox-zgvmasterort" disabled="true" maxlength="64"/>
<label value="ZGV Master Datum" control="student-prestudent-textbox-zgvmasterdatum"/>
<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10"/>
<hbox><textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/></hbox>
</row>
</rows>
</grid>
@@ -367,8 +367,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<row>
<label value="Anmeldung zum Reihungstest am" control="student-prestudent-textbox-anmeldungreihungstest"/>
<hbox>
<textbox id="student-prestudent-textbox-anmeldungreihungstest" disabled="true" maxlength="10"/>
<button id="student-prestudent-button-anmeldungreihungstest-heute" label="Heute" oncommand="StudentAnmeldungreihungstestHeute()" disabled="true"/>
<textbox id="student-prestudent-textbox-anmeldungreihungstest" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>
<button id="student-prestudent-button-anmeldungreihungstest-heute" label="Heute" oncommand="StudentAnmeldungreihungstestHeute()" disabled="true" style="margin:0px;"/>
</hbox>
<label value="Reihungstest" control="student-prestudent-menulist-reihungstest"/>
<menulist id="student-prestudent-menulist-reihungstest" disabled="true"
@@ -387,7 +387,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<label value="Zum Reihungstest angetreten" control="student-prestudent-checkbox-reihungstestangetreten"/>
<checkbox id="student-prestudent-checkbox-reihungstestangetreten" checked="true" disabled="true"/>
<label value="Reihungstestpunkte" control="student-prestudent-textbox-punkte"/>
<textbox id="student-prestudent-textbox-punkte" disabled="true" maxlength="19"/>
<hbox><textbox id="student-prestudent-textbox-punkte" disabled="true" maxlength="9" size="9"/></hbox>
</row>
</rows>
</grid>
content/student/studentenoverlay.xul.php
+2 -2
View File
@@ -70,8 +70,6 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentdetailoverlay.xul.p
<treecols>
<treecol id="student-treecol-uid" label="UID" flex="1" primary="false"
class="sortDirectionIndicator"
sortActive="true"
sortDirection="ascending"
sort="rdf:http://www.technikum-wien.at/student/rdf#uid" />
<splitter class="tree-splitter"/>
<treecol id="student-treecol-titelpre" label="TitelPre" flex="1" hidden="false"
@@ -87,6 +85,8 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentdetailoverlay.xul.p
sort="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
<splitter class="tree-splitter"/>
<treecol id="student-treecol-nachname" label="Nachname" flex="1" hidden="false"
sortActive="true"
sortDirection="ascending"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
<splitter class="tree-splitter"/>
content/student/studentoverlay.js.php
+2 -2
View File
@@ -433,14 +433,14 @@ function StudentAuswahl()
geburtsdatum=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geburtsdatum" ));
geburtsort=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebort" ));
geburtszeit=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebzeit" ));
anmerkung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
anmerkung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungen" ));
homepage=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#homepage" ));
svnr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#svnr" ));
ersatzkennzeichen=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ersatzkennzeichen" ));
familienstand=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#familienstand" ));
geschlecht=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geschlecht" ));
aktiv=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aktiv" ));
anzahlderkinder=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anzahlderkinder" ));
anzahlderkinder=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anzahlkinder" ));
staatsbuergerschaft=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#staatsbuergerschaft" ));
geburtsnation=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geburtsnation" ));
sprache=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#sprache" ));
include/student.class.php
+10 -2
View File
@@ -233,11 +233,15 @@ class student extends benutzer
* @return integer Anzahl der gefundenen Einträge; <b>negativ</b> bei Fehler
*/
function getStudents($stg_kz,$sem=null,$ver=null,$grp=null,$gruppe=null)
function getStudents($stg_kz,$sem=null,$ver=null,$grp=null,$gruppe=null, $stsem=null)
{
$where = '';
if ($gruppe!=null)
{
$where=" gruppe_kurzbz='".$gruppe."'";
if($stsem!=null)
$where.=" AND studiensemester_kurzbz='$stsem'";
}
else
{
if ($stg_kz>=0)
@@ -253,7 +257,9 @@ class student extends benutzer
}
$sql_query="SELECT * FROM campus.vw_student WHERE $where ORDER by nachname,vorname";
//$sql_query="SELECT * FROM campus.vw_student WHERE $where ORDER by nachname,vorname";
$sql_query = "SELECT * FROM public.tbl_person, public.tbl_student, (public.tbl_benutzer LEFT JOIN tbl_benutzergruppe USING(uid))
WHERE tbl_person.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid = tbl_student.student_uid AND $where ORDER BY nachname, vorname";
//echo $sql_query;
if(!($erg=pg_query($this->conn, $sql_query)))
{
@@ -268,6 +274,8 @@ class student extends benutzer
$l=new student($this->conn);
// Personendaten
$l->uid=$row->uid;
$l->person_id=$row->person_id;
$l->prestudent_id=$row->prestudent_id;
$l->titelpre=$row->titelpre;
$l->titelpost=$row->titelpost;
$l->vornamen=$row->vornamen;
rdf/student.rdf.php
+9 -1
View File
@@ -11,6 +11,7 @@ header("Content-type: application/vnd.mozilla.xul+xml");
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
// DAO
require_once('../vilesci/config.inc.php');
require_once('../include/functions.inc.php');
require_once('../include/person.class.php');
require_once('../include/benutzer.class.php');
require_once('../include/student.class.php');
@@ -33,6 +34,8 @@ function convdate($date)
list($d,$m,$y) = explode('.',$date);
return $y.'-'.$m.'-'.$d;
}
$user = get_uid();
loadVariables($conn, $user);
$gruppe=(isset($_GET['gruppe'])?$_GET['gruppe']:null);
$grp=(isset($_GET['grp'])?$_GET['grp']:null);
@@ -42,12 +45,17 @@ $stg_kz=(isset($_GET['stg_kz'])?$_GET['stg_kz']:null);
if(isset($_GET['uid']))
$uid=$_GET['uid'];
if(isset($_GET['stsem']) && $_GET['stsem']=='true')
$stsem = $semester_aktuell;
else
$stsem=null;
// Studenten holen
$student=new student($conn,null,true);
if (isset($uid))
$student->load($uid);
else
$studenten=$student->getStudents($stg_kz,$sem,$ver,$grp,$gruppe);
$studenten=$student->getStudents($stg_kz,$sem,$ver,$grp,$gruppe, $stsem);
$rdf_url='http://www.technikum-wien.at/student';