flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-08 16:36:25 +00:00
Code Issues Releases Wiki Activity

implement refresher. Also factorize code. Need tests

Browse Source
This commit is contained in:
Loïc Blot (@U-Exp) 2014-09-26 18:56:22 +02:00
parent a188178329
commit 59a5353586
2 changed files with 74 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/smscontroller.php
View File

@ -77,7 +77,7 @@ class SmsController extends Controller {
* @NoAdminRequired * @NoAdminRequired
* @NoCSRFRequired * @NoCSRFRequired
*/ */
public function getConversation ($phoneNumber) { public function getConversation ($phoneNumber, $lastDate = 0) {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber); $messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber);
// @ TODO: filter correctly // @ TODO: filter correctly
return new JSONResponse(array("conversation" => $messages)); return new JSONResponse(array("conversation" => $messages));

117
js/script.js
View File

@ -12,6 +12,10 @@
// Some global vars to improve performances // Some global vars to improve performances
var selectedConversation = null; var selectedConversation = null;
var curPhoneNumber = null; var curPhoneNumber = null;
var lastMsgDate = 0;
var months = ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'Jun.', 'Jul.', 'Aug.', 'Sep.',
'Oct.', 'Nov.', 'Dec.'];
// Source: http://www.sitepoint.com/url-parameters-jquery/ // Source: http://www.sitepoint.com/url-parameters-jquery/
$.urlParam = function(name){ $.urlParam = function(name){
@ -25,62 +29,85 @@ $.urlParam = function(name){
}; };
var refreshConversation = function() { var refreshConversation = function() {
$.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'),
{
'phoneNumber': phoneNumber,
"lastDate": lastMsgDate
},
function(jsondata, status) {
conversationBuf = formatConversation(jsondata);
$('.msg-endtag').addBefore(conversationBuf);
$('#app-content').scrollTop(1E10);
}
);
}; };
function fetchConversation(phoneNumber) { function fetchConversation(phoneNumber) {
$.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'), $.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'),
{'phoneNumber': phoneNumber}, {
'phoneNumber': phoneNumber
},
function(jsondata, status) { function(jsondata, status) {
// Improve jQuery performance conversationBuf = formatConversation(jsondata);
var conversationBuf = ""; conversationBuf += '<div class="msg-endtag"></div>';
// Improve JS performance
var msgClass = '';
var unixDate = '';
var formatedDate = '';
var formatedHour = '00';
var formatedMin = '00';
var months = ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'Jun.', 'Jul.', 'Aug.', 'Sep.',
'Oct.', 'Nov.', 'Dec.'];
$.each(jsondata["conversation"], function(id, vals) {
if (vals["type"] == 1) {
msgClass = "msg-recv";
}
else if (vals["type"] == 2) {
msgClass = "msg-sent";
}
else {
msgClass = '';
}
// Multiplicate ID to permit date to use it properly
msgDate = new Date(id*1);
formatedHour = msgDate.getHours();
if (formatedHour < 10) {
formatedHour = '0' + formatedHour;
}
formatedMin = msgDate.getMinutes();
if (formatedMin < 10) {
formatedMin = '0' + formatedMin;
}
formatedDate = msgDate.getDate() + " " + months[msgDate.getMonth()] + " " +
formatedHour + ":" + formatedMin;
conversationBuf += '<div><div class="' + msgClass + '"><div>' +
vals["msg"] + '</div><div class="msg-date">' +
formatedDate + '</div></div><div class="msg-spacer"></div></div>';
curPhoneNumber = phoneNumber;
});
$('#app-content').html(conversationBuf); $('#app-content').html(conversationBuf);
$('#app-content').scrollTop(1E10); $('#app-content').scrollTop(1E10);
curPhoneNumber = phoneNumber;
} }
); );
} }
function formatConversation(jsondata) {
// Improve jQuery performance
var buf = "";
// Improve JS performance
var msgClass = '';
var formatedDate = '';
var formatedHour = '00';
var formatedMin = '00';
$.each(jsondata["conversation"], function(id, vals) {
if (vals["type"] == 1) {
msgClass = "msg-recv";
}
else if (vals["type"] == 2) {
msgClass = "msg-sent";
}
else {
msgClass = '';
}
// Store the greater msg date for refresher
if (id > lastMsgDate) {
id = lastMsgDate;
}
// Multiplicate ID to permit date to use it properly
msgDate = new Date(id*1);
formatedHour = msgDate.getHours();
if (formatedHour < 10) {
formatedHour = '0' + formatedHour;
}
formatedMin = msgDate.getMinutes();
if (formatedMin < 10) {
formatedMin = '0' + formatedMin;
}
formatedDate = msgDate.getDate() + " " + months[msgDate.getMonth()] + " " +
formatedHour + ":" + formatedMin;
buf += '<div><div class="' + msgClass + '"><div>' +
vals["msg"] + '</div><div class="msg-date">' +
formatedDate + '</div></div><div class="msg-spacer"></div></div>';
});
return buf;
}
function changeSelectedConversation(item) { function changeSelectedConversation(item) {
if (selectedConversation != null) { if (selectedConversation != null) {
selectedConversation.parent().removeClass('selected'); selectedConversation.parent().removeClass('selected');
@ -106,6 +133,8 @@ function changeSelectedConversation(item) {
$('#app-mailbox-peers').find('a[mailbox-navigation]').on('click', function (event) { $('#app-mailbox-peers').find('a[mailbox-navigation]').on('click', function (event) {
var phoneNumber = $(this).attr('mailbox-navigation'); var phoneNumber = $(this).attr('mailbox-navigation');
OC.Util.History.pushState('phonenumber=' + phoneNumber); OC.Util.History.pushState('phonenumber=' + phoneNumber);
// Reset it for refreshConversation
lastMsgDate = 0;
fetchConversation(phoneNumber); fetchConversation(phoneNumber);
changeSelectedConversation($(this)); changeSelectedConversation($(this));
event.preventDefault(); event.preventDefault();