Skip to content

Commit 11ecc70

Browse files
CarlosRoca13CarlosRoca13
committed
[FIX] spreadsheet_oca: run pre-commit
1 parent 16f6e43 commit 11ecc70

23 files changed

+182
-327
lines changed

‎spreadsheet_oca/data/spreadsheet_spreadsheet_import_mode.xml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
<field name="code">new</field>
88
<field name="name">Create spreadsheet</field>
99
<field name="sequence" eval="10" />
10-
<field
11-
name="group_ids"
12-
eval="[(4, ref('spreadsheet_oca.group_user'))]"
13-
/>
10+
<field name="group_ids" eval="[(4, ref('spreadsheet_oca.group_user'))]" />
1411
</record>
1512
<record
1613
id="spreadsheet_import_mode_add"
@@ -19,10 +16,7 @@
1916
<field name="code">add</field>
2017
<field name="name">Add to spreadsheet</field>
2118
<field name="sequence" eval="15" />
22-
<field
23-
name="group_ids"
24-
eval="[(4, ref('spreadsheet_oca.group_user'))]"
25-
/>
19+
<field name="group_ids" eval="[(4, ref('spreadsheet_oca.group_user'))]" />
2620
</record>
2721
<record
2822
id="spreadsheet_import_mode_add_sheet"
@@ -31,9 +25,6 @@
3125
<field name="code">add_sheet</field>
3226
<field name="name">Add sheet to spreadsheet</field>
3327
<field name="sequence" eval="16" />
34-
<field
35-
name="group_ids"
36-
eval="[(4, ref('spreadsheet_oca.group_user'))]"
37-
/>
28+
<field name="group_ids" eval="[(4, ref('spreadsheet_oca.group_user'))]" />
3829
</record>
3930
</odoo>

‎spreadsheet_oca/demo/demo_spreadsheet.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
"cols": {},
1111
"merges": [],
1212
"cells": {
13-
"A1": { "style": 1, "content": "First Value", "border": 1 },
14-
"A2": { "format": 1, "content": "30.55", "border": 1 },
15-
"B1": { "style": 1, "content": "Second Value", "border": 1 },
16-
"B2": { "format": 1, "content": "50", "border": 1 },
17-
"C1": { "style": 1, "content": "Total", "border": 1 },
18-
"C2": { "format": 1, "content": "=sum(A2:B2)", "border": 1 },
19-
"A3": { "border": 2 },
20-
"B3": { "border": 2 },
21-
"C3": { "border": 2 },
22-
"D1": { "border": 3 },
23-
"D2": { "border": 3 }
13+
"A1": {"style": 1, "content": "First Value", "border": 1},
14+
"A2": {"format": 1, "content": "30.55", "border": 1},
15+
"B1": {"style": 1, "content": "Second Value", "border": 1},
16+
"B2": {"format": 1, "content": "50", "border": 1},
17+
"C1": {"style": 1, "content": "Total", "border": 1},
18+
"C2": {"format": 1, "content": "=sum(A2:B2)", "border": 1},
19+
"A3": {"border": 2},
20+
"B3": {"border": 2},
21+
"C3": {"border": 2},
22+
"D1": {"border": 3},
23+
"D2": {"border": 3}
2424
},
2525
"conditionalFormats": [],
2626
"figures": [],
@@ -30,17 +30,17 @@
3030
}
3131
],
3232
"entities": {},
33-
"styles": { "1": { "bold": true, "align": "center" } },
34-
"formats": { "1": "[$$]#,##0.00" },
33+
"styles": {"1": {"bold": true, "align": "center"}},
34+
"formats": {"1": "[$$]#,##0.00"},
3535
"borders": {
3636
"1": {
3737
"top": ["thin", "#000"],
3838
"bottom": ["thin", "#000"],
3939
"left": ["thin", "#000"],
4040
"right": ["thin", "#000"]
4141
},
42-
"2": { "top": ["thin", "#000"] },
43-
"3": { "left": ["thin", "#000"] }
42+
"2": {"top": ["thin", "#000"]},
43+
"3": {"left": ["thin", "#000"]}
4444
},
4545
"revisionId": "START_REVISION",
4646
"uniqueFigureIds": true,

‎spreadsheet_oca/security/security.xml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
<record model="ir.rule" id="spreadsheet_company_rule">
2424
<field name="name">Spreadsheet Company Rule</field>
2525
<field name="model_id" ref="model_spreadsheet_spreadsheet" />
26-
<field
27-
name="domain_force"
28-
>[('company_id', 'in', company_ids + [False])]</field>
26+
<field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
2927
</record>
3028
<record model="ir.rule" id="spreadsheet_owner_rule">
3129
<field name="name">Spreadsheet Owner</field>
@@ -57,20 +55,12 @@
5755
<record model="ir.rule" id="spreadsheet_manager_rule">
5856
<field name="name">Spreadsheet Manager</field>
5957
<field name="model_id" ref="model_spreadsheet_spreadsheet" />
60-
<field
61-
name="groups"
62-
eval="[(4, ref('spreadsheet_oca.group_manager'))]"
63-
/>
58+
<field name="groups" eval="[(4, ref('spreadsheet_oca.group_manager'))]" />
6459
<field name="domain_force">[(1,'=', 1)]</field>
6560
</record>
6661
<record model="ir.rule" id="spreadsheet_import_mode_rule">
6762
<field name="name">Spreadsheet Import mode</field>
68-
<field
69-
name="model_id"
70-
ref="model_spreadsheet_spreadsheet_import_mode"
71-
/>
72-
<field
73-
name="domain_force"
74-
>[('group_ids','in', user.groups_id.ids)]</field>
63+
<field name="model_id" ref="model_spreadsheet_spreadsheet_import_mode" />
64+
<field name="domain_force">[('group_ids','in', user.groups_id.ids)]</field>
7565
</record>
7666
</odoo>

‎spreadsheet_oca/static/src/pivot/pivot_table.esm.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/** @odoo-module */
22
/* Copyright 2024 Tecnativa - Carlos Roca
33
* License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */
4-
import { SpreadsheetPivotTable } from "@spreadsheet/pivot/pivot_table";
5-
import { patch } from "@web/core/utils/patch";
4+
import {SpreadsheetPivotTable} from "@spreadsheet/pivot/pivot_table";
5+
import {patch} from "@web/core/utils/patch";
66

77
patch(SpreadsheetPivotTable.prototype, {
88
get _dynamic_cols() {
@@ -53,9 +53,7 @@ patch(SpreadsheetPivotTable.prototype, {
5353
const vals = JSON.stringify(values);
5454
const maxLength = Math.max(...cols.map((col) => col.length));
5555
for (let i = 0; i < maxLength; i++) {
56-
const cellValues = cols.map((col) =>
57-
JSON.stringify((col[i] || {}).values)
58-
);
56+
const cellValues = cols.map((col) => JSON.stringify((col[i] || {}).values));
5957
if (cellValues.includes(vals)) {
6058
return i;
6159
}

‎spreadsheet_oca/static/src/spreadsheet/bundle/chart_panel.esm.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/** @odoo-module */
22

33
import * as spreadsheet from "@odoo/o-spreadsheet";
4-
import { patch } from "@web/core/utils/patch";
4+
import {patch} from "@web/core/utils/patch";
55

6-
const { chartRegistry } = spreadsheet.registries;
7-
const { ChartPanel } = spreadsheet.components;
6+
const {chartRegistry} = spreadsheet.registries;
7+
const {ChartPanel} = spreadsheet.components;
88
export function isOdooKey(code) {
99
return code.startsWith("odoo_");
1010
}

‎spreadsheet_oca/static/src/spreadsheet/bundle/chart_panels.esm.js‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
/** @odoo-module */
22

33
import * as spreadsheet from "@odoo/o-spreadsheet";
4-
import { Domain } from "@web/core/domain";
4+
import {Domain} from "@web/core/domain";
55

6-
import { Many2XAutocomplete } from "@web/views/fields/relational_utils";
7-
import { patch } from "@web/core/utils/patch";
8-
import { useService } from "@web/core/utils/hooks";
9-
import { _t } from "@web/core/l10n/translation";
6+
import {Many2XAutocomplete} from "@web/views/fields/relational_utils";
7+
import {patch} from "@web/core/utils/patch";
8+
import {useService} from "@web/core/utils/hooks";
9+
import {_t} from "@web/core/l10n/translation";
1010

11-
const {
12-
LineBarPieConfigPanel,
13-
ScorecardChartConfigPanel,
14-
GaugeChartConfigPanel,
15-
} = spreadsheet.components;
11+
const {LineBarPieConfigPanel, ScorecardChartConfigPanel, GaugeChartConfigPanel} =
12+
spreadsheet.components;
1613

1714
const menuChartProps = {
1815
setup() {

‎spreadsheet_oca/static/src/spreadsheet/bundle/filter_panel_datasources.esm.js‎

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/** @odoo-module **/
22

33
import * as spreadsheet from "@odoo/o-spreadsheet";
4-
import { Component, onWillStart, onWillUpdateProps } from "@odoo/owl";
5-
import {
6-
makeDynamicCols,
7-
makeDynamicRows,
8-
} from "../utils/dynamic_generators.esm";
9-
import { Domain } from "@web/core/domain";
10-
import { DomainSelector } from "@web/core/domain_selector/domain_selector";
11-
import { DomainSelectorDialog } from "@web/core/domain_selector_dialog/domain_selector_dialog";
12-
import { FormViewDialog } from "@web/views/view_dialogs/form_view_dialog";
13-
import { _t } from "@web/core/l10n/translation";
14-
import { formatDate } from "@web/core/l10n/dates";
15-
import { useService } from "@web/core/utils/hooks";
4+
import {Component, onWillStart, onWillUpdateProps} from "@odoo/owl";
5+
import {makeDynamicCols, makeDynamicRows} from "../utils/dynamic_generators.esm";
6+
import {Domain} from "@web/core/domain";
7+
import {DomainSelector} from "@web/core/domain_selector/domain_selector";
8+
import {DomainSelectorDialog} from "@web/core/domain_selector_dialog/domain_selector_dialog";
9+
import {FormViewDialog} from "@web/views/view_dialogs/form_view_dialog";
10+
import {_t} from "@web/core/l10n/translation";
11+
import {formatDate} from "@web/core/l10n/dates";
12+
import {useService} from "@web/core/utils/hooks";
1613

17-
const { DateTime } = luxon;
18-
const { sidePanelRegistry, topbarMenuRegistry } = spreadsheet.registries;
14+
const {DateTime} = luxon;
15+
const {sidePanelRegistry, topbarMenuRegistry} = spreadsheet.registries;
1916

2017
topbarMenuRegistry.addChild("data_sources", ["data"], (env) => {
2118
let sequence = 100;
@@ -37,7 +34,7 @@ topbarMenuRegistry.addChild("data_sources", ["data"], (env) => {
3734
name: env.model.getters.getListDisplayName(listId),
3835
sequence: sequence++,
3936
execute: (child_env) => {
40-
child_env.model.dispatch("SELECT_ODOO_LIST", { listId: listId });
37+
child_env.model.dispatch("SELECT_ODOO_LIST", {listId: listId});
4138
child_env.openSidePanel("ListPanel", {});
4239
},
4340
icon: "spreadsheet_oca.ListIcon",
@@ -121,15 +118,15 @@ export class PivotPanelDisplay extends Component {
121118
sheetId: this.env.model.getters.getActiveSheetId(),
122119
table: tableStructure,
123120
});
124-
this.env.model.dispatch("REFRESH_PIVOT", { id: this.props.pivotId });
121+
this.env.model.dispatch("REFRESH_PIVOT", {id: this.props.pivotId});
125122
}
126123

127124
async insertDynamicPivot() {
128125
const datasourceModel = await this.env.model.getters
129126
.getPivotDataSource(this.props.pivotId)
130127
.copyModelWithOriginalDomain();
131-
var { cols, rows, measures } = datasourceModel.getTableStructure().export();
132-
const { dynamic_rows, number_of_rows, dynamic_cols, number_of_cols } =
128+
var {cols, rows, measures} = datasourceModel.getTableStructure().export();
129+
const {dynamic_rows, number_of_rows, dynamic_cols, number_of_cols} =
133130
await new Promise((resolve) => {
134131
this.dialog.add(
135132
FormViewDialog,
@@ -148,7 +145,7 @@ export class PivotPanelDisplay extends Component {
148145
});
149146
},
150147
},
151-
{ onClose: () => resolve(false) }
148+
{onClose: () => resolve(false)}
152149
);
153150
});
154151
if (!dynamic_rows && !dynamic_cols) {
@@ -184,17 +181,14 @@ export class PivotPanelDisplay extends Component {
184181
sheetId: this.env.model.getters.getActiveSheetId(),
185182
table,
186183
});
187-
this.env.model.dispatch("REFRESH_PIVOT", { id: this.props.pivotId });
184+
this.env.model.dispatch("REFRESH_PIVOT", {id: this.props.pivotId});
188185
}
189186
delete() {
190-
this.env.askConfirmation(
191-
_t("Are you sure you want to delete this pivot?"),
192-
() => {
193-
this.env.model.dispatch("REMOVE_PIVOT", {
194-
pivotId: this.props.pivotId,
195-
});
196-
}
197-
);
187+
this.env.askConfirmation(_t("Are you sure you want to delete this pivot?"), () => {
188+
this.env.model.dispatch("REMOVE_PIVOT", {
189+
pivotId: this.props.pivotId,
190+
});
191+
});
198192
}
199193
}
200194

@@ -264,14 +258,11 @@ export class ListPanelDisplay extends Component {
264258
});
265259
}
266260
delete() {
267-
this.env.askConfirmation(
268-
_t("Are you sure you want to delete this list?"),
269-
() => {
270-
this.env.model.dispatch("REMOVE_ODOO_LIST", {
271-
listId: this.props.listId,
272-
});
273-
}
274-
);
261+
this.env.askConfirmation(_t("Are you sure you want to delete this list?"), () => {
262+
this.env.model.dispatch("REMOVE_ODOO_LIST", {
263+
listId: this.props.listId,
264+
});
265+
});
275266
}
276267
}
277268

‎spreadsheet_oca/static/src/spreadsheet/bundle/odoo_panels.esm.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/** @odoo-module */
22

33
import * as spreadsheet from "@odoo/o-spreadsheet";
4-
import { Domain } from "@web/core/domain";
5-
import { Many2XAutocomplete } from "@web/views/fields/relational_utils";
6-
import { useService } from "@web/core/utils/hooks";
7-
import { _t } from "@web/core/l10n/translation";
4+
import {Domain} from "@web/core/domain";
5+
import {Many2XAutocomplete} from "@web/views/fields/relational_utils";
6+
import {useService} from "@web/core/utils/hooks";
7+
import {_t} from "@web/core/l10n/translation";
88

9-
const { chartSidePanelComponentRegistry } = spreadsheet.registries;
10-
const { LineBarPieDesignPanel } = spreadsheet.components;
11-
const { Component } = owl;
9+
const {chartSidePanelComponentRegistry} = spreadsheet.registries;
10+
const {LineBarPieDesignPanel} = spreadsheet.components;
11+
const {Component} = owl;
1212

1313
export class OdooPanel extends Component {
1414
setup() {
@@ -73,7 +73,7 @@ export class OdooPanel extends Component {
7373
}
7474
}
7575
OdooPanel.template = "spreadsheet_oca.OdooPanel";
76-
OdooPanel.components = { Many2XAutocomplete };
76+
OdooPanel.components = {Many2XAutocomplete};
7777

7878
class OdooStackablePanel extends OdooPanel {
7979
onChangeStacked(ev) {

0 commit comments

Comments
 (0)