From e6ea19113bcca508a166e576be50adaf49842b55 Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Tue, 29 Nov 2022 16:18:22 +0530
Subject: [PATCH] Nov 29 : [UPDT] Updated 'odoo_dynamic_dashboard'

---
 odoo_dynamic_dashboard/__manifest__.py                |  2 +-
 odoo_dynamic_dashboard/doc/RELEASE_NOTES.md           |  4 ++++
 odoo_dynamic_dashboard/models/dashboard_block.py      |  3 ---
 .../static/src/js/dynamic_dashboard.js                | 10 +++++-----
 odoo_dynamic_dashboard/views/dashboard_view.xml       | 11 -----------
 odoo_dynamic_dashboard/views/dynamic_block_view.xml   |  4 +---
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/odoo_dynamic_dashboard/__manifest__.py b/odoo_dynamic_dashboard/__manifest__.py
index f5ddf6c03..34b1e990b 100644
--- a/odoo_dynamic_dashboard/__manifest__.py
+++ b/odoo_dynamic_dashboard/__manifest__.py
@@ -21,7 +21,7 @@
 #############################################################################
 {
     'name': "Odoo Dynamic Dashboard",
-    'version': '15.0.1.0.1',
+    'version': '15.0.1.0.2',
     'summary': """Create Configurable Dashboards Easily""",
     'description': """Create Configurable Dashboard Dynamically to get the information that are relevant to your business, department, or a specific process or need, Dynamic Dashboard, Dashboard, Dashboard Odoo""",
     'author': 'Cybrosys Techno Solutions',
diff --git a/odoo_dynamic_dashboard/doc/RELEASE_NOTES.md b/odoo_dynamic_dashboard/doc/RELEASE_NOTES.md
index 1faf9af90..8ca44ea1d 100755
--- a/odoo_dynamic_dashboard/doc/RELEASE_NOTES.md
+++ b/odoo_dynamic_dashboard/doc/RELEASE_NOTES.md
@@ -7,3 +7,7 @@
 #### Version 15.0.1.0.1
 ##### Style Updated
 
+#### 06.10.2022
+#### Version 15.0.1.0.2
+##### Code modified
+
diff --git a/odoo_dynamic_dashboard/models/dashboard_block.py b/odoo_dynamic_dashboard/models/dashboard_block.py
index f203260ba..9f9a7d962 100644
--- a/odoo_dynamic_dashboard/models/dashboard_block.py
+++ b/odoo_dynamic_dashboard/models/dashboard_block.py
@@ -99,8 +99,6 @@ class DashboardBlock(models.Model):
                                                                group_by=rec.group_by)
                     self._cr.execute(query)
                     records = self._cr.dictfetchall()
-                    print(query,"query")
-                    print(records,"records")
                     x_axis = []
                     for record in records:
                         x_axis.append(record.get(rec.group_by.name))
@@ -127,7 +125,6 @@ class DashboardBlock(models.Model):
                     records[0]['value'] = val
                     vals.update(records[0])
             block_id.append(vals)
-        print(block_id,"dhressssssssssss")
         return block_id
 
 
diff --git a/odoo_dynamic_dashboard/static/src/js/dynamic_dashboard.js b/odoo_dynamic_dashboard/static/src/js/dynamic_dashboard.js
index 9951f4d5c..71bfe26ab 100644
--- a/odoo_dynamic_dashboard/static/src/js/dynamic_dashboard.js
+++ b/odoo_dynamic_dashboard/static/src/js/dynamic_dashboard.js
@@ -28,13 +28,11 @@ var DynamicDashboard = AbstractAction.extend({
     start: function() {
         var self = this;
         this.set("title", 'Dashboard');
-
         return this._super().then(function() {
             self.render_dashboards();
         });
     },
 
-
     willStart: function() {
         var self = this;
         return $.when(ajax.loadLibs(this), this._super()).then(function() {
@@ -135,8 +133,6 @@ var DynamicDashboard = AbstractAction.extend({
         var options = { },
         doughnut_data = [data,options]
         return doughnut_data;
-
-
     },
 
     get_values_radar : function(block){
@@ -169,11 +165,14 @@ var DynamicDashboard = AbstractAction.extend({
         var self = this;
         _.each(this.block_ids, function(block) {
                 if (block['type'] == 'tile') {
+                    console.log('INSIDE IF');
                     self.$('.o_dynamic_dashboard').append(QWeb.render('DynamicDashboardTile', {widget: block}));
                 }
                 else{
+                    console.log('INSIDE ELSE');
                     self.$('.o_dynamic_chart').append(QWeb.render('DynamicDashboardChart', {widget: block}));
                     var element = $('[data-id=' + block['id'] + ']')
+                    console.log('INSIDE ELSE 2');
                     if (!('x_axis' in block)){
                         return false
                     }
@@ -181,6 +180,7 @@ var DynamicDashboard = AbstractAction.extend({
                     var type = block['graph_type']
                     var chart_type = 'self.get_values_' + `${type}(block)`
                     var data = eval(chart_type)
+                    console.log('chart_type: ', chart_type);
                   //create Chart class object
                   var chart = new Chart(ctx, {
                     type: type,
@@ -266,4 +266,4 @@ core.action_registry.add('dynamic_dashboard', DynamicDashboard);
 
 return DynamicDashboard;
 
-});
+});
\ No newline at end of file
diff --git a/odoo_dynamic_dashboard/views/dashboard_view.xml b/odoo_dynamic_dashboard/views/dashboard_view.xml
index 3fed4b267..a6524a756 100644
--- a/odoo_dynamic_dashboard/views/dashboard_view.xml
+++ b/odoo_dynamic_dashboard/views/dashboard_view.xml
@@ -8,16 +8,5 @@
         <menuitem name="Dashboard" id="menu_dashboard" sequence="1"/>
         <menuitem name="Dashboards" id="menu_dynamic_dashboard" parent="odoo_dynamic_dashboard.menu_dashboard"
                   sequence="1" action="action_dynamic_dashboard"/>
-
-<!--        <template id="assets_backend_dashboard" name="dynamic-dashboard assets inherit" inherit_id="web.assets_backend">-->
-<!--            <xpath expr="." position="inside">-->
-<!--                <script type="text/javascript" src="/odoo_dynamic_dashboard/static/src/js/dynamic_dashboard.js"/>-->
-
-<!--                <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet" />-->
-<!--				<link rel="stylesheet" type="text/scss" href="/odoo_dynamic_dashboard/static/src/scss/style.scss" />-->
-<!--                <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.bundle.js"/>-->
-<!--            </xpath>-->
-<!--        </template>-->
-
     </data>
 </odoo>
\ No newline at end of file
diff --git a/odoo_dynamic_dashboard/views/dynamic_block_view.xml b/odoo_dynamic_dashboard/views/dynamic_block_view.xml
index e184a3117..cb2162600 100644
--- a/odoo_dynamic_dashboard/views/dynamic_block_view.xml
+++ b/odoo_dynamic_dashboard/views/dynamic_block_view.xml
@@ -27,7 +27,7 @@
                         <group>
                             <field name="sequence" invisible="1"/>
                             <field name="type" required="1"/>
-                            <field name="graph_type" attrs="{'invisible': [('type','not in', 'graph')]}"/>
+                            <field name="graph_type" attrs="{'invisible': [('type','not in', 'graph')], 'required':[('type', '=', 'graph')]}"/>
                             <field name="graph_size" attrs="{'invisible': [('type','not in', 'graph')]}"/>
                             <field name="fa_icon" attrs="{'invisible': [('type','not in', 'tile')]}"/>
                             <field name="group_by" attrs="{'invisible': [('type','not in', 'graph')], 'required':[('edit_mode','=', True),('type','=','graph')]}"
@@ -64,6 +64,4 @@
     </record>
     <menuitem name="Blocks" id="menu_dynamic_dashboard_blocks" parent="odoo_dynamic_dashboard.menu_dashboard"
               sequence="1" action="action_dashboard_block"/>
-
-
 </odoo>
\ No newline at end of file