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

Add message store and removal handlers to Angular controller

Browse Source
This commit is contained in:
Loic Blot 2015-06-25 20:47:33 +00:00
parent 9c064f9052
commit fed6cb864a
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/public/app.js
View File

@ -40,6 +40,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
{text: "Send"} {text: "Send"}
]; ];
$scope.contacts = []; $scope.contacts = [];
$scope.messages = []
$scope.sendCountry = function () { $scope.sendCountry = function () {
$.post(OC.generateUrl('/apps/ocsms/set/country'),{'country': $('select[name=intl_phone]').val()}); $.post(OC.generateUrl('/apps/ocsms/set/country'),{'country': $('select[name=intl_phone]').val()});
}; };
@ -171,9 +172,10 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
g_curPhoneNumber = null; g_curPhoneNumber = null;
}); });
}; };
$scope.removeMessage = function(messageId) {
alert('test'); /*
}; * Contact list management
*/
$scope.addContact = function (ct) { $scope.addContact = function (ct) {
$scope.$apply(function () { $scope.$apply(function () {
$scope.contacts.push(ct); $scope.contacts.push(ct);
@ -195,6 +197,25 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
} }
/*
* Conversation messagelist management
*/
$scope.addConversationMessage = function (msg) {
$scope.$apply(function () {
$scope.messages.push(msg);
});
}
$scope.removeConversationMessage = function (msg) {
var len = $scope.messages.length;
for (var i=0; i < len; i++) {
var curMsg = $scope.messages[i];
if (curMsg['id'] == msg['id']) {
$scope.messages.splice(i, 1);
return;
}
}
}
$scope.fetchInitialSettings = function () { $scope.fetchInitialSettings = function () {
$.getJSON(OC.generateUrl('/apps/ocsms/get/country'), function(jsondata, status) { $.getJSON(OC.generateUrl('/apps/ocsms/get/country'), function(jsondata, status) {
if (jsondata['status'] == true) { if (jsondata['status'] == true) {
@ -241,7 +262,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
}); });
} }
$interval(refreshConversation, 10000); //$interval(refreshConversation, 10000);
$interval($scope.checkNewMessages, 10000); $interval($scope.checkNewMessages, 10000);
$timeout(function () { $timeout(function () {
@ -386,7 +407,7 @@ function formatConversation(jsondata) {
buf += '<div><div class="' + msgClass + '"><div>' + buf += '<div><div class="' + msgClass + '"><div>' +
vals["msg"] + '</div>' + vals["msg"] + '</div>' +
'<div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" ng-click="removeMessage(' + id + ');"></div>' + '<div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" ng-click="removeConversationMessage(' + id + ');"></div>' +
'<div class="msg-date">' + formatedDate + '</div>' + '<div class="msg-date">' + formatedDate + '</div>' +
'</div><div class="msg-spacer"></div></div>'; '</div><div class="msg-spacer"></div></div>';
msgCount++; msgCount++;

2
templates/main.php
View File

@ -41,7 +41,7 @@ use \OCA\OcSms\Lib\CountryCodes;
<div ng-repeat="message in messages"> <div ng-repeat="message in messages">
<div class="msg-{{ message.type }}">{{ message.content }} <div class="msg-{{ message.type }}">{{ message.content }}
<div> <div>
<div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" ng-click="removeMessage({{ message.id }});"></div> <div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" ng-click="removeConversationMessage({{ message.id }});"></div>
<div class="msg-date">{{ message.date }}</div> <div class="msg-date">{{ message.date }}</div>
</div> </div>
<div class="msg-spacer"></div> <div class="msg-spacer"></div>