forms bug fix

oasp-forge · Sep 21, 2016 · 4090618 · 4090618
1 parent ca34ac1
commit 4090618
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 52 deletions.
diff --git a/src/app/main/views/crud/view/Crud.component.ts b/src/app/main/views/crud/view/Crud.component.ts
@@ -6,8 +6,7 @@ import { SecurityService} from '../../../../oasp/oasp-security/oasp-security.ser
 
 @Component({
   selector:'crud',
-  templateUrl:'Crud.component.html',
-  providers:[SecurityService, CrudRestService, OaspI18n]
+  templateUrl:'Crud.component.html'
 })
 
 export class CrudComponent{

diff --git a/src/app/main/views/details/view/Details.component.ts b/src/app/main/views/details/view/Details.component.ts
@@ -8,8 +8,7 @@ import { OaspI18n } from '../../../../oasp/oasp-i18n/oasp-i18n.service';
   selector:'tableDetails',
   templateUrl:'Details.component.html',
   inputs:['parentTable'],
-  outputs:['resultEvent', 'closeWindowEvent'],
-  providers:[DetailsRestService, OaspI18n]
+  outputs:['resultEvent', 'closeWindowEvent']
 })
 
 export class DetailsComponent{

diff --git a/src/app/main/views/header/Header.component.ts b/src/app/main/views/header/Header.component.ts
@@ -8,8 +8,7 @@ import { SecurityService } from '../../../oasp/oasp-security/oasp-security.servi
 @Component({
     selector: 'header',
     templateUrl: 'Header.component.html',
-    inputs: ["logged", "user"],
-    providers: [OaspI18n, SecurityService]
+    inputs: ["logged", "user"]
 })
 
 export class HeaderComponent {

diff --git a/src/app/main/views/kitchen/view/Kitchen.component.ts b/src/app/main/views/kitchen/view/Kitchen.component.ts
@@ -5,8 +5,7 @@ import { KitchenRestService } from '../service/Kitchen.service.rest'
 
 @Component({
   selector:'kitchen',
-  templateUrl:'Kitchen.component.html',
-  providers: [KitchenRestService, OaspI18n, SecurityService]
+  templateUrl:'Kitchen.component.html'
 })
 
 export class KitchenComponent{

diff --git a/src/app/main/views/login/Login.component.html b/src/app/main/views/login/Login.component.html
@@ -4,7 +4,7 @@ <h1>{{i18n.loginPage.intro}}</h1>
     <img src="app/main/img/login_logo.png">
   </div>
 
-  <form (ngSubmit)="validateLogin(usernameLogin.value, passwordLogin.value)">
+  <form (ngSubmit)="validateLogin()" #loginForm="ngForm">
       <h2>{{i18n.loginPage.signIn}}</h2>
 
       <div class="cuadroUsuario">
@@ -14,17 +14,17 @@ <h2>{{i18n.loginPage.signIn}}</h2>
             {{i18n.loginPage.failed}}
           </div>
 
-          <!-- <div [hidden]="user.valid || user.pristine" class ="login-alert">
+          <div [hidden]="username.valid || username.pristine" class ="login-alert">
             {{i18n.loginPage.form.usernameError}}
-          </div> -->
-          <input [placeholder]="i18n.loginPage.form.usernamePlaceHolder" type="text" style="margin-bottom:10px;" #usernameLogin class="form-control" required ngControl="username">
+          </div>
+          <input type="text" [placeholder]="i18n.loginPage.form.usernamePlaceHolder" [(ngModel)]="user.username" style="margin-bottom:10px;" #username="ngModel"  name="username" class="form-control" required>
 
-          <!-- <div [hidden]="pass.valid || pass.pristine" class ="login-alert">
+          <div [hidden]="password.valid || password.pristine" class ="login-alert">
             {{i18n.loginPage.form.passwordError}}
-          </div> -->
-          <input type="password" [placeholder]="i18n.loginPage.form.passwordPlaceHolder" style="margin-bottom:10px;" #passwordLogin class="form-control" required ngControl="password">
+          </div>
+          <input type="password" [placeholder]="i18n.loginPage.form.passwordPlaceHolder" [(ngModel)]="user.password" style="margin-bottom:10px;" #password="ngModel" name="password" class="form-control" required>
 
       </div>
-      <button type="submit" class="btn btn-success">{{i18n.buttons.submitBtn}}</button>
+      <button type="submit" class="btn btn-success" [disabled] ="!loginForm.form.valid">{{i18n.buttons.submitBtn}}</button>
   </form>
 </div>
diff --git a/src/app/main/views/login/Login.component.ts b/src/app/main/views/login/Login.component.ts
@@ -1,28 +1,29 @@
 import { Component } from '@angular/core'
+import { User } from '../../models/user/User.model';
 import { Router } from '@angular/router'
 import { SecurityService } from '../../../oasp/oasp-security/oasp-security.service';
 import { OaspI18n } from '../../../oasp/oasp-i18n/oasp-i18n.service';
 
 @Component({
   selector:'login',
-  templateUrl: 'Login.component.html',
-  providers:[SecurityService, OaspI18n]
+  templateUrl: 'Login.component.html'
 })
 
 export class LoginComponent{
 
+  user: User = new User(0, "", "", 0);
   i18n
 
-  constructor(private router:Router, private oaspI18n: OaspI18n, private securityService:SecurityService){
+  constructor(private oaspI18n: OaspI18n, private securityService:SecurityService){
       this.i18n = oaspI18n.getI18n();
   }
 
   hideAlertLogin(){
       this.securityService.closeErrorLogin();
   }
 
-  validateLogin(username, password){
-      this.securityService.funcionLogin(username,password);
+  validateLogin(){
+      this.securityService.funcionLogin(this.user);
       this.securityService.functionsesionExpired();
   }
 

diff --git a/src/app/main/views/main/oasp4js-sample.component.html b/src/app/main/views/main/oasp4js-sample.component.html
@@ -13,22 +13,27 @@
 [modal]=true
 [TITLE]=autoLogInfo
 class="modaldialog">
-  <form (ngSubmit)="validateLogin(usernameLogin.value, passwordLogin.value)" #loginForm="ngForm">
-      <div [hidden]="securityService.geterrorLogin()" class="alert alert-danger">
-        <a href="#" class="close" (click) ="hideAlertLogin()">&times;</a>
-        {{i18n.loginPage.failed}}
-      </div>
-
-      <div [hidden]="user.valid || user.pristine" class ="login-alert">
-        {{i18n.loginPage.form.usernameError}}
-      </div>
-      <input [placeholder]="i18n.loginPage.form.usernamePlaceHolder" type="text" style="margin-bottom:10px;" #usernameLogin class="form-control" required ngControl="username">
-
-      <div [hidden]="pass.valid || pass.pristine" class ="login-alert">
-        {{i18n.loginPage.form.passwordError}}
-      </div>
-      <input type="password" [placeholder]="i18n.loginPage.form.passwordPlaceHolder" style="margin-bottom:10px;" #passwordLogin class="form-control" required ngControl="password">
-
-      <button type="submit" class="btn btn-success">{{i18n.buttons.submitBtn}}</button>
-  </form>
+<form (ngSubmit)="validateLogin()" #loginForm="ngForm">
+    <h2>{{i18n.loginPage.signIn}}</h2>
+
+    <div class="cuadroUsuario">
+
+        <div [hidden]="securityService.geterrorLogin() || securityService.getSessionExpired()" class="alert alert-danger">
+          <a href="#" class="close" (click) ="hideAlertLogin()">&times;</a>
+          {{i18n.loginPage.failed}}
+        </div>
+
+        <div [hidden]="username.valid || username.pristine" class ="login-alert">
+          {{i18n.loginPage.form.usernameError}}
+        </div>
+        <input type="text" [placeholder]="i18n.loginPage.form.usernamePlaceHolder" [(ngModel)]="user.username" style="margin-bottom:10px;" #username="ngModel"  name="username" class="form-control" required>
+
+        <div [hidden]="password.valid || password.pristine" class ="login-alert">
+          {{i18n.loginPage.form.passwordError}}
+        </div>
+        <input type="password" [placeholder]="i18n.loginPage.form.passwordPlaceHolder" [(ngModel)]="user.password" style="margin-bottom:10px;" #password="ngModel" name="password" class="form-control" required>
+
+    </div>
+    <button type="submit" class="btn btn-success" [disabled] ="!loginForm.form.valid">{{i18n.buttons.submitBtn}}</button>
+</form>
 </modal-dialog>
diff --git a/src/app/main/views/main/oasp4js-sample.component.ts b/src/app/main/views/main/oasp4js-sample.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+import { User } from '../../models/user/User.model'
 import { SecurityService} from '../../../oasp/oasp-security/oasp-security.service';
 import { OaspI18n} from '../../../oasp/oasp-i18n/oasp-i18n.service';
 
 @Component({
   selector: 'oasp4js-sample-app',
   templateUrl: 'oasp4js-sample.component.html',
-  styleUrls: ['../../css/oasp4js-sample.component.css'],
-  providers:[SecurityService, OaspI18n]
+  styleUrls: ['../../css/oasp4js-sample.component.css']
 })
 
 export class Oasp4jsSampleAppComponent {
-  title = "oasp4js-sample works!";
+
+  public user : User;
   public autoLogTitle = "Ooops...";
   public autoLogInfo = "Session time expired!";
 
@@ -25,7 +26,7 @@ export class Oasp4jsSampleAppComponent {
   }
 
   validateLogin(username, password){
-      this.securityService.funcionLogin(username,password);
+      this.securityService.funcionLogin(this.user);
       this.securityService.functionsesionExpired();
   }
 

diff --git a/src/app/oasp/oasp-security/oasp-security.service.ts b/src/app/oasp/oasp-security/oasp-security.service.ts
@@ -3,9 +3,9 @@ import { Router } from "@angular/router";
 import { Observable } from 'rxjs/Rx';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/toPromise';
-import { HttpClient } from './http-client.service'
 import { User } from '../../main/models/user/User.model';
 import { BusinessOperations } from '../../main/BusinessOperations';
+import {HttpClient} from './http-client.service'
 
 export var Headerlogged = false;
 export var sessionExpired = false;
@@ -24,10 +24,10 @@ export class SecurityService{
     constructor(private router: Router, private http:HttpClient) {
     }
 
-    funcionLogin(username,password){
+    funcionLogin(u){
     let formData={
-      j_username:username,
-      j_password:password
+      j_username: u.username,
+      j_password: u.password
     };
 
     this.http.post(this.BO.loginPOST,JSON.stringify(formData))
@@ -42,6 +42,7 @@ export class SecurityService{
                         sessionExpired = false;
                         this.http.addDefaultHeader('X-CSRF-TOKEN', csrfToken)
                         Headerlogged = true
+                        //GET USER FROM BACKEND CURRENTUSER FUNCTION
                         user = new User(0,"notUserYet", "notPasswordYet", 3);
                         if(user.permission == 1 || 3){
                             this.router.navigate(['/Tables'])
@@ -50,12 +51,11 @@ export class SecurityService{
                             this.router.navigate(["/Kitchen"])
                         }
 
-                        this.http.get(this.BO.userGET)
-                           .map(res => res.json())
-                           .subscribe(data => {
-                           })
+                        // this.http.get(this.BO.userGET)
+                        //    .map(res => res.json())
+                        //    .subscribe(data => {
+                        //    })
                     })
-                    //GET USER FROM BACKEND CURRENTUSER FUNCTION
     },
     err => {errorLogin = false})
     }