From c4f67cb691fd11fd4def62ba4c68c78c4d450527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Wed, 27 Jul 2022 15:35:20 +0200 Subject: [PATCH] white standard worktime color in calendar --- build.gradle | 2 +- debian/timetrack/DEBIAN/postinst | 17 ++++++++++++----- src/main/resources/templates/done/list.html | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 6aeb5ce..88f8434 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'de.jottyfan' -version = '1.2.4' +version = '1.2.5' sourceCompatibility = '11' ext['spring-framework.version'] = '5.3.18' diff --git a/debian/timetrack/DEBIAN/postinst b/debian/timetrack/DEBIAN/postinst index 9f43aae..779daf4 100755 --- a/debian/timetrack/DEBIAN/postinst +++ b/debian/timetrack/DEBIAN/postinst @@ -9,9 +9,16 @@ chown timetrack:timetrack /usr/bin/timetrack || true cd /var/lib systemctl daemon-reload || true -systemctl enable timetrack || true +R=$(systemctl show -p SubState --value timetrack) -echo "+------------------------------------------------------------------------------+" -echo "| configure timetrack in /etc/timetrack.properties; consider a port change... |" -echo "| start timetrack by calling sudo systemctl restart timetrack |" -echo "+------------------------------------------------------------------------------+" +if [ "running" == "$R" ] +then + systemctl restart timetrack || true + systemctl reload apache2 || true +else + systemctl enable timetrack || true + echo "+------------------------------------------------------------------------------+" + echo "| configure timetrack in /etc/timetrack.properties; consider a port change... |" + echo "| start timetrack by calling sudo systemctl restart timetrack |" + echo "+------------------------------------------------------------------------------+" +fi diff --git a/src/main/resources/templates/done/list.html b/src/main/resources/templates/done/list.html index 1e9284f..bf70477 100644 --- a/src/main/resources/templates/done/list.html +++ b/src/main/resources/templates/done/list.html @@ -194,7 +194,7 @@ for (var i = 0; i < scheduleRecords.length; i++) { var r = scheduleRecords[i]; var cssClass = r.billing; - var color = "#aaaaaa"; + var color = "#ffffff"; if (cssClass == "WP5") { color = "#aa0000"; } else if (cssClass == "WP4") {