--- a/fhiiqm/anlage_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/anlage_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -37,6 +37,12 @@
if (!$al['okn']) $ok=false;
$duptext="";
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ $dir = $_GET["d"]; // Sortierrichtung
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ $filter = $_GET["b"]; // Filterbegriff
+ $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige
+
if ($dup)
{ // Anlage duplizieren
include_once ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/func_lib.inc.php");
@@ -188,8 +194,7 @@
}
echo "</table>\n";
echo "</div>\n";
- if (!is_null($_SESSION["recht"]) && !in_array("ae", $_SESSION["recht"]))
- echo "<p class='sc'> <a href=\"anlage_flist.php\" target=\"_self\" title=\"Anlagen\">« zur Anlagenliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"anlage_flist.php$getp\" target=\"_self\" title=\"Anlagen\">« zur Anlagenliste</a></p>\n";
echo "</form>\n";
}
@@ -288,7 +293,7 @@
}
}
echo "</div>\n";
- echo "<p class=\"sc\"> <a href=\"anlage_flist.php\" target=\"_self\" title=\"Anlagen\">Anlagenenliste</a>\n";
+ echo "<p class=\"sc\"> <a href=\"anlage_flist.php$getp\" target=\"_self\" title=\"Anlagen\">Anlagenenliste</a>\n";
if ($kat)
$parm = "?k=$kat";
else
--- a/fhiiqm/anlage_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/anlage_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -88,6 +88,7 @@
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
+ $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige
echo "<div align='center'>\n";
echo "<p><b>Anlagen</b></p>\n";
@@ -166,7 +167,7 @@
echo "<td>$row->geb_ID</td>";
echo "<td>$row->raum_nr</td>";
echo "<td>$row->verantw</td>";
- echo "<td><a href='/fhiiqm/anlage_ed.php?i=$row->al_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+ echo "<td><a href='/fhiiqm/anlage_ed.php?i=$row->al_ID$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
echo "<td><a href='/fhiiqm/anlage_ed.php?i=$row->al_ID&d=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
echo "<td><a href='/fhiiqm/alpruef_flist.php?s=3&d=DESC&f=5&b=$row->al_ID&st=0&z=25'>
--- a/fhiiqm/as_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/as_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -108,6 +108,13 @@
</tr>
<tr>
<td class="bigger">
+ <a href="/fhiiqm/report/gefgr_gefahr_massn_report.php" title="Gefgruppe_Gefahr_Massnahme">(5a) Gefährdunggruppe - Gefährdung - Maßnahme</a>
+ <br /> Auswahl: Gefährdungsgruppe, Gefährdung
+ <br /> Ansicht: Gefährdungsgruppe, Gefährdung, Maßnahme
+ </td>
+ </tr>
+ <tr>
+ <td class="bigger">
<a href="/fhiiqm/report/gefahr_ap_report.php" title="Gefährdungen Arbeitsplatz">(6) Gefährdungen am Arbeitsplatz</a>
<br /> Auswahl: Haus, Raum, Arbeitsplatz-Typ, Gefährdung
<br /> Ansicht: Haus, Raum-Nr. Raum-Bezeichnung, Arbeitsplatz-Typ, Gefährdung, Maßnahmen
--- a/fhiiqm/css/db.css Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/css/db.css Wed Feb 27 09:43:08 2013 +0100
@@ -133,6 +133,15 @@
color: #FF0000;
}
+.bgmark
+{
+ background-color:#FFCC88;
+ color: #FFFFFF;
+}
+.selected
+{
+ background-color: #A8BBBB
+}
.green
{
color: #008000;
@@ -242,14 +251,14 @@
font-size: 16px;
font-style: normal;
color: #000066;
- text-transform: uppercase
+ text-transform: uppercase;
}
h2{
font-family: Verdana, Arial, Helvetica, Geneva, sans-serif;
font-size: 14px;
font-style: normal;
color: #000066;
- text-transform: !important
+ text-transform: uppercase;
}
h3{
--- a/fhiiqm/css/db_print.css Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/css/db_print.css Wed Feb 27 09:43:08 2013 +0100
@@ -45,7 +45,7 @@
font-style: normal;
font-weight: normal;
color: #003366;
- background-color: #FAFAF0;
+ background-color: #FFFFFF;
border-bottom-width : 0px;
border-left : 0px;
border-left-width : 0px;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/courier.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/courierb.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Bold';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/courierbi.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-BoldOblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/courieri.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Oblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/helvetica.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+ chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+ ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+ 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+ 'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+ chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+ chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+ chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/helveticab.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica-Bold';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+ chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+ ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+ 'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+ 'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+ chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+ chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/helveticabi.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica-BoldOblique';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+ chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+ ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+ 'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+ 'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+ chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+ chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/helveticai.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica-Oblique';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+ chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+ ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+ 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+ 'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+ chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+ chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+ chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/symbol.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Symbol';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+ chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
+ ','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
+ 'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
+ 'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
+ 'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
+ chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+ chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
+ chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
+ chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
+ chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
+ chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/times.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Times-Roman';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+ chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
+ 'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
+ 'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+ 'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+ chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
+ chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+ chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+ chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/timesb.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Times-Bold';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+ chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
+ 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
+ 'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
+ 'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+ chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+ chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/timesbi.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Times-BoldItalic';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+ chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
+ 'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
+ 'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+ 'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+ chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+ chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/timesi.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'Times-Italic';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+ chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
+ 'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
+ 'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
+ 'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+ chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
+ chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+ chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
+ chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/css/fpdf_font/zapfdingbats.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,19 @@
+<?php
+$type = 'Core';
+$name = 'ZapfDingbats';
+$up = -100;
+$ut = 50;
+$cw = array(
+ chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
+ chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
+ ','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
+ 'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
+ 'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
+ 'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
+ chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+ chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
+ chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
+ chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
+ chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
+ chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+?>
--- a/fhiiqm/form/ma_ed_form.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/form/ma_ed_form.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -10,7 +10,11 @@
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
$okn = true;
- if (!$ma) $ma['geb'] = 'A';
+ if (!$ma)
+ {
+ $ma['geb'] = 'A';
+ $ma['abt'][0] = $dbc -> querySingleItem("SELECT abt_ID FROM Abteilung ORDER BY abt_ID+0 LIMIT 0,1");
+ }
?>
<div align="center">
@@ -97,10 +101,12 @@
</select>
</td>
</tr>
- <tr>
+<?php
+/* // deaktiviert am 08.01.2013, Kaendler, Schwarzer
+ echo
+ "<tr>
<td>Arbeitsgruppe</td>
- <td><select name="ma[rag]">
- <?php
+ <td><select name=\"ma[rag]\">";
if ($ma['rag'] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
$sql = "SELECT rag_ID, rag_bez, abt_name FROM RaumArb_Gruppe g INNER JOIN Abteilung a
@@ -117,31 +123,35 @@
echo "<option value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
}
}
- ?>
- </select>
+ echo
+ "</select>
</td>
- </tr>
+ </tr>";
+*/
+?>
<tr>
<td>Telefon</td>
<td><div id="addtel">
<select name="ma[tel][]" size="1">
<?php
$select = null;
- $select = ( "-1"==$ma['tel'][0] ) ? ' selected' : null;
+ $select = ( "-1"==$ma['tel'][0] ) ? " selected='selected'" : "";
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT telefon_nr,geb_ID,raum_nr, telefon_typ FROM fhiiqm.Telefon t
+/* $sql = "SELECT telefon_nr,geb_ID,raum_nr, telefon_typ FROM fhiiqm.Telefon t
LEFT OUTER JOIN Raum r ON t.raum_ID=r.Raum_ID
- ORDER BY telefon_nr
-";
+ ORDER BY telefon_nr"; */
+ $sql = "SELECT telefon_nr, telefon_typ FROM fhiiqm.Telefon
+ ORDER BY telefon_nr";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
{
if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
- if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
- $select = ( $row->telefon_nr==$ma['tel'][0] ) ? ' selected' : null;
- echo "<option $select value=\"$row->telefon_nr\">$teln $telr</option>\n";
- $tel .= "'".$row->telefon_nr. "':'" . $teln ." ". $telr. "',";
+// if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+ $select = ( $row->telefon_nr==$ma['tel'][0] ) ? " selected='selected'" : "";
+ echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
+// $tel .= "'".$row->telefon_nr. "':'" . $teln ." ". $telr. "',";
+ $tel .= "'".$row->telefon_nr. "':'" . $teln . "',";
}
}
$tel = substr($tel,0,strlen($tel)-1);
@@ -153,6 +163,17 @@
//-->
</script>
oder neu <input name="ma[ntel][]" type="text" size="20" maxlength="20" value="<?php echo $ma['ntel'][0]; ?>" />
+ Priorität <select name="ma[so][]" size="1">
+ <?php
+ $select = ($ma["so"][0] == '-1')? " selected='selected'" : "";
+ echo "<option$select value=-1></option>\n";
+ for ($i=1; $i<10; $i++)
+ {
+ $select=($ma["so"][0] == $i)? " selected='selected'" : "";
+ echo "<option$select value=$i>$i</option>\n";
+ }
+ ?>
+ </select>
öffentlich <input name="ma[pub][]" type="checkbox" value="1" <?php if ($ma['pub'][0]) echo "checked"; ?> />
<a href="<?php echo "javascript:addInput('addtel');" ?>" title="weitere Telefon-Nr."><img src="/fhiiqm/img/add.png" /></a>
<a href="<?php echo "javascript:delInput('addtel');" ?>" title="löschen letzte Telefon-Nr."><img src="/fhiiqm/img/delete.png" /></a><br />
@@ -166,22 +187,32 @@
{
if ($i>0)
{
- echo "<select name=\"ma[tel][]\" size=\"1\">";
+ echo "<span></span><select name=\"ma[tel][]\" size=\"1\">";
$select = ( "-1" == $atel ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
foreach ($result as $row)
{
if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
- if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+// if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
$select = ( $row->telefon_nr == $atel ) ? ' selected' : null;
- echo "<option $select value=\"$row->telefon_nr\">$teln $telr</option>\n";
+ echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
}
echo "</select>";
echo " oder neu <input name=\"ma[ntel][]\" type=\"text\" size=\"20\" maxlength=\"20\" value=\"".$ma['ntel'][$i]."\" />";
- echo " öffentlich <input name=\"ma[pub][$i]\" type=\"checkbox\" value=\"1\"";
- $check = ($ma['pub'][$i]) ? " checked" : "" ;
- echo "$check /><br />";
+ echo " Priorität <select name=\"ma[so][]\" size=\"1\">";
+
+ $select = ( $ma["so"][$i] == "-1" ) ? " selected='selected'" : "";
+ echo "<option$select value=\"-1\"></option>\n";
+ for ($j=1; $j<10; $j++)
+ {
+ $select=($ma["so"][$i] == $j)? " selected='selected'" : "";
+ echo "<option$select value=$j>$j</option>\n";
+ }
+ echo "</select>\n";
+ echo " öffentlich <input name=\"ma[pub][$i]\" type=\"checkbox\" value=\"1\"";
+ $check = ($ma['pub'][$i]) ? " checked='checked'" : "" ;
+ echo "$check /><br />\n";
}
$i++;
}
@@ -198,25 +229,100 @@
</tr>
<?php } ?>
<tr><td>Abteilung *</td>
- <td valign="top">
- <select name="ma[abt]">
+ <td valign="top"><div id="addabt">
+ <select name="ma[abt][]" onchange="this.form.submit();">
<?php
$sql = "SELECT abt_ID, abt_name, abt_long FROM `fhiiqm`.`Abteilung` ORDER BY abt_ID+0";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
{
- if ($row->abt_ID == $ma['abt'])
+ if ($row->abt_ID == $ma['abt'][0])
echo "<option selected value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
else
echo "<option value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ $abt .= "'".$row->abt_ID. "':'" . $row->abt_name .": ". $row->abt_long . "',";
}
- }
+ $abt = substr($abt,0,strlen($abt)-1);
+ }
+ ?>
+ </select>
+
+ Arbeitsgruppe
+ <select name="ma[rag][]">
+ <?php
+ if ($ma['rag'] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT rag_ID, rag_bez FROM `fhiiqm`.`RaumArb_Gruppe` WHERE abt_ID = " .$ma["abt"][0] . " ORDER BY rag_bez";
+ if ($resrag = $dbc->queryObjectArray($sql))
+ {
+ foreach ($resrag as $row)
+ {
+ if ($row->rag_ID == $ma['rag'][0])
+ echo "<option selected value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+ else
+ echo "<option value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+// $rag .= "'".$row->rag_ID. "':'" . $row->rag_bez . "',";
+ }
+// $rag = substr($rag,0,strlen($rag)-1);
+ }
+ $sql = "SELECT rag_ID, rag_bez, abt_name FROM RaumArb_Gruppe g INNER JOIN Abteilung a
+ ON g.abt_ID = a.abt_ID ORDER BY g.abt_ID,rag_ID";
+ if ($res = $dbc->queryObjectArray($sql))
+ {
+ foreach ($res as $row)
+ $rag .= "'".$row->rag_ID. "':'" . $row->abt_name . ": ". $row->rag_bez . "',";
+ $rag = substr($rag,0,strlen($rag)-1);
+ }
?>
</select>
- <input type="hidden" name="okn" value="<?php echo $okn; ?>" />
+ <script type="text/javascript">
+ <!--
+ arra = {<?php echo ($abt); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ arrg = {<?php echo ($rag); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+ <a href="<?php echo "javascript:addInput('addabt');" ?>" title="weitere Arbeitsgruppe"><img src="/fhiiqm/img/add.png" /></a>
+ <a href="<?php echo "javascript:delInput('addabt');" ?>" title="löschen letzte Arbeitsgruppe"><img src="/fhiiqm/img/delete.png" /></a><br />
+ <?php
+ if (isset($ma) && (!$ok || $sub))
+ {
+ if (count($ma['abt'])>1 || count($ma['rag'])>1)
+ {
+ $i=0;
+ foreach ($ma['abt'] as $eabt)
+ {
+ if ($i>0)
+ {
+ echo "<span></span><select name=\"ma[abt][]\" size=\"1\">";
+
+ foreach ($result as $row)
+ {
+ $select = ( $row->abt_ID == $eabt ) ? ' selected' : null;
+ echo "<option $select value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ }
+ echo "</select>";
+ echo " Arbeitsgruppe ";
+ echo "<select name='ma[rag][]' size=1>";
+ $select = ( $ma["rag"][$i] == "-1" ) ? " selected='selected'" : "";
+ echo "<option$select value=\"-1\"></option>\n";
+ foreach ($res as $row)
+ {
+ $select = ( $row->rag_ID == $ma['rag'][$i] ) ? ' selected' : null;
+ echo "<option $select value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+ }
+ echo "</select><br />";
+ }
+ $i++;
+ }
+ }
+ }
+ ?>
+ </div>
</td>
</tr>
+ <input type="hidden" name="ma[abtm]" value="<?php echo $ma['abtm']; ?>" />
+ <input type="hidden" name="okn" value="<?php echo $okn; ?>" />
<!--
</table>
</div>
--- a/fhiiqm/form/ma_fkt_form.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/form/ma_fkt_form.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -138,7 +138,7 @@
<?php
echo "</div>\n";
- if (!is_null($_SESSION["recht"]) && !in_array("fme", $_SESSION["recht"]))
- echo "<p class='sc'> <a href=\"ma_fkt_flist.php\" target=\"_self\" title=\"Funktionen\">« zur Funktionenliste</a></p>\n";
+// if (!is_null($_SESSION["recht"]) && !in_array("fme", $_SESSION["recht"]))
+ echo "<p class='sc'> <a href=\"ma_fkt_flist.php?$getp\" target=\"_self\" title=\"Funktionen\">« zur Funktionenliste</a></p>\n";
echo "</form>\n";
?>
\ No newline at end of file
--- a/fhiiqm/form/prozess_form.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/form/prozess_form.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -23,7 +23,7 @@
<div align="center">
<table width="60%" border="0" cellspacing="3" cellpadding="3">
<tr>
- <td>Prozess-Bezeichnung *</td>
+ <td>Projekt-Bezeichnung *</td>
<td><input name="pz[bez]" id="bez" type="text" size="50" maxlength="50" value="<?php echo $pz['bez']; ?>" />
<?php
if (isset($pz['bez']) && $pz['bez']<'!')
@@ -40,7 +40,7 @@
</td>
</tr>
<tr>
- <td>Prozess-Beschreibung</td>
+ <td>Projekt-Beschreibung</td>
<td><textarea name="pz[bezl]" cols="50" rows="2"><?php echo $pz["bezl"]; ?></textarea>
</td>
</tr>
@@ -51,7 +51,7 @@
<?php
if (is_array($pz['prid'])) $select = in_array( "-1", $pz['prid'] ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT DISTINCT ip.produkt_ID,prod_name
+/* $sql = "SELECT DISTINCT ip.produkt_ID,prod_name
FROM Info i LEFT OUTER JOIN Info_Produkt ip
ON i.info_ID=ip.info_ID LEFT OUTER JOIN Info_Verantwortlich v
ON i.info_ID=v.info_ID INNER JOIN Produkt p
@@ -71,28 +71,36 @@
echo "<option $select value=\"$row->produkt_ID\">$prod</option>\n";
}
}
-/*
- else
+*/
+ // Recht Produktgruppe beruecksichtigen
+ if (is_array($_SESSION["prodg"]))
{
- $sql = "CALL prod_hiera_all(0,0)";
- if ($result = $dbc->queryObjectArray($sql))
+ foreach ($_SESSION["prodg"] as $val)
+ $listg .= "," .$val;
+ $listg = substr($listg,1);
+ echo "prodg = $listg<br />";
+ $sql = "CALL fhiiqm.hier_prodgroup('$listg')";
+ }
+ else
+ $sql = "CALL fhiiqm.prod_hiera_all(0,0)";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
{
- foreach ($result as $row)
- {
- if (strlen($row->bez) > 70)
- $prod=str_replace(" "," ",htmlentities(substr($row->bez,0,70))) ."...";
- else
- $prod=str_replace(" "," ",htmlentities($row->bez));
- if ($row->prid >0) $color=" class='green'"; else $color="";
- $select = ($row->prid == $pz['prid'] && $pz['prid']>0) ? ' selected' : null;
- echo "<option $color $select value=\"$row->prid\">$prod</option>\n";
- }
+ if (strlen($row->bez) > 70)
+ $prod=str_replace(" "," ",htmlentities(substr($row->bez,0,70))) ."...";
+ else
+ $prod=str_replace(" "," ",htmlentities($row->bez));
+ if ($row->prid >0) $color=" class='green'"; else $color="";
+ if ($row->prid == $pz['prid'])
+ echo "<option $color selected value=\"$row->prid\">$prod</option>\n";
+ else
+ echo "<option $color value=\"$row->prid\">$prod</option>\n";
}
}
-*/
echo "
</select>\n";
-// echo "<br />bitte 1 <font color='green'>grünen</font> Eintrag wählen";
+ echo "<br />bitte 1 <font color='green'>grünen</font> Eintrag wählen";
if (isset($pz) && $pz['prid']<1)
{
@@ -114,7 +122,7 @@
Eingabe von mind. 2 Zeichen -> Namensliste
</td>
</tr>
- <tr><td>gehört zu Prozess</td>
+ <tr><td>gehört zu Projekt</td>
<td><select name="pz[pzref]">
<?php
if ($pz['pzref'] == -1) $select = " selected "; else $select = "";
@@ -177,6 +185,35 @@
<td>
<div id="add">
<input name="pz[step][]" type="text" size="50" maxlength="50" value="<?php echo $pz['step'][0]; ?>" />
+ Status <select name="pz[ststat][]">
+ <?php
+ if ($pz['ststat'][0] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT proz_stat_ID,proz_stat_bez FROM Proz_Status ORDER BY 1";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->proz_stat_ID == $pz['ststat'][0])
+ echo "<option selected value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+ else
+ echo "<option value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+ $stat .= "'".$row->proz_stat_ID. "':'" . $row->proz_stat_bez . "',";
+ $sta[$row->proz_stat_ID] = $row->proz_stat_bez;
+ }
+ }
+ $stat = substr($stat,0,strlen($stat)-1);
+ echo "</select><br />\n";
+ echo " Bemerkung zu Schritt ";
+ echo "<input name=\"pz[stbem][]\" maxlen=\"50\" size=\"50\" value='".$pz["stbem"][0]."' />";
+ ?>
+ <script type="text/javascript">
+ <!--
+ arr = {<?php echo ($stat); ?>}; // Ergebnis: {key:'value',key:'value',...}
+ //-->
+ </script>
+
+
<a href="<?php echo "javascript:addInput('add');" ?>" id="badd" title="Schritt hinzufügen"><img src="/fhiiqm/img/add.png" border="0" /></a>
<a href="<?php echo "javascript:delInput('add');" ?>" id="bdel" title="letzten Schritt entfernen"><img src="/fhiiqm/img/delete.png" border="0" /></a>
<?php
@@ -189,7 +226,19 @@
{
if ($i>0)
{
- echo "<br /><input name=\"pz[step][]\" type=\"text\" size=\"50\" maxlength=\"50\" value=\"" .$pz['step'][$i] . "\" />\n";
+ echo "<span></span><br /><input name=\"pz[step][]\" type=\"text\" size=\"50\" maxlength=\"50\" value=\"" .$pz['step'][$i] . "\" />\n";
+ echo " Status <select name='pz[ststat][]'>";
+ if ($pz['ststat'][$i] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ foreach ($sta as $key => $value)
+ {
+ $select = ($key == $pz['ststat'][$i])? " selected" : "";
+ echo "<option$select value=\"$key\">$value</option>\n";
+ }
+ echo "</select>";
+ echo "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />\n";
+ echo "<br /> Bemerkung zu Schritt ";
+ echo "<input name=\"pz[stbem][]\" maxlen=\"50\" size=\"50\" value='".$pz["stbem"][$i]."' />\n";
}
$i++;
}
@@ -200,7 +249,7 @@
</td>
</tr>
<tr>
- <td>Prozess-Dringlichkeit</td>
+ <td>Projekt-Dringlichkeit</td>
<td><select name="pz[urg]">
<?php
if ($pz['urg'] == -1) $select = " selected "; else $select = "";
@@ -221,7 +270,7 @@
</td>
</tr>
<tr>
- <td>Prozess-Status</td>
+ <td>Projekt-Status</td>
<td><select name="pz[stat]">
<?php
if ($pz['stat'] == -1) $select = " selected "; else $select = "";
--- a/fhiiqm/form/raumarbgr_form.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/form/raumarbgr_form.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -113,8 +113,13 @@
{
foreach ($result as $row)
{
- $select = ( $row->persknr==$rag['ma'][0] ) ? ' selected' : null;
- echo "<option $select value=\"$row->persknr\">$row->ma</option>\n";
+ $select = ( $row->persknr==$rag['ma'][0] ) ? "selected='selected' class='selected" : null;
+ if (strpos($row->ma,"inaktiv"))
+ {
+ if ($select) $class = " red'"; else $class=" class='red'";
+ }
+ else if ($select) $class="'"; else $class="";
+ echo "<option $select$class value=\"$row->persknr\">$row->ma</option>\n";
$sma .= "'".$row->persknr."':'".$row->ma."',";
}
}
@@ -146,8 +151,13 @@
echo "<option $select value=\"-1\"></option>\n";
foreach ($result as $row)
{
- $select = ( $row->persknr == $mae ) ? ' selected' : null;
- echo "<option $select value=\"$row->persknr\">$row->ma</option>\n";
+ $select = ( $row->persknr == $mae ) ? "selected='selected' class='selected" : null;
+ if (strpos($row->ma,"inaktiv"))
+ {
+ if ($select) $class = " red'"; else $class=" class='red'";
+ }
+ else if ($select) $class="'"; else $class="";
+ echo "<option $select$class value=\"$row->persknr\">$row->ma</option>\n";
}
echo "</select><br/>\n";
}
Binary file fhiiqm/img/nixt.gif has changed
Binary file fhiiqm/img/tel/tellist_kopf1.jpg has changed
Binary file fhiiqm/img/tel/tellist_kopf1n.jpg has changed
Binary file fhiiqm/img/tel/tellist_kopf2.jpg has changed
Binary file fhiiqm/img/tel/tellist_kopf2n.jpg has changed
Binary file fhiiqm/img/tel/tellist_kopf3.jpg has changed
Binary file fhiiqm/img/tel/tellist_kopf3n.jpg has changed
Binary file fhiiqm/img/tel/tellist_kopf4.jpg has changed
Binary file fhiiqm/img/tel/tellist_kopf4n.jpg has changed
--- a/fhiiqm/inc/func_lib.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/inc/func_lib.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -144,10 +144,12 @@
}
if ($result)
{
+ if ($log["pass"] <= '') $log["pass"] = null;
$stmt->bind_result($userid, $pwdmd5);
if ($stmt->fetch())
{
- if ($pwdmd5 == md5($log["pass"]) || $log["pass"]==null)
+// if ($pwdmd5 == md5($log["pass"]) || $log["pass"]==null)
+ if ($pwdmd5 === md5($log["pass"]) || ($pwdmd5 === null && $log["pass"] === null))
{
$_SESSION = array();
$_SESSION["userid"] = $userid;
--- a/fhiiqm/inc/ma_tel_dat_show.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/inc/ma_tel_dat_show.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -12,9 +12,9 @@
echo "<tr><td>Vorname: </td><td>" . $ma["vname"] . "</td></tr>\n";
echo "<tr><td>Titel: </td><td>" . $ma["titel"] . "</td></tr>\n";
echo "<tr><td>E-Mail: </td><td>" . $ma["email"] . "</td></tr>\n";
- if ($ma['abt'])
+ if ($ma['abtm'])
{
- $sql = "SELECT abt_name FROM Abteilung WHERE abt_ID = ".$ma['abt'];
+ $sql = "SELECT abt_name FROM Abteilung WHERE abt_ID = ".$ma['abtm'];
$abt = $dbc -> querySingleItem($sql);
echo "<tr><td>Abteilung: </td><td>$abt</td></tr>\n";
}
@@ -23,10 +23,17 @@
// Arbeitsgruppe
if ($ma['rag'])
{
- $sql = "SELECT rag_bez FROM RaumArb_Gruppe
- WHERE rag_ID = '" . $ma["rag"] ."' ";
- if ($ragb = $dbc->querySingleItem($sql))
- echo "<tr><td>AG: </td><td>" . $ragb . "</td></tr>\n";
+ foreach ($ma['rag'] as $rag)
+ {
+ $sql = "SELECT rag_bez, abt_name
+ FROM fhiiqm.RaumArb_Gruppe r INNER JOIN Abteilung a ON r.abt_ID=a.abt_ID
+ WHERE rag_ID = $rag";
+ if ($ragr = $dbc->queryObjectArray($sql))
+ {
+ foreach ($ragr as $row)
+ echo "<tr><td>AG: </td><td>" . $row->rag_bez . " [". $row->abt_name . "]</td></tr>\n";
+ }
+ }
}
$i=0;
foreach ($ma['tel'] as $tel)
--- a/fhiiqm/inc/menu.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/inc/menu.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -24,8 +24,8 @@
}
}
- // maximal moegliche Rechte (29.10.2012):
- // 'ae','ar','ase','asr','dde','ddr','fme','fmr','ie','ir','le','lr','pe','pr','pze','pzr','re','rr','rtr','rte','ve','vpe','vpr','vr'
+ // maximal moegliche Rechte (17.12.2012):
+ // 'ae','ar','ase','asr','dde','ddr','fme','fmr','ie','ir','le','lr','mtr','mte','pe','pr','pze','pzr','re','rr','rtr','rte','ve','vpe','vpr','vr'
// Rechtegruppen: a, v, i, s
if (is_null($_SESSION["recht"]))
echo "<p> Sie haben keine Rechte, um mit dieser Anwendung zu arbeiten.</p>
@@ -78,12 +78,12 @@
}
if (is_array($arg) && in_array("p",$arg))
{
- echo "<li>Prozesse\n
+ echo "<li>Projekte\n
<ul>\n";
if (in_array("pzr",$_SESSION["recht"]) || in_array("pze",$_SESSION["recht"]))
- echo "<li><a href=\"/fhiiqm/prozess_flist.php\" target=\"_blank\" title=\"Prozessliste\">Prozesse sortieren, filtern, bearbeiten</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/prozess_flist.php\" target=\"_blank\" title=\"Projektliste\">Projekte sortieren, filtern, bearbeiten</a></li>\n";
if (in_array("pze",$_SESSION["recht"]))
- echo "<li><a href=\"/fhiiqm/prozess_ed.php\" target=\"_blank\" title=\"Prozess erfassen\">Prozess erfassen</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/prozess_ed.php\" target=\"_blank\" title=\"Projekt erfassen\">Projekt erfassen</a></li>\n";
echo " </ul>\n
</li>\n";
}
@@ -125,9 +125,8 @@
</li>\n";
}
- // 's' wie 'Sonstige' oder 'Stammdaten' - Rechtegruppe
- if (is_array($arg) && in_array("s",$arg))
- {
+// if (is_array($arg) && in_array("s",$arg))
+// {
if (in_array("asr",$_SESSION["recht"]) || in_array("ase",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
{
echo "<li>Arbeitssicherheit\n
@@ -149,7 +148,7 @@
echo " </ul>\n
</li>\n";
}
- if (in_array("re",$_SESSION["recht"]) || in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
+ if (in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
{
echo "<li>Funktionen\n";
echo "<ul>\n"; // Bearbeitung von ausgewaehlten Stamm-Daten
@@ -162,22 +161,45 @@
echo " </ul>\n
</li>\n";
}
- echo "<li>Räume\n
+ if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]) || in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
+ {
+ echo "<li>Räume\n
+ <ul>\n";
+ if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/raum_flist.php\" target=\"_blank\" title=\"Raumliste\">Räume sortieren, filtern, bearbeiten</a></li>\n";
+ if (in_array("re",$_SESSION["recht"]))
+ {
+ echo "<li><a href=\"/fhiiqm/raum_ins.php\" target=\"_blank\" title=\"Raum erfassen\">Raum erfassen</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/raum_flist_ed.php\" target=\"_blank\" title=\"Raumliste edit\">Räume - Reinig.-Daten sortieren, filtern, bearbeiten</a></li>\n";
+ }
+ if (in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/raum_vma_flist.php\" target=\"_blank\" title=\"Raumliste\">Raumverantwortliche sortieren, filtern, bearbeiten</a></li>\n";
+ if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/raum_report.php\" target=\"_blank\" title=\"Report Räume\">Berichte Räume</a></li>\n";
+ echo " </ul>\n
+ </li>\n";
+ }
+// }
+ echo "<li>Mitarbeiter - Telefon\n
<ul>\n";
- if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
- echo "<li><a href=\"/fhiiqm/raum_flist.php\" target=\"_blank\" title=\"Raumliste\">Räume sortieren, filtern, bearbeiten</a></li>\n";
- if (in_array("re",$_SESSION["recht"]))
- {
- echo "<li><a href=\"/fhiiqm/raum_ins.php\" target=\"_blank\" title=\"Raum erfassen\">Raum erfassen</a></li>\n";
- echo "<li><a href=\"/fhiiqm/raum_flist_ed.php\" target=\"_blank\" title=\"Raumliste edit\">Räume - Reinig.-Daten sortieren, filtern, bearbeiten</a></li>\n";
+ if (in_array("mte",$_SESSION["recht"]))
+ {
+ echo "<li><a href=\"/fhiiqm/ma_tel_flist.php?e=1\" target=\"_blank\" title=\"MA-Telefonliste\">Mitarbeiter - Telefon sortieren, filtern, bearbeiten</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/ma_tel_ed.php\" target=\"_blank\" title=\"MA-Telefon\">Mitarbeiter - Telefon erfassen</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/tel_flist.php\" target=\"_blank\" title=\"Telefonliste\">Telefone sortieren, filtern, bearbeiten</a></li>\n";
+ echo "<li><a href=\"/fhiiqm/tel_ed.php\" target=\"_blank\" title=\"Telefon\">Telefon erfassen</a></li>\n";
}
- if (in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
- echo "<li><a href=\"/fhiiqm/raum_vma_flist.php\" target=\"_blank\" title=\"Raumliste\">Raumverantwortliche sortieren, filtern, bearbeiten</a></li>\n";
- if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
- echo "<li><a href=\"/fhiiqm/raum_report.php\" target=\"_blank\" title=\"Report Räume\">Berichte Räume</a></li>\n";
+ if (in_array("mtr",$_SESSION["recht"]) || in_array("mte",$_SESSION["recht"]))
+ echo "<li><a href=\"/fhiiqm/ma_obj_report.php\" target=\"_blank\" title=\"Report Mitarbeiter\">Berichte Mitarbeiter - Telefon</a></li>\n";
+ else
+ echo "<li><a href=\"/fhiiqm/ma_tel_flist.php\" target=\"_blank\" title=\"MA-Telefonliste\">Mitarbeiter - Telefon sortieren, filtern</a></li>\n";
echo " </ul>\n
</li>\n";
+ // 's' wie 'Sonstige' oder 'Stammdaten' - Rechtegruppe
+// if (is_array($arg) && in_array("s",$arg))
+ if (in_array("pr",$_SESSION["recht"]) || in_array("pe",$_SESSION["recht"]) || in_array("rtr",$_SESSION["recht"]) || in_array("rte",$_SESSION["recht"]))
+ {
echo "<li>Stammdaten\n
<ul>\n";
if (in_array("pr",$_SESSION["recht"]) || in_array("pe",$_SESSION["recht"]))
@@ -191,8 +213,8 @@
//<!-- <li><a href="#">Anleitungen</a></li> -->
echo " </ul>\n
</li>\n";
+ }
- }
echo " </ul>
</div>";
}
--- a/fhiiqm/inc/pdf_ma_tel.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/inc/pdf_ma_tel.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -10,7 +10,12 @@
include ($_SERVER['DOCUMENT_ROOT']."/fhiiqm/tool/fpdf.php");
class PDF extends FPDF
{
- //Author Patrick Benny: Fit text to cell
+ var $y0, $y, $xa, $width, $height;
+ var $wid = array(55,25,40,15,40); // Breite: Spalten 'new'
+ var $fancy = 1;
+ var $anzcol = 2;
+ var $col = 0;
+ //Author Patrick Benny: Fit text to cell (http://www.fpdf.org)
//*********************************************************************
//Cell with horizontal scaling if text is too wide
function CellFit($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $scale=false, $force=true)
@@ -110,28 +115,36 @@
//$this->Cell(20);
//Titel
//Arial fett 15
- $this->SetFont('Arial','BI',11);
+ $this->SetFont('helvetica','BI',11);
$this->Cell(55,10,'Fritz-Haber-Institut',0,0,'L');
- $this->SetFont('Arial','B',11);
+ $this->SetFont('helvetica','B',11);
$this->Cell(40,10,'Telefonverzeichnis',0,0,'L');
- $this->SetTextColor(255,0,0);
- $this->Cell(0,10,'(intern)',0,0,'L');
+ if ($this->fancy && !$this->anzcol)
+ {
+ $this->SetTextColor(255,0,0);
+ $this->Cell(0,10,'(intern)',0,0,'L');
+ }
+ else
+ $this->Cell(0,10,' ',0,0,'L');
//Logo
$this->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/fhilogotransp.png",170,8,25);
//Zeilenumbruch
- $this->Ln(20);
- //Colors, line width and bold font
- $this->SetFont('helvetica','',8);
- $this->SetFillColor(104,172,191);
- $this->SetTextColor(0,0,102);
- $this->SetDrawColor(255,255,255);
- $this->SetLineWidth(.0);
- $this->SetFont('','B');
- //Tabellen-Header immer im Kopf
- $w=array(55,40,30,15,40);
- for($i=0;$i<count($header);$i++)
- $this->Cell($w[$i],5,$header[$i],1,0,'L',1);
- $this->Ln();
+ $this->Ln(16);
+ if ($this->fancy)
+ {
+ //Colors, line width and bold font
+ $this->SetFont('helvetica','',8);
+ $this->SetFillColor(104,172,191);
+ $this->SetTextColor(0,0,102);
+ $this->SetDrawColor(255,255,255);
+ $this->SetLineWidth(.0);
+ $this->SetFont('','B');
+ //Tabellen-Header immer im Kopf
+// $w=array(55,40,30,15,40);
+ for($i=0;$i<count($header);$i++)
+ $this->Cell($this->wid[$i],5,$header[$i],1,0,'L',1);
+ $this->Ln();
+ }
}
//Fusszeile
@@ -159,49 +172,59 @@
$this->SetFont('','B');
//Header notwendig fuer Tabelle, Hoehe = 0!
- $w=array(55,40,30,15,40); // Breite der Zellen
+// $w=array(55,40,30,15,40); // Breite der Zellen
for($i=0;$i<count($header);$i++)
- $this->Cell($w[$i],0,'',1,0,'L',1);
+ $this->Cell($this->wid[$i],0,'',1,0,'L',1);
$this->Ln();
//Color and font restoration
// $this->SetFillColor(222,222,222);
- $this->SetFillColor(238,238,238);
+ $this->SetFillColor(249,249,249);
$this->SetTextColor(0);
$this->SetFont('');
//Data
$fill=0;
+ $height = 4;
$fill = !$fill;
+// $breite = ($pdf->w - $pdf->lMargin - $pdf->rMargin) / 3;
foreach($data as $row)
{
if ($row->persknr != $vpnr)
{
$fill=!$fill;
- if (substr($row->name,0,1) != $vfirst) $this->Ln(5); //$this->AddPage();
+ if (substr($row->name,0,1) != $vfirst)
+ {
+ $this->SetFont('','B',9);
+ $kap = strtoupper(substr($row->name,0,1));
+// $this->Ln(5); //$this->AddPage();
+ $this->CellFitScale(175,$height,$kap,0,0,'L',$fill);
+ $this->Ln();
+ $this->SetFont('','',8);
+ }
$titel = ($row->titel)? ", $row->titel" : "" ;
$vname = ($row->vorname)? ", $row->vorname" : "";
$name = $row->name . $titel . $vname;
- $this->CellFitScale($w[0],4.5,$name,0,0,'L',$fill);
- $this->CellFitScale($w[1],4.5,$row->abt_name,'LR',0,'L',$fill);
+ $this->CellFitScale($this->wid[0],$height,$name,0,0,'L',$fill);
+ $this->CellFitScale($this->wid[1],$height,$row->abt_name,'LR',0,'L',$fill);
if ($row->telefon_typ == "fax") $typ = " FAX"; else $typ = "";
if (!$row->public) $this->SetTextColor(255,0,0); else $this->SetTextColor(0,0,136);
- $this->CellFitScale($w[2],4.5,$row->telefon_nr.$typ,'LR',0,'L',$fill);
+ $this->CellFitScale($this->wid[2],$height,$row->telefon_nr.$typ,'LR',0,'L',$fill);
$this->SetTextColor(0);
- $this->CellFitScale($w[3],4.5,$row->geb_ID . " " . $row->raum_nr,'LR',0,'L',$fill);
- $this->CellFitScale($w[4],4.5,$row->email,'LR',0,'L',$fill);
+ $this->CellFitScale($this->wid[3],$height,$row->geb_ID . " " . $row->raum_nr,'LR',0,'L',$fill);
+ $this->CellFitScale($this->wid[4],$height,$row->email,'LR',0,'L',$fill);
$this->Ln();
}
else
{
- $this->Cell($w[0],4.5,'','LR',0,'L',$fill);
+ $this->Cell($this->wid[0],$height,'','LR',0,'L',$fill);
if ($vabt != $row->abt_name) $abt = $row->abt_name;
else $abt = '';
- $this->CellFitScale($w[1],4.5,$abt,'LR',0,'L',$fill);
+ $this->CellFitScale($this->wid[1],$height,$abt,'LR',0,'L',$fill);
if ($row->telefon_typ == "fax") $typ = " FAX"; else $typ = "";
if (!$row->public) $this->SetTextColor(255,0,0); else $this->SetTextColor(0,0,136);
- $this->CellFitScale($w[2],4.5,$row->telefon_nr.$typ,'LR',0,'L',$fill);
+ $this->CellFitScale($this->wid[2],$height,$row->telefon_nr.$typ,'LR',0,'L',$fill);
$this->SetTextColor(0);
- $this->CellFitScale($w[3],4.5,$row->geb_ID . " " . $row->raum_nr,'LR',0,'L',$fill);
- $this->Cell($w[4],4.5,'','LR',0,'L',$fill);
+ $this->CellFitScale($this->wid[3],$height,'','LR',0,'L',$fill);
+ $this->Cell($this->wid[4],$height,'','LR',0,'L',$fill);
$this->Ln();
}
@@ -271,6 +294,158 @@
$vabt = $row["abt_name"];
}
}
+ function Normal($data)
+ {
+ $this->fancy = 1;
+ $w = array(55,40,35,40);
+ $this->SetFillColor(249,249,249);
+ $fill = 0;
+ $fill = !$fill;
+ foreach ($data as $row)
+ {
+ if ($row->persknr != $vpnr)
+ {
+ if ($vpnr)
+ {
+ // ausgeben vorheriges Objekt
+ $tel = implode(", ",$atel);
+ $this->SetFont('times','',9);
+ $this->CellFitScale($w[0],$this->height,$name,0,0,'L',$fill);
+ $this->CellFitScale($w[1],$this->height,$tel,0,0,'L',$fill);
+ $this->CellFitScale($w[2],$this->height,$abtort,0,0,'L',$fill);
+ $this->CellFitScale($w[3],$this->height,$mail,0,0,'L',$fill);
+ $this->Ln();
+ }
+
+ $fill=!$fill;
+ if (substr($row->name,0,1) != $vfirst)
+ {
+ $this->SetFont('','B',11);
+ $kap = strtoupper(substr($row->name,0,1));
+ $this->CellFitScale(170,$this->height,$kap,0,0,'L',$fill);
+ $this->Ln();
+ $this->SetFont('','',9);
+ }
+ $atel = array();
+ $titel = ($row->titel)? ", ".$row->titel : "" ;
+ $vname = ($row->vorname)? " ". $row->vorname : "";
+ $name = $row->name . $titel . $vname;
+ $raum = ($row->raum_nr)? ", ".$row->raum_nr : "";
+ $abtort = $row->abt_name . " " . $row->geb_ID . $raum;
+ $mail = $row->email;
+ $fax =($row->telefon_typ == 'fax')? " FAX" : "";
+ $atel[] = $row->telefon_nr . $fax;
+ }
+ else
+ {
+ $fax =($row->telefon_typ == 'fax')? " FAX" : "";
+ $atel[] = $row->telefon_nr . $fax;
+ }
+ $vfirst = substr($row->name,0,1);
+ $vpnr = $row->persknr;
+ }
+ // ausgeben letztes Objekt
+ $tel = implode(";",$atel);
+ $this->SetFont('times','',9);
+ $this->CellFitScale($w[0],$this->height,$name,0,0,'L',$fill);
+ $this->CellFitScale($w[1],$this->height,$tel,0,0,'L',$fill);
+ $this->CellFitScale($w[2],$this->height,$abtort,0,0,'L',$fill);
+ $this->CellFitScale($w[3],$this->height,$mail,0,0,'L',$fill);
+ }
+
+// mehrere Spalten
+ function SetCol($col,$width)
+ {
+ // Move position to a column
+ $this->col = $col;
+ $this->width = $width;
+// echo "1x = " . $this->GetX() . ", col = $this->col" . ", width = $this->width<br />\n";
+ if ($this->xa <= $this->lMargin || ($this->anzcol == 3 && $this->xa <= $this->lMargin + $this->width + 5*$this->col))
+ $this->xa = $this->lMargin + 5*$this->col + ($this->col*$this->width);
+ else $this->xa = $this->lMargin;
+// $this->SetLeftMargin(25);
+ $this->SetX($this->xa);
+// echo "2x = " . $this->GetX() . ", col = $this->col" . ", width = $this->width<br />\n";
+ }
+
+ function AcceptPageBreak()
+ {
+ if (!$this->fancy) // nur bei mehrspaltiger Darstellung
+ {
+ if ($this->GetY()+$this->height > $this->PageBreakTrigger)
+ if($this->col < $this->anzcol-1)
+ {
+ // Go to next column
+ $this->SetCol($this->col+1,$this->width);
+ $this->SetY($this->y0);
+ $this->y = $this->y0;
+ // echo "apb_x = " . $this->GetX() . ", col = $this->col" . ", width = $this->width<br />\n";
+ return false;
+ }
+ else
+ {
+ // Go back to first column and issue page break
+ $this->AddPage($this->CurOrientation);
+ $this->SetCol(0,$this->width);
+ $this->SetY($this->y0);
+ $this->y = $this->y0;
+ return true;
+ }
+ else
+ return false;
+ }
+ else
+ return $this->AutoPageBreak;
+ }
+
+ function Small($data,$colwidth,$height)
+ {
+ $this->fancy = 0;
+ $this->y0 = $this->GetY();
+ $this->y = $this->y0;
+ $this->width = $colwidth;
+ $this->height = $height;
+ $this->SetFillColor(249,249,249);
+ $fill = 0;
+ $fill = !$fill;
+ foreach ($data as $row)
+ {
+// echo "3x = " . $this->GetX() . ", y = " . $this->GetY() . ", width = $colwidth<br />\n";
+ $fill=!$fill;
+ if (substr($row->name,0,1) != $vfirst)
+ {
+ $this->SetFont('','B',11);
+ $kap = strtoupper(substr($row->name,0,1));
+ $this->SetX($this->xa);
+ $this->CellFitScale($colwidth,$height,$kap,0,0,'L',$fill);
+ $this->y = $this->y+$height;
+ $this->SetY($this->y);
+ $this->AcceptPageBreak();
+ }
+ $zeil1 = $row->name . ", " . $row->titel . " " . $row->vorname . " ";
+ $zeil2 = $row->abt_name . " " . $row->geb_ID. " ". $row->raum_nr;
+ $zeil3 = $row->telefon_nr;
+ $this->SetFont('times','',9);
+ $this->SetX($this->xa);
+ if ($this->anzcol == 2)
+ $this->CellFitScale($colwidth/2,$height,$zeil1,0,0,'L',$fill);
+ else
+ $this->CellFitScale($colwidth*0.75,$height,$zeil1,0,0,'L',$fill);
+ if ($this->anzcol == 2)
+ {
+ $this->SetFont('','',8);
+ $this->CellFitScale($colwidth/4,$height,$zeil2,0,0,'L',$fill);
+ }
+ $this->SetFont('','',9);
+ $this->CellFitScale($colwidth/4,$height,$zeil3,0,0,'R',$fill);
+ $this->y = $this->y+$height;
+ $this->SetY($this->y);
+
+ $vfirst = substr($row->name,0,1);
+ $this->AcceptPageBreak();
+// echo "4x = " . $this->GetX() . ", y = " . $this->GetY() . ", width = $colwidth<br />\n";
+ }
+ }
}
--- a/fhiiqm/inc/prozess_dat_show.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/inc/prozess_dat_show.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -48,11 +48,16 @@
// Arbeitsschritte
if (is_array($pz["step"]))
{
+ $arrstat = $dbc -> queryObjectArray("SELECT proz_stat_ID,proz_stat_bez FROM Proz_Status");
+ foreach ($arrstat as $row)
+ $as[$row->proz_stat_ID] = $row->proz_stat_bez;
echo "<tr><td>Arbeitsschritte: </td>";
+ $i=0;
foreach ($pz["step"] as $step)
{
if ($next) $next ="<tr><td> </td>"; else $next =" ";
- if ($step) echo "$next<td>$step</td></tr>\n";
+ if ($step) echo "$next<td>$step; <i>".$as[$pz["ststat"][$i]]."</i>; " .$pz["stbem"][$i]."</td></tr>\n";
+ $i++;
}
}
// Dringlichkeit
--- a/fhiiqm/inc/tel_dat_show.inc.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/inc/tel_dat_show.inc.php Wed Feb 27 09:43:08 2013 +0100
@@ -11,6 +11,7 @@
echo "<tr><td>Nummer: </td><td>" . $tf["tel"] . "</td></tr>\n";
$tt = ($tf["typ"] == "fax")? strtoupper($tf["typ"]) : $tf["typ"];
echo "<tr><td>Typ: </td><td>$tt</td></tr>\n";
+/*
if ($tf["raum"] > "-1")
{
$sql = "SELECT raum_nr, geb_ID FROM Raum WHERE raum_ID=" . $tf["raum"];
@@ -22,7 +23,6 @@
}
else
echo "<tr><td>Ort: </td><td> </td></tr>\n";
+*/
echo "</table>\n";
-
-
?>
\ No newline at end of file
--- a/fhiiqm/laser_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/laser_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -33,10 +33,18 @@
$sub = $_POST["eintragen"];
$del = $_POST["del"];
$dup = $_POST["dup"];
- if (!$dup) $dup = $_GET["d"];
+ if (!$dup) $dup = $_GET["dp"];
$ok = $_POST["ok"];
if (!$la['okn']) $ok=false;
$duptext="";
+ $start = $_GET["st"];
+ $zeil = $_GET["z"];
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ $dir = $_GET["d"]; // Sortierrichtung
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ $filter = $_GET["b"]; // Filterbegriff
+ // $_GET-Parameter zurück zur Laserliste mit den selben Einstellungen wie zuvor
+ $getp = "s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
if ($dup)
{ // Anlage duplizieren
@@ -49,7 +57,7 @@
if ($ret)
{
$laid=$ret;
- $addr = $_SERVER["PHP_SELF"] . "?i=$laid&c=1";
+ $addr = $_SERVER["PHP_SELF"] . "?i=$laid&c=1&$getp";
header("Location: $addr");
exit;
}
@@ -194,7 +202,7 @@
echo "</table>\n";
echo "</div>\n";
// if (!is_null($_SESSION["recht"]) && !in_array("le", $_SESSION["recht"]))
- echo "<p class='sc'> <a href=\"laser_flist.php\" target=\"_self\" title=\"Laser\">« zur Laserliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"laser_flist.php?$getp\" target=\"_self\" title=\"Laser\">« zur Laserliste</a></p>\n";
echo "</form>\n";
@@ -375,7 +383,7 @@
}
echo "</div>\n";
echo "<p class=\"sc\"> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Laser erfassen\">Weiteren Laser erfassen</a></p>\n";
- echo "<p class=\"sc\"> <a href=\"laser_flist.php\" target=\"_self\" title=\"Laser\">Laserliste</a></p>\n";
+ echo "<p class=\"sc\"> <a href=\"laser_flist.php?$getp\" target=\"_self\" title=\"Laser\">Laserliste</a></p>\n";
}
?>
</body>
--- a/fhiiqm/laser_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/laser_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -75,6 +75,7 @@
if (!isset($filter) || !$filter) $filter = "";
if (!isset($sort) || !$sort) $sort = 2;
if (!isset($dir) || !$dir) $dir = "";
+ $getp = "&st=$start&z=$zeil&s=$sort&d=$dir&f=$fnum&b=$filter"; //Link fuer Laserliste zurueck
include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
@@ -181,10 +182,10 @@
echo "<td>$row->raum_nr</td>";
echo "<td>$row->abt_name</td>";
echo "<td>$row->vma</td>";
- echo "<td><a href='/fhiiqm/laser_ed.php?i=$row->las_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+ echo "<td><a href='/fhiiqm/laser_ed.php?i=$row->las_ID$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
- echo "<td><a href='/fhiiqm/laser_ed.php?i=$row->las_ID&d=1&c=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
- echo "<td><a href='/fhiiqm/laser_log_flist_ed.php?i=$row->las_ID'><img src=\"/fhiiqm/img/script_edit.png\" alt='log' title='log' border='0'/></a></td>";
+ echo "<td><a href='/fhiiqm/laser_ed.php?i=$row->las_ID&dp=1&c=1$getp'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
+ echo "<td><a href='/fhiiqm/laser_log_flist_ed.php?i=$row->las_ID$getp'><img src=\"/fhiiqm/img/script_edit.png\" alt='log' title='log' border='0'/></a></td>";
}
echo "</table></div>\n";
--- a/fhiiqm/laser_log_flist_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/laser_log_flist_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -82,6 +82,15 @@
if (!$ldat) $ldat = "0";
// echo "ldat: $ldat, " . urlencode($ldat) . ", ". urldecode($ldat). "<br />";
+ $start = $_GET["st"];
+ $zeil = $_GET["z"];
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ $dir = $_GET["d"]; // Sortierrichtung
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ $filter = $_GET["b"]; // Filterbegriff
+ // $_GET-Parameter zurück zur Laserliste mit den selben Einstellungen wie zuvor
+ $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+
// Felder, nach denen gefiltert werden kann
$fields = array(2=>"Laser-ID",3=>"Laser",4=>"Log-Datum");
@@ -363,7 +372,7 @@
$dbc -> close();
echo "<p> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Laser-Log\" class=\"sc\">Log-Buch alle Laser</a></p>\n";
- echo "<p> <a href=\"/fhiiqm/laser_flist.php\" target=\"_self\" title=\"Laserliste\" class=\"sc\">Laserliste</a></p>\n";
+ echo "<p> <a href=\"/fhiiqm/laser_flist.php$getp\" target=\"_self\" title=\"Laserliste\" class=\"sc\">Laserliste</a></p>\n";
?>
--- a/fhiiqm/ma_fkt_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/ma_fkt_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -71,6 +71,7 @@
if (!isset($filter) || !$filter) $filter = "";
if (!isset($sort) || !$sort) $sort = 2;
if (!isset($dir) || !$dir) $dir = "";
+ $getp = "&st=$start&z=$zeil&s=$sort&d=$dir&f=$fnum&b=$filter"; //Link fuer Beauftragungenliste zurueck
include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
@@ -166,7 +167,7 @@
}
else echo "<td> </td>";
echo "<td>$row->fkt_bem</td>";
- $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+// $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
// echo "<td><a href='/fhiiqm/ma_fkt_ed.php?i=$row->mf_ID&p=$row->persknr&f=$row->fkt_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
echo "<td><a href='/fhiiqm/ma_fkt_ed.php?i=$row->mf_ID&p=$row->persknr$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
echo "<td><a href='/fhiiqm/ma_fkt_ed.php?i=$row->mf_ID&dp=1$getp'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td></tr>\n";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/ma_obj_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 02/2013
+ *
+ * Reportauswahl Mitarbeiter - Telefon
+ *
+ */
+
+
+
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ session_start();
+ if (! isset($_SESSION["userid"]))
+ {
+ include_once ("inc/func_lib.inc.php");
+ login($_SERVER["PHP_SELF"]);
+ exit;
+ }
+
+ if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("mtr",$_SESSION["recht"]) && !in_array("mte",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" />
+ <link href="css/navio.css" rel="STYLESHEET" type="TEXT/CSS" />
+ <meta name="author" content="Bettina Schwarzer,FHI" />
+
+ <title>Reports Mitarbeiter</title>
+</head>
+
+<body>
+<?php
+ echo " ";
+ echo "<div class=\"float-br smaller\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/group.png\" border=\"0\" alt=\"Berichte Mitarbeiter\" title=\"Berichte Mitarbeiter\"/></div>\n";
+?>
+ <h3> Berichte Mitarbeiter/Objekte - Telefon</h3>
+ <div align="center">
+ <table width="94%" cellspacing="4" cellpadding="4">
+ <tr>
+ <td class="bigger">
+ <a href="/fhiiqm/report/ma_o_ragmt_report.php" title="MA Daten">Mitarbeiter/Objekte (fehlende Daten)</a>
+ <br /> Auswahl: Abteilung, ohne Arbeitsgruppe, ohne Raum, ohne E-Mail, ohne Telefon
+ <br /> Ansicht: Mitarbeiter/Objekt, Abteilung, Arbeitsgruppe, Raum, Telefon, E-Mail
+ </td>
+ </tr>
+ </table>
+ </div>
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/ma_tel_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/ma_tel_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -59,34 +59,69 @@
var counter = 0;
var limit = 99;
var arr = new Array();
+ var arra = new Array();
+ var arrg = new Array();
function addInput(divName){
if (counter == limit) {
alert("Das Limit von " + counter + " zusätzlichen inputs ist erreicht");
}
- else {
+ else
+ {
+ if (divName == 'addtel')
+ {
var newdiv = document.createElement('div');
var opt="<option value='-1'></option>";
+ var i;
for (var key in arr)
{
opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
}
- opt += "</select>";
- newdiv.innerHTML = "<select name='ma[tel][]'>"+opt;
- newdiv.innerHTML += " oder neu <input type='text' name='ma[ntel][]' size='20' maxlength='20' />";
- newdiv.innerHTML += " öffentlich <input type='checkbox' name='ma[pub][" + (counter+1) + "]' value='1' />";
+ opt += "</select>\n";
+ newdiv.innerHTML = "<span></span><select name='ma[tel][]'>"+opt;
+ newdiv.innerHTML += " oder neu <input type='text' name='ma[ntel][]' size='20' maxlength='20' />";
+ opt = "<option value='-1'></option>";
+ for (i=1; i<10; i++)
+ {
+ opt = opt.concat("<option value=",i,">",i,"</option>\n");
+ }
+ opt += "</select>\n";
+ newdiv.innerHTML += " Priorität <select name='ma[so][]'>"+opt;
+ newdiv.innerHTML += " öffentlich <input type='checkbox' name='ma[pub][" + (counter+1) + "]' value='1' />\n";
document.getElementById(divName).appendChild(newdiv);
counter++;
+ }
+ else
+ {
+ var newdiv = document.createElement('div');
+ var opt="";
+ var optg="<option value='-1'></option>";
+ for (var key in arra)
+ {
+ opt = opt.concat("<option value='",key,"'>",arra[key],"</option>\n" );
+ }
+ opt += "</select>\n";
+ newdiv.innerHTML = "<span></span><select name='ma[abt][]'>"+opt;
+ for (var key in arrg)
+ {
+ optg = optg.concat("<option value='",key,"'>",arrg[key],"</option>\n" );
+ }
+ optg += "</select>\n";
+ newdiv.innerHTML += " Arbeitsgruppe <select name='ma[rag][]'>"+optg;
+ document.getElementById(divName).appendChild(newdiv);
+ counter++;
+ }
}
}
function delInput(divId){
var kn = document.getElementById(divId);
- while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SELECT" && kn.lastChild.nodeName != "A")
+ while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SPAN" && kn.lastChild.nodeName != "A")
{
// alert ("vor "+kn.lastChild.nodeName+", nodetyp = "+ kn.lastChild.nodeType);
var knc = kn.lastChild;
document.getElementById(divId).removeChild(knc);
}
- if (kn.lastChild.nodeName == "SELECT") document.getElementById(divId).removeChild(kn.lastChild);
+// if (kn.lastChild.nodeName == "SELECT") document.getElementById(divId).removeChild(kn.lastChild);
+ if (kn.lastChild.nodeName == "SPAN") document.getElementById(divId).removeChild(kn.lastChild);
}
//-->
</script>
@@ -111,7 +146,7 @@
if ($pid && (!$sub || !$del) && !isset($ma))
{
- $sql = "SELECT nachname,vorname,titel,rag_ID,abt_tel,email,aktiv FROM Mitarbeiter WHERE persknr=$pid";
+ $sql = "SELECT nachname,vorname,titel,abt_tel,email,aktiv FROM Mitarbeiter WHERE persknr=$pid";
if ($result = $dbc -> queryObjectArray($sql))
{
foreach ($result as $row)
@@ -119,12 +154,23 @@
$ma['name'] = $row->nachname;
$ma['vname'] = $row->vorname;
$ma['titel'] = $row->titel;
- $ma['rag'] = $row->rag_ID;
- $ma['abt'] = $row->abt_tel;
+ $ma['abtm'] = $row->abt_tel;
$ma['email'] = $row->email;
$ma['fhi'] = ($row->aktiv == 1)? 1 : 0;
}
}
+ // Arbeitsgruppe, Abteilung
+ $sql = "SELECT mr.rag_ID, abt_ID FROM fhiiqm.MA_RaumArbGruppe mr INNER JOIN RaumArb_Gruppe r ON mr.rag_ID=r.rag_ID
+ WHERE persknr=$pid";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $ma['abt'][] = $row->abt_ID;
+ $ma['rag'][] = $row->rag_ID;
+ }
+ }
+ if (count($ma['abt']) == 0) $ma['abt'][] = $ma['abtm'];
// Haus,Raum
$sql = "SELECT ma.raum_ID, geb_ID FROM Mitarbeiter_Raum ma INNER JOIN Raum r ON ma.raum_ID=r.raum_ID
WHERE persknr=$pid ORDER BY raum_ID";
@@ -137,15 +183,16 @@
}
}
// Telefon
- $sql = "SELECT m.telefon_nr,public
+ $sql = "SELECT m.telefon_nr,public,sort
FROM fhiiqm.MA_Telefon m INNER JOIN Telefon t ON m.telefon_nr=t.telefon_nr
- WHERE persknr = $pid";
+ WHERE persknr = $pid ORDER BY IFNULL(sort,99)" ;
if ($result = $dbc -> queryObjectArray($sql))
{
foreach ($result as $row)
{
$ma['tel'][] = $row->telefon_nr;
$ma['pub'][] = ($row->public)? 1 : 0;
+ $ma['so'][] = $row->sort;
}
}
}
@@ -195,6 +242,8 @@
$retdi = $dbc -> execute($sql);
$sql = "DELETE FROM MA_Telefon WHERE persknr = $pid";
$retdi = $dbc -> execute($sql);
+ $sql = "DELETE FROM MA_RaumArbGruppe WHERE persknr = $pid";
+ $retdi = $dbc -> execute($sql);
}
else
{
@@ -215,23 +264,28 @@
}
else //INSERT oder UPDATE
{
- if ($ma['rag'] == -1) $ma['rag'] = null;
$stmt = $dbc -> stmtinit();
if (is_object($stmt))
{
- if ($ma['fhi']) $aktiv = 1; else $aktiv = 2;
+ if ($ma['fhi']) $aktiv = 1; else $aktiv = 2;
+ if ($ma['email'])
+ {
+ if (strpos($ma['email'],"@") > 0) $ma['email'] = $ma['email']; else $ma['email'] = $ma['email'] . "@fhi-berlin.mpg.de";
+ }
+ foreach ($ma as &$elem) if (!$elem) $elem = null; // NULL-Eintrag in Leerfelder
if ($pid) //UPDATE
{
+ // Abt. alt in aktualisierten Abteilungen?
+ if (!in_array($ma['abtm'],$ma['abt'])) $ma['abtm'] = $ma['abt'][0];
$stmt -> prepare("UPDATE Mitarbeiter SET
nachname = ?,
vorname = ?,
titel = ?,
- rag_ID = ?,
email = ?,
abt_tel = ?,
aktiv = ?
WHERE persknr = $pid");
- $stmt -> bind_param('sssisii',$ma['name'],$ma['vname'],$ma['titel'],$ma['rag'],$ma['email'],$ma['abt'], $aktiv);
+ $stmt -> bind_param('ssssii',$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abtm'], $aktiv);
// echo "UPDATE: ". var_dump($stmt);
$result = $stmt -> execute();
if ($stmt->error) echo "error UPDATE Mitarbeiter: " . $stmt->error . "<br><br>\n";
@@ -240,10 +294,11 @@
{
$sql = "SELECT MAX(persknr) FROM Mitarbeiter WHERE persknr < 9500";
$pid = $dbc -> querySingleItem($sql) + 1;
- $stmt -> prepare ("INSERT INTO Mitarbeiter (persknr, nachname, vorname, titel,rag_ID,email,abt_tel,aktiv) VALUES (?,?,?,?,?,?,?,?)");
- $stmt -> bind_param('isssisii',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['rag'],$ma['email'],$ma['abt'], $aktiv);
+ $stmt -> prepare ("INSERT INTO Mitarbeiter (persknr, nachname, vorname, titel,email,abt_tel,aktiv) VALUES (?,?,?,?,?,?,?)");
+ $stmt -> bind_param('issssii',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abt'][0], $aktiv);
$result = $stmt -> execute();
if ($stmt->error) echo "error INSERT Mitarbeiter: " . $stmt->error . "<br><br>\n";
+ $ma['abtm'] = $ma['abt'][0];
}
if ($result)
{
@@ -259,6 +314,23 @@
$ret = $dbc -> execute($sql);
}
}
+ if (is_array($ma["rag"]) && count($ma["rag"])>0)
+ {
+ $sql = "DELETE FROM MA_RaumArbGruppe WHERE persknr=$pid";
+ $redr = $dbc -> execute($sql);
+ if ($redr)
+ {
+ foreach ($ma['rag'] as $rag)
+ {
+ if ($rag > 0)
+ {
+ $sql = "INSERT INTO MA_RaumArbGruppe (persknr, rag_ID) VALUES ($pid, $rag)";
+ $retn = $dbc -> execute($sql);
+ if ($retn && $ret) $ret = 1; else $ret = 0;
+ }
+ }
+ }
+ }
if (is_array($ma['ntel']))
{
foreach ($ma['ntel'] as $tel)
@@ -271,13 +343,15 @@
{
$sql = "INSERT INTO Telefon (telefon_nr) VALUES('$tel')";
$rest = $dbc -> execute($sql);
- if ($rest) $ret = 1; else $ret = 0;
+ if ($rest && $ret) $ret = 1; else $ret = 0;
}
}
}
}
if ($ret)
{
+ foreach ($ma['so'] as &$prio)
+ if ($prio == '-1') $prio = null;
$sql = "DELETE FROM MA_Telefon WHERE persknr = $pid";
$redmt = $dbc -> execute($sql);
if ($redmt)
@@ -288,9 +362,10 @@
if ($tel >"!" && $tel != "-1")
{
if (!isset($ma['pub'][$i])) $ma['pub'][$i] = 'NULL';
- $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ")";
+ if (!isset($ma['so'][$i])) $ma['so'][$i] = 'NULL';
+ $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public, sort) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ",". $ma['so'][$i] . ")";
$rest = $dbc -> execute($sql);
- if ($rest) $ret = 1; else $ret = 0;
+ if ($rest && $ret) $ret = 1; else $ret = 0;
}
$i++;
}
@@ -300,9 +375,10 @@
if ($tel >"!")
{
if (!isset($ma['pub'][$i])) $ma['pub'][$i] = 'NULL';
- $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ")";
+ if (!isset($ma['so'][$i])) $ma['so'][$i] = 'NULL';
+ $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public, sort) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ",". $ma['so'][$i] . ")";
$rest = $dbc -> execute($sql);
- if ($rest) $ret = 1; else $ret = 0;
+ if ($rest && $ret) $ret = 1; else $ret = 0;
}
$i++;
}
--- a/fhiiqm/ma_tel_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/ma_tel_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -21,7 +21,7 @@
if (! isset($_SESSION["userid"]))
{
include_once ("inc/func_lib.inc.php");
- login($_SERVER["PHP_SELF"]);
+ login($_SERVER["PHP_SELF"]."?e=$edit");
exit;
}
@@ -30,7 +30,8 @@
header("Location: start.php");
exit;
}
- }
+// print_r ($_SESSION); echo "<br />";
+ }
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -56,9 +57,9 @@
}
// Felder, nach denen gefiltert werden kann
- $fields = array(2=>"Name",3=>"Vorname",5=>"Abteilung",6=>"Telefon/Fax",9=>"Haus", 10=>"Raum");
+ $fields = array(2=>"Name",3=>"Vorname",5=>"Abteilung",6=>"Arbeitsgruppe",7=>"Telefon/Fax",9=>"Haus", 10=>"Raum");
// $fieldf = array(2=>"trim(nachname)",3=>"vorname",5=>"abt_name",6=>"mt.telefon_nr",9=>"geb_ID", 10=>"raum_nr");
- $fieldf = array(2=>"name",3=>"vorname",5=>"abt_name",6=>"telefon_nr",9=>"geb_ID", 10=>"raum_nr");
+ $fieldf = array(2=>"name",3=>"vorname",5=>"abt_name",6=>"ag",7=>"telefon_nr",9=>"geb_ID", 10=>"raum_nr");
$sort = $_GET["s"]; // Sortierung nach Spalte
if (!isset($sort) && !$sort) $sort = $_POST["s"];
@@ -103,24 +104,38 @@
*/
// $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list";
// Raum zu Mitarbeiter und nicht zu Telefon
- $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list_ma_raum";
+ if ($edit) // auch ehemalige MA
+// $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv FROM v_tel_list";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, ag, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv FROM v_tel_list_ag
+ WHERE 1=1";
+ else
+// $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv FROM v_tel_list_ma_raum";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, ag, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv
+ FROM v_tel_list_ag WHERE aktiv > 0";
if ($filter)
{
if ($fnum > 3)
- $wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'%$filter%'";
+ $wher = " AND " . $fieldf[$fnum] . " LIKE " . "'%$filter%'";
else
- $wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'$filter%'";
+ $wher = " AND " . $fieldf[$fnum] . " LIKE " . "'$filter%'";
}
else $wher = "";
-
- if ($sort == 2) $so = "name COLLATE latin1_general_ci $dir, 3, 5";
+ // intern/extern
+ $ip=getenv("REMOTE_ADDR");
+ $ippart=explode(".",$ip);
+ if (($ippart[0] == 141 && $ippart[1] == 14) || ($ippart[0] == 172 && $ippart[1] == 16))
+ $wip = "";
+ else
+ $wip = " AND public=1 ";
+
+ if ($sort == 2) $so = "name COLLATE latin1_general_ci $dir, 1, 3, 5, 6";
// if ($sort == 2) $sort = "2, 3, 5";
- elseif ($sort == 5) $so = "5 $dir, name COLLATE latin1_general_ci, 3";
+ elseif ($sort == 5) $so = "5 $dir, 6, name COLLATE latin1_general_ci, 1, 3";
// if ($sort == 5) $sort = "5, 2, 3";
else $so = "$sort $dir ";
- if ($so) $ord = " ORDER BY $so, 6 "; // immer nach Telefon-Nr als 2.
+ if ($so) $ord = " ORDER BY $so, IFNULL(sort,99), 7 "; // immer nach Telefon-Nr als 2.
- $sql .= $wher . $ord;
+ $sql .= $wher . $wip . $ord;
// echo "sql = $sql<br /><br />";
$result = $dbc ->queryObjectArray($sql);
@@ -136,15 +151,17 @@
echo "<table border='0' cellspacing='0'>\n";
echo "<tr><td class='bigger'>Mittels '<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />'
- können Sie nach bestimmten Spalten auf- bzw. absteigend sortieren</td></tr>
- <tr><td class='bigger'>'<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' ermöglicht das Filtern nach ausgewählten Spalten der Liste</td></tr>
- <tr><td class='bigger'>Rote Telefon-/Fax-Nummern sind nur intern erreichbar</td></tr>";
+ können Sie nach allen Spalten auf- bzw. absteigend sortieren</td></tr>
+ <tr><td class='bigger'>'<img src='http://achilleus.rz-berlin.mpg.de/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' ermöglicht das Filtern nach allen Spalten der Liste</td></tr>";
if ($edit)
- echo "<tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Angaben</tr>";
-
+ {
+ echo "<tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Angaben</td></tr>";
+ echo "<tr><td class='bigger'><span style='color: orange; font-size: 1em;'>Orange</span> <span style='background-color: #FFCC88; font-size: 1em;'>hinterlegte</span> Zeilen markieren ausgeschiedenen Mitarbeiter</td></tr>";
+ }
+ echo "<tr><td class='bigger'><span style='color: red; font-size: 1em;'>Rote</span> Telefon-/Fax-Nummern sind nur intern sichtbar</td></tr>";
echo "</table>\n";
- echo "</div><p> <a href=/fhiiqm/ma_tel_pdf.php?e=$edit$getp>PDF erstellen</a></p>\n<div align='center'>\n";
+ echo "</div><p> <a href='/fhiiqm/ma_tel_pdf_mc.php?e=$edit$getp'>PDF erstellen</a></p>\n<div align='center'>\n";
if (isset($fnum) && $fnum>1 && !$filter && !$subf)
{
// Formular anzeigen fuer Filterbegriff
@@ -179,7 +196,7 @@
echo "<a href='". $_SERVER["PHP_SELF"] . "?e=$edit&f=2&b=". chr($j)."' target=\"_self\" title=\"Telefonliste\" class=\"sc\">".chr($j)." </a>";
}
echo "</p>\n";
- echo "<table width='55%'>\n";
+ echo "<table width='75%'>\n";
if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td></tr>\n";
@@ -188,9 +205,10 @@
tab_column(2,"Name",$sort,$dir,2,$fnum,$filter,$start,$zeil,$edit);
tab_column(3,"Vorname",$sort,$dir,3,$fnum,$filter,$start,$zeil,$edit);
tab_column(5,"Abteilung",$sort,$dir,5,$fnum,$filter,$start,$zeil,$edit);
+ tab_column(6,"Arbeitsgruppe",$sort,$dir,6,$fnum,$filter,$start,$zeil,$edit);
tab_column(9,"Haus",$sort,$dir,9,$fnum,$filter,$start,$zeil,$edit);
tab_column(10,"Raum",$sort,$dir,10,$fnum,$filter,$start,$zeil,$edit);
- tab_column(6,"Telefon/Fax",$sort,$dir,6,$fnum,$filter,$start,$zeil,$edit);
+ tab_column(7,"Telefon/Fax",$sort,$dir,7,$fnum,$filter,$start,$zeil,$edit);
if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
echo "<th> </th>";
echo "</tr>\n";
@@ -201,15 +219,20 @@
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
$titel = ($row->titel)? ", $row->titel" : "" ;
$email = ($row->email)? "<a href='mailto:$row->email'>$row->name$titel</a>" : "$row->name$titel";
- echo "<tr bgcolor='" . $bg . "'><td >$email</td>";
+ if ($row->aktiv == 0) $class = " class='bgmark'"; else $class="";
+ echo "<tr$class bgcolor='" . $bg . "'><td>$email</td>";
echo "<td>$row->vorname</td>";
echo "<td>$row->abt_name</td>";
+ echo "<td>$row->ag</td>";
// echo "<td class=\"left\">$row->telnr " . ($row->telefon_typ == 'fax')? ", " . strtoupper($row->telefon_typ) : "" . "</td>";
$ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
$rot = ($row->public)? "" : " class=\"red\"";
echo "<td>$row->geb_ID</td>";
echo "<td>$row->raum_nr</td>";
- echo "<td$rot>$row->telefon_nr $ttyp</td>";
+ if ($row->sort == 1)
+ echo "<td$rot><b>$row->telefon_nr</b> $ttyp</td>";
+ else
+ echo "<td$rot>$row->telefon_nr $ttyp</td>";
if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
echo "<td><a href='/fhiiqm/ma_tel_ed.php?i=$row->persknr$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
echo "</tr>\n";
@@ -218,22 +241,39 @@
{
if ($vabt != $row->abt_name) $abt = $row->abt_name;
else $abt = ' ';
+ if ($vag != $row->ag) $ag = $row->ag;
+ else $ag = ' ';
+ if ($vtel != $row->telefon_nr)
+ {
+ $ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
+ $rot = ($row->public)? "" : " class=\"red\"";
+ $tel = $row->telefon_nr;
+ }
+ else
+ {
+ $tel = ' ';
+ $ttyp = '';
+ }
echo "<tr bgcolor='" . $bg . "'><td colspan='2'> </td>";
- $ttyp = ($row->telefon_typ == 'fax')? " " . strtoupper($row->telefon_typ) : "";
- $rot = ($row->public)? "" : " class=\"red\"";
echo "<td>$abt</td>";
+ echo "<td>$ag</td>";
echo "<td> </td>";
echo "<td> </td>";
- echo "<td$rot>$row->telefon_nr $ttyp</td>";
+ if ($row->sort == 1)
+ echo "<td$rot><b>$tel</b> $ttyp</td>";
+ else
+ echo "<td$rot>$tel $ttyp</td>";
if ($edit && !is_null($_SESSION["recht"]) && in_array("mte", $_SESSION["recht"]))
echo "<td> </td>";
echo "</tr>\n";
}
$vpnr = $row->persknr;
$vabt = $row->abt_name;
+ $vag = $row->ag;
+ $vtel = $row->telefon_nr;
}
echo "</table></div>\n";
- echo "<p> <a href=/fhiiqm/ma_tel_pdf.php?e=$edit$getp>PDF erstellen</a></p>\n";
+ echo "<p> <a href='/fhiiqm/ma_tel_pdf_mc.php?e=$edit$getp'>PDF erstellen</a></p>\n";
}
else
--- a/fhiiqm/ma_tel_pdf.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/ma_tel_pdf.php Wed Feb 27 09:43:08 2013 +0100
@@ -76,9 +76,9 @@
{
$sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email, abt_tel+0 FROM v_tel_list_ma_raum ";
- if ($sortp == '2') $sortp = "name COLLATE latin1_general_ci,3,12,5,6"; // Name
- elseif ($sortp == '12') $sortp = "12,5,name COLLATE latin1_general_ci,3,6"; // abt_ID
- else $sortp = "name COLLATE latin1_general_ci,3,12,5,6";
+ if ($sortp == '2') $sortp = "name COLLATE latin1_general_ci,3,12,5,IFNULL(sort,99),6"; // Name
+ elseif ($sortp == '12') $sortp = "12,5,name COLLATE latin1_general_ci,3,IFNULL(sort,99),6"; // abt_ID
+ else $sortp = "name COLLATE latin1_general_ci,3,12,5,IFNULL(sort,99),6";
if ($abt > '-1') $wher = " WHERE abt_tel = $abt "; else $wher = "";
@@ -89,8 +89,9 @@
$pdf = new PDF();
$pdf->SetLeftMargin(25);
$pdf->AddPage();
- $pdf->AliasNbPages();
+ $pdf->AliasNbPages(); // Anzahl Seiten
$pdf->SetFont('helvetica','',9);
+// $pdf->SetFont('times','',8);
$pdf->FancyTable($header,$result);
$pdf->SetDisplayMode('real');
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/ma_tel_pdf_mc.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 01/2013
+ *
+ * Telefonliste als pdf erstellen
+ *
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+ include ($_SERVER['DOCUMENT_ROOT']."/fhiiqm/inc/pdf_ma_tel.inc.php");
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ $dbc = new dbconnection();
+ $sub = $_POST['sub'];
+ $sortp = $_POST['sortp'];
+ if (!$sortp) $sortp = $_GET['sp'];
+ $abt = $_POST['abt'];
+ if (!$abt) $abt = $_GET['a'];
+ $fmt = $_POST['form'];
+ if (!$fmt) $fmt = $_GET['t'];
+ $info = $_POST['info'];
+ if (!$info) $info = $_GET['o'];
+
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ $dir = $_GET["d"]; // Sortierrichtung
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ $filter = $_GET["b"]; // Filterbegriff
+ $edit = $_GET["e"]; // Telefonliste editierbar
+ $getp = "e=$edit&s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige Mitarbeiter/Objekte-Telefonliste
+
+ if (!$sub)
+ {
+ ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <title>MA/O-Telefonliste -> PDF</title>
+ </head>
+ <body>
+ <div align="center">
+ <p><b>PDF: Mitarbeiter/Objekte - Telefonliste</b></p>
+ <?php
+ echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
+ echo "<table width=\"30%\" border=\"0\">\n";
+ echo "<tr><td>Format</td>";
+ echo " <td><select name=\"form\">
+ <option value=1>normal</option>
+ <option value=2>small</option>
+ <option value=3>tiny</option>
+ <option value=4>new</option>
+ </select>\n";
+ echo " </td></tr>\n";
+ echo "<tr><td>filtern nach Abteilung</td>";
+ echo " <td valign=\"top\">
+ <select name=\"abt\">";
+ echo "<option value=\"-1\"></option>\n";
+ $sql = "SELECT abt_ID, abt_name, abt_long FROM `fhiiqm`.`Abteilung` ORDER BY abt_ID+0";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->abt_ID == $ma['abt'])
+ echo "<option selected value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ else
+ echo "<option value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ }
+ }
+ echo " </select></td></tr>\n";
+ echo "<tr><td>sortieren nach</td>";
+ echo " <td><select name='sortp'>";
+ echo " <option value=\"-1\"></option>\n";
+ echo " <option value='2'>Name</option>\n";
+ echo " <option value='12'>Abteilung</option>\n";
+ echo " </select></td></tr>\n";
+ echo "<tr><td>mit Infoseiten</td><td><input name=\"info\" type=\"checkbox\" value=\"1\" ";
+ if ($info) echo "checked=\"checked\"";
+ echo " /></td></tr>\n";
+
+ echo "<tr><td> </td><td><input class=\"button\" type=\"submit\" name=\"sub\" value=\" pdf erstellen \" /></td></tr>\n";
+ echo "</table>\n";
+ echo "</form>\n";
+ echo "</div>\n";
+ echo "<p><br /><br /> <a href=/fhiiqm/ma_tel_flist.php?$getp>« zur Telefon-Liste</a></p>\n";
+ echo "</body></html>\n";
+ }
+ else
+ {
+ if ($fmt == 2 || $fmt == 3) $wher = " WHERE sort=1 "; else $wher = " WHERE 1=1 ";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email, abt_tel+0
+ FROM v_tel_list_abt " . $wher . " AND aktiv > 0 ";
+
+ // intern/extern
+ $ip=getenv("REMOTE_ADDR");
+ $ippart=explode(".",$ip);
+ if (($ippart[0] == 141 && $ippart[1] == 14) || ($ippart[0] == 172 && $ippart[1] == 16))
+ $wip = "";
+ else
+ $wip = " AND public=1 ";
+ if ($sortp == '2') $sortp = "name COLLATE latin1_general_ci,3,12,5,IFNULL(sort,99),6"; // Name
+ elseif ($sortp == '12') $sortp = "12,5,name COLLATE latin1_general_ci,3,IFNULL(sort,99),6"; // abt_ID
+ else $sortp = "name COLLATE latin1_general_ci,3,12,5,IFNULL(sort,99),6";
+
+ if ($abt > '-1') $wher = " AND abt_tel = $abt "; else $wher = "";
+
+ $sql .= $wher . $wip . " ORDER BY $sortp";
+ if ($result = $dbc ->queryObjectArray($sql))
+ {
+ $pdf = new PDF();
+ $pdf->SetLeftMargin(25);
+ if ($fmt == 4)
+ {
+ $header=array('Name','Abteilung','Tel/Fax','Raum','E-Mail');
+ $pdf->anzcol = null;
+ }
+ $pdf->AddPage();
+ $pdf->AliasNbPages(); // Anzahl Seiten
+ if ($info && $fmt != 4)
+ {
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf1n.jpg",$pdf->lMargin-20,$pdf->tMargin+17,210);
+ $pdf->AddPage();
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf2n.jpg",$pdf->lMargin-20,$pdf->tMargin+14,210);
+ $pdf->AddPage();
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf3n.jpg",$pdf->lMargin-20,$pdf->tMargin+14,210);
+ $pdf->AddPage();
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf4n.jpg",$pdf->lMargin-20,$pdf->tMargin+14,210);
+ $pdf->AddPage();
+ }
+ $pdf->height = 3.5;
+ $pdf->SetFont('times','','');
+ switch ($fmt)
+ {
+ case 1:
+ $pdf->anzcol = 1;
+ $pdf->Normal($result);
+ break;
+ case 2:
+ $pdf->xa = $pdf->lMargin;
+ $pdf->fancy = 0; // mehrspaltig
+ $pdf->anzcol = 2;
+ $colwidth = 85;
+ $pdf->Small($result,$colwidth,$pdf->height);
+ break;
+ case 3:
+ $pdf->xa = $pdf->lMargin;
+ $pdf->fancy = 0; // mehrspaltig
+ $pdf->anzcol = 3;
+ $colwidth = 55;
+ $pdf->Small($result,$colwidth,$pdf->height);
+ break;
+ case 4:
+ $pdf->fancy = 1; // einspaltig
+ $pdf->SetFont('helvetica','',9);
+ $pdf->FancyTable($header,$result);
+ break;
+ }
+
+ $pdf->Ln();
+ $pdf->SetDisplayMode('real');
+ $pdf->Output();
+ // als Download
+// $pdf->Output('ma_tel_list.pdf','D');
+ }
+ }
+?>
\ No newline at end of file
--- a/fhiiqm/prod_hier.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/prod_hier.php Wed Feb 27 09:43:08 2013 +0100
@@ -54,7 +54,10 @@
echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/node-tree.png\" border=\"0\" alt=\"Produkte\" title=\"Produkte\"/></div>\n";
$prods = $_POST['prods'];
+ if (!$prods["ber"]) $prods["ber"] = $_GET["b"];
+ if (!$prods['grp']) $prods['grp'] = $_GET["g"];
$submit = $_POST['search'];
+ if (!$submit) $submit = $_GET["s"];
include_once($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/dbconnect.inc.php");
$dbc = new dbconnection();
@@ -167,6 +170,7 @@
$sql = "CALL prod_hiera_all(" .$prods['ber'].",".$prods['grp'].")";
if ($result = $dbc->queryObjectArray($sql))
{
+ $getp = "&b=".$prods['ber']."&g=".$prods['grp']."&s=1";
// printf ("<p>Es wurden %s Saetze gefunden.</p>", $dbc->numrows($sql));
$bg1 = "#F8F8F8";
$bg2 = "#DEDFE1";
@@ -184,7 +188,7 @@
else
$prod=str_replace(" "," ",htmlentities($row->bez));
if ($row->level == 4)
- $hier="<a href='produkt_upd.php?uid=$row->prid'><img src=\"img/edit.gif\" alt='edit' title='edit' border='0'/></a>";
+ $hier="<a href='produkt_upd.php?uid=$row->prid$getp'><img src=\"img/edit.gif\" alt='edit' title='edit' border='0'/></a>";
else
$hier=" ";
print "<tr bgcolor='" . $bg . "'><td>$row->hier</td><td> $hier</td>
--- a/fhiiqm/produkt_upd.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/produkt_upd.php Wed Feb 27 09:43:08 2013 +0100
@@ -52,6 +52,8 @@
$submit = $_POST["upd"];
$prod = $_POST["prod"];
if (!$prod['okn']) $ok=false;
+
+ $getp = "?s=".$_GET["s"]."&b=".$_GET["b"]."&g=".$_GET["g"]; // Parameter zur Liste zurück
// echo "pid=$pid, submit=$submit<br />\n";
if (!$ok || !$submit)
@@ -99,8 +101,8 @@
}
echo "</table>\n";
echo "</div>\n";
- if (!is_null($_SESSION["recht"]) && !in_array("pe",$_SESSION["recht"]))
- echo "<p> <a href=\"prod_hier.php\" target=\"_self\" title=\"Produkthierarchie\">« zur Produkthierarchie</a></p>\n";
+// if (!is_null($_SESSION["recht"]) && !in_array("pe",$_SESSION["recht"]))
+ echo "<p> <a href=\"prod_hier.php$getp\" target=\"_self\" title=\"Produkthierarchie\">« zur Produkthierarchie</a></p>\n";
echo "</form>\n";
}
@@ -159,7 +161,7 @@
}
$dbc -> close();
echo "</div>\n";
- echo "<p> <a href=\"prod_hier.php\" target=\"_self\" title=\"Produkthierarchie\">Zur Produkthierarchie</a></p>\n";
+ echo "<p> <a href=\"prod_hier.php$getp\" target=\"_self\" title=\"Produkthierarchie\">Zur Produkthierarchie</a></p>\n";
echo "<p> <a href=\"produkt_ins.php\" target=\"_self\" title=\"Produkt erfassen\">Weiteres Produkt erfassen</a></p>\n";
}
--- a/fhiiqm/prozess_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/prozess_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -93,7 +93,18 @@
}
else {
var newdiv = document.createElement('div');
- newdiv.innerHTML = "<input type='text' name='pz[step][]' size='50' maxlength='50' />";
+ var opt="<option value='-1'></option>";
+ var i;
+ for (var key in arr)
+ {
+ opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
+ }
+ opt += "</select>\n";
+ newdiv.innerHTML = "<span></span><input type='text' name='pz[step][]' size='50' maxlength='50' />";
+ newdiv.innerHTML += " Status <select name='pz[ststat][]'>"+opt;
+ newdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+ newdiv.innerHTML += "<br /> Bemerkung zu Schritt ";
+ newdiv.innerHTML += "<input type='text' name='pz[stbem][]' size='50' maxlength='50' />";
document.getElementById(divId).appendChild(newdiv);
counter++;
}
@@ -102,18 +113,18 @@
// var kn = document.getElementById(divId).lastChild;
// document.getElementById(divId).removeChild(kn);
var kn = document.getElementById(divId);
- while (kn.childNodes.length>0 && kn.lastChild.nodeName != "INPUT" && kn.lastChild.nodeName != "A")
+ while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SPAN" && kn.lastChild.nodeName != "A")
{
//alert ("vor "+kn.lastChild.nodeName+", nodetyp = "+ kn.lastChild.nodeType);
var knc = kn.lastChild;
document.getElementById(divId).removeChild(knc);
}
- if (kn.lastChild.nodeName == "INPUT") document.getElementById(divId).removeChild(kn.lastChild);
+ if (kn.lastChild.nodeName == "SPAN") document.getElementById(divId).removeChild(kn.lastChild);
}
//-->
</script>
- <title>Edit Prozess</title>
+ <title>Edit Projekt</title>
</head>
<body>
@@ -177,13 +188,13 @@
echo "<div class=\"float-br smaller\" valign='top'>";
echo " user: " . $_SESSION["userid"];
echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
- echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Prozess ändern\" title=\"Prozess ändern\"/></div>\n";
+ echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Projekt ändern\" title=\"Projekt ändern\"/></div>\n";
echo "<div align='center'>";
if ($pzid) $text = "editieren"; else $text = "erfassen";
if ($copy) $duptext = " (Kopie)";
- echo "<h3>Prozess $text$duptext<h3>";
+ echo "<h3>Projekt $text$duptext<h3>";
echo "</div>\n";
@@ -225,11 +236,15 @@
}
}
// Daten aus Proz_Step
- $sql = "SELECT proz_step FROM Proz_Step WHERE proz_ID = $pzid ORDER BY proz_step_ID";
+ $sql = "SELECT proz_step,step_stat_ID,step_bem FROM Proz_Step WHERE proz_ID = $pzid ORDER BY proz_step_ID";
if ($ress = $dbc -> queryObjectArray($sql))
{
foreach ($ress as $row)
- $pz["step"][] = $row->proz_step;
+ {
+ $pz["step"][] = $row->proz_step;
+ $pz["ststat"][] = $row->step_stat_ID;
+ $pz["stbem"][] = $row->step_bem;
+ }
}
}
@@ -239,7 +254,7 @@
if ($sub)
$frage = "Alle Angaben ok?";
elseif ($del)
- $frage = "Prozess wirklich löschen?";
+ $frage = "Projekt wirklich löschen?";
echo "<tr>
<td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
<td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
@@ -261,7 +276,7 @@
echo "</table>\n";
echo "</div>\n";
// if (!is_null($_SESSION["recht"]) && !in_array("le", $_SESSION["recht"]))
- echo "<p class='sc'> <a href=\"prozess_flist.php\" target=\"_self\" title=\"Prozessliste\">« zur Prozessliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"prozess_flist.php\" target=\"_self\" title=\"Projektliste\">« zur Projektliste</a></p>\n";
echo "</form>\n";
}
else
@@ -281,7 +296,7 @@
{
echo "<p class='red'><b>DELETE: Daten zu '".$pz["bez"]."', ID = '$pzid' konnten nicht gelöscht werden!</b></p>\n";
if (strpos($dbc->error,'1451') !== false)
- echo "error DELETE: Es gibt mindestens einen abhängigen Prozess zu Prozess-ID '$pzid'<br />";
+ echo "error DELETE: Es gibt mindestens einen abhängiges Projekt zu Projekt-ID '$pzid'<br />";
else
{
echo "sql = $sql<br />";
@@ -305,7 +320,8 @@
if ($pz["pkost"]) $pz["pkost"] = dbformat_wert($pz["pkost"]); else $pz["pkost"] = null;
if ($pz["urg"] == -1) $pz["urg"] = null;
if ($pz["stat"] == -1) $pz["stat"] = null;
- if ($pz["pzref"] == -1) $pz["pzref"] = null;
+ if ($pz["pzref"] == -1) $pz["pzref"] = null;
+ if ($pz["prid"] < 1) $pz["prid"] = null;
if ($pz["pers"] < "!") $pz["persknr"] = null;
if ($pz["persa"] < "!") $pz["persknra"] = null;
@@ -336,7 +352,7 @@
$stmt -> bind_param('issssdssdiiiisi',$pz["prid"],$pz["bez"],$pz["bezl"],$pz["sdat"],$pz["edat"],$pz["kost"],$pz["psdat"],$pz["pedat"],$pz["pkost"],
$pz["urg"],$pz["stat"],$pz["persknr"],$pz["pzref"],$pz["bem"],$pz["persknra"]);
$result = $stmt -> execute();
- if ($stmt->error) echo "error UPDATE Prozess: " . $stmt->error . "<br><br>\n";
+ if ($stmt->error) echo "error UPDATE Projekt: " . $stmt->error . "<br><br>\n";
}
else
@@ -346,7 +362,7 @@
$stmt -> bind_param('issssdssdiiiisi',$pz["prid"],$pz["bez"],$pz["bezl"],$pz["sdat"],$pz["edat"],$pz["kost"],$pz["psdat"],$pz["pedat"],$pz["pkost"],
$pz["urg"],$pz["stat"],$pz["persknr"],$pz["pzref"],$pz["bem"],$pz["persknra"]);
$result = $stmt -> execute();
- if ($stmt->error) echo "error INSERT Prozess: " . $stmt->error . "<br><br>\n";
+ if ($stmt->error) echo "error INSERT Projekt: " . $stmt->error . "<br><br>\n";
if ($result)
{ // INSERT o.k.
// info_ID ermitteln
@@ -359,25 +375,27 @@
$retd = $dbc -> execute($sql);
if ($retd)
{
- $stmt -> prepare("INSERT INTO Proz_Step (proz_ID,proz_step) VALUES(?,?)");
+ $stmt -> prepare("INSERT INTO Proz_Step (proz_ID,proz_step,step_stat_ID,step_bem) VALUES(?,?,?,?)");
for ($k=0; $k<count($pz["step"]); $k++)
{
if ($pz["step"][$k])
{
- $stmt -> bind_param('is',$pzid, $pz["step"][$k]);
+ if ($pz["ststat"][$k] == -1) $pz["ststat"][$k] = null;
+ if ($pz["stbem"][$k] < "!") $pz["stbem"][$k] = null;
+ $stmt -> bind_param('isis',$pzid, $pz["step"][$k], $pz["ststat"][$k], $pz["stbem"][$k]);
$rets = $stmt -> execute();
if (!$rets) $rets = false;
}
}
- if (!$rets) echo "error INSERT Prozess-Schritt: $stmt->error<br />\n";
+ if (!$rets) echo "error INSERT Projekt-Schritt: $stmt->error<br />\n";
}
- else echo "error INSERT Prozess-Schritt: $dbc->error<br />\n";
+ else echo "error INSERT Projekt-Schritt: $dbc->error<br />\n";
}
}
if ($result && $rets)
{
- echo "<p class='green'><b>Prozess '".$pz["bez"]."' mit ID '$pzid' wurden erfolgreich gespeichert.</b></p>\n";
+ echo "<p class='green'><b>Projekt '".$pz["bez"]."' mit ID '$pzid' wurden erfolgreich gespeichert.</b></p>\n";
include ("inc/prozess_dat_show.inc.php");
}
else
@@ -385,7 +403,7 @@
}
echo "</div>";
- echo "<p class='sc'> <a href=\"prozess_flist.php\" target=\"_self\" title=\"Prozessliste\">« zur Prozessliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"prozess_flist.php\" target=\"_self\" title=\"Projektliste\">« zur Projektliste</a></p>\n";
}
echo "</body>\n</html>\n";
?>
\ No newline at end of file
--- a/fhiiqm/prozess_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/prozess_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -4,7 +4,7 @@
* @author Bettina Schwarzer, Fritz-Haber-Institut
* @copyright 04/2012
*
- * Liste der Prozesse
+ * Liste der Projekte
*
*/
@@ -36,7 +36,7 @@
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<link type="text/css" href="/fhiiqm/css/db.css" rel="Stylesheet" media="screen"/>
<link type="text/css" href="/fhiiqm/css/db_print.css" rel="Stylesheet" media="print"/>
- <title>Liste Prozesse</title>
+ <title>Liste Projekte</title>
</head>
<body onload="document.ffilter.filter.focus();">
@@ -46,7 +46,7 @@
echo "<div class=\"float-br smaller\" valign='top'>";
echo " user: " . $_SESSION["userid"];
echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
- echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Prozessliste\" title=\"Prozesslisze\"/></div>\n";
+ echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Projektliste\" title=\"Projektlisze\"/></div>\n";
// Felder, nach denen gefiltert werden kann
$fields = array(1=>"ID",2=>"Bezeichnung",4=>"Produkt",5=>"'bezieht sich auf ID'",6=>"Anforderer",7=>"Verantwortlicher",8=>"'Plan Start'",9=>"'Plan Ende'",
@@ -90,7 +90,7 @@
$bg = "#FFFFFF";
echo "<div align='center'>\n";
- echo "<p><b>Prozesse</b></p>\n";
+ echo "<p><b>Projekte</b></p>\n";
echo "<table border='0' cellspacing='0'>\n";
echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />'
@@ -99,12 +99,12 @@
<tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten ";
if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
echo ", '<img src='/fhiiqm/img/duplicate.gif' border='0' hight='11'>' - Duplizieren";
- echo " des Prozesses</td></tr>\n";
+ echo " des Projektes</td></tr>\n";
echo "</table>\n";
$anz = $dbc -> querySingleItem("SELECT @anz");
- printf ("<p>Anzahl Prozesse: %s</p>", $anz);
+ printf ("<p>Anzahl Projekte: %s</p>", $anz);
if (isset($fnum) && $fnum>1 && !$filter && !$subf)
{
@@ -119,7 +119,7 @@
echo "<table width=\"40%\" border=\"0\">\n";
echo "<tr><td>filtern nach $text:$textd </td>";
echo "<td><input id='filter' name='filter' type=\"text\" size=\"10\" maxlength=\"30\" value=\"$filter\"/></td>";
- echo "<td>Prozesse/Seite? <select name='z'>\n";
+ echo "<td>Projekte/Seite? <select name='z'>\n";
foreach ($azeil as $key=>$val)
{
if ($key == $zeil) $select = "selected"; else $select = "";
@@ -253,12 +253,12 @@
if ($dbc -> error)
echo "error: " . $dbc -> error . "<br />\n";
echo "<p class='red'> Leider nichts gefunden für ". $fields["$fnum"] . " wie '$filter'!</p><br />";
- echo " <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Prozessliste\" class=\"sc\">Prozessliste</a></p>\n";
+ echo " <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Projektliste\" class=\"sc\">Projektliste</a></p>\n";
}
$dbc -> close();
if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
- echo "<p> <a href=\"/fhiiqm/prozess_ed.php\" target=\"_self\" title=\"Prozess erfassen\" class=\"sc\">Weiteren Prozess erfassen</a></p>\n";
+ echo "<p> <a href=\"/fhiiqm/prozess_ed.php\" target=\"_self\" title=\"Projekt erfassen\" class=\"sc\">Weiteres Projekt erfassen</a></p>\n";
?>
</body>
--- a/fhiiqm/raum_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/raum_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -71,6 +71,8 @@
if (!isset($filter) || !$filter) $filter = "";
if (!isset($sort) || !$sort) $sort = 2;
if (!isset($dir) || !$dir) $dir = "";
+ $getp = "st=$start&z=$zeil&s=$sort&d=$dir&f=$fnum&b=$filter"; //Link fuer Raumliste zurueck
+
/*
$sql = "SELECT COUNT(*) AS anzr FROM fhiiqm.Raum";
$anz = $dbc -> querySingleItem($sql);
@@ -184,7 +186,7 @@
}
else
echo "<td>$row->raum_file</td>";
- echo "<td><a href='/fhiiqm/raum_upd.php?uid=$row->raum_ID&st=$start&z=$zeil'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
+ echo "<td><a href='/fhiiqm/raum_upd.php?uid=$row->raum_ID&$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
}
echo "</table></div>\n";
@@ -225,7 +227,7 @@
$dbc -> close();
if (!is_null($_SESSION["recht"]) && in_array("re",$_SESSION["recht"]))
- echo "<p> <a href=\"raum_ins.php\" target=\"_self\" title=\"Raum erfassen\" class=\"sc\">Weiteren Raum erfassen</a></p>\n";
+ echo "<p> <a href=\"raum_ins.php?$getp\" target=\"_self\" title=\"Raum erfassen\" class=\"sc\">Weiteren Raum erfassen</a></p>\n";
?>
</body>
--- a/fhiiqm/raum_flist_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/raum_flist_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -119,7 +119,7 @@
WHERE raum_ID=?");
$stmt -> bind_param('ssdii',$raum['reityp'],$raum["reikat"],$raum["reitur"],$raum["boden"],$rid);
$res = $stmt -> execute();
- if ($stmt->error) echo "UPDATE Raum, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+ if ($stmt->error) echo " UPDATE Raum, error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
$stmt -> free_result(); // wegen weiterer query
$sql = "SELECT raum_nr, raum_name, geb_ID FROM fhiiqm.Raum WHERE raum_ID = " . $rid;
$result = $dbc -> queryObjectArray($sql);
@@ -127,13 +127,13 @@
{
if ($res)
{
- echo "<p class='green'><b>UPDATE: Daten zu Haus '".$ro->geb_ID.", ".$ro->raum_nr.", ".$ro->raum_name."' wurden erfolgreich gespeichert.</b></p>\n";
+ echo "<p class='green'> <b>UPDATE: Daten zu Haus '".$ro->geb_ID.", ".$ro->raum_nr.", ".$ro->raum_name."' wurden erfolgreich gespeichert.</b></p>\n";
unset($raum);
$rid = 0;
$sub = 0;
}
else
- echo "<p class='red'><b>UPDATE: Daten zu Haus '".$ro->geb_ID.", ".$ro->raum_nr.", ".$ro->raum_name."' konnten nicht gespeichert werden!</b></p>\n";
+ echo "<p class='red'> <b>UPDATE: Daten zu Haus '".$ro->geb_ID.", ".$ro->raum_nr.", ".$ro->raum_name."' konnten nicht gespeichert werden!</b></p>\n";
}
}
}
--- a/fhiiqm/raum_ins.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/raum_ins.php Wed Feb 27 09:43:08 2013 +0100
@@ -46,6 +46,15 @@
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
//$dbc = new dbconnection();
+ $start = $_GET["st"];
+ $zeil = $_GET["z"];
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ $dir = $_GET["d"]; // Sortierrichtung
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ $filter = $_GET["b"]; // Filterbegriff
+ // $_GET-Parameter zurück zur Raumliste mit den selben Einstellungen wie zuvor
+ $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+
$ok = $_POST["ok"];
$ins = $_POST["ins"];
$raum = $_POST["raum"];
@@ -65,6 +74,7 @@
if (!$ok || !$ins || ($ins && is_uploaded_file($_FILES["rfile"]["tmp_name"]) && $raum['rfname']<'!'))
{
$upd = $ins; // wegen filename-Pruefung bei Upload
+ if ($fnum == 4) $raum["geb"] = $filter; // Gebaeude aus gefilterter Liste vorgeben
include_once("form/raum_form.inc.php");
if ($ins == "eingeben" )
@@ -182,10 +192,10 @@
}
$dbc -> close();
// Raumliste filtern mit zuletzt eingegeben Haus
- $liste="?s=2&f=4&b=" . substr($raum["geb"],0,3);
+// $liste="?s=2&f=4&b=" . substr($raum["geb"],0,3);
echo "</div>\n";
- echo "<p> <a href=\"raum_flist.php$liste\" target=\"_self\" title=\"Raumliste\">Zurück zur Raumliste</a></p>\n";
- echo "<p> <a href=\"raum_ins.php\" target=\"_self\" title=\"Raum erfassen\">Weiteren Raum erfassen</a></p>\n";
+ echo "<p> <a href=\"raum_flist.php$getp\" target=\"_self\" title=\"Raumliste\">Zurück zur Raumliste</a></p>\n";
+ echo "<p> <a href=\"raum_ins.php$getp\" target=\"_self\" title=\"Raum erfassen\">Weiteren Raum erfassen</a></p>\n";
}
--- a/fhiiqm/raum_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/raum_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -60,7 +60,7 @@
</tr>
<tr>
<td class="bigger">
- <a href="/fhiiqm/report/raum_dez_anl_report.php" title="dez. Anlagen">Betrieb dezentrale Anlagen</a>
+ <a href="/fhiiqm/report/raum_dez_anl_report.php" title="Dauerversuch">Labor Dauerversuch</a>
<br /> Auswahl: Haus, Raum, Raum-Typ
<br /> Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte, Verantwortliche)
</td>
--- a/fhiiqm/raum_upd.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/raum_upd.php Wed Feb 27 09:43:08 2013 +0100
@@ -50,6 +50,13 @@
$rid = $_GET["uid"];
$start = $_GET["st"];
$zeil = $_GET["z"];
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ $dir = $_GET["d"]; // Sortierrichtung
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ $filter = $_GET["b"]; // Filterbegriff
+ // $_GET-Parameter zurück zur Raumliste mit den selben Einstellungen wie zuvor
+ $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+
if (!$rid) $rid=1;
$ok = $_POST["ok"];
$upd = $_POST["upd"];
@@ -129,8 +136,9 @@
}
echo "</table>\n";
echo "</div>\n";
- if (!is_null($_SESSION["recht"]) && !in_array("re", $_SESSION["recht"]))
- echo "<p class='sc'> <a href=\"raum_flist.php$liste\" target=\"_self\" title=\"Raumliste\">« zur Raumliste</a></p>\n";
+// if (!is_null($_SESSION["recht"]) && !in_array("re", $_SESSION["recht"]))
+// echo "<p class='sc'> <a href=\"raum_flist.php$liste\" target=\"_self\" title=\"Raumliste\">« zur Raumliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"raum_flist.php$getp\" target=\"_self\" title=\"Raumliste\">« zur Raumliste</a></p>\n";
echo "</form>\n";
}
@@ -283,10 +291,9 @@
if ($ok && ($upd || $del))
{
// Raumliste filtern mit zuletzt eingegeben Haus
- $liste="?s=2&f=4&b=" . substr($raum["geb"],0,3)."&st=$start&z=$zeil";
echo "</div><br /><br />\n";
- echo "<p class='sc'> <a href=\"raum_flist.php$liste\" target=\"_self\" title=\"Raumliste\">Zurück zur Raumliste</a></p>\n";
- echo "<p class='sc'> <a href=\"raum_ins.php\" target=\"_self\" title=\"Raum erfassen\">Weiteren Raum erfassen</a></p>\n";
+ echo "<p class='sc'> <a href=\"raum_flist.php$getp\" target=\"_self\" title=\"Raumliste\">Zurück zur Raumliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"raum_ins.php$getp\" target=\"_self\" title=\"Raum erfassen\">Weiteren Raum erfassen</a></p>\n";
}
?>
--- a/fhiiqm/raumarbgr_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/raumarbgr_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -68,7 +68,10 @@
var opt="<option value='-1'></option>";
for (var key in arr)
{
- opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
+ if (arr[key].indexOf("inaktiv")>0)
+ opt = opt.concat("<option class='red' value='",key,"'>",arr[key],"</option>\n" );
+ else
+ opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
}
opt += "</select>\n";
if (divId == 'addr')
--- a/fhiiqm/report/aptyp_gefahr_massn_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/report/aptyp_gefahr_massn_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -260,6 +260,7 @@
}
elseif ($apt == $row->arbplatz_typ && $gfid != $row->gefahr_ID)
{
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
echo "<tr bgcolor='" . $bg . "'>";
echo "<td> </td>";
echo "<td nowrap='1'>$row->gefahr_ID - $row->gefahr_bez</td>";
--- a/fhiiqm/report/fkt_ma_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/report/fkt_ma_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -77,6 +77,8 @@
$_GET["b"] = $rag["fktb"];
$_GET["j"] = $rag["bind"];
*/
+ if ($search && !isset($_GET["s"]))
+ echo "<br /><br /> <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Gefahren\" class=\"sc\">neuer Bericht Beauftragte</a></p>\n";
if ($bl) $text = " am Fritz-Haber-Institut"; else $text="";
echo "<div align='center'>\n";
echo "<p><b>Bericht Beauftragte$text</b></p>\n";
@@ -181,12 +183,13 @@
{
echo "<div align='center'>\n";
//print_r($rag); echo "<br />";
- $sql = "SELECT nachname,vorname,titel,abt_name,mf.fkt_ID,fkt_bez,fkt_bereich,fkt_bem,tel,email,geb_ID,raum_nr
+ $sql = "SELECT nachname,vorname,titel,abt_name,mf.fkt_ID,fkt_bez,fkt_bereich,fkt_bem,telefon_nr AS tel,email,geb_ID,raum_nr
FROM fhiiqm.MA_Funktion mf INNER JOIN Mitarbeiter m ON mf.persknr=m.Persknr
INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID
LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr=mr.persknr
LEFT OUTER JOIN Raum r ON mr.raum_ID=r.raum_ID
+ LEFT OUTER JOIN MA_Telefon t ON (mf.persknr=t.persknr AND t.sort=1)
WHERE (fkt_bis IS NULL OR fkt_bis>=DATE(NOW())) AND (fkt_von IS NULL OR fkt_von<=DATE(NOW())) ";
$lim = " LIMIT $start,$zeil";
@@ -248,7 +251,8 @@
INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID
LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr=mr.persknr
- LEFT OUTER JOIN Raum r ON mr.raum_ID=r.raum_ID WHERE fkt_bis IS NULL
+ LEFT OUTER JOIN Raum r ON mr.raum_ID=r.raum_ID
+ WHERE (fkt_bis IS NULL OR fkt_bis>=DATE(NOW())) AND (fkt_von IS NULL OR fkt_von<=DATE(NOW()))
$where";
$ianz = $dbc -> querySingleItem($sqlc);
--- a/fhiiqm/report/gefahr_ap_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/report/gefahr_ap_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -9,18 +9,21 @@
error_reporting(E_ALL ^ E_NOTICE);
- session_start();
- if (! isset($_SESSION["userid"]))
- {
- include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
- login($_SERVER["PHP_SELF"]);
- exit;
- }
-
- if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("asr",$_SESSION["recht"]) && !in_array("ase",$_SESSION["recht"])))
+ if (!isset($_GET['s']) || $_GET['s'] != 2 )
{
- header("Location: start.php");
- exit;
+ session_start();
+ if (! isset($_SESSION["userid"]))
+ {
+ include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+ login($_SERVER["PHP_SELF"]);
+ exit;
+ }
+
+ if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("asr",$_SESSION["recht"]) && !in_array("ase",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
}
?>
@@ -38,9 +41,12 @@
<?php
echo " ";
- echo "<div class=\"float-br smaller\" valign='top'>";
- echo " user: " . $_SESSION["userid"];
- echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ if (!isset($_GET['s']) || $_GET['s'] != 2 )
+ {
+ echo "<div class=\"float-br smaller\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ }
echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/role.png\" border=\"0\" alt=\"Raum-Gefahr\" title=\"Raum-Gefahr\"/></div>\n";
$rag = $_POST["rag"]; // Parameter aus Form
@@ -77,7 +83,7 @@
$_GET["s4"] = $rag["sort4"];
$_GET["z"] = $zeil;
- if ($search)
+ if ($search && $_GET['s'] != 2)
{
echo "<span class='sc'>";
echo "<br /> <a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
@@ -230,55 +236,61 @@
echo "</div>\n";
echo "<br /> ";
- // Parameter aus $_GET fuer weitere Seiten
- $_GET["s"] = 1; // bewirkt weitere Suche
- foreach ($_GET as $key=>$val)
- {
- if ($key != "st") $liste .= "&" . $key ."=".$val;
- }
- // Links auf andere Seiten generieren
- liste_links($start,$zeil,$ianz,$liste);
+ if ($search != 2) // Aufruf aus fhiiqm
+ {
+ // Parameter aus $_GET fuer weitere Seiten
+ $_GET["s"] = 1; // bewirkt weitere Suche
+ foreach ($_GET as $key=>$val)
+ {
+ if ($key != "st") $liste .= "&" . $key ."=".$val;
+ }
+ // Links auf andere Seiten generieren
+ liste_links($start,$zeil,$ianz,$liste);
+ }
- echo "<p style=\"page-break-before:always\"></p>";
-
- echo "<div align='center'>\n";
- $sql = "SELECT DISTINCT a.gefahr_ID, gefahr_bez, asm_bez, asm_bem, gf_asm_nr
- FROM Raum r LEFT OUTER JOIN Raum_Typ rt ON r.raumtyp_ID = rt.raumtyp_ID
- LEFT OUTER JOIN Raum_Arbplatz_Typ ra ON ra.raum_ID = r.raum_ID
- LEFT OUTER JOIN Arbplatz_Typ at ON ra.arbplatz_typ = at.arbplatz_typ
- LEFT OUTER JOIN Gefahr_Arbplatz a ON a.arbplatz_typ = at.arbplatz_typ
- LEFT OUTER JOIN Gefahr g ON a.gefahr_ID = g.gefahr_ID
- LEFT OUTER JOIN AS_Massnahme m ON a.gefahr_ID = m.gefahr_ID ";
- if ($where)
- $sql .= $where . " AND NOT (a.Gefahr_ID IS NULL)";
- else
- $sql .= " WHERE NOT (a.Gefahr_ID IS NULL)";
- $sql .= " ORDER BY gefahr_ID,asm_bez";
- $resm = $dbc -> queryObjectArray($sql);
-
- if ($resm)
+ if ($search != 2)
{
- $bg1 = "#F8F8F8";
- $bg2 = "#DEDFE1";
- $bg = "#FFFFFF";
- echo "<table width='80%' border='1' cellspacing='0' cellpadding='2'>\n";
- // Listenkopf
- echo "<tr bgcolor='#68ACBF'>";
- echo "<th>Gefährdung</th>";
- echo "<th>Maßnahme-Bez.</th>";
- echo "<th width='40%'>Maßnahme</th>";
- echo "</tr>";
-
- foreach ($resm as $row)
+ echo "<p style=\"page-break-before:always\"></p>";
+
+ echo "<div align='center'>\n";
+ $sql = "SELECT DISTINCT a.gefahr_ID, gefahr_bez, asm_bez, asm_bem, gf_asm_nr
+ FROM Raum r LEFT OUTER JOIN Raum_Typ rt ON r.raumtyp_ID = rt.raumtyp_ID
+ LEFT OUTER JOIN Raum_Arbplatz_Typ ra ON ra.raum_ID = r.raum_ID
+ LEFT OUTER JOIN Arbplatz_Typ at ON ra.arbplatz_typ = at.arbplatz_typ
+ LEFT OUTER JOIN Gefahr_Arbplatz a ON a.arbplatz_typ = at.arbplatz_typ
+ LEFT OUTER JOIN Gefahr g ON a.gefahr_ID = g.gefahr_ID
+ LEFT OUTER JOIN AS_Massnahme m ON a.gefahr_ID = m.gefahr_ID ";
+ if ($where)
+ $sql .= $where . " AND NOT (a.Gefahr_ID IS NULL)";
+ else
+ $sql .= " WHERE NOT (a.Gefahr_ID IS NULL)";
+ $sql .= " ORDER BY gefahr_ID,asm_bez";
+ $resm = $dbc -> queryObjectArray($sql);
+
+ if ($resm)
{
- if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
- echo "<tr bgcolor='" . $bg . "'>";
- echo "<td>$row->gefahr_ID - $row->gefahr_bez</td>";
- echo "<td>$row->asm_bez</td>";
- echo "<td width='50%'>".nl2br($row->asm_bem)."</td></tr>\n";
- }
- echo "</table>\n";
- }
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+ echo "<table width='80%' border='1' cellspacing='0' cellpadding='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th>Gefährdung</th>";
+ echo "<th>Maßnahme-Bez.</th>";
+ echo "<th width='40%'>Maßnahme</th>";
+ echo "</tr>";
+
+ foreach ($resm as $row)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td>$row->gefahr_ID - $row->gefahr_bez</td>";
+ echo "<td>$row->asm_bez</td>";
+ echo "<td width='50%'>".nl2br($row->asm_bem)."</td></tr>\n";
+ }
+ echo "</table>\n";
+ }
+ }
echo "<p></p><table width=80%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
<img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
@@ -290,10 +302,15 @@
echo "<p class='red'> Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
echo "</div>\n";
}
- echo "<span class='sc'>";
- echo "<br /><br /> <a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
- echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raum-Typ\" class=\"sc\">neuer Arbeitsplatz-Gefährdungen Bericht</a>\n";
- echo "</span>";
+ if ($search != 2)
+ {
+ echo "<span class='sc'>";
+ echo "<br /><br /> <a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raum-Typ\" class=\"sc\">neuer Arbeitsplatz-Gefährdungen Bericht</a>\n";
+ echo "</span>";
+ }
+ else
+ echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zurück'; return true;}\"> « Zurück</a>";
}
?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/report/gefgr_gefahr_massn_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,312 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 02/2013
+ *
+ * Report Gefahrgruppe - Gefaehrdung - Massnahme
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ if (!isset($_GET['s']) || $_GET['s'] != 2 )
+ {
+ session_start();
+ if (! isset($_SESSION["userid"]))
+ {
+ include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+ login($_SERVER["PHP_SELF"]);
+ exit;
+ }
+
+ if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("asr",$_SESSION["recht"]) && !in_array("ase",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+ }
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <title>Report Gefährdungsgruppe-Gefährdung-Maßnahme</title>
+</head>
+
+<body>
+
+<?php
+ echo " ";
+ if (!isset($_GET['s']) || $_GET['s'] != 2 )
+ {
+ echo "<div class=\"float-br smaller\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ }
+ echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/role.png\" border=\"0\" alt=\"Arbeitssicherheit\" title=\"Arbeitssicherheit\"/></div>\n";
+
+ $rag = $_POST["rag"]; // Parameter aus Form
+ $search = $_POST["search"];
+ if (!$search) $search = $_GET["s"];
+
+ $zeil = $rag["z"];
+ if (!$zeil) $zeil = $_GET["z"];
+ if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"]; // Start bei DS $start+1
+ if (!$start) $start=0;
+
+ if (!is_array($rag))
+ {
+ $rag["gef"] = $_GET["g"];
+ $rag["gru"] = $_GET["u"];
+ $rag["bind"] = $_GET["b"];
+ $rag["sort1"] = $_GET["s1"];
+ $rag["sort2"] = $_GET["s2"];
+ $rag["sort3"] = $_GET["s3"];
+ }
+ $_GET["g"] = $rag["gef"];
+ $_GET["u"] = $rag["gru"];
+ $_GET["b"] = $rag["bind"];
+ $_GET["s1"] = $rag["sort1"];
+ $_GET["s2"] = $rag["sort2"];
+ $_GET["s3"] = $rag["sort3"];
+ $_GET["z"] = $zeil;
+
+ if ($search && $_GET['s'] != 2)
+ {
+ echo "<span class='sc'>";
+ echo "<br /> <a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Gefgruppe-Gef.-Massn\" class=\"sc\">neuer Bericht Gefährdungsgruppe - Gefährdung - Maßnahme</a>\n";
+ echo "</span>";
+ }
+ echo "<div align='center'>\n";
+ echo "<p><b>(5a) Bericht Gefährdungsgruppe - Gefährdung - Maßnahme</b></p>\n";
+ echo "</div>\n";
+
+
+ if (!$search)
+ {
+?>
+ <div align="center">
+ <p>Bitte Kriterien für die Suche wählen</p>
+ <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_as_report.php" target="_self">
+ <table width="50%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td>Gefährdungs-Gruppe</td>
+ <td><select name="rag[gru]" onchange="this.form.submit();">
+ <?php
+ if ($rag["atyp"] == -1) $select = " selected='selected' "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT gefahrgr_ID,gefahrgr_bez FROM fhiiqm.Gefahr_Gruppe ORDER BY 1";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $select = ($row->gefahrgr_ID == $rag['gru'])? " selected='selected'" : "";
+ echo "<option$select value=\"$row->gefahrgr_ID\">$row->gefahrgr_ID - $row->gefahrgr_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Gefährdung</td>
+ <td><select name="rag[gef]">
+ <?php
+ if ($rag["gru"] && $rag["gru"]>0) $wher = " WHERE gefahrgr_ID = " . $rag["gru"]; else $wher = "";
+ if ($rag["gef"] == -1) $select = " selected='selected' "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT gefahr_ID,gefahrgr_ID,gefahr_bez FROM fhiiqm.Gefahr $wher
+ ORDER BY CONVERT(substring(gefahr_ID,1,INSTR(gefahr_ID,'.')-1),DECIMAL),CONVERT(SUBSTRING(gefahr_ID,INSTR(gefahr_ID,'.')+1),DECIMAL);";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $select = ($row->gefahr_ID == $rag['gef'])? " selected='selected'" : "";
+ echo "<option$select value=\"$row->gefahr_ID\">$row->gefahr_ID - $row->gefahr_bez</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Verknüpfung</td>
+ <td>UND
+ <input type="radio" name="rag[bind]" value="AND" <?php if (isset($rag["bind"]) && $rag["bind"]=="AND") echo "checked"; else echo "checked";?>>
+ ODER
+ <input type="radio" name="rag[bind]" value="OR" <?php if (isset($rag["bind"]) && $rag["bind"]=="OR") echo "checked"; ?>></td>
+ </tr>
+ <tr>
+ <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+ <?php
+ $sort = array("-1"=>"","1"=>"Gefährdungsgruppe","2"=>"Gefährdung","3"=>"MaßnahmenNr.");
+ for ($i=1; $i<4; $i++)
+ {
+ echo "$i. <select name='rag[sort$i]'>\n";
+ foreach ($sort as $key=>$val)
+ {
+ $rsort = "sort" . $i;
+ if ($rag[$rsort] == $val) $select= " selected"; else $select = "";
+ echo "<option$select value='$key'>$val</option>\n";
+ }
+ echo "</select> \n";
+ }
+ echo "</td></tr>\n";
+
+ $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+ echo "<tr><td>Zeilen/Seite?</td><td><select name='rag[z]'>\n";
+ if (!$rag['z']) $rag['z'] = 9999;
+ foreach ($azeil as $key=>$val)
+ {
+ if ($key == $rag['z']) $select = "selected"; else $select = "";
+ echo "<option $select value='$key'>$val</option>\n";
+ }
+ echo "</select></td></tr>\n";
+
+ ?>
+ <tr>
+ <td> </td>
+ <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+ </tr>
+ </table>
+ </div>
+ </form>
+
+<?php
+ }
+ else
+ {
+ echo "<div align='center'>\n";
+ $sql = "SELECT gg.gefahrgr_ID,g.gefahr_ID,gf_asm_nr,gefahrgr_bez,gefahr_bez,asm_ID,asm_bez,asm_bem
+ FROM Gefahr_Gruppe gg LEFT OUTER JOIN Gefahr g ON gg.gefahrgr_ID=g.gefahrgr_ID
+ LEFT OUTER JOIN fhiiqm.AS_Massnahme gm ON g.gefahr_ID=gm.gefahr_ID ";
+
+ $lim = " LIMIT $start,$zeil";
+
+ if (!$rag["bind"]) $bind = " AND "; else $bind = $rag["bind"];
+
+ if ($rag["gru"]> -1)
+ {
+ if ($where) $where .= "$bind g.gefahrgr_ID = '$rag[gru]' "; else $where = " g.gefahrgr_ID = '$rag[gru]' ";
+ $krit = " [Gefährdungsgruppe = '" . $dbc -> querySingleItem("SELECT gefahrgr_bez FROM Gefahr_Gruppe WHERE gefahrgr_ID='".$rag['gru'] ."'")."']";
+ }
+ if ($rag["gef"]> -1)
+ {
+ $where = " g.gefahr_ID = '$rag[gef]' ";
+ if ($krit) $bd = " ".$bind; else $bd = "";
+ $krit .= "$bd [Gefährdung = '" . $dbc -> querySingleItem("SELECT gefahr_bez FROM Gefahr WHERE gefahr_ID='".$rag['gef'] ."'")."']";
+ }
+ if ($where) $where = " WHERE ($where)";
+
+ if ($rag["sort1"]>0 || $rag["sort2"]>0 || $rag["sort3"]>0)
+ {
+ if ($rag["sort1"]>0) $ord = " ORDER BY " . $rag["sort1"];
+ if ($rag["sort2"]>0) $ord .= ",".$rag["sort2"];
+ if ($rag["sort3"]>0) $ord .= ",".$rag["sort3"];
+ }
+ $sql .= $where;
+ if ($ord && strpos($ord,'2')>0) $ord = str_replace("2","CONVERT(substring(g.gefahr_ID,1,INSTR(g.gefahr_ID,'.')-1),DECIMAL),CONVERT(SUBSTRING(g.gefahr_ID,INSTR(g.gefahr_ID,'.')+1),DECIMAL)",$ord);
+ $sql .= $ord . $lim;
+// echo "sql = $sql<br />\n";
+ $result = $dbc ->queryObjectArray($sql);
+
+ if ($krit )echo "Suchergebnis für $krit"; else echo "Suchergebnis\n";
+ $ianz = $dbc -> querySingleItem("SELECT COUNT(*)
+ FROM Gefahr_Gruppe gg LEFT OUTER JOIN Gefahr g ON gg.gefahrgr_ID=g.gefahrgr_ID
+ LEFT OUTER JOIN fhiiqm.AS_Massnahme gm ON g.gefahr_ID=gm.gefahr_ID $where");
+ printf ("<p>Anzahl: %s</p>", $ianz);
+
+ if ($result)
+ {
+ include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+ echo "<table border='1' width='99%' cellspacing='0' cellpadding='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th>Gefährdungsgruppe</th>";
+ echo "<th>Gefährdung</th>";
+ echo "<th>Maßnahmenbezeichnung</th>";
+ echo "<th>Maßnahme</th>";
+ echo "</tr>\n";
+
+ foreach ($result as $row)
+ {
+ if ($gru != $row->gefahrgr_ID)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td>$row->gefahrgr_ID - $row->gefahrgr_bez</td>";
+ echo "<td nowrap='1'>$row->gefahr_ID - $row->gefahr_bez</td>";
+ echo "<td>$row->asm_bez</td>";
+ echo "<td>".nl2br($row->asm_bem)."</td></tr>\n";
+ }
+ elseif ($gru == $row->gefahrgr_ID && $gfid != $row->gefahr_ID)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td> </td>";
+ echo "<td nowrap='1'>$row->gefahr_ID - $row->gefahr_bez</td>";
+ echo "<td>$row->asm_bez</td>";
+ echo "<td>".nl2br($row->asm_bem)."</td></tr>\n";
+ }
+ else
+ {
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td colspan=2> </td>";
+ echo "<td>$row->asm_bez</td>";
+ echo "<td>".nl2br($row->asm_bem)."</td></tr>\n";
+
+ }
+ $asmid = $row->asm_ID;
+ $gfid = $row->gefahr_ID;
+ $gru = $row->gefahrgr_ID;
+ }
+ echo "</table>\n";
+ echo "<p></p><table width=60%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+ <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+ echo "</div>\n";
+
+ echo "<br /> ";
+ if ($search != 2) // Aufruf aus fhiiqm
+ {
+ // Parameter aus $_GET fuer weitere Seiten
+ $_GET["s"] = 1; // bewirkt weitere Suche
+ foreach ($_GET as $key=>$val)
+ {
+ if ($key != "st") $liste .= "&" . $key ."=".$val;
+ }
+ // Links auf andere Seiten generieren
+ liste_links($start,$zeil,$ianz,$liste);
+ }
+ }
+ else
+ {
+ echo "<p class='red'> Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+ echo "</div>\n";
+ }
+ if ($search != 2)
+ {
+ echo "<span class='sc'>";
+ echo "<br /><br /> <a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Gefgruppe-Gef.-Massn\" class=\"sc\">neuer Bericht Gefährdungsgruppe - Gefährdung - Maßnahme</a>\n";
+ echo "</span>";
+ }
+ else
+ echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zurück'; return true;}\">« Zurück</a>";
+
+ }
+?>
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/report/ma_o_ragmt_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,330 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 02/2013
+ *
+ * Report Mitarbeiter ohne
+ * - E-Mail
+ * - Raum
+ * - Arbeitsgruppe
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+
+ session_start();
+ if (! isset($_SESSION["userid"]))
+ {
+ include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+ login($_SERVER["PHP_SELF"]);
+ exit;
+ }
+
+ if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("mtr",$_SESSION["recht"]) && !in_array("mte",$_SESSION["recht"])))
+ {
+ header("Location: start.php");
+ exit;
+ }
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <title>Report Mitarbeiter - fehlende Daten</title>
+</head>
+
+<body>
+
+<?php
+ echo " ";
+ echo "<div class=\"float-br smaller\" valign='top'>";
+ echo " user: " . $_SESSION["userid"];
+ echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+ echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/group.png\" border=\"0\" alt=\"MA Telefon\" title=\"MA Telefon\"/></div>\n";
+
+ $ma = $_POST["ma"]; // Parameter aus Form
+ $search = $_POST["search"];
+ if (!$search) $search = $_GET["s"];
+
+ $zeil = $ma["z"];
+ if (!$zeil) $zeil = $_GET["z"];
+ if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"]; // Start bei DS $start+1
+ if (!$start) $start=0;
+
+
+ if (!is_array($ma))
+ {
+ $ma["abt"] = $_GET["a"];
+ $ma["mail"] = $_GET["m"];
+ $ma["tel"] = $_GET["t"];
+ $ma["raum"] = $_GET["r"];
+ $ma["rag"] = $_GET["g"];
+ $ma["bind"] = $_GET["b"];
+ $ma["sort1"] = $_GET["s1"];
+ $ma["sort2"] = $_GET["s2"];
+ }
+ $_GET["a"] = $ma["abt"];
+ $_GET["m"] = $ma["mail"];
+ $_GET["t"] = $ma["tel"];
+ $_GET["r"] = $ma["raum"];
+ $_GET["g"] = $ma["rag"];
+ $_GET["b"] = $ma["bind"];
+ $_GET["s1"] = $ma["sort1"];
+ $_GET["s2"] = $ma["sort2"];
+ $_GET["z"] = $zeil;
+
+ if ($search)
+ {
+ echo "<span class='sc'>";
+ echo "<br /> <a href=\"/fhiiqm/ma_obj_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Mitarbeiter\" class=\"sc\">neuer Bericht Mitarbeiterdaten</a>\n";
+ echo "</span>";
+ }
+ echo "<div align='center'>\n";
+ if (!$ma["mail"] && !$ma["tel"] && !$ma["raum"] && !$ma["rag"]) $miss = ""; else $miss = " fehlende";
+ echo "<p><b>Bericht$miss Mitarbeiterdaten</b></p>\n";
+ echo "</div>\n";
+
+ if (!$search)
+ {
+ ?>
+ <div align="center">
+ <p>Bitte Kriterien für die Suche wählen</p>
+ <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">
+ <table width="50%" border="0" cellspacing="3" cellpadding="3">
+ <tr>
+ <td>Abteilung</td>
+ <td>
+ <select name="ma[abt]" size="1">
+ <?php
+ if ($ma["abt"] == -1) $select = " selected "; else $select = "";
+ echo "<option $select value=\"-1\"></option>\n";
+ $sql = "SELECT abt_ID, abt_name, abt_long FROM Abteilung ORDER BY abt_ID+0";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->abt_ID == $ma['abt'])
+ echo "<option selected value=\"$row->abt_ID\">$row->abt_name - $row->abt_long</option>\n";
+ else
+ echo "<option value=\"$row->abt_ID\">$row->abt_name - $row->abt_long</option>\n";
+ }
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr><td>MA/Objekte ohne Raum</td><td><input type="checkbox" name="ma[raum]" value="1" <?php if ($ma["raum"]) echo "checked='checked'"; ?>/></td></tr>
+ <tr><td>MA/Objekte ohne Telefon-Nr.</td><td><input type="checkbox" name="ma[tel]" value="1" <?php if ($ma["tel"]) echo "checked='checked'"; ?>/></td></tr>
+ <tr><td>MA ohne E-Mail</td><td><input type="checkbox" name="ma[mail]" value="1" <?php if ($ma["mail"]) echo "checked='checked'"; ?>/></td></tr>
+ <tr><td>MA ohne Arbeitsgruppe</td><td><input type="checkbox" name="ma[rag]" value="1" <?php if ($ma["rag"]) echo "checked='checked'"; ?>/></td></tr>
+ <tr>
+ <td>Verknüpfung</td>
+ <td>UND
+ <input type="radio" name="ma[bind]" value="AND" <?php if (isset($ma["bind"]) && $ma["bind"]=="AND") echo "checked='checked'"; else echo "checked='checked'";?>>
+ ODER
+ <input type="radio" name="ma[bind]" value="OR" <?php if (isset($ma["bind"]) && $ma["bind"]=="OR") echo "checked='checked'"; ?>></td>
+ </tr>
+ <tr>
+ <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+ <?php
+ $sort = array("-1"=>"","5"=>"Abteilung","2,3"=>"Name, Vorname");
+ for ($i=1; $i<3; $i++)
+ {
+ echo "$i. <select name='ma[sort$i]'>\n";
+ foreach ($sort as $key=>$val)
+ {
+ $rsort = "sort" . $i;
+ if ($ma[$rsort] == $val) $select= " selected"; else $select = "";
+ echo "<option$select value='$key'>$val</option>\n";
+ }
+ echo "</select> \n";
+ }
+ echo "</td></tr>\n";
+ echo "</td></tr>\n";
+
+ $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+ echo "<tr><td>Zeilen/Seite?</td><td><select name='ma[z]'>\n";
+ if (!$ma['z']) $ma['z'] = 9999;
+ foreach ($azeil as $key=>$val)
+ {
+ if ($key == $ma['z']) $select = "selected"; else $select = "";
+ echo "<option $select value='$key'>$val</option>\n";
+ }
+ echo "</select></td></tr>\n";
+
+ ?>
+ <tr>
+ <td> </td>
+ <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+ </tr>
+ </table>
+ </div>
+ </form>
+<?php
+ }
+ else
+ {
+ echo "<div align='center'>\n";
+
+ include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+
+ $sql = "SELECT m.persknr, TRIM(nachname) AS name,vorname,titel,abt_name,rag_bez,geb_ID,raum_nr,email,
+ CASE WHEN telefon_typ='fax' THEN CONCAT (mt.telefon_nr, ' FAX') ELSE mt.telefon_nr END AS telefon_nr
+ FROM Mitarbeiter m
+ LEFT OUTER JOIN Abteilung a ON m.abt_tel = a.abt_ID
+ LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr = mr.persknr
+ LEFT OUTER JOIN MA_RaumArbGruppe ma ON m.persknr = ma.persknr
+ LEFT OUTER JOIN Raum r ON mr.raum_ID = r.raum_ID
+ LEFT OUTER JOIN RaumArb_Gruppe rag ON ma.rag_ID = rag.rag_ID
+ LEFT OUTER JOIN MA_Telefon mt ON m.persknr = mt.persknr
+ LEFT OUTER JOIN Telefon t ON mt.telefon_nr = t.telefon_nr ";
+
+ $lim = " LIMIT $start,$zeil";
+ $where = " WHERE 1=1 AND ";
+ $wher = "";
+ $krit = "";
+ $krito = "";
+ $bind = $ma["bind"];
+ if ($ma["abt"] > -1)
+ {
+ $where .= " abt_tel = ".$ma["abt"] . " AND ";
+ $abt = $dbc->querySingleItem("SELECT abt_name FROM Abteilung WHERE abt_ID =".$ma["abt"]);
+ $krit = " [in Abteilung = '$abt']";
+ }
+ if ($ma["raum"])
+ {
+ $wher .= " (aktiv > 0 AND mr.persknr IS NULL)";
+ if ($krit > '') $bd = " AND ("; else $bd = "(";
+ $krito .= $bd . " [ohne Raum] ";
+ }
+ if ($ma["tel"])
+ {
+ if ($wher) $bd = $bind; else $bd = "";
+ $wher .= " $bd (aktiv > 0 AND (mt.telefon_nr IS NULL OR mt.telefon_nr <= ''))";
+ if ($krito > '') $bd = " $bind "; elseif ($krit > '') $bd = " AND ("; else $bd = "(";
+ $krito .= $bd . " [ohne Telefon-Nr.] ";
+ }
+ if ($ma["mail"])
+ {
+ if ($wher) $bd = $bind; else $bd = "";
+ $wher .= " $bd (aktiv = 1 AND (email IS NULL OR email <= ''))";
+ if ($krito > '') $bd = " $bind "; elseif ($krit > '') $bd = " AND ("; else $bd = "(";
+ $krito .= $bd . " [ohne E-Mail] ";
+ }
+ if ($ma["rag"])
+ {
+ if ($wher) $bd = $bind; else $bd = "";
+ $wher .= " $bd (aktiv = 1 AND ma.persknr IS NULL)";
+ if ($krito > '') $bd = " $bind "; elseif ($krit > '') $bd = " AND ("; else $bd = "(";
+ $krito .= $bd . " [ohne Arbeitsgruppe] ";
+ }
+ if (!$ma["tel"] && !$ma["mail"] && !$ma["raum"] && !$ma["rag"])
+ $wher = " aktiv > 0 ";
+ if ($krito > '') $krito .= ")";
+
+ if ($ma["sort1"]>0 || $ma["sort2"]>0)
+ {
+ if ($ma["sort1"]>0) $ord = " ORDER BY " . $ma["sort1"];
+ if ($ma["sort2"]>0) $ord .= ",".$ma["sort2"];
+ }
+ else $ord = " ORDER BY 2,3";
+
+ $sql .= $where ."(". $wher ." )". $ord .",6,7,8,10". $lim;
+//echo "sql = $sql<br />\n";
+ $result = $dbc -> queryObjectArray($sql);
+
+ if ($krit || $krito)echo "<p>Mitarbeiter/Objekte $krit$krito</p>"; else echo "<p>Mitarbeiter/Objekte</p>";
+
+ if ($result)
+ {
+ $sql = "SELECT COUNT(*)
+ FROM Mitarbeiter m
+ LEFT OUTER JOIN Abteilung a ON m.abt_tel = a.abt_ID
+ LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr = mr.persknr
+ LEFT OUTER JOIN MA_RaumArbGruppe ma ON m.persknr = ma.persknr
+ LEFT OUTER JOIN Raum r ON mr.raum_ID = r.raum_ID
+ LEFT OUTER JOIN RaumArb_Gruppe rag ON ma.rag_ID = rag.rag_ID
+ LEFT OUTER JOIN MA_Telefon t ON m.persknr = t.persknr " . $wher;
+ $ianz = $dbc -> querySingleItem($sql);
+ $bg1 = "#F8F8F8";
+ $bg2 = "#DEDFE1";
+ $bg = "#FFFFFF";
+
+ echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ echo "<th>Name</th>";
+ echo "<th>Abteilung</th>";
+ echo "<th>Arbeitsgruppe</th>";
+ echo "<th>Raum</th>";
+ echo "<th>Telefon</th>";
+ echo "<th>E-Mail</th>";
+ echo "</tr>";
+
+ foreach ($result as $row)
+ {
+ foreach ($row as &$val) if (is_null($val) || $val <=' ') $val = " ";
+ if ($vpnr != $row->persknr)
+ {
+ if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ $titel = ($row->titel != " ")? ", $row->titel" : "" ;
+ echo "<td>$row->name$titel, $row->vorname</td>";
+ echo "<td>$row->abt_name</td>";
+ echo "<td>$row->rag_bez</td>";
+ echo "<td>$row->geb_ID $row->raum_nr</td>";
+ echo "<td class='right'>$row->telefon_nr</td>";
+ echo "<td>$row->email</td></tr>\n";
+ }
+ else
+ {
+ echo "<tr bgcolor='" . $bg . "'>";
+ echo "<td colspan='2'> </td>";
+ echo "<td>$row->rag_bez</td>";
+ echo "<td>$row->geb_ID $row->raum_nr</td>";
+ echo "<td class='right'>$row->telefon_nr</td>";
+ echo "<td>$row->email</td></tr>\n";
+ }
+ $vpnr = $row->persknr;
+ }
+ echo "</table>\n";
+ echo "<p></p><table width=60%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+ <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+ echo "</div>\n";
+ echo "<br /> ";
+
+ // Parameter aus $_GET fuer weitere Seiten
+ $_GET["s"] = 1; // bewirkt weitere Suche
+ foreach ($_GET as $key=>$val)
+ {
+ if ($key != "st") $liste .= "&" . $key ."=".$val;
+ }
+ // Links auf andere Seiten generieren
+ liste_links($start,$zeil,$ianz,$liste);
+ echo "<br /> ";
+ }
+ else
+ {
+ echo "<p class='red'> Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+ echo "</div>\n";
+ echo "<br /> ";
+ }
+
+ echo "<span class='sc'>";
+ echo "<br /> <a href=\"/fhiiqm/ma_obj_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raum-Typ\" class=\"sc\">neuer Bericht Mitarbeiterdaten</a>\n";
+ echo "</span>";
+ }
+?>
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/report/ma_relation_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/report/ma_relation_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -77,7 +77,6 @@
$search = $_POST["search"];
if (!$search) $search = $_GET["s"];
-
if ($search && $_GET['s'] != 2)
{
echo "<span class='sc'>";
@@ -86,7 +85,7 @@
echo "</span>";
}
echo "<div align='center'>\n";
- echo "<p class='sc'><b>Mitarbeiter und ihre Zuordnungen</b></p>\n";
+ echo "<p><b>Mitarbeiter und ihre Zuordnungen</b></p>\n";
echo "</div>\n";
@@ -99,9 +98,9 @@
<table width="30%" border="0" cellspacing="3" cellpadding="3">
<tr><td>Status Mitarbeiter/Objekt</td>
<td><select name="par[act]" size="1" onchange="this.form.submit();">
- <option value="0" <?php if ($par["act"]== 0) echo "selected='selected'"; ?>>ausgeschieden</option>
- <option value="1" <?php if ($par["act"]== 1) echo "selected='selected'"; ?>>aktiv</option>
- <option value="2" <?php if ($par["act"]== 2) echo "selected='selected'"; ?>>sonstig</option>
+ <option value="1" <?php if ($par["act"]== "1") echo "selected='selected'"; ?>>aktiv</option>
+ <option value="0" <?php if ($par["act"]== "0") echo "selected='selected'"; ?>>ausgeschieden</option>
+ <option value="2" <?php if ($par["act"]== "2") echo "selected='selected'"; ?>>sonstig</option>
</select></td>
</tr>
<tr>
@@ -121,7 +120,7 @@
</select>
</td>
</tr>
- <?php if (!isset($par["act"]) || $par["act"]== 0)
+ <?php if ($par["act"]== "0")
{
echo "<tr>
<td>ab Datum</td>
@@ -153,7 +152,7 @@
$result = $dbc -> queryObjectArray($sql);
if ($result)
{
- echo "<p class='sc'>$krit</p>";
+ echo "<p>$krit</p>";
$begin = 0;
// print_r ($result);
foreach ($result as $row)
@@ -242,6 +241,18 @@
$str .= "<br />" . substr($e,strpos($e,"|")+1);
echo "$str</td></tr>\n";
}
+ if ($row->tel)
+ {
+ $str=null;
+ echo "<tr><td><u>Telefon/Fax:</u> ";
+ $arr = explode("; ",$row->tel);
+ foreach ($arr as $e)
+ {
+ $fax = (substr($e,strpos($e,"|")+1) == 'fax')? ' FAX' : '';
+ $str .= "<br />" . substr($e,0,strpos($e,"|")) . $fax;
+ }
+ echo "$str</td></tr>\n";
+ }
echo "</table>\n";
// $begin = 1;
echo "<p> </p>\n";
--- a/fhiiqm/report/rag_gefahr_massn_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/report/rag_gefahr_massn_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -61,34 +61,42 @@
if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
$start = $_GET["st"]; // Start bei DS $start+1
if (!$start) $start=0;
- $short = $_GET["sh"];
+ $short = $_GET["sh"]; // ohne Massnahmen
if (!$short) $short = $rag["msn"];
+ $agsep = $_GET["sp"]; // Arbeitsgruppen separat
+ if (!$agsep) $agsep = $rag["ags"];
if (!is_array($rag))
{
$rag["geb"] = $_GET["g"];
- $rag["abt"] = $_GET["a"];
- $rag["ag"] = $_GET["ag"];
- $rag["rtyp"] = $_GET["t"];
+ $rag["abt"] = $_GET["a"];
+ $rag["ag"] = $_GET["ag"];
+ $rag["rtyp"] = $_GET["t"];
$rag["bind"] = $_GET["b"];
$rag["sort1"] = $_GET["s1"];
$rag["sort2"] = $_GET["s2"];
$rag["sort3"] = $_GET["s3"];
$rag["sort4"] = $_GET["s4"];
+ $rag["msn"] = $_GET["sh"];
+ $rag["ags"] = $_GET["sp"];
}
- $_GET["g"] = $rag["geb"];
- $_GET["t"] = $rag["rtyp"];
- $_GET["a"] = $rag["abt"];
- $_GET["ag"] = $rag["ag"];
- $_GET["b"] = $rag["bind"];
- $_GET["s1"] = $rag["sort1"];
- $_GET["s2"] = $rag["sort2"];
- $_GET["s3"] = $rag["sort3"];
- $_GET["s4"] = $rag["sort4"];
- $_GET["z"] = $zeil;
- $_GET["sh"] = $short;
-
+ // fuer weitere Seiten -> liste_links
+ if (count($_GET == 0))
+ {
+ $_GET["g"] = $rag["geb"];
+ $_GET["t"] = $rag["rtyp"];
+ $_GET["a"] = $rag["abt"];
+ $_GET["ag"] = $rag["ag"];
+ $_GET["b"] = $rag["bind"];
+ $_GET["s1"] = $rag["sort1"];
+ $_GET["s2"] = $rag["sort2"];
+ $_GET["s3"] = $rag["sort3"];
+ $_GET["s4"] = $rag["sort4"];
+ $_GET["z"] = $zeil;
+ $_GET["sh"] = $short;
+ $_GET["sp"] = $agsep;
+ }
if ($short) $msn = ""; else $msn = " -> Maßnahmen";
if ($search && $_GET['s'] != 2)
{
@@ -196,6 +204,7 @@
</select></td>
</tr>
<tr><td>ohne Massnahmen?</td><td><input type="checkbox" name="rag[msn]" value="1" <?php if ($short) echo "checked='checked'"; ?>/></td></tr>
+ <tr><td>Arbeitsgruppen separat?</td><td><input type="checkbox" name="rag[ags]" value="1" <?php if ($agsep) echo "checked='checked'"; ?>/></td></tr>
<tr>
<td>Verknüpfung</td>
<td>UND
@@ -249,7 +258,7 @@
if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
- if ($short)
+ if ($short) // ohne Massnahmen
$sql = "SELECT rg.abt_ID,rag_bez,geb_ID, raum_nr, r.raumtyp_ID, ra.arbplatz_typ, a.gefahr_ID, raum_name, raumtyp_bez, arbplatz_typ_bez, gefahr_bez,
abt_name, r.raum_ID,rg.rag_ID
FROM RaumArb_Gruppe rg
@@ -353,39 +362,83 @@
printf ("<p>Anzahl gefundener Datensätze: %s</p>", $ianz);
if ($short) $width = "'80%'"; else $width="'99%'";
- echo "<table width=$width border='1' cellspacing='0' cellpadding='2'>\n";
- $cols=7;
- // Listenkopf
- echo "<tr bgcolor='#68ACBF'>";
- if ($rag["bind"]=="OR" || !$rag['abt'] || $rag['abt'] == -1)
- {
- echo "<th>Abteilung</th>";
- $cols +=1;
+ if (!$agsep)
+ {
+ echo "<table width=$width border='1' cellspacing='0' cellpadding='2'>\n";
+ $cols=7;
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ if ($rag["bind"]=="OR" || !$rag['abt'] || $rag['abt'] == -1)
+ {
+ echo "<th>Abteilung</th>";
+ $cols +=1;
+ }
+ echo "<th>Arbeitsgruppe</th>";
+ if ($rag["bind"]=="OR" || !$rag['geb'] || $rag['geb'] == -1)
+ {
+ echo "<th>Gebäude</th>";
+ $cols +=1;
+ }
+ echo "<th>Raum-Nr.</th>";
+ echo "<th>Raum-Bez.</th>";
+ if ($rag["bind"]=="OR" || !$rag['rtyp'] || $rag['rtyp'] == -1)
+ {
+ echo "<th>Raum-Typ</th>";
+ $cols +=1;
+ }
+ echo "<th>Arb.-Platz-Typ</th>";
+ echo "<th>Gefährdung</th>";
+ if (!isset($short) && !$short)
+ {
+ echo "<th>Maßnahme-Bez.</th>";
+ echo "<th width='40%'>Maßnahme</th>";
+ }
+ echo "</tr>\n";
}
- echo "<th>Arbeitsgruppe</th>";
- if ($rag["bind"]=="OR" || !$rag['geb'] || $rag['geb'] == -1)
- {
- echo "<th>Gebäude</th>";
- $cols +=1;
- }
- echo "<th>Raum-Nr.</th>";
- echo "<th>Raum-Bez.</th>";
- if ($rag["bind"]=="OR" || !$rag['rtyp'] || $rag['rtyp'] == -1)
- {
- echo "<th>Raum-Typ</th>";
- $cols +=1;
- }
- echo "<th>Arb.-Platz-Typ</th>";
- echo "<th>Gefährdung</th>";
- if (!isset($short) && !$short)
- {
- echo "<th>Maßnahme-Bez.</th>";
- echo "<th width='40%'>Maßnahme</th>";
- }
- echo "</tr>";
foreach ($result as $row)
{
+ if ($agsep && $row->rag_ID != $ragid)
+ {
+ if ($begin)
+ {
+ echo "</table>\n";
+ echo "<p style=\"page-break-after:always\"> </p>\n";
+ echo "<p><b>(7) Bericht Gefährdungen$msn in Arbeitsgruppen</b></p>\n";
+ if ($krit )echo "Suchergebnis für $krit"; else echo "Suchergebnis";
+ echo "<br /><br />";
+ }
+ echo "<table width=$width border='1' cellspacing='0' cellpadding='2'>\n";
+ $cols=7;
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ if ($rag["bind"]=="OR" || !$rag['abt'] || $rag['abt'] == -1)
+ {
+ echo "<th>Abteilung</th>";
+ $cols +=1;
+ }
+ echo "<th>Arbeitsgruppe</th>";
+ if ($rag["bind"]=="OR" || !$rag['geb'] || $rag['geb'] == -1)
+ {
+ echo "<th>Gebäude</th>";
+ $cols +=1;
+ }
+ echo "<th>Raum-Nr.</th>";
+ echo "<th>Raum-Bez.</th>";
+ if ($rag["bind"]=="OR" || !$rag['rtyp'] || $rag['rtyp'] == -1)
+ {
+ echo "<th>Raum-Typ</th>";
+ $cols +=1;
+ }
+ echo "<th>Arb.-Platz-Typ</th>";
+ echo "<th>Gefährdung</th>";
+ if (!isset($short) && !$short)
+ {
+ echo "<th>Maßnahme-Bez.</th>";
+ echo "<th width='40%'>Maßnahme</th>";
+ }
+ echo "</tr>\n";
+ }
if ($rid != $row->raum_ID || $row->rag_ID != $ragid)
{
if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
@@ -448,6 +501,7 @@
$apt = $row->arbplatz_typ;
$gfid = $row->gefahr_ID;
$asmid = $row->asm_ID;
+ $begin = 1;
}
echo "</table>\n";
--- a/fhiiqm/report/rag_raum_rt_ma_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/report/rag_raum_rt_ma_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -63,23 +63,29 @@
if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
$start = $_GET["st"]; // Start bei DS $start+1
if (!$start) $start=0;
-
+ $agsep = $_GET["g"]; // Arbeitsgruppen separat
+ if (!$agsep) $agsep = $rag["ags"];
if (!is_array($rag))
{
$rag["abt"] = $_GET["a"];
- $rag["rtyp"] = $_GET["t"];
+ $rag["rtyp"] = $_GET["t"];
$rag["bind"] = $_GET["b"];
$rag["sort1"] = $_GET["s1"];
$rag["sort2"] = $_GET["s2"];
+ $rag["ags"] = $_GET["g"];
}
- $_GET["a"] = $rag["abt"];
- $_GET["t"] = $rag["rtyp"];
- $_GET["b"] = $rag["bind"];
- $_GET["s1"] = $rag["sort1"];
- $_GET["s2"] = $rag["sort2"];
- $_GET["z"] = $zeil;
-
+ // fuer weitere Seiten -> liste_links
+ if (count($_GET) == 0)
+ {
+ $_GET["a"] = $rag["abt"];
+ $_GET["t"] = $rag["rtyp"];
+ $_GET["b"] = $rag["bind"];
+ $_GET["s1"] = $rag["sort1"];
+ $_GET["s2"] = $rag["sort2"];
+ $_GET["z"] = $zeil;
+ $_GET["g"] = $rag["ags"];
+ }
if ($search && $_GET['s'] != 2)
{
echo "<span class='sc'>";
@@ -142,6 +148,7 @@
?>
</select></td>
</tr>
+ <tr><td>Arbeitsgruppen separat?</td><td><input type="checkbox" name="rag[ags]" value="1" <?php if ($agsep) echo "checked='checked'"; ?>/></td></tr>
<tr>
<td>Verknüpfung</td>
<td>UND
@@ -216,9 +223,10 @@
$rtn = $dbc -> querySingleItem("SELECT raumtyp_bez FROM Raum_Typ WHERE raumtyp_ID='".$rag["rtyp"]."'");
$krit .= $bd." [Raum-Typ = '".$rag["rtyp"]."']";
}
- if ($krit )echo "Suchergebnis für $krit"; else echo "Suchergebnis\n";
+ if ($krit )echo "Suchergebnis für $krit\n"; else echo "Suchergebnis\n";
+// echo "<p class='smaller'>(* - ausgeschiedener bzw. nicht anwesender Mitarbeiter)</p>\n";
$ianz = $dbc -> querySingleItem("SELECT @anz");
- printf ("<p>Anzahl gefundener Arbeitsgruppen: %s</p>", $ianz);
+ printf ("<p>Anzahl gefundener Arbeitsgruppen: %s</p>\n", $ianz);
if ($result)
{
@@ -227,27 +235,55 @@
$bg1 = "#F8F8F8";
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
- echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
- // Listenkopf
- echo "<tr bgcolor='#68ACBF'>";
- if (!$rag['abt'] || $rag['abt'] == "''") echo "<th>Abteilung</th>";
- echo "<th>Arbeitsgruppe</th>";
- echo "<th>Räume [Raumtyp]</th>";
- echo "<th>Mitarbeiter</th>";
- echo "</tr>\n";
+ if (!$agsep)
+ {
+ echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ if (!$rag['abt'] || $rag['abt'] == "''") echo "<th>Abteilung</th>";
+ echo "<th>Arbeitsgruppe</th>";
+ echo "<th>Räume [Raumtyp]</th>";
+ echo "<th>Mitarbeiter</th>";
+ echo "</tr>\n";
+ }
foreach ($result as $row)
{
- if ($rid) echo "</td></tr>\n";
- if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
- echo "<tr bgcolor='" . $bg . "'>";
- if (!$rag['abt'] || $rag['abt'] == "''") echo "<td>$row->abt_name";
- if (strpos($row->rag_bez,"DynamiX")) $row->rag_bez = str_replace("X","χ",$row->rag_bez);
- echo "<td>$row->rag_bez</td>";
- echo "<td>". str_replace(";","<br />",$row->raeume)."</td>";
- echo "<td>". str_replace(";","<br />",$row->ma)."</td></tr>\n";
+ if ($agsep)
+ {
+ if ($begin)
+ {
+ echo "<p><b>(2a) Bericht Arbeitsgruppe - Raum+Raumtyp, Mitarbeiter</b></p>\n";
+ if ($krit )echo "Suchergebnis für $krit\n"; else echo "Suchergebnis\n";
+ echo "<p class='smaller'>(* - ausgeschiedener bzw. nicht anwesender Mitarbeiter)</p>\n";
+ }
+ echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
+ // Listenkopf
+ echo "<tr bgcolor='#68ACBF'>";
+ if (!$rag['abt'] || $rag['abt'] == "''") echo "<th>Abteilung</th>";
+ echo "<th>Arbeitsgruppe</th>";
+ echo "<th>Räume [Raumtyp]</th>";
+ echo "<th>Mitarbeiter</th>";
+ echo "</tr>\n";
+ }
+// if ($rid) echo "</td></tr>\n";
+ if (!$agsep && $bg == $bg1) $bg = $bg2; else $bg = $bg1;
+ echo "<tr bgcolor='" . $bg . "'>";
+ if (!$rag['abt'] || $rag['abt'] == "''") echo "<td>$row->abt_name</td>";
+ if (strpos($row->rag_bez,"DynamiX")) $row->rag_bez = str_replace("X","χ",$row->rag_bez);
+ echo "<td>$row->rag_bez</td>";
+ echo "<td>". str_replace(";","<br />",$row->raeume)."</td>";
+ echo "<td>". str_replace(";","<br />",$row->ma)."</td></tr>\n";
+
+ if ($agsep && $ragv <> $row->rag_ID)
+ {
+ echo "</table>\n";
+ echo "<p style=\"page-break-after:always\"> </p>\n";
+ }
+ $ragv = $row->rag_ID;
+ $begin = 1;
}
- echo "</table>\n";
+ if (!$agsep) echo "</table>\n";
echo "<p></p><table width=60%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
<img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
echo "</div>\n";
--- a/fhiiqm/report/raum_dez_anl_report.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/report/raum_dez_anl_report.php Wed Feb 27 09:43:08 2013 +0100
@@ -40,7 +40,7 @@
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
- <title>Report Betrieb dez. Anlagen</title>
+ <title>Report Labor Dauerversuch</title>
</head>
<body>
@@ -85,11 +85,11 @@
{
echo "<span class='sc'>";
echo "<br /> <a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
- echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Raum dez. Anlagen\" class='sc'>neuer Bericht Betrieb dezentrale Anlagen</a>\n";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Dauerversuch\" class='sc'>neuer Bericht Labor Dauerversuch</a>\n";
echo "</span>";
}
echo "<div align='center'>\n";
- echo "<p class='sc'><b>Betrieb dezentrale Anlagen</b></p>\n";
+ echo "<p class='sc'><b>Labor Dauerversuch</b></p>\n";
echo "</div>\n";
@@ -238,7 +238,7 @@
echo "<table width='90%' border='1' frame='box' rules='rows' cellspacing='2' cellpadding='10'>\n";
echo "<tr><td width='25%'>Gebäude: <b>$row->geb_ID</b></td><td width='40%'>Raum-Nr.: <b>$row->raum_nr</b>
$row->raum_name [$row->raumtyp_bez]</td>";
- echo "<td width='35%'>Apparaturen:</td></tr>\n";
+ echo "<td width='35%'> </td></tr>\n";
echo "<tr><td>Feuerwehr, Notarzt:</td><td colspan='2'>112</td></tr>\n";
echo "<tr><td>Polizei:</td><td colspan='2'>110</td></tr>\n";
echo "<tr><td colspan='2'><b>Besondere Gefahren:</b></td><td><b>Bemerkungen:</b></td></tr>\n";
@@ -274,7 +274,7 @@
}
else echo "<tr><td colspan='3'> </td></tr>\n";
echo "</table>\n";
- echo "<p>Innerbetrieblicher Notdienst: Telefonzentrale: <b>9</b>, nachts/Wochenende: <b>4444</b> oder <b>3637</b></p>\n";
+ echo "<p>Innerbetrieblicher Notdienst: Telefonzentrale: <b>9</b>, nachts/Wochenende: <b>4444</b></p>\n";
$begin = 1;
}
@@ -289,10 +289,10 @@
{
echo "<span class=\"sc\">";
echo "<br /> <a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>« zur Berichtsübersicht</a>";
- echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Raum dez. Anlagen\">neuer Bericht Betrieb dezentrale Anlagen</a></span>\n";
+ echo " | <a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Dauerversuch\">neuer Bericht Labor Dauerversuch</a></span>\n";
}
else
- echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zurück'; return true;}\">« Zurück</a>";
+ echo "<a class='sc' href='javascript:history.back();' onMouseOver=\"{window.status='Zurück'; return true;}\">« Zurück</a>";
}
?>
--- a/fhiiqm/tel_ed.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/tel_ed.php Wed Feb 27 09:43:08 2013 +0100
@@ -74,26 +74,27 @@
if ($tid && (!$sub || !$del) && !isset($tf))
{
- $sql = "SELECT telefon_nr, telefon_typ, raum_ID FROM Telefon WHERE telefon_nr='$tid'";
+// $sql = "SELECT telefon_nr, telefon_typ, raum_ID FROM Telefon WHERE telefon_nr='$tid'";
+ $sql = "SELECT telefon_nr, telefon_typ FROM Telefon WHERE telefon_nr='$tid'";
if ($result = $dbc -> queryObjectArray($sql))
{
foreach ($result as $row)
{
$tf['tel'] = $row->telefon_nr;
$tf['typ'] = $row->telefon_typ;
- $tf['raum'] = $row->raum_ID;
+// $tf['raum'] = $row->raum_ID;
}
}
// Haus
- if ($tf['raum'])
+/* if ($tf['raum'])
{
$sql = "SELECT geb_ID FROM Raum
WHERE raum_ID = " . $tf['raum'];
$tf['geb'] = $dbc -> querySingleItem($sql);
- }
+ } */
}
$okn = true;
- if (!$tf) $tf['geb'] = 'A';
+// if (!$tf) $tf['geb'] = 'A';
?>
<div align="center">
<h5>* - Felder sind erforderlich!</h5>
@@ -134,10 +135,11 @@
</select>
</td>
</tr>
- <tr><td>Ort</td>
- <td valign="top">Haus
- <select name="tf[geb]" onchange="this.form.submit();">
- <?php
+<?php
+/*
+ echo "<tr><td>Ort</td>
+ <td valign=\"top\">Haus
+ <select name=\"tf[geb]\" onchange=\"this.form.submit();\">";
if ($tf['geb'] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
$sql = "SELECT geb_ID, geb_name FROM `fhiiqm`.`Haus` ORDER BY 1";
@@ -151,11 +153,9 @@
echo "<option value=\"$row->geb_ID\">$row->geb_ID: $row->geb_name</option>\n";
}
}
- ?>
- </select>
+ echo "</select>
Raum
- <select name="tf[raum]">
- <?php
+ <select name=\"tf[raum]\">";
if ($tf['raum'] == -1) $select = " selected "; else $select = "";
echo "<option $select value=\"-1\"></option>\n";
$sql = "SELECT raum_ID, raum_nr, raum_name FROM `fhiiqm`.`Raum` WHERE geb_ID='" . $tf['geb'] ."' ORDER BY 2";
@@ -169,10 +169,11 @@
echo "<option value=\"$row->raum_ID\">$row->raum_nr $row->raum_name</option>\n";
}
}
- ?>
- </select>
+ echo "</select>
</td>
- </tr>
+ </tr>";
+*/
+?>
<input type="hidden" name="okn" value="<?php echo $okn; ?>" />
<?php
@@ -230,22 +231,21 @@
$stmt = $dbc -> stmtinit();
if (is_object($stmt))
{
- if ($tf["raum"] == "-1") $tf["raum"] = null;
+// if ($tf["raum"] == "-1") $tf["raum"] = null;
if ($tid) //UPDATE
{
$stmt -> prepare("UPDATE Telefon SET
telefon_nr = ?,
- telefon_typ = ?,
- raum_ID = ?
+ telefon_typ = ?
WHERE telefon_nr = '$tid'");
- $stmt -> bind_param('sss',$tf["tel"],$tf["typ"],$tf["raum"]);
+ $stmt -> bind_param('ss',$tf["tel"],$tf["typ"]);
$result = $stmt -> execute();
if ($stmt->error) echo "error UPDATE Telefon: " . $stmt->error . "<br><br>\n";
}
else
{
- $stmt -> prepare("INSERT INTO Telefon (telefon_nr, telefon_typ, raum_ID) VALUES (?,?,?)");
- $stmt -> bind_param('sss',$tf["tel"],$tf["typ"],$tf["raum"]);
+ $stmt -> prepare("INSERT INTO Telefon (telefon_nr, telefon_typ) VALUES (?,?)");
+ $stmt -> bind_param('ss',$tf["tel"],$tf["typ"]);
$result = $stmt -> execute();
if ($stmt->error) echo "error INSERT Telefon: " . $stmt->error . "<br><br>\n";
}
--- a/fhiiqm/tel_flist.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/tel_flist.php Wed Feb 27 09:43:08 2013 +0100
@@ -76,11 +76,12 @@
if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
- $sql = "SELECT 1, telefon_nr, telefon_typ, geb_ID, raum_nr FROM Telefon t LEFT OUTER JOIN Raum r ON t.raum_ID = r.raum_ID";
+// $sql = "SELECT 1, telefon_nr, telefon_typ, geb_ID, raum_nr FROM Telefon t LEFT OUTER JOIN Raum r ON t.raum_ID = r.raum_ID";
+ $sql = "SELECT 1, telefon_nr, telefon_typ FROM Telefon";
if (strtoupper($filter) == "NULL") $wher = " WHERE ". $fieldf[$fnum] . " IS NULL ";
elseif ($filter) $wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'%$filter%'";
else $wher = "";
-if ($sort == 4) $sort = "4,5";
+// if ($sort == 4) $sort = "4,5";
if ($sort) $ord = " ORDER BY $sort ";
$sql .= $wher . $ord;
$ianz = $dbc -> numrows($sql); // Anzahl DS
@@ -127,15 +128,15 @@
echo "</form>\n";
echo "<p> </p>\n";
}
- echo "<table width='30%'>\n";
+ echo "<table width='15%'>\n";
if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td></tr>\n";
// Listenkopf generieren
echo "<tr bgcolor='#68ACBF'>";
tab_column(2,"Nummer",$sort,$dir,2,$fnum,$filter,$start,$zeil);
tab_column(3,"Typ",$sort,$dir,3,$fnum,$filter,$start,$zeil);
- tab_column(4,"Haus",$sort,$dir,4,$fnum,$filter,$start,$zeil);
- tab_column(5,"Raum",$sort,$dir,5,$fnum,$filter,$start,$zeil);
+// tab_column(4,"Haus",$sort,$dir,4,$fnum,$filter,$start,$zeil);
+// tab_column(5,"Raum",$sort,$dir,5,$fnum,$filter,$start,$zeil);
echo "<th> </th>";
echo "</tr>\n";
foreach ($result as $row)
@@ -144,8 +145,8 @@
echo "<tr bgcolor='$bg'><td>$row->telefon_nr</td>";
$tt = ($row->telefon_typ == "fax")? strtoupper($row->telefon_typ) : $row->telefon_typ;
echo "<td>$tt</td>";
- echo "<td>$row->geb_ID</td>";
- echo "<td>$row->raum_nr</td>";
+// echo "<td>$row->geb_ID</td>";
+// echo "<td>$row->raum_nr</td>";
echo "<td><a href='/fhiiqm/tel_ed.php?i=".urlencode($row->telefon_nr).$getp."'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
echo "</tr>\n";
}
--- a/fhiiqm/test/ma_tel_flist_mysql.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/test/ma_tel_flist_mysql.php Wed Feb 27 09:43:08 2013 +0100
@@ -115,8 +115,15 @@
if (mysql_errno())
echo "error after connect und db select: " . mysql_errno() . ": " . mysql_error() . "<br>\n";
- $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list";
- if ($filter) $wher = " WHERE " . $fieldf[$fnum] . " LIKE " . "'%$filter%'"; else $wher = "";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email FROM v_tel_list WHERE public=1";
+ if ($filter)
+ {
+ if ($fnum > 3)
+ $wher = " AND " . $fieldf[$fnum] . " LIKE " . "'%$filter%'";
+ else
+ $wher = " AND " . $fieldf[$fnum] . " LIKE " . "'$filter%'";
+ }
+ else $wher = "";
if ($sort == 2) $sort = "2, 3, 5";
if ($sort == 5) $sort = "5, 2, 3";
if ($sort) $ord = " ORDER BY $sort, 6"; // immer nach Telefon-Nr als 2.
@@ -173,6 +180,13 @@
echo "</form>\n";
echo "<p> </p>\n";
}
+ // Schnellsuche Namen
+ echo "<p>";
+ for ($j=65; $j<91; $j++)
+ {
+ echo "<a href='". $_SERVER["PHP_SELF"] . "?f=2&b=". chr($j)."' target=\"_self\" title=\"Telefonliste\" class=\"sc\"><b>".chr($j)."</b> </a>";
+ }
+ echo "</p>\n";
echo "<table width='70%'>\n";
if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td></tr>\n";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/test/ma_tel_pdf_mc.php Wed Feb 27 09:43:08 2013 +0100
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 01/2013
+ *
+ * Telefonliste als pdf erstellen
+ *
+ */
+
+ error_reporting(E_ALL ^ E_NOTICE);
+ include ($_SERVER['DOCUMENT_ROOT']."/fhiiqm/inc/pdf_ma_tel.inc.php");
+ include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+ $dbc = new dbconnection();
+ $sub = $_POST['sub'];
+ $sortp = $_POST['sortp'];
+ if (!$sortp) $sortp = $_GET['sp'];
+ $abt = $_POST['abt'];
+ if (!$abt) $abt = $_GET['a'];
+ $fmt = $_POST['form'];
+ if (!fmt) $fmt = $_GET['t'];
+
+ $sort = $_GET["s"]; // Sortierung nach Spalte
+ $dir = $_GET["d"]; // Sortierrichtung
+ $fnum = $_GET["f"]; // Spaltennummer, nach der aktuell gefiltert wird
+ $filter = $_GET["b"]; // Filterbegriff
+ $edit = $_GET["e"]; // Telefonliste editierbar
+ $getp = "e=$edit&s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige Mitarbeiter/Objekte-Telefonliste
+
+ if (!$sub)
+ {
+ ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/>
+ <link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/>
+ <title>MA/O-Telefonliste -> PDF</title>
+ </head>
+ <body>
+ <div align="center">
+ <p><b>PDF: Mitarbeiter/Objekte - Telefonliste</b></p>
+ <?php
+ echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
+ echo "<table width=\"30%\" border=\"0\">\n";
+ echo "<tr><td>Format</td>";
+ echo " <td><select name=\"form\">
+ <option value=1>normal</option>
+ <option value=2>small</option>
+ <option value=3>tiny</option>
+ <option value=4>new</option>
+ </select>\n";
+ echo " </td></tr>\n";
+ echo "<tr><td>filtern nach Abteilung</td>";
+ echo " <td valign=\"top\">
+ <select name=\"abt\">";
+ echo "<option value=\"-1\"></option>\n";
+ $sql = "SELECT abt_ID, abt_name, abt_long FROM `fhiiqm`.`Abteilung` ORDER BY abt_ID+0";
+ if ($result = $dbc->queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ if ($row->abt_ID == $ma['abt'])
+ echo "<option selected value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ else
+ echo "<option value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+ }
+ }
+ echo " </select></td></tr>\n";
+ echo "<tr><td>sortieren nach</td>";
+ echo " <td><select name='sortp'>";
+ echo " <option value=\"-1\"></option>\n";
+ echo " <option value='2'>Name</option>\n";
+ echo " <option value='12'>Abteilung</option>\n";
+ echo " </select></td></tr>\n";
+ echo "<tr><td> </td><td><input class=\"button\" type=\"submit\" name=\"sub\" value=\" pdf erstellen \" /></td></tr>\n";
+ echo "</table>\n";
+ echo "</form>\n";
+ echo "</div>\n";
+ echo "<p><br /><br /> <a href=/fhiiqm/ma_tel_flist.php?$getp>« zur Telefon-Liste</a></p>\n";
+ echo "</body></html>\n";
+ }
+ else
+ {
+ if ($fmt == 2 || $fmt == 3) $wher = " WHERE sort=1 "; else $wher = " WHERE 1=1 ";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email, abt_tel+0
+ FROM v_tel_list_ma_raum " . $wher;
+
+ // intern/extern
+ $ip=getenv("REMOTE_ADDR");
+ $ippart=explode(".",$ip);
+ if (($ippart[0] == 141 && $ippart[1] == 14) || ($ippart[0] == 172 && $ippart[1] == 16))
+ $wip = "";
+ else
+ $wip = " AND public=1 ";
+ if ($sortp == '2') $sortp = "name COLLATE latin1_general_ci,3,12,5,IFNULL(sort,99),6"; // Name
+ elseif ($sortp == '12') $sortp = "12,5,name COLLATE latin1_general_ci,3,IFNULL(sort,99),6"; // abt_ID
+ else $sortp = "name COLLATE latin1_general_ci,3,12,5,IFNULL(sort,99),6";
+
+ if ($abt > '-1') $wher = " AND abt_tel = $abt "; else $wher = "";
+
+ $sql .= $wher . $wip . " ORDER BY $sortp";
+ if ($result = $dbc ->queryObjectArray($sql))
+ {
+ $pdf = new PDF();
+ $pdf->SetLeftMargin(25);
+ if ($fmt == 4)
+ {
+ $header=array('Name','Abteilung','Tel/Fax','Raum','E-Mail');
+ $pdf->anzcol = null;
+ }
+ $pdf->AddPage();
+ $pdf->AliasNbPages(); // Anzahl Seiten
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf1n.jpg",$pdf->lMargin-20,$pdf->tMargin+17,210);
+ $pdf->AddPage();
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf2n.jpg",$pdf->lMargin-20,$pdf->tMargin+14,210);
+ $pdf->AddPage();
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf3n.jpg",$pdf->lMargin-20,$pdf->tMargin+14,210);
+ $pdf->AddPage();
+ $pdf->Image($_SERVER['DOCUMENT_ROOT']."/fhiiqm/img/tel/tellist_kopf4n.jpg",$pdf->lMargin-20,$pdf->tMargin+14,210);
+ $pdf->AddPage();
+ $pdf->height = 3.5;
+ $pdf->SetFont('times','','');
+ switch ($fmt)
+ {
+ case 1:
+ $pdf->anzcol = 1;
+ $pdf->Normal($result);
+ break;
+ case 2:
+ $pdf->xa = $pdf->lMargin;
+ $pdf->fancy = 0; // mehrspaltig
+ $pdf->anzcol = 2;
+ $colwidth = 85;
+ $pdf->Small($result,$colwidth,$pdf->height);
+ break;
+ case 3:
+ $pdf->xa = $pdf->lMargin;
+ $pdf->fancy = 0; // mehrspaltig
+ $pdf->anzcol = 3;
+ $colwidth = 55;
+ $pdf->Small($result,$colwidth,$pdf->height);
+ break;
+ case 4:
+ $pdf->fancy = 1; // einspaltig
+ $pdf->SetFont('helvetica','',9);
+ $pdf->FancyTable($header,$result);
+ break;
+ }
+
+ $pdf->Ln();
+ $pdf->SetDisplayMode('real');
+ $pdf->Output();
+ // als Download
+// $pdf->Output('ma_tel_list.pdf','D');
+ }
+ }
+?>
\ No newline at end of file
--- a/fhiiqm/test/ma_tel_pdf_mysql.php Fri Dec 21 15:31:50 2012 +0100
+++ b/fhiiqm/test/ma_tel_pdf_mysql.php Wed Feb 27 09:43:08 2013 +0100
@@ -74,13 +74,13 @@
}
else
{
- $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email, abt_tel+0 FROM v_tel_list ";
+ $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, geb_ID, raum_nr, email, abt_tel+0 FROM v_tel_list WHERE public=1 ";
if ($sort == '2') $sort = "2,3,12,5,6";
elseif ($sort == '12') $sort = "12,5,2,3,6";
else $sort = "2,3,12,5,6";
- if ($abt > '-1') $wher = " WHERE abt_tel = $abt "; else $wher = "";
+ if ($abt > '-1') $wher = " AND abt_tel = $abt "; else $wher = "";
$sql .= $wher . " ORDER BY $sort";
$result=mysql_query($sql,$conn);
