From 2a3a485db2b85824b8d8a81e390aa0cc2d66a50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 7 Nov 2008 12:34:27 +0000
Subject: [PATCH] neues Feld beim Prestudenten: DUAL

---
 content/statistik/notenspiegel.php           |  2 ++
 content/student/studentDBDML.php             |  1 +
 content/student/studentdetailoverlay.xul.php | 16 +++++++++++-----
 content/student/studentenoverlay.xul.php     |  5 +++++
 content/student/studentoverlay.js.php        |  9 +++++++++
 include/prestudent.class.php                 | 14 ++++++++++----
 rdf/student.rdf.php                          |  4 +++-
 7 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/content/statistik/notenspiegel.php b/content/statistik/notenspiegel.php
index 31d233e01..960db960c 100644
--- a/content/statistik/notenspiegel.php
+++ b/content/statistik/notenspiegel.php
@@ -162,6 +162,8 @@ if($typ=='xls')
 	}
 	$worksheet->write($zeile,++$spalte,'Notendurchschnitt', $format_bold);
 	$maxlength[$spalte]=15;
+	$worksheet->write($zeile,++$spalte,'Gewichteter Notendurchschnitt', $format_bold);
+	$maxlength[$spalte]=15;
 	
 	$anzahl_lv=array();
 	$summe_lv=array();
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index ba765a81f..e432340ec 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -395,6 +395,7 @@ if(!$error)
 				$prestudent->reihungstestangetreten = ($_POST['reihungstestangetreten']=='true'?true:false);
 				$prestudent->punkte = str_replace(',','.',$_POST['punkte']);
 				$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
+				$prestudent->dual = ($_POST['dual']=='true'?true:false);
 				$prestudent->anmerkung = $_POST['anmerkung'];
 				//$prestudent->insertamum = date('Y-m-d H:i:s');
 				//$prestudent->insertvon = $user;
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index f0232ab03..0803187aa 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -440,16 +440,22 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
     			<grid style="margin:4px;" flex="1">
 				  	<columns  >
     					<column flex="1"/>
-    					<column flex="11"/>
-    					<column flex="1"/>
-    					<column flex="5"/>    					
+    					<column flex="12"/>
+    					<column flex="3"/>
+    					<column flex="3"/>
   					</columns>
   					<rows>
   						<row>
 		    				<label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
 		      				<textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
-		      				<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
-		      				<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
+		      				<hbox>
+		      					<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
+		      					<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
+		      				</hbox>
+		      				<hbox>
+		      					<label value="Dual" control="student-prestudent-checkbox-dual"/>
+		      					<checkbox id="student-prestudent-checkbox-dual" checked="false" disabled="true"/>
+		      				</hbox>
 						</row>
 					</rows>
 				</grid>      			
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 0cbc4a2f1..c9963c4fd 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -242,6 +242,10 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#punkte" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-dual" label="Dual" flex="1" hidden="true" persist="hidden, width, ordinal"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#dual" onclick="StudentTreeSort()"/>
+	    				<splitter class="tree-splitter"/>
 					</treecols>
 
 					<template>
@@ -274,6 +278,7 @@ else
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#orgform" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#aufmerksamdurch_kurzbz" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual" />
 	         						</treerow>
 	       						</treeitem>
 	      					</treechildren>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d1a54e7f1..f7750ddc6 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -888,6 +888,7 @@ function StudentAuswahl()
 	punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
 	bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
 	anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungpre" ));
+	dual = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#dual" ));
 
 	document.getElementById('student-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
 	document.getElementById('student-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
@@ -915,6 +916,11 @@ function StudentAuswahl()
 		document.getElementById('student-prestudent-checkbox-bismelden').checked=true;
 	else
 		document.getElementById('student-prestudent-checkbox-bismelden').checked=false;
+		
+	if(dual=='true')
+		document.getElementById('student-prestudent-checkbox-dual').checked=true;
+	else
+		document.getElementById('student-prestudent-checkbox-dual').checked=false;
 
 	document.getElementById('student-prestudent-textbox-person_id').value=person_id;
 	document.getElementById('student-prestudent-textbox-prestudent_id').value=prestudent_id;
@@ -1329,6 +1335,7 @@ function StudentPrestudentDisableFields(val)
 	document.getElementById('student-prestudent-checkbox-reihungstestangetreten').disabled=val;
 	document.getElementById('student-prestudent-textbox-punkte').disabled=val;
 	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
+	document.getElementById('student-prestudent-checkbox-dual').disabled=val;
 	document.getElementById('student-prestudent-button-anmeldungreihungstest-heute').disabled=val;
 	document.getElementById('student-prestudent-button-save').disabled=val;
 	//document.getElementById('student-prestudent-menulist-studiengang_kz').disabled=val;
@@ -1375,6 +1382,7 @@ function StudentPrestudentSave()
 	reihungstestangetreten = document.getElementById('student-prestudent-checkbox-reihungstestangetreten').checked;
 	punkte = document.getElementById('student-prestudent-textbox-punkte').value;
 	bismelden = document.getElementById('student-prestudent-checkbox-bismelden').checked;
+	dual = document.getElementById('student-prestudent-checkbox-dual').checked;
 	person_id = document.getElementById('student-prestudent-textbox-person_id').value;
 	prestudent_id = document.getElementById('student-prestudent-textbox-prestudent_id').value;
 	neu = document.getElementById('student-prestudent-checkbox-new').checked;
@@ -1424,6 +1432,7 @@ function StudentPrestudentSave()
 	req.add('reihungstestangetreten', reihungstestangetreten);
 	req.add('punkte', punkte);
 	req.add('bismelden', bismelden);
+	req.add('dual', dual);
 	req.add('person_id', person_id);
 	req.add('prestudent_id', prestudent_id);
 	req.add('studiengang_kz', studiengang_kz);
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 327b0ed9c..64d7b3358 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -43,6 +43,7 @@ class prestudent extends person
 	var $bismelden;
 	var $anmerkung;
 	var $ext_id_prestudent;
+	var $dual;
 	
 	var $rolle_kurzbz;
 	var $studiensemester_kurzbz;
@@ -122,6 +123,7 @@ class prestudent extends person
 				$this->person_id = $row->person_id;
 				$this->anmerkung = $row->anmerkung;
 				$this->ext_id_prestudent = $row->ext_id;
+				$this->dual = ($row->dual=='t'?true:false);
 				
 				if(!person::load($row->person_id))
 					return false;
@@ -169,7 +171,7 @@ class prestudent extends person
 		
 		if($this->new) //Wenn new true ist dann ein INSERT absetzen ansonsten ein UPDATE
 		{
-			$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id, studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, reihungstest_id, anmeldungreihungstest, reihungstestangetreten, punkte, bismelden, insertamum, insertvon, updateamum, updatevon, ext_id, anmerkung) VALUES('.
+			$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id, studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, reihungstest_id, anmeldungreihungstest, reihungstestangetreten, punkte, bismelden, insertamum, insertvon, updateamum, updatevon, ext_id, anmerkung, dual) VALUES('.
 			       $this->addslashes($this->aufmerksamdurch_kurzbz).",".
 			       $this->addslashes($this->person_id).",".
 			       $this->addslashes($this->studiengang_kz).",".
@@ -193,10 +195,11 @@ class prestudent extends person
 			       $this->addslashes($this->updateamum).",".
 			       $this->addslashes($this->updatevon).",".
 			       $this->addslashes($this->ext_id_prestudent).",".
-			       $this->addslashes($this->anmerkung).");";
+			       $this->addslashes($this->anmerkung).",".
+			       ($this->dual?'true':'false').");";
 		}
 		else
-		{			
+		{
 			$qry = 'UPDATE public.tbl_prestudent SET'.
 			       ' aufmerksamdurch_kurzbz='.$this->addslashes($this->aufmerksamdurch_kurzbz).",".
 			       ' person_id='.$this->addslashes($this->person_id).",".
@@ -219,7 +222,8 @@ class prestudent extends person
 			       ' updateamum='.$this->addslashes($this->updateamum).",".
 			       ' updatevon='.$this->addslashes($this->updatevon).",".
 			       ' ext_id='.$this->addslashes($this->ext_id_prestudent).",".
-			       ' anmerkung='.$this->addslashes($this->anmerkung).
+			       ' anmerkung='.$this->addslashes($this->anmerkung).",".
+			       ' dual='.($this->dual?'true':'false').
 			       " WHERE prestudent_id='".addslashes($this->prestudent_id)."';";
 		}
 		
@@ -545,6 +549,7 @@ class prestudent extends person
 				$ps->punkte = $row->punkte;
 				$ps->bismelden = ($row->bismelden=='t'?true:false);
 				$ps->anmerkung = $row->anmerkung;
+				$ps->dual = ($row->dual=='t'?true:false);
 				
 				$ps->rolle_kurzbz = $row->rolle_kurzbz;
 				$ps->studiensemester_kurzbz = $row->studiensemester_kurzbz;
@@ -814,6 +819,7 @@ class prestudent extends person
 				$obj->person_id = $row->person_id;
 				$obj->anmerkung = $row->anmerkung;
 				$obj->ext_id_prestudent = $row->ext_id;
+				$obj->dual = ($row->dual=='t'?true:false);
 				
 				$this->result[] = $obj;
 			}
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index d16d5edd4..66a624107 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -179,6 +179,7 @@ function draw_content_liste($row)
 			<STUDENT:orgform><![CDATA['.$orgform.']]></STUDENT:orgform>
 			<STUDENT:aufmerksamdurch_kurzbz><![CDATA['.$row->aufmerksamdurch_kurzbz.']]></STUDENT:aufmerksamdurch_kurzbz>
 			<STUDENT:punkte><![CDATA['.$row->punkte.']]></STUDENT:punkte>
+			<STUDENT:dual><![CDATA['.($row->dual=='t'?'Ja':'Nein').']]></STUDENT:dual>
       	</RDF:Description>
       </RDF:li>';
 }
@@ -278,6 +279,7 @@ function draw_prestudent($row)
 			<STUDENT:reihungstestangetreten><![CDATA['.($row->reihungstestangetreten?'true':'false').']]></STUDENT:reihungstestangetreten>
 			<STUDENT:punkte><![CDATA['.$row->punkte.']]></STUDENT:punkte>
 			<STUDENT:bismelden><![CDATA['.($row->bismelden?'true':'false').']]></STUDENT:bismelden>
+			<STUDENT:dual><![CDATA['.($row->dual?'true':'false').']]></STUDENT:dual>
 			<STUDENT:anmerkungpre><![CDATA['.$row->anmerkung.']]></STUDENT:anmerkungpre>
       	</RDF:Description>
       </RDF:li>';
@@ -396,7 +398,7 @@ if($xmlformat=='rdf')
 							LIMIT 1
 						)
 						AS email_privat,
-						(SELECT punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte
+						(SELECT punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte, tbl_prestudent.dual as dual
 						FROM public.tbl_student 
 							JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person p USING (person_id)  JOIN public.tbl_prestudent USING(prestudent_id) ";
 		if($gruppe_kurzbz!=null)