blah blah blah

This commit is contained in:
didier amyot committed 2017-05-23 22:35:11 -04:00
1 parent f67080571a
commit e34b213327
3 files changed
+62 -12

No files matched your search

+33 -11
View File
@@ -34,16 +34,18 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
);
};
playersSelectionBar.getTeamInput = function(model, team){
var label = team.name;
return playersSelectionBar.teamInput(label, team.name, model.activatedTeams);
};
playersSelectionBar.chooseTeams = function(model){
return m('form.uk-grid', {style: {'margin-top': '1em'}},
m('div.uk-width-1-6', m('label', m('b', 'Équipes'))),
m('div.uk-width-5-6',
m('div.uk-grid', [
playersSelectionBar.teamInput('Bleu', 'bleu', model.activatedTeams),
playersSelectionBar.teamInput('Rouge', 'rouge', model.activatedTeams),
playersSelectionBar.teamInput('Jaune', 'jaune', model.activatedTeams),
playersSelectionBar.teamInput('Gris', 'gris', model.activatedTeams),
]))
m('div.uk-grid',
_.map(teams.teams(), _.partial(playersSelectionBar.getTeamInput, model))
))
);
};
@@ -60,12 +62,18 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
])));
};
playersSelectionBar.searchBar = function(){
playersSelectionBar.searchFactory = function(model){
return function(){
model.searchTerm(this.value);
};
};
playersSelectionBar.searchBar = function(model){
var icon = m('i.fa.fa-search', {'aria-hidden': true}, '');
return m('form.uk-grid', {style: {'margin-top': '1em'}},
m('div.uk-width-1-1.', {style: 'text-align: right;'},
m('label', m('b', icon, " Rechercher ")),
m('input', {type: 'text'})));
m('input', {type: 'text', onkeypress: playersSelectionBar.searchFactory(model)})));
};
playersSelectionBar.controller = function(model){
@@ -247,11 +255,22 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
};
};
playersTable.tableBody = function(players, visibleTeams, activatedScores){
playersTable.playerHasBeenSearchedFor = function(searchTerm){
return function(player){
if(_.isEmpty(searchTerm)){
return true;
}
return new RegExp(searchTerm, 'i').test(player.name);
};
}
playersTable.tableBody = function(players, visibleTeams, activatedScores, searchTerm){
return m('tbody',
_(players)
.filter(playersTable.onlyPlayerOfTeams(visibleTeams))
.filter(playersTable.onlyPlayerOfScore(activatedScores))
.filter(playersTable.playerHasBeenSearchedFor(searchTerm))
.map(playersTable.playerRowAndInformation).flatten().value()
);
};
@@ -262,7 +281,9 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
playersTable.tableHeader(ctrl.model.sorting),
playersTable.tableBody(ctrl.players(),
ctrl.model.activatedTeams(),
ctrl.model.activatedScores()
ctrl.model.activatedScores(),
ctrl.model.searchTerm()
)
);
};
@@ -271,9 +292,10 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
playersPage.controller = function(){
var model = {};
model.activatedTeams = m.prop(['bleu', 'rouge', 'jaune', 'gris']);
model.activatedTeams = m.prop(_.map(teams.teams(), 'name'));
model.activatedScores = m.prop([1, 2, 3, 4, 5]);
model.sorting = m.prop([{key: 'team', direction: 1}, {key: 'score', direction: -1}, {key: 'name', direction: 1}]);
model.searchTerm = m.prop('');
return model;
};