Skip to content
Snippets Groups Projects
Commit 95c2783d authored by Titus Netland's avatar Titus Netland
Browse files

Merge branch 'chatTimeFix' into 'main'

Fixed hh:mm with numbers under 10

See merge request !140
parents c9fb7a01 f2a63b31
No related branches found
No related tags found
1 merge request!140Fixed hh:mm with numbers under 10
Pipeline #181858 failed
......@@ -58,12 +58,18 @@ export default {
calculateTime() {
var time = this?.message.timestamp;
var date = new Date(time);
//Todo add timing for mm and hh and week of message
var mmOfMessage = String(date.getMinutes());
var hhOfMessage = String(date.getHours());
if(mmOfMessage <= 9){
mmOfMessage = "0" + mmOfMessage;
}
if(hhOfMessage<=9){
hhOfMessage = "0" + hhOfMessage;
}
var ddOfMessage = String(date.getDate()).padStart(2, "0");
var dayOfMessage = date.toLocaleString("default", { weekday: "short" });
var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0"); //January is 0!
var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0");
const shortMonthOfMessage = date.toLocaleString("default", {
month: "short",
});
......@@ -71,7 +77,7 @@ export default {
var today = new Date();
var dd = String(today.getDate()).padStart(2, "0");
var mm = String(today.getMonth() + 1).padStart(2, "0"); //January is 0!
var mm = String(today.getMonth() + 1).padStart(2, "0");
var yyyy = today.getFullYear();
if (ddOfMessage == dd) {
return "" + hhOfMessage + ":" + mmOfMessage + "";
......
......@@ -97,7 +97,10 @@ export default {
getDateString(milliseconds) {
let today = new Date();
let date = new Date(milliseconds);
let dateString = date.getDate() + "." + (date.getMonth() + 1);
const shortMonthOfRentHistoryItem = date.toLocaleString("default", {
month: "short",
});
let dateString = date.getDate() + ". " + shortMonthOfRentHistoryItem;
if (date.getFullYear() != today.getFullYear()) {
dateString += "." + date.getFullYear();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment