diff --git a/tjreports/administrator/assets/js/tjreports.js b/tjreports/administrator/assets/js/tjreports.js index 85e26b8..088a0df 100755 --- a/tjreports/administrator/assets/js/tjreports.js +++ b/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; } diff --git a/tjreports/administrator/controllers/reports.php b/tjreports/administrator/controllers/reports.php new file mode 100644 index 0000000..9f089b8 --- /dev/null +++ b/tjreports/administrator/controllers/reports.php @@ -0,0 +1,18 @@ + + * @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'); diff --git a/tjreports/administrator/tjreports.xml b/tjreports/administrator/tjreports.xml index fc9c57e..7c73f78 100755 --- a/tjreports/administrator/tjreports.xml +++ b/tjreports/administrator/tjreports.xml @@ -37,6 +37,7 @@ models controllers helpers + assets js diff --git a/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini b/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini index dd69080..2f25336 100755 --- a/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini +++ b/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" diff --git a/tjreports/languages/site/en-GB/en-GB.com_tjreports.sys.ini b/tjreports/languages/site/en-GB/en-GB.com_tjreports.sys.ini index 239de0d..13006c8 100755 --- a/tjreports/languages/site/en-GB/en-GB.com_tjreports.sys.ini +++ b/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" diff --git a/tjreports/site/assets/js/tjreports.js b/tjreports/site/assets/js/tjreports.js index 8aa2e9b..4c2f838 100644 --- a/tjreports/site/assets/js/tjreports.js +++ b/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,6 +442,12 @@ 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(''); @@ -449,10 +455,53 @@ function getReportdata(page, colToShow, limit, sortCol, sortOrder, action, allow 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("
") + .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; } diff --git a/tjreports/site/controllers/reports.php b/tjreports/site/controllers/reports.php index b405f0a..5b1eb61 100644 --- a/tjreports/site/controllers/reports.php +++ b/tjreports/site/controllers/reports.php @@ -133,15 +133,57 @@ 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); @@ -149,7 +191,7 @@ public function csvexport() 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"); diff --git a/tjreports/site/helpers/tjreports.php b/tjreports/site/helpers/tjreports.php index ed4056f..6e1a59c 100755 --- a/tjreports/site/helpers/tjreports.php +++ b/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'); } } diff --git a/tjreports/site/models/forms/tjreport.xml b/tjreports/site/models/forms/tjreport.xml index e76045f..026e2c1 100644 --- a/tjreports/site/models/forms/tjreport.xml +++ b/tjreports/site/models/forms/tjreport.xml @@ -8,7 +8,7 @@ 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); diff --git a/tjreports/site/router.php b/tjreports/site/router.php index 0847307..39f54b9 100755 --- a/tjreports/site/router.php +++ b/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)) { diff --git a/tjreports/site/views/reports/tmpl/default.php b/tjreports/site/views/reports/tmpl/default.php index fe9e153..31ee32d 100644 --- a/tjreports/site/views/reports/tmpl/default.php +++ b/tjreports/site/views/reports/tmpl/default.php @@ -32,9 +32,15 @@ $allow_permission = $user->authorise('core.viewall', 'com_tjreports.tjreport.' . $reportId); } -if(empty($report)) +// Check is there only one report present + +if (count($this->options) == 1) +{ + $document->addScriptDeclaration('var is_single_report = 1'); +} +else { - $this->items =""; + $document->addScriptDeclaration('var is_single_report = 0'); } $currentQuery = $report . '_' . $queryId; @@ -94,12 +100,12 @@ ?> -
+
-
+
@@ -117,7 +123,7 @@ " . JText::_('COM_TJREPORTS_CSV_EXPORT') . ""; endif ?> @@ -229,6 +235,10 @@ class='icon-download'>" . JText::_('COM_TJREPORTS_CSV_EXPORT') . ""; -->
+ +
+ +
@@ -267,33 +277,24 @@ function getQueryResult(id, Itemid) if (queryId=="") { - window.location.href = 'index.php?option=com_tjreports&view=reports&reportToBuild='+reportToBuild+'&client='+client+'&reportId='+reportId+"&Itemid="+Itemid; + window.location.href = '?option=com_tjreports&view=reports&reportToBuild='+reportToBuild+'&client='+client+'&reportId='+reportId+"&Itemid="+Itemid; } else { - window.location.href = 'index.php?option=com_tjreports&view=reports&savedQuery=1&reportToBuild='+queryId[0]+'&client='+client+'&queryId='+queryId[1]+'&reportId='+reportId+"&Itemid="+Itemid; + window.location.href = '?option=com_tjreports&view=reports&savedQuery=1&reportToBuild='+queryId[0]+'&client='+client+'&queryId='+queryId[1]+'&reportId='+reportId+"&Itemid="+Itemid; } } techjoomla.jQuery(document).ready(function() { - switch('') + if(is_single_report) + { + jQuery(".dropdown-list").hide(); + } + + if(reportId == 0) { - case 'userreport': - techjoomla.jQuery('#userreport').addClass('active btn-primary'); - break; - case 'studentcoursereport': - techjoomla.jQuery('#studentcoursereport').addClass('active btn-primary'); - break; - case 'lessonreport': - techjoomla.jQuery('#lessonreport').addClass('active btn-primary'); - break; - case 'coursereport': - techjoomla.jQuery('#coursereport').addClass('active btn-primary'); - break; - case 'attemptreport': - techjoomla.jQuery('#attemptreport').addClass('active btn-primary'); - break; + loadReport(options[0]->value ?>,id ?>); } techjoomla.jQuery('.ColVis_collection input').click(function(){ diff --git a/tjreports/site/views/reports/tmpl/default.xml b/tjreports/site/views/reports/tmpl/default.xml new file mode 100644 index 0000000..61f5854 --- /dev/null +++ b/tjreports/site/views/reports/tmpl/default.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/tjreports/site/views/reports/view.html.php b/tjreports/site/views/reports/view.html.php index 6ab982c..faec027 100755 --- a/tjreports/site/views/reports/view.html.php +++ b/tjreports/site/views/reports/view.html.php @@ -39,7 +39,8 @@ class TjreportsViewReports extends JViewLegacy public function display($tpl = null) { $canDo = TjreportsHelpersTjreports::getActions(); - $user_id = JFactory::getUser()->id; + $user = JFactory::getUser(); + $user_id = $user->id; $input = JFactory::getApplication()->input; $TjreportsModelReports = new TjreportsModelReports; $app = JFactory::getApplication(); @@ -109,6 +110,15 @@ public function display($tpl = null) $param = json_decode($QueryData->param); $this->colToshow = $param->colToshow; } + // Added By komal to show default field + else + { + $model = $this->getModel(); + $colToSelect = array('colToshow'); + $QueryData = $model->getDefaultReport(); + $param = json_decode($QueryData->param); + $this->colToshow = $param->colToshow; + } $input = JFactory::getApplication()->input;