blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 09:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added filter bezeichnung field to reporting to show before filter dropdown instead of kurzbz

Browse Source
This commit is contained in:
alex
2018-09-03 17:15:04 +02:00
parent 979a46e410
commit 61d0ac7ca0
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/filter.class.php
+22 -1
View File
@@ -33,6 +33,7 @@ class filter extends basis_db
//Tabellenspalten
protected $filter_id; // integer (PK)
protected $kurzbz; // varchar(32) unique
protected $bezeichnung; // varchar(32)
protected $sql; // text
protected $valuename; // varchar(32)
protected $showvalue; // boolean (should the value be showed in the input widget
@@ -85,6 +86,7 @@ class filter extends basis_db
{
$this->filter_id=$row->filter_id;
$this->kurzbz=$row->kurzbz;
$this->bezeichnung=$row->bezeichnung;
$this->sql=$row->sql;
$this->valuename=$row->valuename;
$this->showvalue=$this->db_parse_bool($row->showvalue);
@@ -125,6 +127,7 @@ class filter extends basis_db
$obj->filter_id=$row->filter_id;
$obj->kurzbz=$row->kurzbz;
$obj->bezeichnung=$row->bezeichnung;
$obj->sql=$row->sql;
$obj->valuename=$row->valuename;
$obj->showvalue = $this->db_parse_bool($row->showvalue);
@@ -164,6 +167,22 @@ class filter extends basis_db
return false;
}
/**
* Filter Bezeichnung des Filters mit einer gegebenen kurzbz holen
* @param $kurzbz kurzbz des Datensatzes, der gefunden werden soll
* @return string|boolean Bezeichnung wenn kurzbz gefunden, false andernfalls
*/
public function getBezeichnungFromKurzbz($kurzbz)
{
foreach ($this->result as $filter)
{
if ($filter->kurzbz==$kurzbz)
return $filter->__get('bezeichnung');
}
return false;
}
/**
* Ausgabe des HTML Widgets
* @param kurzbz des Datensatzes, der gefunden werden soll
@@ -304,9 +323,10 @@ class filter extends basis_db
if($this->new)
{
//Neuen Datensatz einfuegen
$qry='INSERT INTO public.tbl_filter (kurzbz, sql, valuename,
$qry='INSERT INTO public.tbl_filter (kurzbz, bezeichnung, sql, valuename,
showvalue, type, htmlattr, insertamum, insertvon) VALUES ('.
$this->db_add_param($this->kurzbz).', '.
$this->db_add_param($this->bezeichnung).', '.
$this->db_add_param($this->sql).', '.
$this->db_add_param($this->valuename).', '.
$this->db_add_param($this->showvalue, FHC_BOOLEAN).', '.
@@ -326,6 +346,7 @@ class filter extends basis_db
$qry='UPDATE public.tbl_filter SET'.
' kurzbz='.$this->db_add_param($this->kurzbz).', '.
' bezeichnung='.$this->db_add_param($this->bezeichnung).', '.
' sql='.$this->db_add_param($this->sql).', '.
' valuename='.$this->db_add_param($this->valuename).', '.
' showvalue='.$this->db_add_param($this->showvalue, FHC_BOOLEAN).', '.
vilesci/statistik/filter_details.php
+9 -5
View File
@@ -44,6 +44,7 @@
$filter = new filter();
$filter->filter_id = '';
$filter->kurzbz = 'NewFilter';
$filter->bezeichnung = 'New Filter';
$filter->sql = 'SELECT foo AS value, bar AS name FROM foobar WHERE ... ORDER BY name';
$filter->valuename = '';
$filter->showvalue = true;
@@ -68,6 +69,7 @@
}
$filter->kurzbz = $_POST["kurzbz"];
$filter->bezeichnung = $_POST["bezeichnung"];
$filter->valuename = $_POST["valuename"];
$filter->sql = $_POST["sql"];
$filter->showvalue = isset($_POST["showvalue"]);
@@ -104,19 +106,21 @@
$htmlstr .= " <table class='detail'>\n";
$htmlstr .= " <tr>\n";
$htmlstr .= " <td>KurzBz</td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='kurzbz' size='16' maxlength='32' value='".$filter->kurzbz."' onchange='submitable()'></td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='kurzbz' size='12' maxlength='24' value='".$filter->kurzbz."' onchange='submitable()'></td>\n";
$htmlstr .= " <td>Bezeichnung</td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='bezeichnung' size='12' maxlength='24' value='".$filter->bezeichnung."' onchange='submitable()'></td>\n";
$htmlstr .= " <td>ValueName</td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='valuename' size='16' maxlength='32' value='".$filter->valuename."' onchange='submitable()'></td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='valuename' size='12' maxlength='24' value='".$filter->valuename."' onchange='submitable()'></td>\n";
$htmlstr .= " <td>Type</td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='type' size='16' maxlength='32' value='".$filter->type."' onchange='submitable()'></td>\n";
$htmlstr .= " <td><input class='detail' type='text' name='type' size='12' maxlength='24' value='".$filter->type."' onchange='submitable()'></td>\n";
$htmlstr .= " <td>ShowValue</td>\n";
$htmlstr .= " <td><input class='detail' type='checkbox' name='showvalue' $chk onchange='submitable()'></td>\n";
$htmlstr .= " </tr>\n";
$htmlstr .= " <tr>\n";
$htmlstr .= " <td valign='top'>SQL</td>\n";
$htmlstr .= " <td colspan='5'><textarea name='sql' cols='70' rows='6' onchange='submitable()'>".$filter->sql."</textarea></td>\n";
$htmlstr .= " <td colspan='7'><textarea name='sql' cols='95' rows='6' onchange='submitable()'>".$filter->sql."</textarea></td>\n";
$htmlstr .= " <td valign='top'>HTML-Attributes</td>\n";
$htmlstr .= " <td colspan='2'><textarea name='htmlattr' cols='70' rows='6' onchange='submitable()'>".$filter->htmlattr."</textarea></td>\n";
$htmlstr .= " <td colspan='3'><textarea name='htmlattr' cols='70' rows='6' onchange='submitable()'>".$filter->htmlattr."</textarea></td>\n";
$htmlstr .= " </tr>\n";
$htmlstr .= " </table>\n";
$htmlstr .= "<br>\n";