diff --git a/angular_app/event-info.html b/angular_app/event-info.html index 54ceb61..9f3e661 100644 --- a/angular_app/event-info.html +++ b/angular_app/event-info.html @@ -16,9 +16,11 @@
- + + + +
@@ -31,7 +33,7 @@ - + {{person.name}} {{person.surname}} diff --git a/angular_app/events-list.html b/angular_app/events-list.html index 046aafa..4708559 100644 --- a/angular_app/events-list.html +++ b/angular_app/events-list.html @@ -11,14 +11,16 @@
- +
- + + + +
@@ -31,7 +33,7 @@ - + {{event.title}}

{{'Begins:' | translate}} {{event['begin-date']}}
diff --git a/angular_app/js/controllers.js b/angular_app/js/controllers.js index eef102c..f53865e 100644 --- a/angular_app/js/controllers.js +++ b/angular_app/js/controllers.js @@ -41,7 +41,8 @@ eventManControllers.controller('DatetimePickerCtrl', ['$scope', eventManControllers.controller('EventsListCtrl', ['$scope', 'Event', function ($scope, Event) { $scope.events = Event.all(); - $scope.orderProp = 'begin-datetime'; + $scope.personsOrderProp = 'name'; + $scope.eventsOrderProp = '-begin-date'; $scope.remove = function(_id) { Event.remove({'id': _id}, function() { @@ -54,6 +55,8 @@ eventManControllers.controller('EventsListCtrl', ['$scope', 'Event', eventManControllers.controller('EventDetailsCtrl', ['$scope', 'Event', '$stateParams', '$log', function ($scope, Event, $stateParams, $log) { + $scope.personsOrderProp = 'name'; + $scope.eventsOrderProp = '-begin-date'; if ($stateParams.id) { $scope.event = Event.get($stateParams); } @@ -104,7 +107,8 @@ eventManControllers.controller('EventDetailsCtrl', ['$scope', 'Event', '$statePa eventManControllers.controller('PersonsListCtrl', ['$scope', 'Person', function ($scope, Person) { $scope.persons = Person.all(); - $scope.orderProp = 'name'; + $scope.personsOrderProp = 'name'; + $scope.eventsOrderProp = '-begin-date'; $scope.remove = function(_id) { Person.remove({'id': _id}, function() { @@ -117,6 +121,8 @@ eventManControllers.controller('PersonsListCtrl', ['$scope', 'Person', eventManControllers.controller('PersonDetailsCtrl', ['$scope', '$stateParams', 'Person', 'Event', '$log', function ($scope, $stateParams, Person, Event, $log) { + $scope.personsOrderProp = 'name'; + $scope.eventsOrderProp = '-begin-date'; if ($stateParams.id) { $scope.person = Person.get($stateParams); Person.getEvents($stateParams, function(data) { diff --git a/angular_app/person-info.html b/angular_app/person-info.html index 6e345cc..f057bbc 100644 --- a/angular_app/person-info.html +++ b/angular_app/person-info.html @@ -11,26 +11,28 @@

- +
- - + + + +
- - + + - + - +
EventAttended{{'Event' | translate}}{{'Attended' | translate}}
{{event.title}} diff --git a/angular_app/persons-list.html b/angular_app/persons-list.html index 1e8718a..9a93d88 100644 --- a/angular_app/persons-list.html +++ b/angular_app/persons-list.html @@ -20,9 +20,11 @@
- + + + +
@@ -35,7 +37,7 @@
{{person.name}} {{person.surname}}

{{person.email}}