Notification

Tiago Zimmermann
1 parent 3a1848e5
Showing 7 changed files with 59 additions and 30 deletions Show diff stats
install/database/schema.sql
install/database/system_data.sql
lib/Snep/Notifications.php
modules/default/controllers/IndexController.php
modules/default/controllers/NotificationsController.php
modules/default/views/layouts/layout.phtml
modules/default/views/scripts/notifications/index.phtml
@@ -749,6 +749,7 @@ CREATE TABLE IF NOT EXISTS `core_notifications` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id_itc` int(11),
   `title` varchar(255) NOT NULL,
+  `from` varchar(128) DEFAULT "OPENS",
   `message` text NOT NULL,
   `creation_date` datetime NOT NULL,
   `read` boolean DEFAULT false,
@@ -88,4 +88,4 @@ INSERT INTO `regras_negocio` VALUES (&#39;&#39;,0,&#39;Internas - Ramal para Ramal&#39;,&#39;G:all&#39;,
 INSERT INTO `regras_negocio_actions` VALUES (1,0,'PBX_Rule_Action_CCustos'),(1,1,'PBX_Rule_Action_DiscarRamal');
 INSERT INTO `regras_negocio_actions_config` VALUES (1,0,'ccustos','9'),(1,1,'allow_voicemail','false'),(1,1,'dial_flags','twk'),(1,1,'dial_timeout','60'),(1,1,'diff_ring','false'),(1,1,'dont_overflow','false'),(1,1,'resolv_agent','false');
-INSERT INTO `core_config` (`config_module`, `config_name`, `config_value`) VALUES ('CORE', 'HOST_NOTIFICATION', 'http://api.opens.com.br:3003/notifications/last_id/');
+INSERT INTO `core_config` (`config_module`, `config_name`, `config_value`) VALUES ('CORE', 'HOST_NOTIFICATION', 'http://api.opens.com.br:3003/notifications');
@@ -174,14 +174,17 @@ class Snep_Notifications {
      * @param <string> $title
      * @param <string> $notification
      */
-    public function addNotification($title,$message,$id_itc) {
+    public function addNotification($title,$message,$id_itc,$costumer) {
         $db = Zend_Registry::get('db');
+        ($costumer == 68) ? $from = "OPENS" : $from = "INTEGRADOR";
+        
         $insert_data = array('title' => $title,
             'message' => $message,
             'id_itc' => $id_itc,
-            'creation_date' => date('Y-m-d H:i:s'));
+            'creation_date' => date('Y-m-d H:i:s'),
+            'from' => $from);
         $db->insert('core_notifications', $insert_data);
@@ -238,5 +241,19 @@ class Snep_Notifications {
         }
     }
+    /**
+     * Method to update a lastNotification
+     * @param <int> $id
+     */
+    public function updateLastNotification($id) {
+
+        $db = Zend_Registry::get('db');
+
+        $update_data = array('config_value' => $id);
+
+        $db->update("core_config", $update_data, "config_name = 'LAST_ID_NOTIFICATION'");
+
+    }
+
 }
 ?>
@@ -199,7 +199,7 @@ class IndexController extends Zend_Controller_Action {
                     $title = $this->view->translate('Welcome to Intercomunexão.');
                     $message = $this->view->translate('By registering your SNEP, you connect to the portal of Intercomunexão. Portal where you will have access to exclusive solutions, high-quality support and a constantly evolving technology. <br>Access: itc.opens.com.br');
-                    Snep_Notifications::addNotification($title,$message);
+                    Snep_Notifications::addNotification($title,$message,1,"OPENS");
                     // go to snep
                     $_SESSION['registered'] = true;
@@ -277,19 +277,22 @@ class IndexController extends Zend_Controller_Action {
             $this->view->breadcrumb = Snep_Breadcrumb::renderPath(array(
             $this->view->translate("Dashboard")));
+            $configs = Snep_Config::getConfiguration('CORE','HOST_NOTIFICATION');
+
             // get last_id_notification if exists
             $idLastNotification = Snep_Config::getConfiguration("CORE", "LAST_ID_NOTIFICATION");
             if($idLastNotification){
-                $idLastNotification = $idLastNotification["config_value"];        
+
+                $idLastNotification = $idLastNotification["config_value"];
+                $url = $configs["config_value"]."/last_id/".$idLastNotification."/UUID/".$_SESSION["uuid"];        
+            
             }else{
-                $idLastNotification = Snep_Notifications::getDateLastNotification();
-            }
-            $configs = Snep_Config::getConfiguration('CORE','HOST_NOTIFICATION');
+                $dateNotification = date("Y-m-d");
+                $url = $configs["config_value"]."/date/".$dateNotification."/UUID/".$_SESSION["uuid"];            
+            }
             // get notification in itc
-            $url = $configs["config_value"].$idLastNotification."/UUID/".$_SESSION["uuid"];
-             
             $http = curl_init($url);
             curl_setopt($http, CURLOPT_SSL_VERIFYPEER, false);
@@ -304,8 +307,23 @@ class IndexController extends Zend_Controller_Action {
                     $notifications = json_decode($http_response);
                     foreach($notifications as $item => $notification){
-                        Snep_Notifications::addNotification(utf8_decode($notification->title),utf8_decode($notification->message),$notification->id);    
+                        $lastId = $notification->id;
+
+                        Snep_Notifications::addNotification(utf8_decode($notification->title),utf8_decode($notification->message),$notification->id,$notification->id_costumer);
                     }
+                    
+                    if(isset($lastId)){
+
+                        // get last_id_notification if exists
+                        $idLastNotification = Snep_Config::getConfiguration("CORE", "LAST_ID_NOTIFICATION");
+                        if($idLastNotification){
+                            Snep_Notifications::updateLastNotification($lastId);
+                        }else{
+                            Snep_Notifications::addLastNotification($lastId);
+                        }
+                            
+                    }
+                    
                     break;
                 case 500:
@@ -314,7 +332,7 @@ class IndexController extends Zend_Controller_Action {
                         $title = $this->view->translate('Warning');
                         $message = $this->view->translate('Internal Server Error. <br> To receive notifications about new features, modules and related news Snep you must be connected to an internet network. Check your connection and try again.');
-                        Snep_Notifications::addNotification($title,$message);
+                        Snep_Notifications::addNotification($title,$message,1,"OPENS");
                     }    
                     break;
@@ -325,7 +343,7 @@ class IndexController extends Zend_Controller_Action {
                         $title = $this->view->translate('Warning');
                         $message = $this->view->translate('Error notifications.<br> To receive notifications about new features, modules and related news Snep you must be connected to an internet network. Check your connection and try again.');
-                        Snep_Notifications::addNotification($title,$message);
+                        Snep_Notifications::addNotification($title,$message,1,"OPENS");
                     }
                     break;
@@ -336,7 +354,7 @@ class IndexController extends Zend_Controller_Action {
                         $title = $this->view->translate('Warning');
                         $message = $this->view->translate("Error: Code ") . $httpcode . $this->view->translate(". Please contact the administrator for receiver notifications.");
-                        Snep_Notifications::addNotification($title,$message);
+                        Snep_Notifications::addNotification($title,$message,"OPENS");
                     }
                     break;
             }            
@@ -135,10 +135,6 @@ class NotificationsController extends Zend_Controller_Action {
             $idLastNotification = Snep_Notifications::getDateLastNotification();
-            // update last notification in config_core
-            Snep_Notifications::removeLastNotification();
-            Snep_Notifications::addLastNotification($idLastNotification);
-            
             // remove notification
             Snep_Notifications::removeNotification($id);
@@ -67,26 +67,20 @@
                     <li class="dropdown">
                         <?php $noView = Snep_Notifications::getNoView();  
+                        
                         if($noView){?>
-                            <a class="dropdown-toggle new-notification" data-toggle="dropdown" href="#"><?php echo count($noView)?>
+                            <a class="dropdown-toggle new-notification"  href="<?php echo $this->baseUrl()."/index.php/notifications?id=all";?>"><?php echo count($noView)?>
                         <?php }else{?>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                            <a class="dropdown-toggle" href="<?php echo $this->baseUrl()."/index.php/notifications?id=all" ?>" >
                         <?php } ?>
-                            <i class="fa fa-envelope fa-fw"></i>  <i class="fa fa-caret-down"></i>
+                            <i class="fa fa-envelope fa-fw"></i> 
                         </a>
-                        <ul class="dropdown-menu dropdown-messages">
-
-                            <?php 
-                                echo Snep_Notifications::getNotifications($this->baseUrl());     
-                            ?>
-                           
-                            
-                        </ul>
+                        
                     </li>
@@ -33,6 +33,7 @@ $this-&gt;headLink()-&gt;appendStylesheet( $this-&gt;baseUrl() . &quot;/css/index.css&quot;);
                     <thead>
                         <tr>
+                            <th><?php echo $this->translate('Remetente');?></th>
                             <th><?php echo $this->translate('Notification');?></th>
                             <th data-sort-ignore="true"><?php echo $this->translate('Date');?></th>
                             <th colspan="2" class="text-center" data-sort-ignore="true"><?php echo $this->translate('Actions');?></th>
@@ -46,12 +47,14 @@ $this-&gt;headLink()-&gt;appendStylesheet( $this-&gt;baseUrl() . &quot;/css/index.css&quot;);
                             <tr>
                                 <?php if($notification['read'] == '1'){?>
-                                
+                                    
+                                    <td> <?php echo $notification['from'] ?> </td>
                                     <td> <?php echo $notification['title'] ." - ". substr($notification['message'], 0,60)."..." ?> </td>
                                     <td> <?php echo date("d/m/Y G:i:s", strtotime($notification['creation_date'])) ?> </td>    
                                 <?php }else{?>
+                                    <td class="bold"> <?php echo $notification['from'] ?> </td>
                                     <td class="bold"> <?php echo $notification['title'] ." - ". substr($notification['message'], 0,60)."..." ?> </td>
                                     <td class="bold"> <?php echo date("d/m/Y G:i:s", strtotime($notification['creation_date'])) ?> </td>
	@@ -88,4 +88,4 @@ INSERT INTO `regras_negocio` VALUES ('',0,'Internas - Ramal para Ramal','G:all',		@@ -88,4 +88,4 @@ INSERT INTO `regras_negocio` VALUES ('',0,'Internas - Ramal para Ramal','G:all',
88	INSERT INTO `regras_negocio_actions` VALUES (1,0,'PBX_Rule_Action_CCustos'),(1,1,'PBX_Rule_Action_DiscarRamal');	88	INSERT INTO `regras_negocio_actions` VALUES (1,0,'PBX_Rule_Action_CCustos'),(1,1,'PBX_Rule_Action_DiscarRamal');
89	INSERT INTO `regras_negocio_actions_config` VALUES (1,0,'ccustos','9'),(1,1,'allow_voicemail','false'),(1,1,'dial_flags','twk'),(1,1,'dial_timeout','60'),(1,1,'diff_ring','false'),(1,1,'dont_overflow','false'),(1,1,'resolv_agent','false');	89	INSERT INTO `regras_negocio_actions_config` VALUES (1,0,'ccustos','9'),(1,1,'allow_voicemail','false'),(1,1,'dial_flags','twk'),(1,1,'dial_timeout','60'),(1,1,'diff_ring','false'),(1,1,'dont_overflow','false'),(1,1,'resolv_agent','false');
90		90
91	-INSERT INTO `core_config` (`config_module`, `config_name`, `config_value`) VALUES ('CORE', 'HOST_NOTIFICATION', 'http://api.opens.com.br:3003/notifications/last_id/');	91	+INSERT INTO `core_config` (`config_module`, `config_name`, `config_value`) VALUES ('CORE', 'HOST_NOTIFICATION', 'http://api.opens.com.br:3003/notifications');