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/Makefile b/Makefile index 07c37205..b7071b7e 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,14 @@ 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 + +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/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 diff --git a/docs/sprints/09/planning.md b/docs/sprints/09/planning.md new file mode 100644 index 00000000..62b42d2a --- /dev/null +++ b/docs/sprints/09/planning.md @@ -0,0 +1,73 @@ +# Planejamento da Sprint 9 + +## 1. Resumo da Sprint + +__Número da sprint:__ 9 + +__Data de início:__ 28/04/2018 + +__Data de Término:__ 04/05/2018 + +__Duração__: 6 dias + +__Pontos Planejados:__ 22 pontos + +__Membros ausentes:__ Nenhum + +## 2. Papéis + +- Scrum Master: + - Diego França + +- Product Owner: + - Mariana Mendes + +- DevOps: + - João Sconetto + +- Arquiteto: + - Victor Arnaud + +- Time de Desenvolvimento: + - Daniel Maike + - Elias Bernardo + - Gabriela Medeiros + - Geovana Ramos + - Guilherme Guy + - Joberth Rodrigues + +## 3. Pareamento + +- Daniel e Geovana + +- Elias e Guilherme + +- Gabriela e Joberth + +## 4. Planejamento da Sprint + +A Sprint 9 foi planejada para dar continuidade às histórias da ficha de acompanhamento. Além dessas, features para a marcação de consultas e para exibir a localização do Cris Down também foram colocadas no Backlog da Sprint. + +Tendo em vista o cansaço em virtude de uma das histórias da sprint passada, e da complexidade da feature de evolução do prontuário, esta foi dividida em 2 histórias, com a primeira ficando para esta sprint e a outra para o futuro. + +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 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. + +## 6. Backlog da Sprint + +- [US83 - Evoluir prontuário](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/204) +- [TS84 - Manter o frontend padronizado](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/205) +- [US85 - Solicitar consulta](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/206) +- [US86 - Localização](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/207) +- [TS87 - Documentar o Pipeline](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/208) +- [TS88 - Documentar o mindmap](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/209) +- [TS96 - Documentar a Sprint 8](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/211) + +## 7. Risk Burndown + +![Risk Burndown da Sprint 9](https://uploaddeimagens.com.br/images/001/417/635/original/riscos_S09.png?1526345420) diff --git a/docs/sprints/09/results.md b/docs/sprints/09/results.md new file mode 100644 index 00000000..9d7ac5e6 --- /dev/null +++ b/docs/sprints/09/results.md @@ -0,0 +1,64 @@ +# Fechamento da Sprint 8 + +## 1. Resumo da Sprint + +__Pontos Planejados__: 22 pontos + +__Pontos concluídos__: 31 pontos + +__Dívidas técnicas__: 0 pontos + +__Histórias entregues:__ + +- [US83 - Evoluir prontuário](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/204) +- [TS84 - Manter o frontend padronizado](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/205) +- [US85 - Solicitar consulta](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/206) +- [US86 - Localização](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/207) +- [TS87 - Documentar o Pipeline](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/208) +- [TS88 - Documentar o mindmap](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/209) +- [TS96 - Documentar a Sprint 8](https://github.com/fga-gpp-mds/2018.1-Dr-Down/issues/211) + +## 2. Retrospectiva da Sprint + +| Pontos Positivos | Pontos Negativos | Sugestão de Melhoria | +| ----- | ----- | ---- | +| Tudo foi entregue | Trabalhos de outros matérias afetando a execução de atividades do projeto | Nas dailys não presenciais, tentar responder o mais cedo possível | +| Ganho de conhecimento com a execução das histórias | Critério de aceitação da história do prontuário poderia estar mais claro | Esclarecer melhor os critérios de aceitação | +| O membro que estava sem máquina de trabalho (notebook) conseguiu uma nova | Algumas sugestões aumentaram um pouco a história | Melhor escrita dos reviews dos pull requests | +| A pontuação das histórias refletiu melhor o esforço que foi necessário | Não conseguir entender o código de outro membro para fazer correção | O membro participar na história de refatoração do seu código | +| Melhor auto planejamento dos membros | Confusão com as sugestões do reviews | Auto popular o banco para fazer os testes | +| Troca de conhecimento efetiva entre os membros | Cliente ainda dificulta as conversas e realizações de reuniões | - | +| Membro gostou de trabalhar com a API do Google | Adoecimento de membros da equipe | - | +| Os membros conseguiram entregar as histórias complexas | - | - | +| Fechamento das issues antes do último dia da sprint | - | - | +| Gráfico de commits bem destribuido (bom planejamento e trabalho) | - | - | + +## 3. Quadro de Conhecimento + +![Quadro de conhecimento da Sprint 9](https://uploaddeimagens.com.br/images/001/417/702/full/conhecimento_S09.png?1526348780) + +## 5. Gráfico do Burndown + +![Gráfico do burndown da Sprint 9](https://uploaddeimagens.com.br/images/001/417/688/original/burndown_S09.png?1526348115) + +## 6. Velocity + +![Gráfico do velocity da Sprint 9](https://uploaddeimagens.com.br/images/001/417/690/full/velocity_S09.png?1526348295) + +## 7. Gráfico de Commits + +![Gráfico de commits da Sprint 9](https://uploaddeimagens.com.br/images/001/417/691/full/commits_S09.png?1526348363) + +## 8. EVM + +![Gráfico da EVM da Sprint 9](https://uploaddeimagens.com.br/images/001/417/694/full/evm_S09.png?1526348542) + +## 9. Análise do Scrum Master + +Esta sprint ocorreu tranquilamente e sem problemas, tanto que boa parte das histórias foram entregues na quinta. Isso é mais um sinal de que amadurecemos nossos conhecimentos. + +Com relação à questão de problemas com o entendimento dos critérios de aceitação e do que é proposto nos reviews, ficamos de melhorar a escrita dos textos, aumentando a clareza do que é pedido. + +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. 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. diff --git a/drdown/core/locale/pt_BR/LC_MESSAGES/django.po b/drdown/core/locale/pt_BR/LC_MESSAGES/django.po index 57c8f1a2..f90cb6f0 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 "DOS 9 ANOS EM DIANTE" + +#: 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." diff --git a/drdown/core/static/core/css/vaccineshedule.css b/drdown/core/static/core/css/vaccineshedule.css new file mode 100644 index 00000000..4074bbf4 --- /dev/null +++ b/drdown/core/static/core/css/vaccineshedule.css @@ -0,0 +1,68 @@ +.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; +} + +.mt-13{ + margin-top:10rem; +} + +.size-sm{ + height: 3em; + width: auto; +} \ No newline at end of file diff --git a/drdown/core/static/core/images/Subtitle.png b/drdown/core/static/core/images/Subtitle.png new file mode 100644 index 00000000..f7f76fc1 Binary files /dev/null and b/drdown/core/static/core/images/Subtitle.png differ diff --git a/drdown/core/templates/core/info.html b/drdown/core/templates/core/info.html index 0fddb0a5..35732630 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 %} @@ -32,14 +30,14 @@

{% trans "Summary" %}

-
  • {% trans "About Down's syndrome" %}
    • -
  • {% trans "Frequently Asked Questions (FAQ)" %}
    • -
  • {% trans "What can be done to prevent Down's Syndrome?" %}
    • +
  • {% trans "About Down's syndrome" %}
    • +
  • {% trans "Frequently Asked Questions (FAQ)" %}
    • +
  • {% trans "What can be done to prevent Down's Syndrome?" %}
    • -
  • {% trans "Is Down Syndrome a Disease? Can I catch it during my life?" %}
    • -
  • {% trans "How can I identify Down Syndrome?" %}
    • -
  • {% trans "How far does the autonomy of a child with Down syndrome develop?" %}
    • +
  • {% trans "Is Down Syndrome a Disease? Can I catch it during my life?" %}
    • +
  • {% trans "How can I identify Down Syndrome?" %}
    • +
  • {% trans "How far does the autonomy of a child with Down syndrome develop?" %}
    • @@ -134,7 +132,7 @@

    {% trans "How fa -
    +

    {% trans "Further reading" %}

    @@ -152,4 +150,10 @@

    {%

    + +
    + +
    + {% endblock %} diff --git a/drdown/core/templates/core/vaccine_schedule.html b/drdown/core/templates/core/vaccine_schedule.html index 5dcf4108..194e0c0c 100644 --- a/drdown/core/templates/core/vaccine_schedule.html +++ b/drdown/core/templates/core/vaccine_schedule.html @@ -10,385 +10,388 @@ - + {% endblock css %} {% 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 "Vaccine Schedule" %}

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

    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    {% trans 'Vaccines'%}

    		{% trans '9 TO 10 YEARS OLD'%}{% trans 'ADOLESCENT'%}{% trans 'ADULT'%}{% trans 'OLD MAN'%}
    {% 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'%}
    +
    + + +
    -

    + {% endblock content %} 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/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..d9795424 100644 --- a/drdown/medicalrecords/forms/exam_forms.py +++ b/drdown/medicalrecords/forms/exam_forms.py @@ -6,4 +6,7 @@ class ExamForm(forms.ModelForm): class Meta: model = Exam - fields = ["file", "day", "status", "name"] + fields = ["file", "day", "category", "observations"] + widgets = { + 'day': forms.DateInput(attrs={'type': 'date'}) + } 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/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/locale/pt_BR/LC_MESSAGES/django.po b/drdown/medicalrecords/locale/pt_BR/LC_MESSAGES/django.po index 5224ca1b..eac696d1 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-17 19:53+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:130 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:149 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:363 msgid "Created at" msgstr "Criado em" @@ -36,93 +38,116 @@ msgid "Date of creation" msgstr "Data de criação" #: drdown/medicalrecords/models/model_complaint.py:18 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:28 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:33 msgid "Day of complaint" msgstr "Dia da queixa" #: drdown/medicalrecords/models/model_complaint.py:22 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:33 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:38 msgid "Time of complaint" msgstr "Hora da queixa" -#: drdown/medicalrecords/models/model_complaint.py:28 -#: drdown/medicalrecords/models/model_exams.py:12 +#: drdown/medicalrecords/models/model_complaint.py:30 +#: drdown/medicalrecords/models/model_exams.py:13 #: 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" -#: drdown/medicalrecords/models/model_complaint.py:32 +#: drdown/medicalrecords/models/model_complaint.py:34 #: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:23 msgid "Description" msgstr "Descriçao" -#: drdown/medicalrecords/models/model_complaint.py:33 +#: drdown/medicalrecords/models/model_complaint.py:35 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_complaint.py:42 #: 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_medicines.py:40 #: drdown/medicalrecords/models/model_static_data.py:39 -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:153 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:130 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:146 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:346 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:360 msgid "Author" msgstr "Autor" -#: drdown/medicalrecords/models/model_complaint.py:44 +#: drdown/medicalrecords/models/model_complaint.py:46 msgid "Complaint" msgstr "Queixa" -#: drdown/medicalrecords/models/model_complaint.py:45 +#: drdown/medicalrecords/models/model_complaint.py:47 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:70 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:332 msgid "Complaints" msgstr "Queixas" -#: drdown/medicalrecords/models/model_complaint.py:52 +#: drdown/medicalrecords/models/model_complaint.py:54 +#: drdown/medicalrecords/models/model_exams.py:63 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:18 +#: drdown/medicalrecords/models/model_exams.py:69 msgid "Exam" msgstr "Exame" -#: drdown/medicalrecords/models/model_exams.py:21 +#: drdown/medicalrecords/models/model_exams.py:22 msgid "Exam day" msgstr "Dia de atendimento" -#: drdown/medicalrecords/models/model_exams.py:22 +#: drdown/medicalrecords/models/model_exams.py:23 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" - #: drdown/medicalrecords/models/model_exams.py:27 -msgid "Collected" -msgstr "Coletado" +msgid "Select a category..." +msgstr "Selecione uma categoria..." #: drdown/medicalrecords/models/model_exams.py:28 -msgid "Marked examination" -msgstr "Marcado" +msgid "Others" +msgstr "Outros" + +#: drdown/medicalrecords/models/model_exams.py:29 +msgid "Structured Physical Exam" +msgstr "Exame Físico Estruturado" + +#: drdown/medicalrecords/models/model_exams.py:30 +msgid "Vision Exam" +msgstr "Exame de vista" + +#: drdown/medicalrecords/models/model_exams.py:31 +msgid "Ear Exam" +msgstr "Exame de audição" #: drdown/medicalrecords/models/model_exams.py:32 -msgid "Status" -msgstr "Status" +msgid "Hearth Exam" +msgstr "Exame do coração" + +#: drdown/medicalrecords/models/model_exams.py:33 +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" +msgid "Nervous system Exam" +msgstr "Exame do sistema nervoso" #: drdown/medicalrecords/models/model_exams.py:38 -msgid "Exam Name" -msgstr "Nome do exame" +msgid "Category" +msgstr "Categoria" + +#: drdown/medicalrecords/models/model_exams.py:40 +msgid "Please, insert the category of the exam" +msgstr "Por favor, insira a categoria do exame" -#: drdown/medicalrecords/models/model_exams.py:53 +#: drdown/medicalrecords/models/model_exams.py:46 +msgid "Observations" +msgstr "" + +#: drdown/medicalrecords/models/model_exams.py:70 msgid "Exams" msgstr "Exames" @@ -152,6 +177,7 @@ msgid "Medicine dosage" msgstr "Dosagem do remédio" #: drdown/medicalrecords/models/model_medicines.py:26 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:302 msgid "In use?" msgstr "Em uso?" @@ -159,42 +185,17 @@ 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:32 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:301 +msgid "Time between uses" +msgstr "Tempo entre usos" + +#: drdown/medicalrecords/models/model_medicines.py:47 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:67 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:281 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" @@ -229,20 +230,20 @@ msgstr "Novo prontuário" 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_complaint_form.html:42 +#: 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" msgstr "Salvar" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:39 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html:44 #: 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 +258,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 +270,192 @@ msgstr "Anexos" msgid "Medical Record:" msgstr "Prontuários:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:42 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:47 msgid "Return" msgstr "Retornar" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:51 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:55 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:58 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:115 +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:61 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:174 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:64 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:230 msgid "Medical Exams" msgstr "Exames Médicos" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:92 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:87 msgid "Name: " msgstr "Nome: " -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:98 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:93 msgid "SUS: " msgstr "SUS: " -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:104 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:99 msgid "Birthday: " msgstr "Data de nascimento: " -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:112 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:106 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:118 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:181 msgid "New" msgstr "Novo" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:167 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:156 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:165 +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:179 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:310 msgid "Edit" msgstr "Editar" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:213 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:191 msgid "Weight at birth: " msgstr "Peso ao nascer:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:215 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:193 msgid "grams" msgstr "gramas" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:221 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:196 msgid "APGAR: " msgstr "APGAR:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:234 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:203 msgid "Heart Test:" msgstr "Teste do coraçãozinho:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:244 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:210 msgid "Ear Test:" msgstr "Teste da orelinha:" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:258 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:220 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:234 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:285 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:335 +msgid "Add" +msgstr "Adicionar" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:259 +msgid "Date" +msgstr "Data" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:262 +msgid "Obs" +msgstr "Obs" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:271 +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: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:297 +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_medicine_form.html:16 +msgid "Medicine" +msgstr "Remédio" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:320 -msgid "Vision:" -msgstr "Visão" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:299 +#| msgid "Patient Medicine" +msgid "Name of medicine" +msgstr "Nome do remédio" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:340 -msgid "Ear:" -msgstr "Audição" -#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:365 -msgid "Heart:" -msgstr "Coração" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:300 +msgid "Dosage" +msgstr "Dosagem" -#: 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:325 +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:405 -msgid "Nervous System:" -msgstr "Sistema nervoso:" +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:346 +msgid "Complaint day" +msgstr "Dia da queixa" + +#: drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html:371 +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:14 -msgid "New Medicine" -msgstr "Novo Remédio" +#: 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 -#, fuzzy -#| msgid "Static Data" msgid "Update Static Data" -msgstr "Dados estáticos" +msgstr "Atualizar Dados estáticos" -#: 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 "Name" +#~ msgstr "Nome" + +#~ 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/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/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/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_complaint.py b/drdown/medicalrecords/models/model_complaint.py index 7266f6a1..67ae79ba 100644 --- a/drdown/medicalrecords/models/model_complaint.py +++ b/drdown/medicalrecords/models/model_complaint.py @@ -20,6 +20,8 @@ class Complaint(models.Model): complaint_time = models.TimeField( _('Time of complaint'), + null=True, + blank=True ) patient = models.ForeignKey( diff --git a/drdown/medicalrecords/models/model_exams.py b/drdown/medicalrecords/models/model_exams.py index df02b6bc..19a66342 100644 --- a/drdown/medicalrecords/models/model_exams.py +++ b/drdown/medicalrecords/models/model_exams.py @@ -1,7 +1,8 @@ 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 _ +from django.utils import timezone +from django.core.exceptions import ValidationError class Exam(models.Model): @@ -22,31 +23,47 @@ 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() + ) + + def clean(self, *args, **kwargs): + if self.day: + if timezone.localdate().isoformat() < str(self.day): + raise ValidationError( + {'day': + _("The complaint cannot be in the future!")} + ) + + return super(Exam, self).clean() class Meta: verbose_name = _("Exam") diff --git a/drdown/medicalrecords/models/model_medicines.py b/drdown/medicalrecords/models/model_medicines.py index 6f888644..230d3374 100644 --- a/drdown/medicalrecords/models/model_medicines.py +++ b/drdown/medicalrecords/models/model_medicines.py @@ -24,7 +24,14 @@ class Medicine(models.Model): medicine_in_use = models.BooleanField( verbose_name=_('In use?'), - help_text=_('Does the patient still use this medication?') + help_text=_('Does the patient still use this medication?'), + default=True + ) + + medicine_use_interval = models.CharField( + _('Time between uses'), + max_length=50, + default="" ) author = models.ForeignKey( 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/templates/medicalrecords/medicalrecord_complaint_form.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html index 5d1ba225..b0ae9766 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_complaint_form.html @@ -16,27 +16,32 @@

    {% trans 'Add new Complaint' %}

    {{ form.media }} -
    + {% csrf_token %} {{ form.description.errors }}
    {{ form.description }}

    - - {{ form.complaint_day.errors }} + {% if form.complaint_day.errors %} +
    + {% for error in form.complaint_day.errors %} + {{ error|escape }} + {% endfor %} +
    + {% endif %}

    {{ form.complaint_time.errors }} -
    +

    - + -     {% trans "Cancel" %} + {% trans "Cancel" %}
    diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html index 49e5f4bd..01d65ee5 100644 --- a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html +++ b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_exam_form.html @@ -9,33 +9,67 @@ {% endblock %} {% block content %} -
    +
    -

    {% trans 'Add Specific Exams' %}

    +
    +
    +

    {% trans 'Add Exam' %}

    +
    +
    + +
    +
    +
    + {% csrf_token %} + {% for field in form %} +
    +
    + + + + {% if field.errors %} +
    + {% for error in field.errors %} + {{ error|escape }} + {% endfor %} +
    + {% endif %} + +
    + {{ field.label_tag }} +
    + +
    + {{ field }} +
    + + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} - +
    +
    - {% csrf_token %} + {% endfor %} +
    - {% for field in form %} -
    - {{ field.errors }} -

    - {{ field.label_tag }}
    - {{ field }} -

    -
    - {% endfor %} +
    +
    - +
    + +
    - {% trans "Cancel" %} +
    + {% trans "Cancel" %} +
    +
    +
    -
    -
    +
    {% endblock %} diff --git a/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html b/drdown/medicalrecords/templates/medicalrecords/medicalrecord_list.html index 9684f537..b58ade27 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,396 +39,342 @@
    -
    -
    -

    {% 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 %} +
    +
    +
    -
    - -
    - +