Skip to content

dev #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 602 commits into from
Jun 12, 2024
Merged

dev #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
602 commits
Select commit Hold shift + click to select a range
e713e2c
enable firebug
igorgoncalves Dec 21, 2023
ff2b794
add taghomolog
igorgoncalves Dec 21, 2023
86668fe
fix rules
igorgoncalves Dec 21, 2023
bd00c96
fix: remove rules
igorgoncalves Dec 21, 2023
705974a
change controller
igorgoncalves Dec 21, 2023
a8008af
rename files
igorgoncalves Dec 21, 2023
9691a8f
fix: change routes for foods module
igorgoncalves Dec 21, 2023
e9feddd
fix: change folder names for foodrequest
igorgoncalves Dec 21, 2023
95c4eca
Feat/individual record frequency correction (#567)
evellynreis Dec 22, 2023
883d091
fix(foods): Corrigindo resposividade de estoque e solicitações no mod…
Gusta-Santos Dec 22, 2023
d129766
feito correção de cor de notificação (#566)
Tori-IPTI Dec 22, 2023
12e6d9f
consertado a responsividade na tela de listagem de refeições e adicio…
GabrielChagas14 Dec 22, 2023
0202577
feito correção de fonte no textarea de Diário de Aula (#569)
Tori-IPTI Dec 22, 2023
3d53073
ci: adding sass container build
igorgoncalves Dec 26, 2023
ada2490
Fix/teacher screen option code appears in city (#487)
Tori-IPTI Dec 26, 2023
c82a4ac
Revert "Fix/teacher screen option code appears in city (#487)" (#571)
igorgoncalves Dec 26, 2023
8d820e0
Fix/teacher screen option code appears in city (#572)
igorgoncalves Dec 26, 2023
b1f15fa
Fix/missing fields warning (#475)
Tori-IPTI Dec 26, 2023
c1eb0f8
Merge branch 'dev' into feat/refactor-grades
igorgoncalves Dec 26, 2023
d9a7f1a
fix calculaton
igorgoncalves Dec 26, 2023
611d1aa
adding migrations
igorgoncalves Dec 26, 2023
6c7479e
fix: sagres inconsistences
igorgoncalves Dec 27, 2023
51eb023
feat: adding by concept grades
igorgoncalves Dec 27, 2023
3bee28c
fix delete action and form layout
igorgoncalves Dec 28, 2023
efde64a
fix: remove sonar cloud error
igorgoncalves Dec 28, 2023
583d237
fix: clean code smells
igorgoncalves Dec 28, 2023
1994ef0
fix code smells
igorgoncalves Dec 28, 2023
8a24e44
reduce complexity
igorgoncalves Dec 28, 2023
98864e4
fix: code smells'
igorgoncalves Dec 28, 2023
63fd0b9
fix code smells on usecases
igorgoncalves Dec 28, 2023
1581107
fix: code smells
igorgoncalves Dec 28, 2023
636ceb1
fix loading error
igorgoncalves Dec 28, 2023
132fa0f
feat/refactor grades (#574)
igorgoncalves Dec 28, 2023
8e2a258
fix: adding cpf to search and graderelease
igorgoncalves Dec 28, 2023
a923292
update css
igorgoncalves Dec 28, 2023
ad1582b
Merge branch 'feat/refactor-grades' into dev
igorgoncalves Dec 28, 2023
9840cc2
change labels
igorgoncalves Dec 28, 2023
44100e4
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
igorgoncalves Dec 28, 2023
a91eb2d
fix design issues
igorgoncalves Dec 29, 2023
e1a966c
fix: grade release
igorgoncalves Dec 29, 2023
43cd844
fix status
igorgoncalves Jan 3, 2024
e6d1b53
fix: recovery
igorgoncalves Jan 3, 2024
2961429
fix grades release
igorgoncalves Jan 4, 2024
2ae83b5
consertado tela de update
gabriel-IPTI Jan 8, 2024
23d32d7
salvando vários ingredientes para cada prato
GabrielChagas14 Jan 9, 2024
07ce6b9
mudanças no formulário
gabriel-IPTI Jan 9, 2024
ae5eab8
Merge branch 'fix/foods_module' of https://github.com/ipti/br.tag int…
gabriel-IPTI Jan 9, 2024
5902655
Merge pull request #576 from ipti/fix/foods_module
GabrielChagas14 Jan 10, 2024
66fc868
consertado a rolagem no acordeão
gabriel-IPTI Jan 10, 2024
5df0d8d
fix: initial import doesent require address, only on sedsp scenario
igorgoncalves Jan 10, 2024
9cd7767
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
igorgoncalves Jan 10, 2024
208c1c8
mudado componente de menu
gabriel-IPTI Jan 11, 2024
16ef727
fix(foods): Adicionando filtros nas unidades de medida a depender da …
Jan 12, 2024
67c038e
Corrigindo a classe helper utilizada nas telas de estoque e solicitaç…
Jan 12, 2024
b30ac59
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
Jan 12, 2024
521b70b
Fazendo o merge com a dev e modificando a versão do changelog
Jan 12, 2024
b655417
criando relatório
gabriel-IPTI Jan 12, 2024
1de3af8
change helper class
gabriel-IPTI Jan 12, 2024
5fe1023
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
gabriel-IPTI Jan 12, 2024
8ecdb7b
Corrigindo erro nas unidades de medida
Jan 12, 2024
9c7b4ee
Merge pull request #580 from ipti/fix/foodInventory_measurementUnit
Gusta-Santos Jan 12, 2024
c174ff2
adicionando usuário de nutricionista
gabriel-IPTI Jan 12, 2024
14ec57b
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
gabriel-IPTI Jan 12, 2024
8556c5f
Merge branch 'dev' into fix/foods_module
gabriel-IPTI Jan 12, 2024
6ca6def
escondendo o botão de imprimir cardápio
gabriel-IPTI Jan 12, 2024
10ab6d2
Merge pull request #583 from ipti/fix/foods_module
GabrielChagas14 Jan 12, 2024
b483388
Feat/rename term consent image (#581)
evellynreis Jan 16, 2024
a9387ec
Fix: sagres-generation (#577)
nathanipti Jan 16, 2024
55fdfc9
Feat/new merge individual record frequency (#575)
evellynreis Jan 16, 2024
efbaa3a
Feat/marked form registration (#579)
evellynreis Jan 16, 2024
00afd4c
Merge branch 'main' of https://github.com/ipti/br.tag
igorgoncalves Jan 16, 2024
6ecfad5
Merge branch 'main' into dev
igorgoncalves Jan 16, 2024
2a58a6f
Corrigindo o controller de merenda no módulo de foods
Jan 17, 2024
cda96be
Merge pull request #588 from ipti/fix/foods_rout
Gusta-Santos Jan 17, 2024
59e135b
Corrigido responsividade e colocado link de merenda no mobile
GabrielChagas14 Jan 17, 2024
99c8e56
Merge branch 'dev' into fix/merenda_mobile
GabrielChagas14 Jan 17, 2024
615199f
mostrando dias da semana no mobile na tela de cadastro de cardapio
GabrielChagas14 Jan 17, 2024
840f7e2
Merge pull request #590 from ipti/fix/merenda_mobile
GabrielChagas14 Jan 17, 2024
fd8dae7
Feat/sagres 2024 (#585)
nathanipti Jan 17, 2024
dda7a35
feat/modify_message_error_to_register_user (#584)
evellynreis Jan 17, 2024
3c32c39
Merge branch 'main' into dev
igorgoncalves Jan 17, 2024
12e592d
ungermed file
igorgoncalves Jan 17, 2024
b09e0c1
Feat/unity periods (#425)
paulones Jan 17, 2024
700e945
fix required indicator
igorgoncalves Jan 17, 2024
b10a272
fix/action update classroom fixed
AnotherOne07 Jan 18, 2024
674a5fb
Revert "Feat/sagres 2024" (#595)
igorgoncalves Jan 18, 2024
d3fd5d6
Merge branch 'dev' into fix/update-classroom
Jan 24, 2024
cafa498
Merge pull request #594 from ipti/fix/update-classroom
Tori-IPTI Jan 24, 2024
c9aec63
Feat/no transfered students (#591)
evellynreis Jan 30, 2024
3342022
feat/ correction field deficiency (#597)
evellynreis Jan 30, 2024
87f29ec
Fix: year of generation of the file changed to the one selected in th…
nathanipti Jan 30, 2024
43e808b
Feat/add grades release concept grades (#603)
Gusta-Santos Jan 30, 2024
c4aeca9
feat/add year to all reports (#596)
evellynreis Jan 31, 2024
fb2213e
docs: Criando a documentação da adr que descreve a atribuição de nome…
Feb 1, 2024
4fa98f1
Fix/correction date attendance (#607)
nathanipti Feb 1, 2024
7fc3878
feat/create head instance not is buzios (#598)
evellynreis Feb 1, 2024
c96564a
docs: Criando a documentação da adr que descreve a atribuição de nome…
Feb 1, 2024
d42bb50
chagen pullrequest template
igorgoncalves Feb 1, 2024
eb744b8
Feat/Add Delete Function To Attendances in Update Professional View (…
AnotherOne07 Feb 1, 2024
313d9cc
feat/add value 5 in array scholarity (#606)
evellynreis Feb 1, 2024
91bcf12
Feat/add report card concept grades (#609)
Gusta-Santos Feb 1, 2024
88aae47
Merge branch 'main' into dev
igorgoncalves Feb 1, 2024
7987508
Feat/foodmenu report (#608)
GabrielChagas14 Feb 1, 2024
975c8ee
Feat/sagres 2024 (#602)
nathanipti Feb 1, 2024
d5f6858
feat/ removed in field input (*) (#605)
evellynreis Feb 1, 2024
fee7732
Criando a documentação da adr que descreve a atribuição de nome de pu…
Feb 2, 2024
53ce11d
Merge branch 'dev' into docs/create_pull_request_adr
Feb 2, 2024
0128911
pull dev
gabriel-IPTI Feb 2, 2024
051ec06
Modificando a inconsistência em main.php
Feb 2, 2024
eb1b4cb
Merge pull request #612 from ipti/docs/create_pull_request_adr
Gusta-Santos Feb 5, 2024
c8c7a3f
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
gabriel-IPTI Feb 6, 2024
55221d6
Fix/import student data from sedsp (#613)
nathanipti Feb 6, 2024
e852d3d
fix/individual-report (#582)
AnotherOne07 Feb 18, 2024
f8590dd
Feat/course_plan_abilities (#615)
evellynreis Feb 18, 2024
c436424
Feat/md5 to bcrypt (#616)
nathanipti Feb 18, 2024
034d1ff
Fix/meals (#621)
GabrielChagas14 Feb 18, 2024
408a01a
Icon font version update
LiviaMartinsIPTI Feb 23, 2024
4a5d635
Fix/synchronize sedsp student data (#623)
nathanipti Feb 26, 2024
78f1cd8
Feat/foods report (#622)
GabrielChagas14 Feb 27, 2024
33784dd
[3.69.107]Fix/report_head_poco_dantas (#617)
evellynreis Feb 27, 2024
b11ea46
Fix/food inventory style (#618)
Gusta-Santos Feb 27, 2024
1139db0
Fix/report card unities (#614)
Gusta-Santos Feb 27, 2024
63cfd1e
Realizando o merge com a dev e criando as tabelas de farmer
Mar 1, 2024
c029f3a
Criando tela de cadastro de agricultor
Mar 5, 2024
db398ee
Fix/cod municipio dne (#620)
nathanipti Mar 5, 2024
bbdedd1
Fix: Correção na obtenção do CPF do estudante para o arquivo SAGRES: …
nathanipti Mar 5, 2024
03c1ebf
criado módulo de dashboard (#632)
GabrielChagas14 Mar 5, 2024
54daaeb
Criando esqueleto da tela de cadastro de agricultor
Mar 6, 2024
e167547
Criando verificações
Mar 6, 2024
b512c30
Criando verificação de relação de produtos
Gusta-Santos Mar 7, 2024
c367c45
Feat/button alphabetic order (#631)
Gusta-Santos Mar 7, 2024
3fc13e0
fix/add input no (#633)
evellynreis Mar 7, 2024
4273767
[Versão 3.71.112] Fix/class plan abilities view (#628)
AnotherOne07 Mar 7, 2024
97aa09d
Merge branch 'main' into dev
igorgoncalves Mar 7, 2024
e976f7b
main.css
gabriel-IPTI Mar 7, 2024
e3d038e
Feat calendar surpassing year (#619)
paulones Mar 7, 2024
483e96c
Criando a action de save no controller de farmer register
Mar 7, 2024
2424eee
fix merge
igorgoncalves Mar 7, 2024
a75cf95
Criando a tabela de visualização de agricultores
Mar 8, 2024
6e9871e
Criado as telas de relacionadas a agricultor
Gusta-Santos Mar 10, 2024
a5f96b6
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
gabriel-IPTI Mar 11, 2024
159c404
fix/variable declared incorrectly in function scope
AnotherOne07 Mar 11, 2024
f439052
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
AnotherOne07 Mar 11, 2024
d68baae
Adicionando a school_fk e o status em food_request
Mar 11, 2024
18a7f7e
conectando com o firebase
Mar 12, 2024
4fee7f1
Realizando integração com o firebase
Gusta-Santos Mar 13, 2024
d87d062
Realizando o merge com a dev
Gusta-Santos Mar 13, 2024
db0fa8f
Corrigindo erros do sonarlint
Gusta-Santos Mar 13, 2024
70498d0
Corrigindo errors sonarlint
Gusta-Santos Mar 13, 2024
24f07bd
Corrigindo erros do sonarlint
Gusta-Santos Mar 13, 2024
d0dccda
Corrigindo issues alertados pelo sonarlint
Mar 13, 2024
373c2eb
Corrigindo issues
Mar 13, 2024
db0dab5
Merge pull request #646 from ipti/feat/create_farmer_register
Gusta-Santos Mar 13, 2024
54b67b2
Feat/change food measurement (#635)
GabrielChagas14 Mar 15, 2024
135e109
[TCDA-240] Fix/load schedules by discipline (#637)
AnotherOne07 Mar 15, 2024
34b67b1
Feat: case added for class 22 and multi alias (#638)
nathanipti Mar 15, 2024
f701e81
Fix: gestor not edit calendar (#640)
nathanipti Mar 15, 2024
9966919
fix/poco_dantas (#643)
evellynreis Mar 15, 2024
eb64f24
rename food folders
Mar 18, 2024
324c3e8
fix: rename foodrequest folder
Mar 18, 2024
dadfa9f
fix file rename
gabriel-IPTI Mar 19, 2024
47cf6a3
consertado redirecionamento em Foodmenu
gabriel-IPTI Mar 19, 2024
d6d7626
fix: rename folder
igorgoncalves Mar 21, 2024
f10ab52
fix: delete file
igorgoncalves Mar 21, 2024
7c8b91a
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
igorgoncalves Mar 21, 2024
ae26d4a
Feat/warning missing content (#639)
paulones Mar 21, 2024
f0e5022
Fix/frequency_75 (#644)
evellynreis Mar 21, 2024
3813b28
Fix/scholarity sql column removed (#645)
nathanipti Mar 21, 2024
efd20e9
Fix/merenda escolar (#648)
GabrielChagas14 Mar 21, 2024
271c0f1
Fixing tag version number
Mar 21, 2024
176a972
Fixing changelog
Mar 21, 2024
c8e2fd9
Feat/food notice (#650)
Gusta-Santos Mar 21, 2024
6b73540
Fix/no_notes (#651)
evellynreis Mar 21, 2024
143715b
Fix/corrections and improvements (#655)
nathanipti Mar 21, 2024
25c0a26
Fix: added food Enabled (#654)
nathanipti Mar 21, 2024
6062665
Feat/boquim integration (#652)
paulones Mar 21, 2024
7de1151
Feat/instructor frequency (#657)
paulones Mar 21, 2024
cb7673b
Merge branch 'main' into release/v3.75.123
igorgoncalves Mar 21, 2024
3a62632
Feat/added professional for different schools (#659)
nathanipti Mar 21, 2024
f377631
ci: add release sql
igorgoncalves Mar 21, 2024
7bbf2c5
fix: added msg for inconsistency sagres (#626)
nathanipti Mar 22, 2024
bb52e9e
Merge branch 'dev' into release/v3.75.123
igorgoncalves Mar 22, 2024
798ab8b
Fix/manager not authorized for school pdf (#661)
nathanipti Mar 22, 2024
81150b0
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
igorgoncalves Mar 22, 2024
92e802d
Fix de teste da falta de curricular matrix e notas
Mar 25, 2024
dab43c2
logs
paulones Mar 25, 2024
4d13b07
Merge pull request #663 from ipti/feat/pending_register_fix
paulones Mar 25, 2024
43a10ad
Icon font version update
LiviaMartinsIPTI Mar 25, 2024
66e4ff4
Feat: added new version in changelog and config
nathanipti Mar 26, 2024
0f67679
Feat/added professional for different schools (#665)
nathanipti Mar 26, 2024
083779d
Fix: correction in inep_id (#664)
nathanipti Mar 26, 2024
f44ee45
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
igorgoncalves Mar 26, 2024
fa60d8c
Fix: correction in description class (#668)
nathanipti Mar 28, 2024
05a1d8e
Feat/food notice (#647)
GabrielChagas14 Apr 1, 2024
b5017f6
Feat/create farmer register (#653)
Gusta-Santos Apr 1, 2024
3981b10
corrigido bug produzido em 15/03/2024
paulones Apr 4, 2024
bb54aea
Fix/add lunch unities [Versão 3.77.132] (#677)
GabrielChagas14 Apr 12, 2024
8000ebf
Feat/school management signature (#675)
nathanipti Apr 15, 2024
7134218
Fix/date corrections (#673)
nathanipti Apr 15, 2024
12ae906
Fix/instructor frequency [Versão 3.77.131] (#676)
GabrielChagas14 Apr 15, 2024
a20780d
Fix: Reordered parameters in getSchedulesFromMajorStage method (#667)
nathanipti Apr 16, 2024
a6fe75b
fix: remove jquery
igorgoncalves Apr 19, 2024
c03c1ea
Fix/sagres componentes curriculares (#691)
nathanipti Apr 19, 2024
e09e332
Icon font version update
LiviaMartinsIPTI Apr 23, 2024
1b189a8
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
LiviaMartinsIPTI Apr 23, 2024
35355ad
add bytecodes
igorgoncalves Apr 25, 2024
0417585
Fix/class turn (#683)
nathanipti Apr 25, 2024
40e08ad
[TCDA-214] Feat/class plan validate (#694)
AnotherOne07 Apr 26, 2024
38b5ca7
Fix/datepicker pt br (#693)
nathanipti Apr 26, 2024
6e625a5
Fix/inconsistency lunch (#679)
nathanipti Apr 26, 2024
3f84401
Fix/food module (#672)
GabrielChagas14 Apr 26, 2024
f0ed77d
[TCDA-232] Fix/lunch meal portion (#669)
AnotherOne07 Apr 26, 2024
5679b2d
Fix/stock [Versão 3.77.135] (#686)
GabrielChagas14 Apr 26, 2024
3e04c6b
Fix/instructor frequency (#689)
GabrielChagas14 Apr 26, 2024
5535cea
add 2024-29-04_remove_duplicate_lunch_unity
GabrielChagas14 Apr 29, 2024
e4066eb
Merge branch 'main' into dev
igorgoncalves May 2, 2024
4b95856
Fix/food inventory (#707)
GabrielChagas14 May 9, 2024
244dc3a
[TCDA-318] Feat/insert-disorder (#701)
evellynreis May 9, 2024
2e6776c
Fix/counting faults (#674)
nathanipti May 9, 2024
65234d0
Merge branch 'main' into dev
igorgoncalves May 9, 2024
228e24b
fix: delete user
igorgoncalves May 9, 2024
28f2ece
fix/courseplan start date field fixed
AnotherOne07 May 13, 2024
1f2276a
[TCDA-380] Fix/ Add Nationality Origin To StudentFile (#700)
AnotherOne07 May 24, 2024
a5666d8
[TCDA - 392] Fix/Scrollbar Visualization (#705)
AnotherOne07 May 24, 2024
9ccc147
fix/reports-correction (#708)
evellynreis May 24, 2024
5ddc47e
[TCDA-394] fix/do-not-fill-grade (#711)
evellynreis May 24, 2024
c23d8fb
[TCDA-422] Fix/layout problem (#712)
nathanipti May 24, 2024
afb365a
[TCDA-380] Fix/ Report Style (#713)
AnotherOne07 May 24, 2024
32d5709
[TCDA-436] Feat: students-class-report (#714)
nathanipti May 24, 2024
6ead2e0
[TCDA-157] Fix/erro-message-educacenso (#715)
evellynreis May 24, 2024
67da2fb
Fix: correction in id student identification (#716)
nathanipti May 24, 2024
1eddb69
[TCDA-446] Feat/date-final (#717)
evellynreis May 24, 2024
02237b9
[TCDA-437] Feat/validator-register-civil (#720)
evellynreis May 27, 2024
9a056a2
[TCDA-426] Fix/empty_users_fk_istructor_identification (#721)
nathanipti May 27, 2024
0944e97
Feat/timesheet overwrite past days (#704)
paulones May 27, 2024
0aed608
Merge branch 'main' into dev
igorgoncalves May 27, 2024
db920a7
change power bi module
gabriel-IPTI May 27, 2024
4e8d88c
Merge branch 'dev' of https://github.com/ipti/br.tag into dev
gabriel-IPTI May 27, 2024
6820faa
[TCDA-475] Fix/erro-educacenso-stage (#719)
evellynreis May 28, 2024
62183e0
Fix/error-pdf-studentfileform (#724)
evellynreis Jun 6, 2024
7b8c405
Feat/edcenso 2024 (#730)
paulones Jun 6, 2024
8ac9533
[TCDA-464] fix/delete-enrollmet (#731)
evellynreis Jun 6, 2024
7ef0ac1
Fix/error-educacenso-duplicated (#734)
evellynreis Jun 6, 2024
dc13a98
Fix/correction-datepicker-last (#739)
evellynreis Jun 6, 2024
e4926fb
[TCDA-523] fix/error-classContents (#735)
evellynreis Jun 6, 2024
79460ac
fix: corrigindo posicionamento de icone
igorgoncalves Jul 4, 2023
1d341be
Adicionando o código do professor na listagem da tabela (#746)
Gusta-Santos Jun 10, 2024
b0d9cd1
Adicionando o código na exibição da tabela de turmas (#747)
Gusta-Santos Jun 10, 2024
49b9293
Adicionando o código na exibição da tabela de alunos (#748)
Gusta-Santos Jun 10, 2024
1f57d33
Merge branch 'main' into dev
igorgoncalves Jun 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
## [Versão 3.80.164]
- Adicionando o código na exibição da tabela de alunos

## [Versão 3.80.163]
- Adicionando o código na exibição da tabela de turmas

## [Versão 3.80.162]
- Adicionando o código na exibição da tabela de professores

## [Versão 3.80.161]
- Refatoradas variáveis para utilizar o post, através de uma função do Yii.
- Modificada a ordem dos parâmetros da função getSchedulesFromMajorStage.
-
-
## [Versão 3.80.160]
- Correção na opção da data máxima da função renderDatePickerFinal.

Expand Down
19 changes: 11 additions & 8 deletions app/controllers/StudentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,24 @@ public function actionGetStudentAjax()
{
$requestData = $_POST;

$columns[0] = 'name';
$columns[1] = 'filiation_1';
$columns[2] = 'birthday';
$columns[3] = 'cpf';
$columns[4] = 'inep_id';
$columns[5] = 'actions';
$columns[0] = 't.id';
$columns[1] = 'name';
$columns[2] = 'filiation_1';
$columns[3] = 'birthday';
$columns[4] = 'cpf';
$columns[5] = 'inep_id';
$columns[6] = 'actions';
if (Yii::app()->features->isEnable("FEAT_SEDSP")) {
$columns[5] = 'sedsp_sync';
$columns[6] = 'sedsp_sync';
}

$criteria = new CDbCriteria();


// Filtrar a pesquisa
if (!empty($requestData['search']['value'])) {
$criteria->condition = "name LIKE '%" . $requestData['search']['value'] . "%' OR " .
$criteria->condition = "t.id LIKE '%" . $requestData['search']['value'] . "%' OR " .
"name LIKE '%" . $requestData['search']['value'] . "%' OR " .
"filiation_1 LIKE '%" . $requestData['search']['value'] . "%' OR " .
"birthday LIKE '%" . $requestData['search']['value'] . "%' OR " .
"documentsFk.cpf LIKE '%" . $requestData['search']['value'] . "%' OR " .
Expand Down Expand Up @@ -174,6 +176,7 @@ public function actionGetStudentAjax()
$data = array();
foreach ($students as $student) {
$nestedData = array();
$nestedData[] = $student->id;
$nestedData[] = "<a href='/?r=student/update&id=" . $student->id . "' cursor: pointer;>" . $student->name . "</a>";
$nestedData[] = $student->filiation_1;
$nestedData[] = $student->birthday;
Expand Down
2 changes: 1 addition & 1 deletion app/migrations/2024-05-27_edcenso_2024/edcenso_alias
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ insert into edcenso_alias values
update edcenso_alias set corder = (corder + 1) where corder >= 85 and register = 10 and year = 2024;

insert into edcenso_alias values
(10, 85, 'acessability_light_signaling', 'Sinalização/alarme luminoso', 0 , null, 2024);
(10, 85, 'acessability_light_signaling', 'Sinalização/alarme luminoso', 0, null, 2024);

update edcenso_alias set corder = (corder + 1) where corder >= 120 and register = 10 and year = 2024;

Expand Down
2 changes: 1 addition & 1 deletion config.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$debug = getenv("YII_DEBUG");
defined('YII_DEBUG') or define('YII_DEBUG', $debug);

define("TAG_VERSION", '3.80.161');
define("TAG_VERSION", '3.80.164');

define("YII_VERSION", Yii::getVersion());
define("BOARD_MSG", '<div class="alert alert-success">Novas atualizações no TAG. Confira clicando <a class="changelog-link" href="?r=admin/changelog">aqui</a>.</div>');
Expand Down
1 change: 0 additions & 1 deletion js/datatables/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ function initDatatable() {
}

if ($(".js-tag-table").length) {
debugger;
const isMobile = window.innerWidth <= 768;
const numColumns = $(".js-tag-table th").length;
const columnsIndex = new Array(numColumns - 1).fill(1).map((_, i) => i + 1);
Expand Down
7 changes: 7 additions & 0 deletions themes/default/views/classroom/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ class=""><i></i>Relatório Professores/Turma</a></li>
<div class="widget-body">
<?php
$columns = [];
array_push($columns,
array(
'name' => 'id',
'type' => 'raw',
'value' => '$data->id',
)
);
array_push($columns,
array(
'name' => 'name',
Expand Down
5 changes: 5 additions & 0 deletions themes/default/views/instructor/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@
'ajaxUpdate' => false,
'itemsCssClass' => 'js-tag-table tag-table-primary table table-condensed table-striped table-hover table-primary table-vertical-center checkboxs',
'columns' => array(
array(
'name' => 'id',
'type' => 'raw',
'value' => '$data->id',
),
array(
'name' => 'name',
'type' => 'raw',
Expand Down
1 change: 1 addition & 0 deletions themes/default/views/student/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
style="width:100%" aria-label="students table">
<thead>
<tr>
<th>Código</th>
<th>Nome</th>
<th>Filiação Principal</th>
<th>Data de Nascimento</th>
Expand Down
Loading