IQM: comparison fhiiqm/vertrag

equal deleted inserted replaced

-:fc60ef80a7ad
+:679bc22e37e2
 echo "<div class=\"float-br smaller\" valign='top'>";
 echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
 echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
 echo "<div class=\"float-r\">&nbsp;&nbsp;&nbsp;<img src=\"img/document_mark_as_final.png\" border=\"0\" alt=\"Vertr&auml;ge\" title=\"Vertr&auml;ge\"/></div>\n";
+$mfile = $_GET['g']; // Multifile = mehrere Vertragsdokumente moeglich
+if (!$mfile) $mfile = $_POST['g'];
 $zeil = $_GET["z"];
 if (!$zeil) $zeil = $_POST["z"];
 if (!$zeil) $zeil = 20; // Anzahl der gezeigten Zeilen
 $start = $_GET["st"];   // Start bei DS $start+1
 if (!$start) $start=0;
 if (!isset($fnum) || !$fnum) $fnum = 1;
 if (!isset($sort) || !$sort) $sort = 2;
 if (!isset($dir) || !$dir)  $dir = "";
 // $_GET-Parameter zurueck zur Vertragliste mit den selben Einstellungen wie zuvor fuer Update
-$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&g=$mfile";
 // Recht Produktgruppe beruecksichtigen
 if (is_array($_SESSION["prodg"]))
 {
 foreach ($_SESSION["prodg"] as $val)
 	$dbc = new dbconnection();
 echo "<div align='center'>\n";
 //echo "$sort, $dir, $fnum, $filter<br><br>\n";
 //    $sql = "CALL fhiiqm.vertrag_flist1(" . $sort . ",'" . $dir . "', " . $fnum . ", '" . $filter . "',$start,$zeil, @anz)";
-$sql = "CALL fhiiqm.vertrag_flist1_1(" . $sort . ",'" . $dir . "', " . $fnum . ", '" . $filter . "', '" . $listg . "', $start,$zeil, @anz)";
+if ($mfile)
+$sql = "CALL fhiiqm.vertrag_flist1_mf(" . $sort . ",'" . $dir . "', " . $fnum . ", '" . $filter . "', '" . $listg . "', $start,$zeil, @anz)";
+else
+$sql = "CALL fhiiqm.vertrag_flist1_1(" . $sort . ",'" . $dir . "', " . $fnum . ", '" . $filter . "', '" . $listg . "', $start,$zeil, @anz)";
 // Parameter: Nr. Sortfelf, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Liste der berechtigten prodgroup, Start bei DS $start+1, Anzahl DS/Seite, Anzahl gefundener Vertraege
 // liefert Felder: contract_ID,cname,clong,bearb,doc,typ,prod
 $result = $dbc -> queryObjectArray($sql);
 if ($result)
 {
 <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' hight='11'>' - Bearbeiten der Vertragsdaten,
 '<img src='/fhiiqm/img/file_extension_xls.png' border='0' hight='11'>' - Excel-Export</td></tr>\n";
 echo "</table>\n";
 printf ("<p>Anzahl Vertr&auml;ge: %s </p>", $vanz);
 echo "</div>\n";
-echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/vertrag_flist12.php?s=$sort&d=$dir&f=$fnum&b=$filter&l=$listg&st=$start&z=$zeil\" class=\"sc\" title=\"Vertragliste 2\" onclick=\"winopen(this.href,'Vertragsliste 2'); return false\">Vertr&auml;ge Teil 2</a></p>\n";
+echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/vertrag_flist12.php?$getp\" class=\"sc\" title=\"Vertragliste 2\" onclick=\"winopen(this.href,'Vertragsliste 2'); return false\">Vertr&auml;ge Teil 2</a></p>\n";
 echo "<div align='center'>\n";
 if (isset($fnum) && $fnum>1 && !$filter && !$subf)
 {
 $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
 echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
 echo "<input type='hidden' name='s' value='$sort'>";
 echo "<input type='hidden' name='d' value='$dir'>";
 echo "<input type='hidden' name='f' value='$fnum'>";
+echo "<input type='hidden' name='g' value='$mfile'>";
 echo "<table width=\"40%\" border=\"0\">\n";
 echo "<tr><td>filtern nach $text: </td>";
 echo "<td><input id='filter' name='filter' type=\"text\" size=\"30\" maxlength=\"30\" value=\"$filter\"";
 if ($fnum == 6)
 {
 if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td><tr>\n";
 //        echo "<tr bgcolor='#CFDEF0'><th>Bezeichnung</th><th>Titel</th><th>Beschreibung</th><th>Typ</th><th>Beginn</th><th>Ende</th><th>K&uuml;nd.frist(mon)</th>
 //                <th>Dokument</th><th>Bemerkung</th><th>&nbsp;</th></tr>\n";
 echo "<tr bgcolor='#68ACBF'>";
-tab_column(8,"Partner",$sort,$dir,8,$fnum,$filter,$start,$zeil);
+tab_column(8,"Partner",$sort,$dir,8,$fnum,$filter,$start,$zeil,"",$mfile);
-tab_column(2,"Bezeichnung",$sort,$dir,2,$fnum,$filter,$start,$zeil);
+tab_column(2,"Bezeichnung",$sort,$dir,2,$fnum,$filter,$start,$zeil,"",$mfile);
-tab_column(3,"Beschreibung",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+tab_column(3,"Beschreibung",$sort,$dir,0,$fnum,$filter,$start,$zeil,"",$mfile);
-tab_column(6,"Typ",$sort,$dir,6,$fnum,$filter,$start,$zeil);
+tab_column(6,"Typ",$sort,$dir,6,$fnum,$filter,$start,$zeil,"",$mfile);
-tab_column(7,"zu Produkt",$sort,$dir,7,$fnum,$filter,$start,$zeil);
+tab_column(7,"zu Produkt",$sort,$dir,7,$fnum,$filter,$start,$zeil,"",$mfile);
-tab_column(4,"Bearbeiter",$sort,$dir,4,$fnum,$filter,$start,$zeil);
+tab_column(4,"Bearbeiter",$sort,$dir,4,$fnum,$filter,$start,$zeil,"",$mfile);
-tab_column(5,"Dokument",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+if ($mfile)
+tab_column(5,"Dokument, Schlagwort",$sort,$dir,5,$fnum,$filter,$start,$zeil,"",$mfile);
+else
+tab_column(5,"Dokument",$sort,$dir,0,$fnum,$filter,$start,$zeil);
 echo "<th>&nbsp;</th></tr>\n";
 foreach ($result as $row)
 {
 			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
 echo "<tr bgcolor='" . $bg . "'>";
 //            echo "<td>$row->contract_s</td>";
 echo "<td width='22%'>" . nl2br($row->clong) . "</td>";
 echo "<td>$row->typ</td>";
 echo "<td>$row->prod</td>";
 echo "<td>$row->bearb</td>";
-if (file_exists("documents/".$row->doc))
+if ($mfile)
 {
-$doc = substr($row->doc,strpos($row->doc,"_")+1);
+$docsw = explode("; ", $row->doc);
-echo "<td><a href='documents/$row->doc'>$doc</a></td>";
+if (isset($docsw) && is_array($docsw))
-}
+{
-else
+echo "<td>";
-echo "<td>$row->doc</td>";
+foreach ($docsw as $val)
-echo "<td><a href='/fhiiqm/vertrag_upd.php?uid=$row->contract_ID$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
+{
+$file = substr($val,0,strpos($val,'|'));
+$sw   = substr($val,strpos($val,'|')+1);
+if ($fnum == 5 && $filter > '!') // Filterbegriff in Schlagwort hervorheben
+{
+$sw = str_replace(lcfirst($filter),"<b>".lcfirst($filter)."</b>",$sw);
+$sw = str_replace(ucfirst($filter),"<b>".ucfirst($filter)."</b>",$sw);
+}
+if ($sw) $sw =  " &rarr; <em>$sw</em>"; else $sw = "";
+if (file_exists("documents/$file"))
+{
+$doc = substr($file,strpos($file,"_")+1);
+echo "<a href='documents/$file'>$doc</a>$sw<br />";
+}
+else
+echo "$file$sw<br />";
+}
+echo "</td>";
+}
+}
+else
+{
+if (file_exists("documents/".$row->doc))
+{
+$doc = substr($row->doc,strpos($row->doc,"_")+1);
+echo "<td><a href='documents/$row->doc'>$doc</a></td>";
+}
+else
+echo "<td>$row->doc</td>";
+}
+if ($mfile) $part = "ed"; else $part = "upd";
+echo "<td><a href='/fhiiqm/vertrag_$part.php?uid=$row->contract_ID&$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
 }
 echo "</table></div>\n";
 echo "<br />&nbsp;&nbsp;&nbsp;";
 // Sortierung und Filter aus $_GET fuer weitere Seiten
 // Links auf andere Seiten generieren
 liste_links($start,$zeil,$vanz,$liste);
 // Export csv-Datei
-echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class='sc'><a href='/fhiiqm/vertrag_list12_csv.php?s=$sort&d=$dir&f=$fnum&b=$filter&l=$listg&st=$start&z=$zeil'>
+echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class='sc'><a href='/fhiiqm/vertrag_list12_csv.php?$getp'>
 <img src='/fhiiqm/img/file_extension_xls.png' border='0' title='Export dieser Auswahl nach Excel(csv)' /></a></span>";
 }
 else
 {
 echo "<p class='red'>Leider wurde nichts gefunden mit Ihrem Suchbegriff '$filter'!</p>\n";
 echo "</div>\n";
 }
 $dbc -> close();
-echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/vertrag_flist12.php?s=$sort&d=$dir&f=$fnum&b=$filter&l=$listg&st=$start&z=$zeil\" class=\"sc\" title=\"Vertragliste 2\" onclick=\"winopen(this.href,'Vertragsliste 2'); return false\">Vertr&auml;ge Teil 2</a></p>\n";
+echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/vertrag_flist12.php?$getp\" class=\"sc\" title=\"Vertragliste 2\" onclick=\"winopen(this.href,'Vertragsliste 2'); return false\">Vertr&auml;ge Teil 2</a></p>\n";
 if (!is_null($_SESSION["recht"]) && in_array("ve",$_SESSION["recht"]))
-echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/vertrag_ins.php\" target=\"_self\" class=\"sc\" title=\"Vertrag erfassen\">Weiteren Vertrag erfassen</a></p>\n";
+{
+if ($mfile)
+echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/vertrag_ed.php?$getp\" target=\"_self\" class=\"sc\" title=\"Vertrag erfassen\">Weiteren Vertrag erfassen</a></p>\n";
+else
+echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/vertrag_ins.php\" target=\"_self\" class=\"sc\" title=\"Vertrag erfassen\">Weiteren Vertrag erfassen</a></p>\n";
+}
 ?>
 </body>
 </html>

changeset 35	679bc22e37e2
parent 33	f1a8785434e4
child 43	70cea8f0e807