Issue techjoomla#48 chore: Log Email details in DB table - Tj Notific…

…ation
punambaravkar · Jun 28, 2019 · ef61de7 · ef61de7
1 parent f077d79
commit ef61de7
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 55 deletions.
diff --git a/src/com_tjnotifications/admin/sql/install.mysql.utf8.sql b/src/com_tjnotifications/admin/sql/install.mysql.utf8.sql
@@ -66,6 +66,9 @@ CREATE TABLE IF NOT EXISTS `#__tjnotification_logs` (
   `date` date NOT NULL,
   `state` int(11) NOT NULL,
   `params` text NOT NULL,
+  `priority`int(11) NOT NULL,
+  `message` text NOT NULL,
+  `category` text NOT NULL,
   PRIMARY KEY (`id`)
 )
  DEFAULT CHARSET=utf8

diff --git a/src/com_tjnotifications/admin/sql/updates/mysql/1.1.0.sql b/src/com_tjnotifications/admin/sql/updates/mysql/1.1.0.sql
@@ -16,7 +16,11 @@ CREATE TABLE IF NOT EXISTS `#__tjnotification_logs` (
   `date` date NOT NULL,
   `state` int(11) NOT NULL,
   `params` text NOT NULL,
+  `priority`int(11) NOT NULL,
+  `message` text NOT NULL,
+  `category` text NOT NULL,
   PRIMARY KEY (`id`)
 )
  DEFAULT CHARSET=utf8
  AUTO_INCREMENT=0 ;
+
diff --git a/src/com_tjnotifications/admin/views/logs/tmpl/body.php b/src/com_tjnotifications/admin/views/logs/tmpl/body.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package    Com_Tjnotifications
+ * @copyright  Copyright (c) 2009-2019 TechJoomla. All rights reserved.
+ * @license    GNU General Public License version 2 or later.
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Factory;
+
+$jinput  = Factory::getApplication()->input;
+$logId = $jinput->get('id', 0, 'INT');
+
+if($logId)
+{
+	Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');
+	$logTable = Table::getInstance('Log', 'TjnotificationsTable');
+	$logTable->load(array('id' => $logId));
+}
+?>
+	<div>
+	<h4 class="modal-title"><?php echo
+	JText::_("COM_TJNOTIFICATIONS_FIELD_EMAIL_BODY_LABEL");
+	  ?></h4>
+	</div>
+	<div class="col-xs-12">
+	 <p><?php echo $logTable->body; ?>
+	</p>
+	</div>
+	</div>
diff --git a/src/com_tjnotifications/admin/views/logs/tmpl/default.php b/src/com_tjnotifications/admin/views/logs/tmpl/default.php
@@ -41,7 +41,6 @@
 		<div id="j-main-container">
 	<?php endif;?>
 
-
 <?php
 echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => 1,'filtersHidden' => 0)));?>
 
@@ -117,7 +116,7 @@
 									?>
 									</td>
 									<td class="">
-										<a id="modal_info" class="modal" href="<?php echo JRoute::_('index.php?option=com_tjnotifications&tmpl=component&subject=true&view=logs&layout=popup&id='. $row->id); ?>"><?php echo htmlspecialchars($row->subject, ENT_COMPAT, 'UTF-8'); ?></a>
+										<a id="modal_info" class="modal" href="<?php echo JRoute::_('index.php?option=com_tjnotifications&tmpl=component&view=logs&layout=body&id='. $row->id); ?>"><?php echo htmlspecialchars($row->subject, ENT_COMPAT, 'UTF-8'); ?></a>
 
 									<td class="center">
 											<?php echo htmlspecialchars($row->to, ENT_COMPAT, 'UTF-8'); ?>
@@ -149,9 +148,15 @@
 									<td class="center">
 											<?php echo htmlspecialchars($row->from, ENT_COMPAT, 'UTF-8'); ?>
 									</td>
-									<td class="">
-									<a id="modal_info" class="modal" href="<?php echo JRoute::_('index.php?option=com_tjnotifications&tmpl=component&view=logs&layout=popup&id='. $row->id); ?>"><?php echo JText::_("COM_TJNOTIFICATIONS_VIEW_PARAMS_POPUP");?></a>
+									<td class="center">
+									<?php if(!empty($row->params)){ ?>
+									<a id="modal_info" class="modal" href="<?php echo JRoute::_('index.php?option=com_tjnotifications&tmpl=component&view=logs&layout=param&id='. $row->id); ?>"><?php echo JText::_("COM_TJNOTIFICATIONS_VIEW_PARAMS_POPUP");?></a>
 									</a>
+									<?php }
+									else
+									{
+										echo JText::_('COM_TJNOTIFICATIONS_EMPTY_PARAMS');
+									}?>
 									</td>
 									</tr>
 							<?php endforeach; ?>

diff --git a/src/com_tjnotifications/admin/views/logs/tmpl/param.php b/src/com_tjnotifications/admin/views/logs/tmpl/param.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package    Com_Tjnotifications
+ * @copyright  Copyright (c) 2009-2019 TechJoomla. All rights reserved.
+ * @license    GNU General Public License version 2 or later.
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Factory;
+
+$jinput  = Factory::getApplication()->input;
+$logId = $jinput->get('id', 0, 'INT');
+
+if($logId)
+{
+	Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');
+	$logTable = Table::getInstance('Log', 'TjnotificationsTable');
+	$logTable->load(array('id' => $logId));
+}
+?>
+	<div>
+	<h4 class="modal-title"><?php echo
+	JText::_("COM_TJNOTIFICATIONS_VIEW_PARAMS_POPUP");
+	  ?></h4>
+	</div>
+	<div class="col-xs-12">
+	 <p><?php echo $logTable->params; ?>
+	</p>
+	</div>
+	</div>
diff --git a/src/com_tjnotifications/admin/views/logs/tmpl/popup.php b/src/com_tjnotifications/admin/views/logs/tmpl/popup.php
diff --git a/src/com_tjnotifications/admin/views/logs/view.html.php b/src/com_tjnotifications/admin/views/logs/view.html.php
@@ -8,6 +8,7 @@
 
 defined('_JEXEC') or die;
 jimport('joomla.application.component.view');
+JLoader::register('TjnotificationsHelper', JPATH_ADMINISTRATOR . '/components/com_tjnotifications/helpers/tjnotifications.php');
 use Joomla\CMS\MVC\View\HtmlView;
 
 /**
@@ -61,7 +62,7 @@ protected function addToolBar()
 
 		if ($this->canDo->get('core.export'))
 		{
-			// Adding techjoomla library for csv Export
+			// adding techjoomla library for csv Export
 			jimport('techjoomla.tjtoolbar.button.csvexport');
 
 			$bar = JToolBar::getInstance('toolbar');