{FIX] Dummy push

VincentJanssen-Code · VincentJanssen-Code · commit 3507035316f6 · 2025-12-22T11:51:11.000+01:00
diff --git a/awesome_dashboard/__manifest__.py b/awesome_dashboard/__manifest__.py
@@ -24,7 +24,11 @@
     'assets': {
         'web.assets_backend': [
             'awesome_dashboard/static/src/**/*',
+            ('remove', 'awesome_dashboard/static/src/dashboard/**/**'),
         ],
+        'awesome_dashboard.dashboard': [
+            'awesome_dashboard/static/src/dashboard/**/**'
+        ]
     },
     'license': 'AGPL-3'
 }
diff --git a/awesome_dashboard/static/src/core/statistics.js b/awesome_dashboard/static/src/core/statistics.js
diff --git a/awesome_dashboard/static/src/dashboard.xml b/awesome_dashboard/static/src/dashboard.xml
diff --git a/awesome_dashboard/static/src/dashboard/ChartCard/ChartCard.js b/awesome_dashboard/static/src/dashboard/ChartCard/ChartCard.js
@@ -0,0 +1,13 @@
+import { Component } from "@odoo/owl";
+import { PieChart } from "../PieChart/PieChart";
+
+
+export class ChartCard extends Component {
+    static template = "awesome_dashboard.ChartCard";
+    static components = { PieChart};
+    static props = {
+        title: String,
+        label : String,
+        data : Object,
+    }
+}
diff --git a/awesome_dashboard/static/src/dashboard/ChartCard/ChartCard.xml b/awesome_dashboard/static/src/dashboard/ChartCard/ChartCard.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+    <t t-name="awesome_dashboard.ChartCard">
+        <h2 class="card-text o_text"> <t t-esc="props.title"></t></h2>
+        <PieChart data="props.data" label="props.label"/>
+    </t>
+</templates>
diff --git a/awesome_dashboard/static/src/dashboard/DashboardItem/DashboardItem.js b/awesome_dashboard/static/src/dashboard/DashboardItem/DashboardItem.js
diff --git a/awesome_dashboard/static/src/dashboard/DashboardItem/DashboardItem.xml b/awesome_dashboard/static/src/dashboard/DashboardItem/DashboardItem.xml
diff --git a/awesome_dashboard/static/src/dashboard/NumberCard/NumberCard.js b/awesome_dashboard/static/src/dashboard/NumberCard/NumberCard.js
@@ -0,0 +1,9 @@
+import { Component, onWillStart, useState} from "@odoo/owl";
+export class NumberCard extends Component {
+    static template = "awesome_dashboard.NumberCard";
+    static components = { };
+    static props = {
+        title: String,
+        value: Number
+    };
+}
diff --git a/awesome_dashboard/static/src/dashboard/NumberCard/NumberCard.xml b/awesome_dashboard/static/src/dashboard/NumberCard/NumberCard.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+    <t t-name="awesome_dashboard.NumberCard">
+        <div class="card-text o_text">
+            <h2> <t t-esc="props.title"></t></h2>
+            <t t-esc="props.value"/>
+        </div>
+    </t>
+</templates>
diff --git a/awesome_dashboard/static/src/dashboard/PieChart/PieChart.js b/awesome_dashboard/static/src/dashboard/PieChart/PieChart.js
@@ -25,8 +25,6 @@ export class PieChart extends Component
 
     renderChart()
     {
-        console.log(this.props.data)
-        console.log(this.props.label)
         this.chart = new Chart(this.canvasRef.el,
             {
                 type: 'doughnut',
diff --git a/awesome_dashboard/static/src/dashboard/PieChart/PieChart.xml b/awesome_dashboard/static/src/dashboard/PieChart/PieChart.xml
diff --git a/awesome_dashboard/static/src/dashboard/SettingsDialog/SettingsDialog.js b/awesome_dashboard/static/src/dashboard/SettingsDialog/SettingsDialog.js
@@ -0,0 +1,18 @@
+import { Component} from "@odoo/owl";
+import { Dialog } from "@web/core/dialog/dialog";
+
+export class SettingsDialog extends Component
+{
+    static template = "awesome_dashboard.SettingsDialog";
+    static components = {Dialog}
+    static props = {}
+
+    setup()
+    {
+        console.log("dialogue open");
+    }
+    done()
+    {
+        this.props.close();
+    }
+}
diff --git a/awesome_dashboard/static/src/dashboard/SettingsDialog/SettingsDialog.xml b/awesome_dashboard/static/src/dashboard/SettingsDialog/SettingsDialog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+    <t t-name="awesome_dashboard.SettingsDialog">
+        <div height="20">
+        <h1> Test Dialogue</h1>
+        <button t-on-click="done">Done</button>
+        </div>
+    </t>
+</templates>
diff --git a/awesome_dashboard/static/src/dashboard/dashboard.js b/awesome_dashboard/static/src/dashboard/dashboard.js
@@ -4,6 +4,7 @@ import { Layout } from "@web/search/layout";
 import { useService } from "@web/core/utils/hooks";
 import { DashboardItem } from "./DashboardItem/DashboardItem";
 import { PieChart } from "./PieChart/PieChart";
+import { SettingsDialog } from "./SettingsDialog/SettingsDialog";
 
 class AwesomeDashboard extends Component {
     static template = "awesome_dashboard.AwesomeDashboard";
@@ -12,12 +13,10 @@ class AwesomeDashboard extends Component {
     setup()
     {
         this.action = useService("action");
-        const statistics = useService("awsome_dashboard.statistics")
-        onWillStart(async ()=> 
-        {
-           this.result = await statistics.loadStatistics(); 
-           console.log(this.result);
-        });
+        this.result = useState(useService("awesome_dashboard.statistics"));
+        this.items = registry.category("awesome_dashboard").getAll();
+        this.dialog = useService("dialog");
+
     }
     openCustomers()
     {
@@ -32,7 +31,12 @@ class AwesomeDashboard extends Component {
             views: [[0,'list'],[1,'form']]
         }));
     }
+    openSettings()
+    {
+        this.dialog.add(SettingsDialog, {})
+    }
 }
 
-registry.category("actions").add("awesome_dashboard.dashboard", AwesomeDashboard);
+
+registry.category("lazy_components").add("AwesomeDashboard", AwesomeDashboard);
 
diff --git a/awesome_dashboard/static/src/dashboard/dashboard.scss b/awesome_dashboard/static/src/dashboard/dashboard.scss
diff --git a/awesome_dashboard/static/src/dashboard/dashboard.xml b/awesome_dashboard/static/src/dashboard/dashboard.xml
@@ -0,0 +1,29 @@
+<?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"> 
+                <div class="d-flex flex-warp">
+                    <button class="btn btn-primary" t-on-click="openCustomers">Customers</button>
+                    <button class="btn btn-primary" t-on-click="openLeads">Leads</button>
+                </div>
+            </t>
+            <t t-set-slot="control-panel-additional-actions">
+                <button class="btn p-2 ms-1 boarder-0" t-on-click="openSettings">
+                        <i class="fa fa-gear fa-solid"/>
+                </button>
+            </t>
+            <div class="flex-d flex-warp">
+               <t t-foreach="items" t-as="item" t-key="item.id">
+                    <DashboardItem size="item.size || 10">
+                        <t t-set="itemProp" t-value="item.props ? item.props(result) : {'data': result}"/>
+                        <t t-component="item.Component" t-props="itemProp" />
+                    </DashboardItem>
+                </t>
+            </div>
+            
+        </Layout>
+        
+    </t>
+
+</templates>
diff --git a/awesome_dashboard/static/src/dashboard/dashboard_items.js b/awesome_dashboard/static/src/dashboard/dashboard_items.js
@@ -0,0 +1,73 @@
+import { ChartCard } from "./ChartCard/ChartCard";
+import { NumberCard } from "./NumberCard/NumberCard";
+import { registry } from "@web/core/registry";
+
+const items = [
+    {
+        id:"avg_amount",
+        description: "Average amount of t-shirt by order this month",
+        Component : NumberCard,
+        size: 35,
+        props: (data) => ({
+            title: "Average amount of t-shirt by order this month",
+            value: data.average_quantity,
+        })
+    },
+    {
+        id:"avg_time",
+        description: "Average time for an order",
+        Component : NumberCard,
+        size: 35,
+        props: (data) => ({
+            title: "Average time for an order to go from ‘new’ to ‘sent’ or ‘cancelled’",
+            value: data.average_time
+        })
+    },
+    {
+        id:"nb_cancelled_orders",
+        description: "Number of cancelled orders this month",
+        Component : NumberCard,
+        size: 25,
+        props: (data) => ({
+            title: "Number of cancelled orders this month",
+            value: data.nb_cancelled_orders
+        })
+    },
+    {
+        id:"nb_new_orders",
+        description: "Number of new orders this month",
+        Component : NumberCard,
+        props: (data) => ({
+            title: "Number of new orders this month",
+            value: data.nb_new_orders
+        })
+    },
+    {
+        id:"total_amount",
+        description: "Total amount of new orders this month",
+        Component : NumberCard,
+        size: 45,
+        props: (data) => ({
+            title: "Total amount of new orders this month",
+            value: data.total_amount
+        })
+    },
+    {
+        id:"orders_by_size",
+        description: "Shirt by size",
+        Component : ChartCard,
+        size: 25,
+        props: (data) => ({
+            title: "Shirt by size",
+            label : "Shirt by size",
+            data : data.orders_by_size,
+        })
+    },  
+]
+items.forEach(item => {
+        registry.category("awesome_dashboard").add(item.id, item);   
+});
+    
+
+
+
diff --git a/awesome_dashboard/static/src/dashboard/statistics.js b/awesome_dashboard/static/src/dashboard/statistics.js
@@ -0,0 +1,20 @@
+import { registry } from "@web/core/registry";
+import { rpc } from "@web/core/network/rpc";
+import { reactive } from "@odoo/owl";
+
+const statistics = {
+    dependencies: [],
+    start(env) {
+        
+        const ret = reactive({isReady:false})
+        async function loadStatistics()
+        {
+            Object.assign(ret, await rpc("/awesome_dashboard/statistics"), {isReady:true});
+        }
+        setInterval(loadStatistics,1000*60*10);
+        
+        loadStatistics();
+        return ret;
+        }
+    };
+    registry.category("services").add("awesome_dashboard.statistics",statistics)
diff --git a/awesome_dashboard/static/src/dashboard_acion.js b/awesome_dashboard/static/src/dashboard_acion.js
@@ -0,0 +1,12 @@
+import { registry } from "@web/core/registry";
+import { LazyComponent } from "@web/core/assets";
+import { Component, xml } from "@odoo/owl";
+
+export class DashboardLoader extends Component {
+    static components = { LazyComponent};
+    static template = xml`
+        <LazyComponent bundle="'awesome_dashboard.dashboard'" Component="'AwesomeDashboard'" props="props" />
+    `;
+}
+
+registry.category("actions").add("awesome_dashboard.dashboard", DashboardLoader);

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ export class PieChart extends Component`
`25`	`25`
`26`	`26`	`renderChart()`
`27`	`27`	`{`
`28`		`- console.log(this.props.data)`
`29`		`- console.log(this.props.label)`
`30`	`28`	`this.chart = new Chart(this.canvasRef.el,`
`31`	`29`	`{`
`32`	`30`	`type: 'doughnut',`