diff --git a/app/store/Conversations.js b/app/store/Conversations.js index 3c38e2c3..6b5316bd 100644 --- a/app/store/Conversations.js +++ b/app/store/Conversations.js @@ -5,8 +5,6 @@ Ext.define('NgcpCsc.store.Conversations', { model: 'NgcpCsc.model.Conversation', - autoLoad: true, - groupField: 'timeGroup', proxy: { diff --git a/app/utils/formatter.js b/app/utils/formatter.js index aa1a0753..fb2d41fa 100644 --- a/app/utils/formatter.js +++ b/app/utils/formatter.js @@ -2,34 +2,52 @@ let's use this class as helper to format data. An example of usage: Ngcp.csc.formatter.timeSince('2016-10-13T11:14:12.274000000+02:00'); + +The return value is +- "seconds ago" if date within the last minute +- "minutes ago" if date within the last 5 minutes +- "x minutes ago" if date between 6 and 59 minutes ago +- "today at hh:mm" if date >= than 1 hour ago today +- "yesterday at hh:mm" if date was during yesterday's timeframe (from 00:00 to 23:59) +- "dd.mm.yyy at hh:mm" else + +TODO better data + */ Ext.define('Ngcp.csc.formatter', { statics: { timeSince: function (date) { var date = new Date(date); + var resetDate = new Date(date); + var todaysDate = new Date(); + var yesterdayDate = new Date(); + yesterdayDate.setDate(yesterdayDate.getDate() - 1); + var happenedToday = resetDate.setHours(0,0,0,0) == todaysDate.setHours(0,0,0,0); + var happenedYesterday = resetDate.setHours(0,0,0,0) == yesterdayDate.setHours(0,0,0,0); var seconds = Math.floor((new Date() - date) / 1000); - var interval = Math.floor(seconds / 31536000); - - if (interval > 1) { - return interval + " years"; - } - interval = Math.floor(seconds / 2592000); - if (interval > 1) { - return interval + " months"; - } - interval = Math.floor(seconds / 86400); - if (interval > 1) { - return interval + " days"; + var interval = Math.floor(seconds / 86400); // days + switch(true){ + case interval >= 2: + return Ext.Date.format(date, 'F j, Y \\a\\t g:i a'); + break; + case happenedYesterday: + return "Yesterday at " + Ext.Date.format(date, 'g:i a'); + break; } - interval = Math.floor(seconds / 3600); - if (interval > 1) { - return interval + " hours"; + interval = Math.floor(seconds / 3600); // hours + if (interval >= 1 && happenedToday) { + return "Today at " + Ext.Date.format(date, 'g:i a'); } - interval = Math.floor(seconds / 60); - if (interval > 1) { - return interval + " minutes"; + interval = Math.floor(seconds / 60); // minutes + switch(true){ + case interval >= 6 && interval < 60: + return interval + " minutes " + Ngcp.csc.locales.common.ago[localStorage.getItem('languageSelected')]; + break; + case interval >= 1 && interval < 6: + return "minutes " + Ngcp.csc.locales.common.ago[localStorage.getItem('languageSelected')]; + break; } - return Math.floor(seconds) + " seconds"; + return "seconds " + Ngcp.csc.locales.common.ago[localStorage.getItem('languageSelected')]; } } }); diff --git a/classic/src/view/pages/conversations/ConversationsController.js b/classic/src/view/pages/conversations/ConversationsController.js index 919766aa..f2d73a79 100644 --- a/classic/src/view/pages/conversations/ConversationsController.js +++ b/classic/src/view/pages/conversations/ConversationsController.js @@ -166,6 +166,20 @@ Ext.define('NgcpCsc.view.pages.conversations.ConversationsController', { renderCallee: function(val) { return '
' + val + '
'; }, + // reload the conversations every minute, + // to fetch latest conversations and trigger + // timestamp update + conversationGridRendered: function(grid) { + var runner = new Ext.util.TaskRunner() + var storeReload = function(){ + grid.getStore().load(); + }; + + task = runner.start({ + run: storeReload, + interval: 60000 + }); + }, removeCard: function(el) { var store = Ext.getStore('Conversations'); @@ -202,7 +216,7 @@ Ext.define('NgcpCsc.view.pages.conversations.ConversationsController', { this.fireEvent('initrtc', record, 'startCall'); }, - addToAddressbook: function(el){ + addToAddressbook: function(el) { var record = Ext.getStore('Conversations').findRecord('id', el.id.split('-')[1]); this.fireEvent('addContact', record); }, diff --git a/classic/src/view/pages/conversations/ConversationsGrid.js b/classic/src/view/pages/conversations/ConversationsGrid.js index 191bac9e..3813c803 100644 --- a/classic/src/view/pages/conversations/ConversationsGrid.js +++ b/classic/src/view/pages/conversations/ConversationsGrid.js @@ -24,7 +24,8 @@ Ext.define('NgcpCsc.view.pages.conversations.CallsGrid', { delegate: 'div.card-icon' }, cellclick: 'expandConversation', - rowbodyclick: 'expandConversation' + rowbodyclick: 'expandConversation', + afterrender: 'conversationGridRendered' }, rowLines: false, @@ -64,7 +65,7 @@ Ext.define('NgcpCsc.view.pages.conversations.CallsGrid', { ftype: 'rowbody', getAdditionalData: function(data, idx, record) { var content; - var footer = "" + var footer = "" var previewCharNum = Ext.os.is.Desktop ? 110 : me.getWidth() / 7.5; switch (record.get('conversation_type')) { case 'call': diff --git a/classic/src/view/pages/conversationwith/ConversationWithController.js b/classic/src/view/pages/conversationwith/ConversationWithController.js index 0d9e18a0..adfda499 100644 --- a/classic/src/view/pages/conversationwith/ConversationWithController.js +++ b/classic/src/view/pages/conversationwith/ConversationWithController.js @@ -146,5 +146,19 @@ Ext.define('NgcpCsc.view.pages.conversationwith.ConversationWithController', { if (contacts) { contacts.getView().refresh() } + }, + // reload the conversations every minute, + // to fetch latest conversations and trigger + // timestamp update + notificationRendered: function(listView){ + var runner = new Ext.util.TaskRunner(); + var storeReload = function(){ + listView.getStore().load(); + }; + + task = runner.start({ + run: storeReload, + interval: 60000 + }); } }); diff --git a/classic/src/view/pages/conversationwith/Notification.js b/classic/src/view/pages/conversationwith/Notification.js index 9f9c9050..d8a3af5a 100644 --- a/classic/src/view/pages/conversationwith/Notification.js +++ b/classic/src/view/pages/conversationwith/Notification.js @@ -4,6 +4,10 @@ Ext.define('NgcpCsc.view.pages.conversationwith.Notifications', { cls: 'user-notifications', + listeners: { + afterrender: 'notificationRendered' + }, + scrollable: true, disableSelection: true, @@ -20,7 +24,7 @@ Ext.define('NgcpCsc.view.pages.conversationwith.Notifications', { "
", "
{author}
", "
", - "
{[Ngcp.csc.formatter.timeSince(values.start_time)]} " + Ngcp.csc.locales.common.ago[localStorage.getItem('languageSelected')] + "
", + "
{[Ngcp.csc.formatter.timeSince(values.start_time)]} " + Ngcp.csc.locales.common.ago[localStorage.getItem('languageSelected')] + "
", "
", "", "

{text}

", diff --git a/resources/data/contacts.json b/resources/data/contacts.json index 3768e549..73939e0c 100644 --- a/resources/data/contacts.json +++ b/resources/data/contacts.json @@ -43,6 +43,7 @@ }, { "name": "Operations", "iconCls": "x-fa fa-wechat", + "uid": "operations", "expanded": true, "children": [{ "uid": 162, diff --git a/resources/data/conversations.json b/resources/data/conversations.json index eaa4779a..20803e1c 100644 --- a/resources/data/conversations.json +++ b/resources/data/conversations.json @@ -10,7 +10,7 @@ "status": "answered", "direction": "incoming", "folder": "INBOX", - "start_time": "2017-02-09T12:05:33.384000000+02:00" + "start_time": "2017-05-09T16:42:33.384000000+02:00" }, { "id": 2, "conversation_type": "call", @@ -20,7 +20,7 @@ "currency": "€", "status": "missed", "direction": "outgoing", - "start_time": "2017-02-09T10:05:33.384000000+02:00" + "start_time": "2017-05-07T21:12:33.384000000+02:00" }, { "id": 3, "conversation_type": "call", @@ -30,7 +30,7 @@ "currency": "€", "status": "answered", "direction": "forwarded", - "start_time": "2017-02-08T10:05:33.384000000+02:00" + "start_time": "2017-06-08T20:33:33.384000000+02:00" }, { "id": 4, "conversation_type": "sms", @@ -41,7 +41,7 @@ "currency": "€", "direction": "incoming", "status": "answered", - "start_time": "2017-01-31T10:05:33+02:00" + "start_time": "2017-05-05T18:45:33.384000000+02:00" }, { "id": 5, "conversation_type": "chat", @@ -50,7 +50,7 @@ "direction": "incoming", "source_cli": "John Doe", "status": "answered", - "start_time": "2017-01-30T10:05:33.384000000+02:00" + "start_time": "2017-05-04T16:17:33.384000000+02:00" }, { "id": 6, "conversation_type": "voicemail", @@ -62,7 +62,7 @@ "status": "answered", "direction": "incoming", "folder": "Old", - "start_time": "2017-01-15T10:05:33.384000000+02:00" + "start_time": "2017-05-08T09:11:33.384000000+02:00" }, { "id": 7, "conversation_type": "fax", @@ -70,7 +70,7 @@ "duration": 19.488, "status": "missed", "direction": "outgoing", - "start_time": "2017-01-10T10:05:33.384000000+02:00", + "start_time": "2017-05-03T01:01:33.384000000+02:00", "pages": "7" }, { "id": 8, @@ -79,7 +79,7 @@ "duration": 43.144, "status": "answered", "direction": "incoming", - "start_time": "2016-12-31T10:05:33.384000000+02:00", + "start_time": "2017-05-02T21:53:33.384000000+02:00", "pages": "4" },{ "id": 14, @@ -91,7 +91,7 @@ "currency": "€", "direction": "incoming", "status": "answered", - "start_time": "2017-01-31T10:05:33+02:00" + "start_time": "2017-05-01T16:02:33.384000000+02:00" }, { "id": 15, "conversation_type": "chat", @@ -99,7 +99,7 @@ "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", "direction": "incoming", "status": "answered", - "start_time": "2017-01-30T10:05:33.384000000+02:00" + "start_time": "2017-01-30T14:19:33.384000000+02:00" }, { "id": 16, "conversation_type": "voicemail", @@ -111,7 +111,7 @@ "status": "answered", "direction": "incoming", "folder": "Old", - "start_time": "2017-01-15T10:05:33.384000000+02:00" + "start_time": "2017-01-15T12:59:33.384000000+02:00" }, { "id": 17, "conversation_type": "fax", @@ -128,7 +128,7 @@ "duration": 43.144, "status": "answered", "direction": "incoming", - "start_time": "2016-12-31T10:05:33.384000000+02:00", + "start_time": "2016-12-31T09:11:33.384000000+02:00", "pages": "4" }] } diff --git a/resources/data/notifications/0.json b/resources/data/notifications/0.json index 2e5be96b..672a8285 100644 --- a/resources/data/notifications/0.json +++ b/resources/data/notifications/0.json @@ -88,18 +88,18 @@ "text": "This is an sms. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", "direction": "incoming", "status": "answered", - "start_time": "2017-03-07T12:05:33+02:00" + "start_time": "2017-05-08T10:05:33.384000000+02:00" }, { "id": 22, "conversation_type": "call", "status": "missed", "direction": "outgoing", - "start_time": "2017-03-07T13:05:33.384000000+02:00" + "start_time": "2017-05-08T11:05:33.384000000+02:00" }, { "id": 21, "conversation_type": "voicemail", "status": "answered", "direction": "incoming", - "start_time": "2017-03-07T14:05:33.384000000+02:00" + "start_time": "2017-05-08T11:55:33.384000000+02:00" }] } diff --git a/resources/data/notifications/1.json b/resources/data/notifications/1.json index 0bdedcd2..ba57a6ce 100644 --- a/resources/data/notifications/1.json +++ b/resources/data/notifications/1.json @@ -5,7 +5,7 @@ "source_cli": "+390290775544", "status": "missed", "direction": "outgoing", - "start_time": "2017-01-10T10:05:33.384000000+02:00", + "start_time": "2017-05-07T10:05:33.384000000+02:00", "pages": "7", "author": "Administrator", "thumbnail": "resources/images/user-profile/2.png" @@ -15,7 +15,7 @@ "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", "direction": "incoming", "status": "answered", - "start_time": "2017-01-30T10:05:33.384000000+02:00", + "start_time": "2017-05-08T10:05:33.384000000+02:00", "author": "Oneill Franklin", "thumbnail": "resources/images/user-profile/6.png" }, { @@ -24,7 +24,7 @@ "text": "This is an sms. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", "direction": "incoming", "status": "answered", - "start_time": "2017-01-31T10:05:33+02:00", + "start_time": "2017-05-08T11:05:33.384000000+02:00", "author": "Oneill Franklin", "thumbnail": "resources/images/user-profile/6.png" }] diff --git a/resources/data/notifications/3.json b/resources/data/notifications/3.json index 40d52e31..5473b78a 100644 --- a/resources/data/notifications/3.json +++ b/resources/data/notifications/3.json @@ -12,7 +12,7 @@ "conversation_type": "voicemail", "status": "answered", "direction": "incoming", - "start_time": "2017-02-09T12:05:33.384000000+02:00", + "start_time": "2017-05-08T08:05:33.384000000+02:00", "author": "Branch Allison", "thumbnail": "resources/images/user-profile/8.png" }, { @@ -21,7 +21,7 @@ "source_cli": "+390290775544", "status": "missed", "direction": "outgoing", - "start_time": "2017-03-03T10:05:33.384000000+02:00", + "start_time": "2017-05-08T09:05:33.384000000+02:00", "pages": "7", "author": "Administrator", "thumbnail": "resources/images/user-profile/2.png" @@ -31,7 +31,7 @@ "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", "direction": "incoming", "status": "answered", - "start_time": "2017-03-04T10:05:33.384000000+02:00", + "start_time": "2017-05-08T10:05:33.384000000+02:00", "author": "Branch Allison", "thumbnail": "resources/images/user-profile/8.png" }] diff --git a/resources/data/notifications/5.json b/resources/data/notifications/5.json index d3bcbca3..02dc9bcc 100644 --- a/resources/data/notifications/5.json +++ b/resources/data/notifications/5.json @@ -40,7 +40,7 @@ "conversation_type": "voicemail", "status": "answered", "direction": "incoming", - "start_time": "2017-03-07T14:05:33.384000000+02:00", + "start_time": "2017-05-08T10:05:33.384000000+02:00", "author": "Suzette Powell", "thumbnail": "resources/images/user-profile/7.png" }] diff --git a/resources/data/notifications/buddies.json b/resources/data/notifications/buddies.json index 11e2c22d..b1fdae6b 100644 --- a/resources/data/notifications/buddies.json +++ b/resources/data/notifications/buddies.json @@ -5,27 +5,27 @@ "author":"Allen Morris", "thumbnail": "resources/images/user-profile/11.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-18T10:05:33.384000000+02:00" + "start_time": "2017-03-08T10:05:33.384000000+02:00" },{ "id": 2, "conversation_type": "chat", "author":"Jil Sanchez", "thumbnail": "resources/images/user-profile/9.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-20T11:05:33.384000000+02:00" + "start_time": "2017-04-07T10:05:33.384000000+02:00" },{ "id": 6, "conversation_type": "chat", "author":"Administrator", "thumbnail":"resources/images/user-profile/2.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-20T15:05:33.384000000+02:00" + "start_time": "2017-05-07T10:05:33.384000000+02:00" },{ "id": 7, "conversation_type": "chat", "author":"Ben Wright", "thumbnail": "resources/images/user-profile/10.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-20T16:05:33.384000000+02:00" + "start_time": "2017-05-10T13:42:33.384000000+02:00" }] } diff --git a/resources/data/notifications/development.json b/resources/data/notifications/development.json index 11e2c22d..a95b65d6 100644 --- a/resources/data/notifications/development.json +++ b/resources/data/notifications/development.json @@ -5,27 +5,27 @@ "author":"Allen Morris", "thumbnail": "resources/images/user-profile/11.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-18T10:05:33.384000000+02:00" + "start_time": "2017-03-08T10:05:33.384000000+02:00" },{ "id": 2, "conversation_type": "chat", "author":"Jil Sanchez", "thumbnail": "resources/images/user-profile/9.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-20T11:05:33.384000000+02:00" + "start_time": "2017-04-08T08:05:33.384000000+02:00" },{ "id": 6, "conversation_type": "chat", "author":"Administrator", "thumbnail":"resources/images/user-profile/2.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-20T15:05:33.384000000+02:00" + "start_time": "2017-05-08T08:05:33.384000000+02:00" },{ "id": 7, "conversation_type": "chat", "author":"Ben Wright", "thumbnail": "resources/images/user-profile/10.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-20T16:05:33.384000000+02:00" + "start_time": "2017-05-08T10:05:33.384000000+02:00" }] } diff --git a/resources/data/notifications/operations.json b/resources/data/notifications/operations.json index ba941555..f1ef1ef1 100644 --- a/resources/data/notifications/operations.json +++ b/resources/data/notifications/operations.json @@ -5,14 +5,14 @@ "author":"Allen Morris", "thumbnail": "resources/images/user-profile/11.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-18T10:05:33.384000000+02:00" + "start_time": "2017-01-08T10:05:33.384000000+02:00" },{ "id": 11, "conversation_type": "chat", "author":"Allen Morris", "thumbnail": "resources/images/user-profile/11.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-18T10:06:33.384000000+02:00" + "start_time": "2017-01-07T10:05:33.384000000+02:00" },{ "id": 12, "conversation_type": "chat", @@ -61,20 +61,20 @@ "author":"Allen Morris", "thumbnail": "resources/images/user-profile/11.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-18T12:07:33.384000000+02:00" + "start_time": "2017-05-08T10:05:33.384000000+02:00" },{ "id": 6, "conversation_type": "chat", "author":"Administrator", "thumbnail":"resources/images/user-profile/2.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-18T12:08:33.384000000+02:00" + "start_time": "2017-05-08T11:05:33.384000000+02:00" },{ "id": 7, "conversation_type": "chat", "author":"Allen Morris", "thumbnail": "resources/images/user-profile/11.png", "text": "This is a chat message. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - "start_time": "2017-03-18T12:09:33.384000000+02:00" + "start_time": "2017-05-08T11:55:33.384000000+02:00" }] }