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" />
+
+
@@ -142,6 +146,7 @@ else
+
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('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 '
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__
\n";
+ //print "bind:__FAILED__
\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
";
+ //print "failure: search in LDAP-tree failed
";
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
";
+ //print "failure: search in LDAP-tree failed
";
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
";
+ //print "failure: search in LDAP-tree failed
";
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
";
+ //print "failure: search in LDAP-tree failed
";
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
";
+ //print "failure: search in LDAP-tree failed
";
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
";
+ //print "failure: search in LDAP-tree failed
";
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
";
+ //print "failure: search in LDAP-tree failed
";
return false;
}
if (ldap_count_entries($connect, $res_id) == 0)
{
- print "failure: no person found
";
+ //print "failure: no person found
";
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)
convertISODate($row->ausgegebenam).']]>
retouram.']]>
convertISODate($row->retouram).']]>
+ uid.']]>
';
diff --git a/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi b/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
new file mode 100755
index 000000000..ea79914b2
Binary files /dev/null and b/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi differ
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 @@
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar b/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
new file mode 100755
index 000000000..ad36b2cab
Binary files /dev/null and b/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar differ
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 @@
+
+
+
+ {84cb81c9-6c90-4654-b2c4-87cdaa829281}
+ Planner
+ 1.0
+ Planner
+
+
+ content/
+ skin/
+
+
+
+
+ {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+ 1.7
+ 1.8+
+
+
+
+
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 '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 '
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 '
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')."
";
echo "Geschlecht: ".$person->geschlecht."
";
+echo '
Statusinformation - FH Ausweis
';
$kontakt = new kontakt();
$kontakt->load_pers($person->person_id);
echo 'Kontaktdaten
';