14 Commits

34 changed files with 749 additions and 107 deletions

1
.gitignore vendored
View File

@ -2,4 +2,5 @@ __pycache__/
ENV
api/config/dbconfig.ini
api/config/authservice.pub
cli/config/dbconfig.ini

View File

@ -0,0 +1,30 @@
# -------------------------------------------------------------------
# ATTENTION: This file will not be parsed by Cheetah
# Use plain openapi/yaml syntax, no Cheetah
# escaping
# -------------------------------------------------------------------
tenant_with_saldo:
description: tenant with saldo
type: object
properties:
id:
type: integer
salutation:
type: string
nullable: true
firstname:
type: string
nullable: true
lastname:
type: string
nullable: true
address1:
type: string
nullable: true
saldo:
type: number
nullable: true

View File

@ -72,4 +72,20 @@
type: number
security:
- jwt: ['secret']
/v1/tenants/saldo:
get:
tags: [ "tenant", "account" ]
summary: Return tenant with saldo of the account
operationId: additional_methods.get_tenant_with_saldo
responses:
'200':
description: get_tenant_with_saldo
content:
'application/json':
schema:
type: array
items:
$ref: '#/components/schemas/tenant_with_saldo'
security:
- jwt: ['secret']

View File

@ -31,4 +31,16 @@ def get_account_saldo(user, token_info, accountId=None):
"statement": "SELECT sum(amount) as saldo FROM account_entry_t WHERE account=%s",
"params": (accountId, )
}
)
)
def get_tenant_with_saldo(user, token_info):
return dbGetMany(user, token_info, {
"statement": """
SELECT t.firstname, t.lastname, t.address1, sum(a.amount) AS saldo
FROM tenant_t t, account_entry_t a
WHERE a.account = t.account
GROUP BY t.firstname, t.lastname, t.address1
""",
"params": ()
}
)

View File

@ -1493,6 +1493,22 @@ paths:
type: number
security:
- jwt: ['secret']
/v1/tenants/saldo:
get:
tags: [ "tenant", "account" ]
summary: Return tenant with saldo of the account
operationId: additional_methods.get_tenant_with_saldo
responses:
'200':
description: get_tenant_with_saldo
content:
'application/json':
schema:
type: array
items:
$ref: '#/components/schemas/tenant_with_saldo'
security:
- jwt: ['secret']
components:
@ -1727,3 +1743,34 @@ components:
type: integer
note:
type: string
# -------------------------------------------------------------------
# ATTENTION: This file will not be parsed by Cheetah
# Use plain openapi/yaml syntax, no Cheetah
# escaping
# -------------------------------------------------------------------
tenant_with_saldo:
description: tenant with saldo
type: object
properties:
id:
type: integer
salutation:
type: string
nullable: true
firstname:
type: string
nullable: true
lastname:
type: string
nullable: true
address1:
type: string
nullable: true
saldo:
type: number
nullable: true

View File

@ -156,3 +156,5 @@ components:
#end if
#end for
#end for
#include raw "./api/additional_components.yaml"

126
cli/ConsistencyCheck.py Normal file
View File

@ -0,0 +1,126 @@
from db import dbGetMany
from loguru import logger
errorCnt = 0
def perform(dbh, params):
global errorCnt
checkTenant(dbh, params)
checkFlats(dbh, params)
checkParkings(dbh, params)
checkCommercialPremise(dbh, params)
if (errorCnt > 0):
logger.error(f"Total error count: {errorCnt}")
def checkTenant(dbh, params):
global errorCnt
tenants = dbGetMany(dbh, { "statement": "SELECT * FROM tenant_t", "params": () })
for tenant in tenants:
outPre = f"Tenant: {tenant['firstname']} {tenant['lastname']}"
logger.info(outPre)
# check tenancies
tenancyCnt = 0
flatTenancyCnt = 0
tenancies = dbGetMany(dbh, {
"statement": "SELECT * FROM tenancy_t WHERE tenant = %s AND startdate < now() AND (enddate > now() or enddate is null)",
"params": (tenant['id'], )
}
)
for tenancy in tenancies:
tenancyCnt += 1
if (tenancy['flat']):
flatTenancyCnt += 1
logger.info(f"{outPre}: Flat tenancy: {tenancy['id']}, start: {tenancy['startdate']}, end: {tenancy['enddate']}")
if (tenancy['parking']):
logger.info(f"{outPre}: Garage tenancy: {tenancy['id']}, start: {tenancy['startdate']}, end: {tenancy['enddate']}")
if (tenancy['commercial_premise']):
logger.info(f"{outPre}: Commercial premise tenancy: {tenancy['id']}, start: {tenancy['startdate']}, end: {tenancy['enddate']}")
if (flatTenancyCnt == 0):
logger.warning(f"{outPre}: no flat tenancy")
if (flatTenancyCnt > 1):
logger.warning(f"{outPre}: more than one flat tenancy ({flatTenancyCnt})")
if (tenancyCnt == 0):
logger.error(f"{outPre}: no tenancy at all")
errorCnt += 1
noCurrentTenancies = dbGetMany(dbh, {
"statement": "SELECT * FROM tenancy_t WHERE tenant = %s",
"params": (tenant['id'], )
}
)
for noCurrentTenancy in noCurrentTenancies:
logger.error(f"{outPre}: but: flat {noCurrentTenancy['flat']}, parking: {noCurrentTenancy['parking']}, commercial premise: {noCurrentTenancy['commercial_premise']}, start: {noCurrentTenancy['startdate']}, end: {noCurrentTenancy['enddate']}")
def _checkRentals(dbh, params, rentalType):
global errorCnt
table = f"{rentalType}_t"
rentals = dbGetMany(dbh, {
"statement": f"SELECT * FROM {table}",
"params": ()
}
)
for rental in rentals:
outPre = f"{rentalType}: {rental['description']}, premise: {rental['premise']}"
logger.info(outPre)
if (rentalType == 'flat'):
overheadMappingCnt = 0
overheadMappings = dbGetMany(dbh, {
"statement": "SELECT * FROM overhead_advance_flat_mapping_t WHERE flat = %s",
"params": (rental['id'], )
}
)
for overheadMapping in overheadMappings:
overheadMappingCnt += 1
logger.info(f"{outPre}: overhead mapping: {overheadMapping['id']}")
if (overheadMappingCnt == 0):
errorCnt += 1
logger.error(f"{outPre}: no overhead mapping available")
if (overheadMappingCnt > 1):
errorCnt += 1
logger.error(f"{outPre}: more than one overhead mapping available")
tenancyCnt = 0
tenancies = dbGetMany(dbh, {
"statement": f"SELECT * FROM tenancy_t WHERE {rentalType} = %s AND startdate < now() AND (enddate > now() or enddate is null)",
"params": (rental['id'], )
}
)
for tenancy in tenancies:
tenancyCnt += 1
logger.info(f"{outPre}: tenant: {tenancy['tenant']}, start: {tenancy['startdate']}, end: {tenancy['enddate']}")
feeMappingCnt = 0
feeMappings = dbGetMany(dbh, {
"statement": "SELECT * FROM tenancy_fee_mapping_t where tenancy = %s",
"params": (tenancy['id'], )
}
)
for feeMapping in feeMappings:
feeMappingCnt += 1
logger.info(f"{outPre}: fee mapping: {feeMapping['id']}")
if (feeMappingCnt == 0):
errorCnt += 1
logger.error(f"{outPre}: no fee mapping available")
if (feeMappingCnt > 1):
errorCnt += 1
logger.error(f"{outPre}: more than one fee mapping available")
if (tenancyCnt == 0):
errorCnt += 1
logger.error(f"{outPre}: vacant")
if (tenancyCnt > 1):
errorCnt += 1
logger.error(f"{outPre}: overbooked")
def checkFlats(dbh, params):
_checkRentals(dbh, params, "flat")
def checkParkings(dbh, params):
_checkRentals(dbh, params, "parking")
def checkCommercialPremise(dbh, params):
_checkRentals(dbh, params, "commercial_premise")

View File

@ -0,0 +1,106 @@
from db import dbGetMany, dbGetOne
from loguru import logger
from decimal import Decimal
def perform(dbh, params):
createdAt = params['created_at']
tenants = dbGetMany(dbh, { "statement": "SELECT * FROM tenant_t", "params": () })
for tenant in tenants:
logger.info(f"Tenant: {tenant['firstname']} {tenant['lastname']}")
# check tenancies
tenancies = dbGetMany(dbh, {
"statement": "SELECT * FROM tenancy_t WHERE tenant = %s AND startdate < now() AND (enddate > now() or enddate is null)",
"params": (tenant['id'], )
}
)
requests = []
for tenancy in tenancies:
fee = dbGetOne(dbh, {
"statement": """
SELECT f.amount, f.fee_type
FROM fee_t f, tenancy_fee_mapping_t t
WHERE t.tenancy = %s AND
f.id = t.fee AND
f.startdate < now() AND
(f.enddate > now() OR f.enddate is null)
""",
"params": (tenancy['id'], )
}
)
if (tenancy['flat']):
logger.debug(f" Flat tenancy: {tenancy['id']}, Fee: {fee['amount']}, Fee_Type: {fee['fee_type']}")
flat = dbGetOne(dbh, { "statement": "SELECT area FROM flat_t WHERE id = %s", "params": (tenancy['flat'], ) })
logger.debug(f" Area: {flat['area']}")
if (fee['fee_type'] == 'per_area'):
feeRequest = flat['area'] * fee['amount']
else:
feeRequest = fee['amount']
feeRequest = feeRequest.quantize(Decimal('1.00'))
requests.append({
'description': f"Miete {tenancy['description']}",
'account': tenant['account'],
'created_at': createdAt,
'amount': feeRequest,
'category': 'Mietforderung'
})
overheadAdvance = dbGetOne(dbh, {
"statement": """
SELECT o.amount
FROM overhead_advance_t o, overhead_advance_flat_mapping_t m
WHERE m.flat = %s AND
o.id = m.overhead_advance AND
o.startdate < now() AND
(o.enddate > now() OR o.enddate is null)
""",
"params": (tenancy['flat'], )
}
)
overheadAdvanceRequest = flat['area'] * overheadAdvance['amount']
overheadAdvanceRequest = overheadAdvanceRequest.quantize(Decimal('1.00'))
requests.append({
'description': f"Betriebskosten {tenancy['description']}",
'account': tenant['account'],
'created_at': createdAt,
'amount': overheadAdvanceRequest,
'category': 'Betriebskostenforderung'
})
if (tenancy['parking']):
logger.debug(f" Garage tenancy: {tenancy['id']}, Fee: {fee['amount']}, Fee_Type: {fee['fee_type']}")
feeRequest = fee['amount']
feeRequest = feeRequest.quantize(Decimal('1.00'))
requests.append({
'description': f"Miete {tenancy['description']}",
'account': tenant['account'],
'created_at': createdAt,
'amount': feeRequest,
'category': 'Mietforderung'
})
if (tenancy['commercial_premise']):
logger.debug(f" Commercial premise tenancy: {tenancy['id']}, Fee: {fee['amount']}, Fee_Type: {fee['fee_type']}")
feeRequest = fee['amount']
feeRequest = feeRequest.quantize(Decimal('1.00'))
requests.append({
'description': f"Miete {tenancy['description']}",
'account': tenant['account'],
'created_at': createdAt,
'amount': feeRequest,
'category': 'Mietforderung'
})
for request in requests:
request['amount'] = Decimal('-1.0') * request['amount']
logger.info(f" {request['description']}, {request['account']}, {request['created_at']}, {request['amount']}, {request['category']}")
accountEntry = dbGetOne(dbh, {
"statement": """
INSERT INTO account_entry_t
(description, account, created_at, amount, account_entry_category)
VALUES (%s, %s, %s, %s, (SELECT id FROM account_entry_category_t WHERE description = %s))
RETURNING id
""",
"params": (request['description'], request['account'], request['created_at'], request['amount'], request['category'])
}
)
logger.info(f" account entry entered with id {accountEntry['id']}")

46
cli/db.py Normal file
View File

@ -0,0 +1,46 @@
import psycopg2
import psycopg2.extras
from loguru import logger
class NoDataFoundException(Exception): pass
class TooMuchDataFoundException(Exception): pass
def execDatabaseOperation(dbh, func, params):
cur = None
try:
with dbh.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
params["params"] = [ v if not v=='' else None for v in params["params"] ]
logger.debug("edo: {}".format(str(params)))
return func(cur, params)
except psycopg2.Error as err:
raise Exception("Error when working on cursor: {}".format(err))
def _opGetMany(cursor, params):
items = []
cursor.execute(params["statement"], params["params"])
for itemObj in cursor:
logger.debug("item received {}".format(str(itemObj)))
items.append(itemObj)
return items
def dbGetMany(dbh, params):
return execDatabaseOperation(dbh, _opGetMany, params)
def _opGetOne(cursor, params):
cursor.execute(params["statement"], params["params"])
itemObj = cursor.fetchone()
logger.debug(f"item received: {itemObj}")
if not itemObj:
raise NoDataFoundException
dummyObj = cursor.fetchone()
if dummyObj:
raise TooMuchDataFoundException
return itemObj
def dbGetOne(dbh, params):
return execDatabaseOperation(dbh, _opGetOne, params)

70
cli/hv2cli.py Normal file
View File

@ -0,0 +1,70 @@
import psycopg2
import psycopg2.extras
from loguru import logger
import os
import configparser
import json
import argparse
import importlib
import sys
DB_USER = ""
DB_PASS = ""
DB_HOST = ""
DB_NAME = ""
try:
DB_USER = os.environ["DB_USER"]
DB_PASS = os.environ["DB_PASS"]
DB_HOST = os.environ["DB_HOST"]
DB_NAME = os.environ["DB_NAME"]
except KeyError:
config = configparser.ConfigParser()
config.read('./config/dbconfig.ini')
DB_USER = config["database"]["user"]
DB_PASS = config["database"]["pass"]
DB_HOST = config["database"]["host"]
DB_NAME = config["database"]["name"]
parser = argparse.ArgumentParser(description="hv2cli.py")
parser.add_argument('--operation', '-o',
help='Operation to perform.',
required=True)
parser.add_argument('--params', '-p',
help='JSON string with parameter for the selected operation, default: {}',
required=False,
default="{}")
parser.add_argument('--verbosity', '-v',
help='Minimal log level for output: DEBUG, INFO, WARNING, ..., default: DEBUG',
required=False,
default="DEBUG")
args = parser.parse_args()
operation = args.operation
params = json.loads(args.params)
logLevel = args.verbosity
logger.remove()
logger.add(sys.stderr, colorize=True, level=logLevel)
dbh = None
try:
opMod = importlib.import_module(operation)
dbh = psycopg2.connect(user = DB_USER, password = DB_PASS,
host = DB_HOST, database = DB_NAME,
sslmode = 'require')
dbh.autocommit = False
with dbh:
opMod.perform(dbh, params)
except psycopg2.Error as err:
raise Exception("Error when working on the database: {}".format(err))
except Exception as err:
raise err
finally:
if dbh:
dbh.close()

5
cli/listTenants.py Normal file
View File

@ -0,0 +1,5 @@
from db import dbGetMany
def perform(dbh, params):
tenants = dbGetMany(dbh, { "statement": "SELECT * FROM tenant_t", "params": () })
print(tenants)

View File

@ -133,7 +133,7 @@
"name": "account_entry",
"immutable": true,
"columns": [
{ "name": "description", "sqltype": "varchar(128)", "notnull": true },
{ "name": "description", "sqltype": "varchar(1024)", "notnull": true },
{ "name": "account", "sqltype": "integer", "notnull": true, "foreignkey": true },
{ "name": "created_at", "sqltype": "timestamp", "notnull": true, "default": "now()" },
{ "name": "amount", "sqltype": "numeric(10,2)", "notnull": true, "selector": 0 },

View File

@ -3,6 +3,10 @@ table {
border-spacing: 20px;
}
.mat-table {
border-spacing: 20px;
}
.spacer {
flex: 1 1 auto;
}

View File

@ -1,76 +1,54 @@
<mat-card class="defaultCard">
<mat-card-header>
<mat-card-title>
{{account?.description}} ({{account?.id}})
</mat-card-title>
</mat-card-header>
<mat-card-content>
<mat-accordion>
<mat-expansion-panel (opened)="collapse = true"
(closed)="collapse = false">
<mat-expansion-panel-header>
<mat-panel-title *ngIf="!collapse">
Kontoübersicht, Saldo: {{saldo?.saldo | number:'1.2-2'}} €
</mat-panel-title>
<mat-panel-description>
</mat-panel-description>
</mat-expansion-panel-header>
<div id="firstBlock">
<form (ngSubmit)="addAccountEntry()">
<mat-form-field appearance="outline" id="addEntryfield">
<mat-label>Datum</mat-label>
<input matInput name="createdAt" [(ngModel)]="newAccountEntry.created_at" [matDatepicker]="createdAtPicker"/>
<mat-datepicker-toggle matSuffix [for]="createdAtPicker"></mat-datepicker-toggle>
<mat-datepicker #createdAtPicker></mat-datepicker>
</mat-form-field>
<mat-form-field appearance="outline">
<mat-label>Kategorie</mat-label>
<mat-select [(ngModel)]="newAccountEntry.account_entry_category" name="category" disabled="shallBeRentPayment">
<mat-option *ngFor="let p of accountEntryCategories" [value]="p.id">{{p.description}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="outline">
<mat-label>Betrag (€)</mat-label>
<input matInput type="number" name="amount" [(ngModel)]="newAccountEntry.amount"/>
</mat-form-field>
<mat-form-field appearance="outline">
<mat-label>Beschreibung</mat-label>
<input matInput name="description" [(ngModel)]="newAccountEntry.description"/>
</mat-form-field>
<button #addAccountEntryButton type="submit" mat-raised-button color="primary">Buchung speichern</button>
</form>
</div>
<div class="large">
Saldo: {{saldo?.saldo | number:'1.2-2'}} €
</div>
<div id="secondBlock">
<table mat-table [dataSource]="accountEntriesDataSource" #zftable>
<ng-container matColumnDef="createdAt">
<th mat-header-cell *matHeaderCellDef>Datum</th>
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.created_at | date}}</td>
</ng-container>
<ng-container matColumnDef="description">
<th mat-header-cell *matHeaderCellDef>Beschreibung</th>
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.description}}</td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef>Betrag</th>
<td mat-cell *matCellDef="let element" class="rightaligned">{{element.rawAccountEntry.amount | number:'1.2-2'}} €</td>
</ng-container>
<ng-container matColumnDef="category">
<th mat-header-cell *matHeaderCellDef>Kategorie</th>
<td mat-cell *matCellDef="let element">{{element.accountEntryCategory}}</td>
</ng-container>
<ng-container matColumnDef="overhead_relevant">
<th mat-header-cell *matHeaderCellDef>BK relevant</th>
<td mat-cell *matCellDef="let element">{{element.overheadRelevant}}</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="accountEntriesDisplayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: accountEntriesDisplayedColumns;"></tr>
</table>
</div>
</mat-expansion-panel>
</mat-accordion>
</mat-card-content>
</mat-card>
<div id="firstBlock">
<form (ngSubmit)="addAccountEntry()">
<mat-form-field appearance="outline" id="addEntryfield">
<mat-label>Datum</mat-label>
<input matInput name="createdAt" [(ngModel)]="newAccountEntry.created_at" [matDatepicker]="createdAtPicker"/>
<mat-datepicker-toggle matSuffix [for]="createdAtPicker"></mat-datepicker-toggle>
<mat-datepicker #createdAtPicker></mat-datepicker>
</mat-form-field>
<mat-form-field appearance="outline">
<mat-label>Kategorie</mat-label>
<mat-select [(ngModel)]="newAccountEntry.account_entry_category" name="category" disabled="shallBeRentPayment">
<mat-option *ngFor="let p of accountEntryCategories" [value]="p.id">{{p.description}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="outline">
<mat-label>Betrag (€)</mat-label>
<input matInput type="number" name="amount" [(ngModel)]="newAccountEntry.amount"/>
</mat-form-field>
<mat-form-field appearance="outline">
<mat-label>Beschreibung</mat-label>
<input matInput name="description" [(ngModel)]="newAccountEntry.description"/>
</mat-form-field>
<button #addAccountEntryButton type="submit" mat-raised-button color="primary">Buchung speichern</button>
</form>
</div>
<div class="large">
Saldo: {{saldo?.saldo | number:'1.2-2'}} €
</div>
<div id="secondBlock">
<table mat-table [dataSource]="accountEntriesDataSource" #zftable>
<ng-container matColumnDef="createdAt">
<th mat-header-cell *matHeaderCellDef>Datum</th>
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.created_at | date}}</td>
</ng-container>
<ng-container matColumnDef="description">
<th mat-header-cell *matHeaderCellDef>Beschreibung</th>
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.description}}</td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef>Betrag</th>
<td mat-cell *matCellDef="let element" class="rightaligned">{{element.rawAccountEntry.amount | number:'1.2-2'}} €</td>
</ng-container>
<ng-container matColumnDef="category">
<th mat-header-cell *matHeaderCellDef>Kategorie</th>
<td mat-cell *matCellDef="let element">{{element.accountEntryCategory}}</td>
</ng-container>
<ng-container matColumnDef="overhead_relevant">
<th mat-header-cell *matHeaderCellDef>BK relevant</th>
<td mat-cell *matCellDef="let element">{{element.overheadRelevant}}</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="accountEntriesDisplayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: accountEntriesDisplayedColumns;"></tr>
</table>
</div>

View File

@ -1,5 +1,7 @@
import { ViewFlags } from '@angular/compiler/src/core';
import { Component, Input, OnInit, OnChanges, ViewChild } from '@angular/core';
import { MatButton } from '@angular/material/button';
import { MatExpansionPanel } from '@angular/material/expansion';
import { MatTableDataSource } from '@angular/material/table';
import { AccountEntryCategoryService, AccountEntryService, AccountService } from '../data-object-service';
import { Account, AccountEntry, AccountEntryCategory, NULL_AccountEntry } from '../data-objects';
@ -27,8 +29,6 @@ export class AccountComponent implements OnInit {
@Input() shallBeRentPayment: boolean
@ViewChild('addAccountEntryButton') addAccountEntryButton: MatButton
collapse: boolean = false
account: Account
accountEntries: DN_AccountEntry[]
accountEntriesDataSource: MatTableDataSource<DN_AccountEntry>
@ -50,6 +50,7 @@ export class AccountComponent implements OnInit {
private messageService: MessageService
) { }
async getAccount(): Promise<void> {
try {
if (this.selectedAccountId) {

View File

@ -17,6 +17,8 @@ import { OverheadAdvanceListComponent } from './overhead-advance-list/overhead-a
import { OverheadAdvanceDetailsComponent } from './overhead-advance-details/overhead-advance-details.component';
import { FeeListComponent } from './fee-list/fee-list.component';
import { FeeDetailsComponent } from './fee-details/fee-details.component';
import { EnterPaymentComponent } from './enter-payment/enter-payment.component';
import { HomeComponent } from './home/home.component';
const routes: Routes = [
@ -41,8 +43,11 @@ const routes: Routes = [
{ path: 'fees', component: FeeListComponent, canActivate: [ AuthGuardService ] },
{ path: 'fee/:id', component: FeeDetailsComponent, canActivate: [ AuthGuardService ] },
{ path: 'fee', component: FeeDetailsComponent, canActivate: [ AuthGuardService ] },
{ path: 'enterPayment', component: EnterPaymentComponent, canActivate: [ AuthGuardService ] },
{ path: 'home', component: HomeComponent },
{ path: 'logout', component: LogoutComponent },
{ path: 'login', component: LoginComponent }
{ path: 'login', component: LoginComponent },
{ path: '', pathMatch: 'full', redirectTo: 'home' }
]
@NgModule({

View File

@ -45,7 +45,9 @@ import { FeeDetailsComponent } from './fee-details/fee-details.component';
import { MatExpansionModule } from '@angular/material/expansion';
import { AccountComponent } from './account/account.component';
import { NoteComponent } from './note/note.component'
import { MatMomentDateModule, MAT_MOMENT_DATE_ADAPTER_OPTIONS } from '@angular/material-moment-adapter'
import { MatMomentDateModule, MAT_MOMENT_DATE_ADAPTER_OPTIONS } from '@angular/material-moment-adapter';
import { EnterPaymentComponent } from './enter-payment/enter-payment.component';
import { HomeComponent } from './home/home.component'
registerLocaleData(localeDe)
@ -72,7 +74,9 @@ registerLocaleData(localeDe)
FeeListComponent,
FeeDetailsComponent,
AccountComponent,
NoteComponent
NoteComponent,
EnterPaymentComponent,
HomeComponent
],
imports: [
BrowserModule,

View File

@ -0,0 +1,22 @@
<mat-card class="defaultCard">
<mat-card-header>
<mat-card-title>
Mietzahlung eintragen
</mat-card-title>
</mat-card-header>
<mat-card-content>
<div>
<span>Mieter auswählen: </span>
<mat-form-field appearance="outline">
<mat-select #mapSelect [(ngModel)]="accountId" name="tenantAccount">
<mat-label>Mieter</mat-label>
<mat-option *ngFor="let p of tenants" [value]="p.id">{{p.firstname}} {{p.lastname}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<app-account [selectedAccountId]="accountId" [shallBeRentPayment]="true"></app-account>
</mat-card-content>
</mat-card>

View File

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { EnterPaymentComponent } from './enter-payment.component';
describe('EnterPaymentComponent', () => {
let component: EnterPaymentComponent;
let fixture: ComponentFixture<EnterPaymentComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ EnterPaymentComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(EnterPaymentComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,37 @@
import { Component, OnInit } from '@angular/core';
import { TenantService } from '../data-object-service';
import { Tenant } from '../data-objects';
import { MessageService } from '../message.service';
@Component({
selector: 'app-enter-payment',
templateUrl: './enter-payment.component.html',
styleUrls: ['./enter-payment.component.css']
})
export class EnterPaymentComponent implements OnInit {
tenants: Tenant[]
accountId: number
constructor(
private tenantService: TenantService,
private messageService: MessageService
) { }
async getTenants(): Promise<void> {
try {
this.messageService.add("Trying to load tenants")
this.tenants = await this.tenantService.getTenants()
this.messageService.add("Tenants loaded")
} catch (err) {
this.messageService.add(JSON.stringify(err, undefined, 4))
}
}
ngOnInit(): void {
this.getTenants()
}
}

View File

@ -7,7 +7,7 @@ import { serviceBaseUrl } from './config';
import { Fee, OverheadAdvance } from './data-objects';
import { Saldo } from './ext-data-objects';
import { Saldo, Tenant_with_Saldo } from './ext-data-objects';
@Injectable({ providedIn: 'root' })
@ -28,4 +28,9 @@ export class ExtApiService {
this.messageService.add(`ExtApiService: get saldo for account ${id}`);
return this.http.get<Saldo>(`${serviceBaseUrl}/v1/account/saldo/${id}`).toPromise()
}
async getTenantsWithSaldo(): Promise<Tenant_with_Saldo[]> {
this.messageService.add("ExtApiService: get tenants with saldo");
return this.http.get<Tenant_with_Saldo[]>(`${serviceBaseUrl}/v1/tenants/saldo`).toPromise()
}
}

View File

@ -2,4 +2,11 @@
export interface Saldo {
saldo: number
}
export interface Tenant_with_Saldo {
id: number
firstname: string
lastname: string
address1: string
saldo: number
}

View File

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

View File

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { HomeComponent } from './home.component';
describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ HomeComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(HomeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
styleUrls: ['./home.component.css']
})
export class HomeComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

View File

@ -22,6 +22,10 @@
<th mat-header-cell *matHeaderCellDef>Adresse 1</th>
<td mat-cell *matCellDef="let element">{{element.address1}}</td>
</ng-container>
<ng-container matColumnDef="saldo">
<th mat-header-cell *matHeaderCellDef>Saldo</th>
<td mat-cell *matCellDef="let element">{{element.saldo | number:'1.2-2'}} €</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['/tenant/', row.id]"></tr>
</table>

View File

@ -3,6 +3,9 @@ import { MessageService } from '../message.service';
import { TenantService } from '../data-object-service';
import { Tenant } from '../data-objects';
import { MatTableDataSource } from '@angular/material/table'
import { Tenant_with_Saldo } from '../ext-data-objects';
import { ExtApiService } from '../ext-data-object-service';
@Component({
selector: 'app-my-tenants',
@ -11,19 +14,22 @@ import { MatTableDataSource } from '@angular/material/table'
})
export class MyTenantsComponent implements OnInit {
tenants: Tenant[]
dataSource: MatTableDataSource<Tenant>
displayedColumns: string[] = ["lastname", "firstname", "address1"]
tenants: Tenant_with_Saldo[]
dataSource: MatTableDataSource<Tenant_with_Saldo>
displayedColumns: string[] = ["lastname", "firstname", "address1", "saldo"]
constructor(private tenantService: TenantService, private messageService: MessageService) { }
constructor(
private extApiService: ExtApiService,
private messageService: MessageService
) { }
async getTenants(): Promise<void> {
try {
this.messageService.add("Trying to load tenants")
this.tenants = await this.tenantService.getTenants()
this.tenants = await this.extApiService.getTenantsWithSaldo()
this.messageService.add("Tenants loaded")
this.dataSource = new MatTableDataSource<Tenant>(this.tenants)
this.dataSource = new MatTableDataSource<Tenant_with_Saldo>(this.tenants)
} catch (err) {
this.messageService.add(JSON.stringify(err, undefined, 4))
}

View File

@ -4,17 +4,24 @@
[mode]="(isHandset$ | async) ? 'over' : 'side'"
[opened]="(isHandset$ | async) === false">
<mat-toolbar>Menu</mat-toolbar>
<mat-nav-list>
<mat-nav-list *ngIf="!authenticated">
<a mat-list-item href="/login">Anmelden</a>
</mat-nav-list>
<mat-nav-list *ngIf="authenticated">
<a mat-list-item href="/enterPayment">Mietzahlung eintragen</a>
</mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
<a mat-list-item href="/tenants">Meine Mieter/innen</a>
</mat-nav-list><mat-divider></mat-divider><mat-nav-list>
</mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
<a mat-list-item href="/flats">Meine Wohnungen</a>
<a mat-list-item href="/parkings">Meine Garagen</a>
<a mat-list-item href="/commercialunits">Meine Büros</a>
</mat-nav-list><mat-divider></mat-divider><mat-nav-list>
</mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
<a mat-list-item href="/overheadadvances">Betriebskostensätze</a>
<a mat-list-item href="/fees">Mietsätze</a>
</mat-nav-list><mat-divider></mat-divider><mat-nav-list>
</mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
<a mat-list-item href="/premises">Meine Häuser</a>
</mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
<a mat-list-item href="/logout">Abmelden</a>
</mat-nav-list>
</mat-sidenav>
<mat-sidenav-content>
@ -31,13 +38,11 @@
<span class="spacer"></span>
<span class="gittagversion">GITTAGVERSION</span>
<span class="gittagversion" *ngIf="authenticated">Läuft aus in {{expiryTime | async }} Sekunden</span>
<a *ngIf="!authenticated" mat-button routerLink="/login">Login</a>
<a *ngIf="authenticated" mat-button routerLink="/logout">Logout</a>
</mat-toolbar>
<!-- Add Content Here -->
<router-outlet></router-outlet>
<app-messages></app-messages>
<app-messages *ngIf="authenticated"></app-messages>
</mat-sidenav-content>
</mat-sidenav-container>

View File

@ -256,7 +256,27 @@
</mat-card-content>
</mat-card>
<app-account [selectedAccountId]="tenant.account" [shallBeRentPayment]="true"></app-account>
<mat-card class="defaultCard">
<mat-card-header>
<mat-card-title>
{{account?.description}} ({{account?.id}})
</mat-card-title>
</mat-card-header>
<mat-card-content>
<mat-accordion>
<mat-expansion-panel (opened)="collapseAccount = true"
(closed)="collapseAccount = false" #mep>
<mat-expansion-panel-header>
<mat-panel-title *ngIf="!collapseAccount">
Kontoübersicht, Saldo: {{saldo?.saldo | number:'1.2-2'}} €
</mat-panel-title>
<mat-panel-description>
</mat-panel-description>
</mat-expansion-panel-header>
<app-account [selectedAccountId]="tenant.account" [shallBeRentPayment]="true"></app-account>
</mat-expansion-panel>
</mat-accordion>
</mat-card-content>
</mat-card>
</section>

View File

@ -52,6 +52,7 @@ export class TenantDetailsComponent implements OnInit {
collapseTenantDetails: boolean = false
collapseTenancies: boolean = false
collapseTenancyMapping: boolean = false
collapseAccount: boolean = false
selectedTenancy: Tenancy = undefined
mappedFees: Fee[]

View File

@ -6,6 +6,7 @@ import jwt_decode from 'jwt-decode'
import { Observable, interval, Subject, Subscription } from 'rxjs'
import { map, takeWhile } from 'rxjs/operators'
import { authserviceBaseUrl, applicationId } from './config'
import { Router } from '@angular/router';
interface TokenTuple {
@ -24,8 +25,11 @@ export class TokenService {
private _expiryTime = new Subject<number>()
private subscription: Subscription
constructor(private http: HttpClient, private messageService: MessageService) {
}
constructor(
private http: HttpClient,
private router: Router,
private messageService: MessageService
) { }
checkAuthenticated(): boolean {
let result: boolean = false
@ -60,7 +64,15 @@ export class TokenService {
if (this.subscription && !this.subscription.closed) {
this.subscription.unsubscribe()
}
this.subscription = interval(1000).pipe(map(v => start - v)).pipe(takeWhile(v => v != 0)).subscribe(v => this._expiryTime.next(v))
this.subscription = interval(1000)
.pipe(map(v => start - v))
.pipe(takeWhile(v => v >= 0))
.subscribe((v) => {
this._expiryTime.next(v)
if (v == 0) {
this.router.navigate(['/logout'])
}
})
}
async login(login: string, password: string) : Promise<void> {

View File

@ -1,11 +1,15 @@
/* You can add global styles to this file, and also import other style files */
html, body { height: 100%; }
html, body {
height: 100%;
box-sizing: border-box;
margin: 0;
}
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
table {
width: 75%;
border-spacing: 20px;
}