From 169a5c34c558231f26fae6ad5a319b9ff8540e28 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Fri, 19 Jan 2024 10:02:27 +0100
Subject: [PATCH] Berichte create report from preview

---
 www/pages/content/report_databaseview.tpl | 12 +++++-
 www/pages/report.php                      | 47 +++++++++++++++++++----
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/www/pages/content/report_databaseview.tpl b/www/pages/content/report_databaseview.tpl
index 96cb50a9..602a7ffa 100644
--- a/www/pages/content/report_databaseview.tpl
+++ b/www/pages/content/report_databaseview.tpl
@@ -53,9 +53,19 @@
 		<div class="row" id="report_list_main">
 			<div class="row-height">
 				<div class="col-xs-12 col-sm-10 col-sm-height">
-                    <legend>
+                    <legend style="float:left">
                         Tabelle&nbsp;[TABLENAME]
                     </legend>
+                    <form method="post" action="#tabs-3">
+                        <fieldset style="float: right;">
+                            <input type="text" name="table" value="[TABLENAME]" hidden></input>
+                             <table width="100%" border="0" class="mkTableFormular">
+                                <tr>
+                                    <td><button name="submit" value="erzeugen" class="ui-button-icon" style="width:100%;float:right;">Bericht erzeugen</button></td>
+                                </tr>                                                          
+                            </table>
+                        </fieldset>
+                    </form>
 					<div>
 					    [TAB3]  
 					</div>
diff --git a/www/pages/report.php b/www/pages/report.php
index c2202afc..69bf0ebf 100644
--- a/www/pages/report.php
+++ b/www/pages/report.php
@@ -542,6 +542,7 @@ class Report
                     }
 
                     $heading = $columns;
+                    $heading[] = '';
                     $findcols = $columns;
                     $searchsql = $columns;
                   
@@ -3232,7 +3233,8 @@ class Report
         if (!empty($selectedtable)) {
 
             $this->app->User->SetParameter('report_databaseview_selectedtable',$selectedtable);
-            $selectedcolumns = $this->app->Secure->GetPost('auswahl');
+            $submit = $this->app->Secure->GetPost('submit');
+            $selectedcolumns = $this->app->Secure->GetPost('auswahl');         
 
             $sql = "SHOW COLUMNS FROM `".$selectedtable."`";
             $columns = $this->app->DB->SelectArr($sql);
@@ -3245,7 +3247,6 @@ class Report
                         $checked = 'checked';                        
                     }
                 }
-
                 $row = array();
                 $row[] = '<input type="checkbox" name="auswahl[]" '.$checked.' value="'.$column['Field'].'">';                
                 $row = array_merge($row,$column);
@@ -3254,12 +3255,42 @@ class Report
             $column_easytable->DisplayNew('TAB2');
             $this->app->Tpl->Set('TABLENAME',ucfirst($selectedtable));
 
-            if (!empty($selectedcolumns)) {
-                $this->app->User->SetParameter('report_databaseview_selectedcolumns',implode(',',$selectedcolumns));
-            }
-
-            $this->app->YUI->TableSearch('TAB3', 'databaseview', 'show', '', '', basename(__FILE__), __CLASS__);
-
+            switch($submit) {
+                case 'vorschau':
+                    if (!empty($selectedcolumns)) {
+                        $this->app->User->SetParameter('report_databaseview_selectedcolumns',implode(',',$selectedcolumns));
+                    } else {
+                        $this->app->YUI->Message('warning','Spalten w&auml;hlen');
+                    } 
+                    $this->app->YUI->TableSearch('TAB3', 'databaseview', 'show', '', '', basename(__FILE__), __CLASS__);
+                break;
+                case 'erzeugen':                
+                    $selectedcolumns = $this->app->User->GetParameter('report_databaseview_selectedcolumns');                
+                    $columns = explode(',',$selectedcolumns);
+                    $sql = "SELECT `".implode("`,`",$columns)."` from `".$selectedtable."`";  
+                    $name = $this->service->generateIncrementedReportName(ucfirst($selectedtable));
+                    $userId = $this->app->User->GetID();
+                    $report = ReportData::fromFormData(['name' => $name, 'sql_query' => $sql, 'description' => 'Erzeugt aus Datenbankansicht Tabelle '.ucfirst($selectedtable)]);
+                    $newId = $this->service->saveReport($report);
+                    if ($newId > 0) {
+                        $this->service->saveReportUserArray([
+                            'report_id' => $newId,
+                            'user_id' => $userId,
+                            'name' => $this->app->User->GetName(),
+                            'chart_enabled' => 0,
+                            'file_enabled' => 0,
+                            'menu_enabled' => 0,
+                            'tab_enabled' => 0,
+                        ]);
+                        $report = $this->gateway->getReportById($newId);
+                        $newReport = $this->service->autoCreateColumns($report);
+                        $newId = $this->service->saveReport($newReport);
+                        header('Location: index.php?module=report&action=edit&id='.$newId);
+                    } else {
+                        $this->app->YUI->Message('error','Bericht konnte nicht erzeugt werden');
+                    }
+                break;
+            }            
         } else {
             $this->app->YUI->Message('warning','Tabelle w&auml;hlen');
         }