Commits · development · Ensalamento / ensalamento-back

03 Oct, 2022 8 commits
- Merge branch 'quality-of-life' into 'development' · 9710cddb
  mvrp21 authored Oct 03, 2022
```
Fix tests; Fix blocoCod not set on horario creation; Remove setSala

See merge request !125
```
  9710cddb
- Merge branch 'development' into 'quality-of-life' · e2f2f0f4
  mvrp21 authored Oct 03, 2022
```
# Conflicts:
#   common/models/horario.js
```
  e2f2f0f4
- Fix bloco search · 85b2fd61
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  85b2fd61
- Fix HorarioTurma on horario (and turma) merge · 1262cca0
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  1262cca0
- Fix HorarioTurma on horario merge · aeb730bb
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  aeb730bb
- (re)Fix tests · 99422ee5
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  99422ee5
- Remove setSala · de69fc21
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  de69fc21
- Merge branch 'fix_sem_sala' into 'development' · 5e653533
  vgm18 authored Oct 03, 2022
```
Fixed sem sala case in setSala

See merge request !124
```
  5e653533
30 Sep, 2022 6 commits
- Fixed sem sala case in setSala · 6d173c97
  vgm18 authored Sep 30, 2022
  
  6d173c97
- Fix blocoCod not set on horario creation · c48be3b8
  mvrp21 authored Sep 30, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  c48be3b8
- Fix tests · c0df5872
  mvrp21 authored Sep 30, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  c0df5872
- Merge branch 'import-rework' into 'development' · 1b6a1fe4
  mvrp21 authored Sep 30, 2022
```
Add import logic

See merge request !123
```
  1b6a1fe4
- Merge branch 'fix_vinicius' into 'import-rework' · 4363d114
  mvrp21 authored Sep 30, 2022
```
Fixed setSala

See merge request !122
```
  4363d114
- Better Turma merging codigo handling · 7059492e
  mvrp21 authored Sep 30, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  7059492e
29 Sep, 2022 3 commits
- Add time taken log · cca612ba
  mvrp21 authored Sep 29, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  cca612ba
- Fix horarioturma missing entry, Fix Turma merging codigo · 229e5e78
  mvrp21 authored Sep 29, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  229e5e78
- Fix duplicate CSV rows, Fix 3+ horario merging error, Remove old import file · f06d9d35
  mvrp21 authored Sep 29, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  f06d9d35
28 Sep, 2022 1 commit
- Fixes · 58c2e8ce
  mvrp21 authored Sep 28, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  58c2e8ce
27 Sep, 2022 1 commit
- Almost done · 6e6210cc
  mvrp21 authored Sep 27, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  6e6210cc
26 Sep, 2022 2 commits
- Create disciplina on not found · 4e97fde7
  mvrp21 authored Sep 26, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  4e97fde7
- Add import logic · c75aa75b
  mvrp21 authored Sep 26, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  c75aa75b
23 Sep, 2022 2 commits
- Merge branch 'merge_multiple' into 'development' · 87b43b2c
  mvrp21 authored Sep 23, 2022
```
Merge multiple

See merge request !120
```
  87b43b2c
- Add support for n turma merging · ea971a8b
  mvrp21 authored Sep 23, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  ea971a8b
19 Sep, 2022 1 commit
- Fixed setSala · 2ae488f8
  vgm18 authored Sep 19, 2022
  
  2ae488f8
16 Sep, 2022 4 commits
- Merge branch 'hotfix-originalid' into 'development' · 720a3ecb
  mvrp21 authored Sep 16, 2022
```
Final fix

See merge request !119
```
  720a3ecb
- Final fix · 29f7d317
  mvrp21 authored Sep 16, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  29f7d317
- Merge branch 'hotfix-originalid' into 'development' · 4ef55244
  mvrp21 authored Sep 16, 2022
```
Actually fix the problem

See merge request !118
```
  4ef55244
- Actually fix the problem · 10da114b
  mvrp21 authored Sep 16, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  10da114b
15 Sep, 2022 2 commits
- Merge branch 'hotfix-originalid' into 'development' · 2841cd15
  mvrp21 authored Sep 15, 2022
```
fix

See merge request !117
```
  2841cd15
- fix · 3d710939
  mvrp21 authored Sep 15, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  3d710939
13 Sep, 2022 6 commits
- Merge branch 'lewis_15-08' into 'development' · 69f71557
  vgm18 authored Sep 13, 2022
```
Reduce slowness bloco search

See merge request !116
```
  69f71557
- Merge branch 'development' into 'lewis_15-08' · eec4b10a
  vgm18 authored Sep 13, 2022
```
# Conflicts:
#   common/models/horario.js
#   common/models/horario.json
```
  eec4b10a
- Merge branch 'vinicius_2508' into 'development' · 874a8dfb
  vgm18 authored Sep 13, 2022
```
Modified equivalenciasdpt to return only one equiv side instead of both

See merge request !115
```
  874a8dfb
- Corrigido semestre hardcoded · adaede04
  vgm18 authored Sep 13, 2022
  
  adaede04
- Merge branch 'th_merging_reimplementation' into 'development' · 827deaf6
  mvrp21 authored Sep 13, 2022
```
Fix Turma And Horario Merging

See merge request !114
```
  827deaf6
- Merge branch 'automigrate_reimplementation' into 'th_merging_reimplementation' · cce37d28
  mvrp21 authored Sep 13, 2022
```
Initial automigrate configuration

See merge request !113
```
  cce37d28
12 Sep, 2022 1 commit
- Finish tests · c4a77d9d
  mvrp21 authored Sep 12, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  c4a77d9d
06 Sep, 2022 3 commits
- Minor change · eb94b517
  mvrp21 authored Sep 06, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  eb94b517
- Altera forma de renderizar equivalências · 16839f4f
  lgtg20 authored Sep 06, 2022
  
  16839f4f
- Rewrite some tests · 07edb6b5
  mvrp21 authored Sep 06, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  07edb6b5