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

Bugfixes Firmenverwaltung neu

Browse Source
This commit is contained in:
Andreas Österreicher
2010-03-30 12:14:16 +00:00
parent 14972fdf46
commit 7d8d6fe0a1
7 changed files with 55 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/softgrid.php
+13 -28
View File
@@ -23,8 +23,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
*/
// ---------------- CIS Include Dateien einbinden
require_once('../../../config/cis.config.inc.php');
require_once('../../../config/cis.config.inc.php');
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
@@ -93,28 +92,15 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
$cSoftGridApplicationsRoot=array('%CSIDL_PROGRAMS%\\SoftGrid Applications\\','%CSIDL_PROGRAMS%\\SoftGrid Applications');
$debug=trim((isset($_REQUEST['debug']) ? $_REQUEST['debug']:false));
# $cXMLFile=trim((isset($_REQUEST['xml']) ? $_REQUEST['xml']:'AppList.xml'));
if ($_SERVER["SERVER_NAME"]=="dav.technikum-wien.at" || $_SERVER["SERVER_NAME"]=="calva.technikum-wien.at")
{
$cXMLFile=trim((isset($_REQUEST['xml']) ? $_REQUEST['xml']: dirname(__FILE__).'/AppList.xml'));
if (!is_file($cXMLFile) && !stristr($cXMLFile,'http') )
{
$cXMLFile="/var/www/htdocs/simane/test/appllist/AppList.xml";
}
}
else
{
$cXMLFile=trim((isset($_REQUEST['xml']) ? $_REQUEST['xml']:'../../../documents/infrastruktur/AppList.xml'));
if (!is_file($cXMLFile) && !stristr($cXMLFile,'http') )
{
if (is_file("AppList.xml") )
{
$cXMLFile="AppList.xml";
}
}
}
$cXMLFile=trim((isset($_REQUEST['xml']) ? $_REQUEST['xml']:'../../../documents/infrastruktur/AppList.xml'));
if (!is_file($cXMLFile) && !stristr($cXMLFile,'http') )
{
if (is_file("AppList.xml") )
{
$cXMLFile="AppList.xml";
}
}
if (!is_file($cXMLFile) && !stristr($cXMLFile,'http') )
{
@@ -293,7 +279,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
if (empty($tmp_value['SecondLevel']))
{
$cHTML.='<tr class="'.$cClass.'">';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'blank.png\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'&nbsp;</td>';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'../../../skin/images/blank.gif\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'&nbsp;</td>';
$cHTML.='</tr>';
}
else if ($cLastSecondLevel!=strtolower($tmp_value['SecondLevel']))
@@ -323,7 +309,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
$cHTML.='</table></td></tr>';
$cHTML.='</table>';
echo $cHTML;
exit;
function SecondLevel($arrAPPMENUE,$cSearchSecondLevel)
{
@@ -359,7 +344,7 @@ exit;
if (empty($tmp_value['ThirdLevel']))
{
$cHTML.='<tr class="'.$cClass.'">';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'blank.png\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'</td>';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'../../../skin/images/blank.gif\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'</td>';
$cHTML.='</tr>';
}
else if ($cLastThirdLevel!=strtolower($tmp_value['ThirdLevel']))
@@ -428,7 +413,7 @@ exit;
if (empty($tmp_value['FourthLevel']))
{
$cHTML.='<tr class="'.$cClass.'">';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'blank.png\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'</td>';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'../../../skin/images/blank.gif\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'</td>';
$cHTML.='</tr>';
}
else if ($cLastFourthLevel!=strtolower($tmp_value['FourthLevel']))
@@ -495,7 +480,7 @@ exit;
$cClass='row2';
}
$cHTML.='<tr class="'.$cClass.'">';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'blank.png\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'</td>';
$cHTML.='<td class="'.$cClass.'">'.(!empty($tmp_value['Icon'])?'<img onError="this.onerror=null;this.src=\'../../../skin/images/blank.gif\';" height="16" src="'.$tmp_value['Icon'].'" alt="Icon" />':'').'&nbsp;'.$tmp_value['APPHref'].'</td>';
$cHTML.='</tr>';
}
$cHTML.='</table>';
include/firma.class.php
+4 -3
View File
@@ -393,9 +393,10 @@ class firma extends basis_db
$qry.=" distinct on(firma_id)";
$qry.=" tbl_firma.firma_id,tbl_firma.* ,tbl_standort.kurzbz,tbl_standort.adresse_id,tbl_standort.standort_id,tbl_standort.bezeichnung ";
$qry.=" ,person_id, tbl_adresse.name as adress_name, strasse, plz, ort, gemeinde,nation,typ,heimatadresse,zustelladresse ";
$qry.=" FROM public.tbl_firma, public.tbl_standort ";
$qry.=" left outer join public.tbl_adresse on ( tbl_adresse.adresse_id=tbl_standort.adresse_id ) ";
$qry.=" WHERE tbl_standort.firma_id=tbl_firma.firma_id ";
$qry.=" FROM public.tbl_firma";
$qry.=" LEFT JOIN public.tbl_standort USING(firma_id) ";
$qry.=" LEFT JOIN public.tbl_adresse on ( tbl_adresse.adresse_id=tbl_standort.adresse_id ) ";
$qry.=" WHERE 1=1";
if($filter!='')
$qry.= " and ( lower(tbl_firma.name) like lower('%$filter%')
include/konto.class.php
+1 -1
View File
@@ -393,7 +393,7 @@ class konto extends basis_db
* Liefert alle Buchungstypen
* @return true wenn ok, false wenn Fehler
*/
public function getBuchungstyp($aktiv)
public function getBuchungstyp($aktiv=null)
{
$qry = "SELECT * FROM public.tbl_buchungstyp";
include/mitarbeiter.class.php
+1 -1
View File
@@ -849,7 +849,7 @@ class mitarbeiter extends benutzer
public function getMitarbeiterOrganisationseinheit($oe_kurzbz)
{
$sql_query="SELECT DISTINCT campus.vw_mitarbeiter.uid, titelpre, titelpost, vorname, vornamen, nachname, gebdatum, gebort, gebzeit, anmerkung, aktiv,
homepage, updateamum, updatevon, personalnummer, kurzbz, lektor, fixangestellt, standort_id, telefonklappe FROM campus.vw_mitarbeiter
homepage, vw_mitarbeiter.updateamum, vw_mitarbeiter.updatevon, personalnummer, kurzbz, lektor, fixangestellt, standort_id, telefonklappe FROM campus.vw_mitarbeiter
JOIN public.tbl_benutzerfunktion USING (uid)
WHERE funktion_kurzbz='oezuordnung' AND oe_kurzbz='".addslashes($oe_kurzbz)."' AND
(tbl_benutzerfunktion.datum_von is null OR tbl_benutzerfunktion.datum_von<=now()) AND
include/moodle_course.class.php
+1 -1
View File
@@ -1566,7 +1566,7 @@ class moodle_course extends basis_db
}
}
}
var_dump($courses);
return $courses;
}
include/tw/cis_menu_main.inc.php
-4
View File
@@ -374,10 +374,6 @@
<td class="tdwidth10" nowrap>&nbsp;</td>
<td class="tdwrap"><a href="?Medienaustattung" class="MenuItem" onClick="return(js_toggle_container('Medienaustattung'));"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;Medienaustattung</a>
<table class="tabcontent" id="Medienaustattung" style="display: none">
<tr>
<td class="tdwidth10" nowrap>&nbsp;</td>
<td class="tdwrap"><a class="Item" href="private/tools/inventar.php" target="content"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;Inventar</a></td>
</tr>
<tr>
<td class="tdwidth10" nowrap>&nbsp;</td>
<td class="tdwrap"><a class="Item" href="public/info/medien/medienausstattung_fixer_pc.html" target="content"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;Fixer PC</a></td>
system/checksystem.php
+35 -33
View File
@@ -403,11 +403,11 @@ if(!@$db->db_query("SELECT steuernummer FROM public.tbl_firma LIMIT 1;"))
ALTER TABLE public.tbl_standort ALTER COLUMN kurzbz DROP NOT NULL;
-- vorhandene Standorte als Firmen anlegen
-- verknuepfung Standort/Firma richtigstellen
INSERT INTO public.tbl_firmentyp(firmentyp_kurzbz, beschreibung) VALUES('Intern','Intern');
INSERT INTO public.tbl_firma(firmentyp_kurzbz, name, schule, steuernummer, anmerkung, gesperrt, aktiv, ext_id)
SELECT 'Intern', kurzbz, false, null, null, false, true, standort_id FROM public.tbl_standort;
UPDATE public.tbl_firma set firmentyp_kurzbz='Intern', ext_id=(SELECT standort_id FROM public.tbl_adresse JOIN public.tbl_standort USING(adresse_id) WHERE tbl_adresse.firma_id=tbl_firma.firma_id)
WHERE firma_id in(SELECT tbl_adresse.firma_id FROM public.tbl_standort JOIN public.tbl_adresse USING(adresse_id));
UPDATE public.tbl_standort SET bezeichnung=kurzbz WHERE bezeichnung is null;
@@ -544,7 +544,7 @@ if(!@$db->db_query("SELECT steuernummer FROM public.tbl_firma LIMIT 1;"))
GRANT SELECT ON campus.vw_mitarbeiter TO web;
-- Syncronisieren der Daten
-- Firmenkontakte in tbl_kontakt auslagern
-- EMail
INSERT INTO public.tbl_kontakt(standort_id, kontakttyp, kontakt, insertamum, insertvon, updateamum, updatevon)
@@ -561,6 +561,7 @@ if(!@$db->db_query("SELECT steuernummer FROM public.tbl_firma LIMIT 1;"))
SELECT standort_id, 'fax', fax, tbl_firma.insertamum, tbl_firma.insertvon, now(), 'checksystem' FROM
public.tbl_firma JOIN public.tbl_standort USING(firma_id) WHERE fax is not null AND fax<>'';
UPDATE public.tbl_kontakt SET standort_id=(SELECT standort_id FROM public.tbl_standort WHERE firma_id=tbl_kontakt.firma_id LIMIT 1) WHERE firma_id IS NOT NULL;
-- Spalten entfernen
@@ -579,42 +580,43 @@ if(!@$db->db_query("SELECT steuernummer FROM public.tbl_firma LIMIT 1;"))
if(!$db->db_query($qry))
echo '<strong>Firmenverwaltung: '.$db->db_last_error().'</strong><br>';
else
{
echo 'Tabellen fuer neue Firmenverwaltung hinzugefuegt!<br>';
//Adressen der Firmen Syncronisieren
$qry = "
SELECT
adresse, tbl_firma.insertamum, tbl_firma.insertvon, standort_id
FROM
public.tbl_firma JOIN public.tbl_standort USING(firma_id)
WHERE
tbl_firma.adresse IS NOT NULL
AND tbl_firma.adresse<>''
AND tbl_standort.adresse_id IS NULL";
if($result = $db->db_query($qry))
{
while($row = $db->db_fetch_object($result))
//Adressen der Firmen Syncronisieren
$qry = "
SELECT
adresse, tbl_firma.insertamum, tbl_firma.insertvon, standort_id
FROM
public.tbl_firma JOIN public.tbl_standort USING(firma_id)
WHERE
tbl_firma.adresse IS NOT NULL
AND tbl_firma.adresse<>''
AND tbl_standort.adresse_id IS NULL";
if($result = $db->db_query($qry))
{
$qry = "INSERT INTO public.tbl_adresse(strasse, typ, heimatadresse,
zustelladresse, updateamum, updatevon, insertamum, insertvon)
VALUES('".addslashes($row->adresse)."', 'f', false, true, now(), 'checksystem',
".($row->insertamum!=''?"'".addslashes($row->insertamum)."'":'null').",'".addslashes($row->insertvon)."');
UPDATE public.tbl_standort SET adresse_id=currval('public.tbl_adresse_adresse_id_seq') WHERE standort_id='".$row->standort_id."';";
if(!$db->db_query($qry))
while($row = $db->db_fetch_object($result))
{
echo 'Fehler beim Syncronisieren der Adress-Daten:'.$qry;
$qry = "INSERT INTO public.tbl_adresse(strasse, typ, heimatadresse,
zustelladresse, updateamum, updatevon, insertamum, insertvon)
VALUES('".addslashes($row->adresse)."', 'f', false, true, now(), 'checksystem',
".($row->insertamum!=''?"'".addslashes($row->insertamum)."'":'null').",'".addslashes($row->insertvon)."');
UPDATE public.tbl_standort SET adresse_id=currval('public.tbl_adresse_adresse_id_seq') WHERE standort_id='".$row->standort_id."';";
if(!$db->db_query($qry))
{
echo 'Fehler beim Syncronisieren der Adress-Daten:'.$qry;
}
}
}
//Adressfeld entfernen
$qry = "ALTER TABLE public.tbl_firma DROP COLUMN adresse;";
if(!$db->db_query($qry))
{
echo 'Fehler beim Loeschen der Spalte adresse';
}
}
//Adressfeld entfernen
$qry = "ALTER TABLE public.tbl_firma DROP COLUMN adresse;";
if(!$db->db_query($qry))
{
echo 'Fehler beim Loeschen der Spalte adresse';
}
}
if(!@$db->db_query("SELECT mailverteiler FROM public.tbl_organisationseinheit LIMIT 1;"))