diff --git a/src/libs/models/upload b/src/libs/models/upload
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/libs/routes_v1/activity.js b/src/libs/routes_v1/activity.js
index 1c00ced76b5c2fddbed61d58d7b7966b0a172cec..cb35c2de1e741d37ec860ecb142f8d499f1ab7c5 100644
--- a/src/libs/routes_v1/activity.js
+++ b/src/libs/routes_v1/activity.js
@@ -117,9 +117,9 @@ activityApp.get('/:id', (req, res, next) => {
let actJSON = act.toJSON();
//transform data yyyy-mm-dd to dd/mm/yyyy
let date = actJSON.date.split('-');
- let date_headline = actJSON.date_headline.split('-');
+ let date_start= actJSON.date_start.split('-');
actJSON.date = date[2] + '/' + date[1] + '/' + date[0];
- actJSON.date_headline = date_headline[2] + '/' + date_headline[1] + '/' + date_headline[0];
+ actJSON.date_start = date_start[2] + '/' + date_start[1] + '/' + date_start[0];
req.result = actJSON;
next();
}
@@ -159,7 +159,8 @@ activityApp.post('/', passport.authenticate('bearer', { session: false }), autho
text: req.body.texto,
name_headline: req.body.nome,
resume_headline: req.body.resumo,
- date_headline: transformDateFormat(req.body.dataAtividade),
+ date_start: transformDateFormat(req.body.dataInicio),
+ date_end: transformDateFormat(req.body.dataEnd),
local_headline: req.body.local,
additional_headline: req.body.informacoes,
is_draft: req.body.rascunho,
@@ -207,7 +208,8 @@ activityApp.put('/:id', passport.authenticate('bearer', { session: false }), aut
act.text = req.body.texto || act.text;
act.name_headline = req.body.nome || act.name_headline;
act.resume_headline = req.body.resumo || act.resume_headline;
- act.date_headline = req.body.dataAtividade || act.date_headline;
+ act.date_start = req.body.dataStart || act.date_start;
+ act.date_end = req.body.dataEnd || act.date_end;
act.local_headline = req.body.local || act.local_headline;
act.additional_headline = req.body.informacoes || act.additional_headline;
act.is_draft = req.body.rascunho || act.is_draft;
diff --git a/src/libs/routes_v1/api.js b/src/libs/routes_v1/api.js
index 782f55549cdf104b2f484a18736ad4e8a54ae2dc..bbc7a6982f4662d08834a5ff6c3b40636a14e560 100644
--- a/src/libs/routes_v1/api.js
+++ b/src/libs/routes_v1/api.js
@@ -213,4 +213,7 @@ api.use('/publication', publication);
//Activity
api.use('/activity', activity);
+//Email
+api.use('/email', email);
+
module.exports = api;
diff --git a/src/libs/routes_v1/email.js b/src/libs/routes_v1/email.js
new file mode 100644
index 0000000000000000000000000000000000000000..7b1799a492ceebe711bed8b8c714ff1e78bda37f
--- /dev/null
+++ b/src/libs/routes_v1/email.js
@@ -0,0 +1,24 @@
+const express = require('express');
+
+const email = require(`../middlewares/email`);
+
+const log = require(`../log`)(module);
+
+const emailApp = express();
+
+const libs = `${process.cwd()}/libs`;
+
+const User = require(`${libs}/models/user`);
+
+const passport = require('passport');
+
+
+emailApp.get('/', async (req, res, next) => {
+ var emails = await User.findAll({attributes:['name','email']});
+ const emailsArray = emails.map(_email => _email.get());
+ res.json(emailsArray);
+
+})
+
+
+module.exports = emailApp;
diff --git a/src/libs/routes_v1/liquidEnrollmentRatio.js b/src/libs/routes_v1/liquidEnrollmentRatio.js
index 63bd91685a8df488731a267d268a929a6252a8df..4e3b6f4bff2cff7371500e3795d5d6529071a951 100644
--- a/src/libs/routes_v1/liquidEnrollmentRatio.js
+++ b/src/libs/routes_v1/liquidEnrollmentRatio.js
@@ -348,6 +348,7 @@ liquidEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
if ("education_level_short" in req.filter) {
if (Array.isArray(req.filter.education_level_short)) {
+ console.log("ENTROU NO PRIMEIRO IF")
var stringQuery = '';
for(let i = 0; i < req.filter.education_level_short.length - 1; i++) {
stringQuery = stringQuery + ConvertEnrollment(req.filter.education_level_short[i]) + ' OR ';
@@ -389,6 +390,7 @@ liquidEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
if ("education_level_short" in req.filter) {
if (Array.isArray(req.filter.education_level_short)) {
+ console.log("ENTROU NO SEGUNDO IF")
var stringQuery = '';
for(let i = 0; i < req.filter.education_level_short.length - 1; i++) {
stringQuery = stringQuery + convertPnad(req.filter.education_level_short[i]) + ' OR ';
diff --git a/src/libs/routes_v1/publication.js b/src/libs/routes_v1/publication.js
index 63a7cbd5b5683aaae12696f96079c7ae1177f193..5092cff614417a9c57859fb0bb8bd5485c41ca3b 100644
--- a/src/libs/routes_v1/publication.js
+++ b/src/libs/routes_v1/publication.js
@@ -78,14 +78,13 @@ pubApp.get('/', async (req, res, next) => {
});
pubApp.get('/homepage', async (req, res, next)=> {
+ const page = parseInt(req.query.page) || 1; // Current page number
+ const pageSize = parseInt(req.query.pageSize) || 5; // Number of items per page
const totalCount = await Publication.count({ where: { is_headline: true } });
const offset = (page - 1) * pageSize;
const publis = await Publication.findAll({
offset,
limit: pageSize,
- order: [
- ['created_at', ordenar],
- ],
where:{
is_headline:true
}
@@ -98,18 +97,18 @@ pubApp.get('/homepage', async (req, res, next)=> {
});
});
-pubApp.get('/type/:tp', async (req, res, next) => {
- const tp = req.params.tp || 'all';
- if(tp === 'all'){
+pubApp.get('/type', async (req, res, next) => {
+ const page = parseInt(req.query.page) || 1; // Current page number
+ const pageSize = parseInt(req.query.pageSize) || 5; // Number of items per page
+ const tipo = req.query.tipo || 'all';
+ console.log(tipo);
+ if(tipo === 'all'){
const totalCount = await Publication.count();
const offset = (page - 1) * pageSize;
const publis = await Publication.findAll({
offset,
limit: pageSize,
- order: [
- ['created_at', ordenar],
- ],
});
res.json({
@@ -120,16 +119,13 @@ pubApp.get('/type/:tp', async (req, res, next) => {
});
}
else{
- const totalCount = await Publication.count({ where: { filter: req.params.tp } });
+ const totalCount = await Publication.count({ where: { filter: tipo } });
const offset = (page - 1) * pageSize;
const publis = await Publication.findAll({
offset,
limit: pageSize,
- order: [
- ['created_at', ordenar],
- ],
where: {
- filter: req.params.tp
+ filter: tipo
}
});
res.json({
@@ -186,7 +182,7 @@ pubApp.post('/', passport.authenticate('bearer', { session: false }), authorized
link: data.link,
upload: _file_id,
is_draft: data.rascunho,
- is_homepage: data.homepage,
+ is_headline: data.homepage,
volume: data.volume,
pages: data.pagina
}).catch(function (err) {
@@ -224,7 +220,7 @@ pubApp.post('/edit', passport.authenticate('bearer', { session: false }), author
pb.year = data.ano || pb.year;
pb.text = data.texto || pb.text;
pb.link = data.link || pb.link;
- pb.is_homepage = data.homepage || pb.is_homepage;
+ pb.is_headline = data.homepage || pb.is_headline;
pb.is_draft = data.rascunho || pb.is_draft;
pb.upload = _file_id || pb.upload;
pb.volume = data.volume || pb.volume;