select account to work on

.gitignore

@@ -3,6 +3,11 @@ ENV
 api/config/dbconfig.ini
 api/config/authservice.pub
 cli/config/dbconfig.ini
+cli/output/
 *~
 .*~
 .vscode/
+cli/*.tex
+cli/*.log
+cli/*.pdf
+cli/*.aux

api/methods.py

@@ -286,6 +286,7 @@ SELECT
   ,street
   ,zip
   ,city
+  ,minus_area
   ,account
   FROM premise_t
   ORDER BY
@@ -302,6 +303,7 @@ def insert_premise(user, token_info, **args):
     v_street = body["street"]
     v_zip = body["zip"]
     v_city = body["city"]
+    v_minus_area = body["minus_area"]
     v_account = body["account"]
     return dbInsert(user, token_info, {
       "statement": """
@@ -311,6 +313,7 @@ INSERT INTO premise_t
     ,street
     ,zip
     ,city
+    ,minus_area
     ,account
   ) VALUES (
     %s
@@ -318,6 +321,7 @@ INSERT INTO premise_t
     ,%s
     ,%s
     ,%s
+    ,%s
   )
   RETURNING *
 """,
@@ -326,6 +330,7 @@ INSERT INTO premise_t
     ,v_street
     ,v_zip
     ,v_city
+    ,v_minus_area
     ,v_account
       ]      
     })
@@ -343,6 +348,7 @@ SELECT
   ,street
   ,zip
   ,city
+  ,minus_area
   ,account
   FROM premise_t
   WHERE id = %s
@@ -358,6 +364,7 @@ def update_premise(user, token_info, premiseId=None, **args):
     v_street = body["street"]
     v_zip = body["zip"]
     v_city = body["city"]
+    v_minus_area = body["minus_area"]
     return dbUpdate(user, token_info, {
       "statement": """
 UPDATE premise_t
@@ -366,6 +373,7 @@ UPDATE premise_t
     ,street = %s
     ,zip = %s
     ,city = %s
+    ,minus_area = %s
   WHERE id = %s
   RETURNING *
 """,
@@ -374,6 +382,7 @@ UPDATE premise_t
     v_street,
     v_zip,
     v_city,
+    v_minus_area,
     premiseId
       ]      
     })
@@ -391,6 +400,7 @@ SELECT
   ,street
   ,zip
   ,city
+  ,minus_area
   ,account
   FROM premise_t
   WHERE account = %s
@@ -813,6 +823,7 @@ SELECT
   id
   ,description
   ,premise
+  ,area
   FROM commercial_premise_t
   ORDER BY
     premise
@@ -827,21 +838,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 +871,7 @@ SELECT
   id
   ,description
   ,premise
+  ,area
   FROM commercial_premise_t
   WHERE id = %s
                          """, 
@@ -868,18 +884,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 +914,7 @@ SELECT
   id
   ,description
   ,premise
+  ,area
   FROM commercial_premise_t
   WHERE premise = %s
   ORDER BY
@@ -1295,6 +1315,7 @@ def get_account_entry_categorys(user, token_info):
 SELECT
   id
   ,description
+  ,considerMinusArea
   ,overhead_relevant
   FROM account_entry_category_t
   ORDER BY
@@ -1308,21 +1329,25 @@ def insert_account_entry_category(user, token_info, **args):
   try:
     body = args["body"]
     v_description = body["description"]
+    v_considerMinusArea = body["considerMinusArea"]
     v_overhead_relevant = body["overhead_relevant"]
     return dbInsert(user, token_info, {
       "statement": """
 INSERT INTO account_entry_category_t
   (
     description
+    ,considerMinusArea
     ,overhead_relevant
   ) VALUES (
     %s
     ,%s
+    ,%s
   )
   RETURNING *
 """,
       "params": [
     v_description
+    ,v_considerMinusArea
     ,v_overhead_relevant
       ]      
     })
@@ -1337,6 +1362,7 @@ def get_account_entry_category(user, token_info, account_entry_categoryId=None):
 SELECT 
   id
   ,description
+  ,considerMinusArea
   ,overhead_relevant
   FROM account_entry_category_t
   WHERE id = %s
@@ -1355,7 +1381,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category
@@ -1373,7 +1399,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 +1410,7 @@ INSERT INTO account_entry_t
     description
     ,account
     ,created_at
-    ,due_at
+    ,fiscal_year
     ,amount
     ,document_no
     ,account_entry_category
@@ -1403,7 +1429,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 +1448,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category
@@ -1443,7 +1469,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category
@@ -1464,7 +1490,7 @@ SELECT
   ,description
   ,account
   ,created_at
-  ,due_at
+  ,fiscal_year
   ,amount
   ,document_no
   ,account_entry_category

api/openapi.yaml

@@ -1644,6 +1644,8 @@ components:
           type: string
         city:
           type: string
+        minus_area:
+          type: number
         account:
           type: integer
     flat:
@@ -1714,6 +1716,9 @@ components:
         premise:
           type: integer
           nullable: true
+        area:
+          type: number
+          nullable: true
     tenancy:
       description: tenancy
       type: object
@@ -1776,6 +1781,8 @@ components:
           type: integer
         description:
           type: string
+        considerMinusArea:
+          type: boolean
         overhead_relevant:
           type: boolean
     account_entry:
@@ -1790,9 +1797,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)

ci-script-api

@@ -1,61 +0,0 @@
-stages:
-        - check
-        - build
-        - deploy
-
-variables:
-        IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
-
-check:
-        image: registry.hottis.de/dockerized/base-build-env:latest
-        stage: check
-        tags:
-                - hottis
-                - linux
-                - docker
-        rules:
-                - if: $CI_COMMIT_TAG
-        script:
-                - checksemver.py -v
-                    --versionToValidate "${CI_COMMIT_TAG}"
-                    --validateMessage
-                    --messageToValidate "${CI_COMMIT_MESSAGE}"
-
-build:
-        image: registry.hottis.de/dockerized/docker-bash:latest
-        stage: build
-        tags:
-                - hottis
-                - linux
-                - docker
-        script: 
-                - docker build --tag $IMAGE_NAME:latest .
-                - if [ "$CI_COMMIT_TAG" != "" ]; then
-                    docker tag $IMAGE_NAME:latest $IMAGE_NAME:${CI_COMMIT_TAG};
-                    docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
-                    docker push $IMAGE_NAME:latest;
-                    docker push $IMAGE_NAME:${CI_COMMIT_TAG};
-                  fi
-
-deploy:
-        stage: deploy
-        image: registry.hottis.de/dockerized/docker-bash:latest
-        only:
-                - tags
-        tags:
-                - hottis
-                - linux
-                - docker
-        variables:
-                GIT_STRATEGY: none
-        script:
-                - CONTAINER_NAME=$CI_PROJECT_NAME
-                - SERVICE_VOLUME=$CI_PROJECT_NAME"-conf"
-                - SERVICE_PORT=5000
-                - docker volume inspect $SERVICE_VOLUME || docker volume create $SERVICE_VOLUME
-                - docker stop $CONTAINER_NAME || echo "$CONTAINER_NAME not running, anyway okay"
-                - docker rm $CONTAINER_NAME || echo "$CONTAINER_NAME not exsting, anyway okay"
-                - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
-                - docker pull $IMAGE_NAME:${CI_COMMIT_TAG}
-                - docker run -d --restart always --name $CONTAINER_NAME --network docker-server --ip 172.16.10.38 -v $SERVICE_VOLUME:/opt/app/config $IMAGE_NAME:${CI_COMMIT_TAG}
-

ci-script-ui

@@ -1,88 +0,0 @@
-stages:
-  - check
-  - build
-  - dockerize
-  - deploy
-
-variables:
-  IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
-
-check:
-  image: registry.hottis.de/dockerized/base-build-env:latest
-  stage: check
-  tags:
-    - hottis
-    - linux
-    - docker
-  rules:
-    - if: $CI_COMMIT_TAG
-  script:
-    - checksemver.py -v
-        --versionToValidate "$CI_COMMIT_TAG"
-        --validateMessage
-        --messageToValidate "$CI_COMMIT_MESSAGE"
-
-
-build:
-  image: registry.hottis.de/hv2/hv2-node-build-env:1.0.0
-  stage: build
-  variables:
-    GIT_SUBMODULE_STRATEGY: recursive
-  tags:
-    - hottis
-    - linux
-    - docker
-  artifacts:
-    paths:
-      - dist.tgz
-    expire_in: 1 day
-  script:
-    - cd hv2-ui
-    - if [ "$CI_COMMIT_TAG" != "" ]; then
-        sed -i -e 's/GITTAGVERSION/'"$CI_COMMIT_TAG"':'"$CI_COMMIT_SHORT_SHA"'/' ./src/app/navigation/navigation.component.html;
-      fi
-    - npm install
-    - for F in ./src/app/*.tmpl; do
-        python ../helpers/hv2-api/generate.py -s ../helpers/hv2-api/schema.json -t $F;
-      done
-    - ./node_modules/.bin/ng build --prod
-    - tar -czf ../dist.tgz dist
-  
-
-
-dockerize:
-  image: registry.hottis.de/dockerized/docker-bash:latest
-  stage: dockerize
-  tags:
-    - hottis
-    - linux
-    - docker
-  rules:
-    - if: $CI_COMMIT_TAG
-  script:
-    - tar -xzf dist.tgz
-    - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_TAG .
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker push $IMAGE_NAME:latest
-    - docker push $IMAGE_NAME:$CI_COMMIT_TAG
-
-
-deploy:
-  stage: deploy
-  image: registry.hottis.de/dockerized/docker-bash:latest
-  only:
-    - tags
-  tags:
-    - hottis
-    - linux
-    - docker
-  variables:
-    GIT_STRATEGY: none
-  script:
-    - CONTAINER_NAME=$CI_PROJECT_NAME
-    - docker stop $CONTAINER_NAME || echo "$CONTAINER_NAME not running, anyway okay"
-    - docker rm $CONTAINER_NAME || echo "$CONTAINER_NAME not exsting, anyway okay"
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
-    - docker pull $IMAGE_NAME:${CI_COMMIT_TAG}
-    - docker run -d --restart always --name $CONTAINER_NAME --network docker-server --ip 172.16.10.39  $IMAGE_NAME:${CI_COMMIT_TAG}
-

cli/AccountStatement.py

@@ -0,0 +1,54 @@
+from db import dbGetMany, dbGetOne
+from loguru import logger
+import datetime
+import iso8601
+from utils import getParam
+from Cheetah.Template import Template
+
+def perform(dbh, params):
+    year = getParam(params, 'year', datetime.datetime.today().year)
+
+    accountEntries = dbGetMany(
+        dbh, 
+        { 
+            "statement": "SELECT * FROM account_statement_v WHERE fiscal_year = %(year)s", 
+            "params": {
+                'year': year
+            }
+        }
+    )
+
+    overview = dbGetMany(
+        dbh, 
+        { 
+            "statement": "select sum(amount), category from account_statement_v where fiscal_year = %(year)s group by category", 
+            "params": {
+                'year': year
+            }
+        }
+    )
+
+    sum_related = dbGetOne(
+        dbh, 
+        { 
+            "statement": "select coalesce(sum(amount), 0::numeric(10,2)) as sum from account_statement_v where fiscal_year = %(year)s and category != 'nicht abrechenbare Positionen'", 
+            "params": {
+                'year': year
+            }
+        }
+    )
+
+    sum_unrelated = dbGetOne(
+        dbh, 
+        { 
+            "statement": "select coalesce(sum(amount), 0::numeric(10,2)) as sum from account_statement_v where fiscal_year = %(year)s and category = 'nicht abrechenbare Positionen'", 
+            "params": {
+                'year': year
+            }
+        }
+    )
+
+    template = getParam(params, 'template', 'accountStatement.tmpl')
+    input = { 'year': year, 'entries': accountEntries, 'overview': overview, 'related': sum_related, 'unrelated': sum_unrelated }
+    tmpl = Template(file=template, searchList=[ input ])
+    print(tmpl)

cli/AccountStatement.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+SHOW="0"
+PRINT="0"
+while getopts "y:sphP:" flag
+do
+  case "${flag}" in
+    h)
+      echo "y ... year for statement";
+      echo "s ... show output using evince";
+      echo "p ... print output";
+      echo "P ... printer name";
+      exit 1;
+      ;;
+    y)
+      YEAR=${OPTARG}
+      ;;
+    s)
+      SHOW="1"
+      ;;
+    p)
+      PRINT="1"
+      ;;
+    P)
+      PRINTER="-P ${OPTARG}"
+      ;;
+  esac
+done
+    
+if [ "$YEAR" = "" ]; then
+  echo "give year for statement as argument"
+  exit 1
+fi
+
+python3.10 hv2cli.py -o AccountStatement -p '{"year":'$YEAR'}' > ./output/$YEAR.tex
+
+pushd ./output
+
+pdflatex $YEAR.tex
+pdflatex $YEAR.tex
+pdflatex $YEAR.tex
+
+if [ "$SHOW" = "1" ]; then
+  evince $YEAR.pdf
+fi
+
+if [ "$PRINT" = "1" ]; then
+  lpr $PRINTER $YEAR.pdf
+fi
+
+popd

cli/MonthlyPaymentRequests.py

@@ -2,14 +2,20 @@ from db import dbGetMany, dbGetOne
 from loguru import logger
 from decimal import Decimal
 import datetime
+import iso8601
 
 def perform(dbh, params):
     try:
-        createdAt = params['created_at']
-        dueAt = createdAt.replace(day=1)
+        createdAt = iso8601.parse_date(params['created_at'])
+    except iso8601.iso8601.ParseError:
+        msg = f"Can not parse given date {params['created_at']}"
+        logger.error(msg)
+        raise Exception(msg)
     except KeyError:
-        createdAt = datetime.datetime.today().strftime("%Y-%m-%d")
-        dueAt = createdAt.replace(day=1)
+        createdAt = datetime.datetime.today()
+
+    year = createdAt.year
+    createdAt = createdAt.strftime("%Y-%m-%d")
 
     tenants = dbGetMany(dbh, { "statement": "SELECT * FROM tenant_t", "params": () })
     for tenant in tenants:
@@ -101,11 +107,11 @@ def perform(dbh, params):
             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))
+                                        (description, account, created_at, fiscal_year, amount, account_entry_category)
+                                        VALUES (%s, %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'])
+                    "params": (request['description'], request['account'], request['created_at'], year, request['amount'], request['category'])
                 }
             )
             logger.info(f"    account entry entered with id {accountEntry['id']}")

cli/OverheadAccounts.py

@@ -1,16 +1,194 @@
-from db import dbGetMany
+from db import dbGetMany, dbGetOne
 import datetime
 from loguru import logger
+from decimal import *
+from utils import getParam
+from Cheetah.Template import Template
+
+
+
+EPSILON = Decimal('0.000000001')
 
 def perform(dbh, params):
-    try:
-        year = params['year']
-    except KeyError:
-        year = datetime.datetime.today().year
+    year = getParam(params, 'year', datetime.datetime.today().year)
     startDate = datetime.datetime(year, 1, 1, 0, 0, 0)
     endDate = datetime.datetime(year, 12, 31, 23, 59, 59)
     premises = (1, 2)
 
+    houses = {}
+    for premise in premises:
+        # get overhead sums by object, category and timespan
+        overheadItems = dbGetMany(
+            dbh,
+            {
+                "statement": 
+                """
+                    select (coalesce(sum(ae.amount), 0::numeric(10,2)) * -1) as sum, 
+                        aec.description as category, 
+                        aec.considerminusarea as considerminusarea
+                    from account_t a,
+                        premise_t p,
+                        account_entry_t ae,
+                        account_entry_category_t aec
+                    where p.account = a.id and
+                        ae.account = a.id and
+                        aec.overhead_relevant = 't' and
+                        ae.account_entry_category = aec.id and
+                        ae.fiscal_year = %(year)s and
+                        p.id = %(premise)s
+                    group by category, considerminusarea
+                    union
+                    select 0 as sum,
+                        aec.description as category, 
+                        aec.considerminusarea as considerminusarea
+                    from account_t a,
+                        premise_t p,
+                        account_entry_t ae,
+                        account_entry_category_t aec
+                    where p.account = a.id and
+                        ae.account = a.id and
+                        aec.overhead_relevant = 't' and
+                        aec.id not in (select distinct account_entry_category from account_entry_t where fiscal_year = %(year)s) and
+                        ae.fiscal_year = %(year)s and
+                        p.id = %(premise)s
+                    group by category, considerminusarea
+                    union
+                    select 120 as sum,
+                        '16. Waschmaschine' as category,
+                        false as considerminusarea
+                    from premise_t
+                    where id = %(premise)s
+                    order by category
+                """,
+                "params": {
+                "year": year,
+                "premise": premise
+                }
+            } 
+        )
+
+        # get areas and factors
+        totalArea = {}
+        flatArea = dbGetOne(
+            dbh,
+            {
+                "statement":
+                """
+                    select 
+                        sum(f.area) as flat_area
+                    from
+                        premise_t p,
+                        flat_t f
+                    where
+                        f.premise = p.id and
+                        p.id = %(premise)s
+                """,
+                "params": {
+                    "premise": premise
+                }
+            }
+        )
+        totalArea['flat_area'] = flatArea['flat_area']
+
+        commercialArea = dbGetOne(
+            dbh,
+            {
+                "statement":
+                """
+                    select 
+                        coalesce(sum(c.area), 0) as commercial_area
+                    from
+                        premise_t p full outer join commercial_premise_t c on c.premise = p.id
+                    where
+                        p.id = %(premise)s
+                """,
+                "params": {
+                    "premise": premise
+                }
+            }
+        )
+        totalArea['commercial_area'] = commercialArea['commercial_area']
+
+        minusAreaAndDetails = dbGetOne(
+            dbh,
+            {
+                "statement":
+                """
+                    select 
+                        p.minus_area as minus_area,
+                        p.id as house_id,
+                        p.description as house
+                    from
+                        premise_t p
+                    where
+                        p.id = %(premise)s
+                """,
+                "params": {
+                    "premise": premise
+                }
+            }
+        )
+        totalArea['minus_area'] = minusAreaAndDetails['minus_area']
+        details = { 'id': minusAreaAndDetails['house_id'], 'description': minusAreaAndDetails['house'] }
+
+        totalArea['other_area'] = totalArea['commercial_area'] + totalArea['minus_area']
+        totalArea['total_area'] = totalArea['flat_area'] + totalArea['other_area']
+        totalArea['flat_factor'] = totalArea['flat_area'] / totalArea['total_area']
+        totalArea['other_factor'] = totalArea['other_area'] / totalArea['total_area']
+        totalArea['factor_check'] = totalArea['flat_factor'] + totalArea['other_factor']
+        
+        totalSum = Decimal('0')
+        flatSum = Decimal('0')
+        otherSum = Decimal('0')
+        for overheadItem in overheadItems:
+            totalSum += overheadItem['sum']
+            overheadItem['flat_part'] = overheadItem['sum'] * totalArea['flat_factor'] if overheadItem['considerminusarea'] else overheadItem['sum']
+            flatSum += overheadItem['flat_part']
+            overheadItem['other_part'] = overheadItem['sum'] * totalArea['other_factor'] if overheadItem['considerminusarea'] else Decimal('0')
+            otherSum += overheadItem['other_part']
+
+        verifyDifference = totalSum - flatSum - otherSum
+        logger.debug(f"{totalSum=}, {verifyDifference=}")
+        if abs(verifyDifference) > EPSILON:
+            raise Exception(f"Verify Difference is too large: {premise=}, {verifyDifference=}")
+
+        umlageAusfallWagnis = flatSum * Decimal('0.02')
+        flatSum2 = flatSum + umlageAusfallWagnis
+
+        partByMonthArea = flatSum2 / Decimal('12') / totalArea['flat_area']
+
+        houses[details['id']] = { 
+            'details': details, 
+            'areas': totalArea, 
+            'overhead_items': overheadItems, 
+            'flat_sum': flatSum, 
+            'flat_sum_2': flatSum2, 
+            'other_sum': otherSum, 
+            'total_sum': totalSum,
+            'umlage_ausfall_wagnis': umlageAusfallWagnis,
+            'part_by_montharea': partByMonthArea,
+            'year': year }
+
+
+    logger.info(f"{houses=}")
+
+
+    printOverviews = getParam(params, 'printOverviews', True)
+    if printOverviews:
+        overviewTemplate = getParam(params, 'overviewTemplate', 'betriebskostenuebersicht.tmpl')
+        overviewPrefix = getParam(params, 'overviewPrefix', 'overview')
+        overviewSuffix = getParam(params, 'overviewSuffix', 'tex')
+
+        for house in houses.values():
+            logger.debug(f"Processing item: {house}")
+            outputFile = f"./output/{overviewPrefix}-{house['details']['id']}.{overviewSuffix}"
+            tmpl = Template(file=overviewTemplate, searchList=[ house ])
+            logger.debug(tmpl)
+            with open(outputFile, 'w') as f:
+                f.write(str(tmpl))
+
+       
+
 
     # get flat tenants by object and timespan with paid overhead and due overhead
     tenants = dbGetMany(
@@ -19,22 +197,30 @@ def perform(dbh, params):
             "statement":
             """
                 select t.id as tenant_id,
+                    t.salutation as tenant_salutation,
                     t.firstname as tenant_firstname,
                     t.lastname as tenant_lastname,
+                    t.address1 as tenant_address1,
+                    t.address2 as tenant_address2,
+                    t.address3 as tenant_address3,
+                    t.zip as tenant_zip,
+                    t.city as tenant_city,
                     f.id as flat_id,
                     f.description as flat,
+                    f.area as flat_area,
                     p.id as house_id,
                     p.description as house,
                     ty.startdate as startdate,
-                    ty.enddate as enddate
+                    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
+                    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
@@ -46,56 +232,82 @@ def perform(dbh, params):
            }
         }
     )
-    logger.info(f"{tenants=}")
 
+    letters = []
+    for tenant in tenants:
+        letter = {}
 
-    # get overhead sums by object, category and timespan
-    overheadSums = dbGetMany(
-        dbh,
-        {
-            "statement": 
-            """
-                select sum(ae.amount) as sum, 
-                    aec.description as category, 
-                    p.id as house_id,
-                    p.description as house
-                from account_t a,
-                    premise_t p,
-                    account_entry_t ae,
-                    account_entry_category_t aec
-                where p.account = a.id and
-                    ae.account = a.id and
-                    aec.overhead_relevant = 't' and
-                    ae.account_entry_category = aec.id and
-                    created_at between %(startDate)s and %(endDate)s and
-                    p.id in %(premises)s
-                group by house_id, house, category
-                union
-                select 0 as sum,
-                    aec.description as category, 
-                    p.id as house_id,
-                    p.description as house
-                from account_t a,
-                    premise_t p,
-                    account_entry_t ae,
-                    account_entry_category_t aec
-                where p.account = a.id and
-                    ae.account = a.id and
-                    aec.overhead_relevant = 't' and
-                    aec.id not in (select distinct account_entry_category from account_entry_t) and
-                    created_at between %(startDate)s and %(endDate)s and
-                    p.id in %(premises)s
-                group by house_id, house, category
-                order by house_id, category
-            """,
-            "params": {
-               "startDate": startDate, 
-               "endDate": endDate,
-               "premises": premises
+        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
+                        fiscal_year = %(year)s
+                """,
+                "params": {
+                    "account": tenant['tenant_account'],
+                    "year": year
+                }
             }
-        } 
-    )
-    logger.info(f"{overheadSums=}")
+        )
+        tenant['paid_total'] = paidTotal['sum']
+
+        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
+                        fiscal_year = %(year)s
+                """,
+                "params": {
+                    "account": tenant['tenant_account'],
+                    "year": year
+                }
+            }
+        )
+        tenant['receivable_fee'] = receivableFee['sum']
+        tenant['rent_time'] = receivableFee['cnt']
+        
+        tenant['paid_overhead'] = paidTotal['sum'] - receivableFee['sum']
+
+        letter['tenant'] = tenant
+        letter['year'] = year
+        letter['flat_area'] = houses[tenant['house_id']]['areas']['flat_area']
+        letter['receivable_overhead'] = tenant['flat_area'] * houses[tenant['house_id']]['part_by_montharea'] * tenant['rent_time']
+        letter['unbalanced_overhead'] = tenant['paid_overhead'] - letter['receivable_overhead']
+        letter['unbalanced_overhead_unsigned'] = abs(letter['unbalanced_overhead'])
+        letter['total_overhead'] = houses[tenant['house_id']]['flat_sum_2']
+
+        letters.append(letter)
+
+        logger.info(f"{letter=}")
+
+
+    printLetters = getParam(params, 'printLetters', True)
+    if printLetters:
+        letterTemplate = getParam(params, 'letterTemplate', 'jahresabrechnung.tmpl')
+        letterPrefix = getParam(params, 'letterPrefix', 'letter')
+        letterSuffix = getParam(params, 'letterSuffix', 'tex')
+
+        for letter in letters:
+            logger.debug(f"Processing item: {letter}")
+            outputFile = f"./output/{letterPrefix}-{letter['tenant']['tenant_id']}.{letterSuffix}"
+            tmpl = Template(file=letterTemplate, searchList=[ letter ])
+            logger.debug(tmpl)
+            with open(outputFile, 'w') as f:
+                f.write(str(tmpl))
+
+
 
 
 

cli/OverheadAccounts.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+PRINT="0"
+while getopts "y:phP:" flag
+do
+  case "${flag}" in
+    h)
+      echo "y ... year for statement";
+      echo "p ... print output";
+      echo "P ... printer name";
+      exit 1;
+      ;;
+    y)
+      YEAR=${OPTARG}
+      ;;
+    p)
+      PRINT="1"
+      ;;
+    P)
+      PRINTER="-P ${OPTARG}"
+      ;;
+  esac
+done
+    
+if [ "$YEAR" = "" ]; then
+  echo "give year for statement as argument"
+  exit 1
+fi
+
+python3.10 hv2cli.py -o OverheadAccounts -p '{"year":'$YEAR'}'
+
+pushd ./output
+
+for I in letter-*.tex; do
+  pdflatex $I
+  pdflatex $I
+  pdflatex $I
+done
+for I in overview-*.tex; do
+  pdflatex $I
+  pdflatex $I
+  pdflatex $I
+done
+
+
+if [ "$PRINT" = "1" ]; then
+  for I in letter-*.pdf; do
+    lpr $PRINTER $I
+  done
+  for I in overview-*.pdf; do
+    lpr $PRINTER $I
+  done
+fi
+
+popd

cli/accountStatement.tmpl

@@ -0,0 +1,59 @@
+\documentclass[10pt]{article}
+\usepackage{german}
+\usepackage{eurosym}
+\usepackage[a4paper, landscape=true, left=2cm, right=2cm, top=2cm]{geometry}
+\usepackage{icomma}
+\usepackage{longtable}
+\usepackage{color}
+\setlength{\parindent}{0pt}
+
+\begin{document}
+
+\subsection*{Account Statement $year}
+
+\begin{longtable}{|r|r|p{6cm}|r|r|r|p{3cm}|r|p{5cm}|}
+  \hline \textcolor{blue}{\bf{ID}} & \textcolor{blue}{\bf{Date}} & \textcolor{blue}{\bf{Description}} & \textcolor{blue}{\bf{Amount}} & \textcolor{blue}{\bf{DocNo}} & \textcolor{blue}{\bf{Year}} & \textcolor{blue}{\bf{Category}} & \textcolor{blue}{\bf{IsRef}} & \textcolor{blue}{\bf{BaseAccount}} \\ \hline \hline
+  \endfirsthead
+  \hline \textcolor{blue}{\bf{ID}} & \textcolor{blue}{\bf{Date}} & \textcolor{blue}{\bf{Description}} & \textcolor{blue}{\bf{Amount}} & \textcolor{blue}{\bf{DocNo}} & \textcolor{blue}{\bf{Year}} & \textcolor{blue}{\bf{Category}} & \textcolor{blue}{\bf{IsRef}} & \textcolor{blue}{\bf{BaseAccount}} \\ \hline \hline
+  \endhead
+  \multicolumn{9}{r}{\em{to be continued}}
+  \endfoot
+  
+  \endlastfoot
+
+  #for $entry in $entries
+\tt{$entry['id']} & \tt{$entry['created_at']} & \tt{$entry['description']} & #slurp
+#if $entry['amount'] <= 0
+\textcolor{red}{#slurp
+#end if
+\tt{$entry['amount']} \,\euro{}#slurp
+#if $entry['amount'] <= 0
+}#slurp
+#end if
+& \tt{$entry['document_no']} & \tt{$entry['fiscal_year']} & \tt{$entry['category']} & \tt{$entry['is_reference']} & \tt{{$entry['base_account'].replace('_', ' ') }} \\ \hline
+  #end for
+\end{longtable}
+
+\pagebreak
+\subsection*{Overviews}
+
+\begin{tabular}{|l|r|} \hline
+\hline \textcolor{blue}{\bf{category}} & \textcolor{blue}{\bf{sum}} \\
+#for $entry in $overview
+\hline \tt{$entry['category']} & #slurp
+#if $entry['sum'] <= 0
+\textcolor{red}{#slurp
+#end if
+\tt{$entry['sum']} \,\euro{}#slurp
+#if $entry['sum'] <= 0
+}#slurp
+#end if
+\\
+#end for
+
+\hline \hline related & \tt{$related['sum']} \,\euro{} \\
+\hline unrelated & \tt{$unrelated['sum']} \,\euro{} \\
+\hline \hline
+\end{tabular}
+
+\end{document}

cli/betriebskostenuebersicht.tmpl

@@ -0,0 +1,47 @@
+\documentclass[12pt]{article}
+\renewcommand{\familydefault}{\sfdefault}
+\usepackage{german}
+\usepackage{eurosym}
+\usepackage[a4paper, left=2cm, right=2cm, top=2cm]{geometry}
+\usepackage{icomma}
+\setlength{\parindent}{0pt}
+
+\begin{document}
+
+\subsection*{Aufstellung}
+über die Ermittlung der Betriebskosten gemäß §27 II. BV
+
+\vspace{15mm}
+
+\begin{tabular}{ll}
+Objekt & $details['description'] \\
+Jahr & $year \\
+Eigent"umer & Nober Grundbesitz GmbH \\
+\end{tabular}
+
+\addvspace{1cm}
+
+    \begin{tabular}{|p{7cm}|r|r|r|}
+        \hline Art & Wohnungen & andere Fl"achen & Gesamtfl"ache \\
+        \hline 
+        \hline Fl"ache & \tt{$areas['flat_area']\,m\textsuperscript{2}} & \tt{$areas['other_area']\,m\textsuperscript{2}} & \tt{$areas['total_area']\,m\textsuperscript{2}} \\
+        \hline Faktor & \tt{#echo '%.10f' % $areas['flat_factor'] #} & \tt{#echo '%.10f' % $areas['other_factor'] #} & \\
+        \hline \hline
+
+        #for $item in $overhead_items
+        \hline $item['category'] & \tt{#echo '%.2f' % $item['flat_part'] #\,\euro{}} & \tt{#echo '%.2f' % $item['other_part'] #\,\euro{}} & \tt{#echo '%.2f' % $item['sum'] #\,\euro{}} \\
+        #end for
+
+        \hline 
+%        \hline \multicolumn{4}{c}{ } \\
+        \hline Zwischensumme & \tt{#echo '%.2f' % $flat_sum #\,\euro{}} & \tt{#echo '%.2f' % $other_sum #\,\euro{}} & \tt{#echo '%.2f' % $total_sum #\,\euro{}} \\
+        \hline Umlageausfallwagnis & \tt{#echo '%.2f' % $umlage_ausfall_wagnis #\,\euro{}} & & \\
+        \hline Summe & \tt{#echo '%.2f' % $flat_sum_2 #\,\euro{}} & & \\
+
+        \hline 
+%        \hline \multicolumn{4}{c}{ } \\
+        \hline Anteil pro Monat und m\textsuperscript{2} & \tt{#echo '%.10f' % $part_by_montharea #\,\euro{}} & & \\
+        \hline 
+    \end{tabular}
+
+\end{document}

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:

cli/jahresabrechnung.tmpl

@@ -0,0 +1,74 @@
+\documentclass[12pt]{dinbrief}
+\usepackage{german}
+\usepackage{eurosym}
+
+
+\address{Nober Grundbesitz GbR\\
+         Eupenstr. 20\\
+         45259 Essen}
+\backaddress{Nober Grundbesitz GbR, Eupenstr. 20, 45259 Essen}
+\signature{Wolfgang Hottgenroth} %% Hier Unterschrift einfuegen
+\nowindowrules
+\writer{wh} %% Hier eigenen Namen oder Kuerzel einfuegen
+\phone{0174}{3072474} %% Hier eigene Telefon einfuegen
+
+\bottomtext{\sffamily\footnotesize Gesch"aftsf"uhrer: Wolfgang Hottgenroth, Robert Nober, Gregor Nober ---
+            EMail: hausverwaltung@nober.de\\
+            Bankverbindung: IBAN DE14 3605 0105 0001 5130 35, Sparkasse Essen}
+
+
+\begin{document}
+    \pagenumbering{gobble}
+    \begin{letter}{$tenant['tenant_firstname'] $tenant['tenant_lastname']\\
+                   #if $tenant['tenant_address1']
+                     $tenant['tenant_address1']\\
+                   #end if
+                   #if $tenant['tenant_address2']
+                     $tenant['tenant_address2']\\
+                   #end if
+                   #if $tenant['tenant_address3']
+                     $tenant['tenant_address3']\\
+                   #end if
+                   $tenant['tenant_zip'] $tenant['tenant_city']}
+    \subject{Betriebskostenabrechnung $year}
+    \opening{$tenant['tenant_salutation'],}
+
+    f"ur die im vergangenen Jahr angefallenen Betriebskosten ergibt sich f"ur Sie folgende Abrechnung.
+
+    \begin{tabular}{|p{10cm}|r|}
+        \hline Jahr & \tt{$year} \\
+        \hline Haus & $tenant['house'] \\
+        \hline Betriebskosten gesamt & \tt{#echo '%.2f' % $total_overhead #\,\euro{}} \\
+        \hline Gesamt-Wohnfl"ache & \tt{$flat_area\,m\textsuperscript{2}} \\
+        \hline Ihre Wohnung & $tenant['flat'] \\
+        \hline Ihre Wohnfl"ache & \tt{$tenant['flat_area']\,m\textsuperscript{2}} \\
+        \hline Ihre Mietzeit & \tt{$tenant['rent_time']\,Monate} \\
+        \hline Ihr Betriebskostenanteil nach Fl"ache und Mietzeit & \tt{#echo '%.2f' % $receivable_overhead #\,\euro{}} \\
+        \hline Ihre Zahlungen & \tt{$tenant['paid_total']\,\euro{}} \\
+        \hline davon Anteil Miete & \tt{$tenant['receivable_fee']\,\euro{}} \\
+        \hline davon Anteil Betriebskostenvorauszahlung & \tt{$tenant['paid_overhead']\,\euro{}} \\
+        \hline 
+        #if $unbalanced_overhead < 0
+        Zuwenig
+        #else
+        Zuviel
+        #end if
+        gezahlte Betriebskosten & \tt{#echo '%.2f' % $unbalanced_overhead_unsigned #\,\euro{}} \\
+        \hline
+    \end{tabular}
+
+    #if 1 < 0
+    Bitte "uberweisen Sie den Betrag von #echo '%.2f' % $unbalanced_overhead_unsigned #\,\euro{} kurzfristig auf mein Konto.
+    #else
+    Ich werde den Betrag von #echo '%.2f' % $unbalanced_overhead_unsigned #\,\euro{} in den n"achsten Tagen auf Ihr Konto "uberweisen.
+    #end if
+    
+    Eine tabellarische "Ubersicht "uber die Zusammensetzung der Gesamt-Betriebskosten 
+    finden Sie in der Anlage.
+
+    \closing{Mit freundlichen Gr"u"sen}
+
+
+
+    \end{letter}
+\end{document}

cli/utils.py

@@ -0,0 +1,2 @@
+def getParam(params, attr, default):
+    return params[attr] if attr in params else default

generate.py

@@ -3,6 +3,10 @@ from Cheetah.Template import Template
 import glob
 import argparse
 
+
+
+
+
 parser = argparse.ArgumentParser(description="generate.py")
 parser.add_argument('--schema', '-s',
                     help='Schema file. Default: schema.json in the current folder.',

schema.json

@@ -33,6 +33,7 @@
                 { "name": "street", "sqltype": "varchar(128)", "notnull": true },
                 { "name": "zip", "sqltype": "varchar(10)", "notnull": true },
                 { "name": "city", "sqltype": "varchar(128)", "notnull": true },
+                { "name": "minus_area", "sqltype": "numeric(10,2)", "notnull": true, "default": 0},
                 { "name": "account", "sqltype": "integer", "notnull": true, "foreignkey": true, "immutable": true, "unique": true }
             ]
         },
@@ -79,7 +80,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)"
@@ -127,7 +129,8 @@
             "immutable": true,
             "columns": [
                 { "name": "description", "sqltype": "varchar(128)", "notnull": true, "selector": 0, "unique": true },
-                { "name": "overhead_relevant", "sqltype": "boolean", "notnull": true, "default": "true" }
+                { "name": "considerMinusArea", "sqltype": "boolean", "notnull": true, "default": true },
+                { "name": "overhead_relevant", "sqltype": "boolean", "notnull": true, "default": true }
             ]
         },
         {
@@ -137,7 +140,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/account-statement.sql

@@ -0,0 +1,23 @@
+create or replace view account_statement_v as
+    select ae.id as id,
+        ae.description as description,
+        ae.created_at::timestamp::date as created_at,
+        ae.amount as amount,
+        ae.document_no as document_no,
+        ae.fiscal_year as fiscal_year,
+        aec.description as category,
+        ac.description as account,
+        ae.is_reference as is_reference,
+        bac.description as base_account
+    from joined_account_entry_v ae,
+        account_entry_category_t aec,
+        account_t ac,
+        account_t bac
+    where ae.account_entry_category = aec.id and
+            ae.account = ac.id and
+            ae.base_account = bac.id and
+            ac.id = 1000
+    order by created_at;
+
+grant select on account_statement_v to hv2;
+

schema/changes02.sql

@@ -0,0 +1,126 @@
+CREATE TABLE account_entry_reference_t (
+    id serial not null primary key,
+    account integer     not null   references account_t (id),
+    account_entry integer not null references account_entry_t (id)
+);
+
+
+CREATE OR REPLACE VIEW joined_account_entry_v AS
+  SELECT ae.id as id, 
+         ae.description as description, 
+         ae.account as account, 
+         ae.created_at as created_at, 
+         ae.amount as amount, 
+         ae.account_entry_category as account_entry_category, 
+         ae.document_no as document_no, 
+         ae.fiscal_year as fiscal_year,
+         false as is_reference, 
+         0 as base_account
+    FROM account_entry_t ae
+  UNION
+  SELECT ae.id as id, 
+         ae.description as description, 
+         aer.account as account, 
+         ae.created_at as created_at, 
+         ae.amount as amount, 
+         ae.account_entry_category as account_entry_category, 
+         ae.document_no as document_no, 
+         ae.fiscal_year as fiscal_year,
+         true as is_reference, 
+         ae.account as base_account
+    FROM account_entry_t ae,
+         account_entry_reference_t aer
+    WHERE ae.id = aer.account_entry;
+
+update account_t set description = 'fallback_account' where id = 33;
+delete from account_t where id = 32;
+
+insert into account_t (id, description) values (1000, 'ledger');
+
+update account_entry_t set amount = amount * -1.0 where account=33;
+update account_entry_t set amount = amount * -1.0 where account in (34,35,36,37);
+
+
+DO $$
+DECLARE
+  entry_id integer;
+BEGIN
+  RAISE NOTICE 'Start migration';
+
+  FOR entry_id IN
+    SELECT id
+      FROM account_entry_t
+      WHERE account IN (33,34,35,36,37)
+  LOOP
+    RAISE NOTICE 'About to migrate entry %', entry_id;
+    INSERT INTO account_entry_reference_t (account, account_entry) VALUES (1000, entry_id);
+  END LOOP;
+END;
+$$;
+
+update account_entry_t 
+  set description = 'Miete ' || extract(year from created_at)::text || ' ' || to_char(to_date(extract(month from created_at)::text, 'MM'), 'Month') 
+  where account_entry_category = 2 and description = 'Miete';
+
+
+DO $$
+DECLARE
+  entry RECORD;
+  tenant RECORD;
+BEGIN
+  RAISE NOTICE 'Start migration of tenant accounts';
+
+  FOR entry IN
+    SELECT id, description, account
+      FROM account_entry_t
+      WHERE account_entry_category = 2
+  LOOP
+    RAISE NOTICE 'About to migrate entry %', entry.id;
+    INSERT INTO account_entry_reference_t (account, account_entry) VALUES (1000, entry.id);
+    SELECT * 
+      INTO tenant
+      FROM tenant_t
+      WHERE account = entry.account;
+    RAISE NOTICE 'Tenant: % %', tenant.firstname, tenant.lastname;
+    UPDATE account_entry_t
+      SET description = description || ' ' || tenant.firstname || ' ' || tenant.lastname
+      WHERE id = entry.id;
+  END LOOP;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION maintain_ledger()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  tenant RECORD;
+  adjusted_description text;
+BEGIN
+  IF ((NEW.description = 'Miete') AND (NEW.account_entry_category = 2)) THEN
+    SELECT firstname, lastname
+      INTO tenant
+      FROM tenant_t
+      WHERE account = NEW.account;
+    adjusted_description := 'Miete ' || extract(year from NEW.created_at)::text || ' ' || to_char(to_date(extract(month from NEW.created_at)::text, 'MM'), 'Month') || tenant.firstname || ' ' || tenant.lastname;
+    UPDATE account_entry_t
+      SET description = adjusted_description
+      WHERE id = NEW.id;
+  END IF;
+    
+  INSERT INTO account_entry_reference_t (account, account_entry) VALUES (1000, NEW.id);
+  RETURN NEW;
+END;
+$$;
+
+CREATE TRIGGER maintain_ledger_trigger
+  AFTER INSERT ON account_entry_t
+  FOR EACH ROW
+  WHEN (NEW.account != 1000 AND NEW.account_entry_category NOT IN (3, 4, 29))
+  EXECUTE FUNCTION maintain_ledger();
+
+
+grant select, update on account_entry_reference_t_id_seq to hv2;
+grant insert on account_entry_reference_t to hv2;
+grant update on account_entry_t to hv2;
+

schema/create.sql

@@ -39,6 +39,7 @@ CREATE TABLE premise_t (
   ,street varchar(128)     not null 
   ,zip varchar(10)     not null 
   ,city varchar(128)     not null 
+  ,minus_area numeric(10,2)     not null   default 0 
   ,account integer     not null   references account_t (id)     unique 
 );
 
@@ -91,6 +92,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)
 );
 
@@ -138,7 +140,8 @@ GRANT SELECT, UPDATE ON tenancy_fee_mapping_t_id_seq TO hv2;
 CREATE TABLE account_entry_category_t (
   id serial not null primary key
   ,description varchar(128)     not null     unique 
-  ,overhead_relevant boolean     not null   default true 
+  ,considerMinusArea boolean     not null   default True 
+  ,overhead_relevant boolean     not null   default True 
 );
 
 GRANT SELECT, INSERT ON account_entry_category_t TO hv2;
@@ -149,7 +152,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,15 +6,13 @@
     <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" [formControl]="presetDueAt"/>
-    <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-form-field appearance="outline">
     <mat-label>Kategorie</mat-label>
-    <mat-select ngModel name="category" [disabled]="shallBeRentPayment">
+    <mat-select ngModel name="category" [formControl]="presetCategory" >
         <mat-option *ngFor="let p of accountEntryCategories" [value]="p.id">{{p.description}}</mat-option>
     </mat-select>
 </mat-form-field>
@@ -22,9 +20,9 @@
     <mat-label>Betrag (€)</mat-label>
     <input matInput type="number" name="amount" ngModel/>
 </mat-form-field>
-<mat-form-field appearance="outline" *ngIf="!shallBeRentPayment">
+<mat-form-field appearance="outline">
     <mat-label>Beschreibung</mat-label>
-    <input matInput name="description" [disabled]="shallBeRentPayment" ngModel/>
+    <input matInput name="description" [formControl]="presetDescription" ngModel/>
 </mat-form-field>
 <button #addAccountEntryButton type="submit" mat-raised-button color="primary">Buchung speichern</button>
 </form>
@@ -35,19 +33,19 @@ Saldo: {{saldo?.saldo | number:'1.2-2'}} €
 <div id="secondBlock">
 <table mat-table [dataSource]="accountEntriesDataSource" #zftable>
 <ng-container matColumnDef="createdAt">
-    <th mat-header-cell *matHeaderCellDef>Datum</th>
+    <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>
     <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.description}}</td>
 </ng-container>
 <ng-container matColumnDef="document_no">
-    <th mat-header-cell *matHeaderCellDef>Belegnummer</th>
+    <th mat-header-cell *matHeaderCellDef >Belegnummer</th>
     <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.document_no}}</td>
 </ng-container>
 <ng-container matColumnDef="amount">
@@ -55,11 +53,11 @@ Saldo: {{saldo?.saldo | number:'1.2-2'}} €
     <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>
+    <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>
+    <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>

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

@@ -31,17 +31,20 @@ export class AccountComponent implements OnInit {
   @Input() shallBeRentPayment: boolean
   @ViewChild('addAccountEntryButton') addAccountEntryButton: MatButton
 
+
   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>
 
-  presetDueAt: FormControl
+  presetFiscalYear: FormControl
+  presetCategory: FormControl
+  presetDescription: FormControl
 
   constructor(
     private accountService: AccountService,
@@ -96,23 +99,14 @@ export class AccountComponent implements OnInit {
       let uniquenumber: UniqueNumber = await this.extApiService.getUniqueNumber();
       this.messageService.add(`Got unique number as document_no: ${uniquenumber.number}`)
       let newAccountEntry: AccountEntry = {
-        description: formData.value.description,
+        description: this.presetDescription.value,
         account: this.account.id,
         created_at: formData.value.createdAt,
-        due_at: formData.value.dueAt,
+        fiscal_year: this.presetFiscalYear.value,
         amount: formData.value.amount,
         id: 0,
         document_no: uniquenumber.number,
-        account_entry_category: 0
-      }
-
-      if (this.shallBeRentPayment) {
-        newAccountEntry.account_entry_category = this.accountEntryCategoriesInverseMap.get('Mietzahlung').id
-        newAccountEntry.description = "Miete"
-        this.messageService.add(`shall be rentpayment, category is ${newAccountEntry.account_entry_category}`)
-      } else {
-        newAccountEntry.account_entry_category = formData.value.category
-        this.messageService.add(`category is ${newAccountEntry.account_entry_category}`)
+        account_entry_category: this.presetCategory.value
       }
 
       this.messageService.add(`addAccountEntry: ${ JSON.stringify(newAccountEntry, undefined, 4) }`)
@@ -146,16 +140,28 @@ export class AccountComponent implements OnInit {
   }
 
   private async init(): Promise<void> {
+    this.messageService.add(`AccountComponent.init start, account: ${this.selectedAccountId}`)
     let currentDate = new Date()
-    let y = currentDate.getFullYear().toString()
-    let m = (currentDate.getMonth()+1).toString()
-    if (m.length == 1) {
-      m = `0${m}`
+    let y = currentDate.getFullYear()
+    this.presetFiscalYear = new FormControl(y)
+
+    this.messageService.add(`AccountComponent.init a, account: ${this.selectedAccountId}`)
+    await this.getAccountEntryCategories()
+
+    if (this.shallBeRentPayment) {
+      this.messageService.add(`AccountComponent.init b, account: ${this.selectedAccountId}`)
+      this.presetCategory = new FormControl(this.accountEntryCategoriesInverseMap.get('Mietzahlung').id)
+      this.messageService.add(`AccountComponent.init c, account: ${this.selectedAccountId}`)
+      this.presetDescription = new FormControl("Miete")
+      this.messageService.add(`shall be rentpayment`)
+      this.messageService.add(`AccountComponent.init d, account: ${this.selectedAccountId}`)
+    } else {
+      this.presetCategory = new FormControl()
+      this.presetDescription = new FormControl()
     }
-    this.presetDueAt = new FormControl(`${y}-${m}-01`)
+
     this.messageService.add(`AccountComponent.init, account: ${this.selectedAccountId}`)
     this.getAccount()
-    await this.getAccountEntryCategories()
 
   }
 
@@ -167,5 +173,4 @@ export class AccountComponent implements OnInit {
     this.init()
   }
 
-
 }

ui/hv2-ui/src/app/app.module.ts

@@ -50,6 +50,7 @@ import { EnterPaymentComponent } from './enter-payment/enter-payment.component';
 import { HomeComponent } from './home/home.component';
 import { LedgerComponent } from './ledger/ledger.component';
 import { ErrorDialogComponent } from './error-dialog/error-dialog.component'
+import { MatSortModule } from '@angular/material/sort';
 
 registerLocaleData(localeDe)
 
@@ -102,7 +103,8 @@ registerLocaleData(localeDe)
     MatSelectModule,
     MatDatepickerModule,
     MatNativeDateModule,
-    MatExpansionModule
+    MatExpansionModule,
+    MatSortModule 
   ],
   exports: [
     MatMomentDateModule

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/config.ts

@@ -1,5 +1,5 @@
-// export const serviceBaseUrl = "https://api.hv.nober.de";
-// export const serviceBaseUrl = "http://172.16.10.38:5000";
-export const serviceBaseUrl = "http://localhost:8080"
+export const serviceBaseUrl = "https://api.hv.nober.de";
+// export const serviceBaseUrl = "http://172.16.3.96:8080";
+// export const serviceBaseUrl = "http://localhost:8080"
 export const authserviceBaseUrl = "https://authservice.hottis.de"
 export const applicationId = "hv2"

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

@@ -52,6 +52,7 @@ export interface Premise {
     street: string
     zip: string
     city: string
+    minus_area: number
     account: number
 }
 export const NULL_Premise: Premise = {
@@ -60,6 +61,7 @@ export const NULL_Premise: Premise = {
     ,street:   ''
     ,zip:   ''
     ,city:   ''
+    ,minus_area:   undefined
     ,account:   undefined
 }
 
@@ -119,11 +121,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 {
@@ -178,11 +182,13 @@ export const NULL_TenancyFeeMapping: TenancyFeeMapping = {
 export interface AccountEntryCategory {
     id: number
     description: string
+    considerMinusArea: boolean
     overhead_relevant: boolean
 }
 export const NULL_AccountEntryCategory: AccountEntryCategory = {
     id: 0
     ,description:   ''
+    ,considerMinusArea:   false
     ,overhead_relevant:   false
 }
 
@@ -191,7 +197,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 +207,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/ledger/ledger.component.html

@@ -5,30 +5,16 @@
         </mat-card-title>
     </mat-card-header>
     <mat-card-content>
-        <mat-accordion>
-            <mat-expansion-panel (opened)="collapseExpenseDetails = true"
-                                 (closed)="collapseExpenseDetails = false">
-                <mat-expansion-panel-header>
-                    <mat-panel-title>
-                        Ausgaben
-                    </mat-panel-title>
-                    <mat-panel-description>
-                        <div>Betriebskosten-relevante Ausgaben nicht hier sondern im Betriebskostenkonto unter "Meine Häuser" erfassen.</div>
-                    </mat-panel-description>
-                </mat-expansion-panel-header>
-                <app-account #expenseAccountComponent [selectedAccountId]="expenseAccountId" [shallBeRentPayment]="false"></app-account>
-            </mat-expansion-panel>
-            <mat-expansion-panel (opened)="collapseIncomeDetails = true"
-                                 (closed)="collapseIncomeDetails = false">
-                <mat-expansion-panel-header>
-                    <mat-panel-title>
-                        Einnahmen
-                    </mat-panel-title>
-                    <mat-panel-description>
-                    </mat-panel-description>
-                </mat-expansion-panel-header>
-                <app-account #incomeAccountComponent [selectedAccountId]="incomeAccountId" [shallBeRentPayment]="false"></app-account>
-            </mat-expansion-panel>
-        </mat-accordion>
+        <div>
+            <span>Konto auswählen: </span>
+            <mat-form-field appearance="outline">
+            <mat-select #mapSelect [(ngModel)]="accountId" name="account">
+            <mat-label>Mieter</mat-label>
+                <mat-option *ngFor="let p of accounts" [value]="p.id">{{p.description}}</mat-option>
+            </mat-select>
+            </mat-form-field>
+        </div>
+
+        <app-account [selectedAccountId]="accountId" [shallBeRentPayment]="false"></app-account>
     </mat-card-content>
 </mat-card>

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

@@ -1,5 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { AccountComponent } from '../account/account.component';
+import { AccountService } from '../data-object-service';
 import { Account } from '../data-objects';
 import { ExtApiService } from '../ext-data-object-service';
 import { MessageService } from '../message.service';
@@ -11,29 +12,23 @@ import { MessageService } from '../message.service';
 })
 export class LedgerComponent implements OnInit {
 
-  incomeAccount: Account
-  incomeAccountId: number
-  expenseAccount: Account
-  expenseAccountId: number
+  accounts: Account[]
+  accountId: number
 
-  collapseIncomeDetails: boolean = false
-  collapseExpenseDetails: boolean = false
 
-  @ViewChild('incomeAccountComponent') incomeAccountComponent: AccountComponent
-  @ViewChild('expenseAccountComponent') expenseAccountComponent: AccountComponent
+  @ViewChild('accountComponent') accountComponent: AccountComponent
   
 
   constructor(
-    private extApiService: ExtApiService,
+    private accountService: AccountService,
     private messageService: MessageService
   ) { }
 
   async getAccount(): Promise<void> {
     try {
-      this.messageService.add("Trying to load ledger account")
-      this.incomeAccount = await this.extApiService.getAccountByDescription('LedgerIncome')
-      this.expenseAccount = await this.extApiService.getAccountByDescription('LedgerExpense')
-      this.messageService.add("Account loaded")
+      this.messageService.add("Trying to load accounts")
+      this.accounts = await this.accountService.getAccounts()
+      this.messageService.add("Accounts loaded")
     } catch (err) {
       this.messageService.add(JSON.stringify(err, undefined, 4))
     }
@@ -41,8 +36,6 @@ export class LedgerComponent implements OnInit {
 
   async ngOnInit(): Promise<void> {
     await this.getAccount()
-    this.incomeAccountId = this.incomeAccount.id
-    this.expenseAccountId = this.expenseAccount.id
   }
 
 }

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, 

ui/hv2-ui/src/app/my-premises/my-premises.component.html

@@ -26,6 +26,10 @@
                         <th mat-header-cell *matHeaderCellDef>Ort</th>
                         <td mat-cell *matCellDef="let element">{{element.city}}</td>
                     </ng-container>
+                    <ng-container matColumnDef="minusArea">
+                        <th mat-header-cell *matHeaderCellDef>Minus-Fläche</th>
+                        <td mat-cell *matCellDef="let element">{{element.minus_area | number:'1.2-2'}}</td>
+                    </ng-container>
                     <ng-container matColumnDef="account">
                         <th mat-header-cell *matHeaderCellDef>Betriebskostenkonto</th>
                         <td mat-cell *matCellDef="let element">{{element.account}}</td>

ui/hv2-ui/src/app/my-premises/my-premises.component.ts

@@ -13,7 +13,7 @@ export class MyPremisesComponent implements OnInit {
 
   premises: Premise[]
   dataSource: MatTableDataSource<Premise>
-  displayedColumns: string[] = [ "description", "street", "zip", "city", "account" ]
+  displayedColumns: string[] = [ "description", "street", "zip", "city", "minusArea", "account" ]
 
 
   constructor(private premiseService: PremiseService, private messageService: MessageService) { }

ui/hv2-ui/src/app/premise-details/premise-details.component.html

@@ -40,6 +40,11 @@
                                 <mat-label>Ort</mat-label>
                                 <input matInput name="city" [(ngModel)]="premise.city"/>
                             </mat-form-field>
+                        </div><div>
+                            <mat-form-field appearance="outline">
+                                <mat-label>Minus-Fläche</mat-label>
+                                <input type="number" matInput name="minusArea" [(ngModel)]="premise.minus_area"/>
+                            </mat-form-field>
                         </div><div>
                             <mat-form-field appearance="outline" *ngIf="premise.account">
                                 <mat-label>Betriebskostenkonto</mat-label>