diff --git a/addons/tk_construction_management/static/src/js/construction_dashboard.js b/addons/tk_construction_management/static/src/js/construction_dashboard.js
index d2d551c..f68283a 100644
--- a/addons/tk_construction_management/static/src/js/construction_dashboard.js
+++ b/addons/tk_construction_management/static/src/js/construction_dashboard.js
@@ -45,8 +45,6 @@ export class ConstructionDashboard extends Component {
 //            args: [false, false],
 //        });
         const result = await this.orm.call("tk.construction.dashboard", "get_construction_state", [false, false]);
-        console.log(result,'dasdsa');
-
         this.state.stats = result;
         this.state.sites = Object.entries(result.con_sites || {}).map(([id, name]) => ({ id, name }));
         this.renderCharts(result);
@@ -82,7 +80,6 @@ export class ConstructionDashboard extends Component {
 
         this.state.stats = data;
         this.renderCharts(data);
-        console.log(this.state.stats,'dasdsa');
     }
 
     openAction(name, resModel, domain = []) {
@@ -221,6 +218,16 @@ export class ConstructionDashboard extends Component {
     renderGraph(el, options) {
         if (!el) return;
         el.innerHTML = "";
+        // NaN-guard: ApexCharts emits 'M NaN NaN A NaN' SVG warnings when series is
+        // empty or all zeros (donut/pie divide by total=0). Show 'No data' instead.
+        const series = options.series || [];
+        const hasData = series.some((s) =>
+            typeof s === 'number' ? s > 0 : (s && s.data && s.data.length > 0)
+        );
+        if (!hasData) {
+            el.innerHTML = '<div class="text-muted text-center p-4">No data</div>';
+            return;
+        }
         const chart = new ApexCharts(el, options);
         chart.render();
     }
diff --git a/addons/tk_construction_management/views/construction_project_view.xml b/addons/tk_construction_management/views/construction_project_view.xml
index bc69857..a43ef1e 100644
--- a/addons/tk_construction_management/views/construction_project_view.xml
+++ b/addons/tk_construction_management/views/construction_project_view.xml
@@ -334,11 +334,7 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/construction_site_view.xml b/addons/tk_construction_management/views/construction_site_view.xml
index 17d3f02..a38d1ce 100644
--- a/addons/tk_construction_management/views/construction_site_view.xml
+++ b/addons/tk_construction_management/views/construction_site_view.xml
@@ -306,11 +306,7 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/internal_transfer_view.xml b/addons/tk_construction_management/views/internal_transfer_view.xml
index 44e82f8..ae69d98 100644
--- a/addons/tk_construction_management/views/internal_transfer_view.xml
+++ b/addons/tk_construction_management/views/internal_transfer_view.xml
@@ -164,11 +164,7 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/job_costing_view.xml b/addons/tk_construction_management/views/job_costing_view.xml
index 07454a0..a017205 100644
--- a/addons/tk_construction_management/views/job_costing_view.xml
+++ b/addons/tk_construction_management/views/job_costing_view.xml
@@ -186,11 +186,7 @@
                             </group>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/job_order_view.xml b/addons/tk_construction_management/views/job_order_view.xml
index ae810d7..a900e81 100644
--- a/addons/tk_construction_management/views/job_order_view.xml
+++ b/addons/tk_construction_management/views/job_order_view.xml
@@ -234,11 +234,7 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/material_requisition_view.xml b/addons/tk_construction_management/views/material_requisition_view.xml
index 2d5b83c..e3464a7 100644
--- a/addons/tk_construction_management/views/material_requisition_view.xml
+++ b/addons/tk_construction_management/views/material_requisition_view.xml
@@ -228,11 +228,7 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/project_budget_view.xml b/addons/tk_construction_management/views/project_budget_view.xml
index 89aa884..de30c39 100644
--- a/addons/tk_construction_management/views/project_budget_view.xml
+++ b/addons/tk_construction_management/views/project_budget_view.xml
@@ -55,11 +55,7 @@
                             <field name="reject_reason" invisible="status != 'reject'"/>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/quality_check_view.xml b/addons/tk_construction_management/views/quality_check_view.xml
index 19e0f9a..92e39af 100644
--- a/addons/tk_construction_management/views/quality_check_view.xml
+++ b/addons/tk_construction_management/views/quality_check_view.xml
@@ -65,11 +65,7 @@
                             <field name="reject_reason" invisible="qc_status != 'reject'"/>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
@@ -179,11 +175,7 @@
                             <field name="reject_reason" invisible="qc_status != 'reject'"/>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
@@ -293,11 +285,7 @@
                             <field name="reject_reason" invisible="qc_status != 'reject'"/>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/rate_analysis_view.xml b/addons/tk_construction_management/views/rate_analysis_view.xml
index a104b53..c093f73 100644
--- a/addons/tk_construction_management/views/rate_analysis_view.xml
+++ b/addons/tk_construction_management/views/rate_analysis_view.xml
@@ -103,11 +103,7 @@
                             <field name="total_amount"/>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>
diff --git a/addons/tk_construction_management/views/sub_contract_view.xml b/addons/tk_construction_management/views/sub_contract_view.xml
index 64bd770..14ea9f5 100644
--- a/addons/tk_construction_management/views/sub_contract_view.xml
+++ b/addons/tk_construction_management/views/sub_contract_view.xml
@@ -699,11 +699,7 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids"/>
-                    </div>
+                    <chatter/>
                 </form>
             </field>
         </record>