Ver Fonte

[FIX] ajuste del metodo

Rodney Elpidio Enciso Arias há 6 anos atrás
pai
commit
f6223486a9

+ 5 - 8
static/src/js/reports/report_doctor_ranking.js

@@ -686,7 +686,6 @@ function report_doctor_ranking(reporting){
             var self = this;
             var data = [];
             var ResDoctor = self.getResDoctor();
-            console.log(self);
             var type = $('#current-type').val();
             var company = $('#current-company').val();
             if(company && company != 9999999){
@@ -759,23 +758,21 @@ function report_doctor_ranking(reporting){
                             amount: accounting.formatMoney(index.amount_total_currency,'',CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
                         });
                     });
-                }
-
+                };
                 var amount = invoice_amount + pos_amount;
-
                 if(amount > 0){
                     data.push({
                         id: item.id,
                         medic: item.name,
                         qty_total: accounting.formatNumber((PosOrder.length + AccountInvoice.length),0,'.',','),
-                        total_amount: accounting.formatMoney(pos_amount, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+                        total_amount: accounting.formatMoney(amount, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
                         /*
                         ================================
                         VALORES SIN FORMATEAR
                         ================================
                         */
                         qty: (PosOrder.length + AccountInvoice.length),
-                        amount: pos_amount,
+                        amount: amount,
                         /*
                         ================================
                             TOTAL FOOTER CONFIGURATION
@@ -828,7 +825,7 @@ function report_doctor_ranking(reporting){
                 label.push(item.medic.trim());
                 body.push(item.amount);
             }
-            BarChart.fetchBarChart(data,CurrencyBase,label,body);
+            BarChart.BuildBarChart(data,CurrencyBase,label,body);
 
             /*
             ================================================
@@ -864,7 +861,7 @@ function report_doctor_ranking(reporting){
                 label.push('Otros Doctores');
                 body.push((num/amount_total)*100);
             }
-            PieChart.fetchPieChart(data,CurrencyBase,label,body);
+            PieChart.BuildPieChart(data,CurrencyBase,label,body);
 
             self.$el.find('.report-form').css('display','block');
             self.$el.find('.search-form').unblock();

+ 4 - 6
static/src/reports/report_doctor_ranking.xml

@@ -64,9 +64,9 @@
                 </div>
                 <div class="row">
                     <div class="text-center" style="padding-top:20px;">
-                        <a id="generate" type="button" class="btn btn-danger" aria-label="Left Align" style="color:#fff;display:none;">
-                          Generar
-                        </a>
+                        <button id="generate" class="myButton" aria-label="Left Align">
+                            Generar
+                        </button>
                     </div>
                     <br/>
                 </div>
@@ -80,7 +80,7 @@
                     <canvas class="reporting-pie-chart"></canvas>
                 </div>
                 <div id="toolbar">
-                    <button class="oe_button oe_form_button oe_highlight" value="pdf">PDF</button>
+                    <button class="oe_button myButton" value="pdf">PDF</button>
                 </div>
                 <div class="container" style="width:95%;">
                     <table id="table"
@@ -88,9 +88,7 @@
                         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"