fiscal year

api/methods.py

@@ -813,6 +813,7 @@ SELECT
   id
   ,description
   ,premise
+  ,area
   FROM commercial_premise_t
   ORDER BY
     premise
@@ -827,21 +828,25 @@ def insert_commercial_premise(user, token_info, **args):
     body = args["body"]
     v_description = body["description"]
     v_premise = body["premise"]
+    v_area = body["area"]
     return dbInsert(user, token_info, {
       "statement": """
 INSERT INTO commercial_premise_t
   (
     description
     ,premise
+    ,area
   ) VALUES (
     %s
     ,%s
+    ,%s
   )
   RETURNING *
 """,
       "params": [
     v_description
     ,v_premise
+    ,v_area
       ]      
     })
   except KeyError as e:
@@ -856,6 +861,7 @@ SELECT
   id
   ,description
   ,premise
+  ,area
   FROM commercial_premise_t
   WHERE id = %s
                          """, 
@@ -868,18 +874,21 @@ def update_commercial_premise(user, token_info, commercial_premiseId=None, **arg
     body = args["body"]
     v_description = body["description"]
     v_premise = body["premise"]
+    v_area = body["area"]
     return dbUpdate(user, token_info, {
       "statement": """
 UPDATE commercial_premise_t
   SET
     description = %s
     ,premise = %s
+    ,area = %s
   WHERE id = %s
   RETURNING *
 """,
       "params": [
     v_description,
     v_premise,
+    v_area,
     commercial_premiseId
       ]      
     })
@@ -895,6 +904,7 @@ SELECT
   id
   ,description
   ,premise
+  ,area
   FROM commercial_premise_t
   WHERE premise = %s
   ORDER BY
@@ -1355,7 +1365,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category
@@ -1373,7 +1383,7 @@ def insert_account_entry(user, token_info, **args):
     v_description = body["description"]
     v_account = body["account"]
     v_created_at = body["created_at"]
-    v_due_at = body["due_at"]
+    v_fiscal_year = body["fiscal_year"]
     v_amount = body["amount"]
     v_document_no = body["document_no"]
     v_account_entry_category = body["account_entry_category"]
@@ -1384,7 +1394,7 @@ INSERT INTO account_entry_t
     description
     ,account
     ,created_at
-    ,due_at
+    ,fiscal_year
     ,amount
     ,document_no
     ,account_entry_category
@@ -1403,7 +1413,7 @@ INSERT INTO account_entry_t
     v_description
     ,v_account
     ,v_created_at
-    ,v_due_at
+    ,v_fiscal_year
     ,v_amount
     ,v_document_no
     ,v_account_entry_category
@@ -1422,7 +1432,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category
@@ -1443,7 +1453,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category
@@ -1464,7 +1474,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category

api/openapi.yaml

@@ -1714,6 +1714,9 @@ components:
         premise:
           type: integer
           nullable: true
+        area:
+          type: number
+          nullable: true
     tenancy:
       description: tenancy
       type: object
@@ -1790,9 +1793,8 @@ components:
           type: integer
         created_at:
           type: string
-        due_at:
-          type: string
-          nullable: true
+        fiscal_year:
+          type: integer
         amount:
           type: number
         document_no:

api/test.py

@@ -5,6 +5,6 @@ from flask_cors import CORS
 logging.basicConfig(level=logging.DEBUG)
 
 app = connexion.App('hv2-api')
-app.add_api('./openapi.yaml')
+app.add_api('./openapi.yaml', options = {"swagger_ui": True})
 CORS(app.app)
 app.run(port=8080)

cli/MonthlyPaymentRequests.py

@@ -6,8 +6,10 @@ import datetime
 def perform(dbh, params):
     try:
         createdAt = params['created_at']
+        dueAt = createdAt.replace(day=1)
     except KeyError:
         createdAt = datetime.datetime.today().strftime("%Y-%m-%d")
+        dueAt = createdAt.replace(day=1)
 
     tenants = dbGetMany(dbh, { "statement": "SELECT * FROM tenant_t", "params": () })
     for tenant in tenants:

cli/OverheadAccounts.py

@@ -1,6 +1,7 @@
-from db import dbGetMany
+from db import dbGetMany, dbGetOne
 import datetime
 from loguru import logger
+from decimal import *
 
 def perform(dbh, params):
     try:
@@ -12,42 +13,6 @@ def perform(dbh, params):
     premises = (1, 2)
 
 
-    # get flat tenants by object and timespan with paid overhead and due overhead
-    tenants = dbGetMany(
-        dbh,
-        {
-            "statement":
-            """
-                select t.id as tenant_id,
-                    t.firstname as tenant_firstname,
-                    t.lastname as tenant_lastname,
-                    f.id as flat_id,
-                    f.description as flat,
-                    p.id as house_id,
-                    p.description as house,
-                    ty.startdate as startdate,
-                    ty.enddate as enddate
-                from tenant_t t,
-                    premise_t p,
-                    flat_t f,
-                    tenancy_t ty
-                where ty.tenant = t.id and
-                    ty.flat = f.id and
-                    ty.startdate >= %(startDate)s and
-                    (ty.enddate <= %(endDate)s or ty.enddate is null) and
-                    f.premise = p.id and
-                    p.id in %(premises)s
-                order by house_id, tenant_id
-            """,
-           "params": {
-               "startDate": startDate, 
-               "endDate": endDate,
-               "premises": premises
-           }
-        }
-    )
-    logger.info(f"{tenants=}")
-
 
     # get overhead sums by object, category and timespan
     overheadSums = dbGetMany(
@@ -86,6 +51,13 @@ def perform(dbh, params):
                     created_at between %(startDate)s and %(endDate)s and
                     p.id in %(premises)s
                 group by house_id, house, category
+                union
+                select 120 as sum,
+                    'Waschmaschine' as category,
+                    id as house_id,
+                    description as house
+                from premise_t
+                where id in %(premises)s
                 order by house_id, category
             """,
             "params": {
@@ -95,7 +67,106 @@ def perform(dbh, params):
             }
         } 
     )
-    logger.info(f"{overheadSums=}")
+    # logger.info(f"{overheadSums=}")
+    for overheadSum in overheadSums:
+        logger.info(f"house: {overheadSum['house']}, category: {overheadSum['category']}, sum: {overheadSum['sum']}")
+
+    subtotal = {}
+    for premise in premises:
+        v = [ x['sum'] for x in overheadSums if x['house_id'] == premise ]
+        logger.info(f"{v=}")
+        subtotal[premise] = sum(v)
+        logger.info(f"{subtotal=}")
+
+
+
+
+    # get flat tenants by object and timespan with paid overhead and due overhead
+    tenants = dbGetMany(
+        dbh,
+        {
+            "statement":
+            """
+                select t.id as tenant_id,
+                    t.firstname as tenant_firstname,
+                    t.lastname as tenant_lastname,
+                    f.id as flat_id,
+                    f.description as flat,
+                    p.id as house_id,
+                    p.description as house,
+                    ty.startdate as startdate,
+                    ty.enddate as enddate,
+                    t.account as tenant_account
+                from tenant_t t,
+                    premise_t p,
+                    flat_t f,
+                    tenancy_t ty
+                where ty.tenant = t.id and
+                    ty.flat = f.id and
+                    ty.startdate <= %(startDate)s and
+                    (ty.enddate >= %(endDate)s or ty.enddate is null) and
+                    f.premise = p.id and
+                    p.id in %(premises)s
+                order by house_id, tenant_id
+            """,
+           "params": {
+               "startDate": startDate, 
+               "endDate": endDate,
+               "premises": premises
+           }
+        }
+    )
+
+    for tenant in tenants:
+        logger.info(f"firstname: {tenant['tenant_firstname']}, lastname: {tenant['tenant_lastname']}, house: {tenant['house']}, account: {tenant['tenant_account']}")
+
+        paidTotal = dbGetOne(
+            dbh,
+            {
+                "statement":
+                """
+                    SELECT sum(amount) AS sum,
+                        count(id) AS cnt
+                    FROM account_entry_t
+                    WHERE account = %(account)s AND
+                        account_entry_category = 2 AND
+                        due_at BETWEEN %(startDate)s AND %(endDate)s
+                """,
+                "params": {
+                    "account": tenant['tenant_account'],
+                    "startDate": startDate,
+                    "endDate": endDate
+                }
+            }
+        )
+        receivableFee = dbGetOne(
+            dbh,
+            {
+                "statement":
+                """
+                    SELECT sum(amount) * -1 AS sum ,
+                        count(id) AS cnt
+                    FROM account_entry_t
+                    WHERE account = %(account)s AND
+                        account_entry_category = 3 AND
+                        due_at BETWEEN %(startDate)s AND %(endDate)s
+                """,
+                "params": {
+                    "account": tenant['tenant_account'],
+                    "startDate": startDate,
+                    "endDate": endDate
+                }
+            }
+        )
+
+        logger.info(f"Payments:        cnt: {paidTotal['cnt']}, sum: {paidTotal['sum']}")
+        logger.info(f"Receivable fees: cnt: {receivableFee['cnt']}, sum: {receivableFee['sum']}")
+        
+        paidOverheadAdvance = paidTotal['sum'] - receivableFee['sum']
+        logger.info(f"Paid overhead:   {paidOverheadAdvance} (by month: {paidOverheadAdvance / Decimal(12)})")
+
+
+
 
 
 

cli/db.py

@@ -21,7 +21,7 @@ def execDatabaseOperation(dbh, func, params):
 
 
 def _opGetMany(cursor, params):
-    logger.warning(f"{params=}")
+    #logger.warning(f"{params=}")
     items = []
     cursor.execute(params["statement"], params["params"])
     for itemObj in cursor:

schema.json

@@ -79,7 +79,8 @@
             "name": "commercial_premise",
             "columns": [
                 { "name": "description", "sqltype": "varchar(128)", "selector": 1 },
-                { "name": "premise", "sqltype": "integer", "foreignkey": true, "selector": 0 }
+                { "name": "premise", "sqltype": "integer", "foreignkey": true, "selector": 0 },
+                { "name": "area", "sqltype": "numeric(10,2)", "notnull": false }
             ],
             "tableConstraints": [ 
                 "unique(description, premise)"
@@ -137,7 +138,7 @@
                 { "name": "description", "sqltype": "varchar(1024)", "notnull": true },
                 { "name": "account", "sqltype": "integer", "notnull": true, "foreignkey": true },
                 { "name": "created_at", "sqltype": "timestamp", "notnull": true, "default": "now()", "selector": 0 },
-                { "name": "due_at", "sqltype": "timestamp", "notnull": false },
+                { "name": "fiscal_year", "sqltype": "integer", "notnull": true },
                 { "name": "amount", "sqltype": "numeric(10,2)", "notnull": true },
                 { "name": "document_no", "sqltype": "integer", "unique": true },
                 { "name": "account_entry_category", "sqltype": "integer", "notnull": true, "foreignkey": true }

schema/create.sql

@@ -91,6 +91,7 @@ CREATE TABLE commercial_premise_t (
   id serial not null primary key
   ,description varchar(128) 
   ,premise integer   references premise_t (id) 
+  ,area numeric(10,2) 
   ,unique(description, premise)
 );
 
@@ -149,7 +150,7 @@ CREATE TABLE account_entry_t (
   ,description varchar(1024)     not null 
   ,account integer     not null   references account_t (id) 
   ,created_at timestamp     not null   default now() 
-  ,due_at timestamp 
+  ,fiscal_year integer     not null 
   ,amount numeric(10,2)     not null 
   ,document_no integer     unique 
   ,account_entry_category integer     not null   references account_entry_category_t (id) 

ui/hv2-ui/src/app/account/account.component.html

@@ -6,11 +6,9 @@
     <mat-datepicker-toggle matSuffix [for]="createdAtPicker"></mat-datepicker-toggle>
     <mat-datepicker #createdAtPicker></mat-datepicker>
 </mat-form-field>
-<mat-form-field appearance="outline" id="addEntryfield">
-    <mat-label>Fälligkeit</mat-label>
-    <input matInput ngModel name="dueAt" [matDatepicker]="dueAtPicker"/>
-    <mat-datepicker-toggle matSuffix [for]="dueAtPicker"></mat-datepicker-toggle>
-    <mat-datepicker #dueAtPicker></mat-datepicker>
+<mat-form-field appearance="outline">
+    <mat-label>Jahr</mat-label>
+    <input matInput type="number" name="fiscalYear" [formControl]="presetFiscalYear" ngModel/>
 </mat-form-field>
 <mat-form-field appearance="outline" *ngIf="!shallBeRentPayment">
     <mat-label>Kategorie</mat-label>
@@ -38,9 +36,9 @@ Saldo: {{saldo?.saldo | number:'1.2-2'}} €
     <th mat-header-cell *matHeaderCellDef>Datum</th>
     <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.created_at | date}}</td>
 </ng-container>
-<ng-container matColumnDef="dueAt">
-    <th mat-header-cell *matHeaderCellDef>Fälligkeit</th>
-    <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.due_at | date}}</td>
+<ng-container matColumnDef="fiscalYear">
+    <th mat-header-cell *matHeaderCellDef>Jahr</th>
+    <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.fiscal_year}}</td>
 </ng-container>
 <ng-container matColumnDef="description">
     <th mat-header-cell *matHeaderCellDef>Beschreibung</th>

ui/hv2-ui/src/app/account/account.component.ts

@@ -1,5 +1,6 @@
 import { ViewFlags } from '@angular/compiler/src/core';
 import { Component, Input, OnInit, OnChanges, ViewChild } from '@angular/core';
+import { FormControl } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
 import { MatExpansionPanel } from '@angular/material/expansion';
 import { MatTableDataSource } from '@angular/material/table';
@@ -33,14 +34,14 @@ export class AccountComponent implements OnInit {
   account: Account
   accountEntries: DN_AccountEntry[]
   accountEntriesDataSource: MatTableDataSource<DN_AccountEntry>
-  accountEntriesDisplayedColumns: string[] = [ "description", "document_no", "amount", "createdAt", "dueAt", "category", "overhead_relevant" ]
+  accountEntriesDisplayedColumns: string[] = [ "description", "document_no", "amount", "createdAt", "fiscalYear", "category", "overhead_relevant" ]
   saldo: Saldo
 
   accountEntryCategories: AccountEntryCategory[]
   accountEntryCategoriesMap: Map<number, AccountEntryCategory>
   accountEntryCategoriesInverseMap: Map<string, AccountEntryCategory>
 
-
+  presetFiscalYear: FormControl
 
   constructor(
     private accountService: AccountService,
@@ -98,7 +99,7 @@ export class AccountComponent implements OnInit {
         description: formData.value.description,
         account: this.account.id,
         created_at: formData.value.createdAt,
-        due_at: formData.value.dueAt,
+        fiscal_year: formData.value.fiscalYear,
         amount: formData.value.amount,
         id: 0,
         document_no: uniquenumber.number,
@@ -145,9 +146,13 @@ export class AccountComponent implements OnInit {
   }
 
   private async init(): Promise<void> {
+    let currentDate = new Date()
+    let y = currentDate.getFullYear().toString()
+    this.presetFiscalYear = new FormControl(`${y}`)
     this.messageService.add(`AccountComponent.init, account: ${this.selectedAccountId}`)
     this.getAccount()
     await this.getAccountEntryCategories()
+
   }
 
   ngOnInit(): void {

ui/hv2-ui/src/app/commercial-unit-details/commercial-unit-details.component.html

@@ -22,6 +22,10 @@
                                 <mat-option *ngFor="let p of premises" [value]="p.id">{{p.description}}</mat-option>
                             </mat-select>
                         </mat-form-field>
+                        <mat-form-field appearance="outline">
+                            <mat-label>Fläche</mat-label>
+                            <input type="number" matInput name="area" [(ngModel)]="commercialPremise.area"/>
+                        </mat-form-field>
                     </div>
                     <button #submitButton type="submit" mat-raised-button color="primary">Speichern</button>
                 </form>

ui/hv2-ui/src/app/data-objects.ts

@@ -119,11 +119,13 @@ export interface CommercialPremise {
     id: number
     description: string
     premise: number
+    area: number
 }
 export const NULL_CommercialPremise: CommercialPremise = {
     id: 0
     ,description:   ''
     ,premise:   undefined
+    ,area:   undefined
 }
 
 export interface Tenancy {
@@ -191,7 +193,7 @@ export interface AccountEntry {
     description: string
     account: number
     created_at: string
-    due_at: string
+    fiscal_year: number
     amount: number
     document_no: number
     account_entry_category: number
@@ -201,7 +203,7 @@ export const NULL_AccountEntry: AccountEntry = {
     ,description:   ''
     ,account:   undefined
     ,created_at:   ''
-    ,due_at:   ''
+    ,fiscal_year:   undefined
     ,amount:   undefined
     ,document_no:   undefined
     ,account_entry_category:   undefined

ui/hv2-ui/src/app/my-commercial-units/my-commercial-units.component.html

@@ -19,8 +19,13 @@
                         <th mat-header-cell *matHeaderCellDef>Haus</th>
                         <td mat-cell *matCellDef="let element">{{element.premise.description}}</td>
                     </ng-container>
+                    <ng-container matColumnDef="area">
+                        <th mat-header-cell *matHeaderCellDef>Fläche</th>
+                        <td mat-cell *matCellDef="let element">{{element.commercialPremise.area | number:'1.2-2'}}</td>
+                    </ng-container>
                     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                     <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['/commercialunit/', row.commercialPremise.id]"></tr>
+
                 </table>
             </div>
         </mat-card-content>

ui/hv2-ui/src/app/my-commercial-units/my-commercial-units.component.ts

@@ -21,7 +21,7 @@ export class MyCommercialUnitsComponent implements OnInit {
   dnCommercialPremises: DN_CommercialPremise[] = []
 
   dataSource: MatTableDataSource<DN_CommercialPremise>
-  displayedColumns: string[] = ["description", "premise"]
+  displayedColumns: string[] = ["description", "premise", "area"]
 
   constructor(
     private commercialPremiseService: CommercialPremiseService,