Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'

Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775

pandora_console/include/functions_events.php

@@ -4615,7 +4615,7 @@ function events_page_comments($event, $ajax=false)
                     foreach ($comm as $c) {
                         $data[0] = '<b>'.$c['action'].' by '.$c['id_user'].'</b>';
                         $data[0] .= '<br><br><i>'.date($config['date_format'], $c['utimestamp']).'</i>';
-                        $data[1] = $c['comment'];
+                        $data[1] = '<p style="word-break: break-word;">'.$c['comment'].'</p>';
                         $table_comments->data[] = $data;
                     }
                 }

pandora_console/include/functions_ui.php

@@ -5655,3 +5655,63 @@ function ui_print_breadcrums($tab_name)
 
     return $section;
 }
+
+
+/**
+ * Show last comment
+ *
+ * @param array $comments array with comments
+ *
+ * @return string  HTML string with the last comment of the events.
+ */
+function ui_print_comments($comments)
+{
+    global $config;
+
+    $comments = explode('<br>', $comments);
+    $comments = str_replace(["\n", '&#x0a;'], '<br>', $comments);
+    if (is_array($comments)) {
+        foreach ($comments as $comm) {
+            if (empty($comm)) {
+                continue;
+            }
+
+            $comments_array[] = json_decode(io_safe_output($comm), true);
+        }
+    }
+
+    foreach ($comments_array as $comm) {
+        // Show the comments more recent first.
+        if (is_array($comm)) {
+            $last_comment[] = array_reverse($comm);
+        }
+    }
+
+    // Only show the last comment. If commment its too long,the comment will short with ...
+    // If $config['prominent_time'] is timestamp the date show Month, day, hour and minutes.
+    // Else show comments hours ago
+    
+    if ($last_comment[0][0]['action'] != 'Added comment'){
+        $last_comment[0][0]['comment'] = $last_comment[0][0]['action'];
+    }
+    
+    $short_comment = substr($last_comment[0][0]['comment'], 0, '80px');
+    if ($config['prominent_time'] == 'timestamp') {
+        $comentario = '<i>'.date($config['date_format'], $last_comment[0][0]['utimestamp']).'&nbsp;('.$last_comment[0][0]['id_user'].'):&nbsp;'.$last_comment[0][0]['comment'].'';
+
+        if (strlen($comentario) > '200px') {
+            $comentario = '<i>'.date($config['date_format'], $last_comment[0][0]['utimestamp']).'&nbsp;('.$last_comment[0][0]['id_user'].'):&nbsp;'.$short_comment.'...';
+        }
+    } else {
+        $rest_time = (time() - $last_comment[0][0]['utimestamp']);
+        $time_last = (($rest_time / 60) / 60);
+        $comentario = '<i>'.number_format($time_last, 0).'&nbsp; Hours &nbsp;('.$last_comment[0][0]['id_user'].'):&nbsp;'.$last_comment[0][0]['comment'].'';
+
+        if (strlen($comentario) > '200px') {
+            $comentario = '<i>'.number_format($time_last, 0).'&nbsp; Hours &nbsp;('.$last_comment[0][0]['id_user'].'):&nbsp;'.$short_comment.'...';
+        }
+    }
+
+    return io_safe_output($comentario);
+
+}

pandora_console/include/javascript/pandora_events.js

@@ -63,6 +63,20 @@ function show_event_dialog(event, dialog_page, result) {
           height: 600
         })
         .show();
+      $.post({
+        url: "ajax.php",
+        data: {
+          page: "include/ajax/events",
+          get_comments: 1,
+          event: event,
+          filter: values
+        },
+        dataType: "html",
+        success: function(data) {
+          $("#extended_event_comments_page").empty();
+          $("#extended_event_comments_page").html(data);
+        }
+      });
 
       $("#refrcounter").countdown("pause");
       $("div.vc-countdown").countdown("pause");

pandora_console/operation/events/events.php

@@ -289,6 +289,10 @@ if (is_ajax()) {
                             $tmp->module_name = io_safe_output($tmp->module_name);
                         }
 
+                        if ($tmp->comments) {
+                            $tmp->comments = ui_print_comments($tmp->comments);
+                        }
+
                         $tmp->agent_name = io_safe_output($tmp->agent_name);
                         $tmp->ack_utimestamp = ui_print_timestamp(
                             $tmp->ack_utimestamp,
@@ -1594,6 +1598,17 @@ function process_datatables_callback(table, settings) {
 
 function process_datatables_item(item) {
 
+    // Show comments events.
+    item.user_comment = item.comments
+  
+    if(item.comments.length > 80){
+
+    item.user_comment += '&nbsp;&nbsp;<a id="show_comments" href="javascript:" onclick="show_event_dialog(\'';
+    item.user_comment += item.b64+"','comments'," + $("#group_rep").val()+');">';
+    item.user_comment += '<?php echo html_print_image('images/eye.png', true, ['title' => __('Show more')]); ?></a>';
+    
+    }
+ 
     // Grouped events.
     if(item.max_id_evento) {
         item.id_evento = item.max_id_evento