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

@@ -644,9 +644,9 @@ disciplinesApp.get('/', rqf.parse(), (req, res, next) => {
 
             if (req.tmp_discipline){
                 Object.keys(r).forEach(k => {
-                    if (/^total_suitable/.test(k)) // if k starts with total_suitable
+                    if (/^total_suitable_/.test(k)) // if k starts with total_suitable
                         obj.sum_suitable += parseInt(r[k]);
-                    else if (/^total_/.test(k))
+                    else if (/^total_(?!suitable)/.test(k))
                         obj.sum_total += parseInt(r[k]);
                 })
             } else {