From c8715715cbeaf7a53f1ef16962e0587f4bcb3e17 Mon Sep 17 00:00:00 2001
From: MeghaBiranje <58220237+MeghaBiranje@users.noreply.github.com>
Date: Tue, 9 Mar 2021 17:04:05 +0530
Subject: [PATCH] Bug #169429 Fix: Frontend > Reports > Radio button and Export
 CSV alignment messed up (#205)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Megha Biranje <“megha_b@techjoomla.com”>
---
 tjreports/site/assets/css/tjreports.css       | 4 ++++
 tjreports/site/assets/css/tjreports.min.css   | 2 +-
 tjreports/site/assets/js/tjrContentUI.js      | 4 ++++
 tjreports/site/assets/js/tjrContentUI.min.js  | 2 +-
 tjreports/site/views/reports/tmpl/default.php | 8 ++++----
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tjreports/site/assets/css/tjreports.css b/tjreports/site/assets/css/tjreports.css
index f866afa..6427662 100755
--- a/tjreports/site/assets/css/tjreports.css
+++ b/tjreports/site/assets/css/tjreports.css
@@ -343,3 +343,7 @@ table.tjrport-table {
 .chartItems{
     margin-bottom: 30px;
 }
+.summaryReport{
+    margin-top: 0px !important;
+}
+
diff --git a/tjreports/site/assets/css/tjreports.min.css b/tjreports/site/assets/css/tjreports.min.css
index 8f9bad0..a3a0ece 100644
--- a/tjreports/site/assets/css/tjreports.min.css
+++ b/tjreports/site/assets/css/tjreports.min.css
@@ -1 +1 @@
-.other-filters{padding:0 14px}.hasPopover{display:block!important}a[disabled]{pointer-events:none}.show-hide-cols{position:relative}.ColVis_collection{list-style:none;min-width:150px;padding:8px 8px 4px 8px;margin:0;border:1px solid #ccc;border:1px solid rgba(0,0,0,.4);background-color:#f9f9f9;overflow:hidden;display:block;opacity:1;position:absolute;z-index:1}table#report-table .chzn-container{width:150px!important}ul#ul-columns-name li input{margin-top:0}ul#ul-columns-name li:hover label{background-color:#f0f0f0}ul#ul-columns-name li label{margin-bottom:0;padding-top:2px;padding-bottom:2px;cursor:pointer}div#report-containing-div{min-height:450px}div#reports-container .form-inline-header .controls{padding-right:5px}div#topFilters div.filter-search{display:inline-block;float:left;margin-right:5px}div#topFilters{margin-top:10px;float:left;width:100%}.ColVis_collection{display:none}#topFilters{display:none}#queryName{display:none}.header_title{display:inline-block}th.center:nth-child(odd){background-color:#d9edf7;border-left:1px solid #ddd}th.center:nth-child(even){background-color:#fcf8e3;border-left:1px solid #ddd}td.subdetails.lesson.attempts_done:nth-child(odd),th.subdetails.lesson.attempts_done:nth-child(odd){border-left:1px solid #ddd}table.tjrport-table{border-bottom:1px solid #ddd}#reportPagination .pagination.pagination-toolbar.clearfix{margin:0}#t3-content #report-table thead input{height:100%;max-width:120px}#t3-content #queryName{height:32px;font-size:14px}.report-top-bar{margin-top:10px}#t3-content .form-group{margin-bottom:15px}#reports-container h2{font-weight:500}#t3-mainbody #reports-container .field-calendar .tjrsmall-input{display:inline-block;height:32px!important;max-width:165px;font-size:14px}.report-tbl{min-height:450px !important;overflow-x:auto}#t3-mainbody #report-containing-div .table-responsive{margin-top:20px}#t3-content #reports-container .btn{padding:4px 12px;text-transform:none;font-size:14px}#t3-mainbody #report-table .custom-group{display:table;border-collapse:separate;margin-bottom:0}#content div.row{margin-left:0;margin-right:0}#t3-mainbody #report-table .custom-group-btn{vertical-align:baseline}.t3-content .btn-custom{color:#fff;background-color:#337ab7;border-color:#2e6da4}.t3-content .btn-custom:hover{color:#fff;background-color:#286090;border-color:#204d74}.t3-content .btn-custom:active{color:#fff;background-color:#286090;border-color:#204d74}.t3-content .btn-custom:focus{color:#fff;background-color:#286090;border-color:#204d74}.t3-content .btn-custom.active.focus,.t3-content .btn-custom.active:focus,.t3-content .btn-custom.active:hover,.t3-content .btn-custom:active.focus,.t3-content .btn-custom:active:focus,.t3-content .btn-custom:active:hover{color:#fff;background-color:#204d74;border-color:#122b40}#t3-content.chzn-container-single .chzn-single{height:32px;border-radius:0;background:no-repeat;padding-left:15px}#t3-content #report-table .chzn-container-single .chzn-single span,b{margin-top:3px}#t3-content .filter-search .chzn-container-single .chzn-single{height:32px;border-radius:0;background:no-repeat;padding-left:15px}#t3-content .filter-search .chzn-container-single .chzn-single b,#t3-content .filter-search .chzn-container-single .chzn-single span{margin-top:3px}#reports-container .ordering-select .input-group-btn,#t3-content #report-table .input-group-btn{width:0}.ordering-select a.chzn-single,.view-reports select{height:35px!important}#reports-container .input-append .field-calendar{font-size:14px}#reports-container .input-group .field-calendar .input-append,.view-reports .j-toggle-main input[type=text]{margin-bottom:0}#reports-container .filter-search .input-group-btn{border:1px solid #ccc;border-radius:0}.table-responsive.report-tbl .js-calendar{margin-top:0!important}.view-reports .chzn-container .chzn-single,.view-reports a.btn,.view-reports button,.view-reports button.btn,.view-reports input[type=button],.view-reports input[type=text],.view-reports select{height:35px;padding-top:6px!important;padding-bottom:6px!important;border-radius:0!important;box-shadow:none;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;line-height:18px!important}.view-reports #toolbar [class^=icon-]{height:28px;padding-top:5px!important}.view-reports #toolbar .export{padding-top:0!important;padding-bottom:0!important}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.show-hide-cols{margin-bottom:20px}#show-hide-cols-btn{width:100%}#queryName{margin-bottom:10px!important}.btn-csv{margin-bottom:20px}#t3-content #report-table .input-append input,#t3-content #report-table .input-append select{margin-bottom:0!important;width:auto}}@media screen and (max-width:768px){#t3-content #show-filter{margin-bottom:20px}#filterscourse_id,.ordering-select #filtersreport_filter{margin-bottom:20px}}@media (max-width:1024px) and (min-width:768px){.t3-content .row-fluid [class*=span]{margin-left:0}}.m-0{margin:0!important}.equal-height-col{display:flex;flex-wrap:wrap;margin-top:20px}.equal-height-col>.equal-items{display:flex;flex-direction:column}.tj-card{border:1px solid #f0f0f0;height:100%;-webkit-box-shadow:0 1px 4px 0 rgba(0,0,0,.3);-moz-box-shadow:0 1px 4px 0 rgba(0,0,0,.3);box-shadow:0 1px 4px 0 rgba(0,0,0,.3);border-radius:5px}.tj-card-title{border-bottom:1px solid #f0f0f0;margin:0!important;padding:15px;font-size:15px;font-weight:700}.tj-card-body{margin:15px 0}.chartItems{margin-bottom:30px}
+.other-filters{padding:0 14px}.hasPopover{display:block!important}a[disabled]{pointer-events:none}.show-hide-cols{position:relative}.ColVis_collection{list-style:none;min-width:150px;padding:8px 8px 4px 8px;margin:0;border:1px solid #ccc;border:1px solid rgba(0,0,0,.4);background-color:#f9f9f9;overflow:hidden;display:block;opacity:1;position:absolute;z-index:1}table#report-table .chzn-container{width:150px!important}ul#ul-columns-name li input{margin-top:0}ul#ul-columns-name li:hover label{background-color:#f0f0f0}ul#ul-columns-name li label{margin-bottom:0;padding-top:2px;padding-bottom:2px;cursor:pointer}div#report-containing-div{min-height:450px}div#reports-container .form-inline-header .controls{padding-right:5px}div#topFilters div.filter-search{display:inline-block;float:left;margin-right:5px}div#topFilters{margin-top:10px;float:left;width:100%}.ColVis_collection{display:none}#topFilters{display:none}#queryName{display:none}.header_title{display:inline-block}th.center:nth-child(odd){background-color:#d9edf7;border-left:1px solid #ddd}th.center:nth-child(even){background-color:#fcf8e3;border-left:1px solid #ddd}td.subdetails.lesson.attempts_done:nth-child(odd),th.subdetails.lesson.attempts_done:nth-child(odd){border-left:1px solid #ddd}table.tjrport-table{border-bottom:1px solid #ddd}#reportPagination .pagination.pagination-toolbar.clearfix{margin:0}#t3-content #report-table thead input{height:100%;max-width:120px}#t3-content #queryName{height:32px;font-size:14px}.report-top-bar{margin-top:10px}#t3-content .form-group{margin-bottom:15px}#reports-container h2{font-weight:500}#t3-mainbody #reports-container .field-calendar .tjrsmall-input{display:inline-block;height:32px!important;max-width:165px;font-size:14px}.report-tbl{min-height:450px!important;overflow-x:auto}#t3-mainbody #report-containing-div .table-responsive{margin-top:20px}#t3-content #reports-container .btn{padding:4px 12px;text-transform:none;font-size:14px}#t3-mainbody #report-table .custom-group{display:table;border-collapse:separate;margin-bottom:0}#content div.row{margin-left:0;margin-right:0}#t3-mainbody #report-table .custom-group-btn{vertical-align:baseline}.t3-content .btn-custom{color:#fff;background-color:#337ab7;border-color:#2e6da4}.t3-content .btn-custom:hover{color:#fff;background-color:#286090;border-color:#204d74}.t3-content .btn-custom:active{color:#fff;background-color:#286090;border-color:#204d74}.t3-content .btn-custom:focus{color:#fff;background-color:#286090;border-color:#204d74}.t3-content .btn-custom.active.focus,.t3-content .btn-custom.active:focus,.t3-content .btn-custom.active:hover,.t3-content .btn-custom:active.focus,.t3-content .btn-custom:active:focus,.t3-content .btn-custom:active:hover{color:#fff;background-color:#204d74;border-color:#122b40}#t3-content.chzn-container-single .chzn-single{height:32px;border-radius:0;background:no-repeat;padding-left:15px}#t3-content #report-table .chzn-container-single .chzn-single span,b{margin-top:3px}#t3-content .filter-search .chzn-container-single .chzn-single{height:32px;border-radius:0;background:no-repeat;padding-left:15px}#t3-content .filter-search .chzn-container-single .chzn-single b,#t3-content .filter-search .chzn-container-single .chzn-single span{margin-top:3px}#reports-container .ordering-select .input-group-btn,#t3-content #report-table .input-group-btn{width:0}.ordering-select a.chzn-single,.view-reports select{height:35px!important}#reports-container .input-append .field-calendar{font-size:14px}#reports-container .input-group .field-calendar .input-append,.view-reports .j-toggle-main input[type=text]{margin-bottom:0}#reports-container .filter-search .input-group-btn{border:1px solid #ccc;border-radius:0}.table-responsive.report-tbl .js-calendar{margin-top:0!important}.view-reports .chzn-container .chzn-single,.view-reports a.btn,.view-reports button,.view-reports button.btn,.view-reports input[type=button],.view-reports input[type=text],.view-reports select{height:35px;padding-top:6px!important;padding-bottom:6px!important;border-radius:0!important;box-shadow:none;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;line-height:18px!important}.view-reports #toolbar [class^=icon-]{height:28px;padding-top:5px!important}.view-reports #toolbar .export{padding-top:0!important;padding-bottom:0!important}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.show-hide-cols{margin-bottom:20px}#show-hide-cols-btn{width:100%}#queryName{margin-bottom:10px!important}.btn-csv{margin-bottom:20px}#t3-content #report-table .input-append input,#t3-content #report-table .input-append select{margin-bottom:0!important;width:auto}}@media screen and (max-width:768px){#t3-content #show-filter{margin-bottom:20px}#filterscourse_id,.ordering-select #filtersreport_filter{margin-bottom:20px}}@media (max-width:1024px) and (min-width:768px){.t3-content .row-fluid [class*=span]{margin-left:0}}.m-0{margin:0!important}.equal-height-col{display:flex;flex-wrap:wrap;margin-top:20px}.equal-height-col>.equal-items{display:flex;flex-direction:column}.tj-card{border:1px solid #f0f0f0;height:100%;-webkit-box-shadow:0 1px 4px 0 rgba(0,0,0,.3);-moz-box-shadow:0 1px 4px 0 rgba(0,0,0,.3);box-shadow:0 1px 4px 0 rgba(0,0,0,.3);border-radius:5px}.tj-card-title{border-bottom:1px solid #f0f0f0;margin:0!important;padding:15px;font-size:15px;font-weight:700}.tj-card-body{margin:15px 0}.chartItems{margin-bottom:30px}.summaryReport{margin-top:0!important}
diff --git a/tjreports/site/assets/js/tjrContentUI.js b/tjreports/site/assets/js/tjrContentUI.js
index 62e53b4..6fcc4a5 100755
--- a/tjreports/site/assets/js/tjrContentUI.js
+++ b/tjreports/site/assets/js/tjrContentUI.js
@@ -30,11 +30,15 @@ jQuery.extend(tjrContentUI.report, {
 		if (task == "summary")
 		{
 			layout = 'summary';
+			jQuery('#summaryReportLabel').addClass('btn-danger');
+			jQuery('#detailsReportLabel').removeClass('btn-success');
 			jQuery('#reportPagination').hide();
 			jQuery('#pagination').hide();
 		}
 		else
 		{
+			jQuery('#detailsReportLabel').removeClass('btn-success');
+			jQuery('#summaryReportLabel').removeClass('btn-danger');
 			jQuery('#reportPagination').show();
 			jQuery('#pagination').show();
 		}
diff --git a/tjreports/site/assets/js/tjrContentUI.min.js b/tjreports/site/assets/js/tjrContentUI.min.js
index e6796bb..b5dabfb 100644
--- a/tjreports/site/assets/js/tjrContentUI.min.js
+++ b/tjreports/site/assets/js/tjrContentUI.min.js
@@ -1 +1 @@
-if(void 0===tjrContentUI)var tjrContentUI={};tjrContentUI.root_url="undefined"==typeof root_url?"":root_url,tjrContentUI.base_url="undefined"==typeof root_url?"":root_url,tjrContentUI.report=tjrContentUI.report?tjrContentUI.report:{},jQuery.extend(tjrContentUI.report,{searchToggle:!0,$form:null,url:"index.php?option=com_tjreports&view=reports&format=json",querySaveUrl:"index.php?option=com_tjreports&format=json",submitTJRData:function(e){var t="default";if("summary"==(e=void 0===e?"default":e)?(t="summary",jQuery("#reportPagination").hide(),jQuery("#pagination").hide()):(jQuery("#reportPagination").show(),jQuery("#pagination").show()),jQuery("#reports-container .hasTooltip").tooltip("destroy"),this.searchToggle=jQuery("div#topFilters").is(":visible"),tjrContentUI.utility.loadingLayer("show"),this.$form=jQuery("#adminForm"),!this.validate())return!1;jQuery(".hasPopover").popover("destroy"),tjrContentService.postData(this.url+"&tpl="+t,this.$form.serialize()).fail(function(e){console.log("Something went wrong."),tjrContentUI.utility.loadingLayer("hide"),403==e.status&&alert(Joomla.JText._("JERROR_ALERTNOAUTHOR"))}).done(function(r){if(tjrContentUI.utility.loadingLayer("hide"),"summary"==t)jQuery("#report-containing-div").html(r.html);else{var o=jQuery(r.html).find("#j-main-container").html();jQuery("#j-main-container").html(o),"undefined"!=typeof tjutilitysendemail&&jQuery("body").find(".td-sendemail").length>0&&tjutilitysendemail.addColumn("report-table"),jQuery(".hasPopover").popover({html:!0,trigger:"hover focus",container:"body"}),"showHide"==e&&tjrContentUI.report.getColNames();var n=jQuery("#j-main-container .field-calendar");for(i=0;i<n.length;i++)JoomlaCalendar.init(n[i]);jQuery.prototype.chosen&&jQuery("#j-main-container select").chosen(),"reset"==e&&(tjrContentUI.report.searchToggle=!1),tjrContentUI.report.searchToggle&&(jQuery("#show-filter").addClass("btn-primary").find("i").removeClass("fa-caret-down").addClass("fa-caret-up"),jQuery("#topFilters").show()),jQuery(".btn-displayReport").toggleClass("active btn-success")}}).always(function(e){jQuery(".filter-hide").parents(".col-filter-header").hide(),jQuery(".filter-show").parents("th").find(".table-heading").hide()})},showFilter:function(){jQuery("#show-filter").toggleClass("btn-primary"),jQuery("#topFilters").slideToggle("1000"),jQuery("#show-filter .fa").toggleClass("fa-caret-up").toggleClass("fa-caret-down")},resetSubmitTJRData:function(e,t){t=t&&t.length?t:"#topFilters",jQuery("input:text",t).val(""),jQuery(":input",t).not(":button, :submit, :reset, input:hidden").val("").removeAttr("checked").removeAttr("selected"),tjrContentUI.report.submitTJRData(e)},validate:function(){return!0},getColNames:function(){jQuery(".ColVis_collection").toggle()},cancel:function(){jQuery("#btn-cancel").hide(),jQuery(".saveData").html("Want to save this?"),jQuery('#adminForm1 input[type="text"]').val(""),jQuery(".cancel-btn").hide(),jQuery("#queryName").val("")},saveThisQuery:function(){this.$form=jQuery("#adminForm");var e=jQuery("#queryName").is(":hidden");if(jQuery("#btn-cancel").show(),jQuery(".cancel-btn").show(),jQuery("input").css("margin-bottom","0px"),1==e)jQuery("#queryName").show(),jQuery("#saveQuery").html(Joomla.JText._("COM_TJREPORTS_SAVE_QUERY"));else{var t=jQuery("#queryName").val();if(""===t)return alert(Joomla.JText._("COM_TJREPORTS_ENTER_TITLE")),!1;jQuery("#task",this.$form).val("reports.saveQuery");var r=this.$form.serialize();jQuery("#task",this.$form).val(""),tjrContentUI.utility.loadingLayer(),tjrContentService.postData(this.querySaveUrl+"&queryName="+t,r).fail(function(e){console.log("Something went wrong."),tjrContentUI.utility.loadingLayer("hide")}).done(function(e){tjrContentUI.utility.loadingLayer("hide"),e.success?window.location.reload():console.log("Something went wrong.",e.message,e.messages)})}},deleteThisQuery:function(){this.$form=jQuery("#adminForm");jQuery("#queryName").is(":hidden");var e=jQuery("#queryId").val();if(""===e)return alert("Select Any of the query"),!1;if(deletemsg=Joomla.JText._("COM_TJREPORTS_DELETE_MESSAGE"),confirm(deletemsg)){jQuery("#task",this.$form).val("reports.deleteQuery");var t=this.$form.serialize();tjrContentUI.utility.loadingLayer(),tjrContentService.postData(this.querySaveUrl+"&queryId="+e,t).fail(function(e){console.log("Something went wrong."),tjrContentUI.utility.loadingLayer("hide")}).done(function(e){tjrContentUI.utility.loadingLayer("hide"),e.success?(tjrContentUI.utility.setJSCookie("showdeletemsg","1",1),window.location.reload()):console.log("Something went wrong.",e.message,e.messages)})}},getQueryResult:function(e){var t=tjrContentUI.base_url+"index.php?option=com_tjreports&view=reports";jQuery.each({client:"client",reportId:"reportId",queryId:"queryId"},function(e,r){var o=jQuery("#"+e).val();o&&(t+="&"+r+"="+o)}),window.location.href=t},submitForm:function(){return!!jQuery("#task").val()||(tjrContentUI.report.submitTJRData("submit"),!1)},loadReport:function(e,t){jQuery(e).val();var r=jQuery(e).find(":selected").attr("data-reportid"),o=jQuery(document.adminForm).attr("action")+"&reportId="+r;jQuery("#report-select options").attr("selected","selected"),t&&(o=o+"&client="+t),window.location.href=o},submitOnEnter:function(e){return"keydown"!=e.type||13!=e.which&&13!=e.keyCode||tjrContentUI.report.submitTJRData(),!1},attachCalSubmit:function(e){var t=JoomlaCalendar.getCalObject(e);t&&!t._joomlaCalendar.params.onUpdate&&(t._joomlaCalendar.params.onUpdate=tjrContentUI.report.submitCalForm)},submitCalForm:function(){tjrContentUI.report.submitTJRData()}}),tjrContentUI.validation=tjrContentUI.validation?tjrContentUI.validation:{},jQuery.extend(tjrContentUI.validation,{messages:{},resetInvalidField:function(e,t,r){e&&e.val(""),this.addMessage(t,r)},addMessage:function(e,t){t=t||"error",this.messages[t]=this.messages[t]?this.messages[t]:[],this.messages[t].push(e)},resetMessages:function(){Joomla.removeMessages(),this.messages={}},isValidDate:function(e){return null!=(e=e.split(" "))[0].match(/^\d{4}[-](0?[1-9]|1[012])[-](0?[1-9]|[12][0-9]|3[01])$/)},isValidCalDate:function(e,t){return void 0===Date.parseDate?this.isValidDate(date):(t||(t="%d-%m-%Y"),Date.parseDate(e,t).print(t)==e||void 0)}}),tjrContentUI.utility=tjrContentUI.utility?tjrContentUI.utility:{},jQuery.extend(tjrContentUI.utility,{getTimeStampFromDate:function(e,t){if(void 0!==Date.parseDate){t||(t="%d-%m-%Y");var r=Date.parseDate(e,t);if(r)return r.getTime()}return e},loadingLayer:function(e,t){if(e=e||"show",t=t||document.body,"load"==e){var r=document.createElement("div");r.id="loading-logo",r.style.position="fixed",r.style.top="0",r.style.left="0",r.style.width="100%",r.style.height="100%",r.style.opacity="0.8",r.style.filter="alpha(opacity=80)",r.style.overflow="hidden",r.style["z-index"]="10000",r.style.display="none",r.style["background-color"]="#fff",r.style["background-image"]='url("'+tjrContentUI.root_url+'/components/com_tjreports/assets/images/loadinfo.gif")',r.style["background-position"]="center",r.style["background-repeat"]="no-repeat",r.style["background-attachment"]="fixed",r.style["background-size"]="200px",t.appendChild(r)}else document.getElementById("loading-logo")||this.loadingLayer("load",t),document.getElementById("loading-logo").style.display="show"==e?"block":"none";return document.getElementById("loading-logo")},noScript:function(e){var t=jQuery("<div>").html(e);return t.find("script").remove(),e=t.html()},displayMessage:function(e,t,r){this.parent.validation.messages={},this.parent.validation.addMessage(e,t),this.displayMessages()},displayMessages:function(e){Joomla.removeMessages(),Joomla.renderMessages(this.parent.validation.messages),e&&jQuery("body").animate({scrollTop:jQuery("#system-message-container").offset().top},500)},setJSCookie:function(e,t,r){var o="";if(r){var n=new Date;n.setTime(n.getTime()+24*r*60*60*1e3),o="; expires="+n.toUTCString()}document.cookie=e+"="+t+o+"; path=/"},getJSCookie:function(e){for(var t=e+"=",r=document.cookie.split(";"),o=0;o<r.length;o++){for(var n=r[o];" "==n.charAt(0);)n=n.substring(1,n.length);if(0==n.indexOf(t))return n.substring(t.length,n.length)}return null},eraseJSCookie:function(e){tjrContentUI.utility.setJSCookie(e,"",-1)}}),tjrContentUI.tjreport=tjrContentUI.tjreport?tjrContentUI.tjreport:{},jQuery.extend(tjrContentUI.tjreport,{getPlugins:function(){var e=jQuery("#adminForm.tjreportForm");jQuery("#task",e).val("tjreport.getplugins");var t=tjrContentService.postData("index.php?option=com_tjreports&format=json",e.serialize());jQuery("#task",e).val(),jQuery("#jform_parent",e).find("option").not(":first").remove(),t.fail(function(e){console.log("Something went wrong."),403==e.status&&alert(Joomla.JText._("JERROR_ALERTNOAUTHOR"))}).done(function(e){if(e.success){var t=jQuery("#jform_parent");jQuery.each(e.data,function(e,r){t.append(new Option(r.text,r.value))}),tjrContentUI.tjreport.getParams()}else console.log("Something went wrong.",e.message,e.messages)})},loadSort:function(){jQuery(".col-filter-header").hide(),jQuery(document).on("click",".col-search",function(){var e=jQuery(this).parents("th");jQuery(".col-filter-header",e).show(),jQuery(".chzn-search").children("input").attr("readOnly",!1),jQuery(".table-heading",e).hide()}),jQuery(document).on("click",".close-icon",function(){var e=jQuery(this).parents("th");jQuery(".table-heading",e).show(),jQuery(".col-filter-header",e).hide(),tjrContentUI.report.resetSubmitTJRData("submit",e)})},getParams:function(e){var t="index.php?option=com_tjreports&format=json";e&&(t+="&default=1");var r=jQuery("#adminForm.tjreportForm");jQuery("#task",r).val("tjreport.getparams");var o=tjrContentService.postData(t,r.serialize());jQuery("#task",r).val(),jQuery("#jform_param",r).val(""),jQuery("#jform_plugin",r).val(""),o.fail(function(e){console.log("Something went wrong."),403==e.status&&alert(Joomla.JText._("JERROR_ALERTNOAUTHOR"))}).done(function(e){if(e.success){var t=JSON.stringify(JSON.parse(e.data.param),null,"\t");jQuery("#jform_param",r).val(t),jQuery("#jform_plugin",r).val(e.data.plugin)}else console.log("Something went wrong.",e.message,e.messages)})}}),jQuery(document).click(function(e){jQuery(e.target).closest("#ul-columns-name").length||"show-hide-cols-btn"==e.target.id||jQuery(".ColVis_collection").hide()}),jQuery(document).ready(function(){jQuery("#topFilters").hide(),jQuery("#btn-cancel").hide(),jQuery(".cancel-btn").hide(),tjrContentUI.tjreport.loadSort(),tjrContentUI.utility.getJSCookie("showdeletemsg")&&(Joomla.JText.strings.SUCCESS||(Joomla.JText.strings.SUCCESS="Success"),Joomla.renderMessages({success:[Joomla.JText._("COM_TJREPORTS_QUERY_DELETE_SUCCESS")]}),tjrContentUI.utility.eraseJSCookie("showdeletemsg")),jQuery(document).on("click",'#reports-container a[href="#"]',function(e){e.preventDefault()})}),jQuery(document).ready(function(){jQuery("#report-table").on("liszt:ready","select",function(){jQuery(this).next(".chzn-container-single-nosearch").removeClass("chzn-container-single-nosearch")})});
\ No newline at end of file
+if(void 0===tjrContentUI)var tjrContentUI={};tjrContentUI.root_url="undefined"==typeof root_url?"":root_url,tjrContentUI.base_url="undefined"==typeof root_url?"":root_url,tjrContentUI.report=tjrContentUI.report?tjrContentUI.report:{},jQuery.extend(tjrContentUI.report,{searchToggle:!0,$form:null,url:"index.php?option=com_tjreports&view=reports&format=json",querySaveUrl:"index.php?option=com_tjreports&format=json",submitTJRData:function(e){var t="default";if("summary"==(e=void 0===e?"default":e)?(t="summary",jQuery("#summaryReportLabel").addClass("btn-danger"),jQuery("#detailsReportLabel").removeClass("btn-success"),jQuery("#reportPagination").hide(),jQuery("#pagination").hide()):(jQuery("#detailsReportLabel").removeClass("btn-success"),jQuery("#summaryReportLabel").removeClass("btn-danger"),jQuery("#reportPagination").show(),jQuery("#pagination").show()),jQuery("#reports-container .hasTooltip").tooltip("destroy"),this.searchToggle=jQuery("div#topFilters").is(":visible"),tjrContentUI.utility.loadingLayer("show"),this.$form=jQuery("#adminForm"),!this.validate())return!1;jQuery(".hasPopover").popover("destroy"),tjrContentService.postData(this.url+"&tpl="+t,this.$form.serialize()).fail(function(e){console.log("Something went wrong."),tjrContentUI.utility.loadingLayer("hide"),403==e.status&&alert(Joomla.JText._("JERROR_ALERTNOAUTHOR"))}).done(function(r){if(tjrContentUI.utility.loadingLayer("hide"),"summary"==t)jQuery("#report-containing-div").html(r.html);else{var o=jQuery(r.html).find("#j-main-container").html();jQuery("#j-main-container").html(o),"undefined"!=typeof tjutilitysendemail&&jQuery("body").find(".td-sendemail").length>0&&tjutilitysendemail.addColumn("report-table"),jQuery(".hasPopover").popover({html:!0,trigger:"hover focus",container:"body"}),"showHide"==e&&tjrContentUI.report.getColNames();var n=jQuery("#j-main-container .field-calendar");for(i=0;i<n.length;i++)JoomlaCalendar.init(n[i]);jQuery.prototype.chosen&&jQuery("#j-main-container select").chosen(),"reset"==e&&(tjrContentUI.report.searchToggle=!1),tjrContentUI.report.searchToggle&&(jQuery("#show-filter").addClass("btn-primary").find("i").removeClass("fa-caret-down").addClass("fa-caret-up"),jQuery("#topFilters").show()),jQuery(".btn-displayReport").toggleClass("active btn-success")}}).always(function(e){jQuery(".filter-hide").parents(".col-filter-header").hide(),jQuery(".filter-show").parents("th").find(".table-heading").hide()})},showFilter:function(){jQuery("#show-filter").toggleClass("btn-primary"),jQuery("#topFilters").slideToggle("1000"),jQuery("#show-filter .fa").toggleClass("fa-caret-up").toggleClass("fa-caret-down")},resetSubmitTJRData:function(e,t){t=t&&t.length?t:"#topFilters",jQuery("input:text",t).val(""),jQuery(":input",t).not(":button, :submit, :reset, input:hidden").val("").removeAttr("checked").removeAttr("selected"),tjrContentUI.report.submitTJRData(e)},validate:function(){return!0},getColNames:function(){jQuery(".ColVis_collection").toggle()},cancel:function(){jQuery("#btn-cancel").hide(),jQuery(".saveData").html("Want to save this?"),jQuery('#adminForm1 input[type="text"]').val(""),jQuery(".cancel-btn").hide(),jQuery("#queryName").val("")},saveThisQuery:function(){this.$form=jQuery("#adminForm");var e=jQuery("#queryName").is(":hidden");if(jQuery("#btn-cancel").show(),jQuery(".cancel-btn").show(),jQuery("input").css("margin-bottom","0px"),1==e)jQuery("#queryName").show(),jQuery("#saveQuery").html(Joomla.JText._("COM_TJREPORTS_SAVE_QUERY"));else{var t=jQuery("#queryName").val();if(""===t)return alert(Joomla.JText._("COM_TJREPORTS_ENTER_TITLE")),!1;jQuery("#task",this.$form).val("reports.saveQuery");var r=this.$form.serialize();jQuery("#task",this.$form).val(""),tjrContentUI.utility.loadingLayer(),tjrContentService.postData(this.querySaveUrl+"&queryName="+t,r).fail(function(e){console.log("Something went wrong."),tjrContentUI.utility.loadingLayer("hide")}).done(function(e){tjrContentUI.utility.loadingLayer("hide"),e.success?window.location.reload():console.log("Something went wrong.",e.message,e.messages)})}},deleteThisQuery:function(){this.$form=jQuery("#adminForm");jQuery("#queryName").is(":hidden");var e=jQuery("#queryId").val();if(""===e)return alert("Select Any of the query"),!1;if(deletemsg=Joomla.JText._("COM_TJREPORTS_DELETE_MESSAGE"),confirm(deletemsg)){jQuery("#task",this.$form).val("reports.deleteQuery");var t=this.$form.serialize();tjrContentUI.utility.loadingLayer(),tjrContentService.postData(this.querySaveUrl+"&queryId="+e,t).fail(function(e){console.log("Something went wrong."),tjrContentUI.utility.loadingLayer("hide")}).done(function(e){tjrContentUI.utility.loadingLayer("hide"),e.success?(tjrContentUI.utility.setJSCookie("showdeletemsg","1",1),window.location.reload()):console.log("Something went wrong.",e.message,e.messages)})}},getQueryResult:function(e){var t=tjrContentUI.base_url+"index.php?option=com_tjreports&view=reports";jQuery.each({client:"client",reportId:"reportId",queryId:"queryId"},function(e,r){var o=jQuery("#"+e).val();o&&(t+="&"+r+"="+o)}),window.location.href=t},submitForm:function(){return!!jQuery("#task").val()||(tjrContentUI.report.submitTJRData("submit"),!1)},loadReport:function(e,t){jQuery(e).val();var r=jQuery(e).find(":selected").attr("data-reportid"),o=jQuery(document.adminForm).attr("action")+"&reportId="+r;jQuery("#report-select options").attr("selected","selected"),t&&(o=o+"&client="+t),window.location.href=o},submitOnEnter:function(e){return"keydown"!=e.type||13!=e.which&&13!=e.keyCode||tjrContentUI.report.submitTJRData(),!1},attachCalSubmit:function(e){var t=JoomlaCalendar.getCalObject(e);t&&!t._joomlaCalendar.params.onUpdate&&(t._joomlaCalendar.params.onUpdate=tjrContentUI.report.submitCalForm)},submitCalForm:function(){tjrContentUI.report.submitTJRData()}}),tjrContentUI.validation=tjrContentUI.validation?tjrContentUI.validation:{},jQuery.extend(tjrContentUI.validation,{messages:{},resetInvalidField:function(e,t,r){e&&e.val(""),this.addMessage(t,r)},addMessage:function(e,t){t=t||"error",this.messages[t]=this.messages[t]?this.messages[t]:[],this.messages[t].push(e)},resetMessages:function(){Joomla.removeMessages(),this.messages={}},isValidDate:function(e){return null!=(e=e.split(" "))[0].match(/^\d{4}[-](0?[1-9]|1[012])[-](0?[1-9]|[12][0-9]|3[01])$/)},isValidCalDate:function(e,t){return void 0===Date.parseDate?this.isValidDate(date):(t||(t="%d-%m-%Y"),Date.parseDate(e,t).print(t)==e||void 0)}}),tjrContentUI.utility=tjrContentUI.utility?tjrContentUI.utility:{},jQuery.extend(tjrContentUI.utility,{getTimeStampFromDate:function(e,t){if(void 0!==Date.parseDate){t||(t="%d-%m-%Y");var r=Date.parseDate(e,t);if(r)return r.getTime()}return e},loadingLayer:function(e,t){if(e=e||"show",t=t||document.body,"load"==e){var r=document.createElement("div");r.id="loading-logo",r.style.position="fixed",r.style.top="0",r.style.left="0",r.style.width="100%",r.style.height="100%",r.style.opacity="0.8",r.style.filter="alpha(opacity=80)",r.style.overflow="hidden",r.style["z-index"]="10000",r.style.display="none",r.style["background-color"]="#fff",r.style["background-image"]='url("'+tjrContentUI.root_url+'/components/com_tjreports/assets/images/loadinfo.gif")',r.style["background-position"]="center",r.style["background-repeat"]="no-repeat",r.style["background-attachment"]="fixed",r.style["background-size"]="200px",t.appendChild(r)}else document.getElementById("loading-logo")||this.loadingLayer("load",t),document.getElementById("loading-logo").style.display="show"==e?"block":"none";return document.getElementById("loading-logo")},noScript:function(e){var t=jQuery("<div>").html(e);return t.find("script").remove(),e=t.html()},displayMessage:function(e,t,r){this.parent.validation.messages={},this.parent.validation.addMessage(e,t),this.displayMessages()},displayMessages:function(e){Joomla.removeMessages(),Joomla.renderMessages(this.parent.validation.messages),e&&jQuery("body").animate({scrollTop:jQuery("#system-message-container").offset().top},500)},setJSCookie:function(e,t,r){var o="";if(r){var n=new Date;n.setTime(n.getTime()+24*r*60*60*1e3),o="; expires="+n.toUTCString()}document.cookie=e+"="+t+o+"; path=/"},getJSCookie:function(e){for(var t=e+"=",r=document.cookie.split(";"),o=0;o<r.length;o++){for(var n=r[o];" "==n.charAt(0);)n=n.substring(1,n.length);if(0==n.indexOf(t))return n.substring(t.length,n.length)}return null},eraseJSCookie:function(e){tjrContentUI.utility.setJSCookie(e,"",-1)}}),tjrContentUI.tjreport=tjrContentUI.tjreport?tjrContentUI.tjreport:{},jQuery.extend(tjrContentUI.tjreport,{getPlugins:function(){var e=jQuery("#adminForm.tjreportForm");jQuery("#task",e).val("tjreport.getplugins");var t=tjrContentService.postData("index.php?option=com_tjreports&format=json",e.serialize());jQuery("#task",e).val(),jQuery("#jform_parent",e).find("option").not(":first").remove(),t.fail(function(e){console.log("Something went wrong."),403==e.status&&alert(Joomla.JText._("JERROR_ALERTNOAUTHOR"))}).done(function(e){if(e.success){var t=jQuery("#jform_parent");jQuery.each(e.data,function(e,r){t.append(new Option(r.text,r.value))}),tjrContentUI.tjreport.getParams()}else console.log("Something went wrong.",e.message,e.messages)})},loadSort:function(){jQuery(".col-filter-header").hide(),jQuery(document).on("click",".col-search",function(){var e=jQuery(this).parents("th");jQuery(".col-filter-header",e).show(),jQuery(".chzn-search").children("input").attr("readOnly",!1),jQuery(".table-heading",e).hide()}),jQuery(document).on("click",".close-icon",function(){var e=jQuery(this).parents("th");jQuery(".table-heading",e).show(),jQuery(".col-filter-header",e).hide(),tjrContentUI.report.resetSubmitTJRData("submit",e)})},getParams:function(e){var t="index.php?option=com_tjreports&format=json";e&&(t+="&default=1");var r=jQuery("#adminForm.tjreportForm");jQuery("#task",r).val("tjreport.getparams");var o=tjrContentService.postData(t,r.serialize());jQuery("#task",r).val(),jQuery("#jform_param",r).val(""),jQuery("#jform_plugin",r).val(""),o.fail(function(e){console.log("Something went wrong."),403==e.status&&alert(Joomla.JText._("JERROR_ALERTNOAUTHOR"))}).done(function(e){if(e.success){var t=JSON.stringify(JSON.parse(e.data.param),null,"\t");jQuery("#jform_param",r).val(t),jQuery("#jform_plugin",r).val(e.data.plugin)}else console.log("Something went wrong.",e.message,e.messages)})}}),jQuery(document).click(function(e){jQuery(e.target).closest("#ul-columns-name").length||"show-hide-cols-btn"==e.target.id||jQuery(".ColVis_collection").hide()}),jQuery(document).ready(function(){jQuery("#topFilters").hide(),jQuery("#btn-cancel").hide(),jQuery(".cancel-btn").hide(),tjrContentUI.tjreport.loadSort(),tjrContentUI.utility.getJSCookie("showdeletemsg")&&(Joomla.JText.strings.SUCCESS||(Joomla.JText.strings.SUCCESS="Success"),Joomla.renderMessages({success:[Joomla.JText._("COM_TJREPORTS_QUERY_DELETE_SUCCESS")]}),tjrContentUI.utility.eraseJSCookie("showdeletemsg")),jQuery(document).on("click",'#reports-container a[href="#"]',function(e){e.preventDefault()})}),jQuery(document).ready(function(){jQuery("#report-table").on("liszt:ready","select",function(){jQuery(this).next(".chzn-container-single-nosearch").removeClass("chzn-container-single-nosearch")})});
diff --git a/tjreports/site/views/reports/tmpl/default.php b/tjreports/site/views/reports/tmpl/default.php
index 658f3a9..826fb35 100644
--- a/tjreports/site/views/reports/tmpl/default.php
+++ b/tjreports/site/views/reports/tmpl/default.php
@@ -269,9 +269,9 @@
 							{
 								$reportContainer = "hide";
 									?>
-								<div class="show-hide-cols col-md-5 col-sm-5 inputbox radio btn-group btn-group-yesno radio">
-									<input type="radio" id="detailsReport" name="displayReport" value="1" class="displayReport" checked="checked" onclick="javascript:tjrContentUI.report.submitTJRData('default');" required="" aria-required="true"><label for="detailsReport" class="btn btn-success"><?php echo Text::_('COM_TJREPORTS_REPORT_DETAILS'); ?></label>
-									<input type="radio" id="summaryReport" name="displayReport" value="0" class="displayReport" required="" aria-required="true" onclick="javascript:tjrContentUI.report.submitTJRData('summary');"><label for="summaryReport" class="btn"><?php echo Text::_('COM_TJREPORTS_REPORT_SUMMARY'); ?></label>
+								<div class="show-hide-cols col-md-5 col-sm-5 inputbox radio btn-group btn-group-yesno radio summaryReport">
+									<input type="radio" id="detailsReport" name="displayReport" value="1" class="displayReport hide"  onclick="javascript:tjrContentUI.report.submitTJRData('default');" required="" aria-required="true"><label id="detailsReportLabel" for="detailsReport" class="btn btn-success"><?php echo Text::_('COM_TJREPORTS_REPORT_DETAILS'); ?></label>
+									<input type="radio" id="summaryReport" name="displayReport" value="0" class="displayReport hide" required="" aria-required="true" onclick="javascript:tjrContentUI.report.submitTJRData('summary');"><label id="summaryReportLabel" for="summaryReport" class="btn"><?php echo Text::_('COM_TJREPORTS_REPORT_SUMMARY'); ?></label>
 										</fieldset>
 								</div>
 								<?php
@@ -283,7 +283,7 @@
 						if (!$app->isClient('administrator') && $userAuthorisedExport && $user)
 						{
 						?>
-							<div class="col-sm-5 col-md-8">
+							<div class="col-sm-5 col-md-12">
 								<a onclick="tjexport.exportCsv(0)" class="btn btn-small export pull-right">
 									<i class='fa fa-download'></i>&nbsp;<?php echo Text::_('COM_TJREPORTS_CSV_EXPORT'); ?>
 								</a>