Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[IMP] web_pivot_computed_measure: Saving vertical space

13.0
Ernesto Tejeda 2020-12-01 22:57:45 -05:00
parent 472718dce5
commit a8a490619c
4 changed files with 107 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web_pivot_computed_measure/static/src/js/pivot_controller.js
View File

@ -176,7 +176,8 @@ odoo.define("web_pivot_computed_measure.PivotController", function(require) {
if ($(ev.target).val() === "custom") { if ($(ev.target).val() === "custom") {
this.$buttons_measures_ex this.$buttons_measures_ex
.find("#container_computed_measure_operation_custom") .find("#container_computed_measure_operation_custom")
.removeClass("d-none"); .removeClass("d-none")
.addClass("d-table-row");
} else { } else {
const format = $option.data("format"); const format = $option.data("format");
if (format) { if (format) {
@ -186,6 +187,7 @@ odoo.define("web_pivot_computed_measure.PivotController", function(require) {
} }
this.$buttons_measures_ex this.$buttons_measures_ex
.find("#container_computed_measure_operation_custom") .find("#container_computed_measure_operation_custom")
.removeClass("d-table-row")
.addClass("d-none"); .addClass("d-none");
} }
}, },

9
web_pivot_computed_measure/static/src/scss/web_pivot_computed_measure.scss 100644
View File

@ -0,0 +1,9 @@
#add_computed_measure_wrapper {
padding: 0 20px;
min-width: 300px;
white-space: nowrap;
.d-table-cell {
vertical-align: middle;
padding: 3px 0;
}
}

77
web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml
View File

@ -59,12 +59,13 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
</span> </span>
</a> </a>
<t t-if="isOpen"> <t t-if="isOpen">
<div class="dropdown-item-text"> <div id="add_computed_measure_wrapper" class="d-table">
<div class="d-table-row">
<div class="d-table-cell">
<label for="computed_measure_field_1">Measure 1</label> <label for="computed_measure_field_1">Measure 1</label>
<select </div>
class="o_input o_date_field_selector" <div class="d-table-cell">
id="computed_measure_field_1" <select class="o_input" id="computed_measure_field_1">
>
<t t-foreach="measures" t-as="measure"> <t t-foreach="measures" t-as="measure">
<option t-att-value="measure[0]"> <option t-att-value="measure[0]">
<t t-esc="measure[1].string" /> <t t-esc="measure[1].string" />
@ -72,12 +73,13 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
</t> </t>
</select> </select>
</div> </div>
<div class="dropdown-item-text"> </div>
<div class="d-table-row">
<div class="d-table-cell">
<label for="computed_measure_field_2">Measure 2</label> <label for="computed_measure_field_2">Measure 2</label>
<select </div>
class="o_input o_time_range_selector" <div class="d-table-cell">
id="computed_measure_field_2" <select class="o_input" id="computed_measure_field_2">
>
<t t-foreach="measures" t-as="measure"> <t t-foreach="measures" t-as="measure">
<option t-att-value="measure[0]"> <option t-att-value="measure[0]">
<t t-esc="measure[1].string" /> <t t-esc="measure[1].string" />
@ -85,48 +87,71 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
</t> </t>
</select> </select>
</div> </div>
<div class="dropdown-item-text"> </div>
<div class="d-table-row">
<div class="d-table-cell">
<label for="computed_measure_operation">Operation</label> <label for="computed_measure_operation">Operation</label>
<select </div>
class="o_input o_time_range_selector" <div class="d-table-cell">
id="computed_measure_operation" <select class="o_input" id="computed_measure_operation">
>
<t <t
t-call="web_pivot_computed_measure.ComputedMeasureOperations" t-call="web_pivot_computed_measure.ComputedMeasureOperations"
/> />
</select> </select>
</div> </div>
</div>
<div <div
t-if="debug" t-if="debug"
class="dropdown-item-text d-none" class="d-none"
id="container_computed_measure_operation_custom" id="container_computed_measure_operation_custom"
> >
<label for="computed_measure_operation_custom">Formula</label> <div class="d-table-cell">
<input type="text" id="computed_measure_operation_custom" /> <label
for="computed_measure_operation_custom"
>Formula</label>
</div> </div>
<div class="dropdown-item-text"> <div class="d-table-cell">
<input
type="text"
class="o_input"
id="computed_measure_operation_custom"
/>
</div>
</div>
<div class="d-table-row">
<div class="d-table-cell">
<label for="computed_measure_name">Name</label> <label for="computed_measure_name">Name</label>
</div>
<div class="d-table-cell">
<input <input
placeholder="Can be empty" placeholder="Can be empty"
type="text" type="text"
class="o_input"
id="computed_measure_name" id="computed_measure_name"
/> />
</div> </div>
<div class="dropdown-item-text"> </div>
<div class="d-table-row">
<div class="d-table-cell">
<label for="computed_measure_format">Format</label> <label for="computed_measure_format">Format</label>
<select </div>
class="o_input o_time_range_selector" <div class="d-table-cell">
id="computed_measure_format" <select class="o_input" id="computed_measure_format">
> <t
<t t-call="web_pivot_computed_measure.ComputedMeasureFormats" /> t-call="web_pivot_computed_measure.ComputedMeasureFormats"
/>
</select> </select>
</div> </div>
<div class="dropdown-item-text"> </div>
<div class="d-table-row">
<div class="d-table-cell">
<button <button
class="btn btn-primary o_add_computed_measure" class="btn btn-primary o_add_computed_measure"
type="button" type="button"
>Add</button> >Add</button>
</div> </div>
</div>
</div>
</t> </t>
</div> </div>
</t> </t>

4
web_pivot_computed_measure/view/assets.xml
View File

@ -10,6 +10,10 @@
type="text/javascript" type="text/javascript"
src="/web_pivot_computed_measure/static/src/js/pivot_controller.js" src="/web_pivot_computed_measure/static/src/js/pivot_controller.js"
/> />
<link
rel="stylesheet"
href="/web_pivot_computed_measure/static/src/scss/web_pivot_computed_measure.scss"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>