From 5753f754d6a125f74c2241956c9a986845c5b8bc Mon Sep 17 00:00:00 2001
From: Victor Picussa <vp16@inf.ufpr.br>
Date: Thu, 12 Jul 2018 09:48:13 -0300
Subject: [PATCH 1/3] [dailyChargeAmount]Change variable return to total
---
src/libs/routes/dailyChargeAmount.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/routes/dailyChargeAmount.js b/src/libs/routes/dailyChargeAmount.js
index 1514b441..0d2d1c08 100644
--- a/src/libs/routes/dailyChargeAmount.js
+++ b/src/libs/routes/dailyChargeAmount.js
@@ -380,7 +380,7 @@ dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next)
req.sql.from('turma')
.field('turma.ano_censo', 'year')
.field('turma.etapas_mod_ensino_segmento_id', 'education_level_mod_id')
- .field('AVG(turma.duracao_turma)/60.0', 'average_class_duration')
+ .field('AVG(turma.duracao_turma)/60.0', 'total')
.group('turma.ano_censo')
.group('turma.etapas_mod_ensino_segmento_id')
.order('turma.ano_censo')
--
GitLab
From 9f2166cc9ec9da6aa006b29757aa674197135313 Mon Sep 17 00:00:00 2001
From: Victor Picussa <vp16@inf.ufpr.br>
Date: Thu, 12 Jul 2018 10:29:42 -0300
Subject: [PATCH 2/3] [dailyChargeAmount]Added period & integral time urls
---
src/libs/routes/dailyChargeAmount.js | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/src/libs/routes/dailyChargeAmount.js b/src/libs/routes/dailyChargeAmount.js
index 0d2d1c08..2bf1f513 100644
--- a/src/libs/routes/dailyChargeAmount.js
+++ b/src/libs/routes/dailyChargeAmount.js
@@ -124,6 +124,30 @@ dailyChargeAmountApp.get('/average/education_level_mod', (req, res, next) => {
next();
}, response('education_level_mod'));
+dailyChargeAmountApp.get('/period', (req, res, next) => {
+ req.result = [];
+ for(let i = 1; i <= 3; ++i) {
+ req.result.push({
+ id: i,
+ name: id2str.period(i)
+ });
+ };
+ req.result.push({
+ id: 99,
+ name: id2str.period(99)
+ });
+ next();
+}, response('period'));
+
+dailyChargeAmountApp.get('/integral_time', (req, res, next) => {
+ req.result = [
+ {id: null, name: 'Não Disponível'},
+ {id: 0, name: 'Não'},
+ {id: 1, name: 'Sim'}
+ ];
+ next();
+}, response('integral_time'));
+
rqf.addField({
name: 'filter',
field: false,
--
GitLab
From aa07acfedb374b4e2668debc5c88056b0015298a Mon Sep 17 00:00:00 2001
From: Victor Picussa <vp16@inf.ufpr.br>
Date: Mon, 23 Jul 2018 10:57:11 -0300
Subject: [PATCH 3/3] [hotfix_v1.4.2]CHANGELOG modified
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 633fc48b..33617dd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## 1.4.2 - 2018-07-23
+### Added
+- Added new url's in daily charge amount indicator
+### Changed
+- Fix variable name and url in daily charge amount indicator
+
## 1.4.1 - 2018-07-03
### Changed
- Fix duplicate in transport indicator
--
GitLab