From 7cda05f4f9bf1a091fa869bf90e21da5fa9ba386 Mon Sep 17 00:00:00 2001 From: Andreas Moik Date: Tue, 5 Apr 2016 12:08:42 +0200 Subject: [PATCH] legesamtnoteeintragen and legesamtnoteverwalten changed request from student_uid to prestudent_id --- .../benotungstool/legesamtnoteeintragen.php | 5 ++-- .../benotungstool/legesamtnoteverwalten.php | 28 +++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/cis/private/lehre/benotungstool/legesamtnoteeintragen.php b/cis/private/lehre/benotungstool/legesamtnoteeintragen.php index 5a7bc8beb..7e6476386 100755 --- a/cis/private/lehre/benotungstool/legesamtnoteeintragen.php +++ b/cis/private/lehre/benotungstool/legesamtnoteeintragen.php @@ -35,6 +35,7 @@ require_once('../../../../include/datum.class.php'); require_once('../../../../include/legesamtnote.class.php'); require_once('../../../../include/lvgesamtnote.class.php'); require_once('../../../../include/zeugnisnote.class.php'); +require_once('../../../../include/student.class.php'); $user = get_uid(); @@ -91,10 +92,10 @@ $note = $_REQUEST["note"]; // lvgesamtnote für studenten speichern -if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') && ((($note>0) && ($note < 6)) || ($note == 7) || ($note==8) || ($note==16)) ){ +if (isset($_REQUEST["submit"]) && ($_REQUEST["prestudent_id"] != '') && ((($note>0) && ($note < 6)) || ($note == 7) || ($note==8) || ($note==16)) ){ $jetzt = date("Y-m-d H:i:s"); - $student_uid = $_REQUEST["student_uid"]; + $prestudent_id = $_REQUEST["prestudent_id"]; if(!$student = new student($user)) die("Der Student wurde nicht gefunden!"); diff --git a/cis/private/lehre/benotungstool/legesamtnoteverwalten.php b/cis/private/lehre/benotungstool/legesamtnoteverwalten.php index 34a40604e..e7e7c2ffd 100644 --- a/cis/private/lehre/benotungstool/legesamtnoteverwalten.php +++ b/cis/private/lehre/benotungstool/legesamtnoteverwalten.php @@ -76,7 +76,7 @@ if($stsem!='' && !check_stsem($stsem)) $datum_obj = new datum(); $uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:''); -$uid = (isset($_GET['uid'])?$_GET['uid']:''); +$prestudent_id = (isset($_GET['prestudent_id'])?$_GET['prestudent_id']:''); ?> @@ -132,23 +132,23 @@ $uid = (isset($_GET['uid'])?$_GET['uid']:''); alert("Fehler beim Erstellen des Anfrageobjekts!"); } - function saveLENote(uid) + function saveLENote(prestudent_id) { - note = document.getElementById(uid).note.value; + note = document.getElementById(prestudent_id).note.value; if ((note < 0) || (note > 5 && note != 8 && note != 7 && note!=16)) { alert("t('benotungstool/noteEingeben');?>"); - document.getElementById(uid).note.value=""; + document.getElementById(prestudent_id).note.value=""; } else { erzeugeAnfrage(); - //note = document.getElementById(uid).note.value; - stud_uid = uid; + //note = document.getElementById(prestudent_id).note.value; + student_prestudent_id = prestudent_id; var jetzt = new Date(); var ts = jetzt.getTime(); var url= ''; - url += '&submit=1&student_uid='+uid+"¬e="+note+"&"+ts; + url += '&submit=1&prestudent_id='+prestudent_id+"¬e="+note+"&"+ts; anfrage.open("GET", url, true); anfrage.onreadystatechange = updateSeite; anfrage.send(null); @@ -161,13 +161,13 @@ $uid = (isset($_GET['uid'])?$_GET['uid']:''); { if (anfrage.status == 200) { - uid = stud_uid; - var note = document.getElementById(uid).note.value; + prestudent_id = student_prestudent_id; + var note = document.getElementById(prestudent_id).note.value; var resp = anfrage.responseText; if (resp == "neu" || resp == "update") { - notentd = document.getElementById("note_"+uid); + notentd = document.getElementById("note_"+prestudent_id); while (notentd.childNodes.length>0) { notentd.removeChild(notentd.lastChild); @@ -178,7 +178,7 @@ $uid = (isset($_GET['uid'])?$_GET['uid']:''); else { alert(resp); - document.getElementById(uid).note.value=""; + document.getElementById(prestudent_id).note.value=""; } } else @@ -418,7 +418,7 @@ echo " */ // studentenquery -$qry_stud = "SELECT uid, prestudent_id, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) WHERE studiensemester_kurzbz = ".$db->db_add_param($stsem)." and lehreinheit_id = ".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." ORDER BY nachname, vorname"; +$qry_stud = "SELECT uid, prestudent_id, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) WHERE studiensemester_kurzbz = ".$db->db_add_param($stsem)." and lehreinheit_id = ".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." ORDER BY nachname, vorname"; if($result_stud = $db->db_query($qry_stud)) { @@ -471,12 +471,12 @@ if($result_stud = $db->db_query($qry_stud)) $note_final = null; } } - echo "
"; + echo "
"; if ($note == 5) $negmarkier = " style='color:red; font-weight:bold;'"; else $negmarkier = ""; - echo "$note"; + echo "$note"; echo ""; $i++; }