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

Beim Status des Prestudenten kann nun zusaetzlich der Studienplan gespeichert werden; Erweiterung der Studienplan ansicht für Studierende inklusive Anmeldung zu Lehrveranstaltungen

Browse Source
This commit is contained in:
Andreas Österreicher
2013-12-17 15:30:26 +00:00
parent 28107e830e
commit efff63fa6d
17 changed files with 766 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+3
View File
@@ -597,6 +597,7 @@ if(!$error)
$prestd_neu->datum = date('Y-m-d');
$prestd_neu->ausbildungssemester = $sem;
$prestd_neu->orgform_kurzbz = $prestd->orgform_kurzbz;
$prestd_neu->studienplan_id = $prestd->studienplan_id;
$prestd_neu->insertamum = date('Y-m-d H:i:s');
$prestd_neu->insertvon = $user;
$prestd_neu->new = true;
@@ -875,6 +876,7 @@ if(!$error)
$rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
$rolle->datum = $_POST['datum'];
$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
$rolle->studienplan_id = $_POST['studienplan_id'];
if($rolle->save_rolle())
$return = true;
@@ -1040,6 +1042,7 @@ if(!$error)
$rolle->studiensemester_kurzbz = $hlp->result[0]->studiensemester_kurzbz;
$rolle->ausbildungssemester = $hlp->result[0]->ausbildungssemester;
$rolle->orgform_kurzbz = $hlp->result[0]->orgform_kurzbz;
$rolle->studienplan_id = $hlp->result[0]->studienplan_id;
$rolle->datum = date('Y-m-d');
$rolle->insertamum = date('Y-m-d H:i:s');
$rolle->insertvon = $user;
content/student/studentdetailoverlay.xul.php
+10
View File
@@ -538,6 +538,14 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id" />
<splitter class="tree-splitter"/>
<treecol id="student-prestudent-tree-rolle-studienplan_id" label="StudienplanID" flex="2" hidden="true" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id" />
<splitter class="tree-splitter"/>
<treecol id="student-prestudent-tree-rolle-studienplan_bezeichnung" label="Studienplan" flex="2" hidden="true" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung" />
<splitter class="tree-splitter"/>
</treecols>
<template>
@@ -551,6 +559,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
</treerow>
</treeitem>
</treechildren>
content/student/studentoverlay.js.php
+2
View File
@@ -1614,6 +1614,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
ausbildungssemester = dialog.getElementById('student-rolle-menulist-ausbildungssemester').value;
datum = dialog.getElementById('student-rolle-datum-datum').value;
orgform_kurzbz = dialog.getElementById('student-rolle-menulist-orgform_kurzbz').value;
studienplan_id = dialog.getElementById('student-rolle-menulist-studienplan').value;
if(!CheckDatum(datum))
{
@@ -1634,6 +1635,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
req.add('ausbildungssemester', ausbildungssemester);
req.add('datum', ConvertDateToISO(datum));
req.add('orgform_kurzbz', orgform_kurzbz);
req.add('studienplan_id', studienplan_id);
var response = req.executePOST();
content/student/studentrolledialog.js.php
+4 -1
View File
@@ -56,6 +56,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
//RDF parsen
datum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#datum" ));
orgform_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#orgform_kurzbz" ));
studienplan_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_id" ));
neu = false;
}
else
@@ -72,6 +73,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
ausbildungssemester='1';
datum = '<?php echo date('d.m.Y') ?>';
orgform_kurzbz='';
studienplan_id='';
}
document.getElementById('student-rolle-textbox-prestudent_id').value=prestudent_id;
@@ -80,6 +82,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
document.getElementById('student-rolle-menulist-ausbildungssemester').value=ausbildungssemester;
document.getElementById('student-rolle-datum-datum').value=datum;
document.getElementById('student-rolle-menulist-orgform_kurzbz').value=orgform_kurzbz;
MenulistSelectItemOnValue('student-rolle-menulist-studienplan', studienplan_id);
}
// ****
@@ -92,4 +95,4 @@ function StudentRolleSpeichern()
{
if(window.opener.StudentRolleSpeichern(document, studiensemester_old, ausbildungssemester_old))
window.close();
}
}
content/student/studentrolledialog.xul.php
+22 -3
View File
@@ -29,6 +29,7 @@ header("Content-type: application/vnd.mozilla.xul+xml");
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/person.class.php');
require_once('../../include/prestudent.class.php');
require_once('../../include/studienplan.class.php');
echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
@@ -101,6 +102,7 @@ $db = new basis_db();
<menuitem value="Student" label="Student"/>
<menuitem value="Unterbrecher" label="Unterbrecher"/>
<menuitem value="Diplomand" label="Diplomand"/>
<menuitem value="Incoming" label="Incoming"/>
</menupopup>
</menulist>
</row>
@@ -124,7 +126,7 @@ $db = new basis_db();
<menupopup>
<?php
$maxsem=10;
$qry = "SELECT max(semester) as maxsem FROM public.tbl_lehrverband WHERE studiengang_kz=(SELECT studiengang_kz FROM public.tbl_prestudent WHERE prestudent_id='".addslashes($prestudent_id)."')";
$qry = "SELECT max(semester) as maxsem FROM public.tbl_lehrverband WHERE studiengang_kz=(SELECT studiengang_kz FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($prestudent_id).")";
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
@@ -171,12 +173,29 @@ $db = new basis_db();
<label value="Datum" control="student-rolle-datum-datum"/>
<box class='Datum' id="student-rolle-datum-datum" />
</row>
<row>
<label value="Studienplan" control="student-rolle-menulist-studienplan"/>
<menulist id="student-rolle-menulist-studienplan" >
<menupopup>
<menuitem value="" label="-- keine Auswahl --"/>
<?php
$studienplan = new studienplan();
$studienplan->getStudienplaene($prestudent->studiengang_kz);
foreach($studienplan->result as $row)
{
echo '<menuitem value="'.$row->studienplan_id.'" label="'.$row->bezeichnung.' ('.$row->version.' /'.$row->studienplan_id.')'.($row->aktiv?'AKTIV':'').'"/>';
}
?>
</menupopup>
</menulist>
</row>
</rows>
</grid>
<hbox>
<spacer flex="1" />
<button id="student-rolel-button-speichern" oncommand="StudentRolleSpeichern()" label="Speichern" />
<button id="student-rolle-button-speichern" oncommand="StudentRolleSpeichern()" label="Speichern" />
</hbox>
</groupbox>
</vbox>
</window>
</window>