Änderungen Anschreiben
This commit is contained in:
parent
f8488609a2
commit
3aba14f13d
@ -272,7 +272,7 @@ $pdf->SetY($pos);
|
||||
or die ("Cannot execute query1");
|
||||
|
||||
|
||||
|
||||
$hinweis_umzug_alt=0;
|
||||
while ($row = $result->fetch_array())
|
||||
{
|
||||
$data = Array();
|
||||
@ -335,10 +335,9 @@ $pdf->SetY($pos);
|
||||
|
||||
if($row_alt_aend['umzugsverg'] == 'J'){
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]*";
|
||||
$hinweis_umzug=1;
|
||||
$hinweis_umzug_alt=1;
|
||||
}else{
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
$hinweis_umzug=0;
|
||||
}
|
||||
$data[1]['T_ALIGN'] = "L";
|
||||
$data[1]['V_ALIGN'] = "M";
|
||||
@ -494,7 +493,7 @@ $pdf->SetY($pos);
|
||||
or die ("Cannot execute query1");
|
||||
|
||||
|
||||
|
||||
$hinweis_umzug_neu=0;
|
||||
while ($row = $result->fetch_array())
|
||||
{
|
||||
$data = Array();
|
||||
@ -555,10 +554,9 @@ $pdf->SetY($pos);
|
||||
#$data[0]['T_TYPE'] = "BI"; // B=BOLD, I=ITALIC
|
||||
if($row_neu_aend['umzugsverg'] == 'J'){
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]*";
|
||||
$hinweis_umzug=1;
|
||||
$hinweis_umzug_neu=1;
|
||||
}else{
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
$hinweis_umzug=0;
|
||||
}
|
||||
$data[1]['T_ALIGN'] = "L";
|
||||
$data[1]['V_ALIGN'] = "M";
|
||||
@ -580,7 +578,7 @@ $pdf->SetY($pos);
|
||||
|
||||
$pdf->Draw_Table_Border();
|
||||
|
||||
if($hinweis_umzug == 1){
|
||||
if($hinweis_umzug_alt == 1 or $hinweis_umzug_neu == 1){
|
||||
$pos=$pdf->GetY()+6.4;
|
||||
|
||||
$pdf->SetFont('Arial', '', 12);
|
||||
|
@ -348,7 +348,7 @@ $pdf->SetX(24);
|
||||
or die ("Cannot execute query1");
|
||||
|
||||
}
|
||||
|
||||
$hinweis_umzug=0;
|
||||
while ($row = $result->fetch_array())
|
||||
{
|
||||
|
||||
@ -406,7 +406,6 @@ $pdf->SetX(24);
|
||||
$hinweis_umzug=1;
|
||||
}else{
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
$hinweis_umzug=0;
|
||||
}
|
||||
$data[1]['T_ALIGN'] = "L";
|
||||
$data[1]['V_ALIGN'] = "M";
|
||||
|
@ -301,12 +301,12 @@ $pdf->SetY($pos);
|
||||
or die ("Cannot execute query1e");
|
||||
|
||||
|
||||
|
||||
$hinweis_umzug_alt=0;
|
||||
while ($row = $result->fetch_array())
|
||||
{
|
||||
$data = Array();
|
||||
|
||||
$res_alt_aend = $db->query("SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(ende, '%d.%m.%Y') ende, dst_id, abteilung, e.bezeichnung
|
||||
$res_alt_aend = $db->query("SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(ende, '%d.%m.%Y') ende, dst_id, abteilung, e.bezeichnung, umzugsverg
|
||||
FROM stan_antrag a, stan_vertiefungsbereich e
|
||||
WHERE a.vert_bereich=e.vbid
|
||||
AND a.saaid<'$row[saaid]'
|
||||
@ -362,7 +362,12 @@ $pdf->SetY($pos);
|
||||
$data[0]['V_ALIGN'] = "M"; //T=TOP, M=MIDDLE, B=BOTTOM
|
||||
#$data[0]['T_TYPE'] = "BI"; // B=BOLD, I=ITALIC
|
||||
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
if($row_alt_aend['umzugsverg'] == 'J'){
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]*";
|
||||
$hinweis_umzug_alt=1;
|
||||
}else{
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
}
|
||||
$data[1]['T_ALIGN'] = "L";
|
||||
$data[1]['V_ALIGN'] = "M";
|
||||
|
||||
@ -516,12 +521,12 @@ $pdf->SetY($pos);
|
||||
or die ("Cannot execute query1f");
|
||||
|
||||
|
||||
|
||||
$hinweis_umzug_neu=0;
|
||||
while ($row = $result->fetch_array())
|
||||
{
|
||||
$data = Array();
|
||||
|
||||
$res_neu_aend = $db->query("SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(ende, '%d.%m.%Y') ende, dst_id, abteilung, e.bezeichnung
|
||||
$res_neu_aend = $db->query("SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(ende, '%d.%m.%Y') ende, dst_id, abteilung, e.bezeichnung, umzugsverg
|
||||
FROM stan_antrag a, stan_vertiefungsbereich e
|
||||
WHERE a.vert_bereich=e.vbid
|
||||
AND a.saaid ='$row[saaid]'
|
||||
@ -576,7 +581,12 @@ $pdf->SetY($pos);
|
||||
$data[0]['V_ALIGN'] = "M"; //T=TOP, M=MIDDLE, B=BOTTOM
|
||||
#$data[0]['T_TYPE'] = "BI"; // B=BOLD, I=ITALIC
|
||||
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
if($row_neu_aend['umzugsverg'] == 'J'){
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]*";
|
||||
$hinweis_umzug_neu=1;
|
||||
}else{
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
}
|
||||
$data[1]['T_ALIGN'] = "L";
|
||||
$data[1]['V_ALIGN'] = "M";
|
||||
|
||||
@ -599,6 +609,14 @@ $pdf->SetY($pos);
|
||||
|
||||
|
||||
|
||||
if($hinweis_umzug_alt == 1 or $hinweis_umzug_neu == 1){
|
||||
$pos=$pdf->GetY()+4.4;
|
||||
|
||||
$pdf->SetFont('Arial', '', 10);
|
||||
$pdf->SetY($pos);
|
||||
$pdf->SetX(23);
|
||||
$pdf->MultiCell(170, 4.8, "* Für diese Stelle wurde eine Umzugsvergütung gewährt.", 0, 'J');
|
||||
}
|
||||
|
||||
|
||||
$pos=$pdf->GetY()+6.4;
|
||||
|
@ -299,7 +299,7 @@ $pdf->SetY($pos);
|
||||
|
||||
$db = dbconnect();
|
||||
if(!isset($hist)){
|
||||
$query = "SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(beginn, '%Y%m%d') beginnform, date_format(ende, '%d.%m.%Y') ende, dst_id,abteilung, e.bezeichnung, a.saaid
|
||||
$query = "SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(beginn, '%Y%m%d') beginnform, date_format(ende, '%d.%m.%Y') ende, dst_id,abteilung, e.bezeichnung, a.saaid, umzugsverg
|
||||
FROM stan_antrag a, stan_vertiefungsbereich e
|
||||
WHERE a.vert_bereich=e.vbid
|
||||
AND a.uid='$uid1'
|
||||
@ -314,7 +314,7 @@ $pdf->SetY($pos);
|
||||
$result = $db->query ($query)
|
||||
or die ("Cannot execute query1");
|
||||
}else{
|
||||
$query = "SELECT date_format( beginn, '%d.%m.%Y' ) beginn, date_format( beginn, '%Y%m%d' ) beginnform, date_format( ende, '%d.%m.%Y' ) ende, dst_id, abteilung, e.bezeichnung, a.saaid
|
||||
$query = "SELECT date_format( beginn, '%d.%m.%Y' ) beginn, date_format( beginn, '%Y%m%d' ) beginnform, date_format( ende, '%d.%m.%Y' ) ende, dst_id, abteilung, e.bezeichnung, a.saaid, umzugsverg
|
||||
FROM stan_antrag a, stan_vertiefungsbereich e, stan_printqueue_hist b
|
||||
WHERE a.vert_bereich = e.vbid
|
||||
AND a.saaid=b.saaid
|
||||
@ -327,7 +327,7 @@ $pdf->SetY($pos);
|
||||
}
|
||||
if(isset($hist2)){
|
||||
# Bei der Historie 2 Gesamtdruck, werden über pdf_gen_ges_akte EZS und AES gedruckt, daher hier nicht den höchsten Status sondern wirklich Erstanträge
|
||||
$query = "SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(beginn, '%Y%m%d') beginnform, date_format(ende, '%d.%m.%Y') ende, dst_id,abteilung, e.bezeichnung, a.saaid
|
||||
$query = "SELECT date_format(beginn, '%d.%m.%Y') beginn, date_format(beginn, '%Y%m%d') beginnform, date_format(ende, '%d.%m.%Y') ende, dst_id,abteilung, e.bezeichnung, a.saaid, umzugsverg
|
||||
FROM stan_antrag a, stan_vertiefungsbereich e
|
||||
WHERE a.vert_bereich=e.vbid
|
||||
AND a.uid='$uid1'
|
||||
@ -338,7 +338,8 @@ $pdf->SetY($pos);
|
||||
or die ("Cannot execute query1");
|
||||
|
||||
}
|
||||
|
||||
|
||||
$hinweis_umzug=0;
|
||||
while ($row = $result->fetch_array())
|
||||
{
|
||||
$data = Array();
|
||||
@ -390,7 +391,12 @@ $pdf->SetY($pos);
|
||||
$data[0]['V_ALIGN'] = "M"; //T=TOP, M=MIDDLE, B=BOTTOM
|
||||
#$data[0]['T_TYPE'] = "BI"; // B=BOLD, I=ITALIC
|
||||
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
if($row['umzugsverg'] == 'J'){
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]*";
|
||||
$hinweis_umzug=1;
|
||||
}else{
|
||||
$data[1]['TEXT'] = "$rowdata3[bez]";
|
||||
}
|
||||
$data[1]['T_ALIGN'] = "L";
|
||||
$data[1]['V_ALIGN'] = "M";
|
||||
|
||||
@ -441,6 +447,13 @@ if(!isset($hist) or !isset($hist2)){
|
||||
#$pdf->SetY($pos);
|
||||
#$pdf->SetX(24);
|
||||
#$pdf->MultiCell(168, 4.8, "Beiliegende Anlagen sind Bestandteil des Zuweisungsbescheids.", 0, 'J');
|
||||
if($hinweis_umzug == 1){
|
||||
$pos=$pdf->GetY()+3;
|
||||
$pdf->SetFont('Arial', '', 10);
|
||||
$pdf->SetY($pos);
|
||||
$pdf->SetX(24);
|
||||
$pdf->MultiCell(168, 4.8, "* Für diese Stelle wurde eine Umzugsvergütung gewährt.", 0, 'J');
|
||||
}
|
||||
|
||||
|
||||
$pos=$pdf->GetY()+5;
|
||||
|
Loading…
x
Reference in New Issue
Block a user