Issue techjoomla#145 feat: to get usergoups title based on user id

pravinTek · Jan 22, 2020 · de65050 · de65050
2 parents c93a3b0 + 6d78322
commit de65050
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 2 deletions.
diff --git a/tjreports/administrator/models/tjreport.php b/tjreports/administrator/models/tjreport.php
@@ -177,6 +177,7 @@ public function getReportPluginData($pluginId, $pluginName = null)
 			$params['filter_order']     = $plgModel->getState('list.ordering');
 			$params['filter_order_Dir'] = $plgModel->getState('list.direction');
 			$params['limit']            = $plgModel->getState('list.limit');
+			$params['emailColumn']      = $plgModel->getState('emailColumn');
 			$params['colToshow']        = $plgModel->getState('colToshow');
 			$params['colToshow']        = array_combine($params['colToshow'], array_fill(0, count($params['colToshow']), true));
 			$params['showHideColumns']  = $plgModel->showhideCols;

diff --git a/tjreports/site/assets/js/tjrContentUI.js b/tjreports/site/assets/js/tjrContentUI.js
@@ -12,6 +12,7 @@ tjrContentUI.root_url  = (typeof root_url == 'undefined') ? '' : root_url;
 tjrContentUI.base_url = (typeof root_url == 'undefined') ? '' : root_url;
 tjrContentUI.report    = tjrContentUI.report ? tjrContentUI.report : {};
 
+
 jQuery.extend(tjrContentUI.report, {
 	searchToggle: true,
 	$form: null,
@@ -28,6 +29,7 @@ jQuery.extend(tjrContentUI.report, {
 		}
 		jQuery(".hasPopover").popover('destroy')
 		var promise = tjrContentService.postData(this.url, this.$form.serialize());//, {'datatype':'html'}
+
 		promise.fail(
 			function(response) {
 				console.log('Something went wrong.');
@@ -45,6 +47,15 @@ jQuery.extend(tjrContentUI.report, {
 				var responseHTML = jQuery(response['html']).find(containerSel).html();
 				jQuery(containerSel).html(responseHTML);
 
+				// If sendEmail plug is enabled then try to add a column of checkboxes
+				if (
+				  typeof tjutilitysendemail != 'undefined' &&
+				  jQuery('body').find('.td-sendemail').length > 0
+				)
+				{
+					tjutilitysendemail.addColumn('report-table');
+				}
+
 				// Reinitialze some js like for calandar, tooltip, chosen
 				jQuery(".hasPopover").popover({"html": true,"trigger": "hover focus","container": "body"});
 

diff --git a/tjreports/site/models/reports.php b/tjreports/site/models/reports.php
@@ -15,6 +15,8 @@
 // Load TJReports db helper
 JLoader::import('database', JPATH_SITE . '/components/com_tjreports/helpers');
 
+use Joomla\CMS\Date\Date;
+
 /**
  * Methods supporting a list of Tjreports records.
  *
@@ -37,6 +39,9 @@ class TjreportsModelReports extends JModelList
 	// Columns array contain columns data
 	public $columns = array();
 
+	// Columns array contain email columns
+	private $emailColumn = '';
+
 	// Columns that a user can select to display
 	public $showhideCols = array();
 
@@ -91,6 +96,18 @@ public function __construct($config = array())
 			$this->setCustomFieldsColumns();
 		}
 
+		// Get email column
+		$this->emailColumn = array_search(
+			1,
+			array_map(
+				function ($ar)
+				{
+					return $ar['emailColumn'];
+				},
+				$this->columns
+			)
+		);
+
 		$this->initData();
 
 		parent::__construct($config);
@@ -525,6 +542,11 @@ protected function populateState($ordering = '', $direction = 'ASC')
 		$value = $input->get('limitstart', 0, 'uint');
 		$this->setState('list.start', $value);
 
+		if ($this->emailColumn)
+		{
+			$this->setState('emailColumn', $this->emailColumn);
+		}
+
 		// Ordering
 		$this->default_order = $input->get('filter_order', $this->default_order, 'STRING');
 
@@ -609,12 +631,14 @@ protected function getListQuery()
 						if (!empty($filters[$fromCol]))
 						{
 							$fromTime = $filters[$fromCol] . ' 00:00:00';
+							$fromTime = new Date($fromTime, 'UTC');
 							$query->where($dispFilter['searchin'] . ' >= ' . $db->quote($fromTime));
 						}
 
 						if (!empty($filters[$toCol]))
 						{
 							$toTime = $filters[$toCol] . ' 23:59:59';
+							$toTime = new Date($toTime, 'UTC');
 							$query->where($dispFilter['searchin'] . ' <= ' . $db->quote($toTime));
 						}
 					}
@@ -1095,6 +1119,11 @@ private function filterReportColumns($queryId, &$selColToshow)
 		{
 			$this->showhideCols = $showhideCols;
 		}
+
+		if (!empty($emailColumn))
+		{
+			$this->emailColumn = $emailColumn;
+		}
 	}
 
 	/**

diff --git a/tjreports/site/views/reports/tmpl/default.php b/tjreports/site/views/reports/tmpl/default.php
@@ -12,6 +12,8 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
+$emailColmClass = 'td-sendemail';
+
 $app             = JFactory::getApplication();
 $headerLevel     = $this->headerLevel;
 $this->listOrder = $this->state->get('list.ordering');
@@ -289,7 +291,7 @@
 
 										for($i = $headerLevel; $i > 0 ; $i--)
 										{
-											echo '<tr>';
+											echo '<tr class="report-row">';
 
 											foreach($this->colToshow as $index=>$detail)
 											{
@@ -431,7 +433,8 @@
 													}
 													else
 													{
-														echo '<td class="' . $key . '">'. $item[$key] .'</td>';
+														$isSendEmailClass = ($key == $this->emailColumn) ? $emailColmClass : '';
+														echo "<td class=\"{$key} {$isSendEmailClass} \">{$item[$key]}</td>";
 													}
 												}
 

diff --git a/tjreports/site/views/reports/view.base.php b/tjreports/site/views/reports/view.base.php
@@ -162,6 +162,7 @@ public function processData($type = 'html')
 		$this->columns         = $this->model->columns;
 		$this->showHideColumns = $this->model->showhideCols;
 		$this->sortable        = $this->model->sortableColumns;
+		$this->emailColumn     = $this->model->getState('emailColumn');
 		$this->srButton        = $this->model->showSearchResetButton;
 
 		$this->colToshow       = $this->model->getState('colToshow');