diff --git a/Ui/package-lock.json b/Ui/package-lock.json
index 644acf7..751421a 100644
--- a/Ui/package-lock.json
+++ b/Ui/package-lock.json
@@ -24,6 +24,7 @@
         "bootstrap-icons": "^1.11.3",
         "bootswatch": "^5.3.3",
         "jest-editor-support": "*",
+        "moment": "^2.30.1",
         "ngx-pagination": "^6.0.3",
         "ngx-spinner": "^17.0.0",
         "ngx-toastr": "^19.0.0",
@@ -10701,6 +10702,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mrmime": {
       "version": "2.0.0",
       "dev": true,
diff --git a/Ui/package.json b/Ui/package.json
index 9c44e9b..371742a 100644
--- a/Ui/package.json
+++ b/Ui/package.json
@@ -26,6 +26,7 @@
     "bootstrap-icons": "^1.11.3",
     "bootswatch": "^5.3.3",
     "jest-editor-support": "*",
+    "moment": "^2.30.1",
     "ngx-pagination": "^6.0.3",
     "ngx-spinner": "^17.0.0",
     "ngx-toastr": "^19.0.0",
diff --git a/Ui/src/app/helpers/week.pipe.ts b/Ui/src/app/helpers/week.pipe.ts
index 396e470..1849e8d 100644
--- a/Ui/src/app/helpers/week.pipe.ts
+++ b/Ui/src/app/helpers/week.pipe.ts
@@ -1,4 +1,5 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {Pipe, PipeTransform} from '@angular/core';
+import moment from "moment";
 
 @Pipe({
   name: 'week'
@@ -6,11 +7,6 @@ import { Pipe, PipeTransform } from '@angular/core';
 export class WeekPipe implements PipeTransform {
 
   transform(value: Date, ...args: unknown[]): unknown {
-    const d = new Date(value);
-    let yearStart = +new Date(d.getFullYear(), 0, 1);
-    let today = +new Date(d.getFullYear(),d.getMonth(),d.getDate());
-    let dayOfYear = ((today - yearStart + 1) / 86400000);
-    return Math.ceil(dayOfYear / 7);
+    return moment(value).isoWeek();
   }
-
 }