mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2025-01-12 06:41:14 +01:00
verbindlichkeit added icon attachment missing, change in icons, added filters
This commit is contained in:
parent
63d6f2e7d4
commit
3fe8fcd8aa
@ -3596,10 +3596,14 @@ class YUI {
|
|||||||
|
|
||||||
function IconsSQLVerbindlichkeit() {
|
function IconsSQLVerbindlichkeit() {
|
||||||
|
|
||||||
$go_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/ware_go.png\" style=\"margin-right:1px\" title=\"Wareneingangsprüfung OK\" border=\"0\">";
|
$go_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo.png\" style=\"margin-right:1px\" title=\"Wareneingangsprüfung OK\" border=\"0\">";
|
||||||
$stop_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/ware_stop.png\" style=\"margin-right:1px\" title=\"Wareneingangsprüfung fehlt\" border=\"0\">";
|
$stop_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagerstop.png\" style=\"margin-right:1px\" title=\"Wareneingangsprüfung fehlt\" border=\"0\">";
|
||||||
$go_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" style=\"margin-right:1px\" title=\"Rechnungseingangsprüfung OK\" border=\"0\">";
|
|
||||||
$stop_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_stop.png\" style=\"margin-right:1px\" title=\"Rechnungseingangsprüfung fehlt\" border=\"0\">";
|
$go_pdf = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" style=\"margin-right:1px\" title=\"Anhang OK\" border=\"0\">";
|
||||||
|
$stop_pdf = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_stop.png\" style=\"margin-right:1px\" title=\"Anhang fehlt\" border=\"0\">";
|
||||||
|
|
||||||
|
$go_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/check_go.png\" style=\"margin-right:1px\" title=\"Rechnungseingangsprüfung OK\" border=\"0\">";
|
||||||
|
$stop_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/check_stop.png\" style=\"margin-right:1px\" title=\"Rechnungseingangsprüfung fehlt\" border=\"0\">";
|
||||||
|
|
||||||
$go_zahlung = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/bank_go.svg\" style=\"margin-right:1px\" title=\"Kontoverknüpfung OK\" border=\"0\">";
|
$go_zahlung = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/bank_go.svg\" style=\"margin-right:1px\" title=\"Kontoverknüpfung OK\" border=\"0\">";
|
||||||
$stop_zahlung = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/bank_stop.svg\" style=\"margin-right:1px\" title=\"Kontoverknüpfung fehlt\" border=\"0\">";
|
$stop_zahlung = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/bank_stop.svg\" style=\"margin-right:1px\" title=\"Kontoverknüpfung fehlt\" border=\"0\">";
|
||||||
@ -3608,6 +3612,7 @@ class YUI {
|
|||||||
$gostop_betragbezahlt = "<img alt=\"teilweise bezahlt\" src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassegostop.png\" style=\"margin-right:1px\" title=\"teilweise bezahlt\" border=\"0\">";
|
$gostop_betragbezahlt = "<img alt=\"teilweise bezahlt\" src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassegostop.png\" style=\"margin-right:1px\" title=\"teilweise bezahlt\" border=\"0\">";
|
||||||
$go_betragbezahlt = "<img alt=\"nicht bezahlt\" src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassego.png\" style=\"margin-right:1px\" title=\"bezahlt\" border=\"0\">";
|
$go_betragbezahlt = "<img alt=\"nicht bezahlt\" src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassego.png\" style=\"margin-right:1px\" title=\"bezahlt\" border=\"0\">";
|
||||||
return "CONCAT('<table><tr><td nowrap>',
|
return "CONCAT('<table><tr><td nowrap>',
|
||||||
|
if(datei_anzahl > 0,'$go_pdf','$stop_pdf'),
|
||||||
if(v.freigabe,'$go_ware','$stop_ware'),
|
if(v.freigabe,'$go_ware','$stop_ware'),
|
||||||
if(v.rechnungsfreigabe,'$go_summe','$stop_summe'),
|
if(v.rechnungsfreigabe,'$go_summe','$stop_summe'),
|
||||||
if(v.bezahlt,'$go_betragbezahlt','$stop_betragbezahlt'),
|
if(v.bezahlt,'$go_betragbezahlt','$stop_betragbezahlt'),
|
||||||
|
@ -10,12 +10,19 @@
|
|||||||
<div class="filter-title">{|Filter|}</div>
|
<div class="filter-title">{|Filter|}</div>
|
||||||
<ul class="filter-list">
|
<ul class="filter-list">
|
||||||
<li class="filter-item">
|
<li class="filter-item">
|
||||||
|
<label for="anhang" class="switch">
|
||||||
|
<input type="checkbox" id="anhang">
|
||||||
|
<span class="slider round"></span>
|
||||||
|
</label>
|
||||||
|
<label for="anhang">{|Anhang fehlt|}</label>
|
||||||
|
</li>
|
||||||
|
<li class="filter-item">
|
||||||
<label for="wareneingang" class="switch">
|
<label for="wareneingang" class="switch">
|
||||||
<input type="checkbox" id="wareneingang">
|
<input type="checkbox" id="wareneingang">
|
||||||
<span class="slider round"></span>
|
<span class="slider round"></span>
|
||||||
</label>
|
</label>
|
||||||
<label for="wareneingang">{|Wareingang/Leistungsprüfung fehlt|}</label>
|
<label for="wareneingang">{|Wareingang/Leistungsprüfung fehlt|}</label>
|
||||||
</li>
|
</li>
|
||||||
<li class="filter-item">
|
<li class="filter-item">
|
||||||
<label for="rechnungsfreigabe" class="switch">
|
<label for="rechnungsfreigabe" class="switch">
|
||||||
<input type="checkbox" id="rechnungsfreigabe">
|
<input type="checkbox" id="rechnungsfreigabe">
|
||||||
@ -30,6 +37,13 @@
|
|||||||
</label>
|
</label>
|
||||||
<label for="nichtbezahlt">{|Nicht bezahlt|}</label>
|
<label for="nichtbezahlt">{|Nicht bezahlt|}</label>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="filter-item">
|
||||||
|
<label for="stornierte" class="switch">
|
||||||
|
<input type="checkbox" id="stornierte">
|
||||||
|
<span class="slider round"></span>
|
||||||
|
</label>
|
||||||
|
<label for="stornierte">{|Inkl. stornierte|}</label>
|
||||||
|
</li>
|
||||||
<li class="filter-item">
|
<li class="filter-item">
|
||||||
<label for="zahlbarbis">{|Zahlbar bis|}:</label>
|
<label for="zahlbarbis">{|Zahlbar bis|}:</label>
|
||||||
<input type="text" name="zahlbarbis" id="zahlbarbis" size="10">
|
<input type="text" name="zahlbarbis" id="zahlbarbis" size="10">
|
||||||
|
@ -109,19 +109,22 @@ class Verbindlichkeit {
|
|||||||
".$app->YUI->IconsSQLVerbindlichkeit().",
|
".$app->YUI->IconsSQLVerbindlichkeit().",
|
||||||
v.id FROM verbindlichkeit v
|
v.id FROM verbindlichkeit v
|
||||||
LEFT JOIN adresse a ON v.adresse = a.id
|
LEFT JOIN adresse a ON v.adresse = a.id
|
||||||
|
LEFT JOIN (
|
||||||
";
|
SELECT ds.parameter, COUNT(ds.objekt) datei_anzahl FROM datei_stichwoerter ds INNER JOIN datei d ON d.id = ds.datei WHERE ds.objekt='verbindlichkeit' AND d.geloescht <> 1 GROUP BY ds.parameter
|
||||||
|
) d ON d.parameter = v.id
|
||||||
|
";
|
||||||
$where = "1";
|
$where = "1";
|
||||||
$count = "SELECT count(DISTINCT id) FROM verbindlichkeit WHERE $where";
|
$count = "SELECT count(DISTINCT id) FROM verbindlichkeit WHERE $where";
|
||||||
// $groupby = "";
|
// $groupby = "";
|
||||||
|
|
||||||
// Toggle filters
|
// Toggle filters
|
||||||
$this->app->Tpl->Add('JQUERYREADY', "$('#wareneingang').click( function() { fnFilterColumn1( 0 ); } );");
|
$this->app->Tpl->Add('JQUERYREADY', "$('#anhang').click( function() { fnFilterColumn1( 0 ); } );");
|
||||||
$this->app->Tpl->Add('JQUERYREADY', "$('#rechnungsfreigabe').click( function() { fnFilterColumn2( 0 ); } );");
|
$this->app->Tpl->Add('JQUERYREADY', "$('#wareneingang').click( function() { fnFilterColumn2( 0 ); } );");
|
||||||
$this->app->Tpl->Add('JQUERYREADY', "$('#nichtbezahlt').click( function() { fnFilterColumn3( 0 ); } );");
|
$this->app->Tpl->Add('JQUERYREADY', "$('#rechnungsfreigabe').click( function() { fnFilterColumn3( 0 ); } );");
|
||||||
|
$this->app->Tpl->Add('JQUERYREADY', "$('#nichtbezahlt').click( function() { fnFilterColumn4( 0 ); } );");
|
||||||
|
$this->app->Tpl->Add('JQUERYREADY', "$('#stornierte').click( function() { fnFilterColumn5( 0 ); } );");
|
||||||
|
|
||||||
for ($r = 1;$r <= 3;$r++) {
|
for ($r = 1;$r <= 8;$r++) {
|
||||||
$this->app->Tpl->Add('JAVASCRIPT', '
|
$this->app->Tpl->Add('JAVASCRIPT', '
|
||||||
function fnFilterColumn' . $r . ' ( i )
|
function fnFilterColumn' . $r . ' ( i )
|
||||||
{
|
{
|
||||||
@ -139,37 +142,50 @@ class Verbindlichkeit {
|
|||||||
');
|
');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$more_data1 = $this->app->Secure->GetGET("more_data1");
|
$more_data1 = $this->app->Secure->GetGET("more_data1");
|
||||||
if ($more_data1 == 1) {
|
if ($more_data1 == 1) {
|
||||||
$where .= " AND v.freigabe <> '1'";
|
$where .= " AND datei_anzahl IS NULL";
|
||||||
} else {
|
} else {
|
||||||
}
|
}
|
||||||
|
|
||||||
$more_data2 = $this->app->Secure->GetGET("more_data2");
|
$more_data2 = $this->app->Secure->GetGET("more_data2");
|
||||||
if ($more_data2 == 1) {
|
if ($more_data2 == 1) {
|
||||||
$where .= " AND v.rechnungsfreigabe <> '1'";
|
$where .= " AND v.freigabe <> '1'";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
}
|
}
|
||||||
|
|
||||||
$more_data3 = $this->app->Secure->GetGET("more_data3");
|
$more_data3 = $this->app->Secure->GetGET("more_data3");
|
||||||
if ($more_data3 == 1) {
|
if ($more_data3 == 1) {
|
||||||
$where .= " AND v.bezahlt <> '1'";
|
$where .= " AND v.rechnungsfreigabe <> '1'";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
}
|
||||||
|
|
||||||
|
$more_data4 = $this->app->Secure->GetGET("more_data4");
|
||||||
|
if ($more_data4 == 1) {
|
||||||
|
$where .= " AND v.bezahlt <> 1";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$more_data5 = $this->app->Secure->GetGET("more_data5");
|
||||||
|
if ($more_data5 == 1) {
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$where .= " AND v.status <> 'storniert'";
|
||||||
|
}
|
||||||
// END Toggle filters
|
// END Toggle filters
|
||||||
|
|
||||||
$this->app->YUI->DatePicker('zahlbarbis');
|
$this->app->YUI->DatePicker('zahlbarbis');
|
||||||
$filterzahlbarbis = $this->app->YUI->TableSearchFilter($name, 4,'zahlbarbis');
|
$filterzahlbarbis = $this->app->YUI->TableSearchFilter($name, 6,'zahlbarbis');
|
||||||
if (!empty($filterzahlbarbis)) {
|
if (!empty($filterzahlbarbis)) {
|
||||||
$filterzahlbarbis = $this->app->String->Convert($filterzahlbarbis,'%1.%2.%3','%3-%2-%1');
|
$filterzahlbarbis = $this->app->String->Convert($filterzahlbarbis,'%1.%2.%3','%3-%2-%1');
|
||||||
$where .= " AND v.zahlbarbis <= '".$filterzahlbarbis."'";
|
$where .= " AND v.zahlbarbis <= '".$filterzahlbarbis."'";
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->app->YUI->DatePicker('skontobis');
|
$this->app->YUI->DatePicker('skontobis');
|
||||||
$filterskontobis = $this->app->YUI->TableSearchFilter($name, 5,'skontobis');
|
$filterskontobis = $this->app->YUI->TableSearchFilter($name, 7,'skontobis');
|
||||||
if (!empty($filterskontobis)) {
|
if (!empty($filterskontobis)) {
|
||||||
$filterskontobis = $this->app->String->Convert($filterskontobis,'%1.%2.%3','%3-%2-%1');
|
$filterskontobis = $this->app->String->Convert($filterskontobis,'%1.%2.%3','%3-%2-%1');
|
||||||
$where .= " AND v.skontobis <= '".$filterskontobis."'";
|
$where .= " AND v.skontobis <= '".$filterskontobis."'";
|
||||||
@ -983,7 +999,13 @@ $menu="<table cellpadding=0 cellspacing=0><tr><td nowrap>"."<a href=\"index.php?
|
|||||||
$this->app->Tpl->Set('ZAHLBARBIS',$this->app->erp->ReplaceDatum(false,$verbindlichkeit_from_db['zahlbarbis'],false));
|
$this->app->Tpl->Set('ZAHLBARBIS',$this->app->erp->ReplaceDatum(false,$verbindlichkeit_from_db['zahlbarbis'],false));
|
||||||
$this->app->YUI->DatePicker("zahlbarbis");
|
$this->app->YUI->DatePicker("zahlbarbis");
|
||||||
|
|
||||||
$sql = "SELECT " . $this->app->YUI->IconsSQLVerbindlichkeit() . " AS `icons` FROM verbindlichkeit v WHERE id=$id";
|
$sql = "SELECT
|
||||||
|
".$this->app->YUI->IconsSQLVerbindlichkeit() . " AS `icons`
|
||||||
|
FROM verbindlichkeit v
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT ds.parameter, COUNT(ds.objekt) datei_anzahl FROM datei_stichwoerter ds INNER JOIN datei d ON d.id = ds.datei WHERE ds.objekt='verbindlichkeit' AND d.geloescht <> 1 GROUP BY ds.parameter
|
||||||
|
) d ON d.parameter = v.id
|
||||||
|
WHERE id=$id";
|
||||||
$icons = $this->app->DB->SelectArr($sql);
|
$icons = $this->app->DB->SelectArr($sql);
|
||||||
$this->app->Tpl->Add('STATUSICONS', $icons[0]['icons']);
|
$this->app->Tpl->Add('STATUSICONS', $icons[0]['icons']);
|
||||||
|
|
||||||
|
BIN
www/themes/new/images/check_go.png
Normal file
BIN
www/themes/new/images/check_go.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.4 KiB |
BIN
www/themes/new/images/check_gostop.png
Normal file
BIN
www/themes/new/images/check_gostop.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.7 KiB |
BIN
www/themes/new/images/check_stop.png
Normal file
BIN
www/themes/new/images/check_stop.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.8 KiB |
Loading…
x
Reference in New Issue
Block a user