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 { + } + +}