mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-21 08:52:21 +00:00
This commit is contained in:
@@ -51,6 +51,8 @@ $save = (isset($_REQUEST['save'])?$_REQUEST['save']:null);
|
||||
$work = (isset($_REQUEST['work'])?$_REQUEST['work']:(isset($_REQUEST['save'])?$_REQUEST['save']:null));
|
||||
$ajax = (isset($_REQUEST['ajax'])?$_REQUEST['ajax']:null);
|
||||
|
||||
$neu = (isset($_REQUEST['neu'])?$_REQUEST['neu']:null);
|
||||
|
||||
// Defaultwerte
|
||||
$adresstyp_arr = array('h'=>'Hauptwohnsitz','n'=>'Nebenwohnsitz','f'=>'Firma',''=>'');
|
||||
$errorstr='';
|
||||
@@ -227,8 +229,8 @@ div.css-panes div {
|
||||
</head>
|
||||
<body style="background-color:#eeeeee;">
|
||||
<?php
|
||||
if (empty($firma_id))
|
||||
exit('');
|
||||
/*if (empty($firma_id))
|
||||
exit('ka firma');*/
|
||||
|
||||
##echo "$work <br>";
|
||||
|
||||
@@ -252,22 +254,23 @@ div.css-panes div {
|
||||
if (is_numeric($status))
|
||||
$firma_id=$status;
|
||||
if (!$ajax)
|
||||
echo getFirmadetail($firma_id,$adresstyp_arr,$user);
|
||||
echo getFirmadetail($firma_id,$adresstyp_arr,$user,$neu);
|
||||
else if (is_numeric($status))
|
||||
echo "Daten erfolgreich gespeichert";
|
||||
if (!is_numeric($status))
|
||||
echo $status;
|
||||
break;
|
||||
default:
|
||||
echo getFirmadetail($firma_id,$adresstyp_arr,$user);
|
||||
echo getFirmadetail($firma_id,$adresstyp_arr,$user,$neu);
|
||||
break;
|
||||
}
|
||||
echo ($errorstr?'<br>'.$errorstr:'');
|
||||
echo '<script language="JavaScript1.2" type="text/javascript">
|
||||
/*Führt zu "Rückkopplung" im Frame 0 - große Suchkriterien werden nicht angenommen
|
||||
echo '<script language="JavaScript1.2" type="text/javascript">
|
||||
<!--
|
||||
parent.frames[0].location.reload();
|
||||
-->
|
||||
</script>';
|
||||
</script>';*/
|
||||
?>
|
||||
|
||||
</body>
|
||||
@@ -276,125 +279,130 @@ echo '<script language="JavaScript1.2" type="text/javascript">
|
||||
/*
|
||||
Firmenliste - lt. Suchekriterien
|
||||
*/
|
||||
function getFirmadetail($firma_id,$adresstyp_arr,$user)
|
||||
function getFirmadetail($firma_id, $adresstyp_arr, $user, $neu)
|
||||
{
|
||||
if (!$db = new basis_db())
|
||||
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
|
||||
// Init
|
||||
$htmlstr='';
|
||||
// Datenlesen zur Firma
|
||||
$firma = new firma();
|
||||
if($firma_id!='' && is_numeric($firma_id) )
|
||||
if($firma_id!='' || $neu=='true')
|
||||
{
|
||||
if (!$firma->load($firma_id))
|
||||
return '<br>Firma mit der ID <b>'.$firma_id.'</b> existiert nicht';
|
||||
}
|
||||
else
|
||||
{
|
||||
//Bei neuen Firmen wird standardmaessig Partnerfirma ausgewaehlt
|
||||
$firma->firmentyp_kurzbz='Partnerfirma';
|
||||
$firma->aktiv=true;
|
||||
$firma->gesperrt=false;
|
||||
$firma->schule=false;
|
||||
}
|
||||
|
||||
$htmlstr.="<form id='addFirma' name='addFirma' action='firma_details.php' method='POST'>\n";
|
||||
$htmlstr.="<input type='hidden' name='work' value='saveFirma'>\n";
|
||||
$htmlstr.="<input type='hidden' name='firma_id' value='".$firma->firma_id."'>\n";
|
||||
// Firma Detailanzeige
|
||||
$htmlstr.="<table class='detail' style='padding-top:10px;'>\n";
|
||||
$htmlstr.="<tr><td><table width='100%'><tr>\n";
|
||||
$htmlstr.="<td>Typ: </td>";
|
||||
$htmlstr.="<td><select name='typ'>\n";
|
||||
|
||||
$qry = "SELECT firmentyp_kurzbz FROM public.tbl_firmentyp ORDER BY firmentyp_kurzbz";
|
||||
if($result = $db->db_query($qry))
|
||||
{
|
||||
while($row = $db->db_fetch_object($result))
|
||||
if (!$db = new basis_db())
|
||||
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
|
||||
// Init
|
||||
$htmlstr='';
|
||||
// Datenlesen zur Firma
|
||||
$firma = new firma();
|
||||
if($firma_id!='' && is_numeric($firma_id))
|
||||
{
|
||||
$htmlstr.="<option value='".$row->firmentyp_kurzbz."' ".($firma->firmentyp_kurzbz == $row->firmentyp_kurzbz?' selected ':'').">".$row->firmentyp_kurzbz."</option>";
|
||||
if (!$firma->load($firma_id))
|
||||
return '<br>Firma mit der ID <b>'.$firma_id.'</b> existiert nicht';
|
||||
}
|
||||
else
|
||||
{
|
||||
//Bei neuen Firmen wird standardmaessig Partnerfirma ausgewaehlt
|
||||
$firma->firmentyp_kurzbz='Partnerfirma';
|
||||
$firma->aktiv=true;
|
||||
$firma->gesperrt=false;
|
||||
$firma->schule=false;
|
||||
}
|
||||
|
||||
$htmlstr.="<form id='addFirma' name='addFirma' action='firma_details.php' method='POST'>\n";
|
||||
$htmlstr.="<input type='hidden' name='work' value='saveFirma'>\n";
|
||||
$htmlstr.="<input type='hidden' name='firma_id' value='".$firma->firma_id."'>\n";
|
||||
// Firma Detailanzeige
|
||||
$htmlstr.="<table class='detail' style='padding-top:10px;'>\n";
|
||||
$htmlstr.="<tr><td><table width='100%'><tr>\n";
|
||||
$htmlstr.="<td>Typ: </td>";
|
||||
$htmlstr.="<td><select name='typ'>\n";
|
||||
|
||||
$qry = "SELECT firmentyp_kurzbz FROM public.tbl_firmentyp ORDER BY firmentyp_kurzbz";
|
||||
if($result = $db->db_query($qry))
|
||||
{
|
||||
while($row = $db->db_fetch_object($result))
|
||||
{
|
||||
$htmlstr.="<option value='".$row->firmentyp_kurzbz."' ".($firma->firmentyp_kurzbz == $row->firmentyp_kurzbz?' selected ':'').">".$row->firmentyp_kurzbz."</option>";
|
||||
}
|
||||
}
|
||||
$htmlstr.="</select></td>";
|
||||
$htmlstr.="<td> </td>";
|
||||
$htmlstr.="<td>Name: </td>";
|
||||
$htmlstr.="<td><input type='text' name='name' value='".$firma->name."' size='80' maxlength='128' /></td>\n";
|
||||
//$htmlstr.="<td> </td>";
|
||||
if($firma_id!='' && is_numeric($firma_id) )
|
||||
$htmlstr.="<td align='center' width='20%'><input type='Button' onclick=\"workFirmaDetail('addFirmaInfo', 0);\" name='save' value='speichern'></td>\n";
|
||||
else
|
||||
$htmlstr.="<td align='center' width='20%'><input type='submit' name='save' value='anlegen'></td>\n";
|
||||
$htmlstr.="</tr></table></td>";
|
||||
//$htmlstr.="<td rowspan='2'><table><tr>\n";
|
||||
//$htmlstr.="<td valign='top'>Anmerkung: </td>";
|
||||
//$htmlstr.="<td><textarea cols='40' style='width:100%' name='anmerkung'/>".$firma->anmerkung."</textarea></td>\n";
|
||||
// Unterscheiden der Wartung - Neuanlage = Submit, Aendern = Ajax
|
||||
//if($firma_id!='' && is_numeric($firma_id) )
|
||||
// $htmlstr.="<td> </td><td valign='bottom'><input type='Button' onclick=\"workFirmaDetail('addFirmaInfo');\" name='save' value='speichern'></td>\n";
|
||||
//else
|
||||
// $htmlstr.="<td> </td><td valign='bottom'><input type='submit' name='save' value='anlegen'></td>\n";
|
||||
|
||||
//$htmlstr.="</tr></table></td>";
|
||||
$htmlstr.="</tr>\n";
|
||||
$htmlstr.="<tr><td><table><tr>\n";
|
||||
$htmlstr.="<td>Steuernummer: </td>";
|
||||
$htmlstr.="<td><input size='32' maxlength='32' type='text' name='steuernummer' value=".$firma->steuernummer."></td>\n";
|
||||
$htmlstr.="<td> </td>";
|
||||
$htmlstr.="<td>Finanzamt: </td>";
|
||||
// Finanzamt anzeige und suche
|
||||
$firma_finanzamt = new firma();
|
||||
$firmentyp_finanzamt='Finanzamt';
|
||||
$firma_finanzamt->searchFirma('',$firmentyp_finanzamt);
|
||||
#var_dump($firma_finanzamt);
|
||||
$htmlstr.="<td><select name='finanzamt'>";
|
||||
$htmlstr.="<option value=''> </option>";
|
||||
foreach ($firma_finanzamt->result as $row_finazamt)
|
||||
$htmlstr.=" <option value='".$row_finazamt->standort_id ."'>".$row_finazamt->bezeichnung." </option>";
|
||||
$htmlstr.="</select></td>\n";
|
||||
|
||||
$htmlstr.="<td>Aktiv: </td>";
|
||||
$htmlstr.="<td><input ".($firma->aktiv?' style="background-color: #E3FDEE;" ':' style="background-color: #FFF4F4;" ')." type='checkbox' name='aktiv' ".($firma->aktiv?'checked':'')."></td>\n";
|
||||
$htmlstr.="<td> </td>\n";
|
||||
|
||||
$htmlstr.="<td>Gesperrt: </td>";
|
||||
$user = get_uid();
|
||||
//Zugriffsrechte pruefen
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($user);
|
||||
if($rechte->isBerechtigt('basis/firma',null, 'suid'))
|
||||
{
|
||||
$htmlstr.="<td><input ".($firma->gesperrt?' style="background-color: #FFF4F4;" ':' style="background-color: #E3FDEE;" ')." type='checkbox' name='gesperrt' ".($firma->gesperrt?'checked':'')."></td>\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$htmlstr.="<td><input ".($firma->gesperrt?' style="background-color: #FFF4F4;" ':' style="background-color: #E3FDEE;" ')." type='checkbox' name='gesperrt' ".($firma->gesperrt?'checked':'')." disabled></td>\n";
|
||||
}
|
||||
$htmlstr.="<td> </td>\n";
|
||||
|
||||
$htmlstr.="<td>Schule:</td>";
|
||||
$htmlstr.="<td><input ".($firma->schule?' style="background-color: #E3FDEE;" ':' style="background-color: #FFF4F4;" ')." type='checkbox' name='schule' ".($firma->schule?'checked':'')."> </td>";
|
||||
$htmlstr.="<td> </td>";
|
||||
|
||||
$htmlstr.="</tr></table></td>";
|
||||
$htmlstr.="</tr>\n";
|
||||
$htmlstr.=" </table>\n";
|
||||
$htmlstr.="</form>\n";
|
||||
|
||||
$htmlstr.='<div id="addFirmaInfo"></div>';
|
||||
|
||||
|
||||
$htmlstr.='
|
||||
<!-- Tabs -->
|
||||
<ul class="css-tabs">
|
||||
<li><a href="firma_details.php?work=standortliste&firma_id='.$firma_id.'">Standorte</a></li>
|
||||
<li><a href="firma_details.php?work=organisationliste&firma_id='.$firma_id.'">Organisationseinheit</a></li>
|
||||
<li><a href="firma_details.php?work=anmerkungsfeld&firma_id='.$firma_id.'">Anmerkungen</a></li>
|
||||
</ul>
|
||||
<div class="css-panes">
|
||||
<div style="display:block"></div>
|
||||
</div>
|
||||
<div id="detailstandort"> </div>
|
||||
';
|
||||
|
||||
return $htmlstr;
|
||||
}
|
||||
$htmlstr.="</select></td>";
|
||||
$htmlstr.="<td> </td>";
|
||||
$htmlstr.="<td>Name: </td>";
|
||||
$htmlstr.="<td><input type='text' name='name' value='".$firma->name."' size='80' maxlength='128' /></td>\n";
|
||||
//$htmlstr.="<td> </td>";
|
||||
if($firma_id!='' && is_numeric($firma_id) )
|
||||
$htmlstr.="<td align='center' width='20%'><input type='Button' onclick=\"workFirmaDetail('addFirmaInfo', 0);\" name='save' value='speichern'></td>\n";
|
||||
else
|
||||
$htmlstr.="<td align='center' width='20%'><input type='submit' name='save' value='anlegen'></td>\n";
|
||||
$htmlstr.="</tr></table></td>";
|
||||
//$htmlstr.="<td rowspan='2'><table><tr>\n";
|
||||
//$htmlstr.="<td valign='top'>Anmerkung: </td>";
|
||||
//$htmlstr.="<td><textarea cols='40' style='width:100%' name='anmerkung'/>".$firma->anmerkung."</textarea></td>\n";
|
||||
// Unterscheiden der Wartung - Neuanlage = Submit, Aendern = Ajax
|
||||
//if($firma_id!='' && is_numeric($firma_id) )
|
||||
// $htmlstr.="<td> </td><td valign='bottom'><input type='Button' onclick=\"workFirmaDetail('addFirmaInfo');\" name='save' value='speichern'></td>\n";
|
||||
//else
|
||||
// $htmlstr.="<td> </td><td valign='bottom'><input type='submit' name='save' value='anlegen'></td>\n";
|
||||
|
||||
//$htmlstr.="</tr></table></td>";
|
||||
$htmlstr.="</tr>\n";
|
||||
$htmlstr.="<tr><td><table><tr>\n";
|
||||
$htmlstr.="<td>Steuernummer: </td>";
|
||||
$htmlstr.="<td><input size='32' maxlength='32' type='text' name='steuernummer' value=".$firma->steuernummer."></td>\n";
|
||||
$htmlstr.="<td> </td>";
|
||||
$htmlstr.="<td>Finanzamt: </td>";
|
||||
// Finanzamt anzeige und suche
|
||||
$firma_finanzamt = new firma();
|
||||
$firmentyp_finanzamt='Finanzamt';
|
||||
$firma_finanzamt->searchFirma('',$firmentyp_finanzamt);
|
||||
#var_dump($firma_finanzamt);
|
||||
$htmlstr.="<td><select name='finanzamt'>";
|
||||
$htmlstr.="<option value=''> </option>";
|
||||
foreach ($firma_finanzamt->result as $row_finazamt)
|
||||
$htmlstr.=" <option value='".$row_finazamt->standort_id ."'>".$row_finazamt->bezeichnung." </option>";
|
||||
$htmlstr.="</select></td>\n";
|
||||
|
||||
$htmlstr.="<td>Aktiv: </td>";
|
||||
$htmlstr.="<td><input ".($firma->aktiv?' style="background-color: #E3FDEE;" ':' style="background-color: #FFF4F4;" ')." type='checkbox' name='aktiv' ".($firma->aktiv?'checked':'')."></td>\n";
|
||||
$htmlstr.="<td> </td>\n";
|
||||
|
||||
$htmlstr.="<td>Gesperrt: </td>";
|
||||
$user = get_uid();
|
||||
//Zugriffsrechte pruefen
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($user);
|
||||
if($rechte->isBerechtigt('basis/firma',null, 'suid'))
|
||||
{
|
||||
$htmlstr.="<td><input ".($firma->gesperrt?' style="background-color: #FFF4F4;" ':' style="background-color: #E3FDEE;" ')." type='checkbox' name='gesperrt' ".($firma->gesperrt?'checked':'')."></td>\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$htmlstr.="<td><input ".($firma->gesperrt?' style="background-color: #FFF4F4;" ':' style="background-color: #E3FDEE;" ')." type='checkbox' name='gesperrt' ".($firma->gesperrt?'checked':'')." disabled></td>\n";
|
||||
}
|
||||
$htmlstr.="<td> </td>\n";
|
||||
|
||||
$htmlstr.="<td>Schule:</td>";
|
||||
$htmlstr.="<td><input ".($firma->schule?' style="background-color: #E3FDEE;" ':' style="background-color: #FFF4F4;" ')." type='checkbox' name='schule' ".($firma->schule?'checked':'')."> </td>";
|
||||
$htmlstr.="<td> </td>";
|
||||
|
||||
$htmlstr.="</tr></table></td>";
|
||||
$htmlstr.="</tr>\n";
|
||||
$htmlstr.=" </table>\n";
|
||||
$htmlstr.="</form>\n";
|
||||
|
||||
$htmlstr.='<div id="addFirmaInfo"></div>';
|
||||
|
||||
$htmlstr.='
|
||||
<!-- Tabs -->
|
||||
<ul class="css-tabs">
|
||||
<li><a href="firma_details.php?work=standortliste&firma_id='.$firma_id.'">Standorte</a></li>
|
||||
<li><a href="firma_details.php?work=organisationliste&firma_id='.$firma_id.'">Organisationseinheit</a></li>
|
||||
<li><a href="firma_details.php?work=anmerkungsfeld&firma_id='.$firma_id.'">Anmerkungen</a></li>
|
||||
</ul>
|
||||
<div class="css-panes">
|
||||
<div style="display:block"></div>
|
||||
</div>
|
||||
<div id="detailstandort"> </div>
|
||||
';
|
||||
return $htmlstr;
|
||||
}
|
||||
// ----------------------------------------------------------------------------------------------------------------------------------
|
||||
/*
|
||||
@@ -567,17 +575,15 @@ function getStandortliste($firma_id,$adresstyp_arr,$user)
|
||||
*/
|
||||
function getOrganisationsliste($firma_id,$adresstyp_arr,$user)
|
||||
{
|
||||
|
||||
// Init
|
||||
$htmlstr='';
|
||||
// Plausib
|
||||
if (empty($firma_id) || !is_numeric($firma_id) )
|
||||
return 'Firma fehlt.';
|
||||
|
||||
// Datenlesen zur Firma
|
||||
$firma = new firma();
|
||||
if (!$firma->get_firmaorganisationseinheit($firma_id))
|
||||
return '<br>Firma ID <b>'.$firma_id.'</b> '.$firma->errormsg;;
|
||||
|
||||
|
||||
|
||||
## var_dump($firma);
|
||||
$htmlstr.= '<table class="liste">
|
||||
<tr>
|
||||
@@ -589,6 +595,10 @@ function getOrganisationsliste($firma_id,$adresstyp_arr,$user)
|
||||
<input type="Button" value="Neuanlage" name="work"></a></td>
|
||||
</tr>
|
||||
';
|
||||
// Datenlesen zur Firma
|
||||
$firma = new firma();
|
||||
if (!$firma->get_firmaorganisationseinheit($firma_id))
|
||||
return $htmlstr;
|
||||
$i=0;
|
||||
foreach ($firma->result as $row)
|
||||
{
|
||||
|
||||
@@ -97,6 +97,7 @@ function creatList($suchen,$filter,$firmentypfilter)
|
||||
$firmentyp_finanzamt='Finanzamt';
|
||||
$firma_finanzamt->errormsg='';
|
||||
$firma_finanzamt->result=array();
|
||||
//echo "Filter: ".$filter." Firmentypfilter: ".$firmentypfilter."<br>";
|
||||
if (!is_null($suchen)) // Nur wenn Suchknopf gedrueckt wurde
|
||||
$firma_finanzamt->searchFirma($filter,$firmentypfilter);
|
||||
|
||||
|
||||
@@ -90,6 +90,7 @@ function show_firma_bleibt(work)
|
||||
$("div#"+wohin).html('<img src="../../skin/images/spinner.gif" alt="warten" title="warten" >');
|
||||
var formdata = $('form#firmaform').serialize();
|
||||
|
||||
|
||||
$.ajax
|
||||
(
|
||||
{
|
||||
@@ -448,11 +449,8 @@ function show_firma_bleibt(work)
|
||||
{
|
||||
if (isset($firmaorganisationseinheit_obj->result[$i]))
|
||||
{
|
||||
if(!array_key_exists($firmaorganisationseinheit_obj->result[$i]->oe_kurzbz,$firmaorganisationseinheit_check))
|
||||
{
|
||||
$firmaorganisationseinheit_check[$firmaorganisationseinheit_obj->result[$i]->oe_kurzbz]=$firmaorganisationseinheit[$i];
|
||||
//echo $firmaorganisationseinheit_obj->result[$i]->oe_kurzbz." ".$firmaorganisationseinheit_check[$firmaorganisationseinheit_obj->result[$i]->oe_kurzbz]."<br>";
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -475,10 +473,10 @@ function show_firma_bleibt(work)
|
||||
|
||||
?>
|
||||
|
||||
<fieldset>
|
||||
<legend>Informationen nach der Zusammenlegung </legend>
|
||||
<fieldset>
|
||||
<legend>Firma <?php echo $firma->firma_id; ?> </legend>
|
||||
<fieldset style="background-color:#B6ffAf;">
|
||||
<legend style="background-color:#B6ffAf;">Informationen nach der Zusammenlegung </legend>
|
||||
<fieldset style="background-color:#c3ffb9;">
|
||||
<legend style="background-color:#c3ffb9;">Firma <?php echo $firma->firma_id; ?> </legend>
|
||||
<?php
|
||||
echo '<table>';
|
||||
echo '<tr><td>'.$firma->firmentyp_kurzbz.' '.$firma->name
|
||||
@@ -507,8 +505,8 @@ function show_firma_bleibt(work)
|
||||
foreach ($kontakt as $key => $val)
|
||||
{
|
||||
?>
|
||||
<fieldset>
|
||||
<legend>Standort <?php echo $key .' der Firma '. $firma->name; ?> </legend>
|
||||
<fieldset style="background-color:#e3ffe1;">
|
||||
<legend style="background-color:#e3ffe1;">Standort <?php echo $key .' der Firma '. $firma->name; ?> </legend>
|
||||
<?php
|
||||
$standort_obj = new standort();
|
||||
$standort_obj->result=array();
|
||||
@@ -570,9 +568,9 @@ function show_firma_bleibt(work)
|
||||
?>
|
||||
<?php } ?>
|
||||
|
||||
<fieldset>
|
||||
<fieldset style="background-color:#e3ffe1;">
|
||||
|
||||
<legend>Organisationseinheit zur Firma <?php echo $firma->name; ?> </legend>
|
||||
<legend style="background-color:#e3ffe1;">Organisationseinheit zur Firma <?php echo $firma->name; ?> </legend>
|
||||
<?php
|
||||
|
||||
if (isset($firmaorganisationseinheit) && is_array($firmaorganisationseinheit) && count($firmaorganisationseinheit) )
|
||||
@@ -625,7 +623,7 @@ function show_firma_bleibt(work)
|
||||
$kontakt = (isset($firmendaten['kontakt'])?$firmendaten['kontakt']:array());
|
||||
$personfunktionstandort = (isset($firmendaten['personfunktionstandort'])?$firmendaten['personfunktionstandort']:array());
|
||||
$firmaorganisationseinheit = (isset($firmendaten['firmaorganisationseinheit'])?$firmendaten['firmaorganisationseinheit']:array());
|
||||
|
||||
|
||||
//Überprüfung auf doppelte Organisationseinheiten
|
||||
$firmaorganisationseinheit_check=array();
|
||||
for ($i=0;$i<count($firmaorganisationseinheit);$i++)
|
||||
@@ -644,7 +642,6 @@ function show_firma_bleibt(work)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Ermitteln der Standorte zu den Firmen - geloescht und bleibt. Wichtiger Teil zum ermitteln welche Standorte entfernt werden sollen
|
||||
$standorte_vorhanden=array();
|
||||
$standort_obj = new standort();
|
||||
@@ -688,7 +685,6 @@ function show_firma_bleibt(work)
|
||||
}
|
||||
} // Ende Standort
|
||||
|
||||
|
||||
// Pruefen ob Kontakte noch einen alten Standort zugewiessen ist
|
||||
$kontakt_check=array();
|
||||
$kontakt_ok=array();
|
||||
@@ -755,7 +751,6 @@ function show_firma_bleibt(work)
|
||||
$personfunktionstandort_ok=null;
|
||||
}
|
||||
|
||||
|
||||
// Welche Kontakte werden entfernt
|
||||
if (is_array($standorte_vorhanden) && count($standorte_vorhanden))
|
||||
{
|
||||
@@ -793,38 +788,71 @@ function show_firma_bleibt(work)
|
||||
$oRresult=$db->SQL('','','','','','','',$qry);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
##return;
|
||||
|
||||
##return;
|
||||
/*
|
||||
if (isset($firmaorganisationseinheit) && is_array($firmaorganisationseinheit) && count($firmaorganisationseinheit) )
|
||||
{
|
||||
$i=0;
|
||||
foreach ($firmaorganisationseinheit as $key => $val)
|
||||
{
|
||||
$firmaorganisationseinheit_obj->result[$i] = new firma();
|
||||
$bleibt->firmaorganisationseinheit=array();
|
||||
if(!$firmaorganisationseinheit_obj->result[$i]->load_firmaorganisationseinheit($val))
|
||||
{
|
||||
echo $firmaorganisationseinheit_obj->errormsg.'<br>';
|
||||
}
|
||||
else if ($firmaorganisationseinheit_obj->result[$i])
|
||||
{
|
||||
//var_dump($firmaorganisationseinheit_obj->result[$i]);
|
||||
echo $firmaorganisationseinheit_obj->result[$i]->firma_organisationseinheit_id.' <b>'.$firmaorganisationseinheit_obj->result[$i]->oe_kurzbz.'</b><br>'.$firmaorganisationseinheit_obj->result[$i]->bezeichnung.', KNr.: '.$firmaorganisationseinheit_obj->result[$i]->kundennummer.'<br>';
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '<font color="red">Keine Organisationseinheit zur Firma !</font><br>';
|
||||
}
|
||||
*/
|
||||
if (isset($firmaorganisationseinheit) && is_array($firmaorganisationseinheit) && count($firmaorganisationseinheit) )
|
||||
{
|
||||
foreach ($firmaorganisationseinheit as $key => $firma_organisationseinheit_id)
|
||||
$i=0;
|
||||
foreach ($firmaorganisationseinheit as $key => $firma_organisationseinheit_id)
|
||||
{
|
||||
$firmaorganisationseinheit_obj->result[$i] = new firma();
|
||||
if(!$firmaorganisationseinheit_obj->result[$i]->load_firmaorganisationseinheit($firma_organisationseinheit_id))
|
||||
{
|
||||
$firmaorganisationseinheit_obj = new firma();
|
||||
if(!$firmaorganisationseinheit_obj->load_firmaorganisationseinheit($firma_organisationseinheit_id))
|
||||
echo 'Firma - Organisationseinheit: '.$firmaorganisationseinheit_obj->errormsg.' ($firma_organisationseinheit_id)<br>';
|
||||
}
|
||||
else if ($firmaorganisationseinheit_obj->result[$i])
|
||||
{
|
||||
var_dump($firmaorganisationseinheit_obj);
|
||||
foreach ($firmaorganisationseinheit_obj->result[$i] as $keys => $vals)
|
||||
{
|
||||
echo 'Firma - Organisationseinheit: '.$firmaorganisationseinheit_obj->errormsg.'<br>';
|
||||
}
|
||||
else if ($firmaorganisationseinheit_obj->result)
|
||||
{
|
||||
foreach ($firmaorganisationseinheit_obj->result as $keys => $vals)
|
||||
// Organisation gehoert bereits zu dieser Firma
|
||||
if ($vals->firma_id==$firma_id_bleibt)
|
||||
continue;
|
||||
$qry='UPDATE public.tbl_firma_organisationseinheit SET '.
|
||||
'firma_id='.addslashes($firma_id_bleibt).', '.
|
||||
'updateamum= now(), '.
|
||||
'updatevon=\''.addslashes($uid).'\' '.
|
||||
" WHERE firma_organisationseinheit_id='".addslashes($vals->firma_organisationseinheit_id)."';";
|
||||
$db->errormsg='';
|
||||
if ($oRresult=$db->SQL('','','','','','','',$qry))
|
||||
{
|
||||
// Organisation gehoert bereits zu dieser Firma
|
||||
if ($vals->firma_id==$firma_id_bleibt)
|
||||
continue;
|
||||
$qry='UPDATE public.tbl_firma_organisationseinheit SET '.
|
||||
'firma_id='.addslashes($firma_id_bleibt).', '.
|
||||
'updateamum= now(), '.
|
||||
'updatevon=\''.addslashes($uid).'\' '.
|
||||
" WHERE firma_organisationseinheit_id='".addslashes($vals->firma_organisationseinheit_id)."';";
|
||||
$db->errormsg='';
|
||||
if ($oRresult=$db->SQL('','','','','','','',$qry))
|
||||
echo 'Organisation '.$vals->firma_organisationseinheit_id.' '.$vals->name.', '. $vals->organisationseinheittyp_kurzbz.' '.$vals->bezeichnung.' zu Firma '.$firma_id_bleibt.' zugeordnet '.'<br>';
|
||||
}
|
||||
echo 'Organisation '.$vals->firma_organisationseinheit_id.' '.$vals->name.', '. $vals->organisationseinheittyp_kurzbz.' '.$vals->bezeichnung.' zu Firma '.$firma_id_bleibt.' zugeordnet '.'<br>';
|
||||
}
|
||||
else
|
||||
{
|
||||
echo 'Fehler bein Zuordnen von Organisation '.$vals->firma_organisationseinheit_id.' '.$vals->name.', '. $vals->organisationseinheittyp_kurzbz.' '.$vals->bezeichnung.' zu Firma '.$firma_id_bleibt.'<br>';
|
||||
echo $db->errormsg."<br>";
|
||||
}
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -851,7 +879,7 @@ function show_firma_bleibt(work)
|
||||
$qry = "DELETE FROM public.tbl_firma_organisationseinheit WHERE firma_organisationseinheit_id='".$vals->firma_organisationseinheit_id."'";
|
||||
$db->errormsg='';
|
||||
if (!$oRresult=$db->SQL('','','','','','','',$qry))
|
||||
echo 'Firma - Organisationseinheit: '.$db->errormsg.'<br>';
|
||||
echo 'Firma - Organisationseinheit: '.$db->errormsg.' (... $firma_organisationseinheit_id)<br>';
|
||||
else
|
||||
echo 'Firma '.$firma_id_bleibt.' Organisationseinheit wurde gelöscht '.$vals->firma_organisationseinheit_id.' '.$vals->name.', '. $vals->organisationseinheittyp_kurzbz.' '.$vals->bezeichnung.'<br>';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user