s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-24 13:40:29 +01:00
Code Issues Projects Releases Wiki Activity

Bugfixes projekt preview and files list

Browse Source
This commit is contained in:
Xenomporio 2022-05-30 16:21:01 +02:00
parent 3dc55afd69
commit e201f50b00
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpwf/plugins/class.yui.php
View File

@ -3911,14 +3911,20 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
// alle artikel die ein Kunde kaufen kann mit preisen netto brutto
$cmd = $this->app->Secure->GetGET('smodule');
$adresse = 0;
if(!empty($cmd) && $id > 0){
$adresse = $this->app->DB->Select(
sprintf(
'SELECT adresse FROM `%s` WHERE id=%d LIMIT 1',
$cmd, (int)$id
)
);
}
if ($this->app->DB->Select("SHOW columns FROM `$cmd` LIKE 'adresse'")) {
$adresse = $this->app->DB->Select(
sprintf(
'SELECT adresse FROM `%s` WHERE id=%d LIMIT 1',
$cmd, (int)$id
)
);
}
}
$sortmodus = $this->TableSearchFilter($name, 1, 'sortmodus', 0,0, 'checkbox');
// headings
$heading = array('','','','Titel', 'Stichwort', 'Version','Größe', 'Ersteller','Version','Datum','Sortierung','Menü');

3
www/pages/projekt.php
View File

@ -3282,7 +3282,7 @@ class Projekt extends GenProjekt {
$id = $this->app->Secure->GetGET('id');
$arbeitsschritttabelle = new EasyTable($this->app);
$arbeitsschritttabelle->Query("SELECT p.belegnr AS produktion, pa.sort AS nr, pa.name AS arbeitsanweisung, ag.bezeichnung,
$arbeitsschritttabelle->Query("SELECT p.belegnr AS produktion, pa.sort AS nr, pa.name AS arbeitsanweisung, '',
a.name AS 'geplanter Mitarbeiter',
CONCAT(
IF(pa.einzelzeit >= 3600,
@ -3296,7 +3296,6 @@ class Projekt extends GenProjekt {
) as einzelzeit, pa.status
FROM produktion_arbeitsanweisung pa
LEFT JOIN adresse a ON pa.geplanter_mitarbeiter = a.id
LEFT JOIN arbeitsplatzgruppen ag ON pa.arbeitsplatzgruppe = ag.id
JOIN produktion p ON pa.produktion = p.id
WHERE pa.status = 'gestartet' AND p.projekt = '$id' AND p.status = 'gestartet'
ORDER BY p.id, pa.sort");