From f9c9eff560cc7be6a7f580dc0caee869eab97099 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Tue, 27 Sep 2022 23:41:55 -0300 Subject: [PATCH 01/19] UPDATE! --- README.md | 45 ++++++++++++++----- backend/TMSProject/pom.xml | 9 ++++ .../TMSProject/TmsProjectApplication.java | 29 ++++++------ .../controllers/LoginController.java | 6 +-- .../interfaces/LoginRepository.java | 11 +++++ 5 files changed, 69 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 8177a70..df9f062 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ > >>3.1. GOOGLE CLOUD >> ->>>3.1.1. Google API +>>>3.1.1. Google API >>> ->>>>3.1.1.1. Directions API +>>>>3.1.1.1. Directions API >>>> ->>>>3.1.1.2. Distance Matrix API +>>>>3.1.1.2. Distance Matrix API >>>> >>>> >>>>3.1.1.3. Compute Engine API @@ -109,7 +109,7 @@ ## 1 - RESUMO -
+
1.1 - Da Licença, Disponibilidade e Finalidade ####      Esse projeto foi desenvolvido pelo grupo Roxo da Turma Java Noturno de 2022, composto por Bruno Roberto, Cristian Schauffert, Kalil Fakhouri e Mateus Felipe com a mentoria do professor Oliota, visando apenas a demonstração dos conhecimentos técnicos adquiridos durante o curso e a apresentação da etapa final à empresas. @@ -122,7 +122,7 @@
-
+
1.2 - Das Tecnologias Utilizadas ####      Durante o curso foi utilizado diversas tecnologias, métodos ágeis e ferramentas de desenvolvimento tais como: @@ -156,7 +156,7 @@
2.1 - Visão Geral -####      +####     
@@ -175,9 +175,32 @@ 3.1 - GOOGLE CLOUD
->## 3.1.1 - Google API ->>### 3.1.1.1 - Directions API ->> ->>####         Directions API +Clique aqui para aprender a configurar o Google Cloud - \ No newline at end of file +>## 3.1.1 - Google API +>>### 3.1.1.1 - Directions API +>> +>>####          A API Directions é um serviço da Web que usa uma solicitação HTTP para retornar rotas no formato JSON ou XML entre os locais. As rotas estão disponíveis de várias maneiras: +>> +>> * #### como uma API independente. +>> * #### como parte da API Maps JavaScript do lado do cliente. +>> * #### para uso do servidor como parte das bibliotecas de cliente dos Serviços da Web do Google Maps. +>> +>> ####          Esta API aceita tanto endereços do tipo texto como também latitudes e longitudes previamente formatadas de acordo com o padrão estabelecido. +>> +>>### 3.1.1.2 - Distance Matrix API +>> +>>####          A API Distance Matrix fornece a distância e o tempo de viagem de uma matriz de origens e destinos e consiste em linhas que contêm os valores duration e distance para cada par. A Distance Matrix está disponível de várias formas: +>> +>> * #### como uma API independente. +>> * #### como parte da API Maps JavaScript do lado do cliente. +>> * #### para uso do servidor como parte das bibliotecas de cliente dos Serviços da Web do Google Maps. +>> +>> ####          A API retorna informações com base na rota recomendada entre os pontos inicial e final. Você pode solicitar dados de distância para diferentes meios de transporte, solicitar dados de distância em diferentes unidades, como quilômetros ou milhas, e estimar o tempo de viagem no trânsito. +>> +>>### 3.1.1.3 - Compute Engine API +>> +>> ####          Cria e executa máquinas virtuais no Google Cloud Platform. O Google Compute Engine oferece máquinas virtuais que são executadas nos data centers do Google conectados à rede de fibra óptica global. As ferramentas e o fluxo de trabalho oferecidos permitem o escalonamento de instâncias únicas para computação em nuvem com balanceamento de carga global. +>> ####          Essas VMs são inicializadas rapidamente, vêm com armazenamento em disco permanente e proporcionam desempenho consistente. As máquinas estão disponíveis em muitas configurações, incluindo tamanhos predefinidos e também podem ser criadas com tipos de máquinas personalizados de acordo com suas necessidades específicas. +>> +
\ No newline at end of file diff --git a/backend/TMSProject/pom.xml b/backend/TMSProject/pom.xml index e3214f1..5735092 100644 --- a/backend/TMSProject/pom.xml +++ b/backend/TMSProject/pom.xml @@ -52,6 +52,15 @@ jackson-databind 2.13.3 + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.security + spring-security-test + test + diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java index ebccb8c..f7c9f2b 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java @@ -1,27 +1,16 @@ package br.com.entra21.teamroxo.TMSProject; -import java.util.ArrayList; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.jdbc.core.JdbcTemplate; - -import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository; -import br.com.entra21.teamroxo.TMSProject.template.Login; -import br.com.entra21.teamroxo.TMSProject.template.Pessoa; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; -@SpringBootApplication +@SpringBootApplication(exclude = {SecurityAutoConfiguration.class}) public class TmsProjectApplication implements CommandLineRunner { - private static PessoaRepository pessoaRepository; - - public static ArrayList login = new ArrayList(); - - @Autowired - private JdbcTemplate jdbc; - public static void main(String[] args) { SpringApplication.run(TmsProjectApplication.class, args); } @@ -30,5 +19,13 @@ public static void main(String[] args) { public void run(String... args) throws Exception { } + + @Bean + public PasswordEncoder getPasswordEncoder() { + + BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); + return encoder; + + } } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java index c046bcb..74c6d33 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java @@ -54,10 +54,8 @@ public List listAll() { @ResponseStatus(code = HttpStatus.OK) public @ResponseBody List login(@RequestBody Login credentials){ - List response = new ArrayList(loginRepository.findAll()).stream() - .filter(login -> (login.getUser().equals(credentials.getUser())) && - login.getSenha().equals(credentials.getSenha())) - .toList(); + List response = loginRepository.findLogin(credentials.getUser(), credentials.getSenha()).stream().toList(); + response.forEach(pessoa -> { setMaturidadeLvl3(pessoa); }); diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java index 9f23f4c..66c88d2 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java @@ -1,9 +1,20 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.Login; +@Repository +@EnableJpaRepositories public interface LoginRepository extends JpaRepository { + @Query("FROM Login WHERE user = :usuario and senha = :password") + List findLogin(@Param("usuario") String usuario, @Param("password") String password); + } From d3e48b7dba7017ca6b140db8f1b38d5ff275a9cb Mon Sep 17 00:00:00 2001 From: Mateus Felipe Date: Wed, 28 Sep 2022 21:30:53 -0300 Subject: [PATCH 02/19] Users and Carriers - Get and Post --- .../controllers/CarriersControllers.java | 12 +++ .../interfaces/CarriersRepository.java | 8 ++ frontend/main/src/app/carrier.service.ts | 12 +++ .../src/app/carriers/carriers.component.html | 37 ++++---- .../src/app/carriers/carriers.component.ts | 84 ++++++++++++------- frontend/main/src/app/quote.service.ts | 6 ++ .../main/src/app/rct-qt/rct-qt.component.html | 27 +++++- .../main/src/app/rct-qt/rct-qt.component.ts | 21 ++++- .../main/src/app/ship-qt/ship-qt.component.ts | 3 +- frontend/main/src/app/users.service.spec.ts | 16 ++++ frontend/main/src/app/users.service.ts | 29 +++++++ .../main/src/app/users/users.component.html | 15 ++-- .../main/src/app/users/users.component.ts | 65 +++++++++----- 13 files changed, 262 insertions(+), 73 deletions(-) create mode 100644 frontend/main/src/app/users.service.spec.ts create mode 100644 frontend/main/src/app/users.service.ts diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java index 5a0e7ea..0def445 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java @@ -3,13 +3,18 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; import br.com.entra21.teamroxo.TMSProject.interfaces.CarriersRepository; import br.com.entra21.teamroxo.TMSProject.template.Carriers; +import br.com.entra21.teamroxo.TMSProject.template.Pessoa; @RestController @CrossOrigin(origins = "*") @@ -26,4 +31,11 @@ public List listCarriers(){ } + @PostMapping() + @ResponseStatus(code = HttpStatus.CREATED) + public Carriers register(@RequestBody Carriers dados) { + + return carriersRepository.save(dados); + + } } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java index 62d7a39..9aa8298 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java @@ -1,9 +1,17 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + import br.com.entra21.teamroxo.TMSProject.template.Carriers; public interface CarriersRepository extends JpaRepository { + +// @Query("FROM carriers WHERE idade >= :idadeParam") +// List maiorIdade (@Param("idadeParam")Integer idade); } diff --git a/frontend/main/src/app/carrier.service.ts b/frontend/main/src/app/carrier.service.ts index 0bd06ed..2662659 100644 --- a/frontend/main/src/app/carrier.service.ts +++ b/frontend/main/src/app/carrier.service.ts @@ -16,4 +16,16 @@ export class CarrierService { return this.http.get(this.apiURL) } + + adicionar(object:any){ + this.http.post(this.apiURL,object) + .subscribe((response)=>{ + + + console.log(response); + + }) + + + } } diff --git a/frontend/main/src/app/carriers/carriers.component.html b/frontend/main/src/app/carriers/carriers.component.html index 2949c89..4e87155 100644 --- a/frontend/main/src/app/carriers/carriers.component.html +++ b/frontend/main/src/app/carriers/carriers.component.html @@ -1,43 +1,52 @@ + - - + + - + + + - +
Razão socialTaxa E-mailCNPJTaxa - Tabela de freteCnpj
- + + + + +
+ + + - - - + + + + - + + - - + +
ID Razão socialTaxa E-mailCNPJTaxa - Tabela de freteAçõesCnpj
{{i}}{{carrier.name}}{{carrier.razao}}{{carrier.taxa}} {{carrier.email}} {{carrier.cnpj}}{{carrier.taxValorFrete}} - - -
\ No newline at end of file diff --git a/frontend/main/src/app/carriers/carriers.component.ts b/frontend/main/src/app/carriers/carriers.component.ts index ec78f22..b172b05 100644 --- a/frontend/main/src/app/carriers/carriers.component.ts +++ b/frontend/main/src/app/carriers/carriers.component.ts @@ -1,5 +1,8 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { CarrierService } from '../carrier.service'; +import { QuoteService } from '../quote.service'; @Component({ selector: 'app-carriers', @@ -7,46 +10,65 @@ import { Router } from '@angular/router'; styleUrls: ['./carriers.component.css'] }) export class CarriersComponent implements OnInit { - carriers!:Array - name!:string - email!:string - cnpj!:string - taxValorFrete!:number - constructor( - private router:Router - ) { } + carriers!: Array + cnpj!: string + email!: string + razao!: string + taxa!: number + + constructor(public carrierService: CarrierService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } ngOnInit(): void { this.carriers = new Array() - this.carriers.push({name:"Total Express", email:"total@express.com", cnpj:"4564564566454655", taxValorFrete:0.081}) - this.carriers.push({name:"Jadlog", email:"jadlog@jadlog.com", cnpj:"4564664656565456", taxValorFrete:0.084}) - this.carriers.push({name:"Braspress", email:"braspress@braspress.com", cnpj:"1231323132312", taxValorFrete:0.089}) - this.carriers.push({name:"Correios", email:"correios@correios.com", cnpj:"7897987899789", taxValorFrete:0.078}) + // this.carriers.push({name:"Total Express", email:"total@express.com", cnpj:"4564564566454655", taxValorFrete:0.081}) + // this.carriers.push({name:"Jadlog", email:"jadlog@jadlog.com", cnpj:"4564664656565456", taxValorFrete:0.084}) + // this.carriers.push({name:"Braspress", email:"braspress@braspress.com", cnpj:"1231323132312", taxValorFrete:0.089}) + // this.carriers.push({name:"Correios", email:"correios@correios.com", cnpj:"7897987899789", taxValorFrete:0.078}) + + + this.carrierService.listCarrier().pipe().subscribe((response: any) => { + + console.log(response); + + + + var count = Object.keys(response).length; + + for (let i = 0; i < count; i++) { + + this.razao = response[i].razao; + this.taxa = response[i].taxa; + this.email = response[i].email; + this.cnpj = response[i].cnpj; + + this.carriers.push({ razao: this.razao, taxa: this.taxa, email: this.email, cnpj: this.cnpj}); + + } + + this.razao = ""; + this.taxa = 0; + this.email = ""; + this.cnpj = ""; + + }) } - adicionar(){ - if(this.name){ - this.carriers.push({name:this.name, email:this.email, cnpj:this.cnpj, taxValorFrete:this.taxValorFrete}) - this.name ="" - this.email="" - this.cnpj="" - this.taxValorFrete= 0 - } - let listaCarrier:any = [ - {name:this.name, email:this.email, cnpj:this.cnpj, taxValorFrete:this.taxValorFrete} - ] - this.router.navigate(['ship-qt', JSON.stringify(listaCarrier)]) + adicionar(razao: string, taxa: number, email: string, cnpj: string) { + + + let build ={ + "razao":razao, + "taxa":taxa, + "email":email, + "cnpj":cnpj + } - - deletar(index:number){ - this.carriers.splice(index,1) - } - - alterar(index:number){ - // this.carriers.splice(index,1) + this.carrierService.adicionar(build) + + this.carriers.push({razao:this.razao, taxa:this.taxa, email:this.email, cnpj:this.cnpj}); } } \ No newline at end of file diff --git a/frontend/main/src/app/quote.service.ts b/frontend/main/src/app/quote.service.ts index 6cfa1b6..0ae04f1 100644 --- a/frontend/main/src/app/quote.service.ts +++ b/frontend/main/src/app/quote.service.ts @@ -21,6 +21,12 @@ export class QuoteService { } + recQuote():any{ + + return this.http.get(this.apiURL) + + } + regRecentQuotes(object:any){ this.http.post(this.apiURL2+'/recent',object) .subscribe((response)=>{ diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.html b/frontend/main/src/app/rct-qt/rct-qt.component.html index 1b35802..c81acf7 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.html +++ b/frontend/main/src/app/rct-qt/rct-qt.component.html @@ -1 +1,26 @@ -

rct-qt works!

+ + + + + + + + + + + + + + + +
AçãoIDPreço do fretePrazoOrigemDestinoTransportadoraPeso cubado
\ No newline at end of file diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.ts b/frontend/main/src/app/rct-qt/rct-qt.component.ts index be12925..cc30a23 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.ts +++ b/frontend/main/src/app/rct-qt/rct-qt.component.ts @@ -1,4 +1,8 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { CarrierService } from '../carrier.service'; +import { QuoteService } from '../quote.service'; @Component({ selector: 'app-rct-qt', @@ -7,9 +11,24 @@ import { Component, OnInit } from '@angular/core'; }) export class RctQtComponent implements OnInit { - constructor() { } + + constructor(public quoteService: QuoteService, private router: Router, private http: HttpClient) { } ngOnInit(): void { + + this.quoteService.recQuote().pipe().subscribe((response: any) => { + + var count = Object.keys(response).length; + + for (let i = 0; i < count; i++) { + + + + + + } + + }) } } 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 00ee164..16beccd 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -79,7 +79,8 @@ export class ShipQtComponent implements OnInit { console.log(this.priceFix + this.distance * response[i].taxa * this.cubagem); - this.precoFrete = this.priceFix + this.distance * response[i].taxa * this.cubagem; + 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 }); diff --git a/frontend/main/src/app/users.service.spec.ts b/frontend/main/src/app/users.service.spec.ts new file mode 100644 index 0000000..f81244a --- /dev/null +++ b/frontend/main/src/app/users.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UsersService } from './users.service'; + +describe('UsersService', () => { + let service: UsersService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(UsersService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/users.service.ts b/frontend/main/src/app/users.service.ts new file mode 100644 index 0000000..2f2d66f --- /dev/null +++ b/frontend/main/src/app/users.service.ts @@ -0,0 +1,29 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; + +@Injectable({ + providedIn: 'root' +}) +export class UsersService { + + apiURL:string = 'http://localhost:8080/user' + + constructor(private router: Router, private http: HttpClient) { } + + listUsers():any{ + + return this.http.get(this.apiURL) + + } + + adicionar(object:any){ + this.http.post(this.apiURL,object) + .subscribe((response)=>{ + + + console.log(response); + + }) +} +} \ No newline at end of file diff --git a/frontend/main/src/app/users/users.component.html b/frontend/main/src/app/users/users.component.html index 72942f2..9e1debe 100644 --- a/frontend/main/src/app/users/users.component.html +++ b/frontend/main/src/app/users/users.component.html @@ -3,6 +3,7 @@ Nome E-mail CPF + Data nascimento @@ -10,7 +11,8 @@ - + + @@ -19,7 +21,7 @@ - +
@@ -28,17 +30,18 @@ - + - + + diff --git a/frontend/main/src/app/users/users.component.ts b/frontend/main/src/app/users/users.component.ts index a1c6bbc..de25fa8 100644 --- a/frontend/main/src/app/users/users.component.ts +++ b/frontend/main/src/app/users/users.component.ts @@ -1,4 +1,7 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { UsersService } from '../users.service'; @Component({ selector: 'app-users', @@ -9,38 +12,62 @@ export class UsersComponent implements OnInit { users!:Array name!:string email!:string -cpf!:string +document!:string +birth!:string - constructor() { } + constructor(public usersService: UsersService, private router: Router, private http: HttpClient) { } ngOnInit(): void { this.users = new Array() - this.users.push({name:"Mateus Felipe", email:"mateusgoettems@gmail.com", cpf:"03215415454"}) - this.users.push({name:"Bruno Roberto", email:"bruno@gmail.com", cpf:"03215415454"}) - this.users.push({name:"Cristian Schaufer", email:"cristian@gmail.com", cpf:"03215415454"}) - this.users.push({name:"Kalil", email:"kalil@gmail.com", cpf:"03215415454"}) + this.usersService.listUsers().pipe().subscribe((response: any) => { + console.log(response); + + var count = Object.keys(response).length; + + for (let i = 0; i < count; i++) { + + this.name = response[i].nome; + this.email = response[i].email; + this.document = response[i].document; + this.birth = response[i].birth; + + this.users.push({name:this.name, email:this.email, document:this.document, birth:this.birth}); + + } + + this.name = ""; + this.email = ""; + this.document = ""; + this.birth = ""; + + }) + } - adicionar(){ - if(this.name != null && this.email != null && this.cpf != null){ - this.users.push({name:this.name, email:this.email, cpf:this.cpf}) - this.name ="" - this.email="" - this.cpf="" - }else{ - alert('DIGITE TODOS OS DADOS!') - } + adicionar(name: string, email: string, document: string, birth: string) { + + + let build ={ + "nome":name, + "email":email, + "document":document, + // "birth":birth, + } + this.usersService.adicionar(build) - deletar(index:number){ - this.users.splice(index,1) + this.users.push({name:this.name, email:this.email, document:this.document, birth:this.birth}); } - alterar(index:number){ - // this.users.splice(index,1) + deletar(){ + } + alterar(){ + + } + } From 7ac0742fa20e5e8aba3ba40b2b59b5f0d3bc96f9 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Wed, 28 Sep 2022 22:20:24 -0300 Subject: [PATCH 03/19] UPDATE! --- .../controllers/ShipController.java | 5 -- .../main/src/app/about/about.component.html | 89 ++++++++++++++++++- .../main/src/app/body/body.component.html | 51 +++-------- .../src/app/carriers/carriers.component.ts | 30 +++---- .../src/app/insight/insight.component.html | 4 +- .../main/src/app/insight/insight.component.ts | 21 +++-- 6 files changed, 130 insertions(+), 70 deletions(-) diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java index a9773ef..0d65375 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java @@ -3,10 +3,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.net.HttpURLConnection; import java.net.URL; -import java.util.ArrayList; -import java.util.List; import javax.net.ssl.HttpsURLConnection; @@ -16,10 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.util.JSONPObject; @RestController @CrossOrigin(origins = "*") diff --git a/frontend/main/src/app/about/about.component.html b/frontend/main/src/app/about/about.component.html index 6094aa9..7ce18a8 100644 --- a/frontend/main/src/app/about/about.component.html +++ b/frontend/main/src/app/about/about.component.html @@ -1 +1,88 @@ -

about works!

+
+
+
+
+ +

Bruno Roberto

+
Frontend Dev.
+
+ + + +
+
+ +

Cristian Schauffert

+
Web Designer
+
+ + + +
+
+ +

Kalil J. Fakhouri

+
Lead Developer
+
+ + + +
+
+ +

Mateus Felipe

+
Lead Developer
+
+ + + +
+
+
+
+
+
+

Sobre o Projeto

+
+

Licença,Disponibilidade e finalidade

+
+
Esse projeto foi desenvolvido pelo grupo Roxo da Turma Java Noturno de 2022, composto por Bruno Roberto, + Cristian Schauffert, Kalil Fakhouri e Mateus Felipe com a mentoria do professor Oliota, visando apenas a + demonstração dos conhecimentos técnicos adquiridos durante o curso e a apresentação da etapa final à + empresas. +

+ A cópia do recurso está disponível a todos, podendo ser modificada e alterada. Fica proibida a venda, + distribuição ou repasse da mesma. + A maioria dos recurso e tecnologias são de código livre (open-source) ou teste de avaliação por tempo + determinado (Google Cloud), afim de trazer a melhor experiência do uso de um software funcional. +

+ Devido ao nosso objetivo de comprovar os conhecimentos adquiridos, algumas partes do software são simulados + devido ao tempo e resposta que levaria na realidade, acelerando, assim, o processo de entrega, por exemplo, para que + possa ser vista em tempo real o processamento de dados, tanto localmente quanto em nuvem. + +
+
+
diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 1a907f1..f9ff4b2 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -148,68 +148,39 @@

- -
  • - - -

    Finance - -

    -
  • - - -

    Quotes - + + +

    Finance

    -
  • diff --git a/frontend/main/src/app/carriers/carriers.component.ts b/frontend/main/src/app/carriers/carriers.component.ts index b172b05..d45bf09 100644 --- a/frontend/main/src/app/carriers/carriers.component.ts +++ b/frontend/main/src/app/carriers/carriers.component.ts @@ -10,15 +10,15 @@ import { QuoteService } from '../quote.service'; styleUrls: ['./carriers.component.css'] }) export class CarriersComponent implements OnInit { - + carriers!: Array cnpj!: string email!: string razao!: string taxa!: number - + constructor(public carrierService: CarrierService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } - + ngOnInit(): void { this.carriers = new Array() // this.carriers.push({name:"Total Express", email:"total@express.com", cnpj:"4564564566454655", taxValorFrete:0.081}) @@ -26,13 +26,13 @@ export class CarriersComponent implements OnInit { // this.carriers.push({name:"Braspress", email:"braspress@braspress.com", cnpj:"1231323132312", taxValorFrete:0.089}) // this.carriers.push({name:"Correios", email:"correios@correios.com", cnpj:"7897987899789", taxValorFrete:0.078}) - + this.carrierService.listCarrier().pipe().subscribe((response: any) => { console.log(response); - - + + var count = Object.keys(response).length; for (let i = 0; i < count; i++) { @@ -41,7 +41,7 @@ export class CarriersComponent implements OnInit { this.taxa = response[i].taxa; this.email = response[i].email; this.cnpj = response[i].cnpj; - + this.carriers.push({ razao: this.razao, taxa: this.taxa, email: this.email, cnpj: this.cnpj}); } @@ -52,23 +52,23 @@ export class CarriersComponent implements OnInit { this.cnpj = ""; }) - + } - + adicionar(razao: string, taxa: number, email: string, cnpj: string) { - + let build ={ "razao":razao, "taxa":taxa, "email":email, "cnpj":cnpj - + } - + this.carrierService.adicionar(build) - + this.carriers.push({razao:this.razao, taxa:this.taxa, email:this.email, cnpj:this.cnpj}); } - - } \ No newline at end of file + + } diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index 936871e..333238a 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -4,6 +4,7 @@
    +

    {{countPackages}}

    New packages

    @@ -18,7 +19,6 @@
    -

    12%

    Bounce Rate

    @@ -287,4 +287,4 @@

    -
    \ No newline at end of file + diff --git a/frontend/main/src/app/insight/insight.component.ts b/frontend/main/src/app/insight/insight.component.ts index 25ce337..9fddf9c 100644 --- a/frontend/main/src/app/insight/insight.component.ts +++ b/frontend/main/src/app/insight/insight.component.ts @@ -11,29 +11,36 @@ import { Observable } from 'rxjs'; }) export class InsightComponent implements OnInit { - readonly TMSLoginAPI: string = "http://localhost:8080/user/countClients" + readonly APICountUsers: string = "http://localhost:8080/user/countClients" - readonly apiURL:string = "http://localhost:8080/user/countVisitors" + readonly APICountVisits:string = "http://localhost:8080/user/countVisitors" + + readonly APICountPackages:string = "http://localhost:8080/quote/go" countClient!: number countVisitors!: number + countPackages!:number + + constructor(private router:Router, private http:HttpClient) { - constructor(private router:Router, private http:HttpClient) { - } ngOnInit(): void { - this.http.get(this.TMSLoginAPI) + this.http.get(this.APICountUsers) .subscribe((resultado:any) => { this.countClient=resultado }); - this.http.get(this.apiURL) + this.http.get(this.APICountVisits) .subscribe((resultado:any) => { this.countVisitors=resultado }); + this.http.get(this.APICountPackages) + .subscribe((response:any)=>{ + this.countPackages=response + }) } @@ -48,7 +55,7 @@ export class InsightComponent implements OnInit { // countClients() { // this.http.get(`${this.TMSLoginAPI}/countClients`).subscribe(resultado => console.log(resultado)); // return ; - + // } // countVisitors(){ // this.http.get(`${this.apiURL}/countVisitors`).subscribe(resultado => console.log(resultado)); From e38dae51c30644e08dfb6c6e2aa7b6836e769f9e Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Thu, 29 Sep 2022 19:44:23 -0300 Subject: [PATCH 04/19] UPDATE! --- frontend/main/src/app/body/body.component.html | 2 +- frontend/main/src/app/loginservice.service.ts | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index f9ff4b2..2a88898 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -111,7 +111,7 @@

    • -
  • +

  • Dashboard

    diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 065e399..8afcf53 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -10,12 +10,12 @@ import { LoginComponent } from './login/login.component'; }) export class LoginserviceService implements CanActivate { - user!: string readonly TMSLoginAPI: string = "http://localhost:8080" + user!: string succeed!: boolean - progress: boolean = false - admin:boolean = false - enterprise:boolean = false + progress!: boolean + admin!:boolean + enterprise!:boolean pessoaID!:number constructor(private router: Router, private http: HttpClient) { } @@ -37,12 +37,13 @@ export class LoginserviceService implements CanActivate { }) ) .subscribe((response:any)=>{ + this.admin = response.admin + this.enterprise = response.enterprise + this.http.get(this.TMSLoginAPI+'/user/'+response[0].pessoa_id) .subscribe((resp:any) =>{ console.log(resp); this.user = resp.nome - this.admin = resp.admin - this.enterprise = resp.enterprise this.pessoaID = response[0].pessoa_id }) return response From 96dee6ded43f7bf1e0c26e7beeedb6344b1012ce Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Thu, 29 Sep 2022 20:57:43 -0300 Subject: [PATCH 05/19] WATER MAKER OF API! --- mark.html | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 mark.html diff --git a/mark.html b/mark.html new file mode 100644 index 0000000..b661bd6 --- /dev/null +++ b/mark.html @@ -0,0 +1,11 @@ +$$$$$$$$\ $$\ $$\ $$$$$$\ $$$$$$$\ $$\ +\__$$ __|$$$\ $$$ |$$ __$$\ $$ __$$\ $$ | + $$ | $$$$\ $$$$ |$$ / \__| $$ | $$ | $$$$$$\ $$$$$$\ $$\ $$$$$$\ $$$$$$$\ $$$$$$\ + $$ | $$\$$\$$ $$ |\$$$$$$\ $$$$$$$ |$$ __$$\ $$ __$$\ \__|$$ __$$\ $$ _____|\_$$ _| + $$ | $$ \$$$ $$ | \____$$\ $$ ____/ $$ | \__|$$ / $$ |$$\ $$$$$$$$ |$$ / $$ | + $$ | $$ |\$ /$$ |$$\ $$ | $$ | $$ | $$ | $$ |$$ |$$ ____|$$ | $$ |$$\ + $$ | $$ | \_/ $$ |\$$$$$$ | $$ | $$ | \$$$$$$ |$$ |\$$$$$$$\ \$$$$$$$\ \$$$$ | + \__| \__| \__| \______/ \__| \__| \______/ $$ | \_______| \_______| \____/ + $$\ $$ | + \$$$$$$ | + \______/ From a29160c435dfc64e1e9a34af7f2aefed8f361bd3 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Thu, 29 Sep 2022 21:00:25 -0300 Subject: [PATCH 06/19] UPDATE MARK! --- mark.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mark.html b/mark.html index b661bd6..41f8f1f 100644 --- a/mark.html +++ b/mark.html @@ -8,4 +8,6 @@ \__| \__| \__| \______/ \__| \__| \______/ $$ | \_______| \_______| \____/ $$\ $$ | \$$$$$$ | - \______/ + \______/ + + Developed with ❤️ by Team Roxo! From efd4853056c433763cc37ac854b6ba8209cf9bc3 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Thu, 29 Sep 2022 21:01:35 -0300 Subject: [PATCH 07/19] UPDATE! --- mark.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mark.html b/mark.html index 41f8f1f..77af944 100644 --- a/mark.html +++ b/mark.html @@ -9,5 +9,5 @@ $$\ $$ | \$$$$$$ | \______/ - - Developed with ❤️ by Team Roxo! + +Developed with ❤️ by Team Roxo! From 468fe95958f3102dd3dad0a1e2c800fe1b636a54 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Thu, 29 Sep 2022 23:00:42 -0300 Subject: [PATCH 08/19] UPDATE --- .../TMSProject/TmsProjectApplication.java | 26 ++++++-- .../controllers/LoginController.java | 20 ++++--- .../controllers/PessoaController.java | 23 +++++++- .../interfaces/CountVisitorsRepository.java | 9 +++ .../TMSProject/template/CountVisitors.java | 12 +++- .../main/src/app/login/login.component.ts | 16 ++--- frontend/main/src/app/loginservice.service.ts | 33 ++++++++++- frontend/main/src/app/quote.service.ts | 59 ++++++++++++++++++- .../main/src/app/ship-qt/ship-qt.component.ts | 29 +++++++-- 9 files changed, 189 insertions(+), 38 deletions(-) diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java index f7c9f2b..dcfbabc 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java @@ -1,5 +1,9 @@ package br.com.entra21.teamroxo.TMSProject; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -8,24 +12,36 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -@SpringBootApplication(exclude = {SecurityAutoConfiguration.class}) +@SpringBootApplication(exclude = { SecurityAutoConfiguration.class }) public class TmsProjectApplication implements CommandLineRunner { - + public static void main(String[] args) { SpringApplication.run(TmsProjectApplication.class, args); } @Override public void run(String... args) throws Exception { + + String content; + + URL url = new URL("https://team-roxo.github.io/assets/mark.html"); + + BufferedReader page = new BufferedReader(new InputStreamReader(url.openStream())); + System.out.println("\n"); + while ((content = page.readLine()) != null) { + System.out.println(content); + } + + System.out.println("\n"); } - + @Bean public PasswordEncoder getPasswordEncoder() { - + BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); return encoder; - + } } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java index 74c6d33..ef9bcdf 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java @@ -60,18 +60,22 @@ public List listAll() { setMaturidadeLvl3(pessoa); }); - if(!response.isEmpty()) { - CountVisitors count = new CountVisitors(); - count.setUser(credentials.getUser()); - count.setTime(LocalTime.now()); - count.setDate(LocalDate.now()); - countVisitorsRepository.save(count); - } - return response; } + @PostMapping("/init") + public CountVisitors bounce(@RequestBody CountVisitors visitor) { + + CountVisitors count = new CountVisitors(); + count.setUser(visitor.getUser()); + count.setTime(LocalTime.now()); + count.setDate(LocalDate.now()); + count.setBounceRate(true); + return countVisitorsRepository.save(count); + + } + private void setMaturidadeLvl3(Login pessoa) { ArrayList headers = new ArrayList<>(Arrays.asList( 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 e8419e0..0c34340 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,15 +1,18 @@ package br.com.entra21.teamroxo.TMSProject.controllers; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.repository.query.Param; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -25,8 +28,10 @@ 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 = "*") @@ -62,12 +67,26 @@ public long numberVisitors() { return countVisitorsRepository.count(); } + @GetMapping("/bounce") + public float bounceRate() { + List bounce = new ArrayList(countVisitorsRepository.findAll().stream() + .filter(count -> count.getBounceRate() == true) + .toList()); + + return (bounce.size()*100)/countVisitorsRepository.count(); + + } + + @PostMapping("/disbounce/{id}") + public boolean disBounce(@PathVariable("id") int id) { + countVisitorsRepository.updateBounce(id); + return false; + } + @PostMapping() @ResponseStatus(code = HttpStatus.CREATED) public Pessoa register(@RequestBody Pessoa dados) { - return pessoaRepository.save(dados); - } private List obterListaCompleta() { diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java index b1d1ad9..1946d86 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java @@ -1,9 +1,18 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.CountVisitors; +@Repository +@EnableJpaRepositories public interface CountVisitorsRepository extends JpaRepository { + @Query(value = "UPDATE CountVisitors SET bounceRate = 0 WHERE id = :idUser") + void updateBounce(@Param("idUser") int idUser); + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java index 91ecf7c..f6f9cb1 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java @@ -18,17 +18,19 @@ public class CountVisitors { private String user; private LocalDate date; private LocalTime time; + private boolean bounceRate; public CountVisitors() { super(); } - public CountVisitors(Integer id, String user, LocalDate date, LocalTime time) { + public CountVisitors(Integer id, String user, LocalDate date, LocalTime time, boolean bounceRate) { super(); this.id = id; this.user = user; this.date = date; this.time = time; + this.bounceRate = bounceRate; } public Integer getId() { @@ -62,5 +64,13 @@ public LocalTime getTime() { public void setTime(LocalTime time) { this.time = time; } + + public boolean getBounceRate() { + return bounceRate; + } + + public void setBounceRate(boolean bounceRate) { + this.bounceRate = bounceRate; + } } diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts index 5ec4416..e396200 100644 --- a/frontend/main/src/app/login/login.component.ts +++ b/frontend/main/src/app/login/login.component.ts @@ -30,22 +30,16 @@ export class LoginComponent implements OnInit { } submit():void{ + if(this.user != null && this.password != null){ + this.loginService.logging(this.user, this.password) - .pipe() - .subscribe((response:any)=>{ - console.log('Running...', response) - if(response == ""){ - this.loginService.progress = false; - alert("USUARIO OU SENHA ERRADOS") - }else{ - this.loginService.succeed = true - this.gotoHome() - } - }); + }else{ + alert('DIGITE TODOS OS CAMPOS OBRIGATÓRIOS!') this.loginService.progress = false + } } diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 8afcf53..08a9600 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -11,6 +11,8 @@ import { LoginComponent } from './login/login.component'; export class LoginserviceService implements CanActivate { readonly TMSLoginAPI: string = "http://localhost:8080" + readonly APIBounceInit:string = "http://localhost:8080/login/init" + user!: string succeed!: boolean progress!: boolean @@ -18,6 +20,11 @@ export class LoginserviceService implements CanActivate { enterprise!:boolean pessoaID!:number + idBounce!:number + userBounce!:string + dateBounce!:string + timeBounce!:string + constructor(private router: Router, private http: HttpClient) { } logging(user: string, password: string) { @@ -37,19 +44,39 @@ export class LoginserviceService implements CanActivate { }) ) .subscribe((response:any)=>{ + this.admin = response.admin this.enterprise = response.enterprise + if(response == ""){ + this.progress = false; + alert("USUARIO OU SENHA ERRADOS") + }else{ + this.succeed = true + 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.user = resp.nome this.pessoaID = response[0].pessoa_id }) - return response - }) - return this.http.post(this.TMSLoginAPI +'/login', build) + 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 0ae04f1..8b44c7c 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 { LoginserviceService } from './loginservice.service'; import { ShipQtComponent } from './ship-qt/ship-qt.component'; @Injectable({ @@ -12,28 +13,80 @@ export class QuoteService { apiURL:string = 'http://localhost:8080/ship' apiURL2:string = 'http://localhost:8080/quote' + APIBouncePut:string = "http://localhost:8080/user/disbounce/" + newBounce!:any - constructor(private router: Router, private http: HttpClient) { } + constructor(private router: Router, private http: HttpClient, private login:LoginserviceService) { } quote(cepOrigem:string, cepDestino:string):any{ + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.login.idBounce, + "user":this.login.userBounce, + "date":this.login.dateBounce, + "time":this.login.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) + //FIM DO BOUNCE + return this.http.get(this.apiURL+'/'+cepOrigem+'/'+cepDestino) } recQuote():any{ + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.login.idBounce, + "user":this.login.userBounce, + "date":this.login.dateBounce, + "time":this.login.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) + //FIM DO BOUNCE + return this.http.get(this.apiURL) } regRecentQuotes(object:any){ + + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.login.idBounce, + "user":this.login.userBounce, + "date":this.login.dateBounce, + "time":this.login.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) + //FIM DO BOUNCE + + this.http.post(this.apiURL2+'/recent',object) .subscribe((response)=>{ - + console.log(response); - + }) 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 16beccd..89eb84b 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -35,6 +35,9 @@ export class ShipQtComponent implements OnInit { distance!: number carrierData = []; + APIBouncePut:string = "http://localhost:8080/user/disbounce/" + newBounce!:any + constructor(public loginService: LoginserviceService, public carrierService: CarrierService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } @@ -47,6 +50,22 @@ export class ShipQtComponent implements OnInit { quote() { + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.loginService.idBounce, + "user":this.loginService.userBounce, + "date":this.loginService.dateBounce, + "time":this.loginService.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.loginService.idBounce, this.newBounce) + //FIM DO BOUNCE + if (this.cepOrigem != null && this.cepDestino != null && this.comprimento != null, this.altura != null, this.largura != null, this.peso != null) { this.quoteService.quote(this.cepOrigem, this.cepDestino) .pipe() @@ -64,11 +83,11 @@ export class ShipQtComponent implements OnInit { this.distance = (response.routes[0].legs[0].distance.value); //cálculos - this.vol = (this.comprimento * this.altura * this.largura) / 1000000; //conversão em m³ + this.vol = (this.comprimento * this.altura * this.largura) / 1000000; //conversão em m³ this.cubagem = this.vol * this.fatorCub; this.tempo = Math.ceil((((this.distance) / 1000) / 80) / 7); //dividido por 1000 para converter, /80 velocidade med, /7 horas diárias - //dados da transportadora + //dados da transportadora this.carrierService.listCarrier().pipe().subscribe((response: any) => { var count = Object.keys(response).length; @@ -80,7 +99,7 @@ export class ShipQtComponent implements OnInit { console.log(this.priceFix + this.distance * response[i].taxa * this.cubagem); 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 }); @@ -106,7 +125,7 @@ export class ShipQtComponent implements OnInit { } regRecentQuotes(priceQuote: number, prazo: number, origem: string, destino: string, carrierID: number, cubagem: number, pessoaID:number) { - + let build ={ "price":priceQuote, "await":prazo, @@ -118,7 +137,7 @@ export class ShipQtComponent implements OnInit { } this.quoteService.regRecentQuotes(build) - + } From eeaab0b1c8ca7b08d277140bc107dd080f577a0a Mon Sep 17 00:00:00 2001 From: Cristian-Baade Date: Fri, 30 Sep 2022 21:24:52 -0300 Subject: [PATCH 09/19] =?UTF-8?q?Atualiza=C3=A7=C3=B5es=20no=20Edit=20e=20?= =?UTF-8?q?no=20About=20Us?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/src/app/about/about.component.html | 19 +-- .../main/src/app/edit/edit.component.html | 16 +- frontend/main/src/app/edit/edit.component.ts | 15 +- .../main/src/app/login/login.component.ts | 2 +- frontend/main/src/app/loginservice.service.ts | 146 ++++++++++-------- 5 files changed, 110 insertions(+), 88 deletions(-) diff --git a/frontend/main/src/app/about/about.component.html b/frontend/main/src/app/about/about.component.html index f73f66a..1ad7231 100644 --- a/frontend/main/src/app/about/about.component.html +++ b/frontend/main/src/app/about/about.component.html @@ -8,10 +8,10 @@

    Bruno Roberto

    Frontend Dev.

    -     + + > @@ -26,7 +26,7 @@

    Cristian Schauffert

    href="https://mail.google.com/mail/u/0/?fs=1&to=schauffertcristian@gmail.com&su=CONTACT BY SITE TIME ROXO - HELLO CRISTIAN&body=Olá+Cristian%20Schauffert,+Tudo+bem?&tf=cm" target="_blank" aria-label="Parveen Anand Email Profile"> + > @@ -42,7 +42,7 @@

    Kalil J. Fakhouri

    href="https://mail.google.com/mail/u/0/?fs=1&to=kjfakhouri@gmail.com&su=CONTACT BY SITE TIME ROXO - HELLO KALIL&body=Olá+Kalil%20J.%20Fakhouri,+Tudo+bem?&tf=cm" target="_blank" aria-label="Parveen Anand Email Profile"> + > @@ -53,12 +53,13 @@

    Kalil J. Fakhouri

    Mateus Felipe

    Lead Developer

    - + + > + target="_blank" > diff --git a/frontend/main/src/app/edit/edit.component.html b/frontend/main/src/app/edit/edit.component.html index 82b07c2..6de697d 100644 --- a/frontend/main/src/app/edit/edit.component.html +++ b/frontend/main/src/app/edit/edit.component.html @@ -7,36 +7,36 @@

    Edit your information

    - +
    - +
    -
    +
    - +
    - +
    - - Password: + @@ -46,6 +46,6 @@

    Edit your information

    - +
    \ No newline at end of file diff --git a/frontend/main/src/app/edit/edit.component.ts b/frontend/main/src/app/edit/edit.component.ts index 5fba7ea..7c0e0ca 100644 --- a/frontend/main/src/app/edit/edit.component.ts +++ b/frontend/main/src/app/edit/edit.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { LoginserviceService } from '../loginservice.service'; @Component({ selector: 'app-edit', @@ -18,15 +19,25 @@ password!:string constructor( - private router:Router + private router:Router, + private login: LoginserviceService ) { } ngOnInit(): void { + +this.user= this.login.user +this.name= this.login.nome +this.birth= this.login.birth +this.document= this.login.document +this.email= this.login.email +this.password = this.login.password + } - alterar(index:number){ + alterar(){ + alert("Funcionou!!!") //this.edit.splice() } diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts index e396200..e954fca 100644 --- a/frontend/main/src/app/login/login.component.ts +++ b/frontend/main/src/app/login/login.component.ts @@ -89,7 +89,7 @@ export class LoginComponent implements OnInit { this.http.get(this.TMSLoginAPI+'/user/'+ID) .subscribe((response:any)=>{ console.log(response); - this.loginService.user = response.nome + this.loginService.nome = response.nome }) },500) diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 08a9600..8f773ba 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -11,19 +11,24 @@ import { LoginComponent } from './login/login.component'; export class LoginserviceService implements CanActivate { readonly TMSLoginAPI: string = "http://localhost:8080" - readonly APIBounceInit:string = "http://localhost:8080/login/init" + readonly APIBounceInit: string = "http://localhost:8080/login/init" + nome!: string user!: string + email!: string + password!: string + birth!: Date + document!: string succeed!: boolean progress!: boolean - admin!:boolean - enterprise!:boolean - pessoaID!:number + admin!: boolean + enterprise!: boolean + pessoaID!: number - idBounce!:number - userBounce!:string - dateBounce!:string - timeBounce!:string + idBounce!: number + userBounce!: string + dateBounce!: string + timeBounce!: string constructor(private router: Router, private http: HttpClient) { } @@ -31,80 +36,85 @@ export class LoginserviceService implements CanActivate { this.progress = true - let build:any = { - 'user':user, - 'senha':password + let build: any = { + 'user': user, + 'senha': password } - this.http.post(this.TMSLoginAPI +'/login', build) - .pipe( - catchError((error)=>{ - this.progress = false - return error - }) - ) - .subscribe((response:any)=>{ - - this.admin = response.admin - this.enterprise = response.enterprise - - if(response == ""){ - this.progress = false; - alert("USUARIO OU SENHA ERRADOS") - }else{ - this.succeed = true - 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.user = resp.nome - this.pessoaID = response[0].pessoa_id - }) + this.http.post(this.TMSLoginAPI + '/login', build) + .pipe( + catchError((error) => { + this.progress = false + return error + }) + ) + .subscribe((response: any) => { + this.user = user + this.admin = response.admin + this.enterprise = response.enterprise + + if (response == "") { + this.progress = false; + alert("USUARIO OU SENHA ERRADOS") + } else { + this.succeed = true + 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 + }) - 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) { + registering(name: string, user: string, email: string, password: string) { this.progress = true - let build:any = { - 'nome':name, - 'user':user, - 'email':email, - 'senha':password + let build: any = { + 'nome': name, + 'user': user, + 'email': email, + 'senha': password } - let buildLogin:any = { - 'user':user, - 'senha':password + let buildLogin: any = { + 'user': user, + 'senha': password } - this.http.post(this.TMSLoginAPI+'/register', build) - .pipe( - catchError((error)=>{ - return error + this.http.post(this.TMSLoginAPI + '/register', build) + .pipe( + catchError((error) => { + return error + }) + ) + .subscribe((response) => { + buildLogin = response + return buildLogin }) - ) - .subscribe((response)=>{ - buildLogin = response - return buildLogin - }) return buildLogin From 3eb18ffecdb264f59acb23b7c50510e7e7041cb8 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Fri, 30 Sep 2022 21:25:11 -0300 Subject: [PATCH 10/19] UPDATE RELATORIOS! --- .../controllers/PessoaController.java | 13 +++++++++++ .../interfaces/PessoaRepository.java | 15 ++++++++++++ frontend/main/src/app/app-routing.module.ts | 4 +++- frontend/main/src/app/app.module.ts | 4 +++- .../main/src/app/body/body.component.html | 16 +++++++++---- .../main/src/app/login/login.component.ts | 4 ++-- frontend/main/src/app/loginservice.service.ts | 16 +++++++++---- .../app/user-client/user-client.component.css | 0 .../user-client/user-client.component.html | 1 + .../user-client/user-client.component.spec.ts | 23 +++++++++++++++++++ .../app/user-client/user-client.component.ts | 15 ++++++++++++ 11 files changed, 98 insertions(+), 13 deletions(-) create mode 100644 frontend/main/src/app/user-client/user-client.component.css create mode 100644 frontend/main/src/app/user-client/user-client.component.html create mode 100644 frontend/main/src/app/user-client/user-client.component.spec.ts create mode 100644 frontend/main/src/app/user-client/user-client.component.ts 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 0c34340..823064c 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,6 +1,8 @@ package br.com.entra21.teamroxo.TMSProject.controllers; import java.time.LocalDate; +import java.time.temporal.TemporalAdjuster; +import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -67,6 +69,17 @@ public long numberVisitors() { return countVisitorsRepository.count(); } + @GetMapping("/birthnow") + public List birthNow(){ + return pessoaRepository.findBirth(LocalDate.now()); + } + + @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())); + } + @GetMapping("/bounce") public float bounceRate() { List bounce = new ArrayList(countVisitorsRepository.findAll().stream() 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 d8d0095..9602bc6 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 @@ -1,9 +1,24 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.time.LocalDate; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.Pessoa; +@Repository +@EnableJpaRepositories public interface PessoaRepository extends JpaRepository { + @Query("FROM Pessoa WHERE birth = :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); + } diff --git a/frontend/main/src/app/app-routing.module.ts b/frontend/main/src/app/app-routing.module.ts index af8981c..5c32c78 100644 --- a/frontend/main/src/app/app-routing.module.ts +++ b/frontend/main/src/app/app-routing.module.ts @@ -16,6 +16,7 @@ import { PacktrackComponent } from './packtrack/packtrack.component'; import { RctQtComponent } from './rct-qt/rct-qt.component'; import { ReceiptComponent } from './receipt/receipt.component'; import { ShipQtComponent } from './ship-qt/ship-qt.component'; +import { UserClientComponent } from './user-client/user-client.component'; import { UsersComponent } from './users/users.component'; const routes: Routes = [ @@ -34,7 +35,8 @@ const routes: Routes = [ { path: 'recent-quote', component:RctQtComponent, canActivate:[LoginserviceService]}, { path: 'edit', component:EditComponent, canActivate:[LoginserviceService]}, { path: 'about', component:AboutComponent, canActivate:[LoginserviceService]}, - { path: 'forgetPassword', component:ForgetPasswordComponent} + { path: 'forgetPassword', component:ForgetPasswordComponent}, + { path: "user-client", component:UserClientComponent, canActivate:[LoginserviceService]} ]; @NgModule({ diff --git a/frontend/main/src/app/app.module.ts b/frontend/main/src/app/app.module.ts index b2c0a74..86dd107 100644 --- a/frontend/main/src/app/app.module.ts +++ b/frontend/main/src/app/app.module.ts @@ -23,6 +23,7 @@ import { EditComponent } from './edit/edit.component'; import { AboutComponent } from './about/about.component'; import { HttpClientModule } from "@angular/common/http"; import { ForgetPasswordComponent } from './forget-password/forget-password.component'; +import { UserClientComponent } from './user-client/user-client.component'; @NgModule({ declarations: [ @@ -44,7 +45,8 @@ import { ForgetPasswordComponent } from './forget-password/forget-password.compo RctQtComponent, EditComponent, AboutComponent, - ForgetPasswordComponent + ForgetPasswordComponent, + UserClientComponent ], imports: [ BrowserModule, diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 2a88898..149d77b 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -111,7 +111,7 @@

    • -
  • +

  • Dashboard

    @@ -125,18 +125,24 @@

  • @@ -176,7 +182,7 @@

  • - +

    Finance

    @@ -195,6 +201,6 @@

    Logged in as:
    - {{loginService.user}}
    Sair    Edit + {{loginService.nome}}
    Sair    Edit
    diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts index e396200..4545f57 100644 --- a/frontend/main/src/app/login/login.component.ts +++ b/frontend/main/src/app/login/login.component.ts @@ -39,7 +39,7 @@ export class LoginComponent implements OnInit { alert('DIGITE TODOS OS CAMPOS OBRIGATÓRIOS!') this.loginService.progress = false - + } } @@ -89,7 +89,7 @@ export class LoginComponent implements OnInit { this.http.get(this.TMSLoginAPI+'/user/'+ID) .subscribe((response:any)=>{ console.log(response); - this.loginService.user = response.nome + this.loginService.nome = response.nome }) },500) diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 08a9600..53cdae3 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -13,11 +13,12 @@ export class LoginserviceService implements CanActivate { readonly TMSLoginAPI: string = "http://localhost:8080" readonly APIBounceInit:string = "http://localhost:8080/login/init" - user!: string + nome!: string succeed!: boolean progress!: boolean admin!:boolean enterprise!:boolean + adminEnter:boolean = false pessoaID!:number idBounce!:number @@ -45,8 +46,15 @@ export class LoginserviceService implements CanActivate { ) .subscribe((response:any)=>{ - this.admin = response.admin - this.enterprise = response.enterprise + this.admin = response[0].admin + this.enterprise = response[0].enterprise + + if(this.admin == true){ + this.adminEnter = true; + if(this.enterprise == true){ + this.adminEnter = true + } + } if(response == ""){ this.progress = false; @@ -59,7 +67,7 @@ export class LoginserviceService implements CanActivate { this.http.get(this.TMSLoginAPI+'/user/'+response[0].pessoa_id) .subscribe((resp:any) =>{ console.log(resp); - this.user = resp.nome + this.nome = resp.nome this.pessoaID = response[0].pessoa_id }) diff --git a/frontend/main/src/app/user-client/user-client.component.css b/frontend/main/src/app/user-client/user-client.component.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/main/src/app/user-client/user-client.component.html b/frontend/main/src/app/user-client/user-client.component.html new file mode 100644 index 0000000..abe7264 --- /dev/null +++ b/frontend/main/src/app/user-client/user-client.component.html @@ -0,0 +1 @@ +

    user-client works!

    diff --git a/frontend/main/src/app/user-client/user-client.component.spec.ts b/frontend/main/src/app/user-client/user-client.component.spec.ts new file mode 100644 index 0000000..03ee03b --- /dev/null +++ b/frontend/main/src/app/user-client/user-client.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UserClientComponent } from './user-client.component'; + +describe('UserClientComponent', () => { + let component: UserClientComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ UserClientComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(UserClientComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/user-client/user-client.component.ts b/frontend/main/src/app/user-client/user-client.component.ts new file mode 100644 index 0000000..e040787 --- /dev/null +++ b/frontend/main/src/app/user-client/user-client.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-user-client', + templateUrl: './user-client.component.html', + styleUrls: ['./user-client.component.css'] +}) +export class UserClientComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} From 23d7728f35e4cb141ab4dfd6488a83400f2663b3 Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Fri, 30 Sep 2022 21:27:18 -0300 Subject: [PATCH 11/19] =?UTF-8?q?Atualiza=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/main/src/app/body/body.component.html | 2 +- frontend/main/src/app/insight/insight.component.html | 2 +- frontend/main/src/app/ship-qt/ship-qt.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 2a88898..0c894c8 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -67,7 +67,7 @@

  • - 15 +
    15 Notifications diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index 333238a..6bf3143 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -50,7 +50,7 @@

    {{countClient}}

    -

    {{countVisitors/2}}

    +

    {{countVisitors}}

    Visitors

    diff --git a/frontend/main/src/app/ship-qt/ship-qt.component.html b/frontend/main/src/app/ship-qt/ship-qt.component.html index 6ff8125..457c158 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.html +++ b/frontend/main/src/app/ship-qt/ship-qt.component.html @@ -37,7 +37,7 @@

    • - + From 3ae76c44bb7c056f02355160f6754fe29a25ab36 Mon Sep 17 00:00:00 2001 From: Mateus Felipe Date: Mon, 3 Oct 2022 18:40:28 -0300 Subject: [PATCH 12/19] Updated --- frontend/main/src/app/quote.service.ts | 10 ++++ .../main/src/app/rct-qt/rct-qt.component.html | 26 ++++++---- .../main/src/app/rct-qt/rct-qt.component.ts | 52 ++++++++++++++++--- 3 files changed, 70 insertions(+), 18 deletions(-) diff --git a/frontend/main/src/app/quote.service.ts b/frontend/main/src/app/quote.service.ts index 0ae04f1..266b2e5 100644 --- a/frontend/main/src/app/quote.service.ts +++ b/frontend/main/src/app/quote.service.ts @@ -12,6 +12,7 @@ export class QuoteService { apiURL:string = 'http://localhost:8080/ship' apiURL2:string = 'http://localhost:8080/quote' + apiURL3:string = 'http://localhost:8080/' constructor(private router: Router, private http: HttpClient) { } @@ -39,6 +40,15 @@ export class QuoteService { } + regPackage(object:any){ + this.http.post(this.apiURL3+'/register',object) + .subscribe((response)=>{ + + + console.log(response); + +}) + } } diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.html b/frontend/main/src/app/rct-qt/rct-qt.component.html index c81acf7..3b11fe2 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.html +++ b/frontend/main/src/app/rct-qt/rct-qt.component.html @@ -4,23 +4,27 @@ + - + - +
    Nome E-mail CPFAçõesData nascimento
    {{i}} {{user.name}} {{user.email}}{{user.cpf}}{{user.document}}{{user.birth}} - - + +
    {{i}}{{i+1}} R${{quote.precoFrete}} {{quote.tempo}} dias úteis {{quote.start_adress}}ID Preço do frete PrazoTransportadora Origem DestinoTransportadora Peso cubadoUsuário
    \ No newline at end of file diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.ts b/frontend/main/src/app/rct-qt/rct-qt.component.ts index cc30a23..a6e1bd2 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.ts +++ b/frontend/main/src/app/rct-qt/rct-qt.component.ts @@ -11,24 +11,62 @@ import { QuoteService } from '../quote.service'; }) export class RctQtComponent implements OnInit { - + + recQuotes!: Array + id!: number + price!: number + await!: number + origin!: string + destiny!: string + carrier_id!: number + cub_height!: number + pessoa_id!: number + nomePessoa!: string + razaoTransportadora!: string + + constructor(public quoteService: QuoteService, private router: Router, private http: HttpClient) { } ngOnInit(): void { - this.quoteService.recQuote().pipe().subscribe((response: any) => { + // this.quoteService.recQuote().pipe().subscribe((response: any) => { - var count = Object.keys(response).length; + // var count = Object.keys(response).length; - for (let i = 0; i < count; i++) { + // for (let i = 0; i < count; i++) { - + // this.id = response[i].id + // this.price = response[i].price + // this.await = response[i].await + // this.origin = response[i].origin + // this.destiny = response[i].destiny + // this.cub_height = response[i].cub_height - } + // } + + // }) + } + + + regPackage(price: number, time: number, origin: string, destiny: string, carrier_id: number, cub_height: number, pessoa_id: number) { + + let build = { + "price": price, + "time": time, + "origin": origin, + "destiny": destiny, + "carrier_id": carrier_id, + "cub_height": cub_height, + "pessoa_id": pessoa_id + } + + this.quoteService.regPackage(build) + + + - }) } } From 33bf2232dcec5f58549af492bef11e1654bd480a Mon Sep 17 00:00:00 2001 From: Mateus Felipe Date: Mon, 3 Oct 2022 19:19:15 -0300 Subject: [PATCH 13/19] Updated Carriers and Users --- .../src/app/carriers/carriers.component.html | 8 +++++-- .../src/app/carriers/carriers.component.ts | 9 ++++++++ frontend/main/src/app/quote.service.ts | 2 +- .../main/src/app/rct-qt/rct-qt.component.ts | 22 +++++++++---------- .../main/src/app/users/users.component.html | 3 ++- .../main/src/app/users/users.component.ts | 1 + 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/frontend/main/src/app/carriers/carriers.component.html b/frontend/main/src/app/carriers/carriers.component.html index 4e87155..6d77686 100644 --- a/frontend/main/src/app/carriers/carriers.component.html +++ b/frontend/main/src/app/carriers/carriers.component.html @@ -34,18 +34,22 @@ Taxa E-mail Cnpj + Ação - {{i}} + {{i+1}} {{carrier.razao}} {{carrier.taxa}} {{carrier.email}} {{carrier.cnpj}} - + + + + diff --git a/frontend/main/src/app/carriers/carriers.component.ts b/frontend/main/src/app/carriers/carriers.component.ts index d45bf09..2901bd0 100644 --- a/frontend/main/src/app/carriers/carriers.component.ts +++ b/frontend/main/src/app/carriers/carriers.component.ts @@ -71,4 +71,13 @@ export class CarriersComponent implements OnInit { this.carriers.push({razao:this.razao, taxa:this.taxa, email:this.email, cnpj:this.cnpj}); } + deletar(){ + + + } + + alterar(){ + + } + } diff --git a/frontend/main/src/app/quote.service.ts b/frontend/main/src/app/quote.service.ts index c49bf09..f851d95 100644 --- a/frontend/main/src/app/quote.service.ts +++ b/frontend/main/src/app/quote.service.ts @@ -62,7 +62,7 @@ export class QuoteService { this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) //FIM DO BOUNCE - return this.http.get(this.apiURL) + return this.http.get(this.apiURL2+`/recent`) } diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.ts b/frontend/main/src/app/rct-qt/rct-qt.component.ts index a6e1bd2..5364b01 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.ts +++ b/frontend/main/src/app/rct-qt/rct-qt.component.ts @@ -29,24 +29,24 @@ export class RctQtComponent implements OnInit { ngOnInit(): void { - // this.quoteService.recQuote().pipe().subscribe((response: any) => { + this.quoteService.recQuote().pipe().subscribe((response: any) => { - // var count = Object.keys(response).length; + var count = Object.keys(response).length; - // for (let i = 0; i < count; i++) { + for (let i = 0; i < count; i++) { - // this.id = response[i].id - // this.price = response[i].price - // this.await = response[i].await - // this.origin = response[i].origin - // this.destiny = response[i].destiny - // this.cub_height = response[i].cub_height + this.id = response[i].id + this.price = response[i].price + this.await = response[i].await + this.origin = response[i].origin + this.destiny = response[i].destiny + this.cub_height = response[i].cub_height - // } + } - // }) + }) } diff --git a/frontend/main/src/app/users/users.component.html b/frontend/main/src/app/users/users.component.html index 9e1debe..a825d34 100644 --- a/frontend/main/src/app/users/users.component.html +++ b/frontend/main/src/app/users/users.component.html @@ -31,10 +31,11 @@ E-mail CPF Data nascimento + Ação - {{i}} + {{i+1}} {{user.name}} {{user.email}} {{user.document}} diff --git a/frontend/main/src/app/users/users.component.ts b/frontend/main/src/app/users/users.component.ts index de25fa8..08f69e9 100644 --- a/frontend/main/src/app/users/users.component.ts +++ b/frontend/main/src/app/users/users.component.ts @@ -31,6 +31,7 @@ birth!:string this.email = response[i].email; this.document = response[i].document; this.birth = response[i].birth; + this.users.push({name:this.name, email:this.email, document:this.document, birth:this.birth}); From 1c23cbe9cd5cee9d4f686fd9bedfc2235479abea Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Mon, 3 Oct 2022 19:33:17 -0300 Subject: [PATCH 14/19] UPDATE! RECENT QUOTE BY USER! --- .../TMSProject/controllers/QuoteController.java | 10 ++++++---- .../interfaces/RecentQuoteRepository.java | 11 +++++++++++ .../teamroxo/TMSProject/template/SystemLink.java | 13 +++++++++++++ frontend/main/src/app/loginservice.service.ts | 7 ++++++- 4 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java index 4f3f5a1..5ce2670 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,16 +31,17 @@ public class QuoteController { @PostMapping("/recent") public RecentQuote recentPackage(@RequestBody RecentQuote quote) { - return recentQuoteRepository.save(quote); - } @PostMapping("/register") public RegisterQuote registerPackage(@RequestBody RegisterQuote quote) { - return registerQuoteRepository.save(quote); - + } + + @GetMapping("/recent/{id}") + public List recentQuote(@PathVariable("id") int id){ + return recentQuoteRepository.findOwnQuote(id); } @GetMapping("/go") diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java index 2530b5e..296ad11 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java @@ -1,9 +1,20 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.RecentQuote; +@Repository +@EnableJpaRepositories public interface RecentQuoteRepository extends JpaRepository { + @Query("FROM RecentQuote WHERE pessoa_id = :idUser") + List findOwnQuote(@Param("idUser") int idUser); + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java new file mode 100644 index 0000000..5344a13 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java @@ -0,0 +1,13 @@ +package br.com.entra21.teamroxo.TMSProject.template; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +public class SystemLink { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + +} diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 32a64b6..656cd3c 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -8,17 +8,21 @@ import { LoginComponent } from './login/login.component'; @Injectable({ providedIn: 'root' }) + export class LoginserviceService implements CanActivate { readonly TMSLoginAPI: string = "http://localhost:8080" readonly APIBounceInit: string = "http://localhost:8080/login/init" + //DADOS BÁSICOS nome!: string user!: string email!: string password!: string birth!: Date document!: string + + //DADOS DE CONTROLE succeed!: boolean progress!: boolean admin!: boolean @@ -26,6 +30,7 @@ export class LoginserviceService implements CanActivate { pessoaID!: number adminEnter:boolean = false + //DADOS ESTATÍSTICOS idBounce!: number userBounce!: string dateBounce!: string @@ -79,7 +84,7 @@ export class LoginserviceService implements CanActivate { this.email = resp.email this.password = response[0].senha }) - + let bounce: any = { "user": response[0].user } From ea47c46cb621ee9647d4b2be688ad6c88da4b294 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Mon, 3 Oct 2022 20:30:13 -0300 Subject: [PATCH 15/19] UPDATE! RECENT QUOTE! --- .../TMSProject/controllers/QuoteController.java | 1 + frontend/main/src/app/body/body.component.html | 2 +- frontend/main/src/app/body/body.component.ts | 3 +++ .../main/src/app/notification.service.spec.ts | 16 ++++++++++++++++ frontend/main/src/app/notification.service.ts | 13 +++++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 frontend/main/src/app/notification.service.spec.ts create mode 100644 frontend/main/src/app/notification.service.ts diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java index 5ce2670..08d3e31 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java @@ -36,6 +36,7 @@ public RecentQuote recentPackage(@RequestBody RecentQuote quote) { @PostMapping("/register") public RegisterQuote registerPackage(@RequestBody RegisterQuote quote) { + quote.setPost(LocalDate.now()); return registerQuoteRepository.save(quote); } diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index b4d8527..442143e 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -67,7 +67,7 @@

  • - + 3
    15 Notifications diff --git a/frontend/main/src/app/body/body.component.ts b/frontend/main/src/app/body/body.component.ts index d7e0a88..01e2906 100644 --- a/frontend/main/src/app/body/body.component.ts +++ b/frontend/main/src/app/body/body.component.ts @@ -12,6 +12,9 @@ export class BodyComponent implements OnInit { constructor(public loginService:LoginserviceService) { } ngOnInit(): void { + + + } sair(){ diff --git a/frontend/main/src/app/notification.service.spec.ts b/frontend/main/src/app/notification.service.spec.ts new file mode 100644 index 0000000..c4f2cd6 --- /dev/null +++ b/frontend/main/src/app/notification.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { NotificationService } from './notification.service'; + +describe('NotificationService', () => { + let service: NotificationService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(NotificationService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/notification.service.ts b/frontend/main/src/app/notification.service.ts new file mode 100644 index 0000000..21001b5 --- /dev/null +++ b/frontend/main/src/app/notification.service.ts @@ -0,0 +1,13 @@ +import { Injectable } from '@angular/core'; +import { LoginserviceService } from './loginservice.service'; + +@Injectable({ + providedIn: 'root' +}) +export class NotificationService { + + constructor(private login:LoginserviceService) { } + + + +} From af4ab7036f64971c648ff8c5aeccf35649ebb772 Mon Sep 17 00:00:00 2001 From: Mateus Felipe Date: Mon, 3 Oct 2022 20:30:48 -0300 Subject: [PATCH 16/19] Recent quotes and register --- frontend/main/src/app/quote.service.ts | 26 +++++++++---------- .../main/src/app/rct-qt/rct-qt.component.html | 4 +-- .../main/src/app/rct-qt/rct-qt.component.ts | 19 +++++++++++--- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/frontend/main/src/app/quote.service.ts b/frontend/main/src/app/quote.service.ts index f851d95..a0505ff 100644 --- a/frontend/main/src/app/quote.service.ts +++ b/frontend/main/src/app/quote.service.ts @@ -14,8 +14,6 @@ export class QuoteService { apiURL:string = 'http://localhost:8080/ship' apiURL2:string = 'http://localhost:8080/quote' - apiURL3:string = 'http://localhost:8080/' - APIBouncePut:string = "http://localhost:8080/user/disbounce/" newBounce!:any @@ -47,22 +45,22 @@ export class QuoteService { recQuote():any{ //ATUALIZA BOUNCE - new LoginserviceService(this.router, this.http) + new LoginserviceService(this.router, this.http) - this.newBounce = { - "id":this.login.idBounce, - "user":this.login.userBounce, - "date":this.login.dateBounce, - "time":this.login.timeBounce, - "bounce_rate":false - } + this.newBounce = { + "id":this.login.idBounce, + "user":this.login.userBounce, + "date":this.login.dateBounce, + "time":this.login.timeBounce, + "bounce_rate":false + } - console.log(this.newBounce); + console.log(this.newBounce); - this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) + this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) //FIM DO BOUNCE - return this.http.get(this.apiURL2+`/recent`) + return this.http.get(this.apiURL2+`/recent/`+this.login.pessoaID) } @@ -97,7 +95,7 @@ export class QuoteService { } regPackage(object:any){ - this.http.post(this.apiURL3+'/register',object) + this.http.post(this.apiURL2+'/register',object) .subscribe((response)=>{ diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.html b/frontend/main/src/app/rct-qt/rct-qt.component.html index 3b11fe2..df965ea 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.html +++ b/frontend/main/src/app/rct-qt/rct-qt.component.html @@ -13,7 +13,7 @@ - + {{id}} R${{recQuote.price}} {{recQuote.await}} dias úteis @@ -21,7 +21,7 @@ {{recQuote.origin}} {{recQuote.destiny}} {{recQuote.cub_height}} kg - {{recQuote.nomePessoa}} kg + {{recQuote.nomePessoa}} diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.ts b/frontend/main/src/app/rct-qt/rct-qt.component.ts index 5364b01..ef9b629 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.ts +++ b/frontend/main/src/app/rct-qt/rct-qt.component.ts @@ -2,6 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { CarrierService } from '../carrier.service'; +import { LoginserviceService } from '../loginservice.service'; import { QuoteService } from '../quote.service'; @Component({ @@ -23,29 +24,37 @@ export class RctQtComponent implements OnInit { pessoa_id!: number nomePessoa!: string razaoTransportadora!: string + - constructor(public quoteService: QuoteService, private router: Router, private http: HttpClient) { } + constructor(private loginService: LoginserviceService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } ngOnInit(): void { + this.recQuotes = new Array() this.quoteService.recQuote().pipe().subscribe((response: any) => { + console.log(response); + var count = Object.keys(response).length; for (let i = 0; i < count; i++) { - this.id = response[i].id + this.id = response[i].id this.price = response[i].price this.await = response[i].await this.origin = response[i].origin this.destiny = response[i].destiny this.cub_height = response[i].cub_height - + this.recQuotes.push({id: this.id, price: this.price, await: this.await, origin: this.origin, destiny: this.destiny, cub_height: this.cub_height, razaoTransportadora: "ABC", nomePessoa: "Mateus"}) + } + console.log(); + + }) } @@ -54,7 +63,7 @@ export class RctQtComponent implements OnInit { let build = { "price": price, - "time": time, + "await": time, "origin": origin, "destiny": destiny, "carrier_id": carrier_id, @@ -62,6 +71,8 @@ export class RctQtComponent implements OnInit { "pessoa_id": pessoa_id } + console.log(build); + this.quoteService.regPackage(build) From dafbd2558491a3d5ebc355e284c27f17d3f12fc9 Mon Sep 17 00:00:00 2001 From: Mateus Felipe Date: Mon, 3 Oct 2022 20:38:44 -0300 Subject: [PATCH 17/19] updated --- frontend/main/src/app/rct-qt/rct-qt.component.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.ts b/frontend/main/src/app/rct-qt/rct-qt.component.ts index ef9b629..07c37ee 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.ts +++ b/frontend/main/src/app/rct-qt/rct-qt.component.ts @@ -47,9 +47,16 @@ export class RctQtComponent implements OnInit { this.destiny = response[i].destiny this.cub_height = response[i].cub_height - this.recQuotes.push({id: this.id, price: this.price, await: this.await, origin: this.origin, destiny: this.destiny, cub_height: this.cub_height, razaoTransportadora: "ABC", nomePessoa: "Mateus"}) + + + + + + + this.recQuotes.push({id: this.id, price: this.price, await: this.await, origin: this.origin, destiny: this.destiny, cub_height: this.cub_height, razaoTransportadora: "ABC", nomePessoa: this.loginService.nome}) + } console.log(); From 0356c40dfacd500eebc562d84f39d81dbf4869b0 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Mon, 3 Oct 2022 21:00:53 -0300 Subject: [PATCH 18/19] UPDATE! FIND CARRIERS BY ID! --- .../TMSProject/controllers/CarriersControllers.java | 8 ++++++-- .../TMSProject/interfaces/CarriersRepository.java | 9 ++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java index 5111156..0fe9e65 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java @@ -6,6 +6,7 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,9 +27,12 @@ public class CarriersControllers { @GetMapping() public List listCarriers(){ - return carriersRepository.findAll(); - + } + + @GetMapping("/{id}") + public Carriers carrier(@PathVariable("id") int id) { + return carriersRepository.findCarrierName(id); } @PostMapping() diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java index 9aa8298..9ac52de 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java @@ -4,14 +4,17 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.repository.query.Param; - +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.Carriers; +@Repository +@EnableJpaRepositories public interface CarriersRepository extends JpaRepository { -// @Query("FROM carriers WHERE idade >= :idadeParam") -// List maiorIdade (@Param("idadeParam")Integer idade); + @Query("FROM Carriers WHERE id = :idCarrier") + public Carriers findCarrierName(@Param("idCarrier") int idCarrier); } From 5757d3cf6848916e0077d3b709ff3be4a1f9c05f Mon Sep 17 00:00:00 2001 From: Mateus Felipe Date: Mon, 3 Oct 2022 21:01:23 -0300 Subject: [PATCH 19/19] Updated find name carrier --- frontend/main/src/app/carrier.service.ts | 9 +++++++++ .../main/src/app/rct-qt/rct-qt.component.html | 6 +++--- .../main/src/app/rct-qt/rct-qt.component.ts | 17 ++++++++--------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/frontend/main/src/app/carrier.service.ts b/frontend/main/src/app/carrier.service.ts index 2662659..8a7b74d 100644 --- a/frontend/main/src/app/carrier.service.ts +++ b/frontend/main/src/app/carrier.service.ts @@ -28,4 +28,13 @@ export class CarrierService { } + + findName(id: number):any{ + + this.http.get(this.apiURL+`/`+id).subscribe((response)=>{ + return response + }) + + } + } diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.html b/frontend/main/src/app/rct-qt/rct-qt.component.html index df965ea..9ee9d9d 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.html +++ b/frontend/main/src/app/rct-qt/rct-qt.component.html @@ -1,7 +1,7 @@ - + @@ -13,8 +13,8 @@ - - + + diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.ts b/frontend/main/src/app/rct-qt/rct-qt.component.ts index 07c37ee..1cbccbc 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.ts +++ b/frontend/main/src/app/rct-qt/rct-qt.component.ts @@ -27,7 +27,7 @@ export class RctQtComponent implements OnInit { - constructor(private loginService: LoginserviceService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } + constructor(private carrierService: CarrierService, private loginService: LoginserviceService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } ngOnInit(): void { this.recQuotes = new Array() @@ -46,14 +46,11 @@ export class RctQtComponent implements OnInit { this.origin = response[i].origin this.destiny = response[i].destiny this.cub_height = response[i].cub_height - - + + this.razaoTransportadora = this.carrierService.findName(response.carrier_id); - - - - this.recQuotes.push({id: this.id, price: this.price, await: this.await, origin: this.origin, destiny: this.destiny, cub_height: this.cub_height, razaoTransportadora: "ABC", nomePessoa: this.loginService.nome}) + this.recQuotes.push({id: this.id, price: this.price, await: this.await, origin: this.origin, destiny: this.destiny, cub_height: this.cub_height, razaoTransportadora: this.razaoTransportadora, carrier_id: response.carrier_id, nomePessoa: this.loginService.nome}) @@ -66,7 +63,9 @@ export class RctQtComponent implements OnInit { } - regPackage(price: number, time: number, origin: string, destiny: string, carrier_id: number, cub_height: number, pessoa_id: number) { + regPackage(price: number, time: number, origin: string, destiny: string, carrier_id: string, cub_height: number) { + + let build = { "price": price, @@ -75,7 +74,7 @@ export class RctQtComponent implements OnInit { "destiny": destiny, "carrier_id": carrier_id, "cub_height": cub_height, - "pessoa_id": pessoa_id + "pessoa_id": this.loginService.pessoaID } console.log(build);
    AçãoIDPreço do frete Prazo Transportadora
    {{id}}R${{recQuote.price}} {{recQuote.await}} dias úteis {{recQuote.razaoTransportadora}}