From c2c61460b60c769ff99d7e0d53e84a8a9d0b94f0 Mon Sep 17 00:00:00 2001
From: Richard Toth <info@tothbt.com>
Date: Tue, 8 Sep 2020 13:31:32 +0200
Subject: [PATCH] change training list export

---
 _include/include_export_trainings.php       | 44 +++++++++++++--------
 _include/include_traininglist.php           | 24 +++++++----
 template/templates/training_export_list.tpl |  6 ++-
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/_include/include_export_trainings.php b/_include/include_export_trainings.php
index 5f6ab53..93b7a5f 100644
--- a/_include/include_export_trainings.php
+++ b/_include/include_export_trainings.php
@@ -3,19 +3,25 @@
 if ($user->has_authority(1)) {
     $trainingAssocArray = $sql->assoc_array("
         SELECT
-            tr_id id,
-            substring(tr_date,1,16) 'date',
-            trt_name 'name',
-            GROUP_CONCAT(DISTINCT ua_name) 'coaches',
-            COUNT(DISTINCT pr_id) 'count'
+            tr_id 'Azonosító',
+            substring(tr_date,1,16) 'Időpont',
+            trt_name 'Típus',
+            tr_duration 'Időintervallum',
+            GROUP_CONCAT(DISTINCT uc1.ua_name) 'Edző',
+            GROUP_CONCAT(DISTINCT uc2.ua_name) 'Segédedző',
+            COUNT(DISTINCT pr_id) 'Létszám'
         FROM
             training
                 JOIN
             training_type ON trt_id = tr_training_type_trt_id
                 JOIN
-            training_coach ON trc_training_tr_id = tr_id
+            training_coach tc1 ON tc1.trc_training_tr_id = tr_id AND tc1.trc_helper = 0
+                LEFT JOIN
+            training_coach tc2 ON tc2.trc_training_tr_id = tr_id AND tc2.trc_helper = 1
                 JOIN
-            user_coach ON ua_id = trc_coach_uc_id
+            user_coach uc1 ON uc1.ua_id = tc1.trc_coach_uc_id
+                LEFT JOIN
+            user_coach uc2 ON uc2.ua_id = tc2.trc_coach_uc_id
                 JOIN
             presence ON pr_training_tr_id = tr_id
         WHERE
@@ -27,21 +33,25 @@ if ($user->has_authority(1)) {
 else {
     $trainingAssocArray = $sql->assoc_array("
         SELECT
-            tr_id id,
-            substring(tr_date,1,16) 'date',
-            trt_name 'name',
-            GROUP_CONCAT(DISTINCT ua_name) 'coaches',
-            COUNT(DISTINCT pr_id) 'count'
+            tr_id 'Azonosító',
+            substring(tr_date,1,16) 'Időpont',
+            trt_name 'Típus',
+            tr_duration 'Időintervallum',
+            GROUP_CONCAT(DISTINCT uc1.ua_name) 'Edző',
+            GROUP_CONCAT(DISTINCT uc2.ua_name) 'Segédedző',
+            COUNT(DISTINCT pr_id) 'Létszám'
         FROM
             training
                 JOIN
             training_type ON trt_id = tr_training_type_trt_id
                 JOIN
-            training_coach trc1 ON trc1.trc_training_tr_id = tr_id
+            training_coach tc1 ON tc1.trc_training_tr_id = tr_id AND tc1.trc_helper = 0
+                LEFT JOIN
+            training_coach tc2 ON tc2.trc_training_tr_id = tr_id AND tc2.trc_helper = 1
                 JOIN
-            training_coach trc2 ON trc2.trc_training_tr_id = tr_id
-                JOIN
-            user_coach ON ua_id = trc1.trc_coach_uc_id
+            user_coach uc1 ON uc1.ua_id = tc1.trc_coach_uc_id
+                LEFT JOIN
+            user_coach uc2 ON uc2.ua_id = tc2.trc_coach_uc_id
                 JOIN
             presence ON pr_training_tr_id = tr_id
         WHERE
@@ -53,9 +63,9 @@ else {
 
 $filename = "edzeslista.csv";
 $fp = fopen('php://output', 'w');
+ob_end_clean();
 
 fputcsv($fp, array_keys(reset($trainingAssocArray)), ';');
-ob_end_clean();
 
 header('Content-type: application/csv');
 header('Content-Disposition: attachment; filename='.$filename);
diff --git a/_include/include_traininglist.php b/_include/include_traininglist.php
index f8ff7f2..04df62a 100644
--- a/_include/include_traininglist.php
+++ b/_include/include_traininglist.php
@@ -6,16 +6,22 @@ if ($user->has_authority(1)) {
             tr_id id,
             substring(tr_date,1,16) 'date',
             trt_name 'name',
-            GROUP_CONCAT(DISTINCT ua_name) 'coaches',
+            tr_duration 'duration',
+            GROUP_CONCAT(DISTINCT uc1.ua_name) 'coaches',
+            GROUP_CONCAT(DISTINCT uc2.ua_name) 'helpers',
             COUNT(DISTINCT pr_id) 'count'
         FROM
             training
                 JOIN
             training_type ON trt_id = tr_training_type_trt_id
                 JOIN
-            training_coach ON trc_training_tr_id = tr_id
+            training_coach tc1 ON tc1.trc_training_tr_id = tr_id AND tc1.trc_helper = 0
+                LEFT JOIN
+            training_coach tc2 ON tc2.trc_training_tr_id = tr_id AND tc2.trc_helper = 1
                 JOIN
-            user_coach ON ua_id = trc_coach_uc_id
+            user_coach uc1 ON uc1.ua_id = tc1.trc_coach_uc_id
+                LEFT JOIN
+            user_coach uc2 ON uc2.ua_id = tc2.trc_coach_uc_id
                 JOIN
             presence ON pr_training_tr_id = tr_id
         WHERE
@@ -30,18 +36,22 @@ else {
             tr_id id,
             substring(tr_date,1,16) 'date',
             trt_name 'name',
+            tr_duration 'duration',
             GROUP_CONCAT(DISTINCT ua_name) 'coaches',
+            GROUP_CONCAT(DISTINCT uc2.ua_name) 'helpers',
             COUNT(DISTINCT pr_id) 'count'
         FROM
             training
                 JOIN
             training_type ON trt_id = tr_training_type_trt_id
                 JOIN
-            training_coach trc1 ON trc1.trc_training_tr_id = tr_id
+            training_coach tc1 ON tc1.trc_training_tr_id = tr_id AND tc1.trc_helper = 0
+                LEFT JOIN
+            training_coach tc2 ON tc2.trc_training_tr_id = tr_id AND tc2.trc_helper = 1
                 JOIN
-            training_coach trc2 ON trc2.trc_training_tr_id = tr_id
-                JOIN
-            user_coach ON ua_id = trc1.trc_coach_uc_id
+            user_coach uc1 ON uc1.ua_id = tc1.trc_coach_uc_id
+                LEFT JOIN
+            user_coach uc2 ON uc2.ua_id = tc2.trc_coach_uc_id
                 JOIN
             presence ON pr_training_tr_id = tr_id
         WHERE
diff --git a/template/templates/training_export_list.tpl b/template/templates/training_export_list.tpl
index 19c6696..cb025ce 100644
--- a/template/templates/training_export_list.tpl
+++ b/template/templates/training_export_list.tpl
@@ -10,7 +10,9 @@
             <th>Azonosító</th>
             <th>Időpont</th>
             <th>Típus</th>
-            <th>Edzők</th>
+            <th>Időintervallum</th>
+            <th>Edző</th>
+            <th>Segédedző</th>
             <th>Létszám</th>
         </tr>
         {foreach $trainings as $training}
@@ -18,7 +20,9 @@
                 <td>#{$training['id']}</td>
                 <td>{$training['date']}</td>
                 <td>{$training['name']}</td>
+                <td>{$training['duration']}</td>
                 <td>{$training['coaches']}</td>
+                <td>{$training['helpers']}</td>
                 <td>{$training['count']}</td>
             </tr>
         {/foreach}