From 7ed1806781b2cec576650668cb7ca20ef36850f3 Mon Sep 17 00:00:00 2001
From: "Adrien Peiffer (ACSONE)" <adrien.peiffer@acsone.eu>
Date: Wed, 27 Jan 2016 08:21:30 +0100
Subject: [PATCH 1/3] [IMP][mis_builder] MIS Builder widget improvement, add
 print and export button in the widget.

---
 mis_builder/models/mis_builder.py             |  26 ++++
 mis_builder/report/mis_builder_xls.py         |   2 +-
 .../report/report_mis_report_instance.py      |   3 +
 mis_builder/static/src/js/mis_builder.js      |  68 ++++++++++-
 mis_builder/static/src/xml/mis_widget.xml     | 115 +++++++++---------
 mis_builder/views/mis_builder.xml             |  26 ++--
 6 files changed, 166 insertions(+), 74 deletions(-)

diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py
index 3872233a..44a0671c 100644
--- a/mis_builder/models/mis_builder.py
+++ b/mis_builder/models/mis_builder.py
@@ -639,6 +639,32 @@ class MisReportInstance(models.Model):
             'target': 'new',
         }
 
+    @api.multi
+    def print_pdf(self):
+        self.ensure_one()
+        data = {'context': self.env.context}
+        return {
+            'name': 'MIS report instance QWEB PDF report',
+            'model': 'mis.report.instance',
+            'type': 'ir.actions.report.xml',
+            'report_name': 'mis_builder.report_mis_report_instance',
+            'report_type': 'qweb-pdf',
+            'context': self.env.context,
+            'data': data,
+        }
+
+    @api.multi
+    def export_xls(self):
+        self.ensure_one()
+        return {
+            'name': 'MIS report instance XLS report',
+            'model': 'mis.report.instance',
+            'type': 'ir.actions.report.xml',
+            'report_name': 'mis.report.instance.xls',
+            'report_type': 'xls',
+            'context': self.env.context,
+        }
+
     @api.multi
     def compute(self):
         assert len(self) == 1
diff --git a/mis_builder/report/mis_builder_xls.py b/mis_builder/report/mis_builder_xls.py
index df3d3ee5..903acb74 100644
--- a/mis_builder/report/mis_builder_xls.py
+++ b/mis_builder/report/mis_builder_xls.py
@@ -61,7 +61,7 @@ class MisBuilderXls(report_xls):
 
         # get the computed result of the report
         data = self.pool.get('mis.report.instance').compute(
-            self.cr, self.uid, objects[0].id)
+            self.cr, self.uid, objects[0].id, self.context)
 
         # Column headers
         header_name_list = ['']
diff --git a/mis_builder/report/report_mis_report_instance.py b/mis_builder/report/report_mis_report_instance.py
index 44cfbeb8..33f55511 100644
--- a/mis_builder/report/report_mis_report_instance.py
+++ b/mis_builder/report/report_mis_report_instance.py
@@ -35,6 +35,9 @@ class Report(models.Model):
     @api.v7
     def get_pdf(self, cr, uid, ids, report_name, html=None, data=None,
                 context=None):
+        if not ids and context.get('active_ids') and\
+                report_name == 'mis_builder.report_mis_report_instance':
+            ids = context.get('active_ids')
         if ids:
             report = self._get_report_from_name(cr, uid, report_name)
             obj = self.pool[report.model].browse(cr, uid, ids,
diff --git a/mis_builder/static/src/js/mis_builder.js b/mis_builder/static/src/js/mis_builder.js
index df369e06..e9174349 100644
--- a/mis_builder/static/src/js/mis_builder.js
+++ b/mis_builder/static/src/js/mis_builder.js
@@ -6,21 +6,67 @@ openerp.mis_builder = function(instance) {
         init: function() {
             this._super.apply(this, arguments);
             this.mis_report_data = null;
+            this.mis_report_instance_id = false;
         },
-
+        
         start: function() {
             this._super.apply(this, arguments);
             var self = this;
+            self.mis_report_instance_id = self.getParent().dataset.context.active_id
+            self.getParent().dataset.context['no_destroy'] = true;
+            self.generate_content();
+        },
+        
+        get_context: function() {
+            var self = this;
+            context = {}
+            if (this.mis_report_instance_id){
+                context['active_ids'] = [this.mis_report_instance_id];
+            }
+            return context
+        },
+        print: function() {
+            var self = this
+            context = new instance.web.CompoundContext(self.build_context(), self.get_context()|| {})
+            new instance.web.Model("mis.report.instance").call(
+                "print_pdf", 
+                [self.mis_report_instance_id], 
+                {'context': context}
+            ).then(function(result){
+                self.do_action(result);
+            });
+        },
+        export_pdf: function() {
+            var self = this
+            context = new instance.web.CompoundContext(self.build_context(), self.get_context()|| {})
+            new instance.web.Model("mis.report.instance").call(
+                "export_xls", 
+                [self.mis_report_instance_id], 
+                {'context': context}
+            ).then(function(result){
+                self.do_action(result).done(function(result){
+                    a = 2;
+                });
+            });
+        },
+        generate_content: function() {
+            var self = this
+            context = new instance.web.CompoundContext(self.build_context(), self.get_context()|| {}) 
             new instance.web.Model("mis.report.instance").call(
                 "compute", 
-                [self.getParent().dataset.context.active_id], 
-                {'context': new instance.web.CompoundContext()}
+                [self.mis_report_instance_id], 
+                {'context': context}
             ).then(function(result){
                 self.mis_report_data = result;
                 self.renderElement();
             });
         },
-
+        renderElement: function() {
+            this._super();
+            var self = this;
+            self.$(".oe_mis_builder_print").click(_.bind(this.print, this));
+            self.$(".oe_mis_builder_export").click(_.bind(this.export_pdf, this));
+        },
         events: {
             "click a.mis_builder_drilldown": "drilldown",
         },
@@ -44,5 +90,19 @@ openerp.mis_builder = function(instance) {
         },
     });
 
+    instance.web.ActionManager.include({
+        dialog_stop: function (reason) {
+            var self = this
+            if (self.dialog_widget && self.dialog_widget.dataset && self.dialog_widget.dataset.context) {
+                var context = self.dialog_widget.dataset.context
+                if (!context['no_destroy']) {
+                    this._super.apply(this, arguments);
+                }
+            } else {
+                this._super.apply(this, arguments);
+            }
+        }
+    });
+
     instance.web.form.custom_widgets.add('mis_report', 'instance.mis_builder.MisReport');
 }
diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml
index 5cfd9994..b668e8d1 100644
--- a/mis_builder/static/src/xml/mis_widget.xml
+++ b/mis_builder/static/src/xml/mis_widget.xml
@@ -1,62 +1,67 @@
 <template>
     <t t-name="mis_builder.MisReport">
-        <p> </p>
-        <table t-if="widget.mis_report_data" class="oe_list_content mis_builder">
-            <thead>
-                <tr class="oe_list_header_columns">
-                    <t t-foreach="widget.mis_report_data.header" t-as="h">
-                        <th class="oe_list_header_char">
+        <div class="oe_mis_builder_content">
+            <table t-if="widget.mis_report_data" class="oe_list_content mis_builder">
+                <thead>
+                    <tr class="oe_list_header_columns">
+                        <t t-foreach="widget.mis_report_data.header" t-as="h">
+                            <th class="oe_list_header_char">
+                                <div>
+                                    <t t-esc="h_value.kpi_name"/>
+                                </div>
+                            </th>
+                            <th t-foreach="h_value.cols" t-as="col" class="oe_list_header_char mis_builder_ralign">
+                                <div>
+                                    <t t-esc="col.name"/>
+                                </div>
+                                <div>
+                                    <t t-esc="col.date"/>
+                                </div>
+                            </th>
+                        </t>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr t-foreach="widget.mis_report_data.content" t-as="c">
+                        <td t-att="{'style': c_value.default_style}">
                             <div>
-                                <t t-esc="h_value.kpi_name"/>
-                            </div>
-                        </th>
-                        <th t-foreach="h_value.cols" t-as="col" class="oe_list_header_char mis_builder_ralign">
-                            <div>
-                                <t t-esc="col.name"/>
-                            </div>
-                            <div>
-                                <t t-esc="col.date"/>
-                            </div>
-                        </th>
-                    </t>
-                </tr>
-            </thead>
-            <tbody>
-                <tr t-foreach="widget.mis_report_data.content" t-as="c">
-                    <td t-att="{'style': c_value.default_style}">
-                        <div>
-                            <t t-esc="c_value.kpi_name"/>
-                        </div>
-                    </td>
-                    <t t-foreach="c_value.cols" t-as="value">
-                        <td t-att="{'style': c_value.default_style}" class="mis_builder_ralign">
-                            <div t-att="{'style': value_value.style, 'title': value_value.val_c}">
-                                <t t-if="value_value.drilldown">
-                                    <a href="javascript:void(0)"
-                                       class="mis_builder_drilldown"
-                                       t-att-data-drilldown="JSON.stringify(value_value.drilldown)"
-                                       t-att-data-period-id="JSON.stringify(value_value.period_id)"
-                                       t-att-data-expr="JSON.stringify(value_value.expr)"
-                                    >
-                                        <t t-esc="value_value.val_r"/>
-                                    </a>
-                                </t>
-                                <t t-if="!value_value.drilldown">
-                                    <t t-esc="value_value.val_r"/>
-                                </t>
+                                <t t-esc="c_value.kpi_name"/>
                             </div>
                         </td>
-                    </t>
-                </tr>
-            </tbody>
-            <tfoot>
-                <tr>
-                    <td class="oe_list_footer" />
-                    <t t-foreach="widget.mis_report_data.header" t-as="f">
-                        <td t-foreach="f_value.cols" class="oe_list_footer" />
-                    </t>
-                </tr>
-            </tfoot>
-        </table>
+                        <t t-foreach="c_value.cols" t-as="value">
+                            <td t-att="{'style': c_value.default_style}" class="mis_builder_ralign">
+                                <div t-att="{'style': value_value.style, 'title': value_value.val_c}">
+                                    <t t-if="value_value.drilldown">
+                                        <a href="javascript:void(0)"
+                                           class="mis_builder_drilldown"
+                                           t-att-data-drilldown="JSON.stringify(value_value.drilldown)"
+                                           t-att-data-period-id="JSON.stringify(value_value.period_id)"
+                                           t-att-data-expr="JSON.stringify(value_value.expr)"
+                                        >
+                                            <t t-esc="value_value.val_r"/>
+                                        </a>
+                                    </t>
+                                    <t t-if="!value_value.drilldown">
+                                        <t t-esc="value_value.val_r"/>
+                                    </t>
+                                </div>
+                            </td>
+                        </t>
+                    </tr>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="oe_list_footer" />
+                        <t t-foreach="widget.mis_report_data.header" t-as="f">
+                            <td t-foreach="f_value.cols" class="oe_list_footer" />
+                        </t>
+                    </tr>
+                </tfoot>
+            </table>
+            <div class="oe_mis_builder_buttons">
+                <button class="oe_mis_builder_print"><img src="/web/static/src/img/icons/gtk-print.png"/> Print</button>
+                <button class="oe_mis_builder_export"><img src="/web/static/src/img/icons/gtk-execute.png"/>Export</button>
+            </div>
+        </div>
     </t>
 </template>
diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml
index 65d3c211..cb117f6f 100644
--- a/mis_builder/views/mis_builder.xml
+++ b/mis_builder/views/mis_builder.xml
@@ -98,16 +98,16 @@
         </record>
 
         <menuitem id="mis_report_view_menu" parent="account.menu_account_reports" name="MIS Report Templates" action="mis_report_view_action" sequence="21"/>
-
-	    <record id="xls_export" model="ir.actions.report.xml">
-	      <field name="name">MIS report instance XLS report</field>
-	      <field name="model">mis.report.instance</field>
-	      <field name="type">ir.actions.report.xml</field>
-	      <field name="report_name">mis.report.instance.xls</field>
-	      <field name="report_type">xls</field>
-	      <field name="auto" eval="False"/>
-	    </record>
-
+        
+        <record id="xls_export" model="ir.actions.report.xml">
+          <field name="name">MIS report instance XLS report</field>
+          <field name="model">mis.report.instance</field>
+          <field name="type">ir.actions.report.xml</field>
+          <field name="report_name">mis.report.instance.xls</field>
+          <field name="report_type">xls</field>
+          <field name="auto" eval="False"/>
+        </record>
+    
         <record id="qweb_pdf_export" model="ir.actions.report.xml">
           <field name="name">MIS report instance QWEB PDF report</field>
           <field name="model">mis.report.instance</field>
@@ -124,8 +124,6 @@
             <field name="arch" type="xml">
                 <form string="MIS Report Result" version="7.0">
                     <widget type="mis_report"></widget>
-                    <button icon="gtk-print" name="%(qweb_pdf_export)d" string="Print" type="action" colspan="2"/>
-                    <button icon="gtk-execute" name="%(xls_export)d" string="Export" type="action" colspan="2"/>
                 </form>
             </field>
         </record>
@@ -162,8 +160,8 @@
                     </div>
                     <div class="oe_right oe_button_box" name="buttons"> 
                         <button type="object" name="preview" string="Preview" icon="gtk-print-preview" />
-                        <button type="action" name="%(qweb_pdf_export)d" string="Print" icon="gtk-print" />
-                        <button type="action" name="%(xls_export)d" string="Export" icon="gtk-execute" />
+                        <button type="object" name="print_pdf" string="Print" icon="gtk-print" />
+                        <button type="object" name="export_xls" string="Export" icon="gtk-execute" />
                         <button type="action" name="%(mis_report_instance_add_to_dashboard_action)d" string="Add to dashboard" icon="gtk-add" />
                     </div>
                     <group col="4">

From d904ea7ba381980915ad0cd1775ddba833121cc0 Mon Sep 17 00:00:00 2001
From: "Adrien Peiffer (ACSONE)" <adrien.peiffer@acsone.eu>
Date: Wed, 27 Jan 2016 11:18:03 +0100
Subject: [PATCH 2/3] [IMP][mis_builder] use get_context method in drilldown
 method

---
 mis_builder/static/src/js/mis_builder.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mis_builder/static/src/js/mis_builder.js b/mis_builder/static/src/js/mis_builder.js
index e9174349..e23d2a6f 100644
--- a/mis_builder/static/src/js/mis_builder.js
+++ b/mis_builder/static/src/js/mis_builder.js
@@ -77,10 +77,11 @@ openerp.mis_builder = function(instance) {
             if (drilldown) {
                 var period_id = JSON.parse($(event.target).data("period-id"));
                 var val_c = JSON.parse($(event.target).data("expr"));
+                context = new instance.web.CompoundContext(self.build_context(), self.get_context()|| {}) 
                 new instance.web.Model("mis.report.instance.period").call(
                     "drilldown",
                     [period_id, val_c],
-                    {'context': new instance.web.CompoundContext()}
+                    {'context': context}
                 ).then(function(result) {
                     if (result) {
                         self.do_action(result);

From 85d8580c6c7c1001fc6cca1dee97dfead80c8a68 Mon Sep 17 00:00:00 2001
From: "Adrien Peiffer (ACSONE)" <adrien.peiffer@acsone.eu>
Date: Thu, 28 Jan 2016 17:45:14 +0100
Subject: [PATCH 3/3] [IMP][mis_builder] Improve buttons position

---
 mis_builder/static/src/xml/mis_widget.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml
index b668e8d1..a09c653d 100644
--- a/mis_builder/static/src/xml/mis_widget.xml
+++ b/mis_builder/static/src/xml/mis_widget.xml
@@ -1,6 +1,10 @@
 <template>
     <t t-name="mis_builder.MisReport">
         <div class="oe_mis_builder_content">
+            <div class="oe_mis_builder_buttons oe_right">
+                <button class="oe_mis_builder_print"><img src="/web/static/src/img/icons/gtk-print.png"/> Print</button>
+                <button class="oe_mis_builder_export"><img src="/web/static/src/img/icons/gtk-execute.png"/>Export</button>
+            </div>
             <table t-if="widget.mis_report_data" class="oe_list_content mis_builder">
                 <thead>
                     <tr class="oe_list_header_columns">
@@ -58,10 +62,6 @@
                     </tr>
                 </tfoot>
             </table>
-            <div class="oe_mis_builder_buttons">
-                <button class="oe_mis_builder_print"><img src="/web/static/src/img/icons/gtk-print.png"/> Print</button>
-                <button class="oe_mis_builder_export"><img src="/web/static/src/img/icons/gtk-execute.png"/>Export</button>
-            </div>
         </div>
     </t>
 </template>