Merge branch 'Bug-Login' into devel

fga-eps-mds · Dec 3, 2017 · 0556191 · 0556191
2 parents cb59b6b + 507f280
commit 0556191
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/medical_prescription/templates/landing/footer.html b/medical_prescription/templates/landing/footer.html
@@ -8,18 +8,18 @@
             <div class="row">
                 <div class="col-sm-3 g-margin-b-10--xs g-margin-b-10--md">
                     <ul class="list-unstyled g-ul-li-tb-5--xs g-margin-b-0--xs">
-                        <li><a class="g-font-size-15--xs g-color--white-opacity" href="">{% trans "Home" %}</a></li>
+                        <li><a class="g-font-size-15--xs g-color--white-opacity" href="{% url 'landing_page' %}">{% trans "Home" %}</a></li>
 
                     </ul>
                 </div>
                 <div class="col-sm-3 g-margin-b-10--xs g-margin-b-10--md">
                     <ul class="list-unstyled g-ul-li-tb-5--xs g-margin-b-0--xs">
-                        <li><a class="g-font-size-15--xs g-color--white-opacity" href="">{% trans "Sobre o projeto" %}</a></li>
+                        <li><a class="g-font-size-15--xs g-color--white-opacity" href="https://github.com/fga-gpp-mds/2017.2-Receituario-Medico/wiki/Documento-de-Vis%C3%A3o">{% trans "Sobre o projeto" %}</a></li>
                     </ul>
                 </div>
                 <div class="col-sm-3 g-margin-b-10--xs g-margin-b-10--md">
                     <ul class="list-unstyled g-ul-li-tb-5--xs g-margin-b-0--xs">
-                        <li><a class="g-font-size-15--xs g-color--white-opacity" href="">{% trans "Sobre a equipe" %}</a></li>
+                        <li><a class="g-font-size-15--xs g-color--white-opacity" href="https://github.com/fga-gpp-mds/2017.2-Receituario-Medico/wiki">{% trans "Sobre a equipe" %}</a></li>
                     </ul>
                 </div>
                 <div class="g-margin-b-12--xs g-margin-b-0--md" align="right">

diff --git a/medical_prescription/user/constants.py b/medical_prescription/user/constants.py
@@ -110,6 +110,7 @@
 EMAIL_ADRESS = 'medicalprescriptionapp@gmail.com'
 EMAIL_SUCESS_MESSAGE = 'Verifique a caixa de entrada do seu email para recuperar sua senha.'
 EMAIL_MESSAGE_EXIST = 'Um email de recuperação de senha já foi enviado para este endereço!'
+EMAIL_NOT_EXIST_MESSAGE = "Usuário não encontrado"
 
 # DATE_OF_BIRTH FIELDS.
 DATE_OF_BIRTH = "Date of birth"

diff --git a/medical_prescription/user/templates/login_healthprofessional.html b/medical_prescription/user/templates/login_healthprofessional.html
@@ -40,8 +40,8 @@ <h2 class="g-font-size-30--xs g-color--white">Login</h2>
 
                 <div class="g-text-center--xs">
                   <button type="submit" class="text-uppercase btn-block s-btn s-btn--md s-btn--white-bg g-radius--50 g-padding-x-50--xs g-margin-b-20--xs">Login</button>
-                  <a class="g-color--white g-font-size-13--xs" href="{% url 'reset_password' %}">{% trans "Esqueceu sua senha?" %}</a><br>
-                  <a class="g-color--white g-font-size-13--xs" href="{% url 'register' %}">{% trans "É um profissional de saúde e não possui uma conta?<br>Cadastre-se já" %}</a>
+                  <a class="g-color--white g-font-size-14--xs" href="{% url 'reset_password' %}">{% trans "Esqueceu sua senha?" %}</a><br>
+                  <a class="g-color--white g-font-size-14--xs" href="{% url 'register' %}">{% trans "<br>Cadastre-se agora!" %}</a>
                 </div>
 
               </form>

diff --git a/medical_prescription/user/templates/login_patient.html b/medical_prescription/user/templates/login_patient.html
@@ -40,8 +40,8 @@ <h2 class="g-font-size-30--xs g-color--white">Login</h2>
 
                 <div class="g-text-center--xs">
                   <button type="submit" class="text-uppercase btn-block s-btn s-btn--md s-btn--white-bg g-radius--50 g-padding-x-50--xs g-margin-b-20--xs">Login</button>
-                  <a class="g-color--white g-font-size-13--xs" href="{% url 'reset_password' %}">{% trans "Esqueceu sua senha?" %}</a><br>
-                  <a class="g-color--white g-font-size-13--xs" href="{% url 'register' %}">{% trans "É um paciente e não possui uma conta?<br>Cadastre-se já" %}</a>
+                  <a class="g-color--white g-font-size-14--xs" href="{% url 'reset_password' %}">{% trans "Esqueceu sua senha?" %}</a><br>
+
                 </div>
 
               </form>

diff --git a/medical_prescription/user/templates/reset_password.html b/medical_prescription/user/templates/reset_password.html
@@ -21,8 +21,7 @@ <h2 class="g-font-size-24--xs g-color--primary g-margin-b-50--xs">{% trans "Recu
                                       {% endfor %}
 
                                       <div class="g-text-center--xs g-margin-b-80--xs">
-                                        <p>{% trans "Um email com um link de recuperação será enviado no email digitado abaixo<br>Obs:
-                                          Digite o email informado no registro da sua conta."%} </p>
+                                        <p>{% trans "Um email com um link de recuperação será enviado no email digitado abaixo<br>Obs: Digite o email informado no registro da sua conta." %} </p>
                                       </div>
                                       {{ form.email }}
 
@@ -36,7 +35,7 @@ <h2 class="g-font-size-24--xs g-color--primary g-margin-b-50--xs">{% trans "Recu
                               <!-- End Form -->
 
                               <!-- Contacts -->
-                              <div class="col-md-4 g-bg-color--primary-ltr js__form-eqaul-height-v1">
+                              <div class="col-md-4 g-bg-color--primary-ltr js__form-equal-height-v1">
                                 <br><br><br>
                                 <div class="g-overflow--hidden g-padding-x-40--xs g-padding-y-50--xs">
                                   <h2 class="g-font-size-24--xs g-color--white g-margin-b-150--xs">{% trans "Contate-nos"%}</h2>

diff --git a/medical_prescription/user/test/test_form_reset_password.py b/medical_prescription/user/test/test_form_reset_password.py
@@ -48,4 +48,4 @@ def test_user_reset_password_form_valid(self):
     def test_user_reset_password_form_invalid(self):
         form_data = {'email': self.email_valid_reset}
         form = ResetPasswordForm(data=form_data)
-        self.assertFalse(form.is_valid())
+        self.assertTrue(form.is_valid())
diff --git a/medical_prescription/user/validators/uservalidator.py b/medical_prescription/user/validators/uservalidator.py
@@ -49,7 +49,7 @@ def validator_email_in_reset_password(self, email):
         if email_from_database.exists():
             pass
         else:
-            raise ValidationError({'email': [_(constants.EMAIL_EXISTS)]})
+            pass
 
         logger.debug("Exit validator_email_in_reset_password.")
 

diff --git a/medical_prescription/user/views/resetpasswordview.py b/medical_prescription/user/views/resetpasswordview.py
@@ -48,7 +48,9 @@ def post(self, request, *args, **kwargs):
             user = User.objects.get(email=email)
         except:
             logger.exception("User not found.")
-            return render(request, 'message.html', {"message": "usuário não encontrado"})
+            messages.error(request, constants.EMAIL_NOT_EXIST_MESSAGE)
+            return render(request, 'reset_password.html',
+                          {"form": form})
 
         try:
 
@@ -61,7 +63,6 @@ def post(self, request, *args, **kwargs):
                       constants.EMAIL_ADRESS,
                       [email],
                       fail_silently=False)
-
             messages.success(request, constants.EMAIL_SUCESS_MESSAGE)
 
             return redirect('/')