From 17a4ce123441cce2ff967fa4a07b84945f5929cd Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 22 Apr 2022 08:34:23 +0200 Subject: [PATCH] Aufruf kontakt.xul mit Timestamp --- content/student/studentoverlay.js.php | 54 +++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php index 5444504b1..c4c2ee27c 100644 --- a/content/student/studentoverlay.js.php +++ b/content/student/studentoverlay.js.php @@ -1079,7 +1079,7 @@ function StudentAuswahl() StudentGesamtNotenTreeloaded=false; stsem = getStudiensemester(); - + var url = buildStudentRDFURI({ 'prestudent_id': prestudent_id, 'studiensemester_kurzbz': stsem @@ -1188,18 +1188,18 @@ function StudentAuswahl() zgvort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvort" )); zgvnation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvnation" )); zgvdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdatum" )); - zgv_erfuellt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgv_erfuellt" )); + zgv_erfuellt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgv_erfuellt" )); zgvmaster_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmas_code" )); zgvmasterort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmaort" )); zgvmasternation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmanation" )); - zgvmasterdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmadatum" )); + zgvmasterdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmadatum" )); zgvmas_erfuellt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmas_erfuellt" )); zgvdoktor_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktor_code" )); zgvdoktorort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktorort" )); zgvdoktornation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktornation" )); zgvdoktordatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktordatum" )); zgvdoktor_erfuellt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktor_erfuellt" )); - + aufnahmeschluessel = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufnahmeschluessel" )); facheinschlberuf = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#facheinschlberuf" )); bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" )); @@ -1221,7 +1221,7 @@ function StudentAuswahl() if(zgv_erfuellt=='t') document.getElementById('student-prestudent-checkbox-zgverfuellt').checked=true; else - document.getElementById('student-prestudent-checkbox-zgverfuellt').checked=false; + document.getElementById('student-prestudent-checkbox-zgverfuellt').checked=false; document.getElementById('student-prestudent-menulist-zgvmastercode').value=zgvmaster_code; document.getElementById('student-prestudent-textbox-zgvmasterort').value=zgvmasterort; MenulistSelectItemOnValue('student-prestudent-menulist-zgvmasternation', zgvmasternation); @@ -1229,7 +1229,7 @@ function StudentAuswahl() if(zgvmas_erfuellt=='t') document.getElementById('student-prestudent-checkbox-zgvmaserfuellt').checked=true; else - document.getElementById('student-prestudent-checkbox-zgvmaserfuellt').checked=false; + document.getElementById('student-prestudent-checkbox-zgvmaserfuellt').checked=false; document.getElementById('student-prestudent-menulist-zgvdoktorcode').value=zgvdoktor_code; document.getElementById('student-prestudent-textbox-zgvdoktorort').value=zgvdoktorort; MenulistSelectItemOnValue('student-prestudent-menulist-zgvdoktornation', zgvdoktornation); @@ -1598,7 +1598,7 @@ function StudentAuswahl() } // ***** KONTAKTE ***** - document.getElementById('student-kontakt').setAttribute('src','kontakt.xul.php?person_id='+person_id); + document.getElementById('student-kontakt').setAttribute('src','kontakt.xul.php?person_id='+person_id+'&'+gettimestamp()); // ***** Betriebsmittel ***** document.getElementById('student-betriebsmittel').setAttribute('src','betriebsmitteloverlay.xul.php?person_id='+person_id+'&uid='+uid); @@ -1773,7 +1773,7 @@ function StudentPrestudentDisableFields(val) document.getElementById('student-prestudent-textbox-zgvort').disabled=val; document.getElementById('student-prestudent-menulist-zgvnation').disabled=val; document.getElementById('student-prestudent-textbox-zgvdatum').disabled=val; - document.getElementById('student-prestudent-checkbox-zgverfuellt').disabled=val; + document.getElementById('student-prestudent-checkbox-zgverfuellt').disabled=val; document.getElementById('student-prestudent-menulist-zgvmastercode').disabled=val; document.getElementById('student-prestudent-textbox-zgvmasterort').disabled=val; document.getElementById('student-prestudent-menulist-zgvmasternation').disabled=val; @@ -1784,7 +1784,7 @@ function StudentPrestudentDisableFields(val) document.getElementById('student-prestudent-menulist-zgvdoktornation').disabled=val; document.getElementById('student-prestudent-textbox-zgvdoktordatum').disabled=val; document.getElementById('student-prestudent-checkbox-zgvdoktorerfuellt').disabled=val; - + document.getElementById('student-prestudent-menulist-aufnahmeschluessel').disabled=val; document.getElementById('student-prestudent-checkbox-facheinschlberuf').disabled=val; document.getElementById('student-prestudent-checkbox-bismelden').disabled=val; @@ -1852,7 +1852,7 @@ function StudentPrestudentSave() zgvort = document.getElementById('student-prestudent-textbox-zgvort').value; zgvnation = document.getElementById('student-prestudent-menulist-zgvnation').value; zgvdatum = document.getElementById('student-prestudent-textbox-zgvdatum').value; - zgv_erfuellt = document.getElementById('student-prestudent-checkbox-zgverfuellt').checked; + zgv_erfuellt = document.getElementById('student-prestudent-checkbox-zgverfuellt').checked; zgvmaster_code = document.getElementById('student-prestudent-menulist-zgvmastercode').value; zgvmasterort = document.getElementById('student-prestudent-textbox-zgvmasterort').value; zgvmasternation = document.getElementById('student-prestudent-menulist-zgvmasternation').value; @@ -1863,7 +1863,7 @@ function StudentPrestudentSave() zgvdoktornation = document.getElementById('student-prestudent-menulist-zgvdoktornation').value; zgvdoktordatum = document.getElementById('student-prestudent-textbox-zgvdoktordatum').value; zgvdoktor_erfuellt = document.getElementById('student-prestudent-checkbox-zgvdoktorerfuellt').checked; - + aufnahmeschluessel = document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value; facheinschlberuf = document.getElementById('student-prestudent-checkbox-facheinschlberuf').checked; bismelden = document.getElementById('student-prestudent-checkbox-bismelden').checked; @@ -1912,7 +1912,7 @@ function StudentPrestudentSave() req.add('zgvort', zgvort); req.add('zgvnation', zgvnation); req.add('zgvdatum', ConvertDateToISO(zgvdatum)); - req.add('zgv_erfuellt', zgv_erfuellt); + req.add('zgv_erfuellt', zgv_erfuellt); req.add('zgvmas_code', zgvmaster_code); req.add('zgvmaort', zgvmasterort); req.add('zgvmanation', zgvmasternation); @@ -1923,7 +1923,7 @@ function StudentPrestudentSave() req.add('zgvdoktornation', zgvdoktornation); req.add('zgvdoktordatum', ConvertDateToISO(zgvdoktordatum)); req.add('zgvdoktor_erfuellt', zgvdoktor_erfuellt); - + req.add('aufnahmeschluessel', aufnahmeschluessel); req.add('facheinschlberuf', facheinschlberuf); req.add('bismelden', bismelden); @@ -2680,10 +2680,10 @@ function StudentKontoFilter() // **** // * Generiert eine student.rdf URI // **** -function buildStudentRDFURI(queryparams, tree) +function buildStudentRDFURI(queryparams, tree) { var baseurl = "rdf/student.rdf.php"; - if ( typeof tree !== "undefined" ) + if ( typeof tree !== "undefined" ) { var col = tree.columns ? tree.columns["tree-verband-col-orgform"] : "tree-verband-col-orgform"; queryparams.orgform = tree.view.getCellText(tree.currentIndex,col); @@ -2694,19 +2694,19 @@ function buildStudentRDFURI(queryparams, tree) // **** // * Generiert aus einer BasisURL und einem Dictionary von Parametern eine URI // **** -function _buildURI(baseurl, queryparams) +function _buildURI(baseurl, queryparams) { var str = []; var url = baseurl; - for (var p in queryparams) + for (var p in queryparams) { - if ( queryparams.hasOwnProperty(p) && queryparams[p].length > 0 ) + if ( queryparams.hasOwnProperty(p) && queryparams[p].length > 0 ) { str.push(encodeURIComponent(p) + "=" + encodeURIComponent(queryparams[p])); } } var querystring = str.join("&"); - if ( querystring.length > 0 ) + if ( querystring.length > 0 ) { url = url + '?' + querystring + '&' + gettimestamp(); } @@ -2741,12 +2741,12 @@ function StudentKontoFilterStudenten(filter) var gruppe = getTreeCellText(tree, 'gruppe', tree.currentIndex); var typ = getTreeCellText(tree, 'typ', tree.currentIndex); var stsem = getTreeCellText(tree, 'stsem', tree.currentIndex); - + if(stsem=='') stsem = getStudiensemester(); if(typ=='') typ='student'; - + var url = buildStudentRDFURI({ 'studiengang_kz': stg_kz, 'semester': sem, @@ -2758,9 +2758,9 @@ function StudentKontoFilterStudenten(filter) 'filter2': filter, 'buchungstyp': buchungstyp }, tree); - + console.log(url); - + var treeStudent=document.getElementById('student-tree'); try @@ -2831,7 +2831,7 @@ function StudentKontoFilterBuchungstyp() 'typ': typ, 'filter2': 'buchungstyp;' + filter }, tree); - + var treeStudent=document.getElementById('student-tree'); try @@ -3098,7 +3098,7 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz) if(!confirm('Die Buchung ist bereits vorhanden. Trotzdem fortfahren?')) return false; } - + req.add('type', 'neuebuchung'); req.add('person_ids', person_ids); @@ -3149,7 +3149,7 @@ function StudentCheckBuchung(person_ids, studiensemester_kurzbz, buchungstyp_kur var response = req.executePOST(); var val = new ParseReturnValue(response); - + return(val.dbdml_return); } @@ -5653,7 +5653,7 @@ function StudentSuche() var url = buildStudentRDFURI({ 'filter': filter }); - + var treeStudent=document.getElementById('student-tree'); try