From 46d0ab1e5de2550dc8cfb22632b82e0828ea1af1 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Sun, 9 Oct 2022 16:47:51 -0300 Subject: [PATCH 1/2] UPDATE! NOTIFICATION FINALLY WORKS! --- .../controllers/PessoaController.java | 11 +- .../interfaces/PessoaRepository.java | 6 +- .../main/src/app/body/body.component.html | 6 +- frontend/main/src/app/body/body.component.ts | 111 +++++++++++++----- frontend/main/src/app/edit/edit.component.ts | 4 +- frontend/main/src/app/loginservice.service.ts | 35 ++++-- frontend/main/src/app/quote.service.ts | 4 +- .../main/src/app/ship-qt/ship-qt.component.ts | 1 - 8 files changed, 117 insertions(+), 61 deletions(-) diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java index 6ffcfc6..9c81bfc 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java @@ -1,11 +1,15 @@ package br.com.entra21.teamroxo.TMSProject.controllers; +import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; import java.time.temporal.TemporalAdjuster; import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.logging.SimpleFormatter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; @@ -28,13 +32,11 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import br.com.entra21.teamroxo.TMSProject.TmsProjectApplication; import br.com.entra21.teamroxo.TMSProject.interfaces.CountVisitorsRepository; import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository; import br.com.entra21.teamroxo.TMSProject.template.CountVisitors; import br.com.entra21.teamroxo.TMSProject.template.ItemNivel3; import br.com.entra21.teamroxo.TMSProject.template.Pessoa; -import br.com.entra21.teamroxo.TMSProject.template.RegisterQuote; @RestController @CrossOrigin(origins = "*") @@ -77,8 +79,7 @@ public List birthNow(){ @GetMapping("/birthmonth") public List birthMonth(){ - return pessoaRepository.findBirthMonth(LocalDate.now().withMonth(LocalDate.now().getMonthValue()).with(TemporalAdjusters.firstDayOfMonth()), - LocalDate.now().withMonth(LocalDate.now().getMonthValue()).with(TemporalAdjusters.lastDayOfMonth())); + return pessoaRepository.findBirthMonth(LocalDate.now()); } @GetMapping("/bounce") @@ -107,6 +108,8 @@ public Pessoa register(@RequestBody Pessoa dados) { public void deletePessoa(@PathVariable("id") int id){ pessoaRepository.deleteById(id); } + + private List obterListaCompleta() { diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java index 9602bc6..cc92091 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java @@ -15,10 +15,10 @@ @EnableJpaRepositories public interface PessoaRepository extends JpaRepository { - @Query("FROM Pessoa WHERE birth = :now") + @Query("FROM Pessoa WHERE MONTH(birth) = EXTRACT(MONTH FROM :now) AND DAY(birth) = EXTRACT(DAY FROM :now)") List findBirth (@Param("now") LocalDate now); - @Query("FROM Pessoa WHERE birth BETWEEN :firstDay and :lastDay") - List findBirthMonth (@Param("firstDay") LocalDate first, @Param("lastDay") LocalDate last); + @Query("FROM Pessoa WHERE MONTH(birth) = EXTRACT(MONTH FROM :now)") + List findBirthMonth (@Param("now") LocalDate now); } diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 6817635..58f979b 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -69,14 +69,14 @@

{{this.notificationCount}}
-
+

{{notify.title}} - +

{{notify.text}}

@@ -208,4 +208,4 @@

{{loginService.nome}}
Sair    Edit

- \ No newline at end of file + diff --git a/frontend/main/src/app/body/body.component.ts b/frontend/main/src/app/body/body.component.ts index 5edc99e..b3a49d2 100644 --- a/frontend/main/src/app/body/body.component.ts +++ b/frontend/main/src/app/body/body.component.ts @@ -3,7 +3,7 @@ import { LoginComponent } from '../login/login.component'; import { LoginserviceService } from '../loginservice.service'; import { HttpClient } from '@angular/common/http'; import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { catchError, Observable } from 'rxjs'; import { NotificationService } from '../notification.service'; @Component({ @@ -17,65 +17,112 @@ export class BodyComponent implements OnInit { readonly APIBirthMonth: string = "http://localhost:8080/user/birthmonth" - birthnow! : string - birthmonth! : string - aniversariantes!: Array - aniversariantesMes!: Array - notificacoes!:Array - notificationCount!:number + birthnow!: string + birthmonth!: string + aniversariantes: Array = new Array() + aniversariantesMes: Array = new Array() + notificacoes: Array = new Array() + notificationCount!: number id!: number nome!: string email!: string - birth!: Date + birth!: string document!: string - constructor(public loginService:LoginserviceService, private router:Router, private http:HttpClient, private notify:NotificationService) { } + constructor(public loginService: LoginserviceService, private router: Router, private http: HttpClient, private notify: NotificationService) { } ngOnInit(): void { - this.aniversariantes = new Array() - this.aniversariantesMes = new Array() this.notificacoes = new Array() - if(this.loginService.document == null || this.loginService.birth == null){ - this.notificacoes.push({title:"Complete seu Cadastro!", text:"Clique aqui para concluir!", route:"edit"}) - } - this.http.get(this.APIBirthNow) - .subscribe((resultado:any) => { + .subscribe((resultado: any) => { - var count = Object.keys(resultado).length + console.log(resultado); - for(let i=0;i { + .subscribe((resultado: any) => { + + var count = Object.keys(resultado).length + + for (let i = 0; i < count; i++) { + + this.aniversariantesMes.push({ id: resultado[i].id, nome: resultado[i].nome, email: resultado[i].email, birth: resultado[i].birth, document: resultado[i].document }) + + } + + }); + + setTimeout(() => { + this.notification() + }, 450); + + } + + notification() { - var count = Object.keys(resultado).length + if (this.loginService.succeed == true) { + console.log(this.loginService.document, this.loginService.birth); - for(let i=0;i { - this.aniversariantesMes.push({id: resultado[i].id ,nome: resultado[i].nome, email: resultado[i].email, birth: resultado[i].birth, document: resultado[i].document}) + if (this.loginService.birth) { + console.log('DOCUMENTOS CORRETOS!'); + } else { + this.notificacoes.push({ title: "Complete seu Cadastro!", text: "Clique aqui para concluir!", route: "edit" }) + } + + if (this.loginService.document) { + console.log('DOCUMENTOS CORRETOS!'); + } else { + this.notificacoes.push({ title: "Complete seu Cadastro!", text: "Clique aqui para concluir!", route: "edit" }) + } + + }, 500); + + this.http.get(this.APIBirthNow) + .subscribe((resultado: any) => { + + var count = Object.keys(resultado).length + + for (let i = 0; i < count; i++) { - } + if (resultado[i].id === this.loginService.pessoaID) { //verificar qual ID a API tá retornando + this.notificacoes.push({ title: "Hoje é seu Aniversário!", text: "Parabéns, "+this.loginService.nome.split(' ').at(0)+"! Para comemorar temos algumas ofertas para você. Confira!", route: "ship-quote" }) + } + } + }) - }); + setTimeout(() => { - this.notificationCount = this.notificacoes.length + this.notificationCount = this.notificacoes.length + + if (this.notificationCount === 0) { + this.notificacoes.push({ title: 'Tudo certo por aqui, '+this.loginService.nome.split(' ').at(0)+'!', text: 'Te avisaremos qualquer coisa! 😉', route:'#' }) + } + + }, 600); + + } + + if(this.loginService.succeed == false){ + this.ngOnInit(); + } } - sair(){ + sair() { this.loginService.succeed = false; + this.ngOnInit(); } } diff --git a/frontend/main/src/app/edit/edit.component.ts b/frontend/main/src/app/edit/edit.component.ts index 7c0e0ca..9b9d95a 100644 --- a/frontend/main/src/app/edit/edit.component.ts +++ b/frontend/main/src/app/edit/edit.component.ts @@ -10,7 +10,7 @@ import { LoginserviceService } from '../loginservice.service'; export class EditComponent implements OnInit { name!:string user!:string -birth!:Date +birth!:string document!:string email!:string password!:string @@ -21,7 +21,7 @@ password!:string constructor( private router:Router, private login: LoginserviceService - + ) { } ngOnInit(): void { diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index e9a15f5..b07cd79 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -3,7 +3,9 @@ import { Injectable } from '@angular/core'; import { InjectSetupWrapper } from '@angular/core/testing'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import { catchError, Observable } from 'rxjs'; +import { BodyComponent } from './body/body.component'; import { LoginComponent } from './login/login.component'; +import { NotificationService } from './notification.service'; @Injectable({ providedIn: 'root' @@ -19,7 +21,7 @@ export class LoginserviceService implements CanActivate { user!: string email!: string password!: string - birth!: Date + birth!: string document!: string //DADOS DE CONTROLE @@ -40,6 +42,8 @@ export class LoginserviceService implements CanActivate { logging(user: string, password: string) { + console.log('login service iniciado'); + this.progress = true let build: any = { @@ -51,14 +55,30 @@ export class LoginserviceService implements CanActivate { .pipe( catchError((error)=>{ this.progress = false + console.log(error); return error + }) ) .subscribe((response:any)=>{ + console.log('API works'); + console.log(response); + this.admin = response[0].admin this.enterprise = response[0].enterprise this.user = response[0].user + this.pessoaID = response[0].pessoa_id + this.password = response[0].senha + + this.http.get(this.TMSLoginAPI+'/user/'+response[0].pessoa_id) + .subscribe((resp:any) =>{ + console.log(resp); + this.nome = resp.nome + this.birth = resp.birth + this.document = resp.document + this.email = resp.email + }) if(this.admin == true){ this.adminEnter = true; @@ -75,30 +95,19 @@ export class LoginserviceService implements CanActivate { new LoginComponent(this.router, this, this.http).gotoHome(); } - this.http.get(this.TMSLoginAPI+'/user/'+response[0].pessoa_id) - .subscribe((resp:any) =>{ - console.log(resp); - this.nome = resp.nome - this.pessoaID = response[0].pessoa_id - this.birth = resp.birth - this.document = resp.document - this.email = resp.email - this.password = response[0].senha - }) - let bounce: any = { "user": response[0].user } this.http.post(this.APIBounceInit, bounce) .subscribe((response: any) => { - console.log(response); this.idBounce = response.id this.userBounce = response.user this.dateBounce = response.date this.timeBounce = response.time }) }) + } registering(name: string, user: string, email: string, password: string) { diff --git a/frontend/main/src/app/quote.service.ts b/frontend/main/src/app/quote.service.ts index 85787f1..b92f150 100644 --- a/frontend/main/src/app/quote.service.ts +++ b/frontend/main/src/app/quote.service.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { type } from 'os'; import { catchError } from 'rxjs'; +import { BodyComponent } from './body/body.component'; import { LoginserviceService } from './loginservice.service'; import { RctQtComponent } from './rct-qt/rct-qt.component'; import { ShipQtComponent } from './ship-qt/ship-qt.component'; @@ -24,7 +25,6 @@ export class QuoteService { quote(cepOrigem:string, cepDestino:string):any{ //ATUALIZA BOUNCE - new LoginserviceService(this.router, this.http) this.newBounce = { "id":this.login.idBounce, @@ -46,7 +46,6 @@ export class QuoteService { recQuote():any{ //ATUALIZA BOUNCE - new LoginserviceService(this.router, this.http) this.newBounce = { "id":this.login.idBounce, @@ -68,7 +67,6 @@ export class QuoteService { regRecentQuotes(object:any){ //ATUALIZA BOUNCE - new LoginserviceService(this.router, this.http) this.newBounce = { "id":this.login.idBounce, diff --git a/frontend/main/src/app/ship-qt/ship-qt.component.ts b/frontend/main/src/app/ship-qt/ship-qt.component.ts index 921a5f0..bc0099d 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -53,7 +53,6 @@ export class ShipQtComponent implements OnInit { this.quotes = new Array() //ATUALIZA BOUNCE - new LoginserviceService(this.router, this.http) this.newBounce = { "id":this.loginService.idBounce, From 23eea2e39fc0f6b0dad355e8749c8f38287bdc5c Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Sun, 9 Oct 2022 17:03:39 -0300 Subject: [PATCH 2/2] UPDATE --- frontend/main/src/app/ship-qt/ship-qt.component.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/main/src/app/ship-qt/ship-qt.component.ts b/frontend/main/src/app/ship-qt/ship-qt.component.ts index bc0099d..2db31e5 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -102,7 +102,7 @@ export class ShipQtComponent implements OnInit { this.precoFrete = (this.priceFix + this.distance * response[i].taxa * this.cubagem); - this.quotes.push({ precoFrete: this.precoFrete, tempo: this.tempo, start_adress: this.start_adress, end_address: this.end_address, carrier: response[i].razao, vol: this.vol, cubagem: this.cubagem, carrierID: response[i].id, pessoaID: this.loginService.pessoaID }); + this.quotes.push({ precoFrete: this.precoFrete.toLocaleString('pt-BR', {minimumFractionDigits: 2, maximumFractionDigits: 2}), tempo: this.tempo, start_adress: this.start_adress, end_address: this.end_address, carrier: response[i].razao, vol: this.vol, cubagem: this.cubagem, carrierID: response[i].id, pessoaID: this.loginService.pessoaID}); @@ -127,8 +127,10 @@ export class ShipQtComponent implements OnInit { regRecentQuotes(priceQuote: number, prazo: number, origem: string, destino: string, carrierID: number, cubagem: number, pessoaID:number) { + console.log(priceQuote); + let build ={ - "price":priceQuote, + "price":priceQuote.toLocaleString('en-US').replace('.','').replace(',','.'), "await":prazo, "origin":origem, "destiny":destino, @@ -138,9 +140,6 @@ export class ShipQtComponent implements OnInit { } this.quoteService.regRecentQuotes(build) - - - } openModal(){