Merge branch Dev into master

tjreports/administrator/assets/js/tjreports.js

@@ -402,7 +402,7 @@ function getReportdata(page, colToShow, limit, sortCol, sortOrder, action)
 		{
 			if (isNaN(filterValue))
 			{
-				var msg = Joomla.JText._('COM_TJLMS_NO_NEGATIVE_NUMBER');
+				var msg = Joomla.JText._('COM_TJREPORTS_NO_NEGATIVE_NUMBER');
 				alert(msg);
 
 				return false;
@@ -498,7 +498,7 @@ function getFilterdata(page, event, action, sortCol, sortOrder)
 	}
 
 	if (colToShow.length === 0) {
-		msg = Joomla.JText._('COM_TJLMS_REPORTS_CANNOT_SELECT_NONE');
+		msg = Joomla.JText._('COM_TJREPORTS_REPORTS_CANNOT_SELECT_NONE');
 		alert(msg);
 		return false;
 	}

tjreports/administrator/controllers/reports.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @version    SVN: <svn_id>
+ * @package    Com_Reports
+ * @copyright  Copyright (C) 2005 - 2014. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * Shika is free software. This version may have been modified pursuant
+ * to the GNU General Public License, and as distributed it includes or
+ * is derivative of works licensed under the GNU General Public License or
+ * other free or open source software licenses.
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+jimport('joomla.application.component.controlleradmin');
+
+// Load frontend venues model
+Loader::import('com_tjreports.controllers.reports', JPATH_SITE . '/components');

tjreports/administrator/tjreports.xml

@@ -37,6 +37,7 @@
         <folder>models</folder>
         <folder>controllers</folder>
         <folder>helpers</folder>
+        <folder>assets</folder>
     </files>
     <media destination="com_tjreports" folder="media">
         <folder>js</folder>

tjreports/languages/site/en-GB/en-GB.com_tjreports.ini

@@ -37,6 +37,7 @@ COM_TJREPORTS_REPORT_TIMESPENT="Time Spent"
 COM_TJREPORTS_REPORTS_CANNOT_SELECT_NONE="You need to keep at-least 1 column"
 COM_TJREPORTS_SAVE_THIS_QUERY="Want to save this?"
 COM_TJREPORTS_HIDE_SHOW_COL_BUTTON="Hide and show columns"
+COM_TJREPORTS_NO_NEGATIVE_NUMBER="You can only enter positive integers"
 
 ;new
 COM_TJREPORTST_FILTER_SEARCH_DESC_MENROLLMENT="Search by name, username"
@@ -85,3 +86,7 @@ COM_TJREPORTS_FORM_OPT_COURSE_CERTIFICATE_TERM_COMPALL="Complete all Lessons"
 COM_TJREPORTS_FORM_OPT_COURSE_CERTIFICATE_TERM_PASSALL="Pass all Lessons"
 
 COM_TJREPORTS_CSV_EXPORT="CSV Export"
+
+;tjreport form
+COM_TJREPORTS_FORM_LBL_PLUGIN_NAME="Plugin Name"
+COM_TJREPORTS_FORM_LBL_URL_SLUG="URL slug"

tjreports/languages/site/en-GB/en-GB.com_tjreports.sys.ini

@@ -1,3 +1,6 @@
 COM_TJREPORTS="Tjreports"
 COM_TJREPORTS_XML_DESCRIPTION="This component is used to access all the report at single place."
 COM_TJREPORTS_FORM_LBL_REPORT_PERMISSIONS="Permissions"
+COM_TJREPORTS_TITLE_TJREPORTS="Tjreports"
+COM_TJREPORTS_DEFAULT_REPORTS="Enter Client Name"
+COM_TJREPORT_DEFAULT_REPORTS_DESC="Enter comma seperated client name for displaying reports on frontend"

tjreports/site/assets/js/tjreports.js

@@ -402,7 +402,7 @@ function getReportdata(page, colToShow, limit, sortCol, sortOrder, action, allow
 		{
 			if (isNaN(filterValue))
 			{
-				var msg = Joomla.JText._('COM_TJLMS_NO_NEGATIVE_NUMBER');
+				var msg = Joomla.JText._('COM_TJREPORTS_NO_NEGATIVE_NUMBER');
 				alert(msg);
 
 				return false;
@@ -442,17 +442,66 @@ function getReportdata(page, colToShow, limit, sortCol, sortOrder, action, allow
 		type: "POST",
 		dataType: "json",
 		data:{filterValue:filter, filterName:filterTitle, limit:limit, page:page, colToShow:colToShow, sortCol:sortCol, sortOrder:sortOrder,action:action,reportToBuild:reportToBuild,allow_permission:allow_permission,reportId:reportId},
+		beforeSend: function(){
+			loadingreportImage("report-containing-div", 0);
+		},
+		complete: function(){
+			hideImage();
+		},
 		success: function(data)
 		{
 			techjoomla.jQuery('#report-containing-div').html('');
 			techjoomla.jQuery('.user-report').remove();
 			techjoomla.jQuery('#report-containing-div').html(data.html);
 			techjoomla.jQuery('#totalRows').val(data.total_rows);
 			getPaginationBar(action, data.total_rows);
+
+			// Trigger chosen for select
+			jQuery("select").chosen();
 		}
 	});
 }
 
+
+/* Function to load the loading image. */
+function loadingreportImage(divId, captureWholeScreen)
+{
+	if (typeof(captureWholeScreen)==='undefined')
+	{
+	  captureWholeScreen = 0;
+	}
+	if(captureWholeScreen == 1)
+	{
+		imgwidth = techjoomla.jQuery(document).width();
+		imgheight = techjoomla.jQuery(document).height();
+	}
+	else
+	{
+		imgwidth = techjoomla.jQuery('#'+divId).width();
+		imgheight = techjoomla.jQuery('#'+divId).height();
+	}
+
+	techjoomla.jQuery("<div id='appsloading'></div>")
+	.css("background", "rgba(0, 0, 0, 0.2) url('"+site_root+"/components/com_tjlms/assets/images/ajax.gif') 50% 100px no-repeat")
+	//.css("top", techjoomla.jQuery('#'+divId).position().top - techjoomla.jQuery('#'+divId).scrollTop())
+	.css("top", 0)
+	.css("bottom", 0)
+	.css("left", 0)
+	.css("right", 0)
+	.css("position", "absolute")
+	.css("z-index", "1000")
+	.css("opacity", "1")
+	.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
+	.css("filter", "alpha(opacity = 80)")
+	.appendTo('#'+divId);
+}
+
+/* Function to close the loading image. */
+function hideImage()
+{
+	techjoomla.jQuery('#appsloading').remove();
+}
+
 function getFilterdata(page, event, action, sortCol, sortOrder)
 {
 	allow_permission = techjoomla.jQuery('#allow_permission').val();
@@ -490,7 +539,7 @@ function getFilterdata(page, event, action, sortCol, sortOrder)
 	}
 
 	if (colToShow.length === 0) {
-		msg = Joomla.JText._('COM_TJLMS_REPORTS_CANNOT_SELECT_NONE');
+		msg = Joomla.JText._('COM_TJREPORTS_REPORTS_CANNOT_SELECT_NONE');
 		alert(msg);
 		return false;
 	}

tjreports/site/controllers/reports.php

@@ -133,23 +133,65 @@ public function csvexport()
 
 		$data = $data[0];
 
+		foreach ($data['items'] as $key => $item)
+		{
+			foreach ($item as $item_key => $item_value)
+			{
+				$variable = strip_tags($item_value);
+
+				if ($variable != $item_value)
+				{
+					$parsedXml = new SimpleXMLElement($item_value);
+
+					if (!empty($parsedXml['href']))
+					{
+						$parsedUrl = parse_url($parsedXml['href']);
+
+						if (empty($parsedUrl['host']))
+						{
+							$root = rtrim(JURI::root(), "/");
+							$parsedXml['href'] = $root . "" . $parsedXml['href'];
+						}
+
+						$item_value = $variable . " | " . $parsedXml['href'];
+					}
+				}
+
+				$data['items'][$key]->$item_key = preg_replace('/[ ,]+/', ' ', $item_value);
+			}
+		}
+
 		$csvData     = null;
 		$csvData_arr = array();
 
 		foreach ($data['colToshow'] as $eachColumn)
 		{
-			$calHeading    = strtoupper($eachColumn);
+			// Remove double Quotes from the data
+			$eachColumn       = str_replace('"', '', $eachColumn);
+
+			// Remove single Quotes from the data
+			$eachColumn       = str_replace("'", '', $eachColumn);
+
+			// Remove tabs and newlines from the data
+			$eachColumn2      = preg_replace('/(\r\n|\r|\n)+/', " ", $eachColumn);
+
+			// Remove extra spaces from the data
+			$final_eachColumn = preg_replace('/\s+/', " ", $eachColumn2);
+
+			// Add data in the Quotes and asign it in the csv array
+			// $csvData_arr1[] = '"' . $final_eachColumn . '"';
+			$calHeading    = strtoupper($final_eachColumn);
 			$plgReport     = strtoupper($reportName);
 			$calHeading    = 'PLG_TJREPORTS_' . $plgReport . '_' . $calHeading;
-			$csvData_arr[] = JText::_($calHeading);
+			$csvData_arr[] = '"' . JText::_($calHeading) . '"';
 		}
 
 		$csvData .= implode(',', $csvData_arr);
 		$csvData .= "\n";
 		echo $csvData;
 
 		$csvData  = '';
-		$filename = "tjreports_" . $reportName . "_report_" . date("Y-m-d_H-i", time());
+		$filename = $reportName . "_report_" . date("Y-m-d_H-i", time());
 
 		// Set CSV headers
 		header("Content-type: text/csv");

tjreports/site/helpers/tjreports.php

@@ -115,31 +115,31 @@ public function getDateInLocal($date)
 	 */
 	public static function getLanguageConstant()
 	{
-		JText::script('COM_TJLMS_NO_OF_ATTEMPT_VALIDATION_MSG');
-		JText::script('COM_TJLMS_MAX_ATTEMPT_VALIDATION_MSG1');
-		JText::script('COM_TJLMS_MAX_ATTEMPT_VALIDATION_MSG2');
-		JText::script('COM_TJLMS_EMPTY_TITLE_ISSUE');
-		JText::script('COM_TJLMS_COURSE_DURATION_VALIDATION');
-		JText::script('COM_TJLMS_LESSON_UPDATED_SUCCESSFULLY');
-		JText::script('COM_TJLMS_MODULE_PUBLISHED_SUCCESSFULLY');
-		JText::script('COM_TJLMS_MODULE_UNPUBLISHED_SUCCESSFULLY');
-		JText::script('COM_TJLMS_REPORTS_CANNOT_SELECT_NONE');
-		JText::script('COM_TJLMS_ENTER_NUMERNIC_MARKS');
-		JText::script('COM_TJLMS_NO_NEGATIVE_NUMBER');
-		JText::script('COM_TJLMS_UPDATED_MARKS_SUCCESSFULLY');
-		JText::script('COM_TJLMS_ENTER_MARKS_GRT_TOTALMARKS');
-		JText::script('COM_TJLMS_END_DATE_CANTBE_GRT_TODAY');
-		JText::script('COM_TJLMS_SURE_PAID_TO_FREE');
+		JText::script('COM_TJREPORTS_NO_OF_ATTEMPT_VALIDATION_MSG');
+		JText::script('COM_TJREPORTS_MAX_ATTEMPT_VALIDATION_MSG1');
+		JText::script('COM_TJREPORTS_MAX_ATTEMPT_VALIDATION_MSG2');
+		JText::script('COM_TJREPORTS_EMPTY_TITLE_ISSUE');
+		JText::script('COM_TJREPORTS_COURSE_DURATION_VALIDATION');
+		JText::script('COM_TJREPORTS_LESSON_UPDATED_SUCCESSFULLY');
+		JText::script('COM_TJREPORTS_MODULE_PUBLISHED_SUCCESSFULLY');
+		JText::script('COM_TJREPORTS_MODULE_UNPUBLISHED_SUCCESSFULLY');
+		JText::script('COM_TJREPORTS_REPORTS_CANNOT_SELECT_NONE');
+		JText::script('COM_TJREPORTS_ENTER_NUMERNIC_MARKS');
+		JText::script('COM_TJREPORTS_NO_NEGATIVE_NUMBER');
+		JText::script('COM_TJREPORTS_UPDATED_MARKS_SUCCESSFULLY');
+		JText::script('COM_TJREPORTS_ENTER_MARKS_GRT_TOTALMARKS');
+		JText::script('COM_TJREPORTS_END_DATE_CANTBE_GRT_TODAY');
+		JText::script('COM_TJREPORTS_SURE_PAID_TO_FREE');
 
 		// For date valiation
-		JText::script('COM_TJLMS_DATE_VALIDATION_MONTH_INCORRECT');
-		JText::script('COM_TJLMS_DATE_VALIDATION_DATE_INCORRECT');
-		JText::script('COM_TJLMS_DATE_VALIDATION');
-		JText::script('COM_TJLMS_DATE_VALIDATION_DATE_RANGE');
-		JText::script('COM_TJLMS_DATE_RANGE_VALIDATION');
-		JText::script('COM_TJLMS_DATE_TIME_VALIDATION');
-		JText::script('COM_TJLMS_COUPON_DATE_VALIDATION');
-		JText::script('COM_TJLMS_DASHBOARD_DATE_RANGE_VALIDATION');
-		JText::script('COM_TJLMS_CLOSE_PREVIEW_LESSON');
+		JText::script('COM_TJREPORTS_DATE_VALIDATION_MONTH_INCORRECT');
+		JText::script('COM_TJREPORTS_DATE_VALIDATION_DATE_INCORRECT');
+		JText::script('COM_TJREPORTS_DATE_VALIDATION');
+		JText::script('COM_TJREPORTS_DATE_VALIDATION_DATE_RANGE');
+		JText::script('COM_TJREPORTS_DATE_RANGE_VALIDATION');
+		JText::script('COM_TJREPORTS_DATE_TIME_VALIDATION');
+		JText::script('COM_TJREPORTS_COUPON_DATE_VALIDATION');
+		JText::script('COM_TJREPORTS_DASHBOARD_DATE_RANGE_VALIDATION');
+		JText::script('COM_TJREPORTS_CLOSE_PREVIEW_LESSON');
 	}
 }

tjreports/site/models/forms/tjreport.xml

@@ -8,15 +8,15 @@
 		<field
 				name="title"
 				type="text"
-				label="Plugin Name"
+				label="COM_TJREPORTS_FORM_LBL_PLUGIN_NAME"
 				size="40"
 				class="inputbox"
 				default=""
 				/>
 		<field
 				name="alias"
 				type="text"
-				label="URL slug"
+				label="COM_TJREPORTS_FORM_LBL_URL_SLUG"
 				size="40"
 				class="inputbox"
 				default=""

tjreports/site/models/reports.php

@@ -103,7 +103,10 @@ public function getData($filters = array(), $colNames = array(), $rowsTofetch =
 
 		if (empty($colNames))
 		{
-			$colNames = $this->getColNames();
+			// Get all column name for default report
+			$configcolNames = (array) $this->getconfigColNames();
+
+			$colNames = (array) ($configcolNames['colToshow']);
 		}
 
 		$this->setAllUserPreference($reportName, $sortCol, $sortOrder, $colNames, $filters);
@@ -199,9 +202,10 @@ public function getColNames()
 
 		$colNames  = array_intersect($plugcolNames[0], $confirgcols);
 
-		if (!empty($colNames))
+		// Change By komal to show default field
+		if (!empty($plugcolNames[0]))
 		{
-			return $colNames;
+			return $plugcolNames[0];
 		}
 
 		return false;
@@ -336,6 +340,39 @@ public function getQueryData($queryId)
 		return $queryData;
 	}
 
+	/**
+	 * By komal to show default field
+	 * Get all Default fields names
+	 *
+	 * @return    object
+	 *
+	 * @since    1.0
+	 */
+	public function getDefaultReport()
+	{
+		$input = JFactory::getApplication()->input;
+		$reportName = $input->get('reportToBuild', '', 'STRING');
+
+		if (empty($reportName))
+		{
+			$mainframe  = JFactory::getApplication();
+			$reportName = $mainframe->getUserState('com_tjreports' . '.reportName', '');
+		}
+
+		$db        = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select('*');
+		$query->from($db->quoteName('#__tj_reports', 'tjr'));
+		$query->where($db->quoteName('tjr.plugin') . ' = ' . $db->quote($reportName));
+		$query->where($db->quoteName('tjr.default') . ' = ' . 1);
+		$query->where($db->quoteName('tjr.userid') . ' = ' . 0);
+		$query->where($db->quoteName('tjr.parent') . ' = ' . 0);
+		$db->setQuery($query);
+		$queryData = $db->loadObject();
+
+		return $queryData;
+	}
+
 	/**
 	 * Get all plugins names
 	 *
@@ -379,6 +416,9 @@ public function getCourseFilter($created_by)
 			$query->where('created_by=' . $created_by);
 		}
 
+		$query->where($db->qn('state') . '=' . 1);
+		$query->order('title ASC');
+
 		$db->setQuery($query);
 		$courses = $db->loadObjectList();
 
@@ -484,6 +524,7 @@ public function getCatFilter()
 		$query->from('#__categories');
 		$query->where('extension="com_tjlms"');
 		$query->where('published=1');
+		$query->order('title ASC');
 
 		$db->setQuery($query);
 		$cats = $db->loadObjectList();
@@ -541,8 +582,6 @@ public function getreportoptions()
 		$db->setQuery($query);
 		$reports = $db->loadObjectList();
 
-		$options[] = JHTML::_('select.option', '', JText::_('COM_TJREPORTS_SELONE_REPORTS'));
-
 		foreach ($reports as $repo)
 		{
 			$options[] = JHtml::_('select.option', $repo->value, $repo->text);

tjreports/site/router.php

@@ -85,7 +85,6 @@ public function parse(&$segments)
 
 		// View is always the first element of the array
 		$vars['view'] = array_shift($segments);
-		$model        = TjreportsHelpersTjreports::getModel($vars['view']);
 
 		while (!empty($segments))
 		{