Project-Pro/crmPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://91.189.216.43:3000/jacek.pyziak/crmPRO

Browse Source
This commit is contained in:
Jacek Pyziak
2025-04-12 02:07:47 +02:00
parent a1b24ba466 7481b516b3
commit ec48c84b4b
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
autoload/controls/class.Tasks.php
View File

@@ -5,7 +5,7 @@ class Tasks
static public function gantt_json() { static public function gantt_json() {
global $mdb; 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 ) { foreach ( $tasks as $task ) {
$class = ''; $class = '';
@@ -14,7 +14,7 @@ class Tasks
elseif ( $task['status'] == 5 ) elseif ( $task['status'] == 5 )
$class = 'ganttRed'; $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['desc'] = 'Lorem ipsum dolor sit amet.';
$task_json['id'] = $task['id']; $task_json['id'] = $task['id'];
$task_json['cssClass'] = 'redLabel'; $task_json['cssClass'] = 'redLabel';
@@ -24,7 +24,10 @@ class Tasks
'to' => $task['date_end'] . ' 16:00', 'to' => $task['date_end'] . ' 16:00',
'label' => $task['name'], 'label' => $task['name'],
'desc' => '', 'desc' => '',
'customClass' => $class 'customClass' => $class,
'dataObj' => [
'task_id' => $task['id'],
]
] ]
]; ];
$data[] = $task_json; $data[] = $task_json;

1
libraries/jquery-gantt/jquery-gantt.css
View File

@@ -59,6 +59,7 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
font-size: 12px;
} }
.fn-gantt .leftPanel .row0 { .fn-gantt .leftPanel .row0 {

3
templates/tasks/main_view.php
View File

@@ -167,7 +167,8 @@
scrollToToday: false, scrollToToday: false,
saveEndpoint: "/tasks/set_task_dates/", saveEndpoint: "/tasks/set_task_dates/",
onItemClick: function(data) { onItemClick: function(data) {
alert("Item clicked - show some details"); var task_id = data.task_id;
task_popup( task_id );
}, },
onAddClick: function(dt, rowId) { onAddClick: function(dt, rowId) {
alert("Empty space clicked - add an item!"); alert("Empty space clicked - add an item!");