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 823064c..10aa60b 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 @@ -60,8 +60,8 @@ public Optional list(@PathVariable int id){ } @GetMapping("/countClients") - public long numberClients() { - return pessoaRepository.count(); + public List numberClients() { + return pessoaRepository.findAll(); } @GetMapping("/countVisitors") 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 08d3e31..f857e39 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 @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -45,6 +46,11 @@ public List recentQuote(@PathVariable("id") int id){ return recentQuoteRepository.findOwnQuote(id); } + @DeleteMapping("/recent/{id}") + public void deleteQuote(@PathVariable("id") int id){ + recentQuoteRepository.deleteById(id); + } + @GetMapping("/go") public int goingPackages() { 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 9ac52de..c79c263 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,7 +1,5 @@ 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; diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 6a1d914..258e2ae 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -19,12 +19,12 @@

- Relatório: Aniversantes do dia + Relatório: Aniversantes do dia

Parabéns:

-

- {{aniversariante}} +

+ {{aniversariante.nome}}

@@ -37,9 +37,9 @@

Relatório: Aniversariantes do mês

-

{{birthmonth}}

-

- +

+

+ {{aniversariante.nome}}

diff --git a/frontend/main/src/app/body/body.component.ts b/frontend/main/src/app/body/body.component.ts index 849763a..d57bd1e 100644 --- a/frontend/main/src/app/body/body.component.ts +++ b/frontend/main/src/app/body/body.component.ts @@ -12,30 +12,51 @@ import { Observable } from 'rxjs'; }) export class BodyComponent implements OnInit { - readonly APIBirthNow: string = "http://localhost:8080/user/birthnow" - - readonly APIBirthMonth: string = "http://localhost:8080/user/birthmonth" + readonly APIBirthNow: string = "http://localhost:8080/user/birthnow" + + readonly APIBirthMonth: string = "http://localhost:8080/user/birthmonth" birthnow! : string birthmonth! : string aniversariantes!: Array + aniversariantesMes!: Array id!: number nome!: string - email!: string + email!: string birth!: Date document!: string constructor(public loginService:LoginserviceService, private router:Router, private http:HttpClient) { } ngOnInit(): void { + + this.aniversariantes = new Array() + this.aniversariantesMes = new Array() + this.http.get(this.APIBirthNow) .subscribe((resultado:any) => { - this.birthnow = resultado + + var count = Object.keys(resultado).length + + for(let i=0;i { - this.birthmonth=resultado + + var count = Object.keys(resultado).length + + for(let i=0;ifinance works!

+
+

LUCRO

+ + + Created with Sketch. + + + + + 0 + + + 25 + + + 50 + + + 75 + + + 100 + + + + + + + + + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + + 10 + + + 11 + + + 12 + + + + + + + + + + + + + + + +
diff --git a/frontend/main/src/app/quote.service.ts b/frontend/main/src/app/quote.service.ts index 7e69baa..60805db 100644 --- a/frontend/main/src/app/quote.service.ts +++ b/frontend/main/src/app/quote.service.ts @@ -95,7 +95,6 @@ export class QuoteService { regPackage(object:any){ this.http.post(this.apiURL2+'/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 043e5e8..c64ada3 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,6 @@ - @@ -9,7 +8,6 @@ -
AçãoPreço do frete Prazo TransportadoraDestino Peso cubado Usuário