From b5f90d2581468b084ea16dfe46f82ee6f56e6fbb Mon Sep 17 00:00:00 2001 From: Elias Bernardo Date: Sat, 12 May 2018 18:33:30 -0300 Subject: [PATCH 01/48] Creating Populate DB script Adding populate.py in utility Adding __init__.py in utility Co-authored-by: Geovana Ramos --- utility/__init__.py | 1 + utility/populate.py | 201 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+) create mode 100644 utility/__init__.py create mode 100644 utility/populate.py diff --git a/utility/__init__.py b/utility/__init__.py new file mode 100644 index 00000000..8d1c8b69 --- /dev/null +++ b/utility/__init__.py @@ -0,0 +1 @@ + diff --git a/utility/populate.py b/utility/populate.py new file mode 100644 index 00000000..b57dd7b6 --- /dev/null +++ b/utility/populate.py @@ -0,0 +1,201 @@ +import os.path +import sys +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + + +def create_super_user(username, email, password): + ''' + o try/except é pra garantir que crie um super_user e no caso de erro você saiba + ''' + try: + u = User.objects.create_superuser(username, email, password,is_active = True) + EmailAddress.objects.create( + user=u, email=email, + primary=True, verified=True) + u.set_password(password) + u.save() + print ('\nSuperUser:', User.objects.get(is_superuser=True).username) + + return u + except IntegrityError: + pass + + +def create_user(first_name, last_name, name, username, email, password): + """ + mesma ideia do de cima, mas aqui pro user. + """ + try: + u = User.objects.create_user( + first_name=first_name, + last_name=last_name, + name=name, + username=username, + email=email, + password=password, + birthday='1998-04-05', + telephone='(22)22222-2222', + gender='M', + created_at='2018-04-05', + updated_at='2018-04-05', + is_active=True, + ) + """ + O EmailAdress é pra poder confirmar o email aqui na criação. Sem isso + você precisa confimar o email manualmente + """ + EmailAddress.objects.create( + user=u, email=email, + primary=True, verified=True) + + u.set_password(password) + u.save() + + print ('Criando usuário - {0} {1}'.format(str(u.first_name), str(u.last_name))) + return u + except IntegrityError: + pass + +def populate(): + + print ('\n----------------------') + print ('Populating Database...') + print ('----------------------\n') + + create_super_user('admin', 'admin@admin.com', 'senhafacil') + + user_employee = create_user( + 'Pedro', + 'Victor', + 'Pedro', + 'pedro', + 'pedro@gmail.com', + 'pedro123456', + ) + + user_patient = create_user( + 'Enzo', + 'Gabriel', + 'Enzo', + 'enzo', + 'enzo@gmail.com', + 'enzo123456', + + ) + + user_responsible = create_user( + 'Maria', + 'Joaquina', + 'Maria', + 'maria', + 'maria@gmail.com', + 'maria123456', + ) + + user_healthteam = create_user( + 'Laura', + 'Nsei', + 'Laura', + 'laura', + 'laura@gmail.com', + 'laura123456', + ) + + user_patient_with_responsible = create_user( + 'Huiller', + 'Victor', + 'Huiller', + 'huiller', + 'huiller@gmail.com', + 'huiller123456', + ) + + user_test = create_user( + 'teste', + 'teste', + 'teste', + 'teste', + 'teste@gmail.com', + 'teste123456', + ) + + Employee.objects.create( + cpf="974.220.200-16", + user=user_employee, + departament=Employee.ADMINISTRATION + ) + + HealthTeam.objects.create( + cpf="057.641.271-65", + user=user_healthteam, + speciality=HealthTeam.NEUROLOGY, + council_acronym=HealthTeam.CRM, + register_number="1234567", + registration_state=HealthTeam.DF, + ) + + Patient.objects.create( + ses="1234567", + user=user_patient, + priority=1, + mother_name="Mãe", + father_name="Pai", + ethnicity=3, + sus_number="12345678911", + civil_registry_of_birth="12345678911", + declaration_of_live_birth="12345678911" + ) + + responsible = Responsible.objects.create( + cpf="914.479.730-38", + user=user_responsible + ) + + Patient.objects.create( + ses="1234568", + user=user_patient_with_responsible, + responsible=responsible, + priority=1, + mother_name="Mãe", + father_name="Pai", + ethnicity=3, + sus_number="12345678912", + civil_registry_of_birth="12345678912", + declaration_of_live_birth="12345678912" + ) + + category1 = Category.objects.create( + name='Medicamentos', + description='Fórum de discussão sobre medicamentos', + slug='med', + + ) + + category2 = Category.objects.create( + name='Espaço dos pais', + description='Um lugar para os pais discutirem e trocarem infrmações', + slug='event', + ) + + + print ('------------------------------\n') + print ('Database populated with sucess') + print ('------------------------------\n') + + + +import django + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.local') +django.setup() +from drdown.users.models.model_employee import Employee +from drdown.users.models.model_responsible import Responsible +from drdown.users.models.model_health_team import HealthTeam +from drdown.users.models.model_user import User +from drdown.users.models.model_patient import Patient +from drdown.forum.models.model_category import Category +from django.db import IntegrityError +import allauth.app_settings +from allauth.account.models import EmailAddress + +populate() From 7491f33f627b6191fc365afe3b15ac20d6668a15 Mon Sep 17 00:00:00 2001 From: Elias Bernardo Date: Sat, 12 May 2018 18:42:49 -0300 Subject: [PATCH 02/48] Adding populate to Makefile Adding 'make populete' to the list of commands Co-authored-by: Geovana Ramos --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 07c37205..5c5aa6eb 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,10 @@ sql: manage.py # Show SQL commands sudo docker-compose -f ${file} run --rm ${container} python manage.py sqlmigrate ${app_label} ${migration_name} +populate: manage.py + # Populate the database + sudo docker-compose -f ${file} run --rm ${container} python utility/populate.py + # TESTS -------------------------------------------------------- local := "**/tests/" From 6cb12f55ced43e2802d7b5a1a696985fee586dc6 Mon Sep 17 00:00:00 2001 From: Elias Bernardo Date: Sat, 12 May 2018 19:06:01 -0300 Subject: [PATCH 03/48] The password is now created randomly and displayed in the terminal Addint create_password() function in populate.py Co-authored-by: Geovana Ramos --- utility/populate.py | 71 +++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 25 deletions(-) diff --git a/utility/populate.py b/utility/populate.py index b57dd7b6..8bd1ed3b 100644 --- a/utility/populate.py +++ b/utility/populate.py @@ -1,30 +1,54 @@ import os.path import sys +import random +import string + sys.path.append(os.path.join(os.path.dirname(__file__), '..')) -def create_super_user(username, email, password): +def create_password(): + ''' + Generates random passwords for each user + ''' + + password = ''.join(random.choice(string.ascii_uppercase + + string.ascii_lowercase + + string.digits) for _ in range(9) + ) + return password + + +def create_super_user(username, email): ''' - o try/except é pra garantir que crie um super_user e no caso de erro você saiba + Creates the superuser and ensures that if any error occurs the + script does not continue ''' + + password = create_password() try: - u = User.objects.create_superuser(username, email, password,is_active = True) + u = User.objects.create_superuser(username, + email, + password, + is_active=True) EmailAddress.objects.create( user=u, email=email, primary=True, verified=True) u.set_password(password) u.save() print ('\nSuperUser:', User.objects.get(is_superuser=True).username) + print('username: {0} -- password: {1} \n'. format(username, password)) return u except IntegrityError: - pass + raise ValidationError("An error occurred. Stopping the script") -def create_user(first_name, last_name, name, username, email, password): +def create_user(first_name, last_name, name, username, email, birthday): """ - mesma ideia do de cima, mas aqui pro user. + Creates the user and ensures that if any error occurs the + script does not continue """ + password = create_password() try: u = User.objects.create_user( first_name=first_name, @@ -40,21 +64,21 @@ def create_user(first_name, last_name, name, username, email, password): updated_at='2018-04-05', is_active=True, ) - """ - O EmailAdress é pra poder confirmar o email aqui na criação. Sem isso - você precisa confimar o email manualmente - """ + + # EmailAdress is for validating email confirmation on user creation EmailAddress.objects.create( user=u, email=email, primary=True, verified=True) - - u.set_password(password) u.save() - print ('Criando usuário - {0} {1}'.format(str(u.first_name), str(u.last_name))) + print('User: - {0} {1}'. + format(str(u.first_name), str(u.last_name))) + print('username: {0} -- password: {1} \n'. format(username, password)) + return u except IntegrityError: - pass + raise ValidationError("An error occurred. Stopping the script") + def populate(): @@ -62,7 +86,7 @@ def populate(): print ('Populating Database...') print ('----------------------\n') - create_super_user('admin', 'admin@admin.com', 'senhafacil') + create_super_user('admin', 'admin@admin.com') user_employee = create_user( 'Pedro', @@ -70,7 +94,7 @@ def populate(): 'Pedro', 'pedro', 'pedro@gmail.com', - 'pedro123456', + '1998-04-05', ) user_patient = create_user( @@ -79,8 +103,7 @@ def populate(): 'Enzo', 'enzo', 'enzo@gmail.com', - 'enzo123456', - + '1998-04-05', ) user_responsible = create_user( @@ -89,7 +112,7 @@ def populate(): 'Maria', 'maria', 'maria@gmail.com', - 'maria123456', + '1998-04-05', ) user_healthteam = create_user( @@ -98,7 +121,7 @@ def populate(): 'Laura', 'laura', 'laura@gmail.com', - 'laura123456', + '1998-04-05', ) user_patient_with_responsible = create_user( @@ -107,7 +130,7 @@ def populate(): 'Huiller', 'huiller', 'huiller@gmail.com', - 'huiller123456', + '1998-04-05', ) user_test = create_user( @@ -116,7 +139,7 @@ def populate(): 'teste', 'teste', 'teste@gmail.com', - 'teste123456', + '1998-04-05', ) Employee.objects.create( @@ -177,13 +200,11 @@ def populate(): slug='event', ) - print ('------------------------------\n') print ('Database populated with sucess') print ('------------------------------\n') - import django os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.local') @@ -194,8 +215,8 @@ def populate(): from drdown.users.models.model_user import User from drdown.users.models.model_patient import Patient from drdown.forum.models.model_category import Category +from django.core.exceptions import ValidationError from django.db import IntegrityError -import allauth.app_settings from allauth.account.models import EmailAddress populate() From 27767ce2ed1834219f6afa26b6276a08b1ba206f Mon Sep 17 00:00:00 2001 From: Elias Bernardo Date: Sat, 12 May 2018 21:27:12 -0300 Subject: [PATCH 04/48] Adding new users and methods in populate.py script Adding create user, patient, healthteam, responsible and employee methods Adding all necessary users Adding required posts to forum Co-authored-by: Geovana Ramos --- utility/populate.py | 317 +++++++++++++++++++++++++++++++++----------- 1 file changed, 240 insertions(+), 77 deletions(-) diff --git a/utility/populate.py b/utility/populate.py index 8bd1ed3b..f5364b53 100644 --- a/utility/populate.py +++ b/utility/populate.py @@ -36,14 +36,15 @@ def create_super_user(username, email): u.set_password(password) u.save() print ('\nSuperUser:', User.objects.get(is_superuser=True).username) - print('username: {0} -- password: {1} \n'. format(username, password)) + print('username: {0} -- password: {1} \n'.format(username, password)) return u + except IntegrityError: raise ValidationError("An error occurred. Stopping the script") -def create_user(first_name, last_name, name, username, email, birthday): +def create_user(first_name, last_name, name, username, email, birthday, gender): """ Creates the user and ensures that if any error occurs the script does not continue @@ -57,9 +58,9 @@ def create_user(first_name, last_name, name, username, email, birthday): username=username, email=email, password=password, - birthday='1998-04-05', + birthday=birthday, telephone='(22)22222-2222', - gender='M', + gender=gender, created_at='2018-04-05', updated_at='2018-04-05', is_active=True, @@ -73,9 +74,68 @@ def create_user(first_name, last_name, name, username, email, birthday): print('User: - {0} {1}'. format(str(u.first_name), str(u.last_name))) - print('username: {0} -- password: {1} \n'. format(username, password)) + print('username: {0} -- password: {1} \n'.format(username, password)) return u + + except IntegrityError: + raise ValidationError("An error occurred. Stopping the script") + + +def create_patient(user, n, responsible): + + try: + Patient.objects.create( + ses='11234561'+str(n), + user=user, + priority=1, + mother_name="Janaína Roussef", + father_name="João das neves", + ethnicity=3, + sus_number='1234567891'+str(n), + civil_registry_of_birth='1234567891'+str(n), + declaration_of_live_birth='1234567891'+str(n), + responsible=responsible + ) + + except IntegrityError: + raise ValidationError("An error occurred. Stopping the script") + + +def create_healthteam(user, n, cpf): + try: + HealthTeam.objects.create( + cpf=cpf, + user=user, + speciality=HealthTeam.NEUROLOGY, + council_acronym=HealthTeam.CRM, + register_number='123456'+str(n), + registration_state=HealthTeam.DF, + ) + except IntegrityError: + raise ValidationError("An error occurred. Stopping the script") + + +def create_responsible(user, cpf): + try: + responsible = Responsible.objects.create( + cpf=cpf, + user=user + ) + return responsible + + except IntegrityError: + raise ValidationError("An error occurred. Stopping the script") + + +def create_employee(user, cpf): + + try: + Employee.objects.create( + cpf=cpf, + user=user, + departament=Employee.ADMINISTRATION + ) except IntegrityError: raise ValidationError("An error occurred. Stopping the script") @@ -88,110 +148,179 @@ def populate(): create_super_user('admin', 'admin@admin.com') - user_employee = create_user( - 'Pedro', - 'Victor', - 'Pedro', - 'pedro', - 'pedro@gmail.com', + print ('\n------------------------') + print ('Creating Health Teams...') + print ('------------------------\n') + + healthteam_1 = create_user( + 'Laura', + 'Oliveira', + 'Laura', + 'laura', + 'laura@email.com', '1998-04-05', + 'F' ) - user_patient = create_user( - 'Enzo', - 'Gabriel', - 'Enzo', - 'enzo', - 'enzo@gmail.com', + healthteam_2 = create_user( + 'Maura', + 'Oliveira', + 'Maura', + 'maura', + 'maura@email.com', '1998-04-05', + 'F' ) - user_responsible = create_user( - 'Maria', - 'Joaquina', - 'Maria', - 'maria', - 'maria@gmail.com', + healthteam_3 = create_user( + 'Sara', + 'Oliveira', + 'Sara', + 'sara', + 'sara@email.com', '1998-04-05', + 'F' ) - user_healthteam = create_user( - 'Laura', - 'Nsei', - 'Laura', - 'laura', - 'laura@gmail.com', + create_healthteam(healthteam_1, 1, '326.763.330-38') + create_healthteam(healthteam_2, 2, '875.076.060-23') + create_healthteam(healthteam_3, 3, '452.347.400-13') + + print ('\n------------------------') + print ('Creating Responsibles...') + print ('------------------------\n') + + responsible_1 = create_user( + 'José', + 'Vaz', + 'José', + 'jose', + 'jose@email.com', '1998-04-05', + 'M' ) - user_patient_with_responsible = create_user( - 'Huiller', - 'Victor', - 'Huiller', - 'huiller', - 'huiller@gmail.com', + responsible_2 = create_user( + 'Ana', + 'Vitória', + 'Ana', + 'ana', + 'ana@email.com', '1998-04-05', + 'F' ) - user_test = create_user( - 'teste', - 'teste', - 'teste', - 'teste', - 'teste@gmail.com', + responsible_3 = create_user( + 'Júlio', + 'Tavares', + 'Júlio', + 'julio', + 'julio@email.com', '1998-04-05', + 'M' ) - Employee.objects.create( - cpf="974.220.200-16", - user=user_employee, - departament=Employee.ADMINISTRATION + responsible1 = create_responsible(responsible_1, "902.876.510-70") + responsible2 = create_responsible(responsible_2, "715.643.220-68") + responsible3 = create_responsible(responsible_3, "445.821.390-35") + + print ('\n----------------------') + print ('Creating Patients...') + print ('----------------------\n') + + print ('(Minnor)') + patient_3 = create_user( + 'Enzo', + 'Gabriel', + 'Enzo', + 'enzo', + 'enzo@email.com', + timezone.now() - timezone.timedelta(days=3650), + 'M', ) - HealthTeam.objects.create( - cpf="057.641.271-65", - user=user_healthteam, - speciality=HealthTeam.NEUROLOGY, - council_acronym=HealthTeam.CRM, - register_number="1234567", - registration_state=HealthTeam.DF, + print ('(Minnor)') + patient_4 = create_user( + 'Valentina', + 'Valente', + 'Valentina', + 'valentina', + 'valentina@email.com', + timezone.now() - timezone.timedelta(days=1), + 'F' ) - Patient.objects.create( - ses="1234567", - user=user_patient, - priority=1, - mother_name="Mãe", - father_name="Pai", - ethnicity=3, - sus_number="12345678911", - civil_registry_of_birth="12345678911", - declaration_of_live_birth="12345678911" + print ('(18+)') + patient_1 = create_user( + 'Gabriel', + 'dos Santos', + 'Gabriel', + 'gabriel', + 'gabriel@email.com', + '1998-04-05', + 'M' ) - responsible = Responsible.objects.create( - cpf="914.479.730-38", - user=user_responsible + print ('(18+)') + patient_2 = create_user( + 'Carla', + 'Júlia', + 'Carla', + 'carla', + 'carla@email.com', + '1998-04-05', + 'F' ) - Patient.objects.create( - ses="1234568", - user=user_patient_with_responsible, - responsible=responsible, - priority=1, - mother_name="Mãe", - father_name="Pai", - ethnicity=3, - sus_number="12345678912", - civil_registry_of_birth="12345678912", - declaration_of_live_birth="12345678912" + create_patient(patient_3, 3, responsible1) + create_patient(patient_4, 4, responsible2) + create_patient(patient_1, 1, None) + create_patient(patient_2, 2, None) + + print ('\n------------------------') + print ('Creating Employees...') + print ('------------------------\n') + + employee_1 = create_user( + 'Pedro', + 'Victor', + 'Pedro', + 'pedro', + 'pedro@email.com', + '1998-04-05', + 'M' + ) + + employee_2 = create_user( + 'Raíssa', + 'Parente', + 'Raíssa', + 'raissa', + 'raissa@email.com', + '1998-04-05', + 'F' ) + create_employee(employee_1, "112.954.800-77") + create_employee(employee_2, "832.164.830-45") + category1 = Category.objects.create( name='Medicamentos', description='Fórum de discussão sobre medicamentos', slug='med', + ) + + post1 = Post.objects.create( + title="Qual medicamento tomar?", + message="Tenho dores de cabeça", + created_by=patient_1, + category=category1, + ) + Commentary.objects.create( + message='Gostaria de saber também', + post=post1, + created_by=patient_2, ) category2 = Category.objects.create( @@ -200,21 +329,55 @@ def populate(): slug='event', ) + post2 = Post.objects.create( + title="Meu filho não tá legal", + message="Ele não fala com ninguém. É normal?", + created_by=responsible_1, + category=category2, + ) + + Commentary.objects.create( + message='O meu conversa com os amigos normalmente. Veja com um médico.', + post=post2, + created_by=responsible_2, + ) + + category3 = Category.objects.create( + name='Dúvidas', + description='Espaço de dúvidas', + slug='event', + ) + + post3 = Post.objects.create( + title="Onde achar um bom site sobre SD?", + message="Gostaria de achar um site muito bom sobre SD", + created_by=employee_1, + category=category3, + ) + + Commentary.objects.create( + message='Você está nele :D', + post=post3, + created_by=employee_2, + ) + print ('------------------------------\n') print ('Database populated with sucess') print ('------------------------------\n') - import django os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.local') django.setup() +from django.utils import timezone from drdown.users.models.model_employee import Employee from drdown.users.models.model_responsible import Responsible from drdown.users.models.model_health_team import HealthTeam from drdown.users.models.model_user import User from drdown.users.models.model_patient import Patient from drdown.forum.models.model_category import Category +from drdown.forum.models.model_post import Post +from drdown.forum.models.model_commentary import Commentary from django.core.exceptions import ValidationError from django.db import IntegrityError from allauth.account.models import EmailAddress From e6395e459b4a5b940abc10df4607d20362fc6001 Mon Sep 17 00:00:00 2001 From: Elias Bernardo Date: Sat, 12 May 2018 21:41:29 -0300 Subject: [PATCH 05/48] Adding Confirmation Text to the User and fixing Forum template Adding a condition for displaying the return button in forum categories Adding a warning text and a input Co-authored-by: Geovana Ramos --- drdown/forum/templates/forum/category_list.html | 4 +++- utility/populate.py | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drdown/forum/templates/forum/category_list.html b/drdown/forum/templates/forum/category_list.html index 60ea288a..c015cf2e 100644 --- a/drdown/forum/templates/forum/category_list.html +++ b/drdown/forum/templates/forum/category_list.html @@ -9,10 +9,12 @@

{% trans "Categories" %}

+ {% if user.is_authenticated %} {% trans 'Return' %} + {% endif %}
- +
{% for category in category_list %} diff --git a/utility/populate.py b/utility/populate.py index f5364b53..261ea56a 100644 --- a/utility/populate.py +++ b/utility/populate.py @@ -361,7 +361,18 @@ def populate(): created_by=employee_2, ) - print ('------------------------------\n') + print ('================================================================') + print ('WARNING:\n') + print ('All passwords displayed on this terminal ' + 'are generated randomly\n and can not be ' + 'displayed again. Be sure to save them in ' + 'a safe \nplace before continuing, otherwise' + 'you will have to redo the whole\n process.') + print ('================================================================\n') + + input("I saved the passwords in a safe place (press enter to continue...)") + + print ('\n------------------------------\n') print ('Database populated with sucess') print ('------------------------------\n') From 58d4974c97623ae2b820161cdd843f85273e393b Mon Sep 17 00:00:00 2001 From: Daniel Maike Date: Mon, 14 May 2018 13:32:38 -0300 Subject: [PATCH 06/48] Placing schedule of vaccine in tabs Creating tab of "of birth to the 6 years old" Creating tab of "From 9 years old" Co-authored-by: Gabriela Medeiros --- .../core/templates/core/vaccine_schedule.html | 751 +++++++++--------- 1 file changed, 384 insertions(+), 367 deletions(-) diff --git a/drdown/core/templates/core/vaccine_schedule.html b/drdown/core/templates/core/vaccine_schedule.html index 5dcf4108..573afafc 100644 --- a/drdown/core/templates/core/vaccine_schedule.html +++ b/drdown/core/templates/core/vaccine_schedule.html @@ -16,379 +16,396 @@ {% block content %}






+

{% trans "Vaccine Schedule" %}

{% trans "Vaccination Locations" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

{% trans 'Vaccines'%}

{% trans 'OF BIRTH TO THE 6 YEARS OF AGE'%}
{% trans 'At Birth'%}{% trans '1 Month'%}{% trans '2 Months'%}{% trans '3 Months'%}{% trans '4 Months'%}{% trans '5 Months'%}{% trans '6 Months'%}{% trans '7 Months'%}{% trans '8 Months'%}{% trans '9 Months'%}{% trans '12 Months'%}{% trans '15 Months'%}{% trans '18 Months'%}{% trans '24 Months'%}{% trans '4 Years'%}{% trans '5 Years'%}{% trans '6 Years'%}
{% trans 'BCG ID'%}{% trans 'One dose'%}{% trans 'Vaccinate the previously unvaccinated'%}{% trans 'Vaccinate people who contacted leprosy'%}
{% trans 'Hepatitis B'%}{% trans 'Three or four doses from birth'%}{% trans 'Vaccinate the previously unvaccinated'%}
{% trans 'Rotavirus'%}{% trans 'Two or three doses. Initiate vaccination before 15 weeks of age'%}{% trans 'CONTRAINDICATED'%}
{% trans 'Bacterial triple (DTPw, DTPa, ou dTpa)'%}{% trans 'Four doses of DTPa or DTPw starting at 2 months of age'%}{% trans 'Reinforcement with DTPa, DTPw or dTpa'%}
{% trans 'Haemophilus influenzae type b'%}{% trans 'Four doses starting at 2 months of age'%}{% trans 'Vaccinate the previously unvaccinated'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Poliomyelitis (inactivated virus)'%}{% trans 'Five doses starting at 2 months of age'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Pneumococcal conjugate'%}{% trans 'Four doses starting at 2 months of age - VPC10 or VPC13'%}{% trans 'VPC10 or VPC13 - Vaccinate the previously unvaccinated'%}{% trans 'PCV13: vaccinating people in special risk situations'%}
{% trans 'Meningococcal conjugate C or ACWY'%}{% trans 'With menACWY: three doses beginning at 3 months of age. Or with menC: two doses beginning at 3 months of age'%}{% trans 'REINFORCEMENT'%}{% trans 'REINFORCEMENT'%}
{% trans 'Meningococcal B'%}{% trans 'Three doses beginning at 3 months of age'%}{% trans 'REINFORCEMENT'%}{% trans 'For those not previously vaccinated: two doses'%}
{% trans 'Oral poliomyelitis (live attenuated virus)'%}{% trans 'NATIONAL VACCINATION CAMPAIGNS'%}
{% trans 'Influenza (flu)'%}{% trans 'ANNUAL VACCINATION'%}
{% trans 'Yellow fever'%}{% trans 'IN REGIONS WITH RECOMMENDATION OF VACCINATION (ACCORDING TO CLASSIFICATION OF MS) - single dose at 9 months of age. Not previously vaccinated: single dose'%}
{% trans 'Viral triple (measles, mumps and rubella)'%}{% trans 'Two doses after 12 months'%}{% trans 'Vaccinate the previously unvaccinated'%}
{% trans 'Varicella (chickenpox)'%}{% trans 'Two doses after 12 months'%}{% trans 'Vaccinate previously unvaccinated susceptibles'%}
{% trans 'Hepatitis A'%}{% trans 'Two doses after 12 months'%}{% trans 'Vaccinate the previously unvaccinated'%}
{% trans 'Pneumococcal 23 courageous'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Dengue'%}{% trans 'CONTRAINDICATED'%}

{% trans 'Vaccines'%}

{% trans 'At Birth'%}{% trans '1 Month'%}{% trans '2 Months'%}{% trans '3 Months'%}{% trans '4 Months'%}{% trans '5 Months'%}{% trans '6 Months'%}{% trans '7 Months'%}{% trans '8 Months'%}{% trans '9 Months'%}{% trans '12 Months'%}{% trans '15 Months'%}{% trans '18 Months'%}{% trans '24 Months'%}{% trans '4 Years'%}{% trans '5 Years'%}{% trans '6 Years'%}
{% trans 'OF BIRTH TO THE 6 YEARS OF AGE'%}
{% trans 'Subtitle: '%}
{% trans 'Routine'%}
{% trans 'Vaccinate Unvaccinated'%}
{% trans 'Special Situations'%}
{% trans 'Contraindicated'%}
-
-

- -
- - - - - - - - - +
+

{% trans 'Vaccines'%}

{% trans '9 TO 10 YEARS OLD'%}{% trans 'ADOLESCENT'%}{% trans 'ADULT'%}{% trans 'OLD MAN'%}
+ + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

{% trans 'Vaccines'%}

{% trans 'OF BIRTH TO THE 6 YEARS OF AGE'%}
{% trans 'At Birth'%}{% trans '1 Month'%}{% trans '2 Months'%}{% trans '3 Months'%}{% trans '4 Months'%}{% trans '5 Months'%}{% trans '6 Months'%}{% trans '7 Months'%}{% trans '8 Months'%}{% trans '9 Months'%}{% trans '12 Months'%}{% trans '15 Months'%}{% trans '18 Months'%}{% trans '24 Months'%}{% trans '4 Years'%}{% trans '5 Years'%}{% trans '6 Years'%}
{% trans '9 Years'%}{% trans '10 Years'%}{% trans '11-19 Years'%}{% trans '20-59 Years'%}{% trans '60+ Years'%}
{% trans 'BCG ID'%}{% trans 'Vaccinate people who contacted leprosy'%}
{% trans 'Hepatitis B'%}{% trans 'Vaccinate the previously unvaccinated'%}
{% trans 'Rotavirus'%}{% trans 'CONTRAINDICATED'%}
{% trans 'Bacterial triple (DTPw, DTPa, ou dTpa)'%}{% trans 'Reinforcement with dTpa from 9 years of age and every 10 years (or, in the case of dTpa, do dT)'%}{% trans 'Reinforcement with dTpa from 9 years of age and every 10 years (or, in the case of dTpa, do dT)'%}
{% trans 'Haemophilus influenzae type b'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Poliomyelitis (inactivated virus)'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Pneumococcal conjugate'%}{% trans 'PCV13: vaccinating people in special risk situations'%}{% trans 'VPC13: one dose'%}
{% trans 'Meningococcal conjugate C or ACWY'%}{% trans 'REINFORCED at age 11. For those not previously vaccinated: two doses'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Meningococcal B'%}{% trans 'For those not previously vaccinated: two doses'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Influenza (flu)'%}{% trans 'ANNUAL VACCINATION'%}
{% trans 'Yellow fever'%}{% trans 'IN REGIONS WITH RECOMMENDATION OF VACCINATION (ACCORDING TO CLASSIFICATION OF MS) - single dose at 9 months of age. Not previously vaccinated: single dose'%}
{% trans 'Viral triple (measles, mumps and rubella)'%}{% trans 'Vaccinate the previously unvaccinated'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'Varicella (chickenpox)'%}{% trans 'Vaccinate previously unvaccinated susceptibles'%}
{% trans 'Hepatitis A'%}{% trans 'Vaccinate the previously unvaccinated'%}{% trans 'Vaccinate people in special risk situations'%}
{% trans 'HPV'%}{% trans 'Three doses for girls and boys'%}{% trans 'Vaccinate the previously unvaccinated'%}{% trans 'Vaccinate the non-vaccinated formerly: at the discretion of the physician'%}
{% trans 'Pneumococcal 23 courageous'%}{% trans 'Vaccinate people in special risk situations'%}{% trans 'Two doses at five-year intervals'%}
{% trans 'Herpes zoster'%}{% trans 'From 50 to 59 years old: at medical discretion'%}{% trans 'One dose'%}
{% trans 'Dengue'%}{% trans 'To vaccinate people aged 9 to 45 years previously infected with the virus (seropositive) with three doses: 0 - 6 - 12 months'%}{% trans 'CONTRAINDICATED'%}

{% trans 'Vaccines'%}

{% trans '9 Years'%}{% trans '10 Years'%}{% trans '11-19 Years'%}{% trans '20-59 Years'%}{% trans '60+ Years'%}
{% trans '9 TO 10 YEARS OLD'%}{% trans 'ADOLESCENT'%}{% trans 'ADULT'%}{% trans 'OLD MAN'%}
+ + + + + {% trans 'BCG ID'%} + {% trans 'One dose'%} + {% trans 'Vaccinate the previously unvaccinated'%} + {% trans 'Vaccinate people who contacted leprosy'%} + + + {% trans 'Hepatitis B'%} + {% trans 'Three or four doses from birth'%} + {% trans 'Vaccinate the previously unvaccinated'%} + + + {% trans 'Rotavirus'%} + + + {% trans 'Two or three doses. Initiate vaccination before 15 weeks of age'%} + {% trans 'CONTRAINDICATED'%} + + + {% trans 'Bacterial triple (DTPw, DTPa, ou dTpa)'%} + + + {% trans 'Four doses of DTPa or DTPw starting at 2 months of age'%} + + {% trans 'Reinforcement with DTPa, DTPw or dTpa'%} + + + + {% trans 'Haemophilus influenzae type b'%} + + + {% trans 'Four doses starting at 2 months of age'%} + {% trans 'Vaccinate the previously unvaccinated'%} + {% trans 'Vaccinate people in special risk situations'%} + + + {% trans 'Poliomyelitis (inactivated virus)'%} + + + {% trans 'Five doses starting at 2 months of age'%} + {% trans 'Vaccinate people in special risk situations'%} + + + {% trans 'Pneumococcal conjugate'%} + + + {% trans 'Four doses starting at 2 months of age - VPC10 or VPC13'%} + {% trans 'VPC10 or VPC13 - Vaccinate the previously unvaccinated'%} + {% trans 'PCV13: vaccinating people in special risk situations'%} + + + {% trans 'Meningococcal conjugate C or ACWY'%} + + + + {% trans 'With menACWY: three doses beginning at 3 months of age. Or with menC: two doses beginning at 3 months of age'%} + {% trans 'REINFORCEMENT'%} + + {% trans 'REINFORCEMENT'%} + + + {% trans 'Meningococcal B'%} + + + + {% trans 'Three doses beginning at 3 months of age'%} + {% trans 'REINFORCEMENT'%} + {% trans 'For those not previously vaccinated: two doses'%} + + + {% trans 'Oral poliomyelitis (live attenuated virus)'%} + + + + + + + + {% trans 'NATIONAL VACCINATION CAMPAIGNS'%} + + + + {% trans 'Influenza (flu)'%} + + + + + + + {% trans 'ANNUAL VACCINATION'%} + + + {% trans 'Yellow fever'%} + + + + + + + + + + {% trans 'IN REGIONS WITH RECOMMENDATION OF VACCINATION (ACCORDING TO CLASSIFICATION OF MS) - single dose at 9 months of age. Not previously vaccinated: single dose'%} + + + {% trans 'Viral triple (measles, mumps and rubella)'%} + + + + + + + + + + + {% trans 'Two doses after 12 months'%} + {% trans 'Vaccinate the previously unvaccinated'%} + + + {% trans 'Varicella (chickenpox)'%} + + + + + + + + + + + {% trans 'Two doses after 12 months'%} + {% trans 'Vaccinate previously unvaccinated susceptibles'%} + + + {% trans 'Hepatitis A'%} + + + + + + + + + + + {% trans 'Two doses after 12 months'%} + {% trans 'Vaccinate the previously unvaccinated'%} + + + {% trans 'Pneumococcal 23 courageous'%} + + + + + + + + + + + + + + {% trans 'Vaccinate people in special risk situations'%} + + + {% trans 'Dengue'%} + {% trans 'CONTRAINDICATED'%} + + + + +

{% trans 'Vaccines'%}

+ {% trans 'At Birth'%} + {% trans '1 Month'%} + {% trans '2 Months'%} + {% trans '3 Months'%} + {% trans '4 Months'%} + {% trans '5 Months'%} + {% trans '6 Months'%} + {% trans '7 Months'%} + {% trans '8 Months'%} + {% trans '9 Months'%} + {% trans '12 Months'%} + {% trans '15 Months'%} + {% trans '18 Months'%} + {% trans '24 Months'%} + {% trans '4 Years'%} + {% trans '5 Years'%} + {% trans '6 Years'%} + + + {% trans 'OF BIRTH TO THE 6 YEARS OF AGE'%} + + + +
{% trans 'Subtitle: '%}
+ +
{% trans 'Routine'%}
+ +
{% trans 'Vaccinate Unvaccinated'%}
+ +
{% trans 'Special Situations'%}
+ +
{% trans 'Contraindicated'%}
+ + +
+
+ + -

+ +

{% endblock content %} From 5fa50e54c1f67f87ea14711bb6704a79fc014011 Mon Sep 17 00:00:00 2001 From: Daniel Maike Date: Mon, 14 May 2018 13:42:41 -0300 Subject: [PATCH 07/48] Changing text-colors of tab texts Co-authored-by: Gabriela Medeiros --- .../core/templates/core/vaccine_schedule.html | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/drdown/core/templates/core/vaccine_schedule.html b/drdown/core/templates/core/vaccine_schedule.html index 573afafc..4d85100f 100644 --- a/drdown/core/templates/core/vaccine_schedule.html +++ b/drdown/core/templates/core/vaccine_schedule.html @@ -15,16 +15,16 @@ {% block content %} -






- -

{% trans "Vaccine Schedule" %}

- {% trans "Vaccination Locations" %} -
+






+ +

{% trans "Vaccine Schedule" %}

+{% trans "Vaccination Locations" %} +
@@ -257,17 +257,6 @@ {% trans 'OF BIRTH TO THE 6 YEARS OF AGE'%} - -
{% trans 'Subtitle: '%}
- -
{% trans 'Routine'%}
- -
{% trans 'Vaccinate Unvaccinated'%}
- -
{% trans 'Special Situations'%}
- -
{% trans 'Contraindicated'%}
- From e885dcd1c0927b0b82143fd4747e9e54b6dfc763 Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Mon, 14 May 2018 14:51:05 -0300 Subject: [PATCH 08/48] Changes in model Removing model specific exams Making changes in model exams Co-authored-by: joberth rogers --- drdown/medicalrecords/admin.py | 2 - drdown/medicalrecords/forms/exam_forms.py | 2 +- .../forms/specific_exams_forms.py | 10 --- .../migrations/0004_auto_20180514_1749.py | 46 ++++++++++++++ drdown/medicalrecords/models/model_exams.py | 42 ++++++++----- .../models/model_specific_exams.py | 62 ------------------- drdown/medicalrecords/urls.py | 17 +---- drdown/medicalrecords/views/__init__.py | 1 - .../views/view_medical_record.py | 2 - .../views/view_specific_exams.py | 22 ------- 10 files changed, 73 insertions(+), 133 deletions(-) delete mode 100644 drdown/medicalrecords/forms/specific_exams_forms.py create mode 100644 drdown/medicalrecords/migrations/0004_auto_20180514_1749.py delete mode 100644 drdown/medicalrecords/models/model_specific_exams.py delete mode 100644 drdown/medicalrecords/views/view_specific_exams.py diff --git a/drdown/medicalrecords/admin.py b/drdown/medicalrecords/admin.py index fd590f7a..d3b179ec 100644 --- a/drdown/medicalrecords/admin.py +++ b/drdown/medicalrecords/admin.py @@ -2,13 +2,11 @@ from .models.model_medical_record import MedicalRecord from .models.model_static_data import StaticData from .models.model_medicines import Medicine -from .models.model_specific_exams import SpecificExam from .models.model_complaint import Complaint from .models.model_exams import Exam admin.site.register(MedicalRecord) admin.site.register(StaticData) admin.site.register(Medicine) -admin.site.register(SpecificExam) admin.site.register(Complaint) admin.site.register(Exam) diff --git a/drdown/medicalrecords/forms/exam_forms.py b/drdown/medicalrecords/forms/exam_forms.py index ff94375d..b286738e 100644 --- a/drdown/medicalrecords/forms/exam_forms.py +++ b/drdown/medicalrecords/forms/exam_forms.py @@ -6,4 +6,4 @@ class ExamForm(forms.ModelForm): class Meta: model = Exam - fields = ["file", "day", "status", "name"] + fields = ["file", "day", "category", "observations"] diff --git a/drdown/medicalrecords/forms/specific_exams_forms.py b/drdown/medicalrecords/forms/specific_exams_forms.py deleted file mode 100644 index 4b99d68f..00000000 --- a/drdown/medicalrecords/forms/specific_exams_forms.py +++ /dev/null @@ -1,10 +0,0 @@ -from drdown.medicalrecords.models.model_specific_exams import SpecificExam -from django import forms - - -class SpecificExamsForm(forms.ModelForm): - - class Meta: - model = SpecificExam - fields = ["structured_physical_exam", "vision", "ear", "hearth", - "muscle_skeletal_system", "nervous_system"] diff --git a/drdown/medicalrecords/migrations/0004_auto_20180514_1749.py b/drdown/medicalrecords/migrations/0004_auto_20180514_1749.py new file mode 100644 index 00000000..12e6d16b --- /dev/null +++ b/drdown/medicalrecords/migrations/0004_auto_20180514_1749.py @@ -0,0 +1,46 @@ +# Generated by Django 2.0.3 on 2018-05-14 17:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('medicalrecords', '0003_complaint_exam_medicine_specificexam_staticdata'), + ] + + operations = [ + migrations.RemoveField( + model_name='specificexam', + name='author', + ), + migrations.RemoveField( + model_name='specificexam', + name='patient', + ), + migrations.RemoveField( + model_name='exam', + name='author', + ), + migrations.RemoveField( + model_name='exam', + name='name', + ), + migrations.RemoveField( + model_name='exam', + name='status', + ), + migrations.AddField( + model_name='exam', + name='category', + field=models.IntegerField(choices=[(None, 'select a category'), (0, 'Others'), (1, 'Structured Physical Exam'), (2, 'Vision Exam'), (3, 'Ear Exam'), (4, 'Hearth Exam'), (5, 'Muscle skeletal system Exam'), (6, 'Nervous system Exam')], help_text='Please, insert the category of the exam', null=True, verbose_name='Category'), + ), + migrations.AddField( + model_name='exam', + name='observations', + field=models.CharField(blank=True, default='', max_length=200, verbose_name='Observations'), + ), + migrations.DeleteModel( + name='SpecificExam', + ), + ] diff --git a/drdown/medicalrecords/models/model_exams.py b/drdown/medicalrecords/models/model_exams.py index df02b6bc..4c843cec 100644 --- a/drdown/medicalrecords/models/model_exams.py +++ b/drdown/medicalrecords/models/model_exams.py @@ -22,31 +22,39 @@ class Exam(models.Model): help_text=_('Day the exam was performed'), ) - STATUS = ( - (3, _('Executed')), - (2, _('Collected')), - (1, _('Marked examination')), + CATEGORIES = ( + (None, _("select a category")), + (0, _("Others")), + (1, _('Structured Physical Exam')), + (2, _('Vision Exam')), + (3, _('Ear Exam')), + (4, _('Hearth Exam')), + (5, _('Muscle skeletal system Exam')), + (6, _('Nervous system Exam')), ) - status = models.IntegerField( - _('Status'), - choices=STATUS, - help_text=_("Please, insert the status of the exam"), + category = models.IntegerField( + _('Category'), + choices=CATEGORIES, + help_text=_("Please, insert the category of the exam"), + null=True, + blank=False, ) - name = models.CharField( - _('Exam Name'), - max_length=200 - ) - author = models.ForeignKey( - HealthTeam, - on_delete=models.CASCADE, - verbose_name=_("Author") + observations = models.CharField( + _('Observations'), + max_length=200, + blank=True, + default="" ) + def __str__(self): - return self.patient.user.get_username() + " - " + self.name + return ( + self.patient.user.get_username() + + " - " + self.get_category_display() + ) class Meta: verbose_name = _("Exam") diff --git a/drdown/medicalrecords/models/model_specific_exams.py b/drdown/medicalrecords/models/model_specific_exams.py deleted file mode 100644 index 034f796e..00000000 --- a/drdown/medicalrecords/models/model_specific_exams.py +++ /dev/null @@ -1,62 +0,0 @@ -from django.db import models -from drdown.users.models.model_health_team import HealthTeam -from drdown.users.models.model_patient import Patient -from django.utils.translation import ugettext_lazy as _ - - -class SpecificExam(models.Model): - - patient = models.OneToOneField( - Patient, - on_delete=models.CASCADE, - verbose_name=_('Patient') - ) - - structured_physical_exam = models.FileField( - upload_to='media/medicalrecords/specificexams', - blank=True, - verbose_name=_('Structured Physical Exam') - ) - - vision = models.FileField( - upload_to='media/medicalrecords/specificexams', - blank=True, - verbose_name=_('Vision Exam') - ) - - ear = models.FileField( - upload_to='media/medicalrecords/specificexams', - blank=True, - verbose_name=_('Ear Exam') - ) - - hearth = models.FileField( - upload_to='media/medicalrecords/specificexams', - blank=True, - verbose_name=_('Hearth Exam') - ) - - muscle_skeletal_system = models.FileField( - upload_to='media/medicalrecords/specificexams', - blank=True, - verbose_name=_('Muscle skeletal system Exam') - ) - - nervous_system = models.FileField( - upload_to='media/medicalrecords/specificexams', - blank=True, - verbose_name=_('Nervous system Exam') - ) - - author = models.ForeignKey( - HealthTeam, - on_delete=models.CASCADE, - verbose_name=_("Author") - ) - - def __str__(self): - return self.patient.user.get_username() - - class Meta: - verbose_name = _("Specific Exam") - verbose_name_plural = _("Specific Exams") diff --git a/drdown/medicalrecords/urls.py b/drdown/medicalrecords/urls.py index 6a2199cf..20fb2550 100644 --- a/drdown/medicalrecords/urls.py +++ b/drdown/medicalrecords/urls.py @@ -4,9 +4,8 @@ from drdown.medicalrecords.forms.static_data_forms import StaticDataForm from drdown.medicalrecords.forms.medicines_forms import MedicineForm from drdown.medicalrecords.forms.complaint_forms import ComplaintForm -from drdown.medicalrecords.forms.specific_exams_forms import SpecificExamsForm from drdown.medicalrecords.views import view_medical_record, view_static_data,\ - view_medicines, view_specific_exams, view_complaint, view_exams + view_medicines, view_complaint, view_exams app_name = 'medicalrecords' urlpatterns = [ @@ -37,13 +36,6 @@ name='create_medicine_medicalrecords' ), - url( - regex=r'^(?P[\w.@+-]+)/new-specific-exam/$', - view=view_specific_exams.SpecificExamCreateView.as_view( - form_class=SpecificExamsForm), - name='create_specific_exam_medicalrecords' - ), - url( regex=r'^(?P[\w.@+-]+)/new-complaint/$', view=view_complaint.ComplaintCreateView.as_view( @@ -58,13 +50,6 @@ name='create_exam_medicalrecords' ), - url( - regex=r'^(?P[\w.@+-]+)/update-exams/$', - view=view_specific_exams.SpecificExamUpdateView.as_view( - form_class=SpecificExamsForm), - name='update_exams_medicalrecords' - ), - url( regex=r'^(?P[\w.@+-]+)/update-static-data/$', view=view_static_data.StaticDataUpdateView.as_view( diff --git a/drdown/medicalrecords/views/__init__.py b/drdown/medicalrecords/views/__init__.py index ef0db865..e1007f12 100644 --- a/drdown/medicalrecords/views/__init__.py +++ b/drdown/medicalrecords/views/__init__.py @@ -3,7 +3,6 @@ view_complaint, view_exams, view_medicines, - view_specific_exams, view_static_data, views_base, ) diff --git a/drdown/medicalrecords/views/view_medical_record.py b/drdown/medicalrecords/views/view_medical_record.py index 4259ab8a..914d1454 100644 --- a/drdown/medicalrecords/views/view_medical_record.py +++ b/drdown/medicalrecords/views/view_medical_record.py @@ -1,7 +1,6 @@ from drdown.users.models.model_health_team import HealthTeam from ..models.model_medical_record import MedicalRecord from ..models.model_static_data import StaticData -from ..models.model_specific_exams import SpecificExam from ..models.model_medicines import Medicine from ..models.model_exams import Exam from ..models.model_complaint import Complaint @@ -64,7 +63,6 @@ def get_context_data(self, **kwargs): context['complaints'] = complaints context['exams'] = exams context['medicines'] = medicines - context['specificexams'] = specificexams context['staticdata'] = staticdata context['medicalrecordlist'] = context['object_list'] context['related_patient'] = patient diff --git a/drdown/medicalrecords/views/view_specific_exams.py b/drdown/medicalrecords/views/view_specific_exams.py deleted file mode 100644 index 0a9bc5ad..00000000 --- a/drdown/medicalrecords/views/view_specific_exams.py +++ /dev/null @@ -1,22 +0,0 @@ -from drdown.users.models.model_health_team import HealthTeam -from ..models.model_specific_exams import SpecificExam -from drdown.users.models.model_user import User -from drdown.users.models.model_patient import Patient -from django.views.generic import CreateView, UpdateView -from django.urls import reverse_lazy -from ..forms.specific_exams_forms import SpecificExamsForm -from ..views.views_base import BaseViewForm, BaseViewUrl - - -class SpecificExamCreateView(BaseViewForm, BaseViewUrl, CreateView): - model = SpecificExam - form_class = SpecificExamsForm - template_name = 'medicalrecords/medicalrecord_specific_exams_form.html' - - -class SpecificExamUpdateView(BaseViewUrl, UpdateView): - model = SpecificExam - form_class = SpecificExamsForm - template_name = 'medicalrecords/medicalrecord_specific_exams_form.html' - slug_url_kwarg = 'username' - slug_field = 'patient__user__username' From 7937d6c6f03d6d0e667a0603b317f4e023b98bfc Mon Sep 17 00:00:00 2001 From: Daniel Maike Date: Mon, 14 May 2018 15:04:57 -0300 Subject: [PATCH 09/48] Adding image to core Adding subtitle image to vaccine shedule Co-authored-by: Gabriela Medeiros --- drdown/core/static/core/images/Subtitle.png | Bin 0 -> 11167 bytes .../core/templates/core/vaccine_schedule.html | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 drdown/core/static/core/images/Subtitle.png diff --git a/drdown/core/static/core/images/Subtitle.png b/drdown/core/static/core/images/Subtitle.png new file mode 100644 index 0000000000000000000000000000000000000000..f7f76fc1e739d32dbe8c8ca84b27267ed6d64856 GIT binary patch literal 11167 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 + +

{% endblock content %} From 7f313e0a4b6b9d78c97f8082ca08f03618babb98 Mon Sep 17 00:00:00 2001 From: Daniel Maike Date: Mon, 14 May 2018 16:03:31 -0300 Subject: [PATCH 10/48] Adding css to vaccine schedule Adding colored nav Creating vaccine_schedule.css Co-authored-by: Gabriela Medeiros --- .../core/static/core/css/vaccineshedule.css | 60 +++++++++++++++++++ .../core/templates/core/vaccine_schedule.html | 14 +++-- 2 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 drdown/core/static/core/css/vaccineshedule.css diff --git a/drdown/core/static/core/css/vaccineshedule.css b/drdown/core/static/core/css/vaccineshedule.css new file mode 100644 index 00000000..0b02a18e --- /dev/null +++ b/drdown/core/static/core/css/vaccineshedule.css @@ -0,0 +1,60 @@ +.search{ + padding: 20px; +} + +.align-photo{ + position: relative; + padding-right: 20px; + padding-bottom: 25px; + max-width:200px; + max-height:150px; + width: auto; + height: auto; + +} + +.margintoleft{ + width: 50%; + height: 70%; + position: relative; + top:-170px; + right: -200px; + +} + +.size-cont{ + width: 70%; + height: 370px; + position: relative; + left: 100px; +} + +.size-text{ + word-wrap: break-word; + +} + +.tab-pane { + + border-left: 2px solid #ddd; + border-right: 2px solid #ddd; + border-bottom: 2px solid #ddd; + border-radius: 0px 0px 5px 5px; + padding: 10px; +} + +.nav-tabs-extension { + margin-bottom: 0; + background: transparent; +} + +.nav-link-extension{ + color: #ddd; + background: #2C3E50; +} + +.nav-link-extension:hover{ + font-weight: bold; + color: #ddd; + background: #1a252f; +} diff --git a/drdown/core/templates/core/vaccine_schedule.html b/drdown/core/templates/core/vaccine_schedule.html index 209b0ca6..f56f9dcf 100644 --- a/drdown/core/templates/core/vaccine_schedule.html +++ b/drdown/core/templates/core/vaccine_schedule.html @@ -5,12 +5,14 @@ - + + + {% endblock css %} {% block content %} @@ -22,9 +24,9 @@
@@ -261,7 +263,7 @@ - + + + + + diff --git a/drdown/medicalrecords/urls.py b/drdown/medicalrecords/urls.py index 20fb2550..c05d6c61 100644 --- a/drdown/medicalrecords/urls.py +++ b/drdown/medicalrecords/urls.py @@ -56,4 +56,17 @@ form_class=StaticDataForm), name='update_static_data_medicalrecords' ), + url( + regex=r'^(?P[\w.@+-]+)/new-medicine/$', + view=view_medicines.MedicinesCreateView.as_view( + form_class=MedicineForm), + name='create_medicine' + ), + url( + regex=r'(?P[\w.@+-]+)/update-medicine/(?P\d+)/$', + view=view_medicines.MedicinesUpdateView.as_view( + form_class=MedicineForm), + name='update_medicine' + ), + ] From b58b06876ea0a184ff6c36c205f695a264dc06a8 Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 13:40:30 -0300 Subject: [PATCH 21/48] Add tab on template Adds tab for complaints on medical record template Co-authored-by: joberth rogers --- .../medicalrecords/medicalrecord_list.html | 73 ++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html index de3b3378..c3cfd9ab 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html @@ -360,7 +360,9 @@
{% empty %} -

{% trans 'There are no registered exams for this patient.' %}

+ +

{% trans 'There are no exams registered for this patient.'%}

+ {% endfor %} @@ -425,7 +427,7 @@

{% trans 'Patient Medicine' %}

{% else %} -

{% trans 'There are no registered medicines for this patient.' %}

+

{% trans 'There are no medicines registered for this patient.'%}

{% endif %} @@ -438,6 +440,73 @@

{% trans 'Patient Medicine' %}

From 7c3363732642a8ffb3c817bbb4456fdc9aa95965 Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 13:43:01 -0300 Subject: [PATCH 22/48] Bugfix on view Now the list of medical records is properly filtered Co-authored-by: joberth rogers --- drdown/medicalrecords/views/view_medical_record.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drdown/medicalrecords/views/view_medical_record.py b/drdown/medicalrecords/views/view_medical_record.py index c4792e34..983a480f 100644 --- a/drdown/medicalrecords/views/view_medical_record.py +++ b/drdown/medicalrecords/views/view_medical_record.py @@ -61,7 +61,11 @@ def get_context_data(self, **kwargs): context['complaints'] = complaints context['medicines'] = medicines context['staticdata'] = staticdata - context['medicalrecordlist'] = context['object_list'] + + context['medicalrecordlist'] = context['object_list'].filter( + patient=patient + ) + context['related_patient'] = patient exams = Exam.objects.filter(patient=patient) From ff27bd44c15215a04baabe72b08fd0dc04ae7736 Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 13:58:25 -0300 Subject: [PATCH 23/48] Renaming tab Changing from 'Important Notes' to 'Evolution' Co-authored-by: joberth rogers --- .../templates/medicalrecords/medicalrecord_list.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html index c3cfd9ab..ceb5f356 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html @@ -58,7 +58,7 @@

{% trans 'Medical Record' %}: {{ related_patient.user.
  • - {% trans "Important notes" %} + {% trans "Evolution" %}
  • @@ -130,7 +130,7 @@

    {% trans 'Medical Record' %}: {{ related_patient.user.
    -

    {% trans 'Important Notes' %}

    +

    {% trans 'Evolution' %}

    {% if user.healthteam %}
    @@ -200,7 +200,7 @@
    {% empty %} -

    {% trans 'There are no Important notes for this patient.'%}

    +

    {% trans 'There are no Evolution for this patient.'%}

    {% endfor %}
    From 0395a4526a4896695e5004db61f673553acd3385 Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 14:50:14 -0300 Subject: [PATCH 24/48] Updating tests Adapt test based on changes on implementations Co-authored-by: joberth rogers --- .../tests/test_medical_records_view.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drdown/medicalrecords/tests/test_medical_records_view.py b/drdown/medicalrecords/tests/test_medical_records_view.py index fc52bf41..7d0cfe2b 100644 --- a/drdown/medicalrecords/tests/test_medical_records_view.py +++ b/drdown/medicalrecords/tests/test_medical_records_view.py @@ -7,7 +7,6 @@ from ..models.model_medical_record import MedicalRecord from ..models.model_static_data import StaticData from ..models.model_medicines import Medicine -from ..models.model_specific_exams import SpecificExam from ..models.model_complaint import Complaint from django.test.client import Client from django.urls import reverse @@ -72,9 +71,8 @@ def setUp(self): self.exam = Exam.objects.create( patient=self.patient, day=timezone.now() - timezone.timedelta(days=1), - status=3, - name="Sangue", - author=self.health_team + category=1, + file="exam.txt" ) self.medicine = Medicine.objects.create( @@ -85,11 +83,6 @@ def setUp(self): author=self.health_team ) - self.specificexams = SpecificExam.objects.create( - patient=self.patient, - author=self.health_team - ) - self.staticdata = StaticData.objects.create( patient=self.patient, APGAR=9, @@ -259,10 +252,11 @@ def test__str__(self): self.assertEqual(self.complaint.__str__(), 'teste_2 - Comptaint ID: 1') - self.assertEqual(self.exam.__str__(), 'teste_2 - Sangue') + self.assertEqual( + self.exam.__str__(), + str('teste_2 - ' + self.exam.get_category_display()) + ) self.assertEqual(self.medicine.__str__(), 'teste_2 - Neosaldina') - self.assertEqual(self.specificexams.__str__(), 'teste_2') - self.assertEqual(self.staticdata.__str__(), 'teste_2') From 581844c5208528a5ad8e010ff7ef85007f9fb4ca Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 15:03:00 -0300 Subject: [PATCH 25/48] Changes in model Change display name of a category choice Co-authored-by: joberth rogers --- .../migrations/0005_auto_20180515_1802.py | 18 ++++++++++++++++++ drdown/medicalrecords/models/model_exams.py | 4 +--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 drdown/medicalrecords/migrations/0005_auto_20180515_1802.py diff --git a/drdown/medicalrecords/migrations/0005_auto_20180515_1802.py b/drdown/medicalrecords/migrations/0005_auto_20180515_1802.py new file mode 100644 index 00000000..c9e36ce1 --- /dev/null +++ b/drdown/medicalrecords/migrations/0005_auto_20180515_1802.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-05-15 18:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('medicalrecords', '0004_auto_20180514_1749'), + ] + + operations = [ + migrations.AlterField( + model_name='exam', + name='category', + field=models.IntegerField(choices=[(None, 'Select a category...'), (0, 'Others'), (1, 'Structured Physical Exam'), (2, 'Vision Exam'), (3, 'Ear Exam'), (4, 'Hearth Exam'), (5, 'Muscle skeletal system Exam'), (6, 'Nervous system Exam')], help_text='Please, insert the category of the exam', null=True, verbose_name='Category'), + ), + ] diff --git a/drdown/medicalrecords/models/model_exams.py b/drdown/medicalrecords/models/model_exams.py index 4c843cec..df808138 100644 --- a/drdown/medicalrecords/models/model_exams.py +++ b/drdown/medicalrecords/models/model_exams.py @@ -23,7 +23,7 @@ class Exam(models.Model): ) CATEGORIES = ( - (None, _("select a category")), + (None, _("Select a category...")), (0, _("Others")), (1, _('Structured Physical Exam')), (2, _('Vision Exam')), @@ -41,7 +41,6 @@ class Exam(models.Model): blank=False, ) - observations = models.CharField( _('Observations'), max_length=200, @@ -49,7 +48,6 @@ class Exam(models.Model): default="" ) - def __str__(self): return ( self.patient.user.get_username() + From 7bfb96530eca76d5f9130553854959ffeeb572ee Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 15:05:21 -0300 Subject: [PATCH 26/48] Updating translation Add missing translation Fixes some text errors Co-authored-by: joberth rogers --- .../locale/pt_BR/LC_MESSAGES/django.po | 301 ++++++++++-------- .../medicalrecord_exam_form.html | 2 +- .../medicalrecords/medicalrecord_list.html | 2 +- 3 files changed, 174 insertions(+), 131 deletions(-) diff --git a/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po b/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po index 5224ca1b..5d59699a 100644 --- a/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po +++ b/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-10 00:54+0000\n" +"POT-Creation-Date: 2018-05-15 18:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,13 +21,15 @@ msgstr "" #: drdown/medicalrecords/apps.py:7 #: drdown/medicalrecords/models/model_medical_record.py:41 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_confirm_delete.html:5 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:38 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:44 msgid "Medical Record" msgstr "Prontuário" #: drdown/medicalrecords/models/model_complaint.py:12 #: drdown/medicalrecords/models/model_medical_record.py:14 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:158 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:154 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:180 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:492 msgid "Created at" msgstr "Criado em" @@ -49,7 +51,6 @@ msgstr "Hora da queixa" #: drdown/medicalrecords/models/model_exams.py:12 #: drdown/medicalrecords/models/model_medical_record.py:22 #: drdown/medicalrecords/models/model_medicines.py:12 -#: drdown/medicalrecords/models/model_specific_exams.py:12 #: drdown/medicalrecords/models/model_static_data.py:13 msgid "Patient" msgstr "Paciente" @@ -64,12 +65,13 @@ msgid "Description of the complaint" msgstr "Descrição da queixa" #: drdown/medicalrecords/models/model_complaint.py:40 -#: drdown/medicalrecords/models/model_exams.py:45 #: drdown/medicalrecords/models/model_medical_record.py:34 #: drdown/medicalrecords/models/model_medicines.py:33 -#: drdown/medicalrecords/models/model_specific_exams.py:54 #: drdown/medicalrecords/models/model_static_data.py:39 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:153 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:154 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:175 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:466 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:487 msgid "Author" msgstr "Autor" @@ -78,6 +80,8 @@ msgid "Complaint" msgstr "Queixa" #: drdown/medicalrecords/models/model_complaint.py:45 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:77 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:445 msgid "Complaints" msgstr "Queixas" @@ -86,7 +90,7 @@ msgid "The complaint cannot be in the future!" msgstr "A queixa não pode ser no futuro!" #: drdown/medicalrecords/models/model_exams.py:17 -#: drdown/medicalrecords/models/model_exams.py:52 +#: drdown/medicalrecords/models/model_exams.py:58 msgid "Exam" msgstr "Exame" @@ -99,30 +103,50 @@ msgid "Day the exam was performed" msgstr "Dia em que o exame foi realizado" #: drdown/medicalrecords/models/model_exams.py:26 -msgid "Executed" -msgstr "Relizado" +msgid "Select a category..." +msgstr "Selecione uma categoria..." #: drdown/medicalrecords/models/model_exams.py:27 -msgid "Collected" -msgstr "Coletado" +msgid "Others" +msgstr "Outros" #: drdown/medicalrecords/models/model_exams.py:28 -msgid "Marked examination" -msgstr "Marcado" +msgid "Structured Physical Exam" +msgstr "Exame Físico Estruturado" + +#: drdown/medicalrecords/models/model_exams.py:29 +msgid "Vision Exam" +msgstr "Exame de vista" + +#: drdown/medicalrecords/models/model_exams.py:30 +msgid "Ear Exam" +msgstr "Exame de audição" + +#: drdown/medicalrecords/models/model_exams.py:31 +msgid "Hearth Exam" +msgstr "Exame do coração" #: drdown/medicalrecords/models/model_exams.py:32 -msgid "Status" -msgstr "Status" +msgid "Muscle skeletal system Exam" +msgstr "Sistema músculo esquelético" -#: drdown/medicalrecords/models/model_exams.py:34 -msgid "Please, insert the status of the exam" -msgstr "Por favor, insira o status do exame" +#: drdown/medicalrecords/models/model_exams.py:33 +msgid "Nervous system Exam" +msgstr "Exame do sistema nervoso" -#: drdown/medicalrecords/models/model_exams.py:38 -msgid "Exam Name" -msgstr "Nome do exame" +#: drdown/medicalrecords/models/model_exams.py:37 +msgid "Category" +msgstr "Categoria" -#: drdown/medicalrecords/models/model_exams.py:53 +#: drdown/medicalrecords/models/model_exams.py:39 +msgid "Please, insert the category of the exam" +msgstr "Por favor, insira a categoria do exame" + +#: drdown/medicalrecords/models/model_exams.py:45 +msgid "Observations" +msgstr "" + +#: drdown/medicalrecords/models/model_exams.py:59 msgid "Exams" msgstr "Exames" @@ -152,6 +176,7 @@ msgid "Medicine dosage" msgstr "Dosagem do remédio" #: drdown/medicalrecords/models/model_medicines.py:26 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:407 msgid "In use?" msgstr "Em uso?" @@ -160,41 +185,11 @@ msgid "Does the patient still use this medication?" msgstr "O paciente ainda usa esse medicamento?" #: drdown/medicalrecords/models/model_medicines.py:40 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:73 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:383 msgid "Patient Medicine" msgstr "Remédio do Paciente" -#: drdown/medicalrecords/models/model_specific_exams.py:18 -msgid "Structured Physical Exam" -msgstr "Exame Físico Estruturado" - -#: drdown/medicalrecords/models/model_specific_exams.py:24 -msgid "Vision Exam" -msgstr "Exame de vista" - -#: drdown/medicalrecords/models/model_specific_exams.py:30 -msgid "Ear Exam" -msgstr "Exame de audição" - -#: drdown/medicalrecords/models/model_specific_exams.py:36 -msgid "Hearth Exam" -msgstr "Exame do coração" - -#: drdown/medicalrecords/models/model_specific_exams.py:42 -msgid "Muscle skeletal system Exam" -msgstr "Sistema músculo esquelético" - -#: drdown/medicalrecords/models/model_specific_exams.py:48 -msgid "Nervous system Exam" -msgstr "Exame do sistema nervoso" - -#: drdown/medicalrecords/models/model_specific_exams.py:61 -msgid "Specific Exam" -msgstr "Exame específico" - -#: drdown/medicalrecords/models/model_specific_exams.py:62 -msgid "Specific Exams" -msgstr "Exames específicos" - #: drdown/medicalrecords/models/model_static_data.py:17 msgid "Weight at birth" msgstr "Peso ao nascer" @@ -230,9 +225,9 @@ msgid "Add new Complaint" msgstr "Adicionar nova queixa" #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:37 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html:30 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html:60 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_form.html:64 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:30 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:60 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_specific_exams_form.html:60 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_static_data_form.html:60 msgid "Save" @@ -240,9 +235,9 @@ msgstr "Salvar" #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:39 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_confirm_delete.html:16 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html:32 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html:64 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_form.html:70 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:32 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:64 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_specific_exams_form.html:64 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_static_data_form.html:64 msgid "Cancel" @@ -257,10 +252,9 @@ msgstr "Apagar" msgid "Are you sure you want to delete this medical record?" msgstr "Você tem certeza que deseja apagar este prontuário?" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html:14 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_specific_exams_form.html:16 -msgid "Add Specific Exams" -msgstr "Adicionar exame específico" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html:16 +msgid "Add Exam" +msgstr "Adicionar Exame" #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_form.html:53 msgid "Attachments" @@ -270,138 +264,187 @@ msgstr "Anexos" msgid "Medical Record:" msgstr "Prontuários:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:42 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:48 msgid "Return" msgstr "Retornar" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:51 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:57 msgid "Patient data" msgstr "Dados do paciente" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:55 -msgid "Important notes" -msgstr "Observações importantes" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:61 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:133 +msgid "Evolution" +msgstr "Evolução" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:59 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:188 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:65 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:216 msgid "Postnatal data" msgstr "Dados do pós-natal" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:63 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:275 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:69 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:303 msgid "Medical Exams" msgstr "Exames Médicos" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:92 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:99 msgid "Name: " msgstr "Nome: " -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:98 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:105 msgid "SUS: " msgstr "SUS: " -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:104 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:111 msgid "Birthday: " msgstr "Data de nascimento: " -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:112 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:119 msgid "cpf: " -msgstr "CPF" +msgstr "CPF: " -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:126 -msgid "Important Notes" -msgstr "Observações importantes" - -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:130 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:196 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:281 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:137 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:224 msgid "New" msgstr "Novo" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:167 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:189 msgid "Attachment:" msgstr "Anexos:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:176 -msgid "There are no Important notes for this patient." -msgstr "Não há observações importantes para este paciente." +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:203 +msgid "There are no evolutions registered for this patient." +msgstr "Não há evoluções registradas para este paciente." -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:194 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:283 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:222 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:415 msgid "Edit" msgstr "Editar" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:213 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:241 msgid "Weight at birth: " msgstr "Peso ao nascer:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:215 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:243 msgid "grams" msgstr "gramas" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:221 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:249 msgid "APGAR: " msgstr "APGAR:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:234 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:262 msgid "Heart Test:" msgstr "Teste do coraçãozinho:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:244 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:272 msgid "Ear Test:" msgstr "Teste da orelinha:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:258 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:286 msgid "No postnatal data for this patient." msgstr "Não há dados de pós-natal para este paciente." -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:298 -msgid "Structured Physical:" -msgstr "Físico Estruturado" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:307 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:387 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:449 +msgid "Add" +msgstr "Adicionar" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:309 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:330 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:350 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:375 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:395 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:415 -msgid "Not send" -msgstr "Não enviado" - -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:320 -msgid "Vision:" -msgstr "Visão" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:343 +msgid "Date" +msgstr "Data" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:340 -msgid "Ear:" -msgstr "Audição" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:347 +msgid "Obs" +msgstr "Obs" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:365 -msgid "Heart:" -msgstr "Coração" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:364 +msgid "There are no exams registered for this patient." +msgstr "Não há exames registrados para este paciente." -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:385 -msgid "Muscle skeletal system:" -msgstr "Sistema músculo esquelético:" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:404 +msgid "Medicine" +msgstr "Remédio" #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:405 -msgid "Nervous System:" -msgstr "Sistema nervoso:" +msgid "Name" +msgstr "Nome" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:406 +msgid "Dosage" +msgstr "Dosagem" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:430 +msgid "There are no medicines registered for this patient." +msgstr "Não há observações importantes registradas para este paciente." -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:14 -msgid "New Medicine" -msgstr "Novo Remédio" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:466 +msgid "Complaint day" +msgstr "Dia da queixa" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:505 +msgid "There are no complaints registered for this patient." +msgstr "Não há queixas registradas para este paciente." +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:16 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_static_data_form.html:16 -#, fuzzy -#| msgid "Static Data" msgid "Update Static Data" -msgstr "Dados estáticos" +msgstr "Atualizar Dados estáticos" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_specific_exams_form.html:16 +msgid "Add Specific Exams" +msgstr "Adicionar Exames específicos" -#: drdown/medicalrecords/tests/test_medical_records_view.py:136 +#: drdown/medicalrecords/tests/test_medical_records_view.py:129 msgid "This field is required." msgstr "Este campo é obrigatório." +#~ msgid "Executed" +#~ msgstr "Relizado" + +#~ msgid "Collected" +#~ msgstr "Coletado" + +#~ msgid "Marked examination" +#~ msgstr "Marcado" + +#~ msgid "Status" +#~ msgstr "Status" + +#~ msgid "Exam Name" +#~ msgstr "Nome do exame" + +#~ msgid "Specific Exam" +#~ msgstr "Exame específico" + +#~ msgid "Important notes" +#~ msgstr "Observações importantes" + +#~ msgid "Important Notes" +#~ msgstr "Observações importantes" + +#~ msgid "Structured Physical:" +#~ msgstr "Físico Estruturado" + +#~ msgid "Not send" +#~ msgstr "Não enviado" + +#~ msgid "Vision:" +#~ msgstr "Visão" + +#~ msgid "Ear:" +#~ msgstr "Audição" + +#~ msgid "Heart:" +#~ msgstr "Coração" + +#~ msgid "Muscle skeletal system:" +#~ msgstr "Sistema músculo esquelético:" + +#~ msgid "Nervous System:" +#~ msgstr "Sistema nervoso:" + #~ msgid "data" #~ msgstr "dados" diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html index 8ca2b71c..9f3acf81 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html @@ -13,7 +13,7 @@
    -

    {% trans 'Add Specific Exams' %}

    +

    {% trans 'Add Exam' %}

    diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html index ceb5f356..22295fa2 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html @@ -200,7 +200,7 @@
    {% empty %} -

    {% trans 'There are no Evolution for this patient.'%}

    +

    {% trans 'There are no evolutions registered for this patient.'%}

    {% endfor %}
    From 5e33904834e89a72ace63446d20c802a3e409c3f Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 16:48:33 -0300 Subject: [PATCH 27/48] Changes in model Add a new field to medicine model Make changes in view and template to show the field Co-authored-by: joberth rogers --- drdown/medicalrecords/forms/medicines_forms.py | 7 ++++++- .../0006_medicine_medicine_use_interval.py | 18 ++++++++++++++++++ .../medicalrecords/models/model_medicines.py | 6 ++++++ .../medicalrecords/medicalrecord_list.html | 4 ++++ .../medicalrecord_medicine_form.html | 2 +- 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 drdown/medicalrecords/migrations/0006_medicine_medicine_use_interval.py diff --git a/drdown/medicalrecords/forms/medicines_forms.py b/drdown/medicalrecords/forms/medicines_forms.py index 870cdff1..43a8930a 100644 --- a/drdown/medicalrecords/forms/medicines_forms.py +++ b/drdown/medicalrecords/forms/medicines_forms.py @@ -6,4 +6,9 @@ class MedicineForm(forms.ModelForm): class Meta: model = Medicine - fields = ["medicine_name", "medicine_dosage", "medicine_in_use"] + fields = [ + "medicine_name", + "medicine_dosage", + "medicine_use_interval", + "medicine_in_use", + ] diff --git a/drdown/medicalrecords/migrations/0006_medicine_medicine_use_interval.py b/drdown/medicalrecords/migrations/0006_medicine_medicine_use_interval.py new file mode 100644 index 00000000..1f14c827 --- /dev/null +++ b/drdown/medicalrecords/migrations/0006_medicine_medicine_use_interval.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-05-15 19:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('medicalrecords', '0005_auto_20180515_1802'), + ] + + operations = [ + migrations.AddField( + model_name='medicine', + name='medicine_use_interval', + field=models.CharField(default='', max_length=50, verbose_name='Time between uses'), + ), + ] diff --git a/drdown/medicalrecords/models/model_medicines.py b/drdown/medicalrecords/models/model_medicines.py index 6f888644..c6c6a3f3 100644 --- a/drdown/medicalrecords/models/model_medicines.py +++ b/drdown/medicalrecords/models/model_medicines.py @@ -27,6 +27,12 @@ class Medicine(models.Model): help_text=_('Does the patient still use this medication?') ) + medicine_use_interval = models.CharField( + _('Time between uses'), + max_length=50, + default="" + ) + author = models.ForeignKey( HealthTeam, on_delete=models.CASCADE, diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html index 22295fa2..fe083ad6 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html @@ -404,6 +404,7 @@

    {% trans 'Patient Medicine' %}

    {% trans 'Medicine' %} {% trans 'Name' %} {% trans 'Dosage' %} + {% trans 'Time between uses' %} {% trans 'In use?' %} @@ -416,6 +417,9 @@

    {% trans 'Patient Medicine' %}

    {{medicine.medicine_name}} {{medicine.medicine_dosage}} + + {{medicine.medicine_use_interval}} + diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html index ede946cf..93c27cb2 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html @@ -13,7 +13,7 @@
    -

    {% trans 'Update Static Data' %}

    +

    {% trans 'Medicine' %}

    From 803b8c4750ae376081cd0f306d4a41008a590c7f Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 16:49:28 -0300 Subject: [PATCH 28/48] Improving code quality Apply code style on some code parts Co-authored-by: joberth rogers --- drdown/medicalrecords/models/model_exams.py | 2 +- drdown/medicalrecords/views/view_medical_record.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drdown/medicalrecords/models/model_exams.py b/drdown/medicalrecords/models/model_exams.py index df808138..27dda9df 100644 --- a/drdown/medicalrecords/models/model_exams.py +++ b/drdown/medicalrecords/models/model_exams.py @@ -44,7 +44,7 @@ class Exam(models.Model): observations = models.CharField( _('Observations'), max_length=200, - blank=True, + blank=True, default="" ) diff --git a/drdown/medicalrecords/views/view_medical_record.py b/drdown/medicalrecords/views/view_medical_record.py index 983a480f..98117498 100644 --- a/drdown/medicalrecords/views/view_medical_record.py +++ b/drdown/medicalrecords/views/view_medical_record.py @@ -61,7 +61,7 @@ def get_context_data(self, **kwargs): context['complaints'] = complaints context['medicines'] = medicines context['staticdata'] = staticdata - + context['medicalrecordlist'] = context['object_list'].filter( patient=patient ) From 260de05851bb3b04193e6c29bdb77563b360f402 Mon Sep 17 00:00:00 2001 From: guilherme1guy Date: Tue, 15 May 2018 16:52:33 -0300 Subject: [PATCH 29/48] Update translation Adds missing translations Co-authored-by: joberth rogers --- .../locale/pt_BR/LC_MESSAGES/django.po | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po b/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po index 5d59699a..6089b458 100644 --- a/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po +++ b/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-15 18:00+0000\n" +"POT-Creation-Date: 2018-05-15 19:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ msgstr "Prontuário" #: drdown/medicalrecords/models/model_medical_record.py:14 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:154 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:180 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:492 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:496 msgid "Created at" msgstr "Criado em" @@ -66,12 +66,12 @@ msgstr "Descrição da queixa" #: drdown/medicalrecords/models/model_complaint.py:40 #: drdown/medicalrecords/models/model_medical_record.py:34 -#: drdown/medicalrecords/models/model_medicines.py:33 +#: drdown/medicalrecords/models/model_medicines.py:39 #: drdown/medicalrecords/models/model_static_data.py:39 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:154 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:175 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:466 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:487 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:470 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:491 msgid "Author" msgstr "Autor" @@ -81,7 +81,7 @@ msgstr "Queixa" #: drdown/medicalrecords/models/model_complaint.py:45 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:77 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:445 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:449 msgid "Complaints" msgstr "Queixas" @@ -176,7 +176,7 @@ msgid "Medicine dosage" msgstr "Dosagem do remédio" #: drdown/medicalrecords/models/model_medicines.py:26 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:407 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:408 msgid "In use?" msgstr "Em uso?" @@ -184,7 +184,12 @@ msgstr "Em uso?" msgid "Does the patient still use this medication?" msgstr "O paciente ainda usa esse medicamento?" -#: drdown/medicalrecords/models/model_medicines.py:40 +#: drdown/medicalrecords/models/model_medicines.py:31 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:407 +msgid "Time between uses" +msgstr "Tempo entre usos" + +#: drdown/medicalrecords/models/model_medicines.py:46 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:73 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:383 msgid "Patient Medicine" @@ -317,7 +322,7 @@ msgid "There are no evolutions registered for this patient." msgstr "Não há evoluções registradas para este paciente." #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:222 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:415 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:416 msgid "Edit" msgstr "Editar" @@ -347,7 +352,7 @@ msgstr "Não há dados de pós-natal para este paciente." #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:307 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:387 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:449 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:453 msgid "Add" msgstr "Adicionar" @@ -364,6 +369,7 @@ msgid "There are no exams registered for this patient." msgstr "Não há exames registrados para este paciente." #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:404 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:16 msgid "Medicine" msgstr "Remédio" @@ -375,27 +381,26 @@ msgstr "Nome" msgid "Dosage" msgstr "Dosagem" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:430 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:434 msgid "There are no medicines registered for this patient." msgstr "Não há observações importantes registradas para este paciente." -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:466 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:470 msgid "Complaint day" msgstr "Dia da queixa" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:505 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:509 msgid "There are no complaints registered for this patient." msgstr "Não há queixas registradas para este paciente." -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:16 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_static_data_form.html:16 -msgid "Update Static Data" -msgstr "Atualizar Dados estáticos" - #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_specific_exams_form.html:16 msgid "Add Specific Exams" msgstr "Adicionar Exames específicos" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_static_data_form.html:16 +msgid "Update Static Data" +msgstr "Atualizar Dados estáticos" + #: drdown/medicalrecords/tests/test_medical_records_view.py:129 msgid "This field is required." msgstr "Este campo é obrigatório." From 6398fa2e6847c54c9d0288d931002d43058006ba Mon Sep 17 00:00:00 2001 From: GeovanaRamos Date: Tue, 15 May 2018 17:25:34 -0300 Subject: [PATCH 30/48] Adding password as parameter option Adding if block to create_password Adding makefile command Co-authored-by: Elias Bernardo --- Makefile | 4 ++++ utility/populate.py | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5c5aa6eb..b7071b7e 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,10 @@ populate: manage.py # Populate the database sudo docker-compose -f ${file} run --rm ${container} python utility/populate.py +populate-dev: manage.py + # Populate the database + sudo docker-compose -f ${file} run --rm ${container} python utility/populate.py goiaba10 + # TESTS -------------------------------------------------------- local := "**/tests/" diff --git a/utility/populate.py b/utility/populate.py index 261ea56a..be6540b9 100644 --- a/utility/populate.py +++ b/utility/populate.py @@ -8,10 +8,13 @@ def create_password(): ''' - Generates random passwords for each user + Generates passwords for each user ''' - password = ''.join(random.choice(string.ascii_uppercase + + if len(sys.argv) > 1: + password = sys.argv[1] + else: + password = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(9) ) From b16e09f55414b3f5ee1832368e18cb51ba8647e2 Mon Sep 17 00:00:00 2001 From: Gabriela Medeiros Date: Tue, 15 May 2018 20:43:37 -0300 Subject: [PATCH 31/48] Editing vaccine shedule page Decreasing table caption size Co-authored-by: Daniel Maike --- drdown/core/static/core/css/vaccineshedule.css | 5 +++++ drdown/core/templates/core/vaccine_schedule.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drdown/core/static/core/css/vaccineshedule.css b/drdown/core/static/core/css/vaccineshedule.css index f76f6eba..59433c26 100644 --- a/drdown/core/static/core/css/vaccineshedule.css +++ b/drdown/core/static/core/css/vaccineshedule.css @@ -62,3 +62,8 @@ .mt-13{ margin-top:10rem; } + +.size-sm{ + height: 3em; + width: auto; +} \ No newline at end of file diff --git a/drdown/core/templates/core/vaccine_schedule.html b/drdown/core/templates/core/vaccine_schedule.html index 0fb9d862..5f1b347e 100644 --- a/drdown/core/templates/core/vaccine_schedule.html +++ b/drdown/core/templates/core/vaccine_schedule.html @@ -403,6 +403,6 @@ - + {% endblock content %} From 9ae62b3dc264a0295131146b9cda4156600f882a Mon Sep 17 00:00:00 2001 From: Gabriela Medeiros Date: Tue, 15 May 2018 21:35:13 -0300 Subject: [PATCH 32/48] Editing code details Indenting code Deleting unused lines Co-authored-by: Daniel Maike --- .../core/static/core/css/vaccineshedule.css | 1 - .../core/templates/core/vaccine_schedule.html | 711 +++++++++--------- 2 files changed, 350 insertions(+), 362 deletions(-) diff --git a/drdown/core/static/core/css/vaccineshedule.css b/drdown/core/static/core/css/vaccineshedule.css index 59433c26..4074bbf4 100644 --- a/drdown/core/static/core/css/vaccineshedule.css +++ b/drdown/core/static/core/css/vaccineshedule.css @@ -10,7 +10,6 @@ max-height:150px; width: auto; height: auto; - } .margintoleft{ diff --git a/drdown/core/templates/core/vaccine_schedule.html b/drdown/core/templates/core/vaccine_schedule.html index 5f1b347e..194e0c0c 100644 --- a/drdown/core/templates/core/vaccine_schedule.html +++ b/drdown/core/templates/core/vaccine_schedule.html @@ -5,14 +5,12 @@ - + - - - + {% endblock css %} {% block content %} @@ -30,379 +28,370 @@ {% trans 'FROM 9 YEARS OLD'%}

    • - -
    - - {% endblock content %} From 328716de3df059dd0a40fed0f1c10c46c33c77fc Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Wed, 16 May 2018 08:07:27 -0300 Subject: [PATCH 33/48] Adding the version 1.0 of the roadmap Fixing the roadmap; Adding the sprints 13, 14 and 15 on roadmap Co-authored-by: Joao Pedro Sconetto --- docs/eps/ROADMAP.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/eps/ROADMAP.md b/docs/eps/ROADMAP.md index 13679f8a..54f1bf2b 100644 --- a/docs/eps/ROADMAP.md +++ b/docs/eps/ROADMAP.md @@ -6,9 +6,10 @@ |28/03/2018|0.0.2|Segunda Versão do Roadmap|João Pedro Sconetto| |15/04/2018|0.0.3|Terceira Versão do Roadmap|Mariana de Souza Mendes| |20/04/2018|0.0.4|Quarta Versão do Roadmap|Mariana de Souza Mendes e João Pedro Sconetto| +|16/05/2018|1.0.0|Quinta Versão do Roadmap|Mariana de Souza Mendes e João Pedro Sconetto| -## v0.0.4 +## v1.0.0 -![ROADMAP.png](https://uploaddeimagens.com.br/images/001/382/379/original/ROADMAP_%282%29.png?1524243987) +![ROADMAP.png](https://uploaddeimagens.com.br/images/001/419/978/original/ROADMAP.png?1526468685) -[Clique aqui para ampliar a imagem](https://uploaddeimagens.com.br/images/001/382/379/original/ROADMAP_%282%29.png?1524243987) \ No newline at end of file +[Clique aqui para ampliar a imagem](https://uploaddeimagens.com.br/images/001/419/978/original/ROADMAP.png?1526468685) \ No newline at end of file From ea376e27cec01b63b2104c4e36d19fcbf9029f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Fran=C3=A7a?= Date: Wed, 16 May 2018 21:39:02 -0300 Subject: [PATCH 34/48] Improving the Sprint's 9 documentation Improve the change's section of planning documentation Improve the Scrum Master's analysis of results documentation --- docs/sprints/09/planning.md | 3 +-- docs/sprints/09/results.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/sprints/09/planning.md b/docs/sprints/09/planning.md index e9da4408..62b42d2a 100644 --- a/docs/sprints/09/planning.md +++ b/docs/sprints/09/planning.md @@ -52,10 +52,9 @@ Tendo em vista o cansaço em virtude de uma das histórias da sprint passada, e Para fechar esta sprint, também haverão histórias técnicas de documentação e para homogeneizar o frontend da aplicação. - ## 5. Mudanças -Para esta sprint, ainda trabalhando a questão da pontuação das histórias, decidimos que usaremos histórias do tipo CRUD como referência para pontuações. Uma história com o mesmo nível de complexidade desta vale 5 pontos. Caso seja mais fácil, será pontuada com menos e se for mais difícil com mais do que 5 pontos. +Para esta sprint, ainda trabalhando a questão da pontuação das histórias, decidimos que usaremos histórias do tipo CRUD como referência para pontuações. Uma história com o mesmo nível de esforço desta vale 5 pontos. Caso seja mais fácil, será pontuada com menos e se for mais difícil com mais do que 5 pontos. Outro fator a ser considerado para pontuar as histórias, além desse esforço, é quantas horas de trabalho são estimadas para concluí-las, ou seja, o quanto serão trabalhosas. Outra mudança foi adiantar histórias mais complexas que ficariam para a Sprint 10 para esta, já que na próxima semana os membros de MDS terão avaliações e trabalhos de outras matérias. diff --git a/docs/sprints/09/results.md b/docs/sprints/09/results.md index 1472615b..9d7ac5e6 100644 --- a/docs/sprints/09/results.md +++ b/docs/sprints/09/results.md @@ -61,4 +61,4 @@ Com relação à questão de problemas com o entendimento dos critérios de acei Sobre a questão da dificuldade de refatorar o código de outros membros e a sugestão de melhoria de que algum dos envolvidos com a confecção do código original estejam na refatoração, chegamos à conclusão de que a melhoria proposta não é a melhor saída para resolver este problema. Ao invés disso, combinamos de tomar um maior cuidado com o código que é feito e fazer uso de comentários para deixar claro o que trechos mais complexos estão fazendo, tornando mais fácil a manutenibilidade. -Por fim, a questão do cliente indisponível ou então respondendo e marcando as coisas em cima da hora continua, fazendo com que nós continuemos sem poder contar muito com ele. +Por fim, a questão do cliente indisponível ou então respondendo e marcando as coisas em cima da hora continua, fazendo com que nós continuemos sem poder contar muito com ele. Desta forma, continuaremos fazendo como temos até então de tomar as decisões em grupo e nos basear nos documentos e informações que temos a disposição. From 75c80404e5747ee9758dbd8e27a272fa9da370b5 Mon Sep 17 00:00:00 2001 From: Gabriela Medeiros Date: Wed, 16 May 2018 22:12:38 -0300 Subject: [PATCH 35/48] Editing translation file Adding table translation Co-authored-by: Daniel Maike --- .../core/locale/pt_BR/LC_MESSAGES/django.po | 503 +++++++++--------- 1 file changed, 250 insertions(+), 253 deletions(-) diff --git a/drdown/core/locale/pt_BR/LC_MESSAGES/django.po b/drdown/core/locale/pt_BR/LC_MESSAGES/django.po index 57c8f1a2..1f8ed6d5 100644 --- a/drdown/core/locale/pt_BR/LC_MESSAGES/django.po +++ b/drdown/core/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-04 10:24+0000\n" +"POT-Creation-Date: 2018-05-17 01:08+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,43 +31,43 @@ msgstr "Esta conta está inativa" msgid "Account" msgstr "Conta" -#: drdown/core/templates/account/email.html:10 +#: drdown/core/templates/account/email.html:11 msgid "E-mail Addresses" msgstr "Endereços de e-mail" -#: drdown/core/templates/account/email.html:13 +#: drdown/core/templates/account/email.html:15 msgid "The following e-mail addresses are associated with your account:" msgstr "Os seguintes endereços de e-mail estão associados com a sua conta" -#: drdown/core/templates/account/email.html:27 +#: drdown/core/templates/account/email.html:32 msgid "Verified" msgstr "Verificado" -#: drdown/core/templates/account/email.html:29 +#: drdown/core/templates/account/email.html:34 msgid "Unverified" msgstr "Não verificado" -#: drdown/core/templates/account/email.html:31 +#: drdown/core/templates/account/email.html:37 msgid "Primary" msgstr "Primário" -#: drdown/core/templates/account/email.html:37 +#: drdown/core/templates/account/email.html:46 msgid "Make Primary" msgstr "Fazer Primário" -#: drdown/core/templates/account/email.html:38 +#: drdown/core/templates/account/email.html:47 msgid "Re-send Verification" msgstr "Reenviar verificação" -#: drdown/core/templates/account/email.html:39 +#: drdown/core/templates/account/email.html:48 msgid "Remove" msgstr "Remover" -#: drdown/core/templates/account/email.html:46 +#: drdown/core/templates/account/email.html:56 msgid "Warning:" msgstr "Atenção:" -#: drdown/core/templates/account/email.html:46 +#: drdown/core/templates/account/email.html:56 msgid "" "You currently do not have any e-mail address set up. You should really add " "an e-mail address so you can receive notifications, reset your password, etc." @@ -75,15 +75,15 @@ msgstr "" "No momento, você não tem um e-mail cadastrado. Você realmente deve adicionar " "um e-mail para poder receber notificações, trocar sua senha e etc." -#: drdown/core/templates/account/email.html:51 +#: drdown/core/templates/account/email.html:62 msgid "Add E-mail Address" msgstr "Adicionar endereço de e-mail" -#: drdown/core/templates/account/email.html:56 +#: drdown/core/templates/account/email.html:70 msgid "Add E-mail" msgstr "Adicionar e-mail" -#: drdown/core/templates/account/email.html:66 +#: drdown/core/templates/account/email.html:84 msgid "Do you really want to remove the selected e-mail address?" msgstr "Você realmente deseja remover o endereço de e-mail selecionado?" @@ -425,36 +425,36 @@ msgstr "Consultas" msgid "Edit Profile" msgstr "Editar Perfil" -#: drdown/core/templates/core/base.html:104 +#: drdown/core/templates/core/base.html:105 msgid "Help" msgstr "Ajuda" -#: drdown/core/templates/core/base.html:105 +#: drdown/core/templates/core/base.html:106 msgid "Log out" msgstr "Sair" -#: drdown/core/templates/core/base.html:110 +#: drdown/core/templates/core/base.html:111 msgid "Sign in" msgstr "Entrar" -#: drdown/core/templates/core/base.html:113 +#: drdown/core/templates/core/base.html:114 msgid "Sign up" msgstr "Cadastrar" -#: drdown/core/templates/core/base.html:141 +#: drdown/core/templates/core/base.html:142 msgid "Centro de Referência Interdisciplinar em Síndrome de Down" msgstr "Centro de Referência Interdisciplinar em Síndrome de Down" -#: drdown/core/templates/core/base.html:142 +#: drdown/core/templates/core/base.html:143 msgid "Location: HRAN - Setor Hospitalar Norte, quadra 1, bloco A, Asa Norte" msgstr "" "Localização: HRAN - Setor Hospitalar Norte, quadra 1, bloco A, Asa Norte" -#: drdown/core/templates/core/base.html:143 +#: drdown/core/templates/core/base.html:144 msgid "Phone: 3325-4219" msgstr "Telefone: 3325-4219" -#: drdown/core/templates/core/base.html:151 +#: drdown/core/templates/core/base.html:152 msgid "Copyright © Dr. Down 2018" msgstr "Copyright © Dr. Down 2018" @@ -490,8 +490,7 @@ msgstr "" "lugar especializado no cuidado e acompanhamento de pacientes portadores de " "Síndrome de Down." -#: drdown/core/templates/core/home.html:67 -#| msgid "CRIS DOWN" +#: drdown/core/templates/core/home.html:48 msgid "CRIS Down " msgstr "CRIS DOWN" @@ -663,7 +662,7 @@ msgid "Further reading" msgstr "Leituras complementares" #: drdown/core/templates/core/info.html:144 -#: drdown/core/templates/core/vaccine_schedule.html:19 +#: drdown/core/templates/core/vaccine_schedule.html:18 #, fuzzy #| msgid "My Schedule" msgid "Vaccine Schedule" @@ -679,282 +678,286 @@ msgstr "Anterior" msgid "Next" msgstr "Próximo" -#: drdown/core/templates/core/vaccination_locations.html:25 -#: drdown/core/templates/core/vaccine_schedule.html:20 -#| msgid "Locations" +#: drdown/core/templates/core/vaccination_locations.html:26 +#: drdown/core/templates/core/vaccine_schedule.html:19 msgid "Vaccination Locations" msgstr "Locais de Vacinação" -#: drdown/core/templates/core/vaccination_locations.html:33 -#: drdown/core/templates/core/vaccination_locations.html:79 -#: drdown/core/templates/core/vaccination_locations.html:110 -#: drdown/core/templates/core/vaccination_locations.html:128 -#: drdown/core/templates/core/vaccination_locations.html:146 -#: drdown/core/templates/core/vaccination_locations.html:212 -#: drdown/core/templates/core/vaccination_locations.html:230 -#: drdown/core/templates/core/vaccination_locations.html:248 -#: drdown/core/templates/core/vaccination_locations.html:278 -#: drdown/core/templates/core/vaccination_locations.html:316 -#: drdown/core/templates/core/vaccination_locations.html:346 -#: drdown/core/templates/core/vaccination_locations.html:368 +#: drdown/core/templates/core/vaccination_locations.html:35 +#: drdown/core/templates/core/vaccination_locations.html:83 +#: drdown/core/templates/core/vaccination_locations.html:116 +#: drdown/core/templates/core/vaccination_locations.html:134 +#: drdown/core/templates/core/vaccination_locations.html:154 +#: drdown/core/templates/core/vaccination_locations.html:222 +#: drdown/core/templates/core/vaccination_locations.html:242 +#: drdown/core/templates/core/vaccination_locations.html:262 +#: drdown/core/templates/core/vaccination_locations.html:294 +#: drdown/core/templates/core/vaccination_locations.html:334 +#: drdown/core/templates/core/vaccination_locations.html:366 #: drdown/core/templates/core/vaccination_locations.html:390 -#: drdown/core/templates/core/vaccination_locations.html:412 -#: drdown/core/templates/core/vaccination_locations.html:430 -#: drdown/core/templates/core/vaccination_locations.html:452 -#: drdown/core/templates/core/vaccination_locations.html:530 -#: drdown/core/templates/core/vaccination_locations.html:552 -#: drdown/core/templates/core/vaccination_locations.html:570 -#: drdown/core/templates/core/vaccination_locations.html:592 -#: drdown/core/templates/core/vaccination_locations.html:622 -#: drdown/core/templates/core/vaccination_locations.html:644 -#: drdown/core/templates/core/vaccination_locations.html:694 +#: drdown/core/templates/core/vaccination_locations.html:414 +#: drdown/core/templates/core/vaccination_locations.html:438 +#: drdown/core/templates/core/vaccination_locations.html:458 +#: drdown/core/templates/core/vaccination_locations.html:482 +#: drdown/core/templates/core/vaccination_locations.html:562 +#: drdown/core/templates/core/vaccination_locations.html:586 +#: drdown/core/templates/core/vaccination_locations.html:606 +#: drdown/core/templates/core/vaccination_locations.html:630 +#: drdown/core/templates/core/vaccination_locations.html:661 +#: drdown/core/templates/core/vaccination_locations.html:684 +#: drdown/core/templates/core/vaccination_locations.html:735 msgid "Local" msgstr "Local" -#: drdown/core/templates/core/vaccination_locations.html:34 -#: drdown/core/templates/core/vaccination_locations.html:80 -#: drdown/core/templates/core/vaccination_locations.html:111 -#: drdown/core/templates/core/vaccination_locations.html:129 -#: drdown/core/templates/core/vaccination_locations.html:147 -#: drdown/core/templates/core/vaccination_locations.html:213 -#: drdown/core/templates/core/vaccination_locations.html:231 -#: drdown/core/templates/core/vaccination_locations.html:249 -#: drdown/core/templates/core/vaccination_locations.html:279 -#: drdown/core/templates/core/vaccination_locations.html:317 -#: drdown/core/templates/core/vaccination_locations.html:347 -#: drdown/core/templates/core/vaccination_locations.html:369 +#: drdown/core/templates/core/vaccination_locations.html:36 +#: drdown/core/templates/core/vaccination_locations.html:84 +#: drdown/core/templates/core/vaccination_locations.html:117 +#: drdown/core/templates/core/vaccination_locations.html:135 +#: drdown/core/templates/core/vaccination_locations.html:155 +#: drdown/core/templates/core/vaccination_locations.html:223 +#: drdown/core/templates/core/vaccination_locations.html:243 +#: drdown/core/templates/core/vaccination_locations.html:263 +#: drdown/core/templates/core/vaccination_locations.html:295 +#: drdown/core/templates/core/vaccination_locations.html:335 +#: drdown/core/templates/core/vaccination_locations.html:367 #: drdown/core/templates/core/vaccination_locations.html:391 -#: drdown/core/templates/core/vaccination_locations.html:413 -#: drdown/core/templates/core/vaccination_locations.html:431 -#: drdown/core/templates/core/vaccination_locations.html:453 -#: drdown/core/templates/core/vaccination_locations.html:531 -#: drdown/core/templates/core/vaccination_locations.html:553 -#: drdown/core/templates/core/vaccination_locations.html:571 -#: drdown/core/templates/core/vaccination_locations.html:593 -#: drdown/core/templates/core/vaccination_locations.html:623 -#: drdown/core/templates/core/vaccination_locations.html:645 -#: drdown/core/templates/core/vaccination_locations.html:695 +#: drdown/core/templates/core/vaccination_locations.html:415 +#: drdown/core/templates/core/vaccination_locations.html:439 +#: drdown/core/templates/core/vaccination_locations.html:459 +#: drdown/core/templates/core/vaccination_locations.html:483 +#: drdown/core/templates/core/vaccination_locations.html:563 +#: drdown/core/templates/core/vaccination_locations.html:587 +#: drdown/core/templates/core/vaccination_locations.html:607 +#: drdown/core/templates/core/vaccination_locations.html:631 +#: drdown/core/templates/core/vaccination_locations.html:662 +#: drdown/core/templates/core/vaccination_locations.html:685 +#: drdown/core/templates/core/vaccination_locations.html:736 msgid "Phone" msgstr "Telefone" -#: drdown/core/templates/core/vaccine_schedule.html:26 -#: drdown/core/templates/core/vaccine_schedule.html:225 -#: drdown/core/templates/core/vaccine_schedule.html:267 -#: drdown/core/templates/core/vaccine_schedule.html:376 -msgid "Vaccines" -msgstr "Vacinas" - -#: drdown/core/templates/core/vaccine_schedule.html:26 -#: drdown/core/templates/core/vaccine_schedule.html:244 -#| msgid "OF BIRTH TO THE 10 YEARS OF AGE" +#: drdown/core/templates/core/vaccine_schedule.html:25 +#: drdown/core/templates/core/vaccine_schedule.html:40 +#: drdown/core/templates/core/vaccine_schedule.html:256 msgid "OF BIRTH TO THE 6 YEARS OF AGE" msgstr "DO NASCIMENTO AOS 6 ANOS DE IDADE" -#: drdown/core/templates/core/vaccine_schedule.html:30 -#: drdown/core/templates/core/vaccine_schedule.html:225 +#: drdown/core/templates/core/vaccine_schedule.html:28 +#| msgid "9 TO 10 YEARS OLD" +msgid "FROM 9 YEARS OLD" +msgstr "9 ATÉ 10 ANOS DE IDADE" + +#: drdown/core/templates/core/vaccine_schedule.html:39 +#: drdown/core/templates/core/vaccine_schedule.html:236 +#: drdown/core/templates/core/vaccine_schedule.html:269 +#: drdown/core/templates/core/vaccine_schedule.html:377 +msgid "Vaccines" +msgstr "Vacinas" + +#: drdown/core/templates/core/vaccine_schedule.html:43 +#: drdown/core/templates/core/vaccine_schedule.html:237 msgid "At Birth" msgstr "Ao Nascer" -#: drdown/core/templates/core/vaccine_schedule.html:31 -#: drdown/core/templates/core/vaccine_schedule.html:226 +#: drdown/core/templates/core/vaccine_schedule.html:44 +#: drdown/core/templates/core/vaccine_schedule.html:238 msgid "1 Month" msgstr "1 Mês" -#: drdown/core/templates/core/vaccine_schedule.html:32 -#: drdown/core/templates/core/vaccine_schedule.html:227 +#: drdown/core/templates/core/vaccine_schedule.html:45 +#: drdown/core/templates/core/vaccine_schedule.html:239 msgid "2 Months" msgstr "2 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:33 -#: drdown/core/templates/core/vaccine_schedule.html:228 +#: drdown/core/templates/core/vaccine_schedule.html:46 +#: drdown/core/templates/core/vaccine_schedule.html:240 msgid "3 Months" msgstr "3 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:34 -#: drdown/core/templates/core/vaccine_schedule.html:229 +#: drdown/core/templates/core/vaccine_schedule.html:47 +#: drdown/core/templates/core/vaccine_schedule.html:241 msgid "4 Months" msgstr "4 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:35 -#: drdown/core/templates/core/vaccine_schedule.html:230 +#: drdown/core/templates/core/vaccine_schedule.html:48 +#: drdown/core/templates/core/vaccine_schedule.html:242 msgid "5 Months" msgstr "5 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:36 -#: drdown/core/templates/core/vaccine_schedule.html:231 +#: drdown/core/templates/core/vaccine_schedule.html:49 +#: drdown/core/templates/core/vaccine_schedule.html:243 msgid "6 Months" msgstr "6 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:37 -#: drdown/core/templates/core/vaccine_schedule.html:232 +#: drdown/core/templates/core/vaccine_schedule.html:50 +#: drdown/core/templates/core/vaccine_schedule.html:244 msgid "7 Months" msgstr "7 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:38 -#: drdown/core/templates/core/vaccine_schedule.html:233 +#: drdown/core/templates/core/vaccine_schedule.html:51 +#: drdown/core/templates/core/vaccine_schedule.html:245 msgid "8 Months" msgstr "8 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:39 -#: drdown/core/templates/core/vaccine_schedule.html:234 +#: drdown/core/templates/core/vaccine_schedule.html:52 +#: drdown/core/templates/core/vaccine_schedule.html:246 msgid "9 Months" msgstr "9 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:40 -#: drdown/core/templates/core/vaccine_schedule.html:235 +#: drdown/core/templates/core/vaccine_schedule.html:53 +#: drdown/core/templates/core/vaccine_schedule.html:247 msgid "12 Months" msgstr "12 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:41 -#: drdown/core/templates/core/vaccine_schedule.html:236 +#: drdown/core/templates/core/vaccine_schedule.html:54 +#: drdown/core/templates/core/vaccine_schedule.html:248 msgid "15 Months" msgstr "15 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:42 -#: drdown/core/templates/core/vaccine_schedule.html:237 +#: drdown/core/templates/core/vaccine_schedule.html:55 +#: drdown/core/templates/core/vaccine_schedule.html:249 msgid "18 Months" msgstr "18 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:43 -#: drdown/core/templates/core/vaccine_schedule.html:238 +#: drdown/core/templates/core/vaccine_schedule.html:56 +#: drdown/core/templates/core/vaccine_schedule.html:250 msgid "24 Months" msgstr "24 Meses" -#: drdown/core/templates/core/vaccine_schedule.html:44 -#: drdown/core/templates/core/vaccine_schedule.html:239 +#: drdown/core/templates/core/vaccine_schedule.html:57 +#: drdown/core/templates/core/vaccine_schedule.html:251 msgid "4 Years" msgstr "4 Anos" -#: drdown/core/templates/core/vaccine_schedule.html:45 -#: drdown/core/templates/core/vaccine_schedule.html:240 +#: drdown/core/templates/core/vaccine_schedule.html:58 +#: drdown/core/templates/core/vaccine_schedule.html:252 msgid "5 Years" msgstr "5 Anos" -#: drdown/core/templates/core/vaccine_schedule.html:46 -#: drdown/core/templates/core/vaccine_schedule.html:241 +#: drdown/core/templates/core/vaccine_schedule.html:59 +#: drdown/core/templates/core/vaccine_schedule.html:253 msgid "6 Years" msgstr "6 Anos" -#: drdown/core/templates/core/vaccine_schedule.html:52 -#: drdown/core/templates/core/vaccine_schedule.html:283 +#: drdown/core/templates/core/vaccine_schedule.html:64 +#: drdown/core/templates/core/vaccine_schedule.html:285 msgid "BCG ID" msgstr "BCG ID" -#: drdown/core/templates/core/vaccine_schedule.html:53 -#: drdown/core/templates/core/vaccine_schedule.html:365 +#: drdown/core/templates/core/vaccine_schedule.html:65 +#: drdown/core/templates/core/vaccine_schedule.html:367 msgid "One dose" msgstr "Uma dose" -#: drdown/core/templates/core/vaccine_schedule.html:54 -#: drdown/core/templates/core/vaccine_schedule.html:60 -#: drdown/core/templates/core/vaccine_schedule.html:83 -#: drdown/core/templates/core/vaccine_schedule.html:168 -#: drdown/core/templates/core/vaccine_schedule.html:198 -#: drdown/core/templates/core/vaccine_schedule.html:288 -#: drdown/core/templates/core/vaccine_schedule.html:334 -#: drdown/core/templates/core/vaccine_schedule.html:344 -#: drdown/core/templates/core/vaccine_schedule.html:350 +#: drdown/core/templates/core/vaccine_schedule.html:66 +#: drdown/core/templates/core/vaccine_schedule.html:72 +#: drdown/core/templates/core/vaccine_schedule.html:95 +#: drdown/core/templates/core/vaccine_schedule.html:180 +#: drdown/core/templates/core/vaccine_schedule.html:210 +#: drdown/core/templates/core/vaccine_schedule.html:290 +#: drdown/core/templates/core/vaccine_schedule.html:336 +#: drdown/core/templates/core/vaccine_schedule.html:346 +#: drdown/core/templates/core/vaccine_schedule.html:352 msgid "Vaccinate the previously unvaccinated" msgstr "Vacinar os não vacinados anteriormente" -#: drdown/core/templates/core/vaccine_schedule.html:55 -#: drdown/core/templates/core/vaccine_schedule.html:284 +#: drdown/core/templates/core/vaccine_schedule.html:67 +#: drdown/core/templates/core/vaccine_schedule.html:286 msgid "Vaccinate people who contacted leprosy" msgstr "Vacinar pessoas contactantes de hanseníase" -#: drdown/core/templates/core/vaccine_schedule.html:58 -#: drdown/core/templates/core/vaccine_schedule.html:287 +#: drdown/core/templates/core/vaccine_schedule.html:70 +#: drdown/core/templates/core/vaccine_schedule.html:289 msgid "Hepatitis B" msgstr "Hepatite B" -#: drdown/core/templates/core/vaccine_schedule.html:59 +#: drdown/core/templates/core/vaccine_schedule.html:71 msgid "Three or four doses from birth" msgstr "Três ou quatro doses a partir do nascimento" -#: drdown/core/templates/core/vaccine_schedule.html:63 -#: drdown/core/templates/core/vaccine_schedule.html:291 +#: drdown/core/templates/core/vaccine_schedule.html:75 +#: drdown/core/templates/core/vaccine_schedule.html:293 msgid "Rotavirus" msgstr "Rotavírus" -#: drdown/core/templates/core/vaccine_schedule.html:66 +#: drdown/core/templates/core/vaccine_schedule.html:78 msgid "Two or three doses. Initiate vaccination before 15 weeks of age" msgstr "Duas ou três doses. Iniciar vacinação antes das 15 semanas de vida" -#: drdown/core/templates/core/vaccine_schedule.html:67 -#: drdown/core/templates/core/vaccine_schedule.html:219 -#: drdown/core/templates/core/vaccine_schedule.html:292 -#: drdown/core/templates/core/vaccine_schedule.html:370 +#: drdown/core/templates/core/vaccine_schedule.html:79 +#: drdown/core/templates/core/vaccine_schedule.html:231 +#: drdown/core/templates/core/vaccine_schedule.html:294 +#: drdown/core/templates/core/vaccine_schedule.html:372 msgid "CONTRAINDICATED" msgstr "CONTRAINDICADA" -#: drdown/core/templates/core/vaccine_schedule.html:70 -#: drdown/core/templates/core/vaccine_schedule.html:295 +#: drdown/core/templates/core/vaccine_schedule.html:82 +#: drdown/core/templates/core/vaccine_schedule.html:297 msgid "Bacterial triple (DTPw, DTPa, ou dTpa)" msgstr "Tríplice bacteriana (DTPw, DTPa, ou dTpa)" -#: drdown/core/templates/core/vaccine_schedule.html:73 +#: drdown/core/templates/core/vaccine_schedule.html:85 msgid "Four doses of DTPa or DTPw starting at 2 months of age" msgstr "Quatro doses DTPa ou DTPw iniciando aos 2 meses de idade" -#: drdown/core/templates/core/vaccine_schedule.html:75 +#: drdown/core/templates/core/vaccine_schedule.html:87 msgid "Reinforcement with DTPa, DTPw or dTpa" msgstr "Reforço com DTPa, DTPw ou dTpa" -#: drdown/core/templates/core/vaccine_schedule.html:79 -#: drdown/core/templates/core/vaccine_schedule.html:301 +#: drdown/core/templates/core/vaccine_schedule.html:91 +#: drdown/core/templates/core/vaccine_schedule.html:303 msgid "Haemophilus influenzae type b" msgstr "Haemophilus influenzae tipo b" -#: drdown/core/templates/core/vaccine_schedule.html:82 +#: drdown/core/templates/core/vaccine_schedule.html:94 msgid "Four doses starting at 2 months of age" msgstr "Quatro doses iniciando aos 2 meses de idade" -#: drdown/core/templates/core/vaccine_schedule.html:84 -#: drdown/core/templates/core/vaccine_schedule.html:91 -#: drdown/core/templates/core/vaccine_schedule.html:215 -#: drdown/core/templates/core/vaccine_schedule.html:302 -#: drdown/core/templates/core/vaccine_schedule.html:306 -#: drdown/core/templates/core/vaccine_schedule.html:317 -#: drdown/core/templates/core/vaccine_schedule.html:322 -#: drdown/core/templates/core/vaccine_schedule.html:335 -#: drdown/core/templates/core/vaccine_schedule.html:345 -#: drdown/core/templates/core/vaccine_schedule.html:356 +#: drdown/core/templates/core/vaccine_schedule.html:96 +#: drdown/core/templates/core/vaccine_schedule.html:103 +#: drdown/core/templates/core/vaccine_schedule.html:227 +#: drdown/core/templates/core/vaccine_schedule.html:304 +#: drdown/core/templates/core/vaccine_schedule.html:308 +#: drdown/core/templates/core/vaccine_schedule.html:319 +#: drdown/core/templates/core/vaccine_schedule.html:324 +#: drdown/core/templates/core/vaccine_schedule.html:337 +#: drdown/core/templates/core/vaccine_schedule.html:347 +#: drdown/core/templates/core/vaccine_schedule.html:358 msgid "Vaccinate people in special risk situations" msgstr "Vacinar pessoas em situações especiais de risco" -#: drdown/core/templates/core/vaccine_schedule.html:87 -#: drdown/core/templates/core/vaccine_schedule.html:305 +#: drdown/core/templates/core/vaccine_schedule.html:99 +#: drdown/core/templates/core/vaccine_schedule.html:307 msgid "Poliomyelitis (inactivated virus)" msgstr "Poliomielite (vírus inativados)" -#: drdown/core/templates/core/vaccine_schedule.html:90 +#: drdown/core/templates/core/vaccine_schedule.html:102 msgid "Five doses starting at 2 months of age" msgstr "Cinco doses iniciando aos 2 meses de idade" -#: drdown/core/templates/core/vaccine_schedule.html:94 -#: drdown/core/templates/core/vaccine_schedule.html:309 +#: drdown/core/templates/core/vaccine_schedule.html:106 +#: drdown/core/templates/core/vaccine_schedule.html:311 msgid "Pneumococcal conjugate" msgstr "Pneumocócica conjugada" -#: drdown/core/templates/core/vaccine_schedule.html:97 +#: drdown/core/templates/core/vaccine_schedule.html:109 msgid "Four doses starting at 2 months of age - VPC10 or VPC13" -msgstr "" +msgstr "Quatro doses iniciadas aos 2 meses de idade - VPC10 ou VPC13" -#: drdown/core/templates/core/vaccine_schedule.html:98 +#: drdown/core/templates/core/vaccine_schedule.html:110 msgid "VPC10 or VPC13 - Vaccinate the previously unvaccinated" msgstr "Quatro doses iniciando aos 2 meses de idade - VPC10 ou VPC13" -#: drdown/core/templates/core/vaccine_schedule.html:99 -#: drdown/core/templates/core/vaccine_schedule.html:310 +#: drdown/core/templates/core/vaccine_schedule.html:111 +#: drdown/core/templates/core/vaccine_schedule.html:312 msgid "PCV13: vaccinating people in special risk situations" msgstr "PCV13: vacinar pessoas em situações especiais de risco" -#: drdown/core/templates/core/vaccine_schedule.html:102 -#: drdown/core/templates/core/vaccine_schedule.html:314 +#: drdown/core/templates/core/vaccine_schedule.html:114 +#: drdown/core/templates/core/vaccine_schedule.html:316 msgid "Meningococcal conjugate C or ACWY" msgstr "Meningocócica conjugada C ou ACWY" -#: drdown/core/templates/core/vaccine_schedule.html:106 +#: drdown/core/templates/core/vaccine_schedule.html:118 msgid "" "With menACWY: three doses beginning at 3 months of age. Or with menC: two " "doses beginning at 3 months of age" @@ -962,51 +965,51 @@ msgstr "" "Com menACWY: três doses iniciando aos 3 meses de idade. Ou com menC: duas " "doses iniciando aos 3 meses de idade" -#: drdown/core/templates/core/vaccine_schedule.html:107 -#: drdown/core/templates/core/vaccine_schedule.html:109 -#: drdown/core/templates/core/vaccine_schedule.html:117 +#: drdown/core/templates/core/vaccine_schedule.html:119 +#: drdown/core/templates/core/vaccine_schedule.html:121 +#: drdown/core/templates/core/vaccine_schedule.html:129 msgid "REINFORCEMENT" msgstr "REFORÇO" -#: drdown/core/templates/core/vaccine_schedule.html:112 -#: drdown/core/templates/core/vaccine_schedule.html:320 +#: drdown/core/templates/core/vaccine_schedule.html:124 +#: drdown/core/templates/core/vaccine_schedule.html:322 msgid "Meningococcal B" msgstr "Meningocócica B" -#: drdown/core/templates/core/vaccine_schedule.html:116 +#: drdown/core/templates/core/vaccine_schedule.html:128 msgid "Three doses beginning at 3 months of age" msgstr "Três doses iniciando aos 3 meses de idade" -#: drdown/core/templates/core/vaccine_schedule.html:118 -#: drdown/core/templates/core/vaccine_schedule.html:321 +#: drdown/core/templates/core/vaccine_schedule.html:130 +#: drdown/core/templates/core/vaccine_schedule.html:323 msgid "For those not previously vaccinated: two doses" msgstr "Para os não vacinados anteriormente: duas doses" -#: drdown/core/templates/core/vaccine_schedule.html:121 +#: drdown/core/templates/core/vaccine_schedule.html:133 msgid "Oral poliomyelitis (live attenuated virus)" msgstr "Poliomielite oral (vírus vivos atenuados)" -#: drdown/core/templates/core/vaccine_schedule.html:129 +#: drdown/core/templates/core/vaccine_schedule.html:141 msgid "NATIONAL VACCINATION CAMPAIGNS" msgstr "CAMPANHAS NACIONAIS DE VACINAÇÃO" -#: drdown/core/templates/core/vaccine_schedule.html:133 -#: drdown/core/templates/core/vaccine_schedule.html:325 +#: drdown/core/templates/core/vaccine_schedule.html:145 +#: drdown/core/templates/core/vaccine_schedule.html:327 msgid "Influenza (flu)" msgstr "Influenza (gripe)" -#: drdown/core/templates/core/vaccine_schedule.html:140 -#: drdown/core/templates/core/vaccine_schedule.html:326 +#: drdown/core/templates/core/vaccine_schedule.html:152 +#: drdown/core/templates/core/vaccine_schedule.html:328 msgid "ANNUAL VACCINATION" msgstr "VACINAÇÃO ANUAL" -#: drdown/core/templates/core/vaccine_schedule.html:143 -#: drdown/core/templates/core/vaccine_schedule.html:329 +#: drdown/core/templates/core/vaccine_schedule.html:155 +#: drdown/core/templates/core/vaccine_schedule.html:331 msgid "Yellow fever" msgstr "Febre amarela" -#: drdown/core/templates/core/vaccine_schedule.html:153 -#: drdown/core/templates/core/vaccine_schedule.html:330 +#: drdown/core/templates/core/vaccine_schedule.html:165 +#: drdown/core/templates/core/vaccine_schedule.html:332 msgid "" "IN REGIONS WITH RECOMMENDATION OF VACCINATION (ACCORDING TO CLASSIFICATION " "OF MS) - single dose at 9 months of age. Not previously vaccinated: single " @@ -1016,110 +1019,89 @@ msgstr "" "- dose única aos 9 meses de idade. Para não vacinados anteriormente: dose " "única" -#: drdown/core/templates/core/vaccine_schedule.html:156 -#: drdown/core/templates/core/vaccine_schedule.html:333 +#: drdown/core/templates/core/vaccine_schedule.html:168 +#: drdown/core/templates/core/vaccine_schedule.html:335 msgid "Viral triple (measles, mumps and rubella)" msgstr "Tríplice viral (sarampo,caxumba e rubéola)" -#: drdown/core/templates/core/vaccine_schedule.html:167 -#: drdown/core/templates/core/vaccine_schedule.html:182 -#: drdown/core/templates/core/vaccine_schedule.html:197 +#: drdown/core/templates/core/vaccine_schedule.html:179 +#: drdown/core/templates/core/vaccine_schedule.html:194 +#: drdown/core/templates/core/vaccine_schedule.html:209 msgid "Two doses after 12 months" msgstr "Duas doses a partir dos 12 meses" -#: drdown/core/templates/core/vaccine_schedule.html:171 -#: drdown/core/templates/core/vaccine_schedule.html:338 +#: drdown/core/templates/core/vaccine_schedule.html:183 +#: drdown/core/templates/core/vaccine_schedule.html:340 msgid "Varicella (chickenpox)" msgstr "Varicela (catapora)" -#: drdown/core/templates/core/vaccine_schedule.html:183 -#: drdown/core/templates/core/vaccine_schedule.html:339 +#: drdown/core/templates/core/vaccine_schedule.html:195 +#: drdown/core/templates/core/vaccine_schedule.html:341 msgid "Vaccinate previously unvaccinated susceptibles" msgstr "Vacinar os suscetíveis não vacinados anteriormente" -#: drdown/core/templates/core/vaccine_schedule.html:186 -#: drdown/core/templates/core/vaccine_schedule.html:343 +#: drdown/core/templates/core/vaccine_schedule.html:198 +#: drdown/core/templates/core/vaccine_schedule.html:345 msgid "Hepatitis A" msgstr "Hepatite A" -#: drdown/core/templates/core/vaccine_schedule.html:201 -#: drdown/core/templates/core/vaccine_schedule.html:355 +#: drdown/core/templates/core/vaccine_schedule.html:213 +#: drdown/core/templates/core/vaccine_schedule.html:357 msgid "Pneumococcal 23 courageous" msgstr "Pneumocócica 23 valente" -#: drdown/core/templates/core/vaccine_schedule.html:218 -#: drdown/core/templates/core/vaccine_schedule.html:368 +#: drdown/core/templates/core/vaccine_schedule.html:230 +#: drdown/core/templates/core/vaccine_schedule.html:370 msgid "Dengue" msgstr "Dengue" -#: drdown/core/templates/core/vaccine_schedule.html:248 -msgid "Subtitle: " -msgstr "Legenda: " - -#: drdown/core/templates/core/vaccine_schedule.html:250 -msgid "Routine" -msgstr "Rotina" - -#: drdown/core/templates/core/vaccine_schedule.html:252 -msgid "Vaccinate Unvaccinated" -msgstr "Vacinar não vacinados" - -#: drdown/core/templates/core/vaccine_schedule.html:254 -msgid "Special Situations" -msgstr "Situações especiais" - -#: drdown/core/templates/core/vaccine_schedule.html:256 -msgid "Contraindicated" -msgstr "Contraindicada" - -#: drdown/core/templates/core/vaccine_schedule.html:267 -#: drdown/core/templates/core/vaccine_schedule.html:383 +#: drdown/core/templates/core/vaccine_schedule.html:270 +#: drdown/core/templates/core/vaccine_schedule.html:385 msgid "9 TO 10 YEARS OLD" msgstr "9 ATÉ 10 ANOS DE IDADE" -#: drdown/core/templates/core/vaccine_schedule.html:268 -#: drdown/core/templates/core/vaccine_schedule.html:384 +#: drdown/core/templates/core/vaccine_schedule.html:271 +#: drdown/core/templates/core/vaccine_schedule.html:386 msgid "ADOLESCENT" msgstr "ADOLESCENTE" -#: drdown/core/templates/core/vaccine_schedule.html:269 -#: drdown/core/templates/core/vaccine_schedule.html:385 +#: drdown/core/templates/core/vaccine_schedule.html:272 +#: drdown/core/templates/core/vaccine_schedule.html:387 msgid "ADULT" msgstr "ADULTO" -#: drdown/core/templates/core/vaccine_schedule.html:270 -#: drdown/core/templates/core/vaccine_schedule.html:386 +#: drdown/core/templates/core/vaccine_schedule.html:273 +#: drdown/core/templates/core/vaccine_schedule.html:388 msgid "OLD MAN" msgstr "IDOSO" -#: drdown/core/templates/core/vaccine_schedule.html:274 -#: drdown/core/templates/core/vaccine_schedule.html:376 +#: drdown/core/templates/core/vaccine_schedule.html:276 +#: drdown/core/templates/core/vaccine_schedule.html:378 msgid "9 Years" msgstr "9 Anos" -#: drdown/core/templates/core/vaccine_schedule.html:275 -#: drdown/core/templates/core/vaccine_schedule.html:377 +#: drdown/core/templates/core/vaccine_schedule.html:277 +#: drdown/core/templates/core/vaccine_schedule.html:379 msgid "10 Years" msgstr "10 Anos" -#: drdown/core/templates/core/vaccine_schedule.html:276 -#: drdown/core/templates/core/vaccine_schedule.html:378 +#: drdown/core/templates/core/vaccine_schedule.html:278 +#: drdown/core/templates/core/vaccine_schedule.html:380 msgid "11-19 Years" msgstr "11-19 Anos" -#: drdown/core/templates/core/vaccine_schedule.html:277 -#: drdown/core/templates/core/vaccine_schedule.html:379 +#: drdown/core/templates/core/vaccine_schedule.html:279 +#: drdown/core/templates/core/vaccine_schedule.html:381 msgid "20-59 Years" msgstr "20-59 Anos" -#: drdown/core/templates/core/vaccine_schedule.html:278 -#: drdown/core/templates/core/vaccine_schedule.html:380 +#: drdown/core/templates/core/vaccine_schedule.html:280 +#: drdown/core/templates/core/vaccine_schedule.html:382 msgid "60+ Years" msgstr "60+ Anos" -#: drdown/core/templates/core/vaccine_schedule.html:297 -#: drdown/core/templates/core/vaccine_schedule.html:298 #: drdown/core/templates/core/vaccine_schedule.html:299 +#: drdown/core/templates/core/vaccine_schedule.html:300 msgid "" "Reinforcement with dTpa from 9 years of age and every 10 years (or, in the " "case of dTpa, do dT)" @@ -1127,40 +1109,40 @@ msgstr "" "Reforço com dTpa a partir dos 9 anos de idade e a cada dez anos (ou, na " "impossibilidade de dTpa, fazer dT)" -#: drdown/core/templates/core/vaccine_schedule.html:311 +#: drdown/core/templates/core/vaccine_schedule.html:313 msgid "VPC13: one dose" msgstr "VPC13: uma dose" -#: drdown/core/templates/core/vaccine_schedule.html:316 +#: drdown/core/templates/core/vaccine_schedule.html:318 msgid "REINFORCED at age 11. For those not previously vaccinated: two doses" msgstr "REFORÇO aos 11 anos. Para os não vacinados anteriormente: duas doses" -#: drdown/core/templates/core/vaccine_schedule.html:348 +#: drdown/core/templates/core/vaccine_schedule.html:350 msgid "HPV" msgstr "HPV" -#: drdown/core/templates/core/vaccine_schedule.html:349 +#: drdown/core/templates/core/vaccine_schedule.html:351 msgid "Three doses for girls and boys" msgstr "Três doses para meninas e meninos" -#: drdown/core/templates/core/vaccine_schedule.html:351 +#: drdown/core/templates/core/vaccine_schedule.html:353 msgid "" "Vaccinate the non-vaccinated formerly: at the discretion of the physician" msgstr "Vacinar os não vacinados anteriormente: a critério do médico" -#: drdown/core/templates/core/vaccine_schedule.html:357 +#: drdown/core/templates/core/vaccine_schedule.html:359 msgid "Two doses at five-year intervals" msgstr "Duas doses com intervalo de cinco anos" -#: drdown/core/templates/core/vaccine_schedule.html:360 +#: drdown/core/templates/core/vaccine_schedule.html:362 msgid "Herpes zoster" msgstr "Herpes zóster" -#: drdown/core/templates/core/vaccine_schedule.html:364 +#: drdown/core/templates/core/vaccine_schedule.html:366 msgid "From 50 to 59 years old: at medical discretion" msgstr "De 50 a 59 anos: a critério médico" -#: drdown/core/templates/core/vaccine_schedule.html:369 +#: drdown/core/templates/core/vaccine_schedule.html:371 msgid "" "To vaccinate people aged 9 to 45 years previously infected with the virus " "(seropositive) with three doses: 0 - 6 - 12 months" @@ -1168,6 +1150,21 @@ msgstr "" "Vacinar pessoas de 9 a 45 anos previamente infectadas pelo vírus " "(soropositivas) com três doses: 0 - 6 - 12 meses" +#~ msgid "Subtitle: " +#~ msgstr "Legenda: " + +#~ msgid "Routine" +#~ msgstr "Rotina" + +#~ msgid "Vaccinate Unvaccinated" +#~ msgstr "Vacinar não vacinados" + +#~ msgid "Special Situations" +#~ msgstr "Situações especiais" + +#~ msgid "Contraindicated" +#~ msgstr "Contraindicada" + #~ msgid "Hey! You have procedures to be made." #~ msgstr "Oi! Você tem procedimentos que precisam ser feitos." From 2b17185e995ca9a00b30fcfc45648c7daddb4713 Mon Sep 17 00:00:00 2001 From: Gabriela Medeiros Date: Wed, 16 May 2018 22:57:08 -0300 Subject: [PATCH 36/48] Editing info page Adding News API in info page Co-authored-by: Daniel Maike --- drdown/core/templates/core/info.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drdown/core/templates/core/info.html b/drdown/core/templates/core/info.html index 0fddb0a5..55fba1d8 100644 --- a/drdown/core/templates/core/info.html +++ b/drdown/core/templates/core/info.html @@ -14,12 +14,10 @@ {% endblock %} - {% block css %} {{ block.super }} - {% endblock css %} {% block title %}{% trans "Down's Syndrome infos" %}{% endblock title %} @@ -152,4 +150,7 @@

    {%

    +
    + +
    {% endblock %} From 5bdf1661528e4c76ad167becfb1a67dadd9eef69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= Date: Wed, 16 May 2018 15:56:06 -0300 Subject: [PATCH 37/48] Removing environment key Chaging environment key from travis file to travis administration site Co-authored-by: Victor Arnaud --- .travis.yml | 1 - mkdocs-build.sh | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b05aa604..57f140e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ addons: - 159.203.182.32 env: global: - - secure: "wrb7hIKvhTmybgkW/kAubZmmdnIeKlXG6vczz8ct2ZbvVBvPflOQCDLQuqoRWDHDPs8PdLHwLZ6J3zlFCtkxBX0AKrSC1fCedkZSoTYEzrI3hj3k+IhTthWPao1GYuIyE+/GUIY82+4b8AHuE3weTSjl0JlOVpxIFfOXL9T2oRhZxjxdGJmUkJgWLXZIsDjvX1bmBZ/SbdMgGGer1YSu8UoiAAr94IrEU5dyJ9Yc8sX6HTZnCdkGgMckPMyZkVwbW9sw9DcjSCB0W/h3aYIP86zocBUk1xGD0tzbnd1mEYaScXRU1rxVBYoe0XnTmFAhyAae1NTtw+6Pqrz1RDudbfTxJBLvkkaBse1w5XN3oBUeuOFLGyoagItnxqzbprt3QN6Tno23LLrefhShVAvzemRceB/Ie6NWRmyhDbsEJpLgAhUpdAGY+Phh2iFRjAsfCnsHT1AKJIoNBoJoi8d79dSOHTK1XxgdBJi9zfhIXB3jjFPhKIx0UHd4aNsIzfuTQWWC8cm05UcdWiTAxunWumoh94jQ6flkIk7RdNyeM+dytJW9mqTvw2lxCRAuyYo7eGs5jqTMqokSAuSDzRFPMUDlP+t/lewAsuwLsxXVOjrMn8TnT28yimay4bK4ZocYP6M3EJPg1DsJ/QOyCqFIFqEMs8lAqJDNky/cJ/79ZIY=" - CC_TEST_REPORTER_ID=bf64f4cd10722061b8cad12ca638ebfa7d3c1494df117613b2acd357bfd7aeb0 notifications: slack: diff --git a/mkdocs-build.sh b/mkdocs-build.sh index c72c169f..7be48c8a 100755 --- a/mkdocs-build.sh +++ b/mkdocs-build.sh @@ -8,7 +8,8 @@ rev=$(git rev-parse --short HEAD) ( git config user.name "${GH_USER_NAME}" git config user.email "${GH_USER_EMAIL}" - git remote set-url origin "https://${GH_TOKEN}@${GH_REF}" + git remote remove origin + git remote add origin "https://${GH_TOKEN}@${GH_REF}" git fetch origin ) From 0e25c0ea0f7681a659395b6bfade2a7d2fd9140c Mon Sep 17 00:00:00 2001 From: Daniel Maike Date: Thu, 17 May 2018 11:22:06 -0300 Subject: [PATCH 38/48] Correcting translations of vaccine schedule Correcting translation of tab Co-authored-by: Gabriela Medeiros --- drdown/core/locale/pt_BR/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drdown/core/locale/pt_BR/LC_MESSAGES/django.po b/drdown/core/locale/pt_BR/LC_MESSAGES/django.po index 1f8ed6d5..f90cb6f0 100644 --- a/drdown/core/locale/pt_BR/LC_MESSAGES/django.po +++ b/drdown/core/locale/pt_BR/LC_MESSAGES/django.po @@ -744,7 +744,7 @@ msgstr "DO NASCIMENTO AOS 6 ANOS DE IDADE" #: drdown/core/templates/core/vaccine_schedule.html:28 #| msgid "9 TO 10 YEARS OLD" msgid "FROM 9 YEARS OLD" -msgstr "9 ATÉ 10 ANOS DE IDADE" +msgstr "DOS 9 ANOS EM DIANTE" #: drdown/core/templates/core/vaccine_schedule.html:39 #: drdown/core/templates/core/vaccine_schedule.html:236 From 920ef82745e102ee0172a0778c8083e72b99b38e Mon Sep 17 00:00:00 2001 From: GeovanaRamos Date: Thu, 17 May 2018 12:51:42 -0300 Subject: [PATCH 39/48] Correcting exams forms Correcting indents and line spacing on template Adding date format input Co-authored-by: joberth rogers Co-authored-by: Guilherme Guy --- drdown/medicalrecords/forms/exam_forms.py | 3 + .../medicalrecord_exam_form.html | 103 +++++++++--------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/drdown/medicalrecords/forms/exam_forms.py b/drdown/medicalrecords/forms/exam_forms.py index b286738e..d9795424 100644 --- a/drdown/medicalrecords/forms/exam_forms.py +++ b/drdown/medicalrecords/forms/exam_forms.py @@ -7,3 +7,6 @@ class ExamForm(forms.ModelForm): class Meta: model = Exam fields = ["file", "day", "category", "observations"] + widgets = { + 'day': forms.DateInput(attrs={'type': 'date'}) + } diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html index 9f3acf81..aeadd2a2 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html @@ -9,66 +9,63 @@ {% endblock %} {% block content %} -
    +
    -
    -
    -

    {% trans 'Add Exam' %}

    +
    +
    +

    {% trans 'Add Exam' %}

    +
    +
    + +
    +
    +
    + {% csrf_token %} + {% for field in form %} +
    +
    + + {% if field.errors %} +
    + {{ field.errors }} +
    + {% endif %} + +
    + {{ field.label_tag }} +
    + +
    + {{ field }} +
    + + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} + +
    -
    -
    + {% endfor %} +
    +
    - - - - {% csrf_token %} - - {% for field in form %} - -
    - -
    - - - {% if field.errors %} -
    - {{ field.errors }} -
    - {% endif %} - - -
    - {{ field.label_tag }} -
    - -
    - {{ field }} -
    - -
    - -
    - - {% endfor %} -
    - -
    -
    - -
    - -
    - -
    - {% trans "Cancel" %} -
    -
    - +
    +
    +
    -
    +
    + {% trans "Cancel" %} +
    + +
    + + +
    +
    + {% endblock %} From c34187598b79200ca80e7576ca664233f565f575 Mon Sep 17 00:00:00 2001 From: GeovanaRamos Date: Thu, 17 May 2018 13:38:49 -0300 Subject: [PATCH 40/48] Correcting medical record list Checking if user is health team to add exam Correcting indents and line spacing Co-authored-by: joberth rogers Co-authored-by: Guilherme Guy --- .../medicalrecords/medicalrecord_list.html | 779 +++++++----------- 1 file changed, 316 insertions(+), 463 deletions(-) diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html index fe083ad6..7216b843 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html @@ -10,27 +10,27 @@ {% block script %} - + - + }) + + {%endblock script%} @@ -39,483 +39,336 @@
    -
    -
    -

    {% trans 'Medical Record' %}: {{ related_patient.user.name }}

    -
    - -
    - {% trans "Return" %} -
    - +
    +
    +

    {% trans 'Medical Record' %}: {{ related_patient.user.name }}

    +
    + {% trans "Return" %} +
    +
    + +
    +
    + + +
    +
    +
    +
    + {% if related_patient.user.photo %} + + {% else %} + + {% endif %} +
    -
    -
    - - -
    - -
    - -
    - -
    - {% if related_patient.user.photo %} - - {% else %} - - {% endif %} -
    - -
    +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + + {% if related_patient.user.cpf %} +
    + {{ related_patient.cpf }} +
    + {% endif %} +
    +
    +
    -
    - -
    - +