v1.9.7

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.9.7 - 2019-05-02
+## Changed
+- Fix enrollment projection
+- Fix enrollment number in classroom count
+- Fix error in class count
+
 ## 1.9.6 - 2019-04-02
 ## Changed
 - Fix null in integral time

src/libs/routes/classCount.js

@@ -338,6 +338,23 @@ function addNullFields(result) {
     }
     prevFirstDimId = d;
   });
+  console.log("FUNCTION");
+  console.log(result);
+}
+
+function addZeroFields(result) {
+    let i;
+    for (i=0; i < result.length; i++) {
+        let hasTotal = result[i].hasOwnProperty("total");
+        if (hasTotal == true) {
+            result[i].average = 0.0;
+            result[i].median = 0.0;
+            result[i].stddev = 0.0;
+            result[i].first_qt = 0.0;
+            result[i].third_qt = 0.0;
+        }
+    }
+    return result;
 }
 
 // SimCAQ
@@ -425,8 +442,10 @@ classCountApp.get('/', rqf.parse(), (req, res, next) => {
     })
   }
   // Caso tenha mais de uma dimensão, retorna a consulta só pelas dimensões, sem linha de total
-  else
+  else {
     addNullFields(req.result);
+    req.result = addZeroFields(req.result);
+  }
 
   next();
 }, response('class_count'));

src/libs/routes/classroomCount.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 const express = require('express');
 
 const classroomCountApp = express.Router();

src/libs/routes/enrollmentProjection.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 const express = require('express');
 
 const enrollmentProjectionApp = express.Router();