diff --git a/web/assets/js/attendance.search.js b/web/assets/js/attendance.search.js index 1643fe613ea1d571d81b814908340e7dc5ee5450..9070959dd9a843b63de39ceff8e62ea1392ef060 100644 --- a/web/assets/js/attendance.search.js +++ b/web/assets/js/attendance.search.js @@ -82,9 +82,10 @@ angular.module('datasid.attendance.search', []). key: 'location', title: 'Localização', options: [ - { key: 'Maceio, AL', title: 'Maceio, AL', value: false }, - { key: 'Salvador, BA', title: 'Salvador, BA', value: false }, - { key: 'Manaus, AM', title: 'Manaus, AM', value: false } + { key: 3106200, title: 'Belo Horizonte, MG', value: false }, + { key: 2927408, title: 'Salvador, BA', value: false }, + { key: 1501402, title: 'Belém, PA', value: false }, + { key: 5300108, title: 'BrasÃlia, DF' , value: false } ], more: true } diff --git a/web/routes/points.js b/web/routes/points.js index 643da0b133809d646454de35f1edec4a348bc6c9..13c23abdd941ed03d5a9256249340d88c3233095 100644 --- a/web/routes/points.js +++ b/web/routes/points.js @@ -18,17 +18,28 @@ exports.list = function(req, res) { for (var key in filters) { switch (key) { case "project": + var l = []; for (var i = 0; i < filters[key].length; i++) { - conditions.push("project = $"+(c++)); + l.push("pt.project = $"+(c++)); parameters.push(filters[key][i]); } - + if (l.length > 0) + conditions.push(l.join(' OR ')); + break; + case "location": + var l = []; + for (var i = 0; i < filters[key].length; i++) { + l.push("pt.id_city = $"+(c++)); + parameters.push(filters[key][i]); + } + if (l.length > 0) + conditions.push(l.join(' OR ')); break; } } if (conditions.length > 0) - where = " AND (" + conditions.join(' OR ') + ")"; + where = " AND (" + conditions.join(') AND (') + ")"; var query = "\ SELECT \ @@ -58,6 +69,8 @@ exports.list = function(req, res) { LIMIT 50 \ OFFSET " + offset; + // console.log(query); + req.db.query(query, parameters, function(result) { req.db.done();