norbipeti/ChatServer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed dates!

Browse source
This commit is contained in:
Norbi Peti 2016-08-11 11:09:48 +02:00
parent 9ed20a0087
commit 7cebaf0ddd
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pages/js/index.js
View file

@ -15,7 +15,9 @@ $(document).ready(function () {
if (spans[i].className.split(' ').indexOf("converttime") > -1)
ctime = spans[i];
if (ctime != null)
ctime.innerText = moment(ctime.innerText).format("lll");
console.log(ctime.innerText);
if (ctime != null)
ctime.innerText = moment(ctime.innerText, "YYYY-MM-DDTHH:mm:ssZ").fromNow(); //.format("lll");
//ctime.innerText = new Date(ctime.innerText * 1).toDateString();
}
cmsgs.lastElementChild.scrollIntoView(false);

11
src/io/github/norbipeti/chat/server/page/IndexPage.java
View file

@ -38,10 +38,10 @@ public class IndexPage extends Page {
Element userbox = doc.getElementById("userbox");
userbox.html(userbox.html().replace("<username />", user.getName()));
Element channelmessages = doc.getElementById("channelmessages");
LogManager.getLogger().log(Level.INFO,
LogManager.getLogger().log(Level.DEBUG,
"Conversations: " + DataManager.getAll(Conversation.class).size());
LogManager.getLogger().log(Level.INFO, "User conversations: " + user.getConversations().size());
LogManager.getLogger().log(Level.INFO, "Username: " + user.getName());
LogManager.getLogger().log(Level.DEBUG, "User conversations: " + user.getConversations().size());
LogManager.getLogger().log(Level.DEBUG, "Username: " + user.getName());
if (user.getConversations().size() == 0) {
LoaderCollection<Conversation> convs = DataManager.getAll(Conversation.class);
if (convs.size() == 0) {
@ -55,7 +55,7 @@ public class IndexPage extends Page {
cide.attr("style", "display: none");
cide.attr("id", "convidp");
cide.text(Long.toString(conv.getId()));
LogManager.getLogger().log(Level.INFO, "Messages: " + conv.getMesssageChunks().size());
LogManager.getLogger().log(Level.DEBUG, "Messages: " + conv.getMesssageChunks().size());
for (MessageChunk chunk : conv.getMesssageChunks()) { // TODO: Reverse
for (Message message : chunk.getMessages()) {
Element msgelement = channelmessages.appendElement("div");
@ -63,7 +63,8 @@ public class IndexPage extends Page {
header.text(message.getSender().get().getName() + " - ");
SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
isoFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
header.appendElement("span").addClass("converttime").text(isoFormat.format(message.getTime()));
header.appendElement("span").addClass("converttime")
.text(isoFormat.format(message.getTime()) + "+00:00");
Element body = msgelement.appendElement("p");
body.text(message.getMessage()); // TODO: Use JavaScript to convert time
}