Refactored notifications for object detail view

modules/monitoring/application/views/scripts/show/components/notifications.phtml

@@ -0,0 +1,35 @@
+<?php
+
+// We are not interested in notifications for OK or pending objects
+if (in_array((int) $object->state, array(0, 99))) {
+    return;
+}
+
+?>
+<tr>
+  <th>Notifications</th>
+  <td>
+<?php
+
+if ($object->current_notification_number > 0) {
+    if ((int) $object->current_notification_number === 1) {
+        $msg = sprintf(
+            $this->translate('A notication has been sent for this issue %s ago'),
+            $this->timeSince($object->last_notification)
+        );
+    } else {
+        $msg = sprintf(
+            $this->translate('%s notications have been sent for this issue'),
+            $object->current_notification_number
+        ) . '<br />' . sprintf(
+            'The last one occured %s ago',
+            $this->timeSince($object->last_notification)
+        );
+    }
+    echo $msg;
+} else {
+    echo $this->translate('No notification has been sent for this issue');
+}
+?>
+  </td>
+</tr>

modules/monitoring/application/views/scripts/show/components/status.phtml

@@ -47,43 +47,5 @@
                 
         </div>
 
-        <?php if ($objectState > 0): ?>
-        <?php
-            if ($object->service_description) {
-                $notificationsHref = $this->href(
-                    'monitoring/list/notifications',
-                    array(
-                        'host'      => $object->host_name,
-                        'service'   => $object->service_description
-                    )
-                    );
-            } else {
-                $notificationsHref = $this->href(
-                    'monitoring/list/notifications',
-                    array(
-                        'host'      => $object->host_name
-                    )
-                );
-            }
-        ?>
-        <div class="panel-row">
-            <div class="panel-label">
-                Last Notification
-            </div>
-            <div class="panel-content">
-                <a href="<?= $notificationsHref ?>">
-                    <?php if ($object->last_notification === '0000-00-00 00:00:00'): ?>
-                        N/A
-                    <?php else: ?>
-                        <?= $object->last_notification ?>
-                        <?php if ($object->current_notification_number > 0): ?>
-                            <br />
-                            <?= $object->current_notification_number ?> notifications sent during current problem state
-                        <?php endif ;?>
-                    <?php endif; ?>
-                </a>
-            </div>
-        </div>
-        <?php endif; ?>
     </div>
 </div>

modules/monitoring/application/views/scripts/show/host.phtml

@@ -9,6 +9,7 @@
 <table class="avp">
  <tbody>
 <?= $this->render('show/components/comments.phtml') ?>
+<?= $this->render('show/components/notifications.phtml') ?>
 <?= $this->render('show/components/downtime.phtml') ?>
 <?= $this->render('show/components/flapping.phtml') ?>
 <?= $this->render('show/components/perfdata.phtml') ?>

modules/monitoring/application/views/scripts/show/service.phtml

@@ -9,6 +9,7 @@
 <table class="avp">
  <tbody>
 <?= $this->render('show/components/comments.phtml') ?>
+<?= $this->render('show/components/notifications.phtml') ?>
 <?= $this->render('show/components/downtime.phtml') ?>
 <?= $this->render('show/components/flapping.phtml') ?>
 <?= $this->render('show/components/perfdata.phtml') ?>

modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php

@@ -79,8 +79,8 @@ class StatusQuery extends IdoQuery
             'host_attempt'                => 'hs.current_check_attempt || \'/\' || hs.max_check_attempts',
             'host_check_type' => 'hs.check_type',
             'host_state_type' => 'hs.state_type',
-            'host_last_notification' => 'hs.last_notification',
+            'host_last_notification' => 'UNIX_TIMESTAMP(hs.last_notification)',
-            'host_next_notification' => 'hs.next_notification',
+            'host_next_notification' => 'UNIX_TIMESTAMP(hs.next_notification)',
             'host_no_more_notifications' => 'hs.no_more_notifications',
             'host_problem_has_been_acknowledged' => 'hs.problem_has_been_acknowledged',
             'host_acknowledgement_type' => 'hs.acknowledgement_type',

modules/monitoring/library/Monitoring/DataView/ServiceStatus.php

@@ -71,6 +71,7 @@ class ServiceStatus extends DataView
             'service_attempt',
             'service_last_notification',
             'service_check_command',
+            'service_current_notification_number',
             'host_icon_image',
             'host_acknowledged',
             'host_output',