blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

- XPI für Planner

Browse Source 
- Personendetails für Mitarbeiter im FAS hinzugefügt
- Personendetails enthält nun einen Link zur Statusseite für den FH-Ausweis
- Status FH-Ausweis prüft nun auch ob die Karte bereits im LDAP angelegt ist
- Betriebsmittel Tab im FAS zeigt nun die UID als zusätzliche Spalte an
This commit is contained in:
Andreas Österreicher
2012-06-29 08:20:27 +00:00
parent 552fe36f14
commit 3b44a40ee5
13 changed files with 148 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/betriebsmitteloverlay.xul.php
+5
View File
@@ -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>
content/mitarbeiter/mitarbeiteroverlay.js.php
+10
View File
@@ -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','');
}
content/mitarbeiter/mitarbeiteroverlay.xul.php
+1
View File
@@ -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>
include/functions.inc.php
+9 -9
View File
@@ -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;
}
}
rdf/betriebsmittelperson.rdf.php
+1
View File
@@ -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>';
vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
Executable
BIN
View File
Binary file not shown.
vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
Executable
+17
View File
@@ -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>
vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
Executable
+12
View File
@@ -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>
vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
Executable
BIN
View File
Binary file not shown.
vilesci/admin/XPI/PlannerProduktiv/install.js
Executable
+43
View File
@@ -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);
}
vilesci/admin/XPI/PlannerProduktiv/install.rdf
Executable
+23
View File
@@ -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>
vilesci/fhausweis/search.php
+26 -2
View File
@@ -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';
}
}
vilesci/personen/personendetails.php
+1
View File
@@ -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>';