react-weekly-planning 1.0.30 → 1.0.31

package/components/SumHoursContainer/index.js

@@ -1,5 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { memo } from "react";
+import { totalLabel } from "../../lib/utils";
 const SumHoursContainer = ({ groupId, tasks, weekOffset, calendarDate, sumHoursByGroups, sumHoursRender, className, style, }) => {
     if (sumHoursRender) {
         return (_jsx(_Fragment, { children: sumHoursRender({
@@ -10,6 +11,6 @@ const SumHoursContainer = ({ groupId, tasks, weekOffset, calendarDate, sumHoursB
                 sumHoursByGroups,
             }) }));
     }
-    return (_jsx("div", { style: Object.assign({ textAlign: "right", marginRight: "5px" }, style), className: `${className}`, children: sumHoursByGroups }));
+    return (_jsx("div", { style: Object.assign({ textAlign: "right", marginRight: "5px" }, style), className: `${className}`, children: totalLabel(sumHoursByGroups) }));
 };
 export default memo(SumHoursContainer);

package/components/SumHoursContainer/index.tsx

@@ -1,5 +1,6 @@
 import { memo } from "react";
 import { SumHoursContainerPropsType } from "../../definitions";
+import { millisecondsToHours, totalLabel } from "../../lib/utils";
 
 const SumHoursContainer = ({
   groupId,
@@ -30,7 +31,7 @@ const SumHoursContainer = ({
       style={{ textAlign: "right", marginRight: "5px", ...style }}
       className={`${className}`}
     >
-      {sumHoursByGroups}
+      {totalLabel(sumHoursByGroups)}
     </div>
   );
 };

package/lib/utils.js

@@ -241,12 +241,13 @@ export function compareWeekOffset(calendarDate, weekOffset, taskDate) {
 }
 export const sumHoursByGroups = (groupId, tasks, weekOffset, calendarDate) => {
     let sum = 0;
-    tasks === null || tasks === void 0 ? void 0 : tasks.forEach((task) => {
-        if (task.groupId === groupId &&
-            compareWeekOffset(calendarDate, weekOffset, task.taskDate) === true) {
-            sum += (task.taskEnd - task.taskStart) / 3600000;
-        }
-    });
+    if (tasks)
+        tasks.forEach((task) => {
+            if (task.groupId === groupId &&
+                compareWeekOffset(calendarDate, weekOffset, task.taskDate) === true) {
+                sum += task.taskEnd - task.taskStart;
+            }
+        });
     return sum;
 };
 export function saveTasksToLocalStorage(tasks) {
@@ -617,3 +618,23 @@ export const GetTimeRangeByDay = (start, end) => {
     }
     return range;
 };
+export function totalLabel(milliseconds) {
+    let label = "";
+    const hourConv = milliseconds / 3600000;
+    const truncHour = Math.trunc(hourConv);
+    if (hourConv !== truncHour) {
+        const deciHour = hourConv - truncHour;
+        const minConv = deciHour * 60;
+        const truncMin = Math.trunc(minConv);
+        if (truncMin !== minConv) {
+            const deciMin = minConv - truncMin;
+            const secConv = deciMin * 60;
+            label = `${truncHour}:${truncMin}:${Math.trunc(secConv)}`;
+        }
+        else
+            label = `${truncHour}:${minConv}:0`;
+    }
+    else
+        label = `${hourConv}:0:0`;
+    return label;
+}

package/lib/utils.ts

@@ -300,14 +300,15 @@ export const sumHoursByGroups = (
   calendarDate: Date
 ) => {
   let sum: number = 0;
-  tasks?.forEach((task: TaskType | any) => {
-    if (
-      task.groupId === groupId &&
-      compareWeekOffset(calendarDate, weekOffset, task.taskDate) === true
-    ) {
-      sum += (task.taskEnd - task.taskStart) / 3600000;
-    }
-  });
+  if (tasks)
+    tasks.forEach((task: TaskType | any) => {
+      if (
+        task.groupId === groupId &&
+        compareWeekOffset(calendarDate, weekOffset, task.taskDate) === true
+      ) {
+        sum += task.taskEnd - task.taskStart;
+      }
+    });
   return sum;
 };
 
@@ -946,3 +947,24 @@ export const GetTimeRangeByDay = (start: number, end: number) => {
   }
   return range;
 };
+
+export function totalLabel(milliseconds: number) {
+  let label = "";
+  const hourConv = milliseconds / 3600000;
+
+  const truncHour = Math.trunc(hourConv);
+
+  if (hourConv !== truncHour) {
+    const deciHour = hourConv - truncHour;
+    const minConv = deciHour * 60;
+    const truncMin = Math.trunc(minConv);
+
+    if (truncMin !== minConv) {
+      const deciMin = minConv - truncMin;
+      const secConv = deciMin * 60;
+      label = `${truncHour}:${truncMin}:${Math.trunc(secConv)}`;
+    } else label = `${truncHour}:${minConv}:0`;
+  } else label = `${hourConv}:0:0`;
+
+  return label;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-weekly-planning",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "main": "index.js",
   "scripts": {
     "test": "jest --env=jsdom",