Merge new updates into master

adding filters and changing base consult on employees and teacher tables

edit base consult filters

added 2 commits

• 39026a4c - Fixed the email issue
• 4dc09303 - Merge branch 'email_fix' into 'new_updates'

Compare with previous version

assigned to @ppc19

added 135 commits

• cf3f2d10 - school relative solicitations on issue 792 are completed
• cc78bf9f - adding new filter to class component
• b443a1c9 - Merge branch 'lde_variable_update' into 'dev'
• 7a73716e - made some changes for auxiliar and class routes as required on issue 792
• de44db3e - change goverment to government
• 0bd497b6 - change goverment to government
• fc8e5805 - modify case null
• 0c83fd0e - Merge branch 'issue792_Pietro' into dev
• 5091b4fc - fix spacing in contract_type filter
• 89d6c006 - testing database errors
• 1fef4aa6 - always consider school integral time percentage
• e16fe9c6 - fix total and total_suitable calculations
• f49e261d - Remove console.log
• 5a0f6a6a - Correct total calculations
• bec39f11 - Merge branch 'disciplines_hotfix' into 'dev'
• 1db66865 - all basdic education fixes are done
• de7bff12 - Merge branch 'godp_792' into 'dev'
• 6a86cc45 - Merge branch 'classroom_count_hotfix' into 'dev'
• e498ba2a - fixing turn filter problem
• 042964e7 - fixing turn filter problem
• 4c9ec40f - add nao classificada to school
• 790408ea - [wip] handle null values
• 741846fe - add case null
• 668be3b3 - Merge branch 'godp_792' into 'dev'
• d03045bf - final commit
• 40794560 - Merge branch 'godp_792' into 'dev'
• ae24700a - remove console log
• 2ed6434e - Merge branch 'issue792_Pietro' into 'dev'
• d02048af - remove conflict
• a88d7e12 - hotfix integral percentage for schools
• 83fd9e4f - hotfix integral time calculation
• a4acbbab - add nao declarada name
• a586e860 - correct cor_raca from matriculas ens superior and docentes ens superior
• c79483f5 - Merge branch 'dev' into 'issue792_Pietro'
• df481b12 - Merge branch 'issue792_Pietro' into 'dev'
• da6f5107 - fix não declarado in studentDeficiency and schoolType
• 40bff5e9 - Merge branch 'issue792_Pietro' into 'dev'
• 369b2fcb - remove programas basicos from convert
• 110ab438 - remove Programas basicos from route
• d729fd73 - Merge branch 'issue792_Pietro' into 'dev'
• ffb41e6e - Update enrollment - new filters
• bc807a5f - add ead to nightTime
• 8afbf0d8 - Merge branch 'atualizacao-enrollment' into 'dev'
• b7146390 - Add new sub rout PEE
• bde20d7f - Merge branch 'dev' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into dev
• 9448489d - update enrollment PEE(2)
• f85b649a - update enrollment PEE(3)
• 1fa9f72a - update enrollment PEE(4)
• 705d8f69 - Add new rout possui_necessidade_especial
• fa575b34 - Add pee_por_categoria
• 105d384e - Add new convert
• d2b67617 - Update id2str
• 9c64e673 - Update names
• 5d53044c - fix problem with missing teacher
• dd43f642 - Merge branch 'classroom_count_hotfix' into 'homologa'
• f143e932 - fix classroom_count
• b927a01c - remove não classificada from modalidade de ensino
• 66e88d8e - add backtick
• 576e5a68 - Merge branch 'issue792_Pietro' into 'dev'
• c4b7a895 - add não declarado to boolean variables in docentes
• 97309420 - finish all teacher corrections
• 48428386 - Merge branch 'issue792_Pietro' into 'dev'
• 09cab629 - change from if to switch
• b5e122dd - Add new line to keep the standard fomatting
• 984c8912 - Add new line to keep the standard fomatting
• 9db24d26 - Add missing semicolons
• d98f9f19 - update booleanVariable to convert pattern
• 10f45d72 - Merge branch 'issue792_Pietro' into 'dev'
• 2dfb9583 - Fix missing space
• 8ac47dff - Merge branch 'dev' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into dev
• c0a4f412 - remove console.log
• a4dccb73 - Merge branch 'dev' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into dev
• fb77609b - Add pee_por_categoria
• 0c1c4e28 - Merge branch 'dev' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into dev
• 5ba8011a - Fix bug in pee_por_categoria
• 6cac0455 - Fix bug in pee_por_categoria(2)
• e398b60a - Update filters
• 8f974b1e - Update filters(2)
• 5aad998e - Update filters(3)
• 55c7a8f6 - Update filters(4)
• ab8d1f4c - Update filters disciplines
• 8c3b381a - Merge commit '6cac0455' into homologa
• 7b040277 - Update disciplines - filters
• 080fb67c - Update disciplines - filters(2)
• 6c2c2fd0 - Fix pee indicator
• 0cc7316c - Fix enrollment - pee
• b2d70daf - Fix enrollment - pee(2)
• ea3ce29e - Update pee_por_categoria
• 9f3cccba - Fix pee_por_categoria
• ea8236e7 - fix convert files
• 07e3399b - Fix pee_por_categoria(2)
• 48441f1f - Fix pee_por_categoria(3)
• 47e5d250 - Fix pee_por_categoria(4)
• c5720582 - Fix pee_por_categoria - dims
• ab319ffb - Fix pee_por_categoria - dims(2)
• bf46d199 - Fix pee_por_categoria - dims(3)
• 2df7fc2b - Fix pee_por_categoria - dims(2)
• 8cb4bf20 - Fix query in pee_por_categoria
• 65a847cb - Merge branch 'hotfix_convert' into 'dev'
• 6da00ebf - add city subroutes and filters
• d484d84f - Merge branch 'add_city_subroutes' into 'dev'
• e8ce12e0 - Update dims pee_por_categoria
• 4e4691d8 - Update dims pee_por_categoria(2)
• d2e860a4 - Fix dims pee_por_categoria(2)
• 6f9471a3 - hotfix converts
• 35374464 - Update enrollment - test
• 7ef3aa8b - Update enrollment - test(2)
• 0deb5371 - Update enrollment - test(3)
• 73721ff5 - Update enrollment - test(4)
• 33c25bee - add mesoregion and microregion filters
• bf294db3 - Update enrollment - test(5)
• d6ecda00 - Merge branch 'meso_micro_filters' into 'dev'
• ab0ab607 - Merge branch 'dev' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into dev
• 079e171f - Update enrollment - test(6)
• 651db4da - Update filters (add docente.)
• 83222e48 - Update filters (add docente. 2)
• 2fb663a0 - add null value
• c68ea7ae - Merge branch 'meso_micro_filters' into 'dev'
• 473e72b1 - hotfix null object
• b9afc5f4 - Remove tipo_turma_atendimento_id from filter - disciplines.js
• f72652f6 - Remove filter from disciplines.js
• 7b437be2 - remove console.log
• 552a6306 - fix upper turn convert call
• 9e1daf56 - Merge branch 'homologa' into 'dev'
• 0484fb3d - Merge branch 'dev' into 'homologa'
• e1790b44 - Update pee_por_categoria_name
• 67f46fd6 - Update names in pee_por_categoria
• 487f30a7 - Remove pee.js
• 96b12b32 - Merge branch 'issue753-change-names' into 'dev'
• d833c1a0 - Merge branch 'dev' into 'homologa'
• b90b9cc8 - Add TEA in pee_por_categoria
• 33fe13d0 - Remove console.log from enrollment.js
• 5bed3d9f - Merge branch 'issue753-change-names' into 'dev'
• e3580735 - Merge branch 'dev' into 'homologa'
• f42364e3 - Merge branch 'homologa' into 'new_updates'

Compare with previous version

added 49 commits

• 6a654073 - Add studentsAee rout
• 9346bffa - Add region and state not filter
• 44ea9dd7 - Merge branch 'state_not_filter' into 'dev'
• 22d8137b - Add new rout - studentsAee
• 967aa3d1 - Add value to field - filter
• 0ad0423e - Add value to field - filter(2)
• 54f1b08c - Update rout name studentsAee -> students_aee
• a454dfaa - Update filter city (test)
• e728b216 - Update filter region (test)
• 5ea29c53 - Update filter school (test)
• 8094cff1 - Update filter school (test 2)
• fccfee52 - Update filter school (test 3)
• 13500d94 - Add console log
• f57e6833 - Update school filter
• 7e1a86f3 - Update school filter(2)
• 49d521ab - Update school filter(3)
• 82a9fe96 - Update school filter(2)
• ef472e3f - removing some forbidden filters on universityEnrollment default route
• cd83b890 - removing forbidden filters from all universityEnrollment subRoutes
• ef675009 - adding a console log for debbuging purposes
• 7a4fd1c0 - Add region and state not filter
• 3b4eb9fc - add university filter
• 0ca0bbab - fix filter
• 9b1c4b02 - Add studentsAee rout
• 31cd11c6 - Add new rout - studentsAee
• ecccada6 - Add value to field - filter
• 9ccc0857 - Add value to field - filter(2)
• 8f29b017 - Update rout name studentsAee -> students_aee
• 4db96fe8 - Update filter city (test)
• a67c356d - Update filter region (test)
• 767f725d - Update filter school (test)
• 430aa1f8 - Update filter school (test 2)
• 3efd5518 - Update filter school (test 3)
• 12524926 - Add console log
• 15d7874f - Update school filter
• 9d68fdf1 - Update school filter(2)
• f47c9c74 - Update school filter(3)
• 60566edf - Update school filter(2)
• 7fe8351d - Merge branch 'issue-752-aee' of https://gitlab.c3sl.ufpr.br/simcaq/simcaq-node into issue-752-aee
• 36ae691f - added result for 11 value on cimne detailed filter
• 8b732db1 - Update adm_dep and localizacao
• 06345fd5 - Add local offer name and year filter
• f12d3d86 - Merge branch 'localoffer_upd' into 'dev'
• f447492f - Merge branch 'issue-752-aee' into 'dev'
• 1082bd49 - add localoffer id
• 29322b13 - Merge branch 'dev' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into dev
• 857b477b - removing name column on ocde filters
• 59f1ff86 - Merge branch 'dev' into 'homologa'
• cca715af - Merge branch 'homologa' into 'new_updates'

Compare with previous version

merged

mentioned in commit 83713757