Merge new updates into master

adding filters and changing base consult on employees and teacher tables

edit base consult filters

src/libs/routes/disciplines.js

@@ -162,8 +162,11 @@ disciplinesApp.get('/gender', (req, res, next) => {
 
 
 disciplinesApp.get('/contract_type', (req, res, next) => {
-    req.result = [];
-    for(let i = 1; i <= 5; ++i) {
+    req.result = [
+        id: "null",
+        name: id2str.contractType("null")
+    ];
+    for(let i = 1; i <= 4; ++i) {
         req.result.push({
             id: i,
             name: id2str.contractType(i)