From 7481b516b3047fb0d7dc97b4df2ab0db7ea84e6a Mon Sep 17 00:00:00 2001
From: Jacek Pyziak <jacek.pyziak@project-pro.pl>
Date: Fri, 11 Apr 2025 15:00:39 +0200
Subject: [PATCH] =?UTF-8?q?Zaktualizuj=20plik=20konfiguracyjny=20synchroni?=
 =?UTF-8?q?zacji=20FTP,=20dodaj=C4=85c=20szczeg=C3=B3=C5=82y=20dotycz?=
 =?UTF-8?q?=C4=85ce=20styl=C3=B3w=20CSS=20i=20SCSS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autoload/controls/class.Tasks.php       | 9 ++++++---
 libraries/jquery-gantt/jquery-gantt.css | 1 +
 templates/tasks/main_view.php           | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/autoload/controls/class.Tasks.php b/autoload/controls/class.Tasks.php
index 0ab1b76..02b5a1f 100644
--- a/autoload/controls/class.Tasks.php
+++ b/autoload/controls/class.Tasks.php
@@ -5,7 +5,7 @@ class Tasks
   static public function gantt_json() {
     global $mdb;
 
-    $tasks = $mdb -> query( 'SELECT t.id, t.name, t.date_start, t.date_end, t.status FROM tasks AS t WHERE show_in_calendar = 1 AND status != 2' ) -> fetchAll( \PDO::FETCH_ASSOC );
+    $tasks = $mdb -> query( 'SELECT t.id, t.name, t.date_start, t.date_end, t.status, t.client_id FROM tasks AS t WHERE show_in_calendar = 1 AND status != 2 ORDER BY date_start ASC' ) -> fetchAll( \PDO::FETCH_ASSOC );
     foreach ( $tasks as $task ) {
 
       $class = '';
@@ -14,7 +14,7 @@ class Tasks
       elseif ( $task['status'] == 5 )
         $class = 'ganttRed';
 
-      $task_json['name'] = $task['name'];
+      $task_json['name'] = $task['client_id'] ? \factory\Crm::get_client_name( (int)$task['client_id'] ) : $task['name'];
       $task_json['desc'] = 'Lorem ipsum dolor sit amet.';
       $task_json['id'] = $task['id'];
       $task_json['cssClass'] = 'redLabel';
@@ -24,7 +24,10 @@ class Tasks
           'to' => $task['date_end'] . ' 16:00',
           'label' => $task['name'],
           'desc' => '',
-          'customClass' => $class
+          'customClass' => $class,
+          'dataObj' => [
+            'task_id' => $task['id'],
+          ]
         ]
       ];
       $data[] = $task_json;
diff --git a/libraries/jquery-gantt/jquery-gantt.css b/libraries/jquery-gantt/jquery-gantt.css
index fbe3374..9419710 100644
--- a/libraries/jquery-gantt/jquery-gantt.css
+++ b/libraries/jquery-gantt/jquery-gantt.css
@@ -59,6 +59,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+  font-size: 12px;
 }
 
 .fn-gantt .leftPanel .row0 {
diff --git a/templates/tasks/main_view.php b/templates/tasks/main_view.php
index 34f332d..0ad1e7a 100644
--- a/templates/tasks/main_view.php
+++ b/templates/tasks/main_view.php
@@ -166,7 +166,8 @@
     scaleStep: 1,
     scrollToToday: false,
     onItemClick: function(data) {
-        alert("Item clicked - show some details");
+      var task_id = data.task_id;
+      task_popup( task_id );
     },
     onAddClick: function(dt, rowId) {
         alert("Empty space clicked - add an item!");