From d2a21f4e2ab5285675dcfb1215e48c4d0b65a4da Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Wed, 5 Oct 2022 00:58:04 -0300 Subject: [PATCH] =?UTF-8?q?Component=20-=20Visit=20Relat=C3=B3rio=20Aniver?= =?UTF-8?q?sariantes=20Rotas=20Dashboard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/main/src/app/app-routing.module.ts | 4 +- frontend/main/src/app/app.module.ts | 4 +- .../main/src/app/body/body.component.html | 47 ++++++------------- frontend/main/src/app/body/body.component.ts | 41 ++++++++++------ .../src/app/insight/insight.component.html | 4 +- .../main/src/app/insight/insight.component.ts | 7 ++- .../main/src/app/visits/visits.component.css | 0 .../main/src/app/visits/visits.component.html | 18 +++++++ .../src/app/visits/visits.component.spec.ts | 23 +++++++++ .../main/src/app/visits/visits.component.ts | 33 +++++++++++++ 10 files changed, 130 insertions(+), 51 deletions(-) create mode 100644 frontend/main/src/app/visits/visits.component.css create mode 100644 frontend/main/src/app/visits/visits.component.html create mode 100644 frontend/main/src/app/visits/visits.component.spec.ts create mode 100644 frontend/main/src/app/visits/visits.component.ts diff --git a/frontend/main/src/app/app-routing.module.ts b/frontend/main/src/app/app-routing.module.ts index 5c32c78..32954c6 100644 --- a/frontend/main/src/app/app-routing.module.ts +++ b/frontend/main/src/app/app-routing.module.ts @@ -18,6 +18,7 @@ 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'; +import { VisitsComponent } from './visits/visits.component'; const routes: Routes = [ { path: 'home', component:HomeComponent, canActivate:[LoginserviceService]}, @@ -36,7 +37,8 @@ const routes: Routes = [ { path: 'edit', component:EditComponent, canActivate:[LoginserviceService]}, { path: 'about', component:AboutComponent, canActivate:[LoginserviceService]}, { path: 'forgetPassword', component:ForgetPasswordComponent}, - { path: "user-client", component:UserClientComponent, canActivate:[LoginserviceService]} + { path: "user-client", component:UserClientComponent, canActivate:[LoginserviceService]}, + { path: "visits", component:VisitsComponent, canActivate:[LoginserviceService]} ]; @NgModule({ diff --git a/frontend/main/src/app/app.module.ts b/frontend/main/src/app/app.module.ts index 86dd107..f8a5112 100644 --- a/frontend/main/src/app/app.module.ts +++ b/frontend/main/src/app/app.module.ts @@ -24,6 +24,7 @@ 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'; +import { VisitsComponent } from './visits/visits.component'; @NgModule({ declarations: [ @@ -46,7 +47,8 @@ import { UserClientComponent } from './user-client/user-client.component'; EditComponent, AboutComponent, ForgetPasswordComponent, - UserClientComponent + UserClientComponent, + VisitsComponent ], imports: [ BrowserModule, diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 6a1d914..f010d99 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}}

@@ -64,32 +64,7 @@

-
  • - - - 3 - -
    - 15 Notifications -
    - - 4 new messages - 3 mins - -
    - - 8 friend requests - 12 hours - -
    - - 3 new reports - 2 days - -
    - See All Notifications -
    -
    • + @@ -196,6 +171,14 @@

    +
  • + + +

    + Visits +

    +     +
    • diff --git a/frontend/main/src/app/body/body.component.ts b/frontend/main/src/app/body/body.component.ts index 849763a..628c4b0 100644 --- a/frontend/main/src/app/body/body.component.ts +++ b/frontend/main/src/app/body/body.component.ts @@ -12,42 +12,55 @@ 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 - sair(){ + for(let i=0;i{{countClient}}

    {{countVisitors}}

    -

    Visitors

    +

    Visits

    - More info + More info
    diff --git a/frontend/main/src/app/insight/insight.component.ts b/frontend/main/src/app/insight/insight.component.ts index e6d2048..f94e47c 100644 --- a/frontend/main/src/app/insight/insight.component.ts +++ b/frontend/main/src/app/insight/insight.component.ts @@ -37,7 +37,8 @@ export class InsightComponent implements OnInit { this.http.get(this.APICountVisits) .subscribe((resultado:any) => { - this.countVisitors=resultado + var count = Object.keys(resultado).length + this.countVisitors = count }); this.http.get(this.APICountPackages) @@ -61,5 +62,9 @@ export class InsightComponent implements OnInit { this.router.navigateByUrl('users') } + visits(){ + this.router.navigateByUrl('visits') + } + } diff --git a/frontend/main/src/app/visits/visits.component.css b/frontend/main/src/app/visits/visits.component.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/main/src/app/visits/visits.component.html b/frontend/main/src/app/visits/visits.component.html new file mode 100644 index 0000000..c542c19 --- /dev/null +++ b/frontend/main/src/app/visits/visits.component.html @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + +
    IDDataTimeUserBounce Rate
    {{visit.id}}{{visit.date}}{{visit.time}}{{visit.user}}{{visit.bounceRate}}
    diff --git a/frontend/main/src/app/visits/visits.component.spec.ts b/frontend/main/src/app/visits/visits.component.spec.ts new file mode 100644 index 0000000..377f3f3 --- /dev/null +++ b/frontend/main/src/app/visits/visits.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VisitsComponent } from './visits.component'; + +describe('VisitsComponent', () => { + let component: VisitsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ VisitsComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(VisitsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/visits/visits.component.ts b/frontend/main/src/app/visits/visits.component.ts new file mode 100644 index 0000000..2937a48 --- /dev/null +++ b/frontend/main/src/app/visits/visits.component.ts @@ -0,0 +1,33 @@ +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-visits', + templateUrl: './visits.component.html', + styleUrls: ['./visits.component.css'] +}) +export class VisitsComponent implements OnInit { + + readonly APICountVisits:string = "http://localhost:8080/user/countVisitors" + + visits! : Array + + constructor(private router:Router, private http:HttpClient) { } + + ngOnInit(): void { + this.visits = new Array() + this.http.get(this.APICountVisits) + .subscribe((resultado:any)=>{ + var count = Object.keys(resultado).length + for(let i = 0; i