--- a/fhiiqm/anlage_ed.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/anlage_ed.php Thu Apr 18 14:30:58 2013 +0200
@@ -32,16 +32,21 @@
$sub = $_POST["eintragen"];
$del = $_POST["del"];
$dup = $_POST["dup"];
- if (!$dup) $dup = $_GET["d"];
+ if (!$dup) $dup = $_GET["dp"];
$ok = $_POST["ok"];
if (!$al['okn']) $ok=false;
$duptext="";
+ $zeil = $_GET["z"];
+ if (!$zeil) $zeil = $_POST["z"];
+ if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"];
+ if (!$start) $start=0;
$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
+ $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil"; // Parameter Listenanzeige
if ($dup)
{ // Anlage duplizieren
--- a/fhiiqm/anlage_flist.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/anlage_flist.php Thu Apr 18 14:30:58 2013 +0200
@@ -88,7 +88,7 @@
$bg2 = "#DEDFE1";
$bg = "#FFFFFF";
- $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige
+ $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil"; // Parameter Listenanzeige
echo "<div align='center'>\n";
echo "<p><b>Anlagen</b></p>\n";
@@ -169,7 +169,7 @@
echo "<td>$row->verantw</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/anlage_ed.php?i=$row->al_ID&dp=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'>
<img src=\"/fhiiqm/img/details.gif\" alt='Prüfungen' title='Prüfungen' border='0'/></a></td>";
echo "<td><a href='/fhiiqm/alrisk_flist.php?s=2&d=&f=7&b=$row->al_ID&st=0&z=25'>
--- a/fhiiqm/form/info_betrst_form.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/form/info_betrst_form.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -18,7 +18,7 @@
<!-- <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_svc"> -->
<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="multipart/form-data" name="form_info" target="_self">
<div align="center">
-<table width="60%" border="0" cellspacing="3" cellpadding="3">
+<table width="70%" border="0" cellspacing="3" cellpadding="3">
<tr>
<td>Titel *<br/><br />
max. 300 Zeichen möglich</td>
@@ -356,12 +356,14 @@
</td>
</tr>\n";
}
+ include($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/form/info_file_form.inc.php");
?>
-
+<!--
<tr>
<td>Dateibezeichnung Dokument (*)</td>
<td><input name="inf[ifname]" type="text" size="50" maxlength="50" value="<?php echo $inf['ifname']; ?>" />
<?php
+/*
echo "<br />bitte <u>keine</u> Umlaute im Dateinamen angeben!";
if (isset($inf['ifname']) && $upd && is_uploaded_file($_FILES["ifile"]["tmp_name"]) && $inf['ifname']<'!')
{
@@ -374,10 +376,11 @@
echo "<br />Dokument anschauen: <a href='infos/" . $inf['ifname'] ."'>" . $inf['ifname'] . "</a>";
// if ($okn) $okn = true; else $okn=false;
}
+*/
?>
</td>
</tr>
-
+-->
<input type="hidden" name="inf[pers]" id="pid" value="<?php echo $inf['pers']; // Author ?>"/>
<input type="hidden" name="MAX_FILE_SIZE" value="32000000"/>
<input type="hidden" name="inf[okn]" value="<?php echo $okn; ?>"/>
--- a/fhiiqm/form/info_form2.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/form/info_form2.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -284,10 +284,13 @@
</select>
</td>
</tr>
- <tr>
+ <?php include($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/form/info_file_form.inc.php"); ?>
+
+<!-- <tr>
<td>Dateibezeichnung Dokument (*)</td>
<td><input name="inf[ifname]" type="text" size="50" maxlength="50" value="<?php echo $inf['ifname']; ?>" />
<?php
+/*
echo "<br />bitte <u>keine</u> Umlaute im Dateinamen angeben!";
if (isset($inf['ifname']) && $upd && is_uploaded_file($_FILES["ifile"]["tmp_name"]) && $inf['ifname']<'!')
{
@@ -300,10 +303,11 @@
echo "<br />Dokument anschauen: <a href='infos/" . $inf['ifname'] ."'>" . $inf['ifname'] . "</a>";
if ($okn) $okn = true; else $okn=false;
}
+*/
?>
</td>
</tr>
-
+-->
<input type="hidden" name="inf[pers]" id="pid" value="<?php echo $inf['pers']; // Author?>"/>
<input type="hidden" name="MAX_FILE_SIZE" value="10000000"/>
<input type="hidden" name="inf[okn]" value="<?php echo $okn; ?>"/>
--- a/fhiiqm/form/info_form3.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/form/info_form3.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -24,7 +24,7 @@
<!-- <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_svc"> -->
<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="multipart/form-data" name="form_info" target="_self">
<div align="center">
-<table width="60%" border="0" cellspacing="3" cellpadding="3">
+<table width="70%" border="0" cellspacing="3" cellpadding="3">
<tr>
<td>Titel *<br/><br />
max. 300 Zeichen möglich</td>
@@ -250,10 +250,12 @@
</select>
</td>
</tr>
- <tr>
+ <?php include($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/form/info_file_form.inc.php"); ?>
+<!-- <tr>
<td>Dateibezeichnung Dokument (*)</td>
<td><input name="inf[ifname]" type="text" size="50" maxlength="50" value="<?php echo $inf['ifname']; ?>" />
<?php
+/*
echo "<br />bitte <u>keine</u> Umlaute im Dateinamen angeben!";
if (isset($inf['ifname']) && $upd && is_uploaded_file($_FILES["ifile"]["tmp_name"]) && $inf['ifname']<'!')
{
@@ -266,10 +268,11 @@
echo "<br />Dokument anschauen: <a href='infos/" . $inf['ifname'] ."'>" . $inf['ifname'] . "</a>";
if ($okn) $okn = true; else $okn=false;
}
+*/
?>
</td>
</tr>
-
+-->
<input type="hidden" name="inf[pers]" id="pid" value="<?php echo $inf['pers']; // Author ?>"/>
<input type="hidden" name="inf[vpn]" id="vpid" value="<?php echo $inf['vpn']; // Verantwortliche ?>"/>
<input type="hidden" name="MAX_FILE_SIZE" value="10000000"/>
--- a/fhiiqm/form/prozess_form.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/form/prozess_form.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -41,7 +41,7 @@
</tr>
<tr>
<td>Projekt-Beschreibung</td>
- <td><textarea name="pz[bezl]" cols="50" rows="2"><?php echo $pz["bezl"]; ?></textarea>
+ <td><textarea name="pz[bezl]" cols="80" rows="3"><?php echo $pz["bezl"]; ?></textarea>
</td>
</tr>
<tr>
@@ -187,6 +187,7 @@
<input name="pz[step][]" type="text" size="50" maxlength="50" value="<?php echo $pz['step'][0]; ?>" />
Status <select name="pz[ststat][]">
<?php
+ if (isset($pz['step'])) $anzstep = count($pz['step']); else $anzstep = 1;
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";
@@ -203,7 +204,8 @@
}
}
$stat = substr($stat,0,strlen($stat)-1);
- echo "</select><br />\n";
+ echo "</select>";
+ echo " Sort <input type='text' name=\"pz[sort][]\" class='right' size=\"2\" maxlen=\"2\" value=\"". $pz['sort'][0]. "\" /><br />\n";
echo " Bemerkung zu Schritt ";
echo "<input name=\"pz[stbem][]\" maxlen=\"50\" size=\"50\" value='".$pz["stbem"][0]."' />";
?>
@@ -214,8 +216,9 @@
</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>
+
+ <a href="<?php echo "javascript:addInput('add',$anzstep);" ?>" id="badd" title="Schritt hinzufügen"><img src="/fhiiqm/img/add.png" border="0" /></a>
+ <a href="<?php echo "javascript:markdelInput('add',$anzstep);" ?>" id="bdel" title="Schritt entfernen"><img src="/fhiiqm/img/delete.png" border="0" /></a>
<?php
if ($pzid || ($sub && isset($pz) && !$ok))
{
@@ -232,13 +235,18 @@
echo "<option $select value=\"-1\"></option>\n";
foreach ($sta as $key => $value)
{
- $select = ($key == $pz['ststat'][$i])? " selected" : "";
+ $select = ($key == $pz['ststat'][$i])? " selected='selected'" : "";
echo "<option$select value=\"$key\">$value</option>\n";
}
echo "</select>";
+ echo " Sort <input type='text' name='pz[sort][]' class='right' size='2' maxlen='2' value='".$pz['sort'][$i] ."' />";
+ if (isset($pz['del'])) $cls = "dispil"; else $cls = "pr";
+ if (isset($pz['del'][$i])) $chk = "checked = ' checked'"; else $chk ="";
+ echo "<span id='cbl_$i'> <input class='$cls' type='checkbox' id='del_$i' name='pz[del][$i]' value='1'$chk /></span>
+ <span id='lb_$i' class='$cls'> löschen?</span>";
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";
+ echo "<input name=\"pz[stbem][]\" maxlen=\"50\" size=\"50\" value=\"".$pz["stbem"][$i]."\" />\n";
}
$i++;
}
--- a/fhiiqm/form/vertragmf_form.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/form/vertragmf_form.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -305,7 +305,7 @@
if (isset($vtr['del'])) $cls = "dispil"; else $cls = "pr";
if (isset($vtr['del'][$i])) $chk = "checked = ' checked'"; else $chk ="";
echo "<span id='cbl_$i'> <input class='$cls' type='checkbox' id='del_$i' name='vertrag[del][$i]' value='1'$chk /></span>
- <span id='lb_$i'class=$cls> löschen?</span>";
+ <span id='lb_$i' class='$cls'> löschen?</span>";
if (isset($vtr['cfname'][$i]) && $vtr['cfname'][$i]<'!')
{
echo "<br><span class=\"red\">Dateiname ist erforderlich!</span>\n";
--- a/fhiiqm/inc/info_dat_show.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/inc/info_dat_show.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -195,10 +195,30 @@
}
}
echo "<tr><td>Sprache: </td><td>" . $inf["lang"] . "</td></tr>\n";
- if (file_exists("infos/$ifile"))
- echo "<tr><td>Dateibezeichnung Info: </td><td><a href='infos/$ifile'>" . $ifile. "</a></td></tr>\n";
+ // Infodokumente
+ if (is_array($inf['ifname']) && count($inf['ifname']) > 0)
+ {
+ echo "<tr><td>Dokumente, <em>Schlagworte</em>:</td><td>";
+ foreach ($inf['ifname'] as $key => $value)
+ {
+ if ($value)
+ {
+ if (substr($value,0,$len) != $infid . "_") $file = $infid . "_".$value; else $file = $value;
+ if (file_exists("infos/$file"))
+ echo "<a href='infos/$file'>" . $value. "</a>, <em>". $inf['swort'][$key]. "</em><br />";
+ else
+ echo "$value, <em>".$inf['swort'][$key]. "</em><br />";
+ }
+ }
+ echo "</td></tr>\n";
+ }
else
- echo "<tr><td>Dateibezeichnung Info: </td><td>$ifile</td></tr>\n";
+ {
+ if (file_exists("infos/$ifile"))
+ echo "<tr><td>Dateibezeichnung Info: </td><td><a href='infos/$ifile'>" . $ifile. "</a></td></tr>\n";
+ else
+ echo "<tr><td>Dateibezeichnung Info: </td><td>$ifile</td></tr>\n";
+ }
echo "</table>\n";
?>
\ No newline at end of file
--- a/fhiiqm/inc/info_tab_ins.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/inc/info_tab_ins.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -144,4 +144,27 @@
if (!$retl) echo "error INSERT Info_Anlage: $dbc->error<br />\n";
}
}
+ // Infofile und Schlagwort
+ $retl = true;
+ if (is_array($inf['ifname']) && count($inf['ifname']) > 0)
+ {
+ // alle bisherigen Dokumente loeschen
+ $sql = "DELETE FROM Info_File WHERE info_ID = $infid";
+ $retdl = $dbc -> execute($sql);
+ if ($retdl)
+ {
+ foreach ($inf['ifname'] as $key => $value)
+ {
+ if ($value)
+ {
+ if (!$inf['swort'][$key] || $inf['swort'][$key]<"!") $sw = "NULL"; else $sw = "'".$inf['swort'][$key]."'";
+ if (substr($value,0,$len) != $infid . "_") $file = $infid . "_".$value; else $file = $value;
+ $sql = "INSERT INTO Info_File (info_ID,if_filename,if_schlagwort) VALUES ($infid,'$file',$sw)";
+ $retf = $retf && $dbc -> execute($sql);
+ }
+ }
+ if (!$retf) echo "error INSERT Info_File: " . $dbc -> error . "<br />$sql<br />\n";
+ }
+ }
+
?>
\ No newline at end of file
--- a/fhiiqm/inc/prozess_dat_show.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/inc/prozess_dat_show.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -56,7 +56,8 @@
foreach ($pz["step"] as $step)
{
if ($next) $next ="<tr><td> </td>"; else $next =" ";
- if ($step) echo "$next<td>$step; <i>".$as[$pz["ststat"][$i]]."</i>; " .$pz["stbem"][$i]."</td></tr>\n";
+ if ($pz["del"][$i]) $stdel = "<span class='red'> GELÖSCHT</span>"; else $stdel = "";
+ if ($step) echo "$next<td>(".$pz["sort"][$i].") $step; <i>".$as[$pz["ststat"][$i]]."</i>; " .$pz["stbem"][$i]."$stdel</td></tr>\n";
$i++;
}
}
--- a/fhiiqm/inc/vertragtab_ins.inc.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/inc/vertragtab_ins.inc.php Thu Apr 18 14:30:58 2013 +0200
@@ -163,9 +163,9 @@
{
if ($value)
{
- if (!$vtr['swort'][$key] || $vtr['swort'][$key]<"!") $sw = null; else $sw = $vtr['swort'][$key];
+ if (!$vtr['swort'][$key] || $vtr['swort'][$key]<"!") $sw = "NULL"; else $sw = "'".$vtr['swort'][$key]."'";
if (substr($value,0,$len) != $cid . "_") $file = $cid . "_".$value; else $file = $value;
- $sql = "INSERT INTO Vertrag_File (contract_ID,cf_filename,cf_schlagwort) VALUES ($cid,'$file','$sw')";
+ $sql = "INSERT INTO Vertrag_File (contract_ID,cf_filename,cf_schlagwort) VALUES ($cid,'$file',$sw)";
$retl = $retl && $dbc -> execute($sql);
}
}
--- a/fhiiqm/info_betrst_ed.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/info_betrst_ed.php Thu Apr 18 14:30:58 2013 +0200
@@ -61,12 +61,6 @@
break;
}
- if ($_FILES["ifile"]["error"] == 1 || $_FILES["ifile"]["error"] == 2)
- {
- echo "<p class='red'><b>Uploadfile zu ID '$infid' > 32MByte!.</b></p>\n";
- $retf=0; $reti=0;
- }
-
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
$dbc = new dbconnection();
@@ -210,6 +204,37 @@
}
if (kn.lastChild.nodeName == "SELECT") document.getElementById(divId).removeChild(kn.lastChild);
}
+ function addInputf(divId,anz){
+ var cdiv = document.createElement('div');
+ var idl = "cbl_" + anz;
+ cdiv.innerHTML = "<span></span>Dok-Name <input name='inf[ifname][]' type='text' size='50' maxlength='50' value='' />";
+ cdiv.innerHTML += " Schlagwort <input type='text' name='inf[swort][]' size='30' maxlength='50' value='' />";
+ cdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+ //cdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='vertrag[del][]' value='1'/></span>";
+ cdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='inf[del][]' value='1'/>";
+ cdiv.innerHTML += "<label id='lb' for='del'> löschen</label></span>";
+ cdiv.innerHTML += "<br />Upload-Dokument <input type='file' name='ifile[]' size='50' maxlength='50' value='' />";
+ document.getElementById(divId).appendChild(cdiv);
+ var delcb = document.getElementById('del');
+ delcb.id = "del_" + anz;
+ delcb.style.display = 'none';
+ var lcb = document.getElementById('lb');
+ lcb.id = "lb_" + anz;
+ lcb.setAttribute("for", delcb.id);
+ lcb.style.display = 'none';
+ counter++;
+ }
+ function markdelInput(divId,anz){
+ for (i=1; i<anz; i++)
+ {
+ var id = "del_" + i;
+ var delcb = document.getElementById(id);
+ delcb.style.display = 'inline';
+ var idl = "lb_" + i;
+ var lcb = document.getElementById(idl);
+ lcb.style.display = 'inline';
+ }
+ }
-->
</script>
@@ -220,14 +245,19 @@
echo " <a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
echo "<div class=\"float-r\"><img src=\"img/document_image_ver.png\" border=\"0\" alt=\"Infodaten ändern\" title=\"Infodaten ändern\"/></div>\n";
-//print_r($inf); echo "<br />ok = $ok, okn = " .$inf['okn'].", upload: " . $_FILES["ifile"]["error"] .", sub = $sub<br /><br />";
+//print_r($inf); echo "<br />ok = $ok, sub = $sub<br /><br />";
//print_r($_FILES["ifile"]); echo "<br /><br />";
+
echo "<div align='center'>";
if ($infid) $text = "editieren"; else $text = "erfassen";
if ($copy) $duptext = " (Kopie)";
- echo "<h3>$titel $text$duptext<h3>";
+ echo "<h3>$titel $text$duptext</h3>";
echo "</div>\n";
+
+ //Filename wenn Upload?
+ foreach ($_FILES["ifile"]["error"] as $key => $err)
+ if ($err == 0 && !$inf["ifname"][$key]) $ok = $ok && false;
if (!$ok || (!$sub && !$del && !$dup))
{
@@ -254,7 +284,7 @@
$inf["persknr"] = $row->aname;
$inf["pers"] = $row->persknr;
$inf["infrel"] = $row->info_rel_ID;
- $inf["ifname"] = $row->info_file;
+// $inf["ifname"] = $row->info_file;
$inf["lang"] = $row->lang;
$inf["sort"] = $row->info_sort;
$inf["raum"] = $row->raum_ID;
@@ -287,10 +317,22 @@
$sql = "SELECT al_ID FROM Info_Anlage WHERE info_ID = $infid";
$inf["anl"] = $dbc -> querySingleItem($sql);
}
+
+ // Dokumente
+ $sql = "SELECT if_filename, if_schlagwort FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $inf["ifname"][] = $row->if_filename;
+ $inf["swort"][] = $row->if_schlagwort;
+ }
+ }
// print_r($inf); echo "<br /><br />";
}
include($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/info_betrst_form.inc.php");
+/*
if ($sub)
{
echo
@@ -301,6 +343,7 @@
</tr>";
}
+*/
if ($sub || $del)
{
if ($sub)
@@ -341,17 +384,20 @@
$retdi = $dbc -> execute($sql);
if ($retdi)
{
- include ("inc/file_upload.inc.php");
- $retdf = mod_file("/var/www/fhiiqm/infos",$infid,"","del"); // Loeschen Dokument
- if ($retdf) echo "<p class='green'><b>Infodokument zu ID '$infid' wurde gelöscht.</b></p>\n";
+ // alte Namen Infodocumente
+ $sql = "SELECT if_filename FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ $ifile_old[] = $row->if_filename;
+
+ include_once ("inc/file_upload.inc.php");
+ foreach ($inf['ifname'] as $key => $filename)
+ $retdf = $retdf && mod_file("/var/www/fhiiqm/infos",$infid,"","del",$ifile_old[$key]); // Loeschen alte Datei
+ if ($retdf) echo "<p class='green'><b>Infodokumente zu ID '$infid' wurde gelöscht.</b></p>\n";
echo "<p class='green'><b>Infodaten zu ID '$infid' wurden gelöscht.</b></p>\n";
echo "<br /><br />\n";
// Anzeigen geloeschter Infodaten
- if ($fname)
- $ifile = $infid . "_" . $fname;
- else
- $ifile = $inf['ifname'];
echo "<p class='green'><b>DELETE: Daten zu '".$inf["iname"]."' wurden erfolgreich gelöscht.</b></p>\n";
include ("inc/info_dat_show.inc.php");
}
@@ -391,8 +437,8 @@
if ($infid)
{ //UPDATE
// alter Name Infofile
- $sql = "SELECT info_file FROM Info WHERE info_ID = $infid";
- $ifile_old = $dbc -> querySingleItem($sql);
+// $sql = "SELECT info_file FROM Info WHERE info_ID = $infid";
+// $ifile_old = $dbc -> querySingleItem($sql);
$stmt -> prepare("UPDATE fhiiqm.Info SET
info_name_s = ?,
@@ -430,11 +476,12 @@
} // stmt-Objekt
if ($result)
{
-// echo "upload error: ". $_FILES["ifile"]["error"] . "<br /><br />";
+
+ // upload Files
+ if ($infid) include ("inc/info_file.inc.php");
// n:m Tabellen INSERT
- include ("inc/info_tab_ins.inc.php");
-
- // upload File
+ if ($ret && $retf) include ("inc/info_tab_ins.inc.php");
+/*
if ($_FILES["ifile"]["error"] == 1 || $_FILES["ifile"]["error"] == 2)
{
echo "<p class='red'><b>Uploadfile zu ID '$infid' > 32MByte!.</b></p>\n";
@@ -491,7 +538,7 @@
$retf=1; $reti=1;
if ($ifile_old)
{ // Loeschen alte Datei
- $retf = mod_file("/var/www/fhiiqm/infos",$infid,"","del");
+ $retf = mod_file("/var/www/fhiiqm/infos",$infid,"","del",$ifile_old);
if ($retf)
{
$sql = "UPDATE Info SET info_file = null WHERE info_ID=$infid";
@@ -502,18 +549,15 @@
}
}
}
+*/
}
- if ($result && $retf && $reti && $reta && $retp && $retv && $retl) // INSERT/UPDATE Info
+ if ($result && $ret && $retf && $reta && $retp && $retv && $retl) // INSERT/UPDATE Info
{
//Eingabe Daten, Upload File erfolgreich
echo "<p class='green'><b>Infodaten zu ID '$infid' wurden erfolgreich gespeichert.</b></p>\n";
echo "<br /><br />\n";
// Anzeigen gespeicherte Infodaten
- if ($fname)
- $ifile = $infid . "_" . $fname;
- else
- $ifile = $inf['ifname'];
include ("inc/info_dat_show.inc.php");
}
} // INSERT / UPDATE
--- a/fhiiqm/info_ed.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/info_ed.php Thu Apr 18 14:30:58 2013 +0200
@@ -48,7 +48,7 @@
if (!$inf["okn"]) $ok = false;
$duptext="";
-// print_r($inf); echo "<br /><br />";
+// print_r($inf); echo "ok = $ok<br /><br />";
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
@@ -86,7 +86,7 @@
if ($ret && $retf && $retp && $reta && $retv)
{
- $addr = $_SERVER["PHP_SELF"] . "?i=$infid_new&c=1";
+ $addr = $_SERVER["PHP_SELF"] . "?i=$infid_new&c=1&$getp";
header("Location: $addr");
exit;
}
@@ -157,6 +157,37 @@
$("input[id='vdat']").addClass("long10");
$("input[id='bdat']").addClass("long10");
});
+ function addInputf(divId,anz){
+ var cdiv = document.createElement('div');
+ var idl = "cbl_" + anz;
+ cdiv.innerHTML = "<span></span>Dok-Name <input name='inf[ifname][]' type='text' size='50' maxlength='50' value='' />";
+ cdiv.innerHTML += " Schlagwort <input type='text' name='inf[swort][]' size='30' maxlength='50' value='' />";
+ cdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+ //cdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='vertrag[del][]' value='1'/></span>";
+ cdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='inf[del][]' value='1'/>";
+ cdiv.innerHTML += "<label id='lb' for='del'> löschen</label></span>";
+ cdiv.innerHTML += "<br />Upload-Dokument <input type='file' name='ifile[]' size='50' maxlength='50' value='' />";
+ document.getElementById(divId).appendChild(cdiv);
+ var delcb = document.getElementById('del');
+ delcb.id = "del_" + anz;
+ delcb.style.display = 'none';
+ var lcb = document.getElementById('lb');
+ lcb.id = "lb_" + anz;
+ lcb.setAttribute("for", delcb.id);
+ lcb.style.display = 'none';
+ counter++;
+ }
+ function markdelInput(divId,anz){
+ for (i=1; i<anz; i++)
+ {
+ var id = "del_" + i;
+ var delcb = document.getElementById(id);
+ delcb.style.display = 'inline';
+ var idl = "lb_" + i;
+ var lcb = document.getElementById(idl);
+ lcb.style.display = 'inline';
+ }
+ }
</script>
<?php
@@ -172,15 +203,12 @@
if ($copy) $duptext = " (Kopie)";
echo "<h3>Information $text$duptext<h3>";
- if ($_FILES["ifile"]["error"] == 1 || $_FILES["ifile"]["error"] == 2)
- {
- if ($_FILES["ifile"]["error"] == 2)
- echo "<p class='red'><b>Uploadfile zu ID '$infid' > 10 MByte!</b></p>\n";
- $ok = 0;
- }
-
echo "</div>\n";
+ //Filename wenn Upload?
+ foreach ($_FILES["ifile"]["error"] as $key => $err)
+ if ($err == 0 && !$inf["ifname"][$key]) $ok = $ok && false;
+
if (!$ok || (!$sub && !$del && !$dup))
{
if ($infid && (!$sub || !$del) && !isset($inf))
@@ -205,7 +233,7 @@
$inf["persknr"] = $row->aname;
$inf["pers"] = $row->persknr;
$inf["infrel"] = $row->info_rel_ID;
- $inf["ifname"] = $row->info_file;
+// $inf["ifname"] = $row->info_file;
$inf["lang"] = $row->lang;
$inf["fg"] = $row->info_freigabe_ID;
$inf["sort"] = $row->info_sort;
@@ -242,11 +270,21 @@
$inf["prio"][$row->persknr] = $row->prioritaet;
}
}
+ // Dokumente
+ $sql = "SELECT if_filename, if_schlagwort FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $inf["ifname"][] = $row->if_filename;
+ $inf["swort"][] = $row->if_schlagwort;
+ }
+ }
// print_r($inf); echo "<br /><br />";
}
include($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/info_form2.inc.php");
- if ($sub)
+/* if ($sub)
{
echo
"<tr>
@@ -256,6 +294,7 @@
</tr>";
}
+*/
if ($sub || $del)
{
if ($sub)
@@ -296,17 +335,20 @@
$retdi = $dbc -> execute($sql);
if ($retdi)
{
- include ("inc/file_upload.inc.php");
- $retdf = mod_file("/var/www/fhiiqm/infos",$infid,"","del"); // Loeschen Dokument
- if ($retdf) echo "<p class='green'><b>Infodokument zu ID '$infid' wurde gelöscht.</b></p>\n";
+ // alte Namen Infodocumente
+ $sql = "SELECT if_filename FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ $ifile_old[] = $row->if_filename;
+
+ include_once ("inc/file_upload.inc.php");
+ foreach ($inf['ifname'] as $key => $filename)
+ $retdf = $retdf && mod_file("/var/www/fhiiqm/infos",$infid,"","del",$ifile_old[$key]); // Loeschen alte Datei
+ if ($retdf) echo "<p class='green'><b>Infodokumente zu ID '$infid' wurde gelöscht.</b></p>\n";
echo "<p class='green'><b>Infodaten zu ID '$infid' wurden gelöscht.</b></p>\n";
echo "<br /><br />\n";
// Anzeigen geloeschter Infodaten
- if ($fname)
- $ifile = $infid . "_" . $fname;
- else
- $ifile = $inf['ifname'];
echo "<p class='green'><b>DELETE: Daten zu '".$inf["iname"]."' wurden erfolgreich gelöscht.</b></p>\n";
include ("inc/info_dat_show.inc.php");
}
@@ -343,9 +385,6 @@
{
if ($infid)
{ //UPDATE
- // alter Name Infofile
- $sql = "SELECT info_file FROM Info WHERE info_ID = $infid";
- $ifile_old = $dbc -> querySingleItem($sql);
$stmt -> prepare("UPDATE fhiiqm.Info SET
info_name_s = ?,
@@ -381,84 +420,18 @@
} // stmt-Objekt
if ($result)
{
- // n:m Tabellen INSERT
- include ("inc/info_tab_ins.inc.php");
-
- // upload File
- if (is_uploaded_file($_FILES["ifile"]["tmp_name"]) && isset($_FILES["ifile"]["name"]) && $_FILES["ifile"]["name"] )
- {
- include ("inc/file_upload.inc.php");
- $fname = gen_filename($inf['ifname'],"ifile",$infid);
- $retdf = mod_file("/var/www/fhiiqm/infos",$infid,"","del"); // Loeschen alte Datei
- $retf = upload("ifile", $fname, $infid, "infos"); // Datei prüfen und in Dokumentenverzeichnis verschieben
-
- if ($retf)
- { // upload o.k.
- //UPDATE des Filenamens
- $sql = "UPDATE Info SET info_file = '" . $infid . "_" . $fname ."' WHERE info_ID=$infid";
- $reti=$dbc->execute($sql);
- if (!$reti)
- echo $dbc -> error . "<br>\n";
- }
-
- }
- else
- {// nur Aenderung Dateiname
- if ($inf["ifname"]) // Dateiname vergeben
- {
- include_once ("inc/file_upload.inc.php");
- $fname = gen_filename($inf["ifname"],$ifile_old,$infid,0);
- $len = strlen($infid)+1;
- if (substr($fname,0,$len) != "$infid" . "_") $fname = $infid . "_" . $fname;
- if ($inf["ifname"] != $ifile_old)
- {
- $retf = mod_file("/var/www/fhiiqm/infos",$infid,$fname,"upd"); // Umbenennen alte Datei
- if ($retf)
- {
- $sql = "UPDATE Info SET info_file = '" . $fname . "' WHERE info_ID=$infid";
- $reti=$dbc->execute($sql);
- if (!$reti)
- echo $dbc -> error . "<br>\n";
- if (substr($fname,0,$len) == "$infid" . "_") $fname = substr($fname,$len,50);
- }
-
- }
- else
- {
- //kein Upload, keine Dateinamenaenderung
- if (substr($fname,0,$len) == "$infid" . "_") $fname = substr($fname,$len,50);
- $retf=1; $reti=1;
- }
- }
- else // kein Dateiname angegeben
- {
- $retf=1; $reti=1;
- if ($ifile_old)
- { // Loeschen alte Datei
- include_once ("inc/file_upload.inc.php");
- $retf = mod_file("/var/www/fhiiqm/infos",$infid,"","del");
- if ($retf)
- {
- $sql = "UPDATE Info SET info_file = null WHERE info_ID=$infid";
- $reti=$dbc->execute($sql);
- if (!$reti)
- echo $dbc -> error . "<br>\n";
- }
- }
- }
- }
- }
- if ($result && $retf && $reti && $reta && $retp && $retv) // INSERT/UPDATE Info
+ // upload Files
+ if ($infid) include ("inc/info_file.inc.php");
+ // n:m Tabellen INSERT
+ if ($ret && $retf) include ("inc/info_tab_ins.inc.php");
+ }
+ if ($result && $retf && $ret && $reta && $retp && $retv) // INSERT/UPDATE Info
{
//Eingabe Daten, Upload File erfolgreich
echo "<p class='green'><b>Infodaten zu ID '$infid' wurden erfolgreich gespeichert.</b></p>\n";
echo "<br /><br />\n";
// Anzeigen gespeicherte Infodaten
- if ($fname)
- $ifile = $infid . "_" . $fname;
- else
- $ifile = $inf['ifname'];
include ("inc/info_dat_show.inc.php");
}
} // INSERT / UPDATE
--- a/fhiiqm/info_ed3.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/info_ed3.php Thu Apr 18 14:30:58 2013 +0200
@@ -23,6 +23,17 @@
exit;
}
+ $zeil = $_GET["z"];
+ if (!$zeil) $zeil = 10; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"]; // Start bei DS $start+1
+ if (!$start) $start=0;
+ $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 Infoliste mit den selben Einstellungen wie zuvor
+ $getp = "s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+
$ityp = $_GET["t"]; // t=6 - Geschaeftsverteilungsplan
$infid = $_GET["i"];
@@ -74,7 +85,7 @@
if ($ret && $retf && $retp && $reta && $retv)
{
- $addr = $_SERVER["PHP_SELF"] . "?i=$infid_new&c=1";
+ $addr = $_SERVER["PHP_SELF"] . "?i=$infid_new&c=1&$getp";
header("Location: $addr");
exit;
}
@@ -200,6 +211,37 @@
$("input[id='vdat']").addClass("long10");
$("input[id='bdat']").addClass("long10");
});
+ function addInputf(divId,anz){
+ var cdiv = document.createElement('div');
+ var idl = "cbl_" + anz;
+ cdiv.innerHTML = "<span></span>Dok-Name <input name='inf[ifname][]' type='text' size='50' maxlength='50' value='' />";
+ cdiv.innerHTML += " Schlagwort <input type='text' name='inf[swort][]' size='30' maxlength='50' value='' />";
+ cdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+ //cdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='vertrag[del][]' value='1'/></span>";
+ cdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='inf[del][]' value='1'/>";
+ cdiv.innerHTML += "<label id='lb' for='del'> löschen</label></span>";
+ cdiv.innerHTML += "<br />Upload-Dokument <input type='file' name='ifile[]' size='50' maxlength='50' value='' />";
+ document.getElementById(divId).appendChild(cdiv);
+ var delcb = document.getElementById('del');
+ delcb.id = "del_" + anz;
+ delcb.style.display = 'none';
+ var lcb = document.getElementById('lb');
+ lcb.id = "lb_" + anz;
+ lcb.setAttribute("for", delcb.id);
+ lcb.style.display = 'none';
+ counter++;
+ }
+ function markdelInput(divId,anz){
+ for (i=1; i<anz; i++)
+ {
+ var id = "del_" + i;
+ var delcb = document.getElementById(id);
+ delcb.style.display = 'inline';
+ var idl = "lb_" + i;
+ var lcb = document.getElementById(idl);
+ lcb.style.display = 'inline';
+ }
+ }
</script>
<?php
@@ -215,14 +257,11 @@
if ($copy) $duptext = " (Kopie)";
echo "<h3>Geschäftsverteilungsplan $text$duptext<h3>";
- if ($_FILES["ifile"]["error"] == 1 || $_FILES["ifile"]["error"] == 2)
- {
- if ($_FILES["ifile"]["error"] == 2)
- echo "<p class='red'><b>Uploadfile > 10 MByte!</b></p>\n";
- $ok = 0;
- }
-
echo "</div>\n";
+
+ //Filename wenn Upload?
+ foreach ($_FILES["ifile"]["error"] as $key => $err)
+ if ($err == 0 && !$inf["ifname"][$key]) $ok = $ok && false;
if (!$ok || (!$sub && !$del && !$dup))
{
@@ -248,7 +287,7 @@
$inf["persknr"] = $row->aname;
$inf["pers"] = $row->persknr;
$inf["infrel"] = $row->info_rel_ID;
- $inf["ifname"] = $row->info_file;
+// $inf["ifname"] = $row->info_file;
$inf["lang"] = $row->lang;
$inf["fg"] = $row->info_freigabe_ID;
$inf["sort"] = $row->info_sort;
@@ -287,20 +326,20 @@
}
$inf["vpn"] = substr($inf["vpn"],0,strlen($inf["vpn"])-1);
}
+ // Dokumente
+ $sql = "SELECT if_filename, if_schlagwort FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
+ if ($result = $dbc -> queryObjectArray($sql))
+ {
+ foreach ($result as $row)
+ {
+ $inf["ifname"][] = $row->if_filename;
+ $inf["swort"][] = $row->if_schlagwort;
+ }
+ }
// print_r($inf); echo "<br /><br />";
}
include($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/info_form3.inc.php");
- if ($sub)
- {
- echo
- "<tr>
- <td>Upload Infodokument </td>
- <td><input type=\"file\" name=\"ifile\" size=\"50\" maxlength=\"50\" value=\"" .
- $_FILES["ifile"]["name"] . "\"/></td>
- </tr>";
-
- }
if ($sub || $del)
{
if ($sub)
@@ -328,7 +367,7 @@
echo "</table>\n";
echo "</div>\n";
// if (!is_null($_SESSION["recht"]) && !in_array("le", $_SESSION["recht"]))
- echo "<p class='sc'> <a href=\"info_flist.php\" target=\"_self\" title=\"Infoliste\">« zur Infoliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"info_flist.php?$getp\" target=\"_self\" title=\"Infoliste\">« zur Infoliste</a></p>\n";
echo "</form>\n";
}
else
@@ -341,17 +380,20 @@
$retdi = $dbc -> execute($sql);
if ($retdi)
{
- include ("inc/file_upload.inc.php");
- $retdf = mod_file("/var/www/fhiiqm/infos",$infid,"","del"); // Loeschen Dokument
+ // alte Namen Infodocumente
+ $sql = "SELECT if_filename FROM Info_File WHERE info_ID = $infid ORDER BY if_ID";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ $ifile_old[] = $row->if_filename;
+
+ include_once ("inc/file_upload.inc.php");
+ foreach ($inf['ifname'] as $key => $filename)
+ $retdf = $retdf && mod_file("/var/www/fhiiqm/infos",$infid,"","del",$ifile_old[$key]); // Loeschen alte Datei
if ($retdf) echo "<p class='green'><b>Infodokument zu ID '$infid' wurde gelöscht.</b></p>\n";
echo "<p class='green'><b>Infodaten zu ID '$infid' wurden gelöscht.</b></p>\n";
echo "<br /><br />\n";
// Anzeigen geloeschter Infodaten
- if ($fname)
- $ifile = $infid . "_" . $fname;
- else
- $ifile = $inf['ifname'];
echo "<p class='green'><b>DELETE: Daten zu '".$inf["iname"]."' wurden erfolgreich gelöscht.</b></p>\n";
include ("inc/info_dat_show.inc.php");
}
@@ -388,9 +430,6 @@
{
if ($infid)
{ //UPDATE
- // alter Name Infofile
- $sql = "SELECT info_file FROM Info WHERE info_ID = $infid";
- $ifile_old = $dbc -> querySingleItem($sql);
$stmt -> prepare("UPDATE fhiiqm.Info SET
info_name_s = ?,
@@ -426,74 +465,13 @@
} // stmt-Objekt
if ($result)
{
- // n:m Tabellen INSERT
- include ("inc/info_tab_ins.inc.php");
+ // upload Files
+ if ($infid) include ("inc/info_file.inc.php");
+ // n:m Tabellen INSERT
+ if ($ret && $retf) include ("inc/info_tab_ins.inc.php");
- // upload File
- if (is_uploaded_file($_FILES["ifile"]["tmp_name"]) && isset($_FILES["ifile"]["name"]) && $_FILES["ifile"]["name"] )
- {
- include_once ("inc/file_upload.inc.php");
- $fname = gen_filename($inf['ifname'],"ifile",$infid);
- $retdf = mod_file("/var/www/fhiiqm/infos",$infid,"","del"); // Loeschen alte Datei
- $retf = upload("ifile", $fname, $infid, "infos"); // Datei prüfen und in Dokumentenverzeichnis verschieben
-
- if ($retf)
- { // upload o.k.
- //UPDATE des Filenamens
- $sql = "UPDATE Info SET info_file = '" . $infid . "_" . $fname ."' WHERE info_ID=$infid";
- $reti=$dbc->execute($sql);
- if (!$reti)
- echo $dbc -> error . "<br>\n";
- }
-
- }
- else
- {// nur Aenderung Dateiname
- if ($inf["ifname"]) // Dateiname vergeben
- {
- include_once ("inc/file_upload.inc.php");
- $fname = gen_filename($inf["ifname"],$ifile_old,$infid,0);
- $len = strlen($infid)+1;
- if (substr($fname,0,$len) != "$infid" . "_") $fname = $infid . "_" . $fname;
- if ($inf["ifname"] != $ifile_old)
- {
- $retf = mod_file("/var/www/fhiiqm/infos",$infid,$fname,"upd"); // Umbenennen alte Datei
- if ($retf)
- {
- $sql = "UPDATE Info SET info_file = '" . $fname . "' WHERE info_ID=$infid";
- $reti=$dbc->execute($sql);
- if (!$reti)
- echo $dbc -> error . "<br>\n";
- if (substr($fname,0,$len) == "$infid" . "_") $fname = substr($fname,$len,50);
- }
-
- }
- else
- {
- //kein Upload, keine Dateinamenaenderung
- if (substr($fname,0,$len) == "$infid" . "_") $fname = substr($fname,$len,50);
- $retf=1; $reti=1;
- }
- }
- else // kein Dateiname angegeben
- {
- $retf=1; $reti=1;
- if ($ifile_old)
- { // Loeschen alte Datei
- include_once ("inc/file_upload.inc.php");
- $retf = mod_file("/var/www/fhiiqm/infos",$infid,"","del");
- if ($retf)
- {
- $sql = "UPDATE Info SET info_file = null WHERE info_ID=$infid";
- $reti=$dbc->execute($sql);
- if (!$reti)
- echo $dbc -> error . "<br>\n";
- }
- }
- }
- }
}
- if ($result && $retf && $reti && $reta && $retp && $retv) // INSERT/UPDATE Info
+ if ($result && $retf && $ret && $reta && $retp && $retv) // INSERT/UPDATE Info
{
//Eingabe Daten, Upload File erfolgreich
echo "<p class='green'><b>Infodaten zu ID '$infid' wurden erfolgreich gespeichert.</b></p>\n";
@@ -508,7 +486,7 @@
}
} // INSERT / UPDATE
echo "</div>";
- echo "<p class='sc'> <a href=\"info_flist.php\" target=\"_self\" title=\"Infoliste\">Infoliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"info_flist.php?$getp\" target=\"_self\" title=\"Infoliste\">Infoliste</a></p>\n";
echo "<p class='sc'> <a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Info erfassen\">Weitere Info erfassen</a></p>\n";
} // Form o.k. und submit
--- a/fhiiqm/info_flist.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/info_flist.php Thu Apr 18 14:30:58 2013 +0200
@@ -149,7 +149,8 @@
tab_column(11,"gilt bis",$sort,$dir,0,$fnum,$filter,$start,$zeil);
// echo "<th>Sprache</th>";
tab_column(12,"Status",$sort,$dir,12,$fnum,$filter,$start,$zeil);
- echo "<th>Dokument</th>";
+ tab_column(13,"Dokument, Schlagwort",$sort,$dir,13,$fnum,$filter,$start,$zeil);
+// echo "<th>Dokument</th>";
echo "<th>zu ID</th>";
echo "<th> </th>";
echo "<th> </th></tr>\n";
@@ -213,6 +214,31 @@
else echo "<td> </td>";
// echo "<td class=\"left\">$row->lang</td>";
echo "<td class=\"left\">$row->freigabe</td>";
+ $docsw = explode("; ", $row->doc);
+ if (isset($docsw) && is_array($docsw))
+ {
+ echo "<td>";
+ foreach ($docsw as $val)
+ {
+ $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 = " → <em>$sw</em>"; else $sw = "";
+ if (file_exists("infos/$file"))
+ {
+ $doc = substr($file,strpos($file,"_")+1);
+ echo "<a href='infos/$file'>$doc</a>$sw<br />";
+ }
+ else
+ echo "$file$sw<br />";
+ }
+ echo "</td>";
+ }
+/*
if (file_exists("infos/".$row->doc))
{
$doc = substr($row->doc,strpos($row->doc,"_")+1);
@@ -220,9 +246,12 @@
}
else
echo "<td class=\"left\">$row->doc</td>";
+*/
echo "<td class=\"left\">$row->infrel</td>";
$getp = "&s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
- if (substr($row->ityp_ID,0,1) == 7 || substr($row->ityp_ID,0,1) == 8) $ref = "/fhiiqm/info_betrst_ed.php?i=$row->info_ID&t=$row->ityp_ID$getp"; else $ref="/fhiiqm/info_ed.php?i=$row->info_ID$getp";
+ if (substr($row->ityp_ID,0,1) == 7 || substr($row->ityp_ID,0,1) == 8) $ref = "/fhiiqm/info_betrst_ed.php?i=$row->info_ID&t=$row->ityp_ID$getp";
+ elseif ($row->ityp_ID == 6) $ref="/fhiiqm/info_ed3.php?i=$row->info_ID$getp";
+ else $ref="/fhiiqm/info_ed.php?i=$row->info_ID$getp";
echo "<td><a href='$ref'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
echo "<td><a href='$ref&dp=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td></tr>\n";
}
--- a/fhiiqm/prozess_ed.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/prozess_ed.php Thu Apr 18 14:30:58 2013 +0200
@@ -24,11 +24,21 @@
exit;
}
+ $zeil = $_GET["z"];
+ if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+ $start = $_GET["st"]; // Start bei DS $start+1
+ if (!$start) $start=0;
+ $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&st=$start&z=$zeil";
+
$pzid = $_GET["i"];
$del = $_POST["del"];
$sub = $_POST["eintragen"];
$dup = $_POST["dup"];
- if (!$dup) $dup = $_GET["d"];
+ if (!$dup) $dup = $_GET["dp"];
$copy = $_GET["c"];
$pz = $_POST["pz"];
$ok = $_POST["ok"];
@@ -84,34 +94,55 @@
<script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
<script type="text/javascript">
- var counter = 0;
- var limit = 99;
- var arr = new Array();
- function addInput(divId){
- if (counter == limit) {
+ //<!--
+ var counter = 0;
+ var limit = 99;
+ var arr = new Array();
+ function addInput(divId,anz){
+ if (counter == limit) {
alert("Das Limit von " + counter + " zusätzlichen inputs ist erreicht");
- }
- else {
- 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>\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++;
- }
- }
- function delInput(divId){
-// var kn = document.getElementById(divId).lastChild;
-// document.getElementById(divId).removeChild(kn);
+ }
+ else
+ {
+ 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>\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 += " Sort <input type='text' name='pz[sort][]' class='right' size='2' maxlength='2' value='' />";
+ 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' />";
+ newdiv.innerHTML += "<span id='cbl'> <input type='checkbox' id='del' name='pz[del][]' value='1'/>";
+ newdiv.innerHTML += "<label id='lb' for='del'> löschen</label></span>";
+ document.getElementById(divId).appendChild(newdiv);
+ var delcb = document.getElementById('del');
+ delcb.id = "del_" + anz;
+ delcb.style.display = 'none';
+ var lcb = document.getElementById('lb');
+ lcb.id = "lb_" + anz;
+ lcb.setAttribute("for", delcb.id);
+ lcb.style.display = 'none';
+ counter++;
+ }
+ }
+ function markdelInput(divId,anz){
+ for (i=1; i<anz; i++)
+ {
+ var id = "del_" + i;
+ var delcb = document.getElementById(id);
+ delcb.style.display = 'inline';
+ var idl = "lb_" + i;
+ var lcb = document.getElementById(idl);
+ lcb.style.display = 'inline';
+ }
+ }
+ function delInput(divId){
var kn = document.getElementById(divId);
while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SPAN" && kn.lastChild.nodeName != "A")
{
@@ -120,7 +151,7 @@
document.getElementById(divId).removeChild(knc);
}
if (kn.lastChild.nodeName == "SPAN") document.getElementById(divId).removeChild(kn.lastChild);
- }
+ }
//-->
</script>
@@ -236,12 +267,13 @@
}
}
// Daten aus Proz_Step
- $sql = "SELECT proz_step,step_stat_ID,step_bem FROM Proz_Step WHERE proz_ID = $pzid ORDER BY proz_step_ID";
+ $sql = "SELECT proz_step,step_sort,step_stat_ID,step_bem FROM Proz_Step WHERE proz_ID = $pzid ORDER BY step_sort";
if ($ress = $dbc -> queryObjectArray($sql))
{
foreach ($ress as $row)
{
$pz["step"][] = $row->proz_step;
+ $pz["sort"][] = $row->step_sort;
$pz["ststat"][] = $row->step_stat_ID;
$pz["stbem"][] = $row->step_bem;
}
@@ -276,7 +308,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=\"Projektliste\">« zur Projektliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"prozess_flist.php$getp\" target=\"_self\" title=\"Projektliste\">« zur Projektliste</a></p>\n";
echo "</form>\n";
}
else
@@ -310,7 +342,7 @@
// echo "INSERT/UPDATE: Daten speichern<br /><br />\n";
// print_r($pz); echo "<br />\n";
- $pz["bezl"] = substr($pz["bezl"],0,100);
+ $pz["bezl"] = substr($pz["bezl"],0,200);
$pz["bem"] = substr($pz["bem"],0,500);
if ($pz["sdat"] == "") $pz["sdat"] = null;
if ($pz["edat"] == "") $pz["edat"] = null;
@@ -325,7 +357,7 @@
if ($pz["pers"] < "!") $pz["persknr"] = null;
if ($pz["persa"] < "!") $pz["persknra"] = null;
-
+
if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
$stmt = $dbc -> stmtinit();
@@ -376,14 +408,15 @@
if ($retd)
{
$rets = 1;
- $stmt -> prepare("INSERT INTO Proz_Step (proz_ID,proz_step,step_stat_ID,step_bem) VALUES(?,?,?,?)");
+ $stmt -> prepare("INSERT INTO Proz_Step (proz_ID,proz_step,step_sort,step_stat_ID,step_bem) VALUES(?,?,?,?,?)");
for ($k=0; $k<count($pz["step"]); $k++)
{
- if ($pz["step"][$k])
+ if ($pz["step"][$k] && !$pz["del"][$k])
{
+ if (!is_numeric($pz["sort"][$k]) || (is_numeric($pz["sort"][$k]) && $pz["sort"]< 1)) $pz["sort"][$k] = null;
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]);
+ $stmt -> bind_param('isiis',$pzid, $pz["step"][$k], $pz["sort"][$k],$pz["ststat"][$k], $pz["stbem"][$k]);
$rets = $rets && $stmt -> execute();
}
}
@@ -404,7 +437,7 @@
}
echo "</div>";
- echo "<p class='sc'> <a href=\"prozess_flist.php\" target=\"_self\" title=\"Projektliste\">« zur Projektliste</a></p>\n";
+ echo "<p class='sc'> <a href=\"prozess_flist.php$getp\" 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 Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/prozess_flist.php Thu Apr 18 14:30:58 2013 +0200
@@ -76,7 +76,8 @@
if (!isset($filter) || !$filter) $filter = "";
if (!isset($sort) || !$sort) $sort = 2;
if (!isset($dir) || !$dir) $dir = "";
-
+ $getp = "s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+
include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
$sql = "CALL prozess_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);";
@@ -223,9 +224,9 @@
echo "<td>$row->urg_bez</td>";
echo "<td>$row->stat_bez</td>";
echo "<td>".nl2br($row->bem)."</td>";
- echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+ echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID&$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
- echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID&d=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
+ echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID&dp=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
}
echo "</table></div>\n";
--- a/fhiiqm/report/info_allg_report.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/report/info_allg_report.php Thu Apr 18 14:30:58 2013 +0200
@@ -225,7 +225,7 @@
if (substr($ityp,0,1) != 8) echo "<th>Adressat</th>";
if ($ityp == 7 || substr($ityp,0,1) == 8) echo "<th>Haus, Raum</th>";
if ($stat == "''") echo "<th>Status</th>";
- echo "<th>Dokument</th>";
+ echo "<th>Dokument, Schlagwort</th>";
echo "</tr>";
foreach ($result as $row)
@@ -266,7 +266,31 @@
else echo "<td> </td>";
}
if ($stat == "''") echo "<td>$row->freigabe</td>";
- echo "<td><a href='/fhiiqm/infos/$row->doc'>".substr($row->doc,strpos($row->doc,"_")+1)."</a></td>";
+ $docsw = explode("; ", $row->doc);
+ if (isset($docsw) && is_array($docsw))
+ {
+ echo "<td>";
+ foreach ($docsw as $val)
+ {
+ $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 = " → <em>$sw</em>"; else $sw = "";
+ if (file_exists("../infos/$file"))
+ {
+ $doc = substr($file,strpos($file,"_")+1);
+ echo "<a href='../infos/$file'>$doc</a>$sw<br />";
+ }
+ else
+ echo "$file$sw<br />";
+ }
+ echo "</td>";
+ }
+// echo "<td><a href='/fhiiqm/infos/$row->doc'>".substr($row->doc,strpos($row->doc,"_")+1)."</a></td>";
echo "</tr>\n";
}
--- a/fhiiqm/report/proz_htweb_report.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/report/proz_htweb_report.php Thu Apr 18 14:30:58 2013 +0200
@@ -207,9 +207,9 @@
{
if ($pz["sort1"]>"-1") $ord = " ORDER BY " . $pz["sort1"];
if ($pz["sort2"]>"-1") $ord .= ",".$pz["sort2"];
- $ord .= ",proz_step_ID ";
+ $ord .= ",step_sort ";
}
- else $ord = " ORDER BY proz_bez,proz_step_ID";
+ else $ord = " ORDER BY proz_bez,step_sort";
if ($where) $where = " WHERE $where";
$sql .= $where . $ord .$lim;
@@ -242,7 +242,7 @@
echo "<td width='15%'>Verantwortlich: $row->verantw</td>";
echo "<td width='10%'>Status: $row->proz_stat</td>";
echo "<td>$row->proz_bem</td></tr>\n";
- echo "<tr bgcolor='" . $bg . "'>";
+ echo "<tr bgcolor='" . $bg . "' background='../img/linelightblue.gif'>";
if ($row->proz_start_pl>" ")
{
$dat = new DateTime($row->proz_start_pl);
--- a/fhiiqm/report/prozess_report.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/report/prozess_report.php Thu Apr 18 14:30:58 2013 +0200
@@ -252,9 +252,9 @@
{
if ($pz["sort1"]>"-1") $ord = " ORDER BY " . $pz["sort1"];
if ($pz["sort2"]>"-1") $ord .= ",".$pz["sort2"];
- $ord .= ",proz_step_ID ";
+ $ord .= ",step_sort ";
}
- else $ord = " ORDER BY proz_bez,proz_step_ID";
+ else $ord = " ORDER BY proz_bez,step_sort";
if ($where) $where = " WHERE $where";
$sql .= $where . $ord .$lim;
--- a/fhiiqm/vertrag_ed.php Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/vertrag_ed.php Thu Apr 18 14:30:58 2013 +0200
@@ -84,7 +84,6 @@
document.getElementById(idl).appendChild(newlabel);
*/
}
-
}
function delInput(divId,anz){
@@ -398,7 +397,6 @@
// DELETE, INSERT n:m Tabellen
include ("inc/vertragtab_ins.inc.php");
}
- // nicht mehr notwendige Dateien auf Server löschen
if ($retv && $retb && $retp && $retd && $retk && $retf && $retl)
{//Eingabe Daten, Upload File erfolgreich
@@ -422,6 +420,11 @@
// DELETE aus Tab Vertrag und abhaengigen Tabellen
echo "<div align='center'>\n";
+ // alte Namen Vertragsdocument
+ $sql = "SELECT cf_filename FROM Vertrag_File WHERE contract_ID = $cid ORDER BY cf_ID";
+ if ($res = $dbc -> queryObjectArray($sql))
+ foreach ($res as $row)
+ $vfile_old[] = $row->cf_filename;
$sql = "DELETE FROM Vertrag WHERE contract_ID = $cid";
$retvd = $dbc -> execute($sql);
if ($retvd)
@@ -439,6 +442,7 @@
if ($ok && ($sub || $del))
{
/*
+ // nicht mehr notwendige Dateien auf Server löschen
if (count($vtr['cfname']) != count($vfile_old))
{
foreach ($vfile_old as $key => $val)