Skip to content

Commit

Permalink
notas implementadas
Browse files Browse the repository at this point in the history
  • Loading branch information
MigueldsBatista committed Apr 9, 2024
1 parent 35c40ae commit f7afce5
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 48 deletions.
36 changes: 15 additions & 21 deletions conecta-cesar/app_cc/templates/app_cc/boletim.html
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
{% extends "app_cc/main.html" %}
{% extends "app_cc/main.html" %}

{% block content %}

<!-- Content -->
<div class="container">
<h2 class="text-center mb-4" style="font-size: 32px; font-weight: lighter;">DISCIPLINAS</h2>
<form method="post">
{% csrf_token %}
{% for disciplina, notas in disciplinas_com_notas %}
<div class="grade-container">
<h5>{{ disciplina }}</h5>
{% for nota in notas %}
<div class="nota-container">
<p class="grade-text">
<input type="text" name="notas[{{ disciplina }}]" value="{{ nota.nota }}">
</p>
</div>
{% empty %}
<p>Nenhuma nota encontrada para esta disciplina.</p>
{% endfor %}

{% for nota in notas %}
<div class="grade-container">
<h5>{{ nota.disciplina }}</h5>
<div class="nota-container">
<p class="grade-text">
<h5>{{ nota.nota }}</h5>
</p>
</div>
{% empty %}
<p>Nenhum registro encontrado.</p>
{% endfor %}
<button type="submit" class="btn-custom btn-save">Salvar</button>
</form>
</div>
{% empty %}
<p>Nenhuma nota encontrada.</p>
{% endfor %}

</div>

<!-- Button -->
<div class="text-end mt-3">
<button class="orange-button" onclick="window.location.href='mediag.html'">></button>
</div>

{% endblock content %}
{% endblock content %}
8 changes: 6 additions & 2 deletions conecta-cesar/app_cc/templates/app_cc/boletimp.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "app_cc/main.html" %}
{% extends "app_cc/mainp.html" %}

{% block content %}

Expand All @@ -17,7 +17,11 @@ <h5>{{ disciplina }}</h5>
</p>
</div>
{% empty %}
<p>Nenhuma nota encontrada para esta disciplina.</p>
<div class="nota-container">
<p class="grade-text">
<input type="text" name="notas[{{ disciplina }}]" placeholder="Adicionar nota">
</p>
</div>
{% endfor %}
</div>
{% empty %}
Expand Down
3 changes: 2 additions & 1 deletion conecta-cesar/app_cc/templates/app_cc/mainp.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ <h5 class="offcanvas-title" id="offcanvasNavbarLabel">Conecta Cesar</h5>
Turmas
</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="turmas">Todas as turmas</a></li>
<li><a class="dropdown-item" href="turmas">Disciplina</a></li>
<li><a class="dropdown-item" href="frequenciap">Frequência</a></li>

</ul>
</li>
<a class="nav-link" href="calendariop">Calendário</a>
Expand Down
14 changes: 2 additions & 12 deletions conecta-cesar/app_cc/templates/app_cc/turmas.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,10 @@

{% block content %}

<a href="frequenciap.html" style="text-decoration: none;"><div class="bg-dark text-light p-5 rounded-4" style="margin-left: 150px; margin-right:150px">
<a href="boletimp" style="text-decoration: none;"><div class="bg-dark text-light p-5 rounded-4" style="margin-left: 150px; margin-right:150px">
<h3 style="color: black; text-decoration: none; cursor: default;">Turma A</h3>
<p></p>
</div></a>
<br>
<a href="frequenciap.html" style="text-decoration: none;"><div class="bg-dark text-light p-5 rounded-4" style="margin-left: 150px; margin-right:150px">
<h3 style="color: black; text-decoration: none; cursor: default;">Turma B</h3>
<p></p>
</div></a>
<br>
<a href="frequenciap.html" style="text-decoration: none;"><div class="bg-dark text-light p-5 rounded-4" style="margin-left: 150px; margin-right:150px">
<h3 style="color: black; text-decoration: none; cursor: default;">Turma C</h3>
<p></p>
</div></a>
<br>

{% endblock content %}

1 change: 1 addition & 0 deletions conecta-cesar/app_cc/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
path('', views.index),
path('avisos', views.avisos),
path('boletim', views.boletim),
path('boletimp', views.boletimp),
path('diariop', views.diariop),
path('frequencia', views.frequencia),
path('turmas', views.turmas),
Expand Down
25 changes: 13 additions & 12 deletions conecta-cesar/app_cc/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,36 @@ def index(request):
def avisos(request):
return render(request, 'app_cc/avisos.html')


def boletim(request):
# Recuperar todas as notas
notas = Nota.objects.all()

return render(request, 'app_cc/boletim.html', {'notas': notas})



def boletimp(request):
if request.method == "POST":
# Processar dados do formulário
for disciplina in Disciplina.objects.all():
# Recuperar a nota enviada pelo formulário
nota_value = request.POST.get(f"notas[{disciplina.disciplina}]")
if nota_value is not None:
# Substituir vírgulas por pontos e, em seguida, converter para float
nota_value = nota_value.replace(',', '.')
try:
nota_value = float(nota_value)
except ValueError:
return HttpResponse("Erro: Valor da nota inválido")

# Obter a instância da nota correspondente
nota_instance = Nota.objects.filter(disciplina=disciplina).first()
if nota_instance:
# Atualizar a nota no banco de dados
nota_instance.nota = nota_value
nota_instance.save()
nota_instance, created = Nota.objects.get_or_create(disciplina=disciplina)
nota_instance.nota = nota_value
nota_instance.save()

# Recuperar disciplinas e notas
disciplinas_com_notas = []
for disciplina in Disciplina.objects.all():
notas = Nota.objects.filter(disciplina=disciplina)
disciplinas_com_notas.append((disciplina, notas))

return render(request, 'app_cc/boletim.html', {'disciplinas_com_notas': disciplinas_com_notas})
return render(request, 'app_cc/boletimp.html', {'disciplinas_com_notas': disciplinas_com_notas})



def diariop(request):
Expand Down
Binary file modified conecta-cesar/project_cc/__pycache__/urls.cpython-312.pyc
Binary file not shown.
1 change: 1 addition & 0 deletions conecta-cesar/project_cc/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

path('disciplina', include('app_cc.urls')),
path('boletim', include('app_cc.urls')),
path('boletimp', include('app_cc.urls')),
path('frequencia', include('app_cc.urls')),
path('perfil', include('app_cc.urls')),
path('diario', include('app_cc.urls')),
Expand Down

0 comments on commit f7afce5

Please sign in to comment.