nextcloud
/
contacts
mirror of https://github.com/nextcloud/contacts
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #69 from owncloud/add-addressbook-selector 

Adding addressbook select on each contact
This commit is contained in:
Thomas Müller 2016-03-01 14:50:14 +01:00
parent 10f3c33006 3e497c3f1c
commit e05557e97a
5 changed files with 96 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/components/contactDetails/contactDetails_controller.js
View File

@ -1,4 +1,4 @@
app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService', '$routeParams', '$scope', function(ContactService, vCardPropertiesService, $routeParams, $scope) {
app.controller('contactdetailsCtrl', ['ContactService', 'AddressBookService', 'vCardPropertiesService', '$routeParams', '$scope', function(ContactService, AddressBookService, vCardPropertiesService, $routeParams, $scope) {
var ctrl = this;
ctrl.uid = $routeParams.uid;
@ -8,6 +8,21 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService'
};
ctrl.fieldDefinitions = vCardPropertiesService.fieldDefinitions;
$scope.addressBooks = [];
ctrl.addressBooks = [];
AddressBookService.getAll().then(function(addressBooks) {
ctrl.addressBooks = addressBooks;
$scope.addressBooks = addressBooks.map(function (element) {
return {
id: element.displayName,
name: element.displayName
};
});
$scope.addressBook = _.find($scope.addressBooks, function(book) {
return book.id === ctrl.contact.addressBookId;
});
});
$scope.$watch('ctrl.uid', function(newValue, oldValue) {
ctrl.changeContact(newValue);
@ -21,6 +36,9 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService'
ctrl.contact = contact;
ctrl.singleProperties = ctrl.contact.getSingleProperties();
ctrl.photo = ctrl.contact.photo();
$scope.addressBook = _.find($scope.addressBooks, function(book) {
return book.id === ctrl.contact.addressBookId;
});
});
};
@ -35,5 +53,12 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService'
ctrl.addField = function(field) {
ctrl.contact.setProperty(field, {value: ''});
ctrl.singleProperties = ctrl.contact.getSingleProperties();
}
};
ctrl.changeAddressBook = function (addressBook) {
addressBook = _.find(ctrl.addressBooks, function(book) {
return book.displayName === addressBook.id;
});
ContactService.moveContact(ctrl.contact, addressBook);
};
}]);

4
js/models/contact_model.js
View File

@ -1,5 +1,5 @@
app.factory('Contact', [ '$filter', function($filter) {
return function Contact(vCard) {
return function Contact(addressBook, vCard) {
angular.extend(this, {
data: {},
@ -17,6 +17,8 @@ app.factory('Contact', [ '$filter', function($filter) {
return singleProperties;
},
addressBookId: addressBook.displayName,
uid: function(value) {
if (angular.isDefined(value)) {
// setter

50
js/public/script.js
View File

@ -192,7 +192,7 @@ app.directive('contact', function() {
};
});
app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService', '$routeParams', '$scope', function(ContactService, vCardPropertiesService, $routeParams, $scope) {
app.controller('contactdetailsCtrl', ['ContactService', 'AddressBookService', 'vCardPropertiesService', '$routeParams', '$scope', function(ContactService, AddressBookService, vCardPropertiesService, $routeParams, $scope) {
var ctrl = this;
ctrl.uid = $routeParams.uid;
@ -202,6 +202,21 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService'
};
ctrl.fieldDefinitions = vCardPropertiesService.fieldDefinitions;
$scope.addressBooks = [];
ctrl.addressBooks = [];
AddressBookService.getAll().then(function(addressBooks) {
ctrl.addressBooks = addressBooks;
$scope.addressBooks = addressBooks.map(function (element) {
return {
id: element.displayName,
name: element.displayName
};
});
$scope.addressBook = _.find($scope.addressBooks, function(book) {
return book.id === ctrl.contact.addressBookId;
});
});
$scope.$watch('ctrl.uid', function(newValue, oldValue) {
ctrl.changeContact(newValue);
@ -215,6 +230,9 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService'
ctrl.contact = contact;
ctrl.singleProperties = ctrl.contact.getSingleProperties();
ctrl.photo = ctrl.contact.photo();
$scope.addressBook = _.find($scope.addressBooks, function(book) {
return book.id === ctrl.contact.addressBookId;
});
});
};
@ -229,7 +247,14 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService'
ctrl.addField = function(field) {
ctrl.contact.setProperty(field, {value: ''});
ctrl.singleProperties = ctrl.contact.getSingleProperties();
}
};
ctrl.changeAddressBook = function (addressBook) {
addressBook = _.find(ctrl.addressBooks, function(book) {
return book.displayName === addressBook.id;
});
ContactService.moveContact(ctrl.contact, addressBook);
};
}]);
app.directive('contactdetails', function() {
@ -521,7 +546,7 @@ app.factory('AddressBook', function()
});
app.factory('Contact', [ '$filter', function($filter) {
return function Contact(vCard) {
return function Contact(addressBook, vCard) {
angular.extend(this, {
data: {},
@ -539,6 +564,8 @@ app.factory('Contact', [ '$filter', function($filter) {
return singleProperties;
},
addressBookId: addressBook.displayName,
uid: function(value) {
if (angular.isDefined(value)) {
// setter
@ -859,7 +886,7 @@ app.service('ContactService', [ 'DavClient', 'AddressBookService', 'Contact', '$
promises.push(
AddressBookService.sync(addressBook).then(function(addressBook) {
for(var i in addressBook.objects) {
contact = new Contact(addressBook.objects[i]);
contact = new Contact(addressBook, addressBook.objects[i]);
contacts.put(contact.uid(), contact);
}
})
@ -909,6 +936,7 @@ app.service('ContactService', [ 'DavClient', 'AddressBookService', 'Contact', '$
var newUid = uuid4.generate();
newContact.uid(newUid);
newContact.setUrl(addressBook, newUid);
newContact.addressBookId = addressBook.displayName;
return DavClient.createCard(
addressBook,
@ -926,6 +954,20 @@ app.service('ContactService', [ 'DavClient', 'AddressBookService', 'Contact', '$
});
};
this.moveContact = function (contact, addressbook) {
if (contact.addressBookId === addressbook.displayName) {
return;
}
contact.syncVCard();
var clone = angular.copy(contact);
// create the contact in the new target addressbook
this.create(clone, addressbook);
// delete the old one
this.delete(contact);
};
this.update = function(contact) {
contact.syncVCard();

17
js/services/contact_service.js
View File

@ -29,7 +29,7 @@ app.service('ContactService', [ 'DavClient', 'AddressBookService', 'Contact', '$
promises.push(
AddressBookService.sync(addressBook).then(function(addressBook) {
for(var i in addressBook.objects) {
contact = new Contact(addressBook.objects[i]);
contact = new Contact(addressBook, addressBook.objects[i]);
contacts.put(contact.uid(), contact);
}
})
@ -79,6 +79,7 @@ app.service('ContactService', [ 'DavClient', 'AddressBookService', 'Contact', '$
var newUid = uuid4.generate();
newContact.uid(newUid);
newContact.setUrl(addressBook, newUid);
newContact.addressBookId = addressBook.displayName;
return DavClient.createCard(
addressBook,
@ -96,6 +97,20 @@ app.service('ContactService', [ 'DavClient', 'AddressBookService', 'Contact', '$
});
};
this.moveContact = function (contact, addressbook) {
if (contact.addressBookId === addressbook.displayName) {
return;
}
contact.syncVCard();
var clone = angular.copy(contact);
// create the contact in the new target addressbook
this.create(clone, addressbook);
// delete the old one
this.delete(contact);
};
this.update = function(contact) {
contact.syncVCard();

4
templates/contactDetails.html
View File

@ -14,6 +14,10 @@
</header>
<section>
<detailsItem ng-repeat="prop in ctrl.singleProperties" name="prop.name" data="prop.data" model="ctrl"></detailsItem>
<div ng-if="addressBooks.length > 1">
<select ng-model="addressBook" ng-change="ctrl.changeAddressBook(addressBook)" ng-options="book.id for book in addressBooks track by book.id">
</select>
</div>
<select ng-model="field" ng-change="ctrl.addField(field)">
<option ng-repeat="field in ctrl.fieldDefinitions" value="{{field.id}}">{{field.name}}</option>
</select>