alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

separate sort orders for persons and events

Browse source
This commit is contained in:
Davide Alberani 2015-04-06 12:48:41 +02:00
parent a620227ab1
commit 54fdc2a475
5 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
angular_app/event-info.html
View file

@ -16,9 +16,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="persons-order">{{'Sort by:' | translate}}</label> <label for="persons-order">{{'Sort by:' | translate}}</label>
<select id="persons-order" class="form-control" ng-model="orderProp"> <select id="persons-order" class="form-control" ng-model="personsOrderProp">
<option value="name" ng-selected="selected">{{'Alphabetical' | translate}}</option> <option value="name" ng-selected="selected">{{'Name' | translate}}</option>
<option value="_id">{{'ID' | translate}}</option> <option value="-name" ng-selected="selected">{{'Name (descending)' | translate}}</option>
<option value="surname" ng-selected="selected">{{'Surname' | translate}}</option>
<option value="-surname" ng-selected="selected">{{'Surname (descending)' | translate}}</option>
</select> </select>
</div> </div>
</form> </form>
@ -31,7 +33,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="person in event.persons | splittedFilter:query | orderBy:orderProp"> <tr ng-repeat="person in event.persons | splittedFilter:query | orderBy:personsOrderProp">
<td><strong><a ui-sref="person.info({id: person.person_id})">{{person.name}} {{person.surname}}</a></strong></td> <td><strong><a ui-sref="person.info({id: person.person_id})">{{person.name}} {{person.surname}}</a></strong></td>
<td> <td>
<button class="btn btn-link" name="switch-attended" ng-click="updateAttendee(person, !person.attended)"><span class="glyphicon {{(person.attended) && 'glyphicon-ok-sign text-success' || 'glyphicon-remove-sign text-danger'}}"></span></button> <button class="btn btn-link" name="switch-attended" ng-click="updateAttendee(person, !person.attended)"><span class="glyphicon {{(person.attended) && 'glyphicon-ok-sign text-success' || 'glyphicon-remove-sign text-danger'}}"></span></button>

12
angular_app/events-list.html
View file

@ -11,14 +11,16 @@
<div class="panel-body"> <div class="panel-body">
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">
<label for="query-events">Search:</label> <label for="query-events">{{'Search:' | translate}}</label>
<input type="text" id="query-events" class="form-control" placeholder="{{'Event title' | translate}}" ng-model="query"> <input type="text" id="query-events" class="form-control" placeholder="{{'Event title' | translate}}" ng-model="query">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="events-order">Sort by:</label> <label for="events-order">Sort by:</label>
<select id="events-order" class="form-control" ng-model="orderProp"> <select id="events-order" class="form-control" ng-model="eventsOrderProp">
<option value="title">Alphabetical</option> <option value="title">{{'Title' | translate}}</option>
<option value="begin-datetime">Date</option> <option value="-title">{{'Title (descending)' | translate}}</option>
<option value="begin-date">{{'Date' | translate}}</option>
<option value="-begin-date">{{'Date (descending)' | translate}}</option>
</select> </select>
</div> </div>
</form> </form>
@ -31,7 +33,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="event in events | splittedFilter:query | orderBy:orderProp"> <tr ng-repeat="event in events | splittedFilter:query | orderBy:eventsOrderProp">
<td> <td>
<span><strong><a ui-sref="event.info({id: event._id})">{{event.title}}</a></strong></span> <span><strong><a ui-sref="event.info({id: event._id})">{{event.title}}</a></strong></span>
<p>{{'Begins:' | translate}} {{event['begin-date']}}<br/> <p>{{'Begins:' | translate}} {{event['begin-date']}}<br/>

10
angular_app/js/controllers.js vendored
View file

@ -41,7 +41,8 @@ eventManControllers.controller('DatetimePickerCtrl', ['$scope',
eventManControllers.controller('EventsListCtrl', ['$scope', 'Event', eventManControllers.controller('EventsListCtrl', ['$scope', 'Event',
function ($scope, Event) { function ($scope, Event) {
$scope.events = Event.all(); $scope.events = Event.all();
$scope.orderProp = 'begin-datetime'; $scope.personsOrderProp = 'name';
$scope.eventsOrderProp = '-begin-date';
$scope.remove = function(_id) { $scope.remove = function(_id) {
Event.remove({'id': _id}, function() { Event.remove({'id': _id}, function() {
@ -54,6 +55,8 @@ eventManControllers.controller('EventsListCtrl', ['$scope', 'Event',
eventManControllers.controller('EventDetailsCtrl', ['$scope', 'Event', '$stateParams', '$log', eventManControllers.controller('EventDetailsCtrl', ['$scope', 'Event', '$stateParams', '$log',
function ($scope, Event, $stateParams, $log) { function ($scope, Event, $stateParams, $log) {
$scope.personsOrderProp = 'name';
$scope.eventsOrderProp = '-begin-date';
if ($stateParams.id) { if ($stateParams.id) {
$scope.event = Event.get($stateParams); $scope.event = Event.get($stateParams);
} }
@ -104,7 +107,8 @@ eventManControllers.controller('EventDetailsCtrl', ['$scope', 'Event', '$statePa
eventManControllers.controller('PersonsListCtrl', ['$scope', 'Person', eventManControllers.controller('PersonsListCtrl', ['$scope', 'Person',
function ($scope, Person) { function ($scope, Person) {
$scope.persons = Person.all(); $scope.persons = Person.all();
$scope.orderProp = 'name'; $scope.personsOrderProp = 'name';
$scope.eventsOrderProp = '-begin-date';
$scope.remove = function(_id) { $scope.remove = function(_id) {
Person.remove({'id': _id}, function() { Person.remove({'id': _id}, function() {
@ -117,6 +121,8 @@ eventManControllers.controller('PersonsListCtrl', ['$scope', 'Person',
eventManControllers.controller('PersonDetailsCtrl', ['$scope', '$stateParams', 'Person', 'Event', '$log', eventManControllers.controller('PersonDetailsCtrl', ['$scope', '$stateParams', 'Person', 'Event', '$log',
function ($scope, $stateParams, Person, Event, $log) { function ($scope, $stateParams, Person, Event, $log) {
$scope.personsOrderProp = 'name';
$scope.eventsOrderProp = '-begin-date';
if ($stateParams.id) { if ($stateParams.id) {
$scope.person = Person.get($stateParams); $scope.person = Person.get($stateParams);
Person.getEvents($stateParams, function(data) { Person.getEvents($stateParams, function(data) {

18
angular_app/person-info.html
View file

@ -11,26 +11,28 @@
<div class="panel-body"> <div class="panel-body">
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">
<label for="query-persons">Search:</label> <label for="query-persons">{{'Search:' | translate}}</label>
<input type="text" id="query-persons" class="form-control" placeholder="{{'Name or email' | translate}}" ng-model="query"> <input type="text" id="query-persons" class="form-control" placeholder="{{'Name or email' | translate}}" ng-model="query">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="events-order">Sort by:</label> <label for="events-order">{{'Sort by:' | translate}}</label>
<select id="events-order" class="form-control" ng-model="orderProp"> <select id="events-order" class="form-control" ng-model="eventsOrderProp">
<option value="name" ng-selected="selected">Alphabetical</option> <option value="title">{{'Title' | translate}}</option>
<option value="date">Date</option> <option value="-title">{{'Title (descending)' | translate}}</option>
<option value="begin-date">{{'Date' | translate}}</option>
<option value="-begin-date">{{'Date (descending)' | translate}}</option>
</select> </select>
</div> </div>
</form> </form>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th>Event</th> <th>{{'Event' | translate}}</th>
<th>Attended</th> <th>{{'Attended' | translate}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="event in events"> <tr ng-repeat="event in events | splittedFilter:query | orderBy:eventsOrderProp">
<td><strong><a ui-sref="event.info({id: event._id})">{{event.title}}</a></strong></td> <td><strong><a ui-sref="event.info({id: event._id})">{{event.title}}</a></strong></td>
<td> <td>
<button class="btn btn-link" name="switch-attended" ng-click="updateAttendee(event, !event.person_data.attended)"><span class="glyphicon {{(event.person_data.attended) && 'glyphicon-ok-sign text-success' || 'glyphicon-remove-sign text-danger'}}"></span></button> <button class="btn btn-link" name="switch-attended" ng-click="updateAttendee(event, !event.person_data.attended)"><span class="glyphicon {{(event.person_data.attended) && 'glyphicon-ok-sign text-success' || 'glyphicon-remove-sign text-danger'}}"></span></button>

10
angular_app/persons-list.html
View file

@ -20,9 +20,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="persons-order">{{'Sort by:' | translate}}</label> <label for="persons-order">{{'Sort by:' | translate}}</label>
<select id="persons-order" class="form-control" ng-model="orderProp"> <select id="persons-order" class="form-control" ng-model="personsOrderProp">
<option value="name">{{'Alphabetical' | translate}}</option> <option value="name" ng-selected="selected">{{'Name' | translate}}</option>
<option value="_id">{{'ID' | translate}}</option> <option value="-name" ng-selected="selected">{{'Name (descending)' | translate}}</option>
<option value="surname" ng-selected="selected">{{'Surname' | translate}}</option>
<option value="-surname" ng-selected="selected">{{'Surname (descending)' | translate}}</option>
</select> </select>
</div> </div>
</form> </form>
@ -35,7 +37,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="person in persons | splittedFilter:query | orderBy:orderProp"> <tr ng-repeat="person in persons | splittedFilter:query | orderBy:personsOrderProp">
<td> <td>
<span><strong><a ui-sref="person.info({id: person._id})"><span>{{person.name}}</span>&nbsp;<span>{{person.surname}}</span></a></strong></span> <span><strong><a ui-sref="person.info({id: person._id})"><span>{{person.name}}</span>&nbsp;<span>{{person.surname}}</span></a></strong></span>
<p>{{person.email}}</p> <p>{{person.email}}</p>