odoo-addon-mis-builder 16.0.5.2.3.1__py3-none-any.whl → 16.0.5.4.0__py3-none-any.whl

odoo/addons/mis_builder/static/src/components/mis_report_widget.css

@@ -23,6 +23,10 @@
 .oe_mis_builder_content {
 }
 
+.oe_mis_builder_report_wide_sheet {
+    max-width: 95% !important;
+}
+
 /* style for the control panel (search box and buttons) */
 
 .oe_mis_builder_cp {
@@ -44,6 +48,11 @@
     max-width: 1280px;
 }
 
+.oe_mis_builder_cp_right_top_right {
+    display: flex;
+    flex-direction: row;
+}
+
 .oe_mis_builder_cp_right_top {
     display: flex;
     flex-direction: row;
@@ -65,3 +74,35 @@
     flex-grow: 1;
     justify-content: flex-end;
 }
+
+.oe_mis_builder_dropdown {
+    overflow: visible !important;
+}
+
+.oe_mis_builder_footnote {
+    font-size: 80%;
+    color: red;
+    position: relative;
+    bottom: 1ex;
+    width: 1em;
+    display: inline-block;
+    padding-right: 1px;
+}
+
+.oe_mis_builder_footnote_table {
+    list-style: none;
+    white-space: pre-wrap;
+    display: inline-block;
+
+    td {
+        vertical-align: top;
+    }
+}
+
+.oe_mis_builder_footnote_div {
+    padding-top: 1em;
+}
+
+.oe_mis_builder_menu_disabled {
+    color: gainsboro;
+}

odoo/addons/mis_builder/static/src/components/mis_report_widget.esm.js

@@ -1,13 +1,15 @@
 /** @odoo-module **/
 
-import {Component, onWillStart, useState, useSubEnv} from "@odoo/owl";
-import {useBus, useService} from "@web/core/utils/hooks";
+import Dialog from "web.Dialog";
+import {Component, onMounted, onWillStart, useState, useSubEnv} from "@odoo/owl";
 import {DatePicker} from "@web/core/datepicker/datepicker";
 import {FilterMenu} from "@web/search/filter_menu/filter_menu";
 import {SearchBar} from "@web/search/search_bar/search_bar";
 import {SearchModel} from "@web/search/search_model";
 import {parseDate} from "@web/core/l10n/dates";
+import {qweb} from "web.core";
 import {registry} from "@web/core/registry";
+import {useBus, useService} from "@web/core/utils/hooks";
 
 export class MisReportWidget extends Component {
     setup() {
@@ -18,8 +20,10 @@ export class MisReportWidget extends Component {
         this.view = useService("view");
         this.JSON = JSON;
         this.state = useState({
-            mis_report_data: {header: [], body: []},
+            mis_report_data: {header: [], body: [], notes: {}},
             pivot_date: null,
+            can_edit_annotation: false,
+            can_read_annotation: false,
         });
         this.searchModel = new SearchModel(this.env, {
             user: this.user,
@@ -32,6 +36,8 @@ export class MisReportWidget extends Component {
             this.refresh();
         });
         onWillStart(this.willStart);
+
+        onMounted(this._onMounted);
     }
 
     // Lifecycle
@@ -46,6 +52,9 @@ export class MisReportWidget extends Component {
                 "widget_search_view_id",
                 "pivot_date",
                 "widget_show_pivot_date",
+                "user_can_read_annotation",
+                "user_can_edit_annotation",
+                "wide_display_by_default",
             ],
             {context: this.context}
         );
@@ -64,8 +73,16 @@ export class MisReportWidget extends Component {
             });
         }
 
+        this.wide_display = result.wide_display_by_default;
+
         // Compute the report
         this.refresh();
+        this.state.can_edit_annotation = result.user_can_edit_annotation;
+        this.state.can_read_annotation = result.user_can_read_annotation;
+    }
+
+    async _onMounted() {
+        this.resize_sheet();
     }
 
     get showSearchBar() {
@@ -121,7 +138,7 @@ export class MisReportWidget extends Component {
     }
 
     async drilldown(event) {
-        const drilldown = $(event.target).data("drilldown");
+        const drilldown = JSON.parse(event.target.dataset.drilldown);
         const action = await this.orm.call(
             "mis.report.instance",
             "drilldown",
@@ -140,6 +157,15 @@ export class MisReportWidget extends Component {
         );
     }
 
+    async refresh_annotation() {
+        this.state.mis_report_data.notes = await this.orm.call(
+            "mis.report.instance",
+            "get_notes_by_cell_id",
+            [this._instanceId()],
+            {context: this.context}
+        );
+    }
+
     async printPdf() {
         const action = await this.orm.call(
             "mis.report.instance",
@@ -170,10 +196,89 @@ export class MisReportWidget extends Component {
         this.action.doAction(action);
     }
 
+    async _remove_annotation(cell_id) {
+        await this.orm.call(
+            "mis.report.instance.annotation",
+            "remove_annotation",
+            [cell_id, this._instanceId()],
+            {context: this.context}
+        );
+        this.refresh_annotation();
+    }
+
+    async _save_annotation(cell_id) {
+        const text = document.querySelector(".o_mis_builder_annotation_text").value;
+        await this.orm.call(
+            "mis.report.instance.annotation",
+            "set_annotation",
+            [cell_id, this._instanceId(), text],
+            {context: this.context}
+        );
+        await this.refresh_annotation();
+    }
+
+    async annotate(event) {
+        const cell_id = event.target.dataset.cellId;
+        const note = this.state.mis_report_data.notes[cell_id];
+        const note_text = (note && note.text) || "";
+        var buttons = [
+            {
+                text: this.env._t("Save"),
+                classes: "btn-primary",
+                close: true,
+                click: this._save_annotation.bind(this, cell_id),
+            },
+            {
+                text: this.env._t("Cancel"),
+                close: true,
+            },
+        ];
+        if (typeof note !== "undefined") {
+            buttons.push({
+                text: this.env._t("Remove"),
+                classes: "btn-secondary",
+                close: true,
+                click: this._remove_annotation.bind(this, cell_id),
+            });
+        }
+
+        new Dialog(this, {
+            title: "Annotate",
+            size: "medium",
+            $content: $(
+                qweb.render("mis_builder.annotation_dialog", {
+                    text: note_text,
+                })
+            ),
+            buttons: buttons,
+        }).open();
+    }
+
+    async remove_annotation(event) {
+        const cell_id = event.target.dataset.cellId;
+        this._remove_annotation(cell_id);
+    }
+
     onDateTimeChanged(ev) {
         this.state.pivot_date = ev;
         this.refresh();
     }
+
+    async toggle_wide_display() {
+        this.wide_display = !this.wide_display;
+        this.resize_sheet();
+    }
+
+    async resize_sheet() {
+        var sheet_element = document.getElementsByClassName("o_form_sheet")[0];
+        sheet_element.classList.toggle(
+            "oe_mis_builder_report_wide_sheet",
+            this.wide_display
+        );
+        var button_resize_element = document.getElementById("icon_resize");
+        button_resize_element.classList.toggle("fa-expand", !this.wide_display);
+        button_resize_element.classList.toggle("fa-compress", this.wide_display);
+    }
 }
 
 MisReportWidget.components = {FilterMenu, SearchBar, DatePicker};

odoo/addons/mis_builder/static/src/components/mis_report_widget.xml

@@ -4,10 +4,21 @@
     <t t-name="mis_builder.MisReportWidget" owl="1">
         <div class="oe_mis_builder_content">
             <t t-if="state.mis_report_data">
+                <t t-set="notes" t-value="state.mis_report_data.notes" />
                 <div class="oe_mis_builder_cp">
                     <div class="oe_mis_builder_cp_left">
                     </div>
                     <div class="oe_mis_builder_cp_right">
+                        <div class="oe_mis_builder_cp_right_top_right">
+                            <div class="oe_mis_builder_action_buttons">
+                                <button
+                                    t-on-click="toggle_wide_display"
+                                    class="btn btn-secondary"
+                                >
+                                    <i id="icon_resize" class="fa" />
+                                </button>
+                            </div>
+                        </div>
                         <div class="oe_mis_builder_cp_right_top">
                             <SearchBar t-if="showSearchBar" />
                         </div>
@@ -85,21 +96,65 @@
                                     t-as="cell"
                                     t-key="cell_index"
                                     t-att="{'style': cell.style, 'title': cell.val_c}"
-                                    class="mis_builder_amount"
+                                    class="mis_builder_amount oe_mis_builder_dropdown"
                                 >
-                                    <t t-if="cell.drilldown_arg">
-                                        <a
-                                            href="javascript:void(0)"
-                                            class="mis_builder_drilldown"
-                                            t-on-click="drilldown"
-                                            t-att-data-drilldown="JSON.stringify(cell.drilldown_arg)"
-                                        >
+                                    <div>
+                                        <t t-if="cell.drilldown_arg">
+                                            <a
+                                                href="javascript:void(0)"
+                                                class="mis_builder_drilldown"
+                                                t-on-click="drilldown"
+                                                t-att-data-drilldown="JSON.stringify(cell.drilldown_arg)"
+                                            >
+                                                <t t-esc="cell.val_r" />
+                                            </a>
+                                        </t>
+                                        <t t-else="">
                                             <t t-esc="cell.val_r" />
-                                        </a>
-                                    </t>
-                                    <t t-if="!cell.drilldown_arg">
-                                        <t t-esc="cell.val_r" />
-                                    </t>
+                                        </t>
+                                        <span class="oe_mis_builder_footnote">
+                                            <div t-if="notes[cell.cell_id]">
+                                                <a
+                                                    t-att-id="'note_'+notes[cell.cell_id].sequence"
+                                                    t-out="notes[cell.cell_id] and notes[cell.cell_id].sequence"
+                                                    t-att="{'title': notes[cell.cell_id].text}"
+                                                    href="#footnotes"
+                                                />
+                                            </div>
+                                        </span>
+
+                                        <div id="dropdown_menu" class="btn-group">
+                                            <div
+                                                class="dropdown"
+                                                t-if="state.can_edit_annotation and cell.can_be_annotated"
+                                            >
+                                                <div
+                                                    data-bs-toggle="dropdown"
+                                                    t-attf-class="dropdown-toggle"
+                                                />
+
+                                                <div
+                                                    class="dropdown-menu o_filter_menu"
+                                                    role="menu"
+                                                >
+                                                    <a
+                                                        href="javascript:void(0)"
+                                                        t-on-click="annotate"
+                                                        t-att-data-cell-id="cell.cell_id"
+                                                        role="menuitem"
+                                                        class="dropdown-item js_tag"
+                                                    >
+                                                        Annotate
+                                                    </a>
+                                                </div>
+                                            </div>
+                                            <!-- show menu as disabled -->
+                                            <div
+                                                t-else=""
+                                                class="dropdown-toggle oe_mis_builder_menu_disabled"
+                                            />
+                                        </div>
+                                    </div>
                                 </td>
                             </tr>
                         </tbody>
@@ -108,8 +163,44 @@
                         </tfoot>
                     </table>
                 </div>
+                <!-- Adding notes -->
+                <div class="oe_mis_builder_footnote_div" id="footnotes">
+                    <table class="oe_mis_builder_footnote_table">
+                        <t
+                            t-foreach="state.mis_report_data.notes"
+                            t-as="cell_id"
+                            t-key="cell_id"
+                        >
+                            <tr>
+                                <td><a
+                                        t-out="notes[cell_id].sequence"
+                                        t-att-href="'#note_'+notes[cell_id].sequence"
+                                    />. </td>
+                                <td><t t-out="notes[cell_id].text" /></td>
+                                <td><i
+                                        href="javascript:void(0)"
+                                        t-on-click="remove_annotation"
+                                        t-att-data-cell-id="cell_id"
+                                        class="btn fa fa-trash-o"
+                                        t-if="state.can_edit_annotation"
+                                    /></td>
+                            </tr>
+                        </t>
+                    </table>
+                </div>
             </t>
         </div>
     </t>
 
+    <t t-name="mis_builder.annotation_dialog">
+        <form role="form">
+            <textarea
+                class="o_mis_builder_annotation_text"
+                name="note"
+                rows='4'
+                placeholder="Insert note here"
+            ><t t-out="text" t-att-data-textnote="text" /></textarea>
+        </form>
+    </t>
+
 </templates>

odoo/addons/mis_builder/static/src/css/report.css

@@ -44,3 +44,25 @@
 .mis_table .mis_cell.mis_amount {
     text-align: right;
 }
+.oe_mis_builder_footnote {
+    font-size: 70%;
+    color: red;
+    position: relative;
+    bottom: 1ex;
+    width: 1em;
+    display: inline-block;
+    padding-right: 1px;
+}
+.oe_mis_builder_footnote_div {
+    padding-top: 1em;
+}
+
+.oe_mis_builder_footnote_table {
+    list-style: none;
+    white-space: pre-wrap;
+    display: inline-block;
+
+    td {
+        vertical-align: top;
+    }
+}

odoo/addons/mis_builder/tests/__init__.py

@@ -14,3 +14,4 @@ from . import test_render
 from . import test_simple_array
 from . import test_target_move
 from . import test_utc_midnight
+from . import test_mis_report_instance_annotation

odoo/addons/mis_builder/tests/test_mis_report_instance_annotation.py

@@ -0,0 +1,154 @@
+# Copyright 2025 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import Command
+from odoo.tests.common import TransactionCase
+
+
+class TestMisReportInstanceAnnotation(TransactionCase):
+    def setUp(self):
+        super().setUp()
+        self.report = self.env["mis.report"].create(
+            dict(
+                name="test report",
+                subkpi_ids=[
+                    Command.create(
+                        dict(
+                            name="subkpi1_report2",
+                            description="subkpi 1, report 2",
+                            sequence=1,
+                        )
+                    ),
+                    Command.create(
+                        dict(
+                            name="subkpi2_report2",
+                            description="subkpi 2, report 2",
+                            sequence=2,
+                        ),
+                    ),
+                ],
+            )
+        )
+
+        self.kpi = self.env["mis.report.kpi"].create(
+            dict(
+                report_id=self.report.id,
+                description="kpi 1",
+                name="k1",
+                multi=True,
+                expression_ids=[
+                    Command.create(
+                        dict(name="bale[200%]", subkpi_id=self.report.subkpi_ids[0].id),
+                    ),
+                    Command.create(
+                        dict(name="balp[200%]", subkpi_id=self.report.subkpi_ids[1].id),
+                    ),
+                ],
+            )
+        )
+
+        self.report_instance = self.env["mis.report.instance"].create(
+            dict(
+                name="test instance",
+                report_id=self.report.id,
+                company_id=self.env.ref("base.main_company").id,
+                period_ids=[
+                    Command.create(
+                        dict(
+                            name="p1",
+                            mode="fix",
+                            manual_date_from="2013-01-01",
+                            manual_date_to="2013-12-31",
+                            sequence=1,
+                        ),
+                    ),
+                    Command.create(
+                        dict(
+                            name="p2",
+                            mode="fix",
+                            manual_date_from="2014-01-01",
+                            manual_date_to="2014-12-31",
+                            sequence=2,
+                        ),
+                    ),
+                ],
+            )
+        )
+
+    def test_adding_note(self):
+        notes = self.report_instance.get_notes_by_cell_id()
+
+        self.assertEqual({}, notes)
+
+        # report with 4 cells, 2 periods and 2 subkpis
+        matrix = self.report_instance._compute_matrix()
+        cell_ids = [c.cell_id for row in matrix.iter_rows() for c in row.iter_cells()]
+        self.assertEqual(len(cell_ids), 4)
+
+        first_cell_id, second_cell_id, third_cell_id, _fourth_cell_id = cell_ids
+
+        # adding one note
+        self.env["mis.report.instance.annotation"].set_annotation(
+            first_cell_id, self.report_instance.id, "This is a note"
+        )
+        notes = self.report_instance.get_notes_by_cell_id()
+        self.assertDictEqual(
+            {first_cell_id: {"text": "This is a note", "sequence": 1}}, notes
+        )
+
+        # adding another note
+        self.env["mis.report.instance.annotation"].set_annotation(
+            third_cell_id, self.report_instance.id, "This is another note"
+        )
+        notes = self.report_instance.get_notes_by_cell_id()
+        self.assertDictEqual(
+            {
+                first_cell_id: {"text": "This is a note", "sequence": 1},
+                third_cell_id: {"text": "This is another note", "sequence": 2},
+            },
+            notes,
+        )
+
+        self.env["mis.report.instance.annotation"].set_annotation(
+            second_cell_id, self.report_instance.id, "This is third note"
+        )
+
+        notes = self.report_instance.get_notes_by_cell_id()
+        # Last note added should have a sequence of
+        # 2 since it is deplayed in the second cell
+        self.assertDictEqual(
+            {
+                first_cell_id: {"text": "This is a note", "sequence": 1},
+                second_cell_id: {"text": "This is third note", "sequence": 2},
+                third_cell_id: {"text": "This is another note", "sequence": 3},
+            },
+            notes,
+        )
+
+    def test_remove_note(self):
+        notes = self.report_instance.get_notes_by_cell_id()
+
+        self.assertEqual({}, notes)
+
+        # report with 4 cells, 2 periods and 2 subkpis
+        matrix = self.report_instance._compute_matrix()
+        cell_ids = [c.cell_id for row in matrix.iter_rows() for c in row.iter_cells()]
+        self.assertEqual(len(cell_ids), 4)
+
+        first_cell_id = cell_ids[0]
+
+        # adding one note
+        self.env["mis.report.instance.annotation"].set_annotation(
+            first_cell_id, self.report_instance.id, "This is a note"
+        )
+        notes = self.report_instance.get_notes_by_cell_id()
+        self.assertDictEqual(
+            {first_cell_id: {"text": "This is a note", "sequence": 1}}, notes
+        )
+
+        # remove note
+        self.env["mis.report.instance.annotation"].remove_annotation(
+            first_cell_id, self.report_instance.id
+        )
+        notes = self.report_instance.get_notes_by_cell_id()
+        self.assertEqual({}, notes)

odoo/addons/mis_builder/views/mis_report_instance.xml

@@ -195,6 +195,7 @@
                                 <field name="landscape_pdf" />
                                 <field name="no_auto_expand_accounts" />
                                 <field name="display_columns_description" />
+                                <field name="wide_display_by_default" />
                             </group>
                         </page>
                         <page string="Widget">

{odoo_addon_mis_builder-16.0.5.2.3.1.dist-info → odoo_addon_mis_builder-16.0.5.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-mis_builder
-Version: 16.0.5.2.3.1
+Version: 16.0.5.4.0
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-date_range>=16.0dev,<16.1dev
 Requires-Dist: odoo-addon-report_xlsx>=16.0dev,<16.1dev
@@ -25,7 +25,7 @@ MIS Builder
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:578ec6e1eb6754314b8a51c950070f53d28faebcd67c3d7014c0a53d82cca432
+   !! source digest: sha256:eaf310c997ae9746cf01edf102baa7c519355121536c5a695b45470f6ab27dee
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png