UPDATE RELATORIOS!

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<Pessoa> birthNow(){
+		return pessoaRepository.findBirth(LocalDate.now());
+	}
+
+	@GetMapping("/birthmonth")
+	public List<Pessoa> 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<CountVisitors> bounce = new ArrayList<CountVisitors>(countVisitorsRepository.findAll().stream()

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<Pessoa, Integer> {
 
+	@Query("FROM Pessoa WHERE birth = :now")
+	List<Pessoa> findBirth (@Param("now") LocalDate now);
+
+	@Query("FROM Pessoa WHERE birth BETWEEN :firstDay and :lastDay")
+	List<Pessoa> findBirthMonth (@Param("firstDay") LocalDate first, @Param("lastDay") LocalDate last);
+
 }

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({

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,

frontend/main/src/app/body/body.component.html

@@ -111,7 +111,7 @@ <h3 class="dropdown-item-title">
             </p>
           </a>
         </li>
-        <li class="nav-item" [hidden]="loginService.admin">
+        <li class="nav-item" [hidden]="!loginService.admin">
           <a href="" routerLink="dashboard" class="nav-link">
             <i class="nav-icon fas fa-chart-bar"></i>
             <p>Dashboard</p>
@@ -125,18 +125,24 @@ <h3 class="dropdown-item-title">
             </p>
           </a>
           <ul class="nav nav-treeview">
-            <li class="nav-item">
+            <li class="nav-item" [hidden]="!loginService.admin">
               <a routerLink="users" class="nav-link">
                 <i class="far fa-circle nav-icon"></i>
                 <p>Clients</p>
               </a>
             </li>
-            <li class="nav-item">
+            <li class="nav-item" [hidden]="!loginService.admin">
               <a routerLink="carriers" class="nav-link">
                 <i class="far fa-circle nav-icon"></i>
                 <p>Carriers</p>
               </a>
             </li>
+            <li class="nav-item" [hidden]="loginService.admin">
+              <a routerLink="user-client" class="nav-link">
+                <i class="far fa-circle nav-icon"></i>
+                <p>Clients</p>
+              </a>
+            </li>
           </ul>
         </li>
         <li class="nav-item">
@@ -176,7 +182,7 @@ <h3 class="dropdown-item-title">
           </ul>
         </li>
         <li class="nav-item">
-          <a href="" routerLink="finance" class="nav-link">
+          <a href="" routerLink="finance" class="nav-link" [hidden]="!loginService.adminEnter">
             <i class="nav-icon fas fa-dollar-sign"></i>
             <p>Finance
             </p>
@@ -195,6 +201,6 @@ <h3 class="dropdown-item-title">
   </div>
   <div style="padding-left: 20px;">
     <div class="small">Logged in as:</div>
-    <span>{{loginService.user}}<br><a routerLink="" (click)="sair()" class="small" style="color: red;">Sair</a>&nbsp;&nbsp;&nbsp;&nbsp;<a routerLink="edit" class="small">Edit</a> </span>
+    <span>{{loginService.nome}}<br><a routerLink="" (click)="sair()" class="small" style="color: red;">Sair</a>&nbsp;&nbsp;&nbsp;&nbsp;<a routerLink="edit" class="small">Edit</a> </span>
   </div>
 </aside>

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)
 

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
       })
 

frontend/main/src/app/user-client/user-client.component.html

@@ -0,0 +1 @@
+<p>user-client works!</p>

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<UserClientComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ UserClientComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(UserClientComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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