-
Notifications
You must be signed in to change notification settings - Fork 2.9k
First try #1130
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
eesteerina
wants to merge
21
commits into
odoo:19.0
Choose a base branch
from
odoo-dev:19.0-onboarding-esand
base: 19.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
First try #1130
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
9efdf59
First try
eesteerina b75db3b
[ADD] some elements added
eesteerina a29cdce
[ADD] elements added 2
eesteerina c3295cb
Update awesome_clicker/__manifest__.py
eesteerina 0ef923a
Update estate/models/estate_property.py
eesteerina 34a537f
[ADD] estate: add menus and action for property model
eesteerina e7ec16b
[IMP] estate: add defaults and reserved fields to property model
eesteerina ebfc72c
[IMP] estate: improve property views usability
eesteerina f3d41a7
[ADD] add property types, property tags and offers
eesteerina ed9fb0b
[IMP] corrections
eesteerina a4130ad
[IMP] Improved property with best price calculation, validity, deadline
eesteerina 60d1ea2
[ADD] confirmation buttons and interactions added
eesteerina 1be9f1c
[IMP] variables improved by adding some constraints
eesteerina 27e01b3
[ADD] connections between models
eesteerina 9386f03
[IMP] inheritance in some models
eesteerina daf3303
[ADD] New module added
eesteerina 2978944
[IMP] Improved views and added kanban view
eesteerina 95968ee
[IMP] Improve code quality
eesteerina 37aadb0
[ADD] awesome_owl buttons
eesteerina 6eac334
[CLN] Code cleaned
eesteerina 63e836c
[ADD] Awesome_dashboard creation
eesteerina File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,3 +127,6 @@ dmypy.json | |
|
|
||
| # Pyre type checker | ||
| .pyre/ | ||
|
|
||
| #launcher | ||
| .vscode/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import { Component, useState } from "@odoo/owl"; | ||
| import { registry } from "@web/core/registry"; | ||
| import { Layout } from "@web/search/layout"; | ||
| import { useService } from "@web/core/utils/hooks"; | ||
| import { DashboardItem } from "./dashboard_item/dashboard_item"; | ||
| import { Dialog } from "@web/core/dialog/dialog"; | ||
| import { CheckBox } from "@web/core/checkbox/checkbox"; | ||
| import { browser } from "@web/core/browser/browser"; | ||
|
|
||
| class AwesomeDashboard extends Component { | ||
| static template = "awesome_dashboard.AwesomeDashboard"; | ||
|
|
||
| static components = { Layout, DashboardItem }; | ||
|
|
||
| setup() { | ||
| this.action = useService("action"); | ||
| this.statistics = useState(useService("awesome_dashboard.statistics")); | ||
| this.items = registry.category("awesome_dashboard").getAll(); | ||
| this.dialog = useService("dialog"); | ||
| this.state = useState({disabledItems: browser.localStorage.getItem("disabledDashboardItems")?.split(",") || []}); | ||
| } | ||
|
|
||
| openConfiguration() { | ||
| this.dialog.add(ConfigurationDialog, { | ||
| items: this.items, | ||
| disabledItems: this.state.disabledItems, | ||
| onUpdateConfiguration: this.updateConfiguration.bind(this), | ||
| }) | ||
| } | ||
|
|
||
| updateConfiguration(newDisabledItems) { | ||
| this.state.disabledItems = newDisabledItems; | ||
| } | ||
|
|
||
| openCustomerView() { | ||
| this.action.doAction("base.action_partner_form"); | ||
| } | ||
|
|
||
| openLeads() { | ||
| this.action.doAction({ | ||
| type: "ir.actions.act_window", | ||
| name: "Lead", | ||
| res_model: "crm.lead", | ||
| views: [ | ||
| [false, "form"], | ||
| [false, "list"], | ||
| ] | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| class ConfigurationDialog extends Component { | ||
| static template = "awesome_dashboard.ConfigurationDialog"; | ||
| static components = { CheckBox, Dialog } | ||
| static props = [ "close", "items", "disabledItems", "onUpdateConfiguration" ]; | ||
|
|
||
| setup() { | ||
| this.items = useState(this.props.items.map((item) => { | ||
| return { | ||
| ...item, | ||
| enabled: !this.props.disabledItems.includes(item.id), | ||
| } | ||
| })); | ||
| } | ||
|
|
||
| done() { | ||
| this.props.close(); | ||
| } | ||
|
|
||
| onChange(checked, changedItem) { | ||
| changedItem.enabled = checked; | ||
| const newDisabledItems = Object.values(this.items).filter( | ||
| (item) => !item.enabled | ||
| ).map((item) => item.id) | ||
|
|
||
| browser.localStorage.setItem("disabledDashboardItems", newDisabledItems); | ||
| this.props.onUpdateConfiguration(newDisabledItems); | ||
| } | ||
| } | ||
|
|
||
| registry.category("lazy_components").add("AwesomeDashboard", AwesomeDashboard); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .o_dashboard { | ||
| background-color: paleturquoise; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <templates xml:space="preserve"> | ||
|
|
||
| <t t-name="awesome_dashboard.AwesomeDashboard"> | ||
| <Layout display="{controlPanel: {} }" className="'o_dashboard h-100'"> | ||
| <t t-set-slot="layout-buttons"> | ||
| <button class="btn btn-primary" t-on-click="openCustomerView">Customers</button> | ||
| <button class="btn btn-primary" t-on-click="openLeads">Leads</button> | ||
| </t> | ||
|
|
||
| <t t-set-slot="control-panel-additional-actions"> | ||
| <button t-on-click="openConfiguration" class="btn p-0 ms-1 border-0"> | ||
| <i class="fa fa-cog"></i> | ||
| </button> | ||
| </t> | ||
|
|
||
| <div class="d-flex flex-wrap" t-if="statistics.isReady"> | ||
| <t t-foreach="items" t-as="item" t-key="item.id"> | ||
| <DashboardItem t-if="!state.disabledItems.includes(item.id)" size="item.size || 1"> | ||
| <t t-set="itemProp" t-value="item.props ? item.props(statistics) : {'data': statistics}"/> | ||
| <t t-component="item.Component" t-props="itemProp" /> | ||
| </DashboardItem> | ||
| </t> | ||
| </div> | ||
| </Layout> | ||
| </t> | ||
|
|
||
| <t t-name="awesome_dashboard.ConfigurationDialog"> | ||
| <Dialog title="'Dashboard items configuration'"> | ||
| Which cards do you whish to see ? | ||
| <t t-foreach="items" t-as="item" t-key="item.id"> | ||
| <CheckBox value="item.enabled" onChange="(ev) => this.onChange(ev, item)"> | ||
| <t t-esc="item.description"/> | ||
| </CheckBox> | ||
| </t> | ||
| <t t-set-slot="footer"> | ||
| <button class="btn btn-primary" t-on-click="done"> | ||
| Done | ||
| </button> | ||
| </t> | ||
| </Dialog> | ||
| </t> | ||
|
|
||
| </templates> |
18 changes: 18 additions & 0 deletions
18
awesome_dashboard/static/src/dashboard/dashboard_item/dashboard_item.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import { Component } from "@odoo/owl"; | ||
|
|
||
| export class DashboardItem extends Component { | ||
| static template = "awesome_dashboard.DashboardItem" | ||
| static props = { | ||
| slots: { | ||
| type: Object, | ||
| shape: { | ||
| default: Object | ||
| }, | ||
| }, | ||
| size: { | ||
| type: Number, | ||
| default: 1, | ||
| optional: true, | ||
| }, | ||
| }; | ||
| } |
12 changes: 12 additions & 0 deletions
12
awesome_dashboard/static/src/dashboard/dashboard_item/dashboard_item.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <templates xml:space="preserve"> | ||
|
|
||
| <t t-name="awesome_dashboard.DashboardItem"> | ||
| <div class="card m-2 border-dark" t-attf-style="width: {{18*props.size}}rem;"> | ||
| <div class="card-body"> | ||
| <t t-slot="default"/> | ||
| </div> | ||
| </div> | ||
| </t> | ||
|
|
||
| </templates> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| import { NumberCard } from "./number_card/number_card"; | ||
| import { PieChartCard } from "./pie_chart_card/pie_chart_card"; | ||
| import { registry } from "@web/core/registry"; | ||
|
|
||
| const items = [ | ||
| { | ||
| id: "average_quantity", | ||
| description: "Average amount of t-shirt", | ||
| Component: NumberCard, | ||
| props: (data) => ({ | ||
| title: "Average amount of t-shirt by order this month", | ||
| value: data.average_quantity, | ||
| }) | ||
| }, | ||
| { | ||
| id: "average_time", | ||
| description: "Average time for an order", | ||
| Component: NumberCard, | ||
| props: (data) => ({ | ||
| title: "Average time for an order to go from 'new' to 'sent' or 'cancelled'", | ||
| value: data.average_time, | ||
| }) | ||
| }, | ||
| { | ||
| id: "number_new_orders", | ||
| description: "New orders this month", | ||
| Component: NumberCard, | ||
| props: (data) => ({ | ||
| title: "Number of new orders this month", | ||
| value: data.nb_new_orders, | ||
| }) | ||
| }, | ||
| { | ||
| id: "cancelled_orders", | ||
| description: "Cancelled orders this month", | ||
| Component: NumberCard, | ||
| props: (data) => ({ | ||
| title: "Number of cancelled orders this month", | ||
| value: data.nb_cancelled_orders, | ||
| }) | ||
| }, | ||
| { | ||
| id: "amount_new_orders", | ||
| description: "amount orders this month", | ||
| Component: NumberCard, | ||
| props: (data) => ({ | ||
| title: "Total amount of new orders this month", | ||
| value: data.total_amount, | ||
| }) | ||
| }, | ||
| { | ||
| id: "pie_chart", | ||
| description: "Shirt orders by size", | ||
| Component: PieChartCard, | ||
| size: 2, | ||
| props: (data) => ({ | ||
| title: "Shirt orders by size", | ||
| values: data.orders_by_size, | ||
| }) | ||
| } | ||
| ] | ||
|
|
||
| items.forEach(item => { | ||
| registry.category("awesome_dashboard").add(item.id, item); | ||
| }) |
13 changes: 13 additions & 0 deletions
13
awesome_dashboard/static/src/dashboard/number_card/number_card.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import { Component } from "@odoo/owl"; | ||
|
|
||
| export class NumberCard extends Component { | ||
| static template = "awesome_dashboard.NumberCard"; | ||
| static props = { | ||
| title: { | ||
| type: String, | ||
| }, | ||
| value: { | ||
| type: Number, | ||
| } | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
awesome_dashboard/static/src/dashboard/number_card/number_card.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <templates xml:space="preserve"> | ||
| <t t-name="awesome_dashboard.NumberCard" owl="1"> | ||
| <t t-esc="props.title"/> | ||
| <div class="fs-1 fw-bold text-success text-center"> | ||
| <t t-esc="props.value"/> | ||
| </div> | ||
| </t> | ||
| </templates> |
39 changes: 39 additions & 0 deletions
39
awesome_dashboard/static/src/dashboard/pie_chart/pie_chart.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import { loadJS } from "@web/core/assets"; | ||
| import { Component, onWillStart, useRef, onMounted, onWillUnmount, onPatched } from "@odoo/owl"; | ||
|
|
||
| export class PieChart extends Component { | ||
| static template = "awesome_dashboard.PieChart"; | ||
| static props = { | ||
| label: String, | ||
| data: Object, | ||
| }; | ||
|
|
||
| setup() { | ||
| this.canvasRef = useRef("canvas"); | ||
| onWillStart(() => loadJS(["/web/static/lib/Chart/Chart.js"])); | ||
|
|
||
| onMounted(() => {this.renderChart();}); | ||
| onPatched(() => { | ||
| this.chart.destroy(); | ||
| this.renderChart(); | ||
| }); | ||
| onWillUnmount(() => {this.chart.destroy();}); | ||
| } | ||
|
|
||
| renderChart() { | ||
| const labels = Object.keys(this.props.data); | ||
| const data = Object.values(this.props.data); | ||
| this.chart = new Chart(this.canvasRef.el, { | ||
| type: "pie", | ||
| data: { | ||
| labels: labels, | ||
| datasets: [ | ||
| { | ||
| label: this.props.label, | ||
| data: data, | ||
| }, | ||
| ], | ||
| }, | ||
| }); | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
awesome_dashboard/static/src/dashboard/pie_chart/pie_chart.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <templates xml:space="preserve"> | ||
|
|
||
| <t t-name="awesome_dashboard.PieChart"> | ||
| <div t-att-class="'h-100 ' + props.class" t-ref="root"> | ||
| <div class="h-100 position-relative" t-ref="container"> | ||
| <canvas t-ref="canvas" /> | ||
| </div> | ||
| </div> | ||
| </t> | ||
|
|
||
| </templates> |
15 changes: 15 additions & 0 deletions
15
awesome_dashboard/static/src/dashboard/pie_chart_card/pie_chart_card.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import { Component } from "@odoo/owl"; | ||
| import { PieChart } from "../pie_chart/pie_chart"; | ||
|
|
||
| export class PieChartCard extends Component { | ||
| static template = "awesome_dashboard.PieChartCard"; | ||
| static components = { PieChart } | ||
| static props = { | ||
| title: { | ||
| type: String, | ||
| }, | ||
| values: { | ||
| type: Object, | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
awesome_dashboard/static/src/dashboard/pie_chart_card/pie_chart_card.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <templates xml:space="preserve"> | ||
| <t t-name="awesome_dashboard.PieChartCard" owl="1"> | ||
| <t t-esc="props.title"/> | ||
| <PieChart data="props.values" label="''"/> | ||
| </t> | ||
| </templates> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure it was necessary to change this, we try not to change code for aestetic reasons once it has been merged, as it makes it harder to get the git blame to see who wrote it and find the commit that introduced the line.