Skip to content

Commit

Permalink
Merge pull request #24 from Wooo589/jose
Browse files Browse the repository at this point in the history 
Editar dados completo
  • Loading branch information
@JAugusto-Moraes
JAugusto-Moraes authored Dec 2, 2023
2 parents 0351479 + 61ff417 commit 754dab6
Show file tree
Hide file tree
Showing 10 changed files with 246 additions and 81 deletions.
3 changes: 2 additions & 1 deletion inicial/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ class ListandoDados(admin.ModelAdmin):

admin.site.register(Hospital, ListandoHospitais)
admin.site.register(Avaliacao, ListandoAvaliacoes)
admin.site.register(Dados, ListandoDados)
admin.site.register(Dados, ListandoDados)
admin.site.register(Medicamento)
Binary file modified inicial/migrations/__pycache__/__init__.cpython-311.pyc
View file
Binary file not shown.
86 changes: 85 additions & 1 deletion inicial/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,88 @@ class Meta:
exercicio_frequencia = models.CharField(max_length=200, null=False, blank=False, default="n", choices=FREQUENCIA)

def __str__(self):
return self.usuario.username
return self.usuario.username

class Doencas(models.Model):

class Meta:
verbose_name = "doença"
verbose_name_plural = "Doenças"

user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="doencas")
doenca = models.CharField(max_length=200, null=False, blank=False, default="N/A")

def __str__(self):
return self.doenca

class Sintomas(models.Model):

user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="sintomas")
sintoma = models.CharField(max_length=200, null=False, blank=False, default="N/A")
data = models.DateTimeField(null=False, blank=False, default=timezone.now)

def __str__(self):
return self.sintoma

class Diagnostico(models.Model):

user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="diagnosticos")
diagnostico = models.CharField(max_length=200, null=False, blank=False, default="N/A")

def __str__(self):
return self.diagnostico

class Cirurgia(models.Model):

user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="cirurgias")
cirurgia = models.CharField(max_length=200, null=False, blank=False, default="N/A")
data = models.DateField(null=False, blank=False, default=timezone.now)

def __str__(self):
return self.cirurgia

class Internacao(models.Model):

user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="internacoes")
internacao = models.CharField(max_length=200, null=False, blank=False, default="N/A")
tempo = models.IntegerField(null=False, blank=False, default=0)
data = models.DateField(null=False, blank=False, default=timezone.now)

def __str__(self):
return self.internacao

class Condicao_familiar(models.Model):

GRAU_PARENTESCO = [
("1", "1° Grau"),
("2", "2° Grau"),
("3", "3° Grau")
]

user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="condicao_familiar")
condicao = models.CharField(max_length=200, null=False, blank=False, default="N/A")
grau_parentesco = models.CharField(max_length=10, null=False, blank=False, default="1", choices=GRAU_PARENTESCO)

def __str__(self):
return self.condicao

class Medicamento(models.Model):

TIPO_MEDICAMENTO = [
("1", "Medicamento com prescrição"),
("2", "Medicamento sem prescrição")
]

FREQUENCIA = [
("n","Não"),
("d","Diariamente"),
("s","Semanalmente"),
("m","Mensalmente"),
("a","Anualmente")
]

user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="medicamentos")
tipo = models.CharField(max_length=200, null=False, blank=False, default="1", choices=TIPO_MEDICAMENTO)
medicamento = models.CharField(max_length=200, null=False, blank=False, default="N/A")
frequencia = models.CharField(max_length=200, null=False, blank=False, default="n", choices=FREQUENCIA)
numero_frequencia = models.IntegerField(null=False, blank=False, default=0)
4 changes: 2 additions & 2 deletions inicial/static/js/editardados.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ $(document).ready(function(){
var $address = $(this).parents('.inner_condicao_familiar');
var nextHtml = $address.clone();
nextHtml.attr('id', 'condicao_familiar' + count6);
$('.1grau', nextHtml).attr('name', 'parentesco' + count6);
/*$('.1grau', nextHtml).attr('name', 'parentesco' + count6);
$('.2grau', nextHtml).attr('name', 'parentesco' + count6);
$('.3grau', nextHtml).attr('name', 'parentesco' + count6);
$('.3grau', nextHtml).attr('name', 'parentesco' + count6);*/
var hasRmBtn = $('.rmbtn', nextHtml).length > 0;
if (!hasRmBtn){
var rm = "<button type='button' class='rmbtn'>Remover</button>";
Expand Down
2 changes: 1 addition & 1 deletion inicial/static/styles/meusdados.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ input[type=text]:focus{
outline: none;
}
input[type=number], #tipo_sanguineo{
width: 70px;
width: 80px;
padding-top: 7px;
padding-bottom: 7px;
padding-left: 7px;
Expand Down
Empty file added inicial/templatetags/__init__.py
View file
Empty file.
8 changes: 8 additions & 0 deletions inicial/templatetags/inicial_extras.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from django import template
from django.template.defaultfilters import stringfilter

register = template.Library()

@register.filter
def tipo_medicamento(value, arg):
return value.filter(tipo__exact=arg)
47 changes: 35 additions & 12 deletions inicial/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,9 @@ def editar_dados(request):
if isinstance(doencas,list):
doencas.pop(0)

for i in doencas:
print(f"Doença: {i}")
for doenca in doencas:
# print(f"Doença: {i}")
Doencas.objects.create(user=request.user, doenca=doenca)

if "sim-nao4" in dados:
if dados["sim-nao4"] != "nao":
Expand All @@ -441,7 +442,9 @@ def editar_dados(request):
data_sintoma.pop(0)

for i in range(len(sintomas)):
print(f"Sintoma: {sintomas[i]} Data: {data_sintoma[i]}")
# print(f"Sintoma: {sintomas[i]} Data: {data_sintoma[i]}")
data = datetime.strptime(data_sintoma[i],"%Y-%m-%dT%H:%M")
Sintomas.objects.create(user=request.user, sintoma=sintomas[i], data=data)

if "sim-nao5" in dados:
if dados["sim-nao5"] != "nao":
Expand All @@ -450,8 +453,9 @@ def editar_dados(request):
if isinstance(diagnosticos, list):
diagnosticos.pop(0)

for i in diagnosticos:
print(f"Diagnosticos: {i}")
for diagnostico in diagnosticos:
# print(f"Diagnosticos: {i}")
Diagnostico.objects.create(user=request.user, diagnostico=diagnostico)

if "sim-nao6" in dados:
if dados["sim-nao6"] != "nao":
Expand All @@ -463,7 +467,9 @@ def editar_dados(request):
data_cirurgia.pop(0)

for i in range(len(cirurgias)):
print(f"Cirurgia: {cirurgias[i]} Data: {data_cirurgia[i]}")
# print(f"Cirurgia: {cirurgias[i]} Data: {data_cirurgia[i]}")
data = datetime.strptime(data_cirurgia[i],"%Y-%m-%d")
Cirurgia.objects.create(user=request.user, cirurgia=cirurgias[i], data=data)

if "sim-nao7" in dados:
if dados["sim-nao7"] != "nao":
Expand All @@ -477,20 +483,23 @@ def editar_dados(request):
data_internacao.pop(0)

for i in range(len(motivo)):
print(f"Motivo: {motivo[i]} Tempo: {tempo_internacao[i]} dias Data: {data_internacao[i]}")
# print(f"Motivo: {motivo[i]} Tempo: {tempo_internacao[i]} dias Data: {data_internacao[i]}")
data = datetime.strptime(data_internacao[i],"%Y-%m-%d")
Internacao.objects.create(user=request.user, tempo=tempo_internacao[i], data=data, internacao=motivo[i])

if "sim-nao8" in dados:
if dados["sim-nao8"] != "nao":
if "condicao" in dados and "grau_parentesco" in dados:
grau_parentesco = dados["grau_parentesco"]
condicao = dados["condicao"]
grau_parentesco = list(grau_parentesco)

if isinstance(grau_parentesco, list) and isinstance(condicao, list):
condicao.pop(0)
grau_parentesco.pop(0)

for i in range(len(grau_parentesco)):
print(f"Grau: {grau_parentesco} Condicao: {condicao}")
for i in range(len(condicao)):
# print(f"Grau: {grau_parentesco} Condicao: {condicao}")
Condicao_familiar.objects.create(user=request.user, condicao=condicao[i], grau_parentesco=grau_parentesco[i])

if "sim-nao9" in dados:
if dados["sim-nao9"] != "nao":
Expand All @@ -503,9 +512,15 @@ def editar_dados(request):
if isinstance(medicamento_cp, list) and isinstance(freq_cp, list) and isinstance(freq3, list):
medicamento_cp.pop(0)
freq_cp.pop(0)
freq3.pop(0)

for i in range(len(medicamento_cp)):
print(f"Medicamento: {medicamento_cp} Frequência: {freq_cp} {freq3}")
# print(f"Medicamento: {medicamento_cp} Frequência: {freq_cp} {freq3}")
Medicamento.objects.create(user=request.user,
tipo="1",
medicamento=medicamento_cp[i],
frequencia=freq3[i],
numero_frequencia=freq_cp[i])

if "sim-nao10" in dados:
if dados["sim-nao10"] != "nao":
Expand All @@ -518,11 +533,19 @@ def editar_dados(request):
if isinstance(medicamento_sp, list) and isinstance(freq_sp, list) and isinstance(freq4, list):
medicamento_sp.pop(0)
freq_sp.pop(0)
freq3.pop(0)

for i in range(len(medicamento_sp)):
print(f"Medicamento: {medicamento_sp} Frequência: {freq_sp} {freq4}")
# print(f"Medicamento: {medicamento_sp} Frequência: {freq_sp} {freq4}")
Medicamento.objects.create(user=request.user,
tipo="2",
medicamento=medicamento_sp[i],
frequencia=freq4[i],
numero_frequencia=freq_sp[i])

novos_dados.save()
messages.success(request, "Dados alterados com sucesso!")
return redirect("meus_dados")

buscar2 = BuscarForms()
filter_form = FilterForms()
Expand Down
102 changes: 61 additions & 41 deletions templates/inicial/editardados.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ <h4>Internações</h4>
</div>
<div>
<span class="subquestion">Tempo:</span>
<input type='number' name='tempo_internacao' class="tempo_internacao" placeholder="Adicione o tempo de duração da internação em dias">
<input type='number' name='tempo_internacao' class="tempo_internacao" placeholder="Em dias">
</div>
<div>
<span>Data:<input type='date' name='data_internacao' class="data_internacao"></span>
Expand Down Expand Up @@ -343,12 +343,18 @@ <h3>HISTÓRICO FAMILIAR</h3>
<span>Grau de parentesco:</span>
</div>
<div>
<input type='radio' class="1grau" value="1" name="grau_parentesco">
<select name="grau_parentesco" class="grau_parentesco">
<option value=" "> </option>
<option value="1">1° Grau</option>
<option value="2">2° Grau</option>
<option value="3">3° Grau</option>
</select>
<!--<input type='radio' class="1grau" value="1" name="grau_parentesco">
<label for="1grau">1º grau</label>
<input type='radio' class="2grau" value="2" name="grau_parentesco">
<label for="2grau">2º grau</label>
<input type='radio' class="3grau" value="3" name="grau_parentesco">
<label for="3grau">3º grau</label>
<label for="3grau">3º grau</label>-->
</div>
<div>
<span>Condição:</span>
Expand Down Expand Up @@ -380,25 +386,32 @@ <h3>USO DE MEDICAMENTOS</h3>
<input name="medicamento_cp" type='text' class="med_cp" placeholder="Nome/tipo do medicamento">
</div>
<div>
<span>Frequência:</span>
<div class='f'>
<div>
<input type='radio' class="d3" name="freq3" value="d">
<label for= "d3">Diariamente</label>
</div>
<div>
<input type="radio" class="s3" name="freq3" value="s">
<label for="s3">Semanalmente</label>
</div>
<div>
<input type='radio' class="m3" name="freq3" value="m">
<label for="m3">Mensalmente</label>
</div>
<div>
<input type='radio' class="a3" name="freq3" value="a">
<label for="a3">Anualmente</label>
</div>
</div>
<span>Frequência:</span>
<div class='f'>
<select name="freq3">
<option value=""></option>
<option value="d">Diariamente</option>
<option value="s">Semanalmente</option>
<option value="m">Mensalmente</option>
<option value="a">Anualmente</option>
</select>
<!--<div>
<input type='radio' class="d3" name="freq3" value="d">
<label for= "d3">Diariamente</label>
</div>
<div>
<input type="radio" class="s3" name="freq3" value="s">
<label for="s3">Semanalmente</label>
</div>
<div>
<input type='radio' class="m3" name="freq3" value="m">
<label for="m3">Mensalmente</label>
</div>
<div>
<input type='radio' class="a3" name="freq3" value="a">
<label for="a3">Anualmente</label>
</div>-->
</div>
</div>
<span>Neste período, quantas vezes você usa o medicamento?</span>
<input type='number' class="freq_med_cp" name="freq_med_cp">
Expand All @@ -425,25 +438,32 @@ <h3>USO DE MEDICAMENTOS</h3>
<input name="medicamento_sp" type='text' class="med_sp" placeholder="Nome/tipo do medicamento">
</div>
<div>
<span>Frequência:</span>
<div class='f'>
<div>
<input type='radio' class="d4" name="freq4" value="d">
<label for="d4">Diariamente</label>
</div>
<div>
<input type='radio' class="s4" name="freq4" value="s">
<label for="s4">Semanalmente</label>
</div>
<div>
<input type='radio' class="m4" name="freq4" value="m">
<label for="m4">Mensalmente</label>
</div>
<div>
<input type='radio' class="a4" name="freq4" value="a">
<label for="a4">Anualmente</label>
</div>
</div>
<span>Frequência:</span>
<div class='f'>
<select name="freq4">
<option value=""></option>
<option value="d">Diariamente</option>
<option value="s">Semanalmente</option>
<option value="m">Mensalmente</option>
<option value="a">Anualmente</option>
</select>
<!--<div>
<input type='radio' class="d4" name="freq4" value="d">
<label for="d4">Diariamente</label>
</div>
<div>
<input type='radio' class="s4" name="freq4" value="s">
<label for="s4">Semanalmente</label>
</div>
<div>
<input type='radio' class="m4" name="freq4" value="m">
<label for="m4">Mensalmente</label>
</div>
<div>
<input type='radio' class="a4" name="freq4" value="a">
<label for="a4">Anualmente</label>
</div>-->
</div>
Neste período, quantas vezes você usa o medicamento?
<input type='number' class="freq_med_sp" name="freq_med_sp">
</div>
Expand Down
Loading

0 comments on commit 754dab6

Please sign in to comment.