From 2d4a7f1f9e7369229c9f1ece0568042d0ef24025 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 25 Feb 2022 00:05:20 +0000
Subject: [PATCH]

---
 .../components/dash-labor-hours-personal.vue  | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/ayanova/src/components/dash-labor-hours-personal.vue b/ayanova/src/components/dash-labor-hours-personal.vue
index 249660a6..ae84403c 100644
--- a/ayanova/src/components/dash-labor-hours-personal.vue
+++ b/ayanova/src/components/dash-labor-hours-personal.vue
@@ -119,27 +119,21 @@ export default {
       //so as similar as possible to the datatable system but handles the math and summarizing ideally in the db server itself
       /*
       DateTrunc https://www.postgresqltutorial.com/postgresql-date_trunc/ will respect changes of month or year or whatever so this works 
-     SELECT SUM(AWORKORDERITEMLABOR.serviceratequantity), date_trunc('day',AWORKORDERITEMLABOR.servicestartdate) m
+
+SELECT row_to_json(t) as res from (
+	
+	select SUM(AWORKORDERITEMLABOR.serviceratequantity) SERVICERATESUM, date_trunc('month',AWORKORDERITEMLABOR.servicestartdate) timeframe
 
 FROM AWORKORDER
 		LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
 		LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
 		WHERE AWORKORDERITEMLABOR.userid = 10
 
-GROUP BY m
-ORDER BY m ASC;
+GROUP BY timeframe
+ORDER BY timeframe ASC
+) t
 
 
-SELECT SUM(AWORKORDERITEMLABOR.serviceratequantity), date_trunc('month',AWORKORDERITEMLABOR.servicestartdate) m
-
-FROM AWORKORDER
-		LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
-		LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
-		WHERE AWORKORDERITEMLABOR.userid = 10
-
-GROUP BY m
-ORDER BY m ASC;
-
 
       */
       // try {