Features de turmas#37
Open
HeitorMelo wants to merge 79 commits into
Open
Conversation
… failed by absence
…criteria and evaluation goals to the correct terminology
Feature: Report filters
Fix pie chart label
…ta persistence and grade calculations
…dation and error handling
## Decisões do Merge: ### 1. .gitignore - **Decisão**: Mesclado ambas as versões - **Resultado**: Manteve estrutura detalhada da branch local + adicionou cucumber reports, jest coverage e tmp_data/ do upstream - **Razão**: Ambas as seções são complementares e não conflitantes ### 2. server/package.json - **Decisão**: Mesclado dependências de ambas as branches - **Dependências preservadas**: multer 2.0.2, xlsx 0.18.5 (local) + jest, supertest, ts-jest (upstream) - **Scripts**: Manteve 'dev' com cross-env PORT=3005 (compatibilidade Windows) mas start aponta para index.js (upstream) - **Razão**: Precisamos de todas as dependências para bulk import E testes unitários ### 3. client/package.json - **Decisão**: Mesclado dependências de ambas as branches - **Dependências preservadas**: react-router-dom (local) + recharts (upstream) - **Dev dependencies**: cross-env (local) + jest-cucumber, puppeteer, expect (upstream) - **Razão**: react-router-dom necessário para navegação de import, recharts para gráficos de relatórios ### 4. package-lock.json (root, client, server) - **Decisão**: Aceito versão do upstream (git checkout --theirs) - **Razão**: Arquivos gerados automaticamente, serão regenerados com npm install ### 5. client/src/App.css - **Decisão**: Base do upstream + estilos de bulk import adicionados ao final - **Estilos adicionados**: .bulk-import-section, .import-btn, .import-result-container, .import-result-card, animações - **Razão**: Upstream tem estilos de relatórios/gráficos, local tem estilos de import - ambos necessários ### 6. client/src/components/Classes.tsx - **Decisão**: Mesclado ambos os recursos no state - **State preservado**: - Bulk import: selectedFile, fileInputRef, navigate (local) - Reports: reportPanelClass, reportData, isLoadingReport (upstream) - **Razão**: Componente precisa suportar AMBAS as features simultaneamente ## Novas Features do Upstream Integradas: - ✅ Sistema de relatórios com gráficos (Recharts) - ✅ Testes Jest no servidor - ✅ Testes Cucumber no cliente - ✅ Componentes de gráficos (EvaluationBarChart, StatusPieChart) - ✅ ImportGrade component - ✅ ClassReport component - ✅ ApprovalCriteria model - ✅ Report type system ## Features Locais Preservadas: - ✅ Bulk enrollment via CSV/XLSX upload - ✅ React Router navigation - ✅ Import success/error pages - ✅ EnrollmentService with bulk upload - ✅ Multer + XLSX processing no servidor - ✅ Cross-platform compatibility (cross-env)
Co-authored-by: Heitor Riquelme Melo de Souza <101292201+HeitorMelo@users.noreply.github.com>
- Remove duplicate multer import and unused upload_dir variable - Revert server dev script to use src/index.ts - Remove server and client scripts from root package.json - Restore original project folder name in README - Rename test documentation to IMPORT_STUDENTS_TEST_GUIDE.md
- Restore server and client scripts in root package.json with PORT definitions - Add back upload_dir multer configuration for gradeImport endpoint - Ensures compatibility with existing features and future merges Based on feedback from code review to maintain compatibility with other features
Feature: Bulk Student Import with CSV/XLSX Support
Feat/report tests
Feature: Class comparison
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request - Teaching Assistant
📝 Descrição
O que foi feito:
ClassComparison,ClassReport, gráficos de desempenho (StatusPieChart,EvaluationBarChart) e páginas de importação de notas.Por que foi feito:
📌 Observações
Impacto:
Riscos identificados:
📦 Área afetada
Frontend (Client - React):
Backend (Server - Express/Node.js):
Funcionalidades:
Infraestrutura:
🔧 Tipo de mudança
🧪 Testes
Testes automatizados
Por nível de teste:
Por área testada:
Cobertura:
Como revisar e testar
Testes Unitários (Server):
Testes E2E (Client):
Testar manualmente:
http://localhost:3000http://localhost:3004📸 Screenshots/GIFs
Class Report:
Class Comparison:
Import Students:
✅ Checklist
🔗 Issues relacionadas