Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Django CI

on:
push:
branches: [ "staging", "lack0fdev" ]
branches: [ "staging", "lack0fdev", "danidev" ]
pull_request:
branches: [ "staging", "lack0fdev" ]
branches: [ "staging", "lack0fdev", "danidev" ]

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion core/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,6 @@ class Meta:
)
widgets = {
"data_admissao": forms.DateInput(attrs={"type": "date"}),
"sala": forms.NumberInput(),
"sala": forms.TextInput(),
"email": forms.EmailInput(),
}
23 changes: 23 additions & 0 deletions core/migrations/0007_alter_customuser_sala.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 5.2.11 on 2026-04-24 22:34

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("core", "0006_alter_chamada_acao"),
]

operations = [
migrations.AlterField(
model_name="customuser",
name="sala",
field=models.CharField(
blank=True,
max_length=50,
null=True,
verbose_name="Sala do Profissional",
),
),
]
6 changes: 3 additions & 3 deletions core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ class CustomUser(AbstractUser):
default="recepcionista",
verbose_name="Função",
) # coloquei agora
sala = models.IntegerField(
null=True, blank=True, verbose_name="Sala do Profissional"
) # coloquei agora
sala = models.CharField(
max_length=50, null=True, blank=True, verbose_name="Sala do Profissional"
) # trocado para permitir nomes como 'enfermaria'

failed_login_attempts = models.IntegerField(
default=0, verbose_name="Tentativas de login falhadas"
Expand Down
17 changes: 14 additions & 3 deletions guiche/templates/guiche/painel_guiche.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,20 @@ <h2 class="text-xl font-semibold text-gray-900 mb-4">Senhas Geradas Hoje</h2>
<span class="text-3xl font-extrabold text-primary">{{ senha.senha }}</span>
<div>
<div class="text-lg font-semibold text-gray-900">{{ senha.nome_completo|default:"—" }}</div>
{% if senha.tipo_senha %}
<div class="text-sm text-gray-500">Tipo: {{ senha.tipo_senha }}</div>
{% endif %}
<div class="text-sm text-gray-500 flex flex-wrap items-center gap-x-2">
{% if senha.tipo_senha %}
<span>Tipo: {{ senha.tipo_senha }}</span>
{% endif %}
{% if senha.tipo_senha and senha.profissional_saude %}
<span class="text-gray-300">·</span>
{% endif %}
{% if senha.profissional_saude %}
<span class="inline-flex items-center">
<i class="bi bi-person-badge text-green-600 mr-1"></i>
Médico: {{ senha.profissional_saude.first_name }} {{ senha.profissional_saude.last_name }}{% if senha.profissional_saude.sala %} — Sala {{ senha.profissional_saude.sala }}{% endif %}
</span>
{% endif %}
</div>
</div>
</div>
<div class="flex space-x-2">
Expand Down
Loading
Loading