Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: validacao passos de cadastro RF-1 #31

Merged
merged 7 commits into from
Mar 22, 2019
Merged

feat: validacao passos de cadastro RF-1 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87abd81
#10 #21 - incluindo validação nos campos do formulário
JordanPena Mar 14, 2019
97dcc8c
feat: #8 #14 - implementação de mascara e validacao input cnpj
JordanPena Mar 15, 2019
5f8f5fe
feat: closes #8, closes #14; validacao formulario, natureza juridica …
JordanPena Mar 21, 2019
e08838a
refactor: Tela passo 4 - Msg de cadastrada com sucesso #11
edoura Mar 16, 2019
e9608a2
feat: #8 #14 - implementação de mascara e validacao input cnpj
JordanPena Mar 15, 2019
4545be3
feat: #10 - validacao sigla cadastrada no banco
JordanPena Mar 22, 2019
b7f588e
merge feature/validacaoformulario in develop
JordanPena Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"jquery": "^3.3.1",
"js-marker-clusterer": "^1.0.0",
"ngx-bootstrap": "^3.0.1",
"ngx-mask": "^7.6.5",
"rxjs": "6.3.3",
"zone.js": "~0.8.26"
},
Expand Down
3 changes: 3 additions & 0 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { EntidadeService } from './entidade.service';
import { AgmCoreModule } from '@agm/core';
import { AgmJsMarkerClustererModule } from '@agm/js-marker-clusterer';

import {NgxMaskModule} from 'ngx-mask';

import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { ModalModule } from 'ngx-bootstrap/modal';
Expand All @@ -42,6 +44,7 @@ import { ModalEntityProfileComponent } from './maps/modal-entity-profile/modal-e
FormsModule,
ReactiveFormsModule,
HttpClientModule,
NgxMaskModule.forRoot(),
BsDropdownModule.forRoot(),
TooltipModule.forRoot(),
ModalModule.forRoot(),
Expand Down
2 changes: 1 addition & 1 deletion src/app/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class AuthService {
}).catch((error) => {

console.log(error);
return new Promise((resolve) => resolve("erro"))
return new Promise((resolve) => resolve(error))
})
}

Expand Down
8 changes: 8 additions & 0 deletions src/app/entidade.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ export class EntidadeService {
});
};

public recuperaEntidadePorCnpj(cnpj: string): any {

return this.db.list('/entidades', ref => ref.orderByChild("cnpj").equalTo(cnpj)).valueChanges();
}

public recuperaEntidadePorSigla(sigla: string): any {

return this.db.list('/entidades', ref => ref.orderByChild("sigla").equalTo(sigla)).valueChanges();
}

}
98 changes: 58 additions & 40 deletions src/app/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@

<div class="collapse navbar-collapse" [ngClass]="{ 'show': navbarOpen }">
<ul class="nav navbar-nav mr-auto">
<!--
<li class="nav-item pt-2 pt-lg-0">
<a class="nav-link text-warning alert-link" href="#" *ngIf="!salvo"
(click)="openModalEntityRegister(templateEntityRegister)">Cadastrar
ONG</a>
</li>
<!-- para próxima entrega.
para próxima entrega.
<li class="nav-item">
<a class="nav-link" href="#">Causa</a>
</li>
Expand All @@ -30,9 +31,17 @@
</li>
-->
</ul>
<!-- para próxima entrega.
<ul class="nav navbar-nav pt-3 pt-lg-0">
<div class="dropdown">


<ul class="nav navbar-nav pt-3 pt-lg-0">

<li class="nav-item pt-2 pt-lg-0">
<a class="nav-link text-warning alert-link" href="#" *ngIf="!salvo"
(click)="openModalEntityRegister(templateEntityRegister)">Cadastrar
ONG</a>
</li>

<!--<div class="dropdown">
<button class="btn btn-sm btn-outline-warning dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Entrar
Expand All @@ -44,9 +53,9 @@
<small class="dropdown-header" style="font-size:12px">Painel</small>
<a class="dropdown-item" href="#">Usuário solidário</a>
</div>
</div>
</ul>
-->
</div> -->
</ul>

</div>
</div>
</nav>
Expand All @@ -68,44 +77,50 @@ <h4 class="modal-title text-center" *ngIf="registrationSteps == 4">Entidade Soci

<form [formGroup]="formCadastro" (ngSubmit)="onSubmit()">

<div class="alert alert-danger" role="alert" *ngIf="msgErro != ''">
{{ msgErro }}
</div>

<div class="modal-body bg-light" *ngIf="registrationSteps != 4" [ngClass]="{'pb-1': registrationSteps == 1}">

<div class="input-group form-group" *ngIf="registrationSteps == 1">

<input type="text" id="cnpj" formControlName="cnpj" maxlength="14" name="cnpj" #cnpj
class="form-control form-control-lg" placeholder="CNPJ - apenas números" aria-describedby="basic-addon2">
<input type="text" id="cnpj" formControlName="cnpj" name="cnpj" autofocus
class="form-control form-control-lg" placeholder="CNPJ - apenas números"
aria-describedby="basic-addon2" maxlength="18" mask='00.000.000/0000-00'>

<div class="input-group-append">
<button class="btn btn-secondary" type="button" (click)="buscaCnpj(cnpj.value);"><i
class="fas fa-search"></i></button>
<button class="btn btn-secondary" type="button" (click)="buscaCnpj();"
[disabled]="!formCadastro.controls['cnpj'].valid || msgErro != ''">
<i class="fas fa-search"></i></button>
</div>
</div>

<div class="form-group" *ngIf="registrationSteps == 2">
<small class="form-text">Razão Social</small>
<input type="text" formControlName="razaoSocial" name="razaoSocial" class="form-control form-control-sm"
id="razao-social" disabled>
<small class="form-text">Razão Social</small>
</div>

<!--<div class="form-group" *ngIf="registrationSteps == 2">
<input type="text" formControlName="atividadePrincipal" name="atividadePrincipal" class="form-control form-control-sm"
id="atividade-principal" disabled>
</div>-->

<div class="form-group" *ngIf="registrationSteps == 2">
<input type="text" formControlName="nomeFantasia" name="nomeFantasia"
class="form-control font-weight-bold text-uppercase" id="nomeFantasia">
<small class="form-text">Nome fantasia</small>
<input type="text" formControlName="nomeFantasia" name="nomeFantasia"
class="form-control font-weight-bold text-uppercase" id="nomeFantasia"
[ngClass]="aplicaCSSerro('nomeFantasia')">
<small class="invalid-feedback">Campo inválido</small>
</div>

<div class="form-group" *ngIf="registrationSteps == 2">
<input type="email" formControlName="email" name="email" class="form-control text-lowercase" id="email">
<small class="form-text">E-mail principal da ONG</small>
<input type="email" formControlName="email" name="email" class="form-control text-lowercase" id="email"
[ngClass]="aplicaCSSerro('email')">
<small class="invalid-feedback">Campo inválido</small>
</div>

<!-- TODO: transformar em select -->
<div class="form-group" *ngIf="registrationSteps == 2">
<select class="custom-select" formControlName="areaAtuacao" name="areaAtuacao" id="area-de-atuacao">
<small class="form-text">Área de atuação</small>
<select class="custom-select form-control" formControlName="areaAtuacao" name="areaAtuacao"
id="area-de-atuacao" [ngClass]="validaSelecioneAreaAtuacao()">
<option value="selecione" selected="true" disabled="disabled">Selecione...</option>
<option value="Idosos">Idosos</option>
<option value="Crianças">Crianças</option>
Expand All @@ -123,7 +138,7 @@ <h4 class="modal-title text-center" *ngIf="registrationSteps == 4">Entidade Soci
<option value="Doação de Órgãos">Doação de Órgãos</option>
<option value="Outros">Outros</option>
</select>
<small class="form-text">Área de atuação</small>
<small class="invalid-feedback">Campo obrigatório</small>
</div>

<div *ngIf="registrationSteps == 2" style="height:135px;">
Expand All @@ -134,14 +149,15 @@ <h4 class="modal-title text-center" *ngIf="registrationSteps == 4">Entidade Soci
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon3">ongbook.org/</span>
</div>
<input type="text" class="form-control" formControlName="sigla" name="sigla" id="sigla"
aria-describedby="basic-addon3" placeholder="Sigla da ONG">
<input type="text" class="form-control text-lowercase" formControlName="sigla" name="sigla" id="sigla"
(blur)="validaSigla()" aria-describedby="basic-addon3" placeholder="Sigla da ONG" autocomplete="off"
[ngClass]="aplicaCSSerro('sigla')" mask="A*" maxlength="12">
<small class="invalid-feedback">Campo inválido</small>
</div>

<small *ngIf="registrationSteps == 3">Coordenador responsável</small>
<div class="jumbotron pt-3 pb-2 mb-0" *ngIf="registrationSteps == 3" formGroupName="responsavel">

<h6 *ngIf="registrationSteps == 3">Coordenador responsável</h6>

<!-- div class="input-group form-group" *ngIf="registrationSteps == 3">
<input type="text" id="cpf" formControlName="cpf" name="cpf" #buscaCpf class="form-control" placeholder="CPF"
aria-describedby="basic-addon2">
Expand All @@ -151,12 +167,16 @@ <h6 *ngIf="registrationSteps == 3">Coordenador responsável</h6>
</div -->

<div class="form-group" *ngIf="registrationSteps == 3">
<input type="text" class="form-control" placeholder="Nome" formControlName="nome" name="nome" id="nome">
<input type="text" class="form-control" placeholder="Nome" formControlName="nome" name="nome"
id="nome" [ngClass]="aplicaCSSerroInputsResponsavel('nome')">
<small class="invalid-feedback">Campo inválido</small>
</div>

<div class="form-group" *ngIf="registrationSteps == 3">
<input type="email" class="form-control" placeholder="E-mail" formControlName="emailResponsavel"
name="emailResponsavel" id="emailResponsavel">
name="emailResponsavel" id="emailResponsavel"
[ngClass]="aplicaCSSerroInputsResponsavel('emailResponsavel')">
<small class="invalid-feedback">Campo inválido</small>
</div>

<!--<div class="form-group" *ngIf="registrationSteps == 3">
Expand All @@ -165,8 +185,9 @@ <h6 *ngIf="registrationSteps == 3">Coordenador responsável</h6>
</div> -->

<div class="form-group" *ngIf="registrationSteps == 3">
<input type="password" class="form-control" placeholder="Senha" formControlName="senhaOk" name="senhaOk"
id="senhaOk">
<input type="password" class="form-control" placeholder="Senha" formControlName="senhaOk"
name="senhaOk" id="senhaOk" [ngClass]="aplicaCSSerroInputsResponsavel('senhaOk')">
<small class="invalid-feedback">Campo inválido</small>
</div>

</div>
Expand Down Expand Up @@ -198,15 +219,12 @@ <h6 *ngIf="registrationSteps == 3">Coordenador responsável</h6>
<div class="form-group mb-1">
<button type="button" class="btn btn-sm btn-outline-secondary mr-2"
*ngIf="registrationSteps != 1 && registrationSteps != 4" (click)="backStep();">Voltar</button>
<button type="button" class="btn btn-sm btn-success" *ngIf="registrationSteps == 2" (click)="nextStep();"
[disabled]="formCadastro.controls['areaAtuacao'].value == 'selecione'">Avançar</button>
<!-- <button type="submit" class="btn btn-sm btn-success" *ngIf="registrationSteps == 3"
[disabled]="!formCadastro.valid">Cadastrar</button> -->

<!-- SÓ PARA TESTE - CRIAR PASSO 4 -->
<button class="btn btn-sm btn-success" *ngIf="registrationSteps == 3" (click)="nextStep();">Passo 4</button>
<!-- End: SÓ PARA TESTE - CRIAR PASSO 4 -->

<button type="button" class="btn btn-sm btn-success" *ngIf="registrationSteps == 2"
(click)="registrationSteps = 3;" [disabled]="formCadastro.controls['areaAtuacao'].value == 'selecione'
|| !formCadastro.controls['email'].valid
|| !formCadastro.controls['nomeFantasia'].valid">Avançar</button>
<button class="btn btn-sm btn-success" *ngIf="registrationSteps == 3"
[disabled]="!formCadastro.valid">Cadastrar</button>
<small id="emailHelp" class="form-text text-muted text-right mt-2" style="font-size:10px"
*ngIf="registrationSteps != 1 && registrationSteps != 4">Passo
{{ registrationSteps }}/4.</small>
Expand Down
Loading