From 3b44a40ee50678dbc0b57b0304f5320a53e3bc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 29 Jun 2012 08:20:27 +0000
Subject: [PATCH] =?UTF-8?q?-=20XPI=20f=C3=BCr=20Planner=20-=20Personendeta?=
 =?UTF-8?q?ils=20f=C3=BCr=20Mitarbeiter=20im=20FAS=20hinzugef=C3=BCgt=20-?=
 =?UTF-8?q?=20Personendetails=20enth=C3=A4lt=20nun=20einen=20Link=20zur=20?=
 =?UTF-8?q?Statusseite=20f=C3=BCr=20den=20FH-Ausweis=20-=20Status=20FH-Aus?=
 =?UTF-8?q?weis=20pr=C3=BCft=20nun=20auch=20ob=20die=20Karte=20bereits=20i?=
 =?UTF-8?q?m=20LDAP=20angelegt=20ist=20-=20Betriebsmittel=20Tab=20im=20FAS?=
 =?UTF-8?q?=20zeigt=20nun=20die=20UID=20als=20zus=C3=A4tzliche=20Spalte=20?=
 =?UTF-8?q?an?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/betriebsmitteloverlay.xul.php         |   5 ++
 content/mitarbeiter/mitarbeiteroverlay.js.php |  10 ++++
 .../mitarbeiter/mitarbeiteroverlay.xul.php    |   1 +
 include/functions.inc.php                     |  18 ++++----
 rdf/betriebsmittelperson.rdf.php              |   1 +
 .../admin/XPI/PlannerProduktiv/Planner.xpi    | Bin 0 -> 3142 bytes
 .../chrome/content/contents.rdf               |  17 +++++++
 .../chrome/content/planner.xul                |  12 +++++
 .../XPI/PlannerProduktiv/chrome/planner.jar   | Bin 0 -> 944 bytes
 vilesci/admin/XPI/PlannerProduktiv/install.js |  43 ++++++++++++++++++
 .../admin/XPI/PlannerProduktiv/install.rdf    |  23 ++++++++++
 vilesci/fhausweis/search.php                  |  28 +++++++++++-
 vilesci/personen/personendetails.php          |   1 +
 13 files changed, 148 insertions(+), 11 deletions(-)
 create mode 100755 vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
 create mode 100755 vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
 create mode 100755 vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
 create mode 100755 vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
 create mode 100755 vilesci/admin/XPI/PlannerProduktiv/install.js
 create mode 100755 vilesci/admin/XPI/PlannerProduktiv/install.rdf

diff --git a/content/betriebsmitteloverlay.xul.php b/content/betriebsmitteloverlay.xul.php
index f6fb26e34..6e600a4d1 100644
--- a/content/betriebsmitteloverlay.xul.php
+++ b/content/betriebsmitteloverlay.xul.php
@@ -126,6 +126,10 @@ else
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/betriebsmittel/rdf#beschreibung" />
 							<splitter class="tree-splitter"/>
+							<treecol id="betriebsmittel-tree-uid" label="UID" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/betriebsmittel/rdf#uid" />
+							<splitter class="tree-splitter"/>
 						</treecols>
 
 						<template>
@@ -142,6 +146,7 @@ else
 										<treecell label="rdf:http://www.technikum-wien.at/betriebsmittel/rdf#person_id"/>
 										<treecell label="rdf:http://www.technikum-wien.at/betriebsmittel/rdf#betriebsmittelperson_id"/>
 										<treecell label="rdf:http://www.technikum-wien.at/betriebsmittel/rdf#beschreibung"/>
+										<treecell label="rdf:http://www.technikum-wien.at/betriebsmittel/rdf#uid"/>
 									</treerow>
 								</treeitem>
 							</treechildren>
diff --git a/content/mitarbeiter/mitarbeiteroverlay.js.php b/content/mitarbeiter/mitarbeiteroverlay.js.php
index 5b1e39ac6..98606d91b 100644
--- a/content/mitarbeiter/mitarbeiteroverlay.js.php
+++ b/content/mitarbeiter/mitarbeiteroverlay.js.php
@@ -1845,4 +1845,14 @@ function MitarbeiterTreeEntwicklungsteamSort()
 function MitarbeiterTreeVerwendungSort()
 {
 	debug('ToDo: MitarbeiterTreeVerwendungSort');
+}
+
+
+// ****
+// * Oeffnet ein Fenster mit den Details der gesamten Person
+// ****
+function MitarbeiterShowPersonendetails()
+{
+	person_id = document.getElementById('mitarbeiter-detail-textbox-person_id').value;
+	window.open('<?php echo APP_ROOT ?>vilesci/personen/personendetails.php?id='+person_id,'Personendetails','');
 }
\ No newline at end of file
diff --git a/content/mitarbeiter/mitarbeiteroverlay.xul.php b/content/mitarbeiter/mitarbeiteroverlay.xul.php
index 767856d0c..e0c674dc4 100644
--- a/content/mitarbeiter/mitarbeiteroverlay.xul.php
+++ b/content/mitarbeiter/mitarbeiteroverlay.xul.php
@@ -48,6 +48,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/mitarbeiter/mitarbeiterfunktionove
 <popupset>
 	<popup id="mitarbeiter-tree-popup">
 		<menuitem label="EMail versenden" oncommand="MitarbeiterSendMail();" id="mitarbeiter-tree-popup-mail" hidden="false"/>
+		<menuitem label="Personendetails anzeigen" oncommand="MitarbeiterShowPersonendetails()" id="mitarbeiter-tree-popup-personendetails" hidden="false"/>
 	</popup>
 </popupset>
 	<hbox>
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 0a2623366..aa6d1a422 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -418,14 +418,14 @@ function getUidFromCardNumber($number)
 	    // bind to ldap connection
 	    if(($bind=@ldap_bind($connect)) == false)
 	    {
-			print "bind:__FAILED__<br>\n";
+			//print "bind:__FAILED__<br>\n";
 			return false;
 	    }
 
 	    // search for card id
 	    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
 	    {
-			print "failure: search in LDAP-tree failed<br>";
+			//print "failure: search in LDAP-tree failed<br>";
 			return false;
 	    }
 
@@ -436,7 +436,7 @@ function getUidFromCardNumber($number)
 	    	 // search for card id 0[Number]
 		    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
 		    {
-				print "failure: search in LDAP-tree failed<br>";
+				//print "failure: search in LDAP-tree failed<br>";
 				return false;
 		    }
 		    if (ldap_count_entries($connect, $res_id) == 0)
@@ -445,7 +445,7 @@ function getUidFromCardNumber($number)
 		    	 // search for card id 00[Number]
 			    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
 			    {
-					print "failure: search in LDAP-tree failed<br>";
+					//print "failure: search in LDAP-tree failed<br>";
 					return false;
 			    }
 			    if (ldap_count_entries($connect, $res_id) == 0)
@@ -454,7 +454,7 @@ function getUidFromCardNumber($number)
 			    	// search for card id 000[Number]
 				    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
 				    {
-						print "failure: search in LDAP-tree failed<br>";
+						//print "failure: search in LDAP-tree failed<br>";
 						return false;
 				    }
 				    if (ldap_count_entries($connect, $res_id) == 0)
@@ -464,7 +464,7 @@ function getUidFromCardNumber($number)
 				    	// search for card id 0000[Number]
 					    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
 					    {
-							print "failure: search in LDAP-tree failed<br>";
+							//print "failure: search in LDAP-tree failed<br>";
 							return false;
 					    }
 				    	if (ldap_count_entries($connect, $res_id) == 0)
@@ -473,7 +473,7 @@ function getUidFromCardNumber($number)
 					    	// search for card id 00000[Number]
 						    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
 						    {
-								print "failure: search in LDAP-tree failed<br>";
+								//print "failure: search in LDAP-tree failed<br>";
 								return false;
 						    }
 					    	if (ldap_count_entries($connect, $res_id) == 0)
@@ -482,12 +482,12 @@ function getUidFromCardNumber($number)
 								// search for card id 000000[Number]
 							    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
 							    {
-									print "failure: search in LDAP-tree failed<br>";
+									//print "failure: search in LDAP-tree failed<br>";
 									return false;
 							    }
 							    if (ldap_count_entries($connect, $res_id) == 0)
 						    	{
-						    		print "failure: no person found<br>"; 
+						    		//print "failure: no person found<br>"; 
 						    		return false; 
 						    	}
 					    	}
diff --git a/rdf/betriebsmittelperson.rdf.php b/rdf/betriebsmittelperson.rdf.php
index 0a947a46e..45938ee60 100644
--- a/rdf/betriebsmittelperson.rdf.php
+++ b/rdf/betriebsmittelperson.rdf.php
@@ -152,6 +152,7 @@ function draw_content($row)
             <BTM:ausgegebenam><![CDATA['.$datum->convertISODate($row->ausgegebenam).']]></BTM:ausgegebenam>
             <BTM:retouram_iso><![CDATA['.$row->retouram.']]></BTM:retouram_iso>
             <BTM:retouram><![CDATA['.$datum->convertISODate($row->retouram).']]></BTM:retouram>
+            <BTM:uid><![CDATA['.$row->uid.']]></BTM:uid>
          </RDF:Description>
       </RDF:li>';
 
diff --git a/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi b/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
new file mode 100755
index 0000000000000000000000000000000000000000..ea79914b2d3c0dadc077dda3692a1bfa196f2ef2
GIT binary patch
literal 3142
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

literal 0
HcmV?d00001

diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
new file mode 100755
index 000000000..b89fc4434
--- /dev/null
+++ b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+              xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+	
+	<RDF:Seq about="urn:mozilla:package:root">
+		<RDF:li resource="urn:mozilla:package:planner" />
+	</RDF:Seq>
+
+
+	<RDF:Description about="urn:mozilla:package:planner"
+		chrome:extension="false" 
+	 	chrome:name="planner"
+	 	chrome:displayName="Planner"
+	 	chrome:author="TW"	
+	/>
+
+</RDF:RDF>
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
new file mode 100755
index 000000000..8dbbac518
--- /dev/null
+++ b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE window >
+<window id="planner" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+		title="Planner" 
+		width="800"
+  		height="600"
+  		persist="screenX screenY width height sizemode"
+		onclose="return document.getElementById('fas_browser').contentWindow.closeWindow()"
+  	>
+	<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+	<browser id="fas_browser" type="content-primary" flex="1" src="https://vilesci.technikum-wien.at/content/planner.xul.php"/>
+</window>
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar b/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
new file mode 100755
index 0000000000000000000000000000000000000000..ad36b2cabb7ecf36a4cdd34c457f963c3b447818
GIT binary patch
literal 944
zcmWIWW@Zs#W&naKu6G?kGz@S68Oiy1C8>EO`T<Z?91KT*s-`@;`t}!4_B0~{g9wr;
zsOn<9qLj4SfP;C56?kmd2mNQfSnM==ZquZ%L2oU5Z!eh}`O54fM@pN{%YAixOIB%x
zvg#!M`E&2^(Xt%V->fCQrmFXsWbdnu((BrOck_~j5YxO}Q}=w^H`$5j@C3g8l}8uf
zcv7i%ZRUwhEZ^IY%<TzJPP)^jFa9RWb=E4k+lNGhv;Rx24PBtjC#b0HCnxuUMgIMV
z!&j!itvy+7Qj|Aw?y7xP1y!P6GutgHJuEQi?Z&3tKm4?l87zf^gB8;_y)w>EvMvxc
zo4b6W%gf&(lPgN}62BxoGT`^Je$dnPCdM@D*Z-w&gKnDl&GXl1{7}WbpejCE=jU<t
z`D)5d_g~Cw+EkAStIfc$%24^Q8wU(0DJBL6VWhAs$Vtr0OD)o?D9!N=wDmu1ATlR<
z<^O|wSS7NivnskoalSa<!mje7CFr^7wpTYM-p{`L<@)2Ah8Z<hKkv?cH!tk@sZL?H
zO$XBp)WtVMom=J~zW%+w{Oz+*CfCFl3d)*0MW+PpzEj<!aB1su9-iXAD?%=tY~m7s
z9i!*0bCvP7min<3r{;WYh)_SlrtIZyRB`>(=ZlRqeAR`wy)kG$yTGQPSNBHBhYb-2
za<q=5Bwd)+X1wEn@+&<n)vgkkFY!qg+ZXK@J=~~JeNan;V{X=mTdZDjf<GnpYBbq}
zy@;H4BD-C-ChvaN?ANt^_jgN39jd6+F8$Cm&;GYqioW54*|!x>8+CrKJ=YoCo+1!A
zqvJQvmd=HTt^~Y1q*va>cTHR1&NWT8$1|s@HHEG>u=-~E-}}Sw>K?=Oi`Ra-(R9Pw
zX8BWxfGdZEru6t-Q_R$s-1_lb!J22iuKLAciyNfO--u1vy3(;!dUfIxmU@N&Z$>72
zX52{}7$-m=(D2p~L?aSBOc(Yf4^qp(pwO_TQ4L7LbRlN|guNUL*b)NR0I&%`z~lil
Y0V!Doc(byB6fpzgP9Xgdn1UD>06lehb^rhX

literal 0
HcmV?d00001

diff --git a/vilesci/admin/XPI/PlannerProduktiv/install.js b/vilesci/admin/XPI/PlannerProduktiv/install.js
new file mode 100755
index 000000000..ede417c9e
--- /dev/null
+++ b/vilesci/admin/XPI/PlannerProduktiv/install.js
@@ -0,0 +1,43 @@
+/* !!!
+ * DIESE WERTE MUESSEN GEAENDERT WERDEN
+ */
+const APP_DISPLAY_NAME = "Planner";
+const APP_NAME = "Planner";
+const APP_PACKAGE = "/tw/planner";
+const APP_VERSION = "V1.0";
+
+const APP_JAR_FILE = "planner.jar";
+const APP_CONTENT_FOLDER = "content/";
+const APP_LOCALE_FOLDER  = "locale/de-AT/planner/";
+const APP_SKIN_FOLDER  = "skin/";
+/* aus
+ */
+
+initInstall(APP_NAME, APP_PACKAGE, APP_VERSION);
+
+var chromef = getFolder("Profile", "chrome");
+var instFlags = PROFILE_CHROME;
+
+var err = addFile(APP_PACKAGE, APP_VERSION, "chrome/" + APP_JAR_FILE, chromef, null);
+
+if(err >= SUCCESS) { 
+	var jar = getFolder(chromef, APP_JAR_FILE);
+	registerChrome(CONTENT | instFlags, jar, APP_CONTENT_FOLDER);
+	//registerChrome(LOCALE  | instFlags, jar, APP_LOCALE_FOLDER);
+	//registerChrome(SKIN  | instFlags, jar, APP_SKIN_FOLDER);
+	err = performInstall();
+	if(err == SUCCESS) {
+		alert(APP_NAME + " " + APP_VERSION + " wurde erfolgreich installiert.\n"
+			+"Bitte starten Sie den Browser neu bevor Sie die Anwendung starten.");
+	} else { 
+		alert("Install failed. Error code:" + err);
+		cancelInstall(err);
+	}
+} else { 
+	alert("Failed to create " +APP_JAR_FILE +"\n"
+		+"You probably don't have appropriate permissions \n"
+		+"(write access to Profile/chrome directory). \n"
+		+"_____________________________\nError code:" + err);
+	cancelInstall(err);
+}
+
diff --git a/vilesci/admin/XPI/PlannerProduktiv/install.rdf b/vilesci/admin/XPI/PlannerProduktiv/install.rdf
new file mode 100755
index 000000000..3f6914fd4
--- /dev/null
+++ b/vilesci/admin/XPI/PlannerProduktiv/install.rdf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+	<Description about="urn:mozilla:install-manifest">
+		<em:id>{84cb81c9-6c90-4654-b2c4-87cdaa829281}</em:id>
+		<em:name>Planner</em:name>
+		<em:version>1.0</em:version>
+		<em:description>Planner</em:description>
+		<em:file>
+			<Description about="urn:mozilla:extension:file:planner.jar">
+			<em:package>content/</em:package>
+			<em:skin>skin/</em:skin>
+			</Description>
+		</em:file>
+		<em:targetApplication>
+			<Description>
+			<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+			<em:minVersion>1.7</em:minVersion>
+			<em:maxVersion>1.8+</em:maxVersion>
+			</Description>
+		</em:targetApplication>
+	</Description>
+</RDF>
diff --git a/vilesci/fhausweis/search.php b/vilesci/fhausweis/search.php
index 99f62240c..e960f91dc 100755
--- a/vilesci/fhausweis/search.php
+++ b/vilesci/fhausweis/search.php
@@ -58,7 +58,7 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 $uid = get_uid();
 $rechte = new benutzerberechtigung();
 $rechte->getBerechtigungen($uid);
-if(!$rechte->isBerechtigt('basis/fhausweis'))
+if(!$rechte->isBerechtigt('basis/fhausweis') && !$rechte->isBerechtigt('assistenz'))
 	die('Sie haben keine Berechtigung für diese Seite');
 	
 $db = new basis_db();
@@ -145,7 +145,7 @@ if($person_id!='')
 		echo '<br>Neue Karte bereits gedruckt:';
 		$qry = "
 		SELECT 
-			tbl_betriebsmittelperson.ausgegebenam
+			tbl_betriebsmittelperson.ausgegebenam, tbl_betriebsmittel.nummer
 		FROM 
 			wawi.tbl_betriebsmittel 
 			JOIN wawi.tbl_betriebsmittelperson USING(betriebsmittel_id) 
@@ -154,11 +154,13 @@ if($person_id!='')
 			AND tbl_betriebsmittelperson.uid=".$db->db_add_param($row_account->uid)."
 			AND nummer2 is not null";
 		$ausgegeben='';
+		$nummer='';
 		if($result = $db->db_query($qry))
 		{
 			if($row = $db->db_fetch_object($result))
 			{
 				$ausgegeben = $row->ausgegebenam;
+				$nummer = $row->nummer;
 			}
 		}
 		if($db->db_num_rows($result)>0)
@@ -171,6 +173,28 @@ if($person_id!='')
 			echo 'Nein';
 		else
 			echo 'Ja ( '.$datum_obj->formatDatum($ausgegeben,'d.m.Y').' )';
+			
+		echo '<br>Neue Karte bereits aktiv (im LDAP): ';
+		if($nummer!='')
+		{
+			if($uidldap = getUidFromCardNumber($nummer))
+			{
+				if($uidldap==$row_account->uid)
+				{
+					echo 'Ja';
+				}
+				else
+				{
+					echo 'Ja, aber bei UID '.$uidldap;
+				}
+			}
+			else
+			{
+				echo 'Nein';
+			}		
+		}
+		else
+			echo 'Nein';
 	}
 	 
 }
diff --git a/vilesci/personen/personendetails.php b/vilesci/personen/personendetails.php
index 60b36471e..f26d5a38c 100644
--- a/vilesci/personen/personendetails.php
+++ b/vilesci/personen/personendetails.php
@@ -80,6 +80,7 @@ echo "Name: $person->titelpre $person->nachname $person->vorname $person->titelp
 echo "Geburtsdatum: ".$datum_obj->formatDatum($person->gebdatum,'d.m.Y')."<br>";
 echo "Geschlecht: ".$person->geschlecht."<br>";
 
+echo '<br><a href="../fhausweis/search.php?person_id='.$person->person_id.'">Statusinformation - FH Ausweis</a><br>';
 $kontakt = new kontakt();
 $kontakt->load_pers($person->person_id);
 echo '<h3>Kontaktdaten</h3>';