From 77ce607eeb456f2855ad5da5d62693246a62c320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20K=C3=A4stle?= <sven.kaestle@gmx.de>
Date: Tue, 10 Jul 2018 23:16:30 +0200
Subject: [PATCH] refactor: Change date format style on annotation card
---
.../main/webapp/assets/js/annotationScript.js | 26 +++++++++----------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
index 5d4374d8..8a71da55 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
@@ -511,29 +511,27 @@ function timestampToReadableTime(timestamp) {
// declare response
var responseTimestamp;
+ // get hours from date
+ var hours = "0" + annotationDate.getHours();
+ // get minutes from date
+ var minutes = "0" + annotationDate.getMinutes();
+
// if annotation is from today
if (isTimestampToday(timestamp)) {
- // get hours from date
- var hours = annotationDate.getHours();
- // get minutes from date
- var minutes = "0" + annotationDate.getMinutes();
- // get seconds from date
- // var seconds = "0" + annotationDate.getSeconds();
-
- // build readable timestamp
- responseTimestamp = hours + ":" + minutes.substr(-2);
+ // build readable timestamp in format HH:mm
+ responseTimestamp = hours.substr(-2) + ":" + minutes.substr(-2);
}
// else annotation is not from today
else {
// get date
- var date = annotationDate.getDate();
+ var date = "0" + annotationDate.getDate();
// get month
- var month = annotationDate.getMonth();
+ var month = "0" + annotationDate.getMonth();
// get year
- var year = annotationDate.getFullYear();
+ var year = "" + annotationDate.getFullYear();
- // build readable timestamp
- responseTimestamp = date + "." + month + "." + year;
+ // build readable timestamp dd.MM.yy HH:mm
+ responseTimestamp = date.substr(-2) + "." + month.substr(-2) + "." + year.substr(-2) + " " + hours.substr(-2) + ":" + minutes.substr(-2);
}
return responseTimestamp;
--
GitLab