diff --git a/hv-ui/src/app/app-routing.module.ts b/hv-ui/src/app/app-routing.module.ts index de4af2b..371f66a 100644 --- a/hv-ui/src/app/app-routing.module.ts +++ b/hv-ui/src/app/app-routing.module.ts @@ -2,10 +2,14 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { MietersComponent } from './mieters/mieters.component'; import { ObjekteComponent } from './objekte/objekte.component'; +import { WohnungenComponent } from './wohnungen/wohnungen.component'; +import { MieterDetailComponent } from './mieter-detail/mieter-detail.component' const routes: Routes = [ { path: 'objekte', component: ObjekteComponent }, - { path: 'mieters', component: MietersComponent } + { path: 'mieters', component: MietersComponent }, + { path: 'mieter/:id', component: MieterDetailComponent }, + { path: 'wohnungen/:objektId', component: WohnungenComponent } ]; @NgModule({ diff --git a/hv-ui/src/app/app.module.ts b/hv-ui/src/app/app.module.ts index a9e86d6..c95166a 100644 --- a/hv-ui/src/app/app.module.ts +++ b/hv-ui/src/app/app.module.ts @@ -7,13 +7,17 @@ import { AppComponent } from './app.component'; import { MessagesComponent } from './messages/messages.component'; import { ObjekteComponent } from './objekte/objekte.component'; import { MietersComponent } from './mieters/mieters.component'; +import { WohnungenComponent } from './wohnungen/wohnungen.component'; +import { MieterDetailComponent } from './mieter-detail/mieter-detail.component'; @NgModule({ declarations: [ AppComponent, MessagesComponent, ObjekteComponent, - MietersComponent + MietersComponent, + WohnungenComponent, + MieterDetailComponent ], imports: [ BrowserModule, diff --git a/hv-ui/src/app/config.ts b/hv-ui/src/app/config.ts index 3b658e3..7663e29 100644 --- a/hv-ui/src/app/config.ts +++ b/hv-ui/src/app/config.ts @@ -1 +1 @@ -export const serviceBaseUrl = "http://172.16.3.32:5000"; \ No newline at end of file +export const serviceBaseUrl = "http://172.16.3.185:5000"; \ No newline at end of file diff --git a/hv-ui/src/app/forderung.service.spec.ts b/hv-ui/src/app/forderung.service.spec.ts new file mode 100644 index 0000000..8d32b83 --- /dev/null +++ b/hv-ui/src/app/forderung.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ForderungService } from './forderung.service'; + +describe('ForderungService', () => { + let service: ForderungService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ForderungService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/hv-ui/src/app/forderung.service.ts b/hv-ui/src/app/forderung.service.ts new file mode 100644 index 0000000..2acbe50 --- /dev/null +++ b/hv-ui/src/app/forderung.service.ts @@ -0,0 +1,24 @@ +import { Injectable } from '@angular/core'; +import { Observable, of } from 'rxjs'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; + +import { Forderung } from './forderung'; +import { MessageService } from './message.service'; +import { serviceBaseUrl } from './config'; + +@Injectable({ + providedIn: 'root' +}) +export class ForderungService { + constructor(private messageService: MessageService, private http: HttpClient) { } + + getForderungenByMieter(mieterId: number): Promise { + this.messageService.add(`ForderungService: fetched forderungen by mieter ${mieterId}`); + return this.http.get(`${serviceBaseUrl}/hv/mieter/${mieterId}/forderungen`).toPromise() + } + + getForderung(id: number): Promise { + this.messageService.add(`ForderungService: fetch forderung id=${id}`); + return this.http.get(`${serviceBaseUrl}/hv/forderung/${id}`).toPromise() + } +} diff --git a/hv-ui/src/app/forderung.ts b/hv-ui/src/app/forderung.ts new file mode 100644 index 0000000..d12ef2c --- /dev/null +++ b/hv-ui/src/app/forderung.ts @@ -0,0 +1,7 @@ +export interface Forderung { + id: number; + mieter_id: number; + ref_wohnung: number; + datum: string; + betrag: number; +} diff --git a/hv-ui/src/app/mieter-detail/mieter-detail.component.css b/hv-ui/src/app/mieter-detail/mieter-detail.component.css new file mode 100644 index 0000000..e69de29 diff --git a/hv-ui/src/app/mieter-detail/mieter-detail.component.html b/hv-ui/src/app/mieter-detail/mieter-detail.component.html new file mode 100644 index 0000000..deae049 --- /dev/null +++ b/hv-ui/src/app/mieter-detail/mieter-detail.component.html @@ -0,0 +1,27 @@ +

Mieter: {{mieter.vorname}} {{mieter.nachname}} ({{mieter.id}})

+ + + + + + + + + + + + + +
Objekt:{{mieter.objekt}} ({{mieter.objekt_id}})
Wohnung:{{mieter.wohnung}} ({{mieter.wohnung_id}})
Vorname:{{mieter.vorname}}
Nachname:{{mieter.nachname}}
Anrede:{{mieter.anrede}}
Strasse:{{mieter.strasse}}
PLZ:{{mieter.plz}}
Ort:{{mieter.ort}}
Telefon:{{mieter.telefon}}
Einzug:{{mieter.einzug}}
Auszug:{{mieter.auszug}}
+ + + + + + + + + + + +
DatumForderungZahlung
{{forderung.datum}}{{forderung.betrag}}
{{forderung.kommentar}}
\ No newline at end of file diff --git a/hv-ui/src/app/mieter-detail/mieter-detail.component.spec.ts b/hv-ui/src/app/mieter-detail/mieter-detail.component.spec.ts new file mode 100644 index 0000000..1c7b093 --- /dev/null +++ b/hv-ui/src/app/mieter-detail/mieter-detail.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MieterDetailComponent } from './mieter-detail.component'; + +describe('MieterDetailComponent', () => { + let component: MieterDetailComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MieterDetailComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MieterDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/hv-ui/src/app/mieter-detail/mieter-detail.component.ts b/hv-ui/src/app/mieter-detail/mieter-detail.component.ts new file mode 100644 index 0000000..1bcded2 --- /dev/null +++ b/hv-ui/src/app/mieter-detail/mieter-detail.component.ts @@ -0,0 +1,43 @@ +import { Component, OnInit } from '@angular/core' +import { ActivatedRoute } from '@angular/router' +import { Location } from '@angular/common' + +import { Mieter } from '../mieter' +import { Forderung } from '../forderung' +import { MieterService} from '../mieter.service' +import { ForderungService} from '../forderung.service' +import { MessageService } from '../message.service' + +@Component({ + selector: 'app-mieter-detail', + templateUrl: './mieter-detail.component.html', + styleUrls: ['./mieter-detail.component.css'] +}) +export class MieterDetailComponent implements OnInit { + + mieter: Mieter + forderungen : Forderung[] + + + constructor( + private mieterService: MieterService, + private forderungService: ForderungService, + private messageService: MessageService, + private route: ActivatedRoute, + private location: Location ) { + } + + async getMieter() { + const id = +this.route.snapshot.paramMap.get('id') + try { + this.mieter = await this.mieterService.getMieter(id) + this.forderungen = await this.forderungService.getForderungenByMieter(id) + } catch (err) { + this.messageService.add(JSON.stringify(err, undefined, 4)) + } + } + + ngOnInit(): void { + this.getMieter() + } +} diff --git a/hv-ui/src/app/mieter.ts b/hv-ui/src/app/mieter.ts index 4c3d5b1..211a8f5 100644 --- a/hv-ui/src/app/mieter.ts +++ b/hv-ui/src/app/mieter.ts @@ -13,5 +13,4 @@ export interface Mieter { telefon: string; einzug: string; auszug: string; - flaeche: number; } diff --git a/hv-ui/src/app/mieters/mieters.component.html b/hv-ui/src/app/mieters/mieters.component.html index 98731ed..9763f6a 100644 --- a/hv-ui/src/app/mieters/mieters.component.html +++ b/hv-ui/src/app/mieters/mieters.component.html @@ -1,6 +1,7 @@

Meine Mieter

    -
  • +
  • {{mieter.vorname}} {{mieter.nachname}}
diff --git a/hv-ui/src/app/objekte/objekte.component.html b/hv-ui/src/app/objekte/objekte.component.html index c6cd83a..6f516cf 100644 --- a/hv-ui/src/app/objekte/objekte.component.html +++ b/hv-ui/src/app/objekte/objekte.component.html @@ -1,6 +1,7 @@

Meine Objekte

    -
  • +
  • {{objekt.shortname}}
diff --git a/hv-ui/src/app/wohnung.service.spec.ts b/hv-ui/src/app/wohnung.service.spec.ts new file mode 100644 index 0000000..f0b5546 --- /dev/null +++ b/hv-ui/src/app/wohnung.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { WohnungService } from './wohnung.service'; + +describe('WohnungService', () => { + let service: WohnungService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(WohnungService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/hv-ui/src/app/wohnung.service.ts b/hv-ui/src/app/wohnung.service.ts new file mode 100644 index 0000000..2f5d511 --- /dev/null +++ b/hv-ui/src/app/wohnung.service.ts @@ -0,0 +1,29 @@ +import { Injectable } from '@angular/core'; +import { Observable, of } from 'rxjs'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; + +import { Wohnung } from './wohnung'; +import { MessageService } from './message.service'; +import { serviceBaseUrl } from './config'; + +@Injectable({ + providedIn: 'root' +}) +export class WohnungService { + constructor(private messageService: MessageService, private http: HttpClient) { } + + getWohnungen(): Promise { + this.messageService.add('WohnungService: fetched wohnungen'); + return this.http.get(`${serviceBaseUrl}/hv/wohnungen`).toPromise() + } + + getWohnungenByObjekt(objektId: number): Promise { + this.messageService.add(`WohnungService: fetched wohnungen by Objekt ${objektId}`); + return this.http.get(`${serviceBaseUrl}/hv/objekt/${objektId}/wohnungen`).toPromise() + } + + getWohnung(id: number): Promise { + this.messageService.add(`WohnungService: fetch wohnung id=${id}`); + return this.http.get(`${serviceBaseUrl}/hv/wohnung/${id}`).toPromise() + } +} diff --git a/hv-ui/src/app/wohnung.ts b/hv-ui/src/app/wohnung.ts new file mode 100644 index 0000000..e1c517f --- /dev/null +++ b/hv-ui/src/app/wohnung.ts @@ -0,0 +1,8 @@ +export interface Wohnung { + id: number; + objekt_id: number; + wohnung_id: number; + wohnung: string; + objekt: string; + flaeche: number; +} diff --git a/hv-ui/src/app/wohnungen/wohnungen.component.css b/hv-ui/src/app/wohnungen/wohnungen.component.css new file mode 100644 index 0000000..22953ec --- /dev/null +++ b/hv-ui/src/app/wohnungen/wohnungen.component.css @@ -0,0 +1,57 @@ +/* HeroesComponent's private CSS styles */ +.wohnungen { + margin: 0 0 2em 0; + list-style-type: none; + padding: 0; + width: 15em; +} +.wohnungen li { + cursor: pointer; + position: relative; + left: 0; + background-color: #EEE; + margin: .5em; + padding: .3em 0; + height: 1.6em; + border-radius: 4px; +} +.wohnungen li:hover { + color: #607D8B; + background-color: #DDD; + left: .1em; +} +.wohnungen li.selected { + background-color: #CFD8DC; + color: white; +} +.wohnungen li.selected:hover { + background-color: #BBD8DC; + color: white; +} +.wohnungen .badge { + display: inline-block; + font-size: small; + color: white; + padding: 0.8em 0.7em 0 0.7em; + background-color:#405061; + line-height: 1em; + position: relative; + left: -1px; + top: -4px; + height: 1.8em; + margin-right: .8em; + border-radius: 4px 0 0 4px; +} + + +.wohnungen a { + color: #333; + text-decoration: none; + position: relative; + display: block; + width: 250px; +} + +.wohnungen a:hover { + color:#607D8B; +} diff --git a/hv-ui/src/app/wohnungen/wohnungen.component.html b/hv-ui/src/app/wohnungen/wohnungen.component.html new file mode 100644 index 0000000..ff8db98 --- /dev/null +++ b/hv-ui/src/app/wohnungen/wohnungen.component.html @@ -0,0 +1,10 @@ +

Meine Wohnungen

+

Objekt: {{objekt.shortname}}

+

+ Objektfläche: {{objekt.flaeche}} +

+
    +
  • + {{wohnung.wohnung}}: {{wohnung.flaeche}}m² +
    • +
diff --git a/hv-ui/src/app/wohnungen/wohnungen.component.spec.ts b/hv-ui/src/app/wohnungen/wohnungen.component.spec.ts new file mode 100644 index 0000000..2f1b0e8 --- /dev/null +++ b/hv-ui/src/app/wohnungen/wohnungen.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WohnungenComponent } from './wohnungen.component'; + +describe('WohnungenComponent', () => { + let component: WohnungenComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ WohnungenComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(WohnungenComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/hv-ui/src/app/wohnungen/wohnungen.component.ts b/hv-ui/src/app/wohnungen/wohnungen.component.ts new file mode 100644 index 0000000..631385f --- /dev/null +++ b/hv-ui/src/app/wohnungen/wohnungen.component.ts @@ -0,0 +1,44 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Location } from '@angular/common'; + +import { Wohnung } from '../wohnung'; +import { WohnungService } from '../wohnung.service'; +import { ObjektService } from '../objekt.service'; +import { MessageService } from '../message.service'; +import { Objekt } from '../objekt'; + + +@Component({ + selector: 'app-wohnungen', + templateUrl: './wohnungen.component.html', + styleUrls: ['./wohnungen.component.css'] +}) +export class WohnungenComponent implements OnInit { + + wohnungen: Wohnung[]; + objekt: Objekt; + + constructor( + private wohnungService: WohnungService, + private objektService: ObjektService, + private messageService: MessageService, + private route: ActivatedRoute, + private location: Location ) { + + } + + async getWohnungen() { + const objektId = +this.route.snapshot.paramMap.get('objektId') + try { + this.objekt = await this.objektService.getObjekt(objektId) + this.wohnungen = await this.wohnungService.getWohnungenByObjekt(objektId); + } catch (err) { + this.messageService.add(JSON.stringify(err, undefined, 4)) + } + } + + ngOnInit(): void { + this.getWohnungen(); + } +} diff --git a/hv-ui/src/app/zahlung-forderung.service.spec.ts b/hv-ui/src/app/zahlung-forderung.service.spec.ts new file mode 100644 index 0000000..2c9a70e --- /dev/null +++ b/hv-ui/src/app/zahlung-forderung.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ZahlungForderungService } from './zahlung-forderung.service'; + +describe('ZahlungForderungService', () => { + let service: ZahlungForderungService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ZahlungForderungService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/hv-ui/src/app/zahlung-forderung.service.ts b/hv-ui/src/app/zahlung-forderung.service.ts new file mode 100644 index 0000000..7639302 --- /dev/null +++ b/hv-ui/src/app/zahlung-forderung.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core' +import { Observable, of } from 'rxjs' +import { HttpClient, HttpHeaders } from '@angular/common/http' + +import { ZahlungForderung } from './zahlung-forderung' +import { Forderung } from './forderung' +import { MessageService } from './message.service' +import { serviceBaseUrl } from './config' + +@Injectable({ + providedIn: 'root' +}) +export class ZahlungForderungService { + constructor(private messageService: MessageService, private http: HttpClient) { } + + getZahlungenForderungenByMieterAndYear(mieterId: number, year: number): Promise { + this.messageService.add(`ZahlungForderungService: fetched zahlungen and forderungen by mieter ${mieterId} and year ${year}`) + return this.http.get(`${serviceBaseUrl}/hv/mieter/${mieterId}/zahlungforderung${year}`).toPromise() + } + + getForderung(id: number): Promise { + this.messageService.add(`ZahlungForderungService: fetch forderung id=${id}`) + return this.http.get(`${serviceBaseUrl}/hv/forderung/${id}`).toPromise() + } +} diff --git a/hv-ui/src/app/zahlung-forderung.ts b/hv-ui/src/app/zahlung-forderung.ts new file mode 100644 index 0000000..2cbfae7 --- /dev/null +++ b/hv-ui/src/app/zahlung-forderung.ts @@ -0,0 +1,10 @@ +export interface ZahlungForderung { + id: number + zf_type: string + mieter: number + datum_soll: string + datum_ist: string + betrag_zahlung: number + betrag_forderung: number + kommentar: string +} \ No newline at end of file