[FIX]ajuste de grafico

static/src/js/reports/report_crm.js

@@ -556,20 +556,23 @@ function report_crm(reporting) {
       var names = _.flatten(_.map(data, function(item) {
         return item.stage_name;
       }));
-      var cash = _.flatten(_.map(data, function(item) {
+      var qty = _.flatten(_.map(data, function(item) {
         return item.count;
       }));
 
       var receiptCanvas = $("#reporting-chart");
-      var context = receiptCanvas.get(0).getContext("2d");
 
-      var myChart = new Chart(context, {
+      if (window.bar != undefined) {
+        window.bar.destroy();
+      }
+
+      window.bar = new Chart(receiptCanvas, {
         type: 'bar',
         data: {
           labels: names,
           datasets: [{
             label: '',
-            data: cash,
+            data: qty,
             backgroundColor: color,
           }]
         },
@@ -577,7 +580,6 @@ function report_crm(reporting) {
           responsive: true,
           responsiveAnimationDuration: 10,
           maintainAspectRatio: false,
-          events: ['click'],
           scales: {
             yAxes: [{
               ticks: {

static/src/reports/report_crm.xml

@@ -26,92 +26,90 @@
           </div>
           <div class="col-lg-3 stage filter-style">
             <label>Etapas</label>
-            <select id="current-stage" class="form-control form-control-sm">
-          </select>
-        </div>
+            <select id="current-stage" class="form-control form-control-sm"></select>
+          </div>
 
-        <div class="col-lg-3 filter-style">
-          <label>Fecha de Creación</label>
-          <select id="current-date" class="form-control form-control-sm">
-            <option value="9999999">Sin fechas</option>
-            <option value="today">Hoy</option>
-            <option value="yesterday">Ayer</option>
-            <option value="currentMonth">Mes Actual</option>
-            <option value="lastMonth">Mes Pasado</option>
-            <option value="range">Busqueda Avanzada</option>
-          </select>
+          <div class="col-lg-3 filter-style">
+            <label>Fecha de Creación</label>
+            <select id="current-date" class="form-control form-control-sm">
+              <option value="9999999">Sin fechas</option>
+              <option value="today">Hoy</option>
+              <option value="yesterday">Ayer</option>
+              <option value="currentMonth">Mes Actual</option>
+              <option value="lastMonth">Mes Pasado</option>
+              <option value="range">Busqueda Avanzada</option>
+            </select>
+          </div>
         </div>
-      </div>
 
-      <div class="row" >
-        <div class="datepicker" style="display:none;">
-          <div class="col-lg-3 filter-style col-md-offset-3">
-            <div class="input-group">
-              <span class="input-group-addon" id="basic-addon1">Desde</span>
-              <input type="text" id="from" class="form-control" aria-describedby="basic-addon1"/>
+        <div class="row" >
+          <div class="datepicker" style="display:none;">
+            <div class="col-lg-3 filter-style col-md-offset-3">
+              <div class="input-group">
+                <span class="input-group-addon" id="basic-addon1">Desde</span>
+                <input type="text" id="from" class="form-control" aria-describedby="basic-addon1"/>
+              </div>
             </div>
-          </div>
-          <div class="col-lg-3 filter-style">
-            <div class="input-group">
-              <span class="input-group-addon" id="basic-addon1">Hasta</span>
-              <input type="text" id="to" class="form-control" aria-describedby="basic-addon1"/>
+            <div class="col-lg-3 filter-style">
+              <div class="input-group">
+                <span class="input-group-addon" id="basic-addon1">Hasta</span>
+                <input type="text" id="to" class="form-control" aria-describedby="basic-addon1"/>
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <div class="row">
-        <div class="text-center" style="padding-top:20px;">
-          <button id="generate" class="myButton" aria-label="Left Align" style="color:#fff;display:none;">
-            Generar
-          </button>
+        <div class="row">
+          <div class="text-center" style="padding-top:20px;">
+            <button id="generate" class="myButton" aria-label="Left Align" style="color:#fff;display:none;">
+              Generar
+            </button>
+          </div>
+          <br/>
         </div>
-        <br/>
       </div>
-    </div>
 
-    <div class="report-form" style="display:none;">
-      <div class="chart-container center-block" style="padding-top:20px; height:300px; padding-bottom:20px;">
-        <canvas id="reporting-chart" class="reporting-chart"></canvas>
-      </div>
-      <div id="toolbar">
-        <button class="oe_button oe_form_button myButton" value="pdf">Imprimir Informe</button>
+      <div class="report-form" style="display:none;">
+        <div class="chart-container center-block" style="padding-top:20px; height:300px; width:90%; padding-bottom:20px;">
+          <canvas id="reporting-chart" class="reporting-chart"></canvas>
+        </div>
+        <div id="toolbar">
+          <button class="oe_button oe_form_button myButton" value="pdf">Imprimir Informe</button>
+        </div>
+        <div class="container" style="width:100%;">
+          <table id="table"
+            data-pagination="true"
+            data-toggle="table"
+            data-toolbar="#toolbar"
+            data-show-columns="true"
+            data-classes="table table-condensed  table-no-bordered"
+            data-row-style="rowStyle"
+            data-search="true"
+            data-show-export="true"
+            data-show-toggle="true"
+            data-pagination-detail-h-align="left"
+            data-show-footer="true"
+            data-footer-style="footerStyle"
+            data-buttons-class="oe_button oe_form_button myButton"
+            data-show-pagination-switch="true"
+            data-page-size="10"
+            data-search-on-enter-key="true"
+            data-undefined-text=" ">
+            <thead style="background:none;">
+              <tr>
+                <th data-field="create_date" data-sortable="true">Fecha Creación</th>
+                <th data-field="name" data-sortable="true">Asunto</th>
+                <th data-field="description">Descripcion</th>
+                <th data-field="partner" data-sortable="true">Cliente</th>
+                <th data-field="stage" data-sortable="true">Etapa</th>
+                <th data-field="user" data-sortable="true">Responsable</th>
+                <th data-field="date_last_stage_update" data-sortable="true" data-align="center">Fecha Cambio Etapa</th>
+                <th data-field="write_date" data-sortable="true" data-align="center">Fecha Modificado</th>
+              </tr>
+            </thead>
+          </table>
+        </div>
       </div>
-      <div class="container" style="width:95%;">
-        <table id="table"
-          data-pagination="true"
-          data-toggle="table"
-          data-toolbar="#toolbar"
-          data-show-columns="true"
-          data-height="auto"
-          data-classes="table table-condensed  table-no-bordered"
-          data-row-style="rowStyle"
-          data-search="true"
-          data-show-export="true"
-          data-show-toggle="true"
-          data-pagination-detail-h-align="left"
-           data-show-footer="true"
-           data-footer-style="footerStyle"
-           data-buttons-class="oe_button oe_form_button myButton"
-           data-show-pagination-switch="true"
-           data-page-size="10"
-           data-search-on-enter-key="true"
-           data-undefined-text=" ">
-           <thead style="background:none;">
-             <tr>
-               <th data-field="create_date" data-sortable="true">Fecha Creación</th>
-               <th data-field="name" data-sortable="true">Asunto</th>
-               <th data-field="description">Descripcion</th>
-               <th data-field="partner" data-sortable="true">Cliente</th>
-               <th data-field="stage" data-sortable="true">Etapa</th>
-               <th data-field="user" data-sortable="true">Responsable</th>
-               <th data-field="date_last_stage_update" data-sortable="true" data-align="center">Fecha Cambio Etapa</th>
-               <th data-field="write_date" data-sortable="true" data-align="center">Fecha Modificado</th>
-             </tr>
-           </thead>
-         </table>
-       </div>
-     </div>
-   </div>
- </t>
+    </div>
+  </t>
 </template>