From 144f36e0a01ba5336ba5f36c80d43caab66059d0 Mon Sep 17 00:00:00 2001
From: rxf <rexfue@gmail.com>
Date: Fri, 21 Apr 2023 17:33:52 +0200
Subject: [PATCH] added week to mapdata

package.json
  "version": "1.2.1",
  "date": "2023-04-21",
---
 Dockerfile_sensorapi | 2 +-
 actions/data4map.js  | 2 ++
 build_and_copy.sh    | 0
 docker-compose.yml   | 4 ++--
 package.json         | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 build_and_copy.sh

diff --git a/Dockerfile_sensorapi b/Dockerfile_sensorapi
index 53d7989..46f8c48 100644
--- a/Dockerfile_sensorapi
+++ b/Dockerfile_sensorapi
@@ -7,7 +7,7 @@ RUN mkdir -p /opt/app && cp -a /tmp/node_modules /opt/app/
 WORKDIR /opt/app
 ADD . /opt/app
 
-RUN apk add busybox-initscripts
+# RUN apk add busybox-initscripts
 RUN apk add --no-cache tzdata
 ENV TZ Europe/Berlin
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/actions/data4map.js b/actions/data4map.js
index a5f1b1c..d934bea 100644
--- a/actions/data4map.js
+++ b/actions/data4map.js
@@ -165,6 +165,8 @@ export var getData4map = async (params) => {
                         oneAktData.value = Math.round(sensor.values[v4map] * 100) / 100
                     }
                 }
+                let weeks = Math.round(diff / (7 * 24 * 3600 * 1000))
+                oneAktData.weeks = weeks
             }
             if (sensor.values.timestamp > lastDate) {
                 lastDate = sensor.values.timestamp
diff --git a/build_and_copy.sh b/build_and_copy.sh
old mode 100644
new mode 100755
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c1aa22..11e54c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,8 @@ services:
       INFLUXTOKEN: ${INFLUXTOKEN}
       LIVE: "true"
     ports:
-      - "3031:3000"
+      - "3004:3004"
     volumes:
-      - /var/log/sensorapi:/var/log
+      - ${PWD}/log/sensorapi:/var/log
     container_name: node_sensorapi
     restart: unless-stopped
diff --git a/package.json b/package.json
index 1ce0a25..fa3c540 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sensorapi",
-  "version": "1.2.0",
-  "date": "2023-04-07",
+  "version": "1.2.1",
+  "date": "2023-04-21",
   "private": true,
   "scripts": {
     "start": "node ./bin/www.js",