From 8f5e2885da5740f8941fc48b8652a6e5d42c42e4 Mon Sep 17 00:00:00 2001
From: Janaina <jsk22@inf.ufpr.br>
Date: Fri, 1 Sep 2023 11:24:46 -0300
Subject: [PATCH] eduardo asked
---
src/libs/routes_v1/activity.js | 10 ++++++----
src/libs/routes_v1/publication.js | 13 ++++++-------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/libs/routes_v1/activity.js b/src/libs/routes_v1/activity.js
index 1c00ced7..cb35c2de 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/publication.js b/src/libs/routes_v1/publication.js
index 2a953e17..3e1dfeed 100644
--- a/src/libs/routes_v1/publication.js
+++ b/src/libs/routes_v1/publication.js
@@ -78,14 +78,14 @@ 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
}
@@ -99,7 +99,8 @@ pubApp.get('/homepage', async (req, res, next)=> {
});
pubApp.get('/type', async (req, res, next) => {
- console.log("Entrei");
+ const page = parseInt(req.query.page) || 1; // Current page number
+ const pageSize = parseInt(req.query.pageSize) || 5; // Number of items per page
const tp = req.params.tp || 'all';
if(tp === 'all'){
const totalCount = await Publication.count();
@@ -108,9 +109,7 @@ pubApp.get('/type', async (req, res, next) => {
const publis = await Publication.findAll({
offset,
limit: pageSize,
- order: [
- ['created_at', ordenar],
- ],
+
});
res.json({
--
GitLab