mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 12:19:28 +00:00
Punkteeingabe im CIS und Anzeige im FAS
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
<?php
|
||||
/* Copyright (C) 2014 fhcomplete.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
|
||||
*/
|
||||
/**
|
||||
*
|
||||
*/
|
||||
require_once('../../../../config/cis.config.inc.php');
|
||||
require_once('../../../../include/functions.inc.php');
|
||||
require_once('../../../../include/notenschluessel.class.php');
|
||||
|
||||
$uid = get_uid();
|
||||
|
||||
if(!check_lektor($uid))
|
||||
die('Sie haben keine Berechtigung fuer diese Seite');
|
||||
|
||||
if(!isset($_POST['work']))
|
||||
die('Fehlerhafte Parameteruebergabe');
|
||||
|
||||
$lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
|
||||
$punkte = $_POST['punkte'];
|
||||
$studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
|
||||
$work = $_POST['work'];
|
||||
|
||||
switch($work)
|
||||
{
|
||||
case 'getGradeFromPoints':
|
||||
$notenschluessel = new notenschluessel();
|
||||
$note = $notenschluessel->getNote($punkte, $lehrveranstaltung_id, $studiensemester_kurzbz);
|
||||
echo $note;
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
@@ -108,7 +108,7 @@ if(!$rechte->isBerechtigt('admin',0) &&
|
||||
}
|
||||
}
|
||||
|
||||
function savenote($db,$lvid, $student_uid, $note)
|
||||
function savenote($db,$lvid, $student_uid, $note, $punkte=null)
|
||||
{
|
||||
global $stsem, $user, $p;
|
||||
$jetzt = date("Y-m-d H:i:s");
|
||||
@@ -138,12 +138,14 @@ function savenote($db,$lvid, $student_uid, $note)
|
||||
$lvgesamtnote->updatevon = null;
|
||||
$lvgesamtnote->insertamum = $jetzt;
|
||||
$lvgesamtnote->insertvon = $user;
|
||||
$lvgesamtnote->punkte = $punkte;
|
||||
$new = true;
|
||||
$response = "neu";
|
||||
}
|
||||
else
|
||||
{
|
||||
$lvgesamtnote->note = trim($note);
|
||||
$lvgesamtnote->punkte = $punkte;
|
||||
$lvgesamtnote->benotungsdatum = $jetzt;
|
||||
$lvgesamtnote->updateamum = $jetzt;
|
||||
$lvgesamtnote->updatevon = $user;
|
||||
@@ -167,9 +169,10 @@ if (isset($_REQUEST["submit"]))
|
||||
{
|
||||
$student_uid = $_REQUEST["student_uid"];
|
||||
$note = $_REQUEST["note"];
|
||||
$punkte = $_REQUEST["punkte"];
|
||||
|
||||
//if((($note>0) && ($note < 6)) || ($note == 7) || ($note==16) || ($note==10) || ($note==14))
|
||||
$response = savenote($db,$lvid, $student_uid, $note);
|
||||
$response = savenote($db,$lvid, $student_uid, $note, $punkte);
|
||||
/*else
|
||||
$response = $p->t('benotungstool/noteEingeben')."!";
|
||||
*/
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
|
||||
*/
|
||||
require_once('../../../../config/cis.config.inc.php');
|
||||
require_once('../../../../config/global.config.inc.php');
|
||||
require_once('../../../../include/functions.inc.php');
|
||||
require_once('../../../../include/lehrveranstaltung.class.php');
|
||||
require_once('../../../../include/studiengang.class.php');
|
||||
@@ -98,35 +99,50 @@ $uid = (isset($_GET['uid'])?$_GET['uid']:'');
|
||||
$noten_obj = new note();
|
||||
$noten_obj->getAll();
|
||||
|
||||
?><!DOCTYPE HTML>
|
||||
echo '<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
|
||||
<title>Gesamtnote</title>
|
||||
<STYLE TYPE="text/css">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
|
||||
<title>Gesamtnote</title>
|
||||
<link href="../../../../skin/jquery.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../../skin/jquery-ui-1.9.2.custom.min.css" rel="stylesheet" type="text/css">
|
||||
<script src="../../../../include/js/jquery1.9.min.js" type="text/javascript"></script>
|
||||
|
||||
.td_datum
|
||||
{
|
||||
width:70px;
|
||||
text-align: left;
|
||||
}
|
||||
.td_note{
|
||||
width:50px;
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
</STYLE>
|
||||
<script language="JavaScript" type="text/javascript">
|
||||
<!--
|
||||
<?php
|
||||
echo "var noten_array=Array();\n";
|
||||
$noten_array=array();
|
||||
foreach($noten_obj->result as $row)
|
||||
<style type="text/css">
|
||||
.td_datum
|
||||
{
|
||||
echo "noten_array['".$row->note."']='".$row->bezeichnung."';\n";
|
||||
$noten_array[$row->note]=$row->bezeichnung;
|
||||
width:70px;
|
||||
text-align: left;
|
||||
}
|
||||
.td_note{
|
||||
width:50px;
|
||||
text-align:center;
|
||||
}
|
||||
.gradetable
|
||||
{
|
||||
background:#DCE4EF;
|
||||
border: 1px solid #FFF;
|
||||
font-size: 8pt;
|
||||
padding: 4px;
|
||||
}
|
||||
|
||||
</style>
|
||||
<script language="JavaScript" type="text/javascript">
|
||||
|
||||
var noten_array=Array();
|
||||
';
|
||||
|
||||
$noten_array=array();
|
||||
foreach($noten_obj->result as $row)
|
||||
{
|
||||
echo " noten_array['".$row->note."']='".addslashes($row->bezeichnung)."';\n";
|
||||
$noten_array[$row->note]['bezeichnung']=$row->bezeichnung;
|
||||
$noten_array[$row->note]['positiv']=$row->positiv;
|
||||
$noten_array[$row->note]['aktiv']=$row->aktiv;
|
||||
$noten_array[$row->note]['lehre']=$row->lehre;
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
function MM_jumpMenu(targ, selObj, restore)
|
||||
@@ -206,42 +222,31 @@ $noten_obj->getAll();
|
||||
{
|
||||
note = document.getElementById(uid).note.value;
|
||||
note_label = document.getElementById(uid).note.label;
|
||||
|
||||
note_orig = document.getElementById(uid).note_orig.value;
|
||||
//wenn die Note gleich bleibt dann abbrechen
|
||||
if (note == note_orig && note != "")
|
||||
{
|
||||
alert('<?php echo $p->t('gesamtnote/noteUnveraendert');?>');
|
||||
return true;
|
||||
}
|
||||
if(document.getElementById(uid).punkte)
|
||||
punkte = document.getElementById(uid).punkte.value;
|
||||
else
|
||||
{
|
||||
//Request erzeugen und die Note speichern
|
||||
erzeugeAnfrage();
|
||||
stud_uid = uid;
|
||||
var jetzt = new Date();
|
||||
var ts = jetzt.getTime();
|
||||
var url= '<?php echo "lvgesamtnoteeintragen.php?lvid=".addslashes($lvid)."&stsem=".addslashes($stsem); ?>';
|
||||
url += '&submit=1&student_uid='+uid+"¬e="+note+"&"+ts;
|
||||
anfrage.open("GET", url, true);
|
||||
anfrage.onreadystatechange = updateSeite;
|
||||
anfrage.send(null);
|
||||
document.getElementById(uid).note_orig.value=noten_array[note];
|
||||
}
|
||||
}
|
||||
punkte='';
|
||||
|
||||
// *****************************************************
|
||||
// * Update der Seite nachdem die Note gespeichert wurde
|
||||
// *****************************************************
|
||||
function updateSeite()
|
||||
{
|
||||
if (anfrage.readyState == 4)
|
||||
{
|
||||
if (anfrage.status == 200)
|
||||
{
|
||||
uid = stud_uid;
|
||||
note_orig = document.getElementById(uid).note_orig.value;
|
||||
|
||||
//Request erzeugen und die Note speichern
|
||||
stud_uid = uid;
|
||||
|
||||
var jetzt = new Date();
|
||||
var ts = jetzt.getTime();
|
||||
|
||||
var url= '<?php echo "lvgesamtnoteeintragen.php?lvid=".urlencode($lvid)."&stsem=".urlencode($stsem); ?>';
|
||||
url += '&submit=1&student_uid='+encodeURIComponent(uid)+"¬e="+encodeURIComponent(note)+"&punkte="+encodeURIComponent(punkte)+"&"+ts;
|
||||
|
||||
$.ajax({
|
||||
type:"GET",
|
||||
url: url,
|
||||
success:function(result)
|
||||
{
|
||||
document.getElementById(uid).note_orig.value=noten_array[note];
|
||||
uid = stud_uid;
|
||||
var note = document.getElementById(uid).note.value;
|
||||
var resp = anfrage.responseText;
|
||||
var resp = result;
|
||||
if (resp == "neu" || resp == "update" || resp == "update_f")
|
||||
{
|
||||
|
||||
@@ -250,7 +255,11 @@ $noten_obj->getAll();
|
||||
{
|
||||
notentd.removeChild(notentd.lastChild);
|
||||
}
|
||||
notenode = document.createTextNode(noten_array[note]);
|
||||
if(punkte!='')
|
||||
notentext = noten_array[note]+'('+punkte+')';
|
||||
else
|
||||
notentext = noten_array[note];
|
||||
notenode = document.createTextNode(notentext);
|
||||
notentd.appendChild(notenode);
|
||||
notenstatus = document.getElementById("status_"+uid);
|
||||
if (resp == "update_f")
|
||||
@@ -261,11 +270,14 @@ $noten_obj->getAll();
|
||||
alert(resp);
|
||||
document.getElementById(uid).note.value="";
|
||||
}
|
||||
}
|
||||
else alert("Request status:" + anfrage.status);
|
||||
}
|
||||
},
|
||||
error:function(result)
|
||||
{
|
||||
alert('Speichern der Note fehlgeschlagen');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// *************************************************
|
||||
// * Formular zum Eintragen einer Pruefung erstellen
|
||||
// *************************************************
|
||||
@@ -317,68 +329,55 @@ $noten_obj->getAll();
|
||||
var uid = document.nachpruefung_form.uid.value;
|
||||
var lehreinheit_id = document.nachpruefung_form.le_id.value;
|
||||
|
||||
erzeugeAnfrage();
|
||||
var jetzt = new Date();
|
||||
var ts = jetzt.getTime();
|
||||
var url= '<?php echo "nachpruefungeintragen.php?lvid=$lvid&stsem=$stsem"; ?>';
|
||||
//&lehreinheit_id=$lehreinheit_id
|
||||
url += '&submit=1&student_uid='+uid+'¬e='+note+'&datum='+datum+'&lehreinheit_id_pr='+lehreinheit_id+'&'+ts;
|
||||
//alert(url);
|
||||
anfrage.open("GET", url, true);
|
||||
anfrage.onreadystatechange = updateSeitePruefung;
|
||||
anfrage.send(null);
|
||||
}
|
||||
}
|
||||
|
||||
// ***********************************************************
|
||||
// * Nach dem Eintragen einer Pruefung die Seite aktualisieren
|
||||
// ***********************************************************
|
||||
function updateSeitePruefung()
|
||||
{
|
||||
if (anfrage.readyState == 4)
|
||||
{
|
||||
if (anfrage.status == 200)
|
||||
{
|
||||
var anlegendiv = document.getElementById("nachpruefung_div");
|
||||
var datum = document.nachpruefung_form.datum.value;
|
||||
var note = document.nachpruefung_form.note.value;
|
||||
var uid = document.nachpruefung_form.uid.value;
|
||||
var lehreinheit_id = document.nachpruefung_form.le_id.value;
|
||||
//var note = document.getElementById(uid).note.value;
|
||||
var resp = anfrage.responseText;
|
||||
|
||||
$.ajax({
|
||||
type:"GET",
|
||||
url: url,
|
||||
success:function(result)
|
||||
{
|
||||
var anlegendiv = document.getElementById("nachpruefung_div");
|
||||
var datum = document.nachpruefung_form.datum.value;
|
||||
var note = document.nachpruefung_form.note.value;
|
||||
var uid = document.nachpruefung_form.uid.value;
|
||||
var lehreinheit_id = document.nachpruefung_form.le_id.value;
|
||||
//var note = document.getElementById(uid).note.value;
|
||||
var resp = result;
|
||||
|
||||
if (resp == "neu" || resp == "update" || resp == "update_f" || resp == "update_pr")
|
||||
{
|
||||
|
||||
if (resp != "update_pr")
|
||||
{
|
||||
notentd = document.getElementById("note_"+uid);
|
||||
while (notentd.childNodes.length>0)
|
||||
if (resp == "neu" || resp == "update" || resp == "update_f" || resp == "update_pr")
|
||||
{
|
||||
|
||||
if (resp != "update_pr")
|
||||
{
|
||||
notentd.removeChild(notentd.lastChild);
|
||||
}
|
||||
notenode = document.createTextNode(note);
|
||||
notentd.appendChild(notenode);
|
||||
}
|
||||
notenstatus = document.getElementById("status_"+uid);
|
||||
if (resp == "update_f")
|
||||
notenstatus.innerHTML = "<img src='../../../../skin/images/changed.png'>";
|
||||
document.getElementById("lvnoteneingabe_"+uid).style.visibility = "hidden";
|
||||
|
||||
anlegendiv.innerHTML = "";
|
||||
anlegendiv.style.visibility = "hidden";
|
||||
//if (note == 9)
|
||||
// note = " ";
|
||||
document.getElementById("span_"+uid).innerHTML = "<table><tr><td class='td_datum'>"+datum+"</td><td class='td_note'>"+note+"<td><input type='button' name='anlegen' value='Ändern' onclick='pruefungAnlegen(\""+uid+"\",\""+datum+"\",\""+note+"\",\""+lehreinheit_id+"\")'></td></tr></table>";
|
||||
}
|
||||
else
|
||||
{
|
||||
alert(resp);
|
||||
document.getElementById(uid).note.value="";
|
||||
}
|
||||
}
|
||||
else
|
||||
alert("Request status:" + anfrage.status);
|
||||
notentd = document.getElementById("note_"+uid);
|
||||
while (notentd.childNodes.length>0)
|
||||
{
|
||||
notentd.removeChild(notentd.lastChild);
|
||||
}
|
||||
notenode = document.createTextNode(note);
|
||||
notentd.appendChild(notenode);
|
||||
}
|
||||
notenstatus = document.getElementById("status_"+uid);
|
||||
if (resp == "update_f")
|
||||
notenstatus.innerHTML = "<img src='../../../../skin/images/changed.png'>";
|
||||
document.getElementById("lvnoteneingabe_"+uid).style.visibility = "hidden";
|
||||
|
||||
anlegendiv.innerHTML = "";
|
||||
anlegendiv.style.visibility = "hidden";
|
||||
//if (note == 9)
|
||||
// note = " ";
|
||||
document.getElementById("span_"+uid).innerHTML = "<table><tr><td class='td_datum'>"+datum+"</td><td class='td_note'>"+note+"<td><input type='button' name='anlegen' value='Ändern' onclick='pruefungAnlegen(\""+uid+"\",\""+datum+"\",\""+note+"\",\""+lehreinheit_id+"\")'></td></tr></table>";
|
||||
}
|
||||
},
|
||||
error:function(result)
|
||||
{
|
||||
alert('Request fehlgeschlagen');
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -399,6 +398,46 @@ $noten_obj->getAll();
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Wird bei der Punkteeingabe aufgerufen und laedt
|
||||
* die dazupassende Noten anhand des Notenschluessels
|
||||
*/
|
||||
function PunkteEingabe(idx)
|
||||
{
|
||||
var punkte = $('#textbox-punkte-'+idx).val();
|
||||
|
||||
// Request absetzen und Note zu den Punkten holen
|
||||
if(punkte!='')
|
||||
{
|
||||
$.ajax({
|
||||
type:"POST",
|
||||
url:"lvgesamtnote_worker.php",
|
||||
data: { lehrveranstaltung_id: '<?php echo $lvid; ?>',
|
||||
punkte: punkte,
|
||||
work: 'getGradeFromPoints',
|
||||
studiensemester_kurzbz: '<?php echo $stsem;?>'
|
||||
},
|
||||
success:function(result)
|
||||
{
|
||||
note=result;
|
||||
|
||||
var notendropdown = $('#dropdown-note-'+idx);
|
||||
notendropdown.val(note);
|
||||
notendropdown.prop('disabled',true);
|
||||
},
|
||||
error:function(result)
|
||||
{
|
||||
alert('Noten ermittlung fehlgeschlagen');
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
var notendropdown = $('#dropdown-note-'+idx);
|
||||
notendropdown.prop('disabled',false);
|
||||
}
|
||||
}
|
||||
|
||||
// ****
|
||||
// * Liefert die Daten aus der Zwischenablage fuer IE und Firefox
|
||||
// * Opera und Safari unterstuetzen dies nicht
|
||||
@@ -479,16 +518,31 @@ $noten_obj->getAll();
|
||||
|
||||
if(i>0)
|
||||
{
|
||||
erzeugeAnfrage();
|
||||
|
||||
var jetzt = new Date();
|
||||
var ts = jetzt.getTime();
|
||||
var url= '<?php echo "lvgesamtnoteeintragen.php?lvid=".addslashes($lvid)."&stsem=".addslashes($stsem); ?>';
|
||||
url += '&submit=1&'+ts;
|
||||
anfrage.open("POST", url, true);
|
||||
anfrage.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
|
||||
anfrage.setRequestHeader("Connection", "close");
|
||||
anfrage.onreadystatechange = updateSeiteMatrikelnr;
|
||||
anfrage.send('test='+params);
|
||||
|
||||
$.ajax({
|
||||
type:"POST",
|
||||
url: url,
|
||||
data: { test: params },
|
||||
success:function(result)
|
||||
{
|
||||
var resp = anfrage.responseText;
|
||||
if (resp!='')
|
||||
{
|
||||
alert(resp);
|
||||
}
|
||||
window.location.href=window.location.href;
|
||||
},
|
||||
error:function(result)
|
||||
{
|
||||
alert('Request fehlgeschlagen');
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -496,29 +550,6 @@ $noten_obj->getAll();
|
||||
}
|
||||
}
|
||||
|
||||
// **************************************************************
|
||||
// * Seite neu laden nachdem der Request gesendet wurde und ggf
|
||||
// * Errormsg ausgeben
|
||||
// **************************************************************
|
||||
function updateSeiteMatrikelnr()
|
||||
{
|
||||
if (anfrage.readyState == 4)
|
||||
{
|
||||
if (anfrage.status == 200)
|
||||
{
|
||||
var resp = anfrage.responseText;
|
||||
if (resp!='')
|
||||
{
|
||||
alert(resp);
|
||||
}
|
||||
//QuickNDirty
|
||||
//ToDo: Aktualisierung der geaenderten Felder per JS anstatt reload
|
||||
//window.location.reload();
|
||||
window.location.href=window.location.href;
|
||||
}
|
||||
else alert("Request status:" + anfrage.status);
|
||||
}
|
||||
}
|
||||
//-->
|
||||
</script>
|
||||
<style type="text/css">
|
||||
@@ -767,30 +798,29 @@ if ($pr_komm->getPruefungenLV($lvid,"kommPruef",$stsem))
|
||||
$summe_komm=count($studpruef_komm);
|
||||
|
||||
//Studentenliste
|
||||
echo '<table>';
|
||||
echo "<tr>
|
||||
<td colspan='11'> </td>
|
||||
</tr>
|
||||
|
||||
echo '<table class="gradetable">';
|
||||
echo "
|
||||
<tr>
|
||||
<td class='ContentHeader2'></td>
|
||||
<td class='ContentHeader2'>".$p->t('global/uid')."</td>
|
||||
<td class='ContentHeader2'>".$p->t('global/nachname')."</td>
|
||||
<td class='ContentHeader2'>".$p->t('global/vorname')."</td>
|
||||
<td class='ContentHeader2'>".($grade_from_moodle?''.$p->t('benotungstool/moodleNote').'':''.$p->t('benotungstool/leNoten').' (LE-ID)')."</td>
|
||||
<td class='ContentHeader2'></td>
|
||||
<td class='ContentHeader2'>".$p->t('benotungstool/lvNote')."<br><input type='button' onclick='readNotenAusZwischenablage()' value='".$p->t('benotungstool/importieren')."'></td>
|
||||
<td class='ContentHeader2' align='right'>
|
||||
<th></th>
|
||||
<th>".$p->t('global/uid')."</th>
|
||||
<th>".$p->t('global/nachname')."</th>
|
||||
<th>".$p->t('global/vorname')."</th>
|
||||
<th>".($grade_from_moodle?''.$p->t('benotungstool/moodleNote').'':''.$p->t('benotungstool/leNoten').' (LE-ID)')."</th>
|
||||
<th>".$p->t('benotungstool/punkte').' / '.$p->t('benotungstool/note')."</th>
|
||||
<th rowspan=2>".$p->t('benotungstool/lvNote')."<br><input type='button' onclick='readNotenAusZwischenablage()' value='".$p->t('benotungstool/importieren')."'></th>
|
||||
<th align='right' rowspan=2>
|
||||
<form name='freigabeform' action='".$_SERVER['PHP_SELF']."?lvid=$lvid&lehreinheit_id=$lehreinheit_id&stsem=$stsem' method='POST' onsubmit='return OnFreigabeSubmit()'><input type='hidden' name='freigabe' value='1'>
|
||||
".$p->t('global/passwort').": <input type='password' size='8' id='textbox-freigabe-passwort' name='passwort'><br><input type='submit' name='frei' value='Freigabe'>
|
||||
<span style='white-space:nowrap;'>".$p->t('global/passwort').": <input type='password' size='8' id='textbox-freigabe-passwort' name='passwort'></span><br><input type='submit' name='frei' value='Freigabe'>
|
||||
</form>
|
||||
</td>
|
||||
<td class='ContentHeader2'>".$p->t('benotungstool/zeugnisnote')."</td>
|
||||
<td class='ContentHeader2' colspan='2'>".$p->t('benotungstool/nachpruefung')."</td>
|
||||
<td class='ContentHeader2' colspan='2'>".$p->t('benotungstool/kommissionellePruefung')."</td>
|
||||
</th>
|
||||
<th>".$p->t('benotungstool/zeugnisnote')."</th>
|
||||
<th colspan='2'>".$p->t('benotungstool/nachpruefung')."</th>
|
||||
<th colspan='2'>".$p->t('benotungstool/kommissionellePruefung')."</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan='9'> </td>
|
||||
<td colspan='2'>
|
||||
<th colspan='9'> </th>
|
||||
<th colspan='2'>
|
||||
<table>
|
||||
<tr>
|
||||
<td class='td_datum'>".$p->t('global/datum')."</td>
|
||||
@@ -798,8 +828,8 @@ echo '<table>';
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
<td colspan='2'>
|
||||
</th>
|
||||
<th colspan='2'>
|
||||
<table>
|
||||
<tr>
|
||||
<td class='td_datum'>".$p->t('global/datum')."</td>
|
||||
@@ -807,11 +837,9 @@ echo '<table>';
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan='11'> </td>
|
||||
</tr>";
|
||||
";
|
||||
|
||||
|
||||
if($grade_from_moodle)
|
||||
@@ -1016,12 +1044,16 @@ echo '<table>';
|
||||
if ($lvgesamtnote = new lvgesamtnote($lvid,$row_stud->uid,$stsem))
|
||||
{
|
||||
$note_lv = $lvgesamtnote->note;
|
||||
$punkte_lv = $lvgesamtnote->punkte;
|
||||
}
|
||||
else
|
||||
{
|
||||
$note_lv = null;
|
||||
$punkte_lv = null;
|
||||
}
|
||||
|
||||
if (!is_null($note_lv))
|
||||
$note_vorschlag = $note_lv;
|
||||
$note_vorschlag = $note_lv;
|
||||
else if ($le_anz > 0)
|
||||
$note_vorschlag = round($note_le/$le_anz);
|
||||
else
|
||||
@@ -1044,7 +1076,11 @@ echo '<table>';
|
||||
<span id='lvnoteneingabe_".$row_stud->uid."' ".$hide.">
|
||||
<input type='hidden' name='student_uid' value='$row_stud->uid'>";
|
||||
|
||||
echo '<select name="note">';
|
||||
if(CIS_GESAMTNOTE_PUNKTE)
|
||||
echo '<input type="text" name="punkte" id="textbox-punkte-'.$i.'" value="'.$punkte_lv.'" size="3" oninput="PunkteEingabe('.$i.')"/>';
|
||||
|
||||
// Noten DropDown
|
||||
echo '<select name="note" id="dropdown-note-'.$i.'">';
|
||||
echo '<option value="">-- keine Auswahl --</option>';
|
||||
foreach($noten_obj->result as $row_note)
|
||||
{
|
||||
@@ -1053,9 +1089,8 @@ echo '<table>';
|
||||
else
|
||||
$selected='';
|
||||
|
||||
echo '<option value="'.$row_note->note.'" '.$selected.'>'.$row_note->bezeichnung.'</option>';
|
||||
|
||||
//<input type='text' size='1' value='$note_vorschlag' name='note'>
|
||||
if($row_note->lehre && $row_note->aktiv)
|
||||
echo '<option value="'.$row_note->note.'" '.$selected.'>'.$row_note->bezeichnung.'</option>';
|
||||
}
|
||||
echo '</select>';
|
||||
echo "
|
||||
@@ -1064,15 +1099,20 @@ echo '<table>';
|
||||
</span>
|
||||
</form></td>";
|
||||
|
||||
|
||||
if ($note_lv == 5)
|
||||
if(isset($noten_array[$note_lv]) && $noten_array[$note_lv]['positiv']==false)
|
||||
$negmarkier = " style='color:red; font-weight:bold;'";
|
||||
else
|
||||
$negmarkier = "";
|
||||
|
||||
echo "<td align='center' id='note_$row_stud->uid'><span ".$negmarkier.">".(isset($noten_array[$note_lv])?$noten_array[$note_lv]:'')."</span></td>";
|
||||
// LV Note
|
||||
echo '<td align="center" id="note_'.$row_stud->uid.'"><span '.$negmarkier.'>';
|
||||
if(isset($noten_array[$note_lv]))
|
||||
echo $noten_array[$note_lv]['bezeichnung'];
|
||||
if($punkte_lv!='')
|
||||
echo ' ('.number_format($punkte_lv,2).')';
|
||||
echo '</span></td>';
|
||||
|
||||
//status //////////////////////////////////////////////////////////////////////////////////
|
||||
//status
|
||||
echo "<td align='center' id='status_$row_stud->uid'>";
|
||||
if (!$lvgesamtnote->freigabedatum)
|
||||
echo "<img src='../../../../skin/images/offen.png'>";
|
||||
@@ -1082,16 +1122,16 @@ echo '<table>';
|
||||
echo "<img src='../../../../skin/images/ok.png'>";
|
||||
|
||||
echo "</td>";
|
||||
if (($znote) and ($note_lv != $znote))
|
||||
if (($znote) && ($note_lv != $znote))
|
||||
$stylestr = " style='color:red; border-color:red; border-style:solid; border-width:1px;'";
|
||||
else
|
||||
$stylestr ="";
|
||||
echo "<td".$stylestr." align='center'>".(isset($noten_array[$znote])?$noten_array[$znote]:'')."</td>";
|
||||
if($znote==5 || $znote==7 || $znote==9 || $znote==13 || $znote==13 || $znote=='')
|
||||
echo "<td".$stylestr." align='center'>".(isset($noten_array[$znote])?$noten_array[$znote]['bezeichnung']:'')."</td>";
|
||||
if(isset($noten_array[$znote]) && $noten_array[$znote]['positiv']==false)
|
||||
{
|
||||
$summe_ng++;
|
||||
}
|
||||
// Pruefung 2.Termin ///////////////////////////////////////////////////////////////////////////
|
||||
// Pruefung 2.Termin
|
||||
if (key_exists($row_stud->uid, $studpruef_arr))
|
||||
{
|
||||
echo "<td colspan='2'>";
|
||||
@@ -1123,7 +1163,7 @@ echo '<table>';
|
||||
else
|
||||
echo "<td colspan='2'></td>";
|
||||
}
|
||||
// komm Pruefung ///////////////////////////////////////////////////////////////////////////
|
||||
// komm Pruefung
|
||||
if (key_exists($row_stud->uid,$studpruef_komm))
|
||||
{
|
||||
echo "<td colspan='2'>";
|
||||
@@ -1161,12 +1201,12 @@ echo '<table>';
|
||||
//}
|
||||
echo "
|
||||
<tr style='font-weight:bold;' align='center'>
|
||||
<td class='ContentHeader2' style='font-weight:bold;'>Σ</td>
|
||||
<td class='ContentHeader2' style='font-weight:bold;' title='".$p->t('benotungstool/anzahlDerStudenten')."'>$summe_stud</td>
|
||||
<td class='ContentHeader2' colspan='6'></td>
|
||||
<td class='ContentHeader2' style='color:red; font-weight:bold;' title='".$p->t('benotungstool/anzahlNegativerBeurteilungen')."'>$summe_ng</td>
|
||||
<td class='ContentHeader2' style='font-weight:bold;' colspan='2' title='".$p->t('benotungstool/anzahlNachpruefungen')."'>$summe_t2</td>
|
||||
<td class='ContentHeader2' style='font-weight:bold;' colspan='2' title='".$p->t('benotungstool/anzahlKommisionellePruefungen')."'>$summe_komm</td>
|
||||
<th style='font-weight:bold;'>Σ</th>
|
||||
<th style='font-weight:bold;' title='".$p->t('benotungstool/anzahlDerStudenten')."'>$summe_stud</th>
|
||||
<th colspan='6'></td>
|
||||
<th style='color:red; font-weight:bold;' title='".$p->t('benotungstool/anzahlNegativerBeurteilungen')."'>$summe_ng</th>
|
||||
<th style='font-weight:bold;' colspan='2' title='".$p->t('benotungstool/anzahlNachpruefungen')."'>$summe_t2</th>
|
||||
<th style='font-weight:bold;' colspan='2' title='".$p->t('benotungstool/anzahlKommisionellePruefungen')."'>$summe_komm</th>
|
||||
</tr>
|
||||
</table>
|
||||
</td></tr>
|
||||
|
||||
@@ -124,7 +124,10 @@ else
|
||||
|
||||
//Lehrveranstaltungen und Noten holen
|
||||
$qry = "SELECT
|
||||
tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_zeugnisnote.note, tbl_lvgesamtnote.note as lvnote, tbl_zeugnisnote.benotungsdatum, tbl_lvgesamtnote.freigabedatum, tbl_lvgesamtnote.benotungsdatum as lvbenotungsdatum
|
||||
tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_zeugnisnote.note, tbl_zeugnisnote.punkte,
|
||||
tbl_lvgesamtnote.note as lvnote, tbl_lvgesamtnote.punkte as lvpunkte,
|
||||
tbl_zeugnisnote.benotungsdatum, tbl_lvgesamtnote.freigabedatum,
|
||||
tbl_lvgesamtnote.benotungsdatum as lvbenotungsdatum
|
||||
FROM
|
||||
lehre.tbl_lehrveranstaltung, lehre.tbl_zeugnisnote
|
||||
LEFT OUTER JOIN
|
||||
@@ -160,6 +163,9 @@ else
|
||||
else
|
||||
$tbl.=$row->lvnote;
|
||||
}
|
||||
if($row->lvpunkte!='')
|
||||
$tbl.=' ('.((float)$row->lvpunkte).')';
|
||||
|
||||
$tbl.= "</td>";
|
||||
if ($row->note != $row->lvnote && $row->lvnote != NULL)
|
||||
$markier = " style='border: 1px solid red;'";
|
||||
@@ -173,6 +179,8 @@ else
|
||||
else
|
||||
$tbl.=$row->note;
|
||||
|
||||
if($row->punkte!='')
|
||||
$tbl.=' ('.((float)$row->punkte).')';
|
||||
|
||||
$tbl .= "</td>";
|
||||
$tbl .= '<td>'.$datum_obj->formatDatum($row->benotungsdatum,'d.m.Y').'</td>';
|
||||
|
||||
+5
-2
@@ -19,8 +19,6 @@
|
||||
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
|
||||
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
|
||||
*/
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
require_once('../config/vilesci.config.inc.php');
|
||||
require_once('../include/functions.inc.php');
|
||||
require_once('../include/benutzerberechtigung.class.php');
|
||||
@@ -46,6 +44,11 @@ if(!$variable->loadVariables($user))
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($user);
|
||||
|
||||
if(!$rechte->isBerechtigt('basis/fas'))
|
||||
die('Sie haben keine Berechtigung für diese Seite');
|
||||
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
|
||||
echo '<?xml-stylesheet href="'.APP_ROOT.'content/bindings.css" type="text/css" ?>';
|
||||
echo '<?xml-stylesheet href="'.APP_ROOT.'content/datepicker/datepicker.css" type="text/css"?>';
|
||||
|
||||
@@ -112,6 +112,10 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_semester" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="lehrveranstaltung-noten-tree-punkte" label="Punkte" flex="2" hidden="true" persist="hidden, width, ordinal"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte" />
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -132,6 +136,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_semester"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
@@ -201,6 +206,10 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="lehrveranstaltung-lvgesamtnoten-tree-punkte" label="Punkte" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte" />
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -219,6 +228,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#student_uid"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
@@ -245,4 +255,4 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
<button id="lehrveranstaltung-noten-button-import" label="Notenimport" oncommand="LehrveranstaltungNotenImport();" />
|
||||
</hbox>
|
||||
</vbox>
|
||||
</overlay>
|
||||
</overlay>
|
||||
|
||||
+22
-2
@@ -1,6 +1,21 @@
|
||||
<?php
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
/* Copyright (C) 2014 fhcomplete.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
require_once('../config/vilesci.config.inc.php');
|
||||
require_once('../include/functions.inc.php');
|
||||
require_once('../include/benutzerberechtigung.class.php');
|
||||
@@ -14,6 +29,11 @@ loadVariables($uid);
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($uid);
|
||||
|
||||
if(!$rechte->isBerechtigt('basis/planner'))
|
||||
die('Sie haben keine Berechtigung fuer diese Seite');
|
||||
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
/*echo '<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>';*/
|
||||
echo '<?xml-stylesheet href="'.APP_ROOT.'skin/planner.css" type="text/css"?>';
|
||||
echo '<?xul-overlay href="'.APP_ROOT.'content/planner.overlay.xul.php"?>';
|
||||
|
||||
@@ -2530,8 +2530,7 @@ if(!$error)
|
||||
|
||||
if(!$error)
|
||||
{
|
||||
if(!$rechte->isBerechtigt('admin', $stg_lva, 'suid') && !$rechte->isBerechtigt('admin', $stg_std, 'suid') &&
|
||||
!$rechte->isBerechtigt('assistenz', $stg_lva, 'suid') && !$rechte->isBerechtigt('assistenz', $stg_std, 'suid'))
|
||||
if(!$rechte->isBerechtigt('student/noten', $stg_lva, 'suid') && !$rechte->isBerechtigt('student/noten', $stg_std, 'suid'))
|
||||
{
|
||||
$return = false;
|
||||
$error = true;
|
||||
@@ -2564,6 +2563,7 @@ if(!$error)
|
||||
}
|
||||
|
||||
$zeugnisnote->note = $lvgesamtnote->note;
|
||||
$zeugnisnote->punkte = $lvgesamtnote->punkte;
|
||||
$zeugnisnote->uebernahmedatum = date('Y-m-d H:i:s');
|
||||
$zeugnisnote->benotungsdatum = $lvgesamtnote->benotungsdatum;
|
||||
$zeugnisnote->bemerkung = $lvgesamtnote->bemerkung;
|
||||
|
||||
@@ -114,6 +114,10 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_kurzbz" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-noten-tree-punkte" label="Punkte" flex="2" hidden="true" persist="hidden, width, ordinal"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte" />
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -134,6 +138,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_lv"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_lehrform"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
@@ -197,6 +202,10 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-lvgesamtnoten-tree-punkte" label="Punkte" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte" />
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -213,6 +222,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#student_uid"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
||||
+22
-2
@@ -1,6 +1,21 @@
|
||||
<?php
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
/* Copyright (C) 2014 fhcomplete.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
require_once('../config/vilesci.config.inc.php');
|
||||
require_once('../include/functions.inc.php');
|
||||
require_once('../include/benutzerberechtigung.class.php');
|
||||
@@ -14,6 +29,11 @@ loadVariables($uid);
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($uid);
|
||||
|
||||
if(!$rechte->isBerechtigt('basis/tempus'))
|
||||
die('Sie haben keine Berechtigung fuer diese Seite');
|
||||
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
/*echo '<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>';*/
|
||||
echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
|
||||
echo '<?xul-overlay href="'.APP_ROOT.'content/tempusoverlay.xul.php"?>';
|
||||
|
||||
@@ -172,8 +172,8 @@ class lvgesamtnote extends basis_db
|
||||
if($new)
|
||||
{
|
||||
//Neuen Datensatz einfuegen
|
||||
$qry='INSERT INTO campus.tbl_lvgesamtnote (lehrveranstaltung_id, student_uid, studiensemester_kurzbz,
|
||||
mitarbeiter_uid, note, freigabedatum, freigabevon_uid, benotungsdatum, bemerkung, updateamum,
|
||||
$qry='INSERT INTO campus.tbl_lvgesamtnote (lehrveranstaltung_id, student_uid, studiensemester_kurzbz,
|
||||
mitarbeiter_uid, note, freigabedatum, freigabevon_uid, benotungsdatum, bemerkung, updateamum,
|
||||
updatevon, insertamum, insertvon, punkte) VALUES('.
|
||||
$this->db_add_param($this->lehrveranstaltung_id, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->student_uid).', '.
|
||||
@@ -187,13 +187,13 @@ class lvgesamtnote extends basis_db
|
||||
$this->db_add_param($this->updateamum).', '.
|
||||
$this->db_add_param($this->updatevon).', '.
|
||||
$this->db_add_param($this->insertamum).', '.
|
||||
$this->db_add_param($this->insertvon).','.
|
||||
$this->db_add_param($this->insertvon).','.
|
||||
$this->db_add_param($this->punkte).');';
|
||||
}
|
||||
else
|
||||
{
|
||||
$qry='UPDATE campus.tbl_lvgesamtnote SET '.
|
||||
'note='.$this->db_add_param($this->note, FHC_INTEGER).', '.
|
||||
'note='.$this->db_add_param($this->note, FHC_INTEGER).', '.
|
||||
'punkte='.$this->db_add_param($this->punkte).','.
|
||||
'freigabedatum='.$this->db_add_param($this->freigabedatum).', '.
|
||||
'freigabevon_uid='.$this->db_add_param($this->freigabevon_uid).', '.
|
||||
@@ -283,6 +283,7 @@ class lvgesamtnote extends basis_db
|
||||
$obj->mitarbeiter_uid = $row->mitarbeiter_uid;
|
||||
$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
|
||||
$obj->note = $row->note;
|
||||
$obj->punkte = $row->punkte;
|
||||
$obj->freigabedatum = $row->freigabedatum;
|
||||
$obj->freigabevon_uid = $row->freigabevon_uid;
|
||||
$obj->benotungsdatum = $row->benotungsdatum;
|
||||
|
||||
@@ -43,6 +43,7 @@ class zeugnisnote extends basis_db
|
||||
public $insertvon; // varchar(16)
|
||||
public $ext_id; // bigint
|
||||
public $bemerkung; // text
|
||||
public $punkte; // numeric(8,4)
|
||||
|
||||
public $lehrveranstaltung_bezeichung;
|
||||
public $note_bezeichnung;
|
||||
@@ -106,6 +107,7 @@ class zeugnisnote extends basis_db
|
||||
$this->insertvon = $row->insertvon;
|
||||
$this->ext_id = $row->ext_id;
|
||||
$this->bemerkung = $row->bemerkung;
|
||||
$this->punkte = $row->punkte;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@@ -179,7 +181,7 @@ class zeugnisnote extends basis_db
|
||||
//Neuen Datensatz einfuegen
|
||||
$qry='INSERT INTO lehre.tbl_zeugnisnote (lehrveranstaltung_id, student_uid,
|
||||
studiensemester_kurzbz, note, uebernahmedatum, benotungsdatum, bemerkung,
|
||||
updateamum, updatevon, insertamum, insertvon, ext_id) VALUES('.
|
||||
updateamum, updatevon, insertamum, insertvon, ext_id, punkte) VALUES('.
|
||||
$this->db_add_param($this->lehrveranstaltung_id, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->student_uid).', '.
|
||||
$this->db_add_param($this->studiensemester_kurzbz).', '.
|
||||
@@ -191,12 +193,14 @@ class zeugnisnote extends basis_db
|
||||
$this->db_add_param($this->updatevon).', '.
|
||||
$this->db_add_param($this->insertamum).', '.
|
||||
$this->db_add_param($this->insertvon).', '.
|
||||
$this->db_add_param($this->ext_id).');';
|
||||
$this->db_add_param($this->ext_id).','.
|
||||
$this->db_add_param($this->punkte).');';
|
||||
}
|
||||
else
|
||||
{
|
||||
$qry='UPDATE lehre.tbl_zeugnisnote SET '.
|
||||
'note='.$this->db_add_param($this->note).', '.
|
||||
'punkte='.$this->db_add_param($this->punkte).','.
|
||||
'uebernahmedatum='.$this->db_add_param($this->uebernahmedatum).', '.
|
||||
'benotungsdatum='.$this->db_add_param($this->benotungsdatum).', '.
|
||||
'bemerkung='.$this->db_add_param($this->bemerkung).', '.
|
||||
@@ -266,7 +270,7 @@ class zeugnisnote extends basis_db
|
||||
$where2.=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
|
||||
|
||||
$qry = "SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
|
||||
vw_student_lehrveranstaltung.studiensemester_kurzbz, note, uebernahmedatum, benotungsdatum,
|
||||
vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
|
||||
vw_student_lehrveranstaltung.ects, vw_student_lehrveranstaltung.semesterstunden,
|
||||
tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
|
||||
tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id,
|
||||
@@ -288,7 +292,7 @@ class zeugnisnote extends basis_db
|
||||
) LEFT JOIN lehre.tbl_note USING(note)
|
||||
WHERE true $where
|
||||
UNION
|
||||
SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,student_uid AS uid,studiensemester_kurzbz, note,
|
||||
SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,student_uid AS uid,studiensemester_kurzbz, note, punkte,
|
||||
uebernahmedatum, benotungsdatum,lehre.tbl_lehrveranstaltung.ects,lehre.tbl_lehrveranstaltung.semesterstunden, tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
|
||||
tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id, lehre.tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, lehre.tbl_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
|
||||
tbl_note.bezeichnung as note_bezeichnung, tbl_zeugnisnote.bemerkung as bemerkung, tbl_lehrveranstaltung.sort, tbl_lehrveranstaltung.zeugnis, tbl_lehrveranstaltung.studiengang_kz,
|
||||
@@ -310,6 +314,7 @@ class zeugnisnote extends basis_db
|
||||
$obj->student_uid = $row->uid;
|
||||
$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
|
||||
$obj->note = $row->note;
|
||||
$obj->punkte = $row->punkte;
|
||||
$obj->uebernahmedatum = $row->uebernahmedatum;
|
||||
$obj->benotungsdatum = $row->benotungsdatum;
|
||||
$obj->updateamum = $row->updateamum;
|
||||
|
||||
@@ -166,5 +166,6 @@ $this->phrasen['benotungstool/errechneteGesamtnote']='Errechnete Gesamtnote';
|
||||
$this->phrasen['benotungstool/mussPositivSein']='* muss positiv sein';
|
||||
$this->phrasen['benotungstool/eingetrageneNoten']='Eingetragene Noten';
|
||||
$this->phrasen['benotungstool/zeunis']='Zeugnis';
|
||||
$this->phrasen['benotungstool/handbuch']='Handbuch';
|
||||
$this->phrasen['benotungstool/handbuch']='Handbuch';
|
||||
$this->phrasen['benotungstool/punkte']='Punkte';
|
||||
?>
|
||||
|
||||
@@ -32,6 +32,7 @@ require_once('../include/functions.inc.php');
|
||||
require_once('../include/lvgesamtnote.class.php');
|
||||
require_once('../include/datum.class.php');
|
||||
require_once('../include/studiengang.class.php');
|
||||
require_once('../include/benutzerberechtigung.class.php');
|
||||
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
|
||||
@@ -39,6 +40,12 @@ $user = get_uid();
|
||||
loadVariables($user);
|
||||
$datum = new datum();
|
||||
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($user);
|
||||
|
||||
if(!$rechte->isBerechtigt('student/noten'))
|
||||
die('Sie haben keine Berechtigung fuer diese Seite');
|
||||
|
||||
$stg_arr = array();
|
||||
$stg_obj = new studiengang();
|
||||
$stg_obj->getAll(null, false);
|
||||
@@ -78,7 +85,7 @@ foreach ($obj->result as $row)
|
||||
{
|
||||
$vorname = '';
|
||||
$nachname = '';
|
||||
$qry_name = "SELECT vorname, nachname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid='$row->student_uid'";
|
||||
$qry_name = "SELECT vorname, nachname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=".$db->db_add_param($row->student_uid);
|
||||
if($db->db_query($qry_name))
|
||||
{
|
||||
if($row_name = $db->db_fetch_object())
|
||||
@@ -96,6 +103,7 @@ foreach ($obj->result as $row)
|
||||
<NOTE:mitarbeiter_uid><![CDATA['.$row->mitarbeiter_uid.']]></NOTE:mitarbeiter_uid>
|
||||
<NOTE:studiensemester_kurzbz><![CDATA['.$row->studiensemester_kurzbz.']]></NOTE:studiensemester_kurzbz>
|
||||
<NOTE:note><![CDATA['.$row->note.']]></NOTE:note>
|
||||
<NOTE:punkte><![CDATA['.$row->punkte.']]></NOTE:punkte>
|
||||
<NOTE:freigabedatum_iso><![CDATA['.$row->freigabedatum.']]></NOTE:freigabedatum_iso>
|
||||
<NOTE:freigabedatum><![CDATA['.$datum->convertISODate($row->freigabedatum).']]></NOTE:freigabedatum>
|
||||
<NOTE:benotungsdatum_iso><![CDATA['.$row->benotungsdatum.']]></NOTE:benotungsdatum_iso>
|
||||
|
||||
@@ -36,6 +36,7 @@ require_once('../include/benutzer.class.php');
|
||||
require_once('../include/student.class.php');
|
||||
require_once('../include/studiengang.class.php');
|
||||
require_once('../include/lehrveranstaltung.class.php');
|
||||
require_once('../include/benutzerberechtigung.class.php');
|
||||
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
|
||||
@@ -43,6 +44,12 @@ $user = get_uid();
|
||||
loadVariables($user);
|
||||
$datum = new datum();
|
||||
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($user);
|
||||
|
||||
if(!$rechte->isBerechtigt('student/noten'))
|
||||
die('Sie haben keine Berechtigung fuer diese Seite');
|
||||
|
||||
$stg_arr = array();
|
||||
$stg_obj = new studiengang();
|
||||
$stg_obj->getAll(null, false);
|
||||
@@ -108,9 +115,10 @@ foreach ($obj->result as $row)
|
||||
<NOTE:studiengang_kz><![CDATA['.$benutzer->studiengang_kz.']]></NOTE:studiengang_kz>
|
||||
<NOTE:studiengang_lv><![CDATA['.$stg_arr[$lv_obj->studiengang_kz].']]></NOTE:studiengang_lv>
|
||||
<NOTE:student_semester><![CDATA['.$benutzer->semester.']]></NOTE:student_semester>
|
||||
<NOTE:punkte><![CDATA['.$row->punkte.']]></NOTE:punkte>
|
||||
</RDF:Description>
|
||||
</RDF:li>';
|
||||
}
|
||||
?>
|
||||
</RDF:Seq>
|
||||
</RDF:RDF>
|
||||
</RDF:RDF>
|
||||
|
||||
@@ -2557,6 +2557,25 @@ if(!$result = @$db->db_query("SELECT oe_kurzbz FROM public.tbl_ort LIMIT 1;"))
|
||||
echo ' public.tbl_ort: Spalte m2, gebteil, oe_kurzbz hinzugefuegt!<br>';
|
||||
}
|
||||
|
||||
// Eigene Berechtigung fuer Noten
|
||||
if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz='student/noten' LIMIT 1"))
|
||||
{
|
||||
if($db->db_num_rows($result)==0)
|
||||
{
|
||||
$qry = "
|
||||
INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('student/noten','FAS Zugriff');
|
||||
|
||||
INSERT INTO system.tbl_rolleberechtigung(berechtigung_kurzbz, rolle_kurzbz, art) VALUES('student/noten','assistenz','suid');
|
||||
INSERT INTO system.tbl_rolleberechtigung(berechtigung_kurzbz, rolle_kurzbz, art) VALUES('student/noten','admin','suid');
|
||||
";
|
||||
|
||||
if(!$db->db_query($qry))
|
||||
echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
echo ' system.tbl_berechtigung: Eigene Berechtigungen fuer Notenverwaltung im FAS hinzugefuegt student/noten!<br>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '<br><br><br>';
|
||||
|
||||
$tabellen=array(
|
||||
@@ -2879,6 +2898,7 @@ $berechtigungen = array(
|
||||
array('basis/cms_sperrfreigabe','Berechtigung zum Freigeben von gesperrtem Content'),
|
||||
array('basis/cronjob','Cronjobverwaltung'),
|
||||
array('basis/dms','DMS Download'),
|
||||
array('basis/fas','FAS Zugriff'),
|
||||
array('basis/ferien','Verwaltung der Ferien und Feiertage im System'),
|
||||
array('basis/fhausweis','Verwaltungstools für FH Ausweis – Kartentausch, Bildpruefung, Druck'),
|
||||
array('basis/firma','Firmenverwaltung'),
|
||||
@@ -2890,9 +2910,11 @@ $berechtigungen = array(
|
||||
array('basis/organisationseinheit','Organisationseinheiten Verwalten'),
|
||||
array('basis/ort','Raum-/Ortverwaltung'),
|
||||
array('basis/person','Personen Zusammenlegen, Stg-Wiederholer anlegen, etc'),
|
||||
array('basis/planner','Planner Zugriff'),
|
||||
array('basis/service','Services Administrieren (SLAs)'),
|
||||
array('basis/statistik','Statistiken Administrieren'),
|
||||
array('basis/studiengang','Studiengangsverwaltung'),
|
||||
array('basis/tempus','Tempus zugriff'),
|
||||
array('basis/testtool','Administrationseite, Gebiete löschen/zurücksetzen'),
|
||||
array('basis/variable','Variablenverwaltung'),
|
||||
array('basis/vilesci','Grundrecht, um in VileSci irgendwelche Menüpunkte zu sehen'),
|
||||
@@ -2944,6 +2966,7 @@ $berechtigungen = array(
|
||||
array('soap/buchungen','Berechtigung für Buchungsabfrage Addon Kontoimport'),
|
||||
array('student/bankdaten','Bankdaten des Studenten'),
|
||||
array('student/dokumente','Wenn SUID dann dürfen Dokumente auch wieder entfernt werden'),
|
||||
array('student/noten','Notenverwaltung'),
|
||||
array('student/stammdaten','Stammdaten der Studenten'),
|
||||
array('student/vorrueckung','Studentenvorrückung'),
|
||||
array('system/developer','Anzeige zusätzlicher Developerinfos'),
|
||||
|
||||
Reference in New Issue
Block a user