Counting time between 2 hours

Author: Stigmatoz

src/assets/css/main.css

@@ -19,19 +19,14 @@ body {
   padding: 0;
   margin: 0;
 }
-.no-data {
-  text-align: center;
-  font-size: 16px;
-  font-weight: 600;
-  margin-top: 30%;
-}
 .tabs {
 }
 .tabs input[name='tab-control'] {
   display: none;
 }
 .tabs .content section h2,
 .tabs ul li label {
+  
   font-size: 15px;
   color: #428bff;
 }

src/components/TimeIntervalChart.vue

@@ -51,18 +51,44 @@ const hours: number[] = [];
 
 isLoaded.value = false;
 
-function convertTimIntervalToObject(timeInterval: string, domain: string): DomainsInterval | null {
+function convertTimIntervalToObject(
+  timeInterval: string,
+  domain: string,
+): DomainsInterval[] | null {
   const array = timeInterval.split('-');
   const time1 = array[0].split(':');
   const time2 = array[1].split(':');
-  //добавить подсчет, если в разных часах интервал
   if (time1[0] == time2[0]) {
-    return {
-      hour: Number(time1[0]),
+    return [
+      {
+        hour: Number(time1[0]),
+        summary:
+          convertStringTimeIntervalToSeconds(array[1]) -
+          convertStringTimeIntervalToSeconds(array[0]),
+        domain: domain,
+      },
+    ];
+  } else {
+    const arr = [];
+    const firstPart1 = array[0];
+    const firstPart2 = `${time1[0]}:59:59`;
+    arr.push({
+      hour: Number(firstPart1[0]),
       summary:
-        convertStringTimeIntervalToSeconds(array[1]) - convertStringTimeIntervalToSeconds(array[0]),
+        convertStringTimeIntervalToSeconds(firstPart2) -
+        convertStringTimeIntervalToSeconds(firstPart1),
       domain: domain,
-    };
+    });
+    const secondPart1 = `${time2[0]}:00:00`;
+    const secondPart2 = `${time2[0]}:${time2[1]}:${time2[2]}`;
+    arr.push({
+      hour: Number(secondPart1[0]),
+      summary:
+        convertStringTimeIntervalToSeconds(secondPart2) -
+        convertStringTimeIntervalToSeconds(secondPart1),
+      domain: domain,
+    });
+    return arr;
   }
   return null;
 }
@@ -77,12 +103,14 @@ function fillData(timeIntervalList: TimeInterval[]) {
     intervals.forEach(array => {
       const i = array.intervals;
       i.forEach(time => {
-        const obj = convertTimIntervalToObject(time, domain);
-        if (obj != null) {
-          const existDomain = intervalsObj.find(x => x.domain == domain && x.hour == obj.hour);
-          if (existDomain != undefined) {
-            existDomain.summary += obj.summary;
-          } else intervalsObj.push(obj);
+        const objs = convertTimIntervalToObject(time, domain);
+        if (objs != null && objs.length > 0) {
+          objs.forEach(obj => {
+            const existDomain = intervalsObj.find(x => x.domain == domain && x.hour == obj.hour);
+            if (existDomain != undefined) {
+              existDomain.summary += obj.summary;
+            } else intervalsObj.push(obj);
+          });
         }
       });
     });

src/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_extName__",
   "short_name": "Web Tracker",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "__MSG_extDescription__",
   "options_page": "src/dashboard.html",
   "default_locale": "en",