Merge remote-tracking branch 'origin/master'

backoffice/src/main/java/uy/edu/fing/tse/jsf/UserLoginBean.java

@@ -40,8 +40,12 @@ public class UserLoginBean implements Serializable {
 
         final var s = securityLocal.login(user);
         LOG.info(s);
+
+
     }
 
+
+
     public void register() {
         final var s = securityLocal.register(user);
     }

backoffice/src/main/webapp/jsf/login.xhtml

@@ -11,17 +11,17 @@
     <ui:define name="contenido">
         <h:form>
             <h1>LOGIN</h1>
-            <h:panelGrid columns="2" cellpadding="5" id="form">
+            <h:panelGrid columns="3" cellpadding="5" id="form">
 
                 <h:outputLabel for="username" value="Username:"/>
-                <p:inputText id="username" value="#{userLoginView.user.mail}" required="true" label="username"/>
-
+                <p:inputText id="username" value="#{userLoginView.user.mail}" required="true" requiredMessage="Ingrese su e-mail" label="username"/>
+                <p:message id="msgName" for="username"/>
                 <h:outputLabel for="password" value="Password:"/>
-                <p:password id="password" value="#{userLoginView.user.password}" required="true" label="password"/>
-
+                <p:password id="password" value="#{userLoginView.user.password}" required="true" requiredMessage="Ingrese: su password" label="password"/>
+                <p:message id="msgPassword" for="password"/>
                 <f:facet name="footer">
-                    <p:commandButton value="Register" action="register.xhmtl?faces-redirect=true" update="form"/>
-                    <p:commandButton value="Login" action="#{userLoginView.login()}"/>
+                    <p:commandButton value="Register" action="register.xhmtl?faces-redirect=true" update="form"  async="true" process="@this"/>
+                    <p:commandButton value="Login" action="#{userLoginView.login()}" update="form" />
                 </f:facet>
             </h:panelGrid>
         </h:form>

backoffice/src/main/webapp/jsf/register.xhtml

@@ -11,20 +11,25 @@
     <ui:define name="contenido">
         <h:form>
             <h1>Register</h1>
-            <h:panelGrid columns="2" cellpadding="5" id="form">
+            <h:panelGrid columns="3" cellpadding="5" id="form">
 
                 <h:outputLabel for="username" value="Username:"/>
-                <p:inputText id="username" value="#{userLoginView.user.mail}" required="true" label="username"/>
+                <p:inputText id="username" value="#{userLoginView.user.mail}" required="true"  requiredMessage="Ingrese su e-mail" label="username"/>
+                <p:message id="msgName" for="username"/>
 
                 <h:outputLabel for="password" value="Password:"/>
-                <p:password id="password" value="#{userLoginView.user.password}" required="true" label="password"/>
+                <p:password id="password" value="#{userLoginView.user.password}" required="true" requiredMessage="Ingrese su password" label="password"/>
+                <p:message id="msgPassword" for="password"/>
 
                 <h:outputLabel for="repassword" value="RePassword:"/>
-                <p:password id="repassword" value="#{userLoginView.repassword}" required="true" label="repassword"/>
+                <p:password id="repassword" value="#{userLoginView.repassword}" required="true" requiredMessage="Reingrese su password" label="repassword"/>
+                <p:message id="msgrepassword" for="repassword"/>
 
                 <f:facet name="footer">
-                    <p:commandButton value="Register" action="#{userLoginView.register()}"/>
+                    <p:commandButton value="Register" action="#{userLoginView.register()}"  update="form"/>
+                    <p:commandButton value="Volver" action="login.xhmtl?faces-redirect=true" update="form"  async="true" process="@this"/>
                 </f:facet>
+
             </h:panelGrid>
         </h:form>
     </ui:define>