anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

add comment to search

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-06-04 17:47:58 -03:00
commit b1a15d56c0
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/includes/note.html
View file

@ -3,7 +3,7 @@
<span ng-show="!comment" translate>Enter a new comment</span> <span ng-show="!comment" translate>Enter a new comment</span>
<span ng-show="comment" translate>Edit comment</span> <span ng-show="comment" translate>Edit comment</span>
</label> </label>
<input type="text" ng-model="data.comment"> <input type="text" ng-model="data.comment" autofocus>
</div> </div>
<div class="small-6 columns"> <div class="small-6 columns">
<button class="round outline dark-gray expand" ng-click="commentPopupClose()" translate>CANCEL</button> <button class="round outline dark-gray expand" ng-click="commentPopupClose()" translate>CANCEL</button>

18
public/views/modals/search.html
View file

@ -31,14 +31,18 @@
<img src="img/icon-moved.svg" alt="sync" width="40" ng-show="btx.action == 'moved'"> <img src="img/icon-moved.svg" alt="sync" width="40" ng-show="btx.action == 'moved'">
</div> </div>
<div class="m10t"> <div class="m10t">
<span ng-show="btx.action == 'received'" translate>Received</span> <span ng-show="btx.action == 'received'">
<span ng-show="btx.action == 'sent'"> <span class="ellipsis">
{{index.addressbook[btx.addressTo]}} <span ng-if="btx.note.body">{{btx.note.body}}</span>
<span ng-show="!index.addressbook[btx.addressTo] && btx.message"> <span ng-if="!btx.note.body" translate> Received</span>
<span class="ellipsis">{{btx.message}}</span>
</span> </span>
<span ng-show="!index.addressbook[btx.addressTo] && !btx.message"> </span>
<span translate> Sent</span> <span ng-show="btx.action == 'sent'">
<span class="ellipsis">
<span ng-if="btx.message">{{btx.message}}</span>
<span ng-if="!btx.message && btx.note.body">{{btx.note.body}}</span>
<span ng-if="!btx.message && !btx.note.body && index.addressbook[btx.addressTo]">{{index.addressbook[btx.addressTo]}}</span>
<span ng-if="!btx.message && !btx.note.body && !index.addressbook[btx.addressTo]" translate> Sent</span>
</span> </span>
</span> </span>
<span ng-show="btx.action == 'moved'" translate>Moved</span> <span ng-show="btx.action == 'moved'" translate>Moved</span>

3
src/js/controllers/index.js
View file

@ -913,8 +913,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (tx.addressTo && self.addressbook && self.addressbook[tx.addressTo]) addrbook = self.addressbook[tx.addressTo] || ''; if (tx.addressTo && self.addressbook && self.addressbook[tx.addressTo]) addrbook = self.addressbook[tx.addressTo] || '';
var searchableDate = computeSearchableDate(new Date(tx.time * 1000)); var searchableDate = computeSearchableDate(new Date(tx.time * 1000));
var message = tx.message ? tx.message : ''; var message = tx.message ? tx.message : '';
var comment = tx.note ? tx.note.body : '';
var addressTo = tx.addressTo ? tx.addressTo : ''; var addressTo = tx.addressTo ? tx.addressTo : '';
return ((tx.amountStr + message + addressTo + addrbook + searchableDate).toString()).toLowerCase(); return ((tx.amountStr + message + addressTo + addrbook + searchableDate + comment).toString()).toLowerCase();
} }
function computeSearchableDate(date) { function computeSearchableDate(date) {

1
src/js/controllers/modals/txDetails.js
View file

@ -41,6 +41,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
$scope.btx.note.body = $scope.data.comment; $scope.btx.note.body = $scope.data.comment;
$scope.btx.note.editedByName = fc.credentials.copayerName; $scope.btx.note.editedByName = fc.credentials.copayerName;
$scope.btx.note.editedOn = Math.floor(Date.now() / 1000); $scope.btx.note.editedOn = Math.floor(Date.now() / 1000);
$scope.btx.searcheableString = null;
commentPopup.close(); commentPopup.close();
}); });
}; };