Merge pull request #1049 from eileenmcnaughton/CRM-12887

Crm 12887 JS tidy up

CRM/Contribute/Form/ContributionCharts.php

@@ -71,10 +71,10 @@ class CRM_Contribute_Form_ContributionCharts extends CRM_Core_Form {
   public function buildQuickForm() {
     //p3 = Three dimensional pie chart.
     //bvg = Vertical bar chart
-    $this->addElement('select', 'chart_type', ts('Chart Style'), array('bvg' => ts('Bar'),
+    $this->addElement('select', 'chart_type', ts('Chart Style'), array(
+        'bvg' => ts('Bar'),
         'p3' => ts('Pie'),
-      ),
-      array('onchange' => "getChart();")
+      )
     );
     $defaultValues['chart_type'] = $this->_chartType;
     $this->setDefaults($defaultValues);
@@ -92,9 +92,7 @@ class CRM_Contribute_Form_ContributionCharts extends CRM_Core_Form {
       }
     }
 
-    $this->addElement('select', 'select_year', ts('Select Year (for monthly breakdown)'),
-      $years, array('onchange' => "getChart();")
-    );
+    $this->addElement('select', 'select_year', ts('Select Year (for monthly breakdown)'), $years);
     $this->setDefaults(array(
       'select_year' => ($this->_year) ? $this->_year : $currentYear,
       ));

CRM/Contribute/Page/DashBoard.php

@@ -121,6 +121,7 @@ class CRM_Contribute_Page_DashBoard extends CRM_Core_Page {
     $chartForm->setEmbedded(TRUE);
     $chartForm->process();
     $chartForm->run();
+    CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'templates/CRM/Contribute/Page/DashBoard.js');
 
     return parent::run();
   }

templates/CRM/Case/Form/ActivityChangeStatus.js

@@ -62,6 +62,6 @@ cj(function($) {
     );
     return false;
   });
-});
+}
 
 

templates/CRM/Contribute/Page/DashBoard.js

+// http://civicrm.org/licensing
+/*jslint indent: 2 */
+/*global CRM, cj */
+cj(function ($) {
+  'use strict';
+
+  var load = {
+    chart_view: function()  {
+      var chartUrl = CRM.url("civicrm/ajax/chart", {
+        'snippet': 4,
+        'year': $('#select_year').val() || new Date().getFullYear(),
+        'type': $('#chart_type').val() || 'bvg'
+      });
+      $("#chartData").load(chartUrl, function() {
+        $("select", "#chartData").change(load.chart_view);
+      });
+    },
+    table_view: function() {
+      var tableUrl = CRM.url("civicrm/contribute/ajax/tableview", {showtable: 1, snippet: 4});
+      $("#chartData").load(tableUrl);
+    }
+  };
+
+  $('#chart_view, #table_view').click(function() {
+    if ($(this).hasClass('ui-state-default')) {
+      $('.ui-tabs-selected', '#mainTabContainer').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default');
+      $(this).removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected');
+      load[this.id]();
+    }
+  });
+
+  // Initialize chart or table based on url hash
+  if (window.location.hash === '#table_layout') {
+    $('#table_view').click();
+  }
+  else {
+    load.chart_view();
+  }
+});
+

templates/CRM/Contribute/Page/DashBoard.tpl

@@ -80,7 +80,7 @@
 {/if}
 </ul>
 <div id="chartData"></div>
-<div id="tableData"></div></div>
+</div>
 <div class="spacer"></div>
 
 {if $pager->_totalItems}
@@ -88,61 +88,5 @@
     <div>
         {include file="CRM/Contribute/Form/Selector.tpl" context="dashboard"}
     </div>
-{/if}{literal}
-<script type="text/javascript">
-
-cj(document).ready( function( ) {
-    getChart( );
-    cj('#chart_view').click(function( ) {
-        if ( cj('#chart_view').hasClass('ui-state-default') ) {
-            cj('#chart_view').removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected');
-            cj('#table_view').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default');
-            getChart( );
-            cj('#tableData').children().html('');
-        }
-    });
-    cj('#table_view').click(function( ) {
-        if ( cj('#table_view').hasClass('ui-state-default') ) {
-            cj('#table_view').removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected');
-            cj('#chart_view').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default');
-            buildTabularView();
-            cj('#chartData').children().html('');
-        }
-    });
-});
-
-function getChart( ) {
-   var year        = cj('#select_year').val( );
-   var charttype   = cj('#chart_type').val( );
-   var date        = new Date()
-   var currentYear = date.getFullYear( );
-   if ( !charttype ) charttype = 'bvg';
-   if ( !year ) year           = currentYear;
-
-   var chartUrl = {/literal}"{crmURL p='civicrm/ajax/chart' q='snippet=4' h=0}"{literal};
-   chartUrl    += "&year=" + year + "&type=" + charttype;
-   cj.ajax({
-       url     : chartUrl,
-       async    : false,
-       success  : function(html){
-           cj( "#chartData" ).html( html );
-       }
-   });
-
-}
-
-function buildTabularView( ) {
-    var tableUrl = {/literal}"{crmURL p='civicrm/contribute/ajax/tableview' q='showtable=1&snippet=4' h=0}"{literal};
-    cj.ajax({
-        url      : tableUrl,
-        async    : false,
-        success  : function(html){
-            cj( "#tableData" ).html( html );
-        }
-    });
-}
-
-</script>
-{/literal}
-
+{/if}
 {/if}
\ No newline at end of file