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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2015-04-17 12:27:25 +02:00
parent 8d7a1134a1 b2d2cd109f
commit d86e1ec4d3
15 changed files with 1948 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/fasDBDML.php
+10 -2
View File
@@ -582,8 +582,16 @@ if(!$error)
}
else
{
$return = false;
$errormsg = 'Fehler: '.$variable->errormsg;
if($variable->errormsg=='')
{
$return = true;
$data = '';
}
else
{
$return = false;
$errormsg = 'Fehler: '.$variable->errormsg;
}
}
}
else
content/lvplanung/lehrveranstaltungDBDML.php
+5 -5
View File
@@ -140,28 +140,28 @@ function getStundenproInstitut($mitarbeiter_uid, $studiensemester_kurzbz)
{
global $db;
$ret="Der Lektor ist in folgenden Instituten zugeteilt:\n";
$ret="Der Lektor ist in folgenden Organisationseinheiten zugeteilt:\n";
//Liste mit den Stunden in den jeweiligen Instituten anzeigen
$qry = "SELECT sum(tbl_lehreinheitmitarbeiter.semesterstunden) as summe, tbl_fachbereich.bezeichnung
$qry = "SELECT sum(tbl_lehreinheitmitarbeiter.semesterstunden) as summe, tbl_organisationseinheit.bezeichnung
FROM
lehre.tbl_lehreinheitmitarbeiter
JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(lehrfach_id=lehrfach.lehrveranstaltung_id)
JOIN public.tbl_fachbereich USING(oe_kurzbz)
JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
WHERE
mitarbeiter_uid=".$db->db_add_param($mitarbeiter_uid)." AND
studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
faktor>0 AND
stundensatz>0 AND
bismelden
GROUP BY tbl_fachbereich.bezeichnung";
GROUP BY tbl_organisationseinheit.bezeichnung";
if($result = $db->db_query($qry))
{
while($row = $db->db_fetch_object($result))
{
$ret .=$row->summe.' Stunden im Institut '.$row->bezeichnung."\n";
$ret .=$row->summe.' Stunden '.$row->bezeichnung."\n";
}
}
return $ret;
content/student/studentDBDML.php
+36 -26
View File
@@ -944,33 +944,43 @@ if(!$error)
$rolle->new = false;
}
$student = new student();
$temp_uid = $student->getUid($rolle->prestudent_id);
$student->load($temp_uid);
//$studiensemester = new studiensemester();
$stdsem_new = filter_input(INPUT_POST, "studiensemester_kurzbz");
$semester = filter_input(INPUT_POST, "ausbildungssemester");
if(!$error)
{
$prestudent_temp = new prestudent();
$prestudent_temp->getLastStatus($rolle->prestudent_id, "", "Student");
$student->load_studentlehrverband($temp_uid, $prestudent_temp->studiensemester_kurzbz);
$lehrverband = new lehrverband();
if(!$lehrverband->exists($student->studiengang_kz, $semester, $student->verband, $student->gruppe))
{
$student->studiensemester_kurzbz = $stdsem_new;
$return = false;
$errormsg = $student->errormsg;
}
else
{
$student->studiensemester_kurzbz = $stdsem_new;
$student->semester = $semester;
$student->updatevon = get_uid();
}
$student->save_studentlehrverband(true);
// Bei Studenten wird der Studentlehrverband Eintrag angelegt/korrigiert
$student = new student();
if($temp_uid = $student->getUid($rolle->prestudent_id))
{
if($student->load($temp_uid))
{
$stdsem_new = filter_input(INPUT_POST, "studiensemester_kurzbz");
$semester = filter_input(INPUT_POST, "ausbildungssemester");
$prestudent_temp = new prestudent();
$prestudent_temp->getLastStatus($rolle->prestudent_id, "", "Student");
if($student->load_studentlehrverband($temp_uid, $prestudent_temp->studiensemester_kurzbz))
$student->new=false;
else
$student->new=true;
$lehrverband = new lehrverband();
if(!$lehrverband->exists($student->studiengang_kz, $semester, $student->verband, $student->gruppe))
{
$student->studiensemester_kurzbz = $stdsem_new;
$return = false;
$errormsg = $student->errormsg;
}
else
{
$student->studiensemester_kurzbz = $stdsem_new;
$student->semester = $semester;
$student->updatevon = $user;
}
$student->save_studentlehrverband();
}
}
$rolle->ausbildungssemester = $_POST['ausbildungssemester'];
$rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
$rolle->datum = $_POST['datum'];
@@ -3653,4 +3663,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
</RDF:li>
</RDF:Seq>
</RDF:RDF>';
?>
?>
content/student/studentdetailoverlay.xul.php
+2 -2
View File
@@ -300,7 +300,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<box class='Datum' id="student-prestudent-textbox-zgvdatum" disabled="true"/>
<!--<textbox id="student-prestudent-textbox-zgvdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
</hbox>
<label value="Land" control="student-prestudent-menulist-zgvnation"/>
<label value="ZGV Nation" control="student-prestudent-menulist-zgvnation"/>
<hbox>
<menulist id="student-prestudent-menulist-zgvnation" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
@@ -335,7 +335,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<box class='Datum' id="student-prestudent-textbox-zgvmasterdatum" disabled="true"/>
<!--<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
</hbox>
<label value="Land" control="student-prestudent-menulist-zgvmasternation"/>
<label value="ZGV Master Nation" control="student-prestudent-menulist-zgvmasternation"/>
<hbox>
<menulist id="student-prestudent-menulist-zgvmasternation" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
content/tempus.js.php
+12 -12
View File
@@ -90,10 +90,18 @@ function onLoad()
//wenn zb ein IFrame geladen wird
onLoad=function() {return false};
if(document.getElementById('statusbarpanel-ignore_kollision'))
{
// Anzeige von DBTable und Ignorekoll. aktualisieren
window.setTimeout(updateignorekollision,20);
window.setTimeout(updatedbstpltable,20);
}
//Notizen des Users laden
notiz = document.getElementById('box-notizen');
notiz.LoadNotizTree('','','','','','','', getUsername(),'');
if(notiz)
notiz.LoadNotizTree('','','','','','','', getUsername(),'');
}
catch(e)
{
@@ -294,7 +302,7 @@ function updateignorekollision()
if(getvariable('ignore_kollision')=='true')
{
panel.label='Kollisionscheck AUS';
panel.style.backgroundColor='red';
panel.style.backgroundColor='#FF0000';
panel.style.MozAppearance = "none"
document.getElementById('menu-prefs-ignore_kollision').setAttribute('checked','true');
}
@@ -322,7 +330,7 @@ function updatedbstpltable()
}
else
{
panel.style.backgroundColor='transparent';
panel.style.backgroundColor='';
panel.style.MozAppearance = "none"
}
}
@@ -463,14 +471,6 @@ function UnDo(log_id, bezeichnung)
}
}
// ****
// * Oeffnet die ToDoListe fuers Tempus
// ****
function HelpOpenToDo()
{
window.open('ToDo_Tempus.html','ToDo');
}
// ****
// * Zeigt das Fenster zur Kollisionspruefung auf Studentenebene an
// ****
content/tempus.xul.php
+1 -8
View File
@@ -79,7 +79,6 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
<command id="menu-extras-rescheck:command" oncommand="ResCheckShow();"/>
<command id="menu-extras-synclvplan:command" oncommand="SyncLVPlan();"/>
<command id="menu-help-about:command" oncommand="OpenAboutDialog()"/>
<command id="menu-help-todo:command" oncommand="HelpOpenToDo();"/>
<command id="menu-help-manual:command" oncommand="OpenManualTempus();"/>
</commandset>
@@ -264,12 +263,6 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
label = "&menu-help-manual.label;"
command = "menu-help-manual:command"
accesskey = "&menu-help-manual.accesskey;"/>
<menuitem
id = "menu-help-todo"
key = "&menu-help-todo.key;"
label = "&menu-help-todo.label;"
command = "menu-help-todo:command"
accesskey = "&menu-help-todo.accesskey;"/>
</menupopup>
</menu>
</menubar>
@@ -316,7 +309,7 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
?>
<statusbarpanel id="statusbarpanel-db_table" label="<?php echo $db_stpl_table; ?>"/>
<statusbarpanel>
<toolbarbutton id="statusbarpanel-ignore_kollision" label="Kollisionscheck <?php echo ($ignore_kollision=='true'?'AUS':'AN'); ?>" <?php echo ($ignore_kollision=='true'?'style="background-color: RED;"':'');?> oncommand="updateignorekollision()"/>
<toolbarbutton id="statusbarpanel-ignore_kollision" label="Kollisionscheck <?php echo ($ignore_kollision=='true'?'AUS':'AN'); ?>" <?php echo ($ignore_kollision=='true'?'style="background-color: red;"':'');?> oncommand="updateignorekollision()"/>
</statusbarpanel>
<statusbarpanel id="statusbarpanel-text" label="<?php echo htmlspecialchars($error_msg); ?>" flex="4" crop="right" />
<statusbarpanel id="progress-panel" class="statusbarpanel-progress">