forgotten config fix

.gitignore

@@ -3,6 +3,7 @@ ENV
 api/config/dbconfig.ini
 api/config/authservice.pub
 cli/config/dbconfig.ini
+cli/output/
 *~
 .*~
 .vscode/

cli/AccountStatement.py

@@ -1,4 +1,4 @@
-from db import dbGetMany
+from db import dbGetMany, dbGetOne
 from loguru import logger
 import datetime
 import iso8601
@@ -15,15 +15,40 @@ def perform(dbh, params):
             "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')
-    prefix = getParam(params, 'prefix', 'accountStatement')
+    input = { 'year': year, 'entries': accountEntries, 'overview': overview, 'related': sum_related, 'unrelated': sum_unrelated }
-    suffix = getParam(params, 'suffix', 'tex')
-    input = { 'year': year, 'entries': accountEntries }
-    outputFile = f"{prefix}-{year}.{suffix}"
     tmpl = Template(file=template, searchList=[ input ])
-    with open(outputFile, 'w') as f:
+    print(tmpl)
-        f.write(str(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/OverheadAccounts.py

@@ -23,7 +23,7 @@ def perform(dbh, params):
             {
                 "statement": 
                 """
-                    select sum(ae.amount) as sum, 
+                    select (coalesce(sum(ae.amount), 0::numeric(10,2)) * -1) as sum, 
                         aec.description as category, 
                         aec.considerminusarea as considerminusarea
                     from account_t a,
@@ -48,13 +48,13 @@ def perform(dbh, params):
                     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
+                        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,
-                        'Waschmaschine' as category,
+                        '16. Waschmaschine' as category,
                         false as considerminusarea
                     from premise_t
                     where id = %(premise)s
@@ -181,7 +181,7 @@ def perform(dbh, params):
 
         for house in houses.values():
             logger.debug(f"Processing item: {house}")
-            outputFile = f"{overviewPrefix}-{house['details']['id']}.{overviewSuffix}"
+            outputFile = f"./output/{overviewPrefix}-{house['details']['id']}.{overviewSuffix}"
             tmpl = Template(file=overviewTemplate, searchList=[ house ])
             logger.debug(tmpl)
             with open(outputFile, 'w') as f:
@@ -301,7 +301,7 @@ def perform(dbh, params):
 
         for letter in letters:
             logger.debug(f"Processing item: {letter}")
-            outputFile = f"{letterPrefix}-{letter['tenant']['tenant_id']}.{letterSuffix}"
+            outputFile = f"./output/{letterPrefix}-{letter['tenant']['tenant_id']}.{letterSuffix}"
             tmpl = Template(file=letterTemplate, searchList=[ letter ])
             logger.debug(tmpl)
             with open(outputFile, 'w') as f:

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

@@ -9,29 +9,51 @@
 
 \begin{document}
 
-\subsection*{Kontoauszug $year}
+\subsection*{Account Statement $year}
 
-\begin{longtable}{rrp{5cm}rrrp{3cm}l}
+\begin{longtable}{|r|r|p{6cm}|r|r|r|p{3cm}|r|p{5cm}|}
-  \bf{id} & \bf{createdAt} & \bf{description} & \bf{amount} & \bf{documentNo} & \bf{fiscalYear} & \bf{category} & \bf{account} \\ \hline
+  \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
-  \bf{id} & \bf{createdAt} & \bf{description} & \bf{amount} & \bf{documentNo} & \bf{fiscalYear} & \bf{category} & \bf{account} \\ \hline
+  \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
-  \hline \multicolumn{8}{r}{\em{to be continued}}
+  \multicolumn{9}{r}{\em{to be continued}}
   \endfoot
-  \hline
+  
   \endlastfoot
 
   #for $entry in $entries
 \tt{$entry['id']} & \tt{$entry['created_at']} & \tt{$entry['description']} & #slurp
-#if not $entry['income']
+#if $entry['amount'] <= 0
 \textcolor{red}{#slurp
 #end if
-\tt{$entry['amount']}#slurp
+\tt{$entry['amount']} \,\euro{}#slurp
-#if not $entry['income']
+#if $entry['amount'] <= 0
 }#slurp
 #end if
-& \tt{$entry['document_no']} & \tt{$entry['fiscal_year']} & \tt{$entry['category']} & \tt{{ $entry['account'].replace('_', '\\textunderscore ') }} \\
+& \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

@@ -1,4 +1,5 @@
 \documentclass[12pt]{article}
+\renewcommand{\familydefault}{\sfdefault}
 \usepackage{german}
 \usepackage{eurosym}
 \usepackage[a4paper, left=2cm, right=2cm, top=2cm]{geometry}
@@ -7,8 +8,10 @@
 
 \begin{document}
 
-\subsection*{Betriebskostenabrechnung}
+\subsection*{Aufstellung}
+über die Ermittlung der Betriebskosten gemäß §27 II. BV
 
+\vspace{15mm}
 
 \begin{tabular}{ll}
 Objekt & $details['description'] \\
@@ -18,23 +21,25 @@ Eigent"umer & Nober Grundbesitz GmbH \\
 
 \addvspace{1cm}
 
-    \begin{tabular}{|p{5cm}|r|r|r|}
+    \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 \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 \multicolumn{4}{c}{ } \\
+        \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 \multicolumn{4}{c}{ } \\
+        \hline 
+%        \hline \multicolumn{4}{c}{ } \\
         \hline Anteil pro Monat und m\textsuperscript{2} & \tt{#echo '%.10f' % $part_by_montharea #\,\euro{}} & & \\
         \hline 
     \end{tabular}

schema/account-statement.sql

@@ -6,12 +6,18 @@ create or replace view account_statement_v as
         ae.document_no as document_no,
         ae.fiscal_year as fiscal_year,
         aec.description as category,
-        aec.income as income,
+        ac.description as account,
-        ac.description as account
+        ae.is_reference as is_reference,
-    from account_entry_t ae,
+        bac.description as base_account
+    from joined_account_entry_v ae,
         account_entry_category_t aec,
-        account_t ac
+        account_t ac,
+        account_t bac
     where ae.account_entry_category = aec.id and
             ae.account = ac.id and
-            aec.id not in (3, 4)
+            ae.base_account = bac.id and
+            ac.id = 1000
     order by created_at;
+
+grant select on account_statement_v to hv2;
+

schema/changes02.sql

@@ -5,7 +5,7 @@ CREATE TABLE account_entry_reference_t (
 );
 
 
-CREATE OR REPLACE VIEW joined_account_entry_t AS
+CREATE OR REPLACE VIEW joined_account_entry_v AS
   SELECT ae.id as id, 
          ae.description as description, 
          ae.account as account, 
@@ -118,3 +118,9 @@ CREATE TRIGGER maintain_ledger_trigger
   FOR EACH ROW
   WHEN (NEW.account != 1000 AND NEW.account_entry_category NOT IN (3, 4))
   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;
+

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

@@ -10,9 +10,9 @@
     <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,7 +22,7 @@
 </mat-form-field>
 <mat-form-field appearance="outline">
     <mat-label>Beschreibung</mat-label>
-    <input matInput name="description" ngModel/>
+    <input matInput name="description" [formControl]="presetDescription" ngModel/>
 </mat-form-field>
 <button #addAccountEntryButton type="submit" mat-raised-button color="primary">Buchung speichern</button>
 </form>
@@ -31,13 +31,13 @@
 Saldo: {{saldo?.saldo | number:'1.2-2'}} €
 </div>
 <div id="secondBlock">
-<table mat-table [dataSource]="accountEntriesDataSource" #zftable>
+<table mat-table [dataSource]="accountEntriesDataSource" matSort #zftable>
 <ng-container matColumnDef="createdAt">
-    <th mat-header-cell *matHeaderCellDef>Datum</th>
+    <th mat-header-cell *matHeaderCellDef mat-sort-header>Datum</th>
     <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.created_at | date}}</td>
 </ng-container>
 <ng-container matColumnDef="fiscalYear">
-    <th mat-header-cell *matHeaderCellDef>Jahr</th>
+    <th mat-header-cell *matHeaderCellDef mat-sort-header>Jahr</th>
     <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.fiscal_year}}</td>
 </ng-container>
 <ng-container matColumnDef="description">
@@ -45,7 +45,7 @@ Saldo: {{saldo?.saldo | number:'1.2-2'}} €
     <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 mat-sort-header>Belegnummer</th>
     <td mat-cell *matCellDef="let element">{{element.rawAccountEntry.document_no}}</td>
 </ng-container>
 <ng-container matColumnDef="amount">
@@ -53,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 mat-sort-header>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 mat-sort-header>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

@@ -3,6 +3,7 @@ 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 { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { AccountEntryCategoryService, AccountEntryService, AccountService } from '../data-object-service';
 import { Account, AccountEntry, AccountEntryCategory, NULL_AccountEntry } from '../data-objects';
@@ -31,6 +32,8 @@ export class AccountComponent implements OnInit {
   @Input() shallBeRentPayment: boolean
   @ViewChild('addAccountEntryButton') addAccountEntryButton: MatButton
 
+  @ViewChild(MatSort) sort: MatSort;
+
   account: Account
   accountEntries: DN_AccountEntry[]
   accountEntriesDataSource: MatTableDataSource<DN_AccountEntry>
@@ -42,6 +45,8 @@ export class AccountComponent implements OnInit {
   accountEntryCategoriesInverseMap: Map<string, AccountEntryCategory>
 
   presetFiscalYear: FormControl
+  presetCategory: FormControl
+  presetDescription: FormControl
 
   constructor(
     private accountService: AccountService,
@@ -96,23 +101,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,
         fiscal_year: this.presetFiscalYear.value,
         amount: formData.value.amount,
         id: 0,
         document_no: uniquenumber.number,
-        account_entry_category: 0
+        account_entry_category: this.presetCategory.value
-      }
-
-      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}`)
       }
 
       this.messageService.add(`addAccountEntry: ${ JSON.stringify(newAccountEntry, undefined, 4) }`)
@@ -146,12 +142,25 @@ 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()
     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}`)
+    }
+
     this.messageService.add(`AccountComponent.init, account: ${this.selectedAccountId}`)
     this.getAccount()
-    await this.getAccountEntryCategories()
 
   }
 
@@ -163,5 +172,8 @@ export class AccountComponent implements OnInit {
     this.init()
   }
 
+  ngAfterViewInit(): void {
+    this.accountEntriesDataSource.sort = this.sort;
+  }
 
 }

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

@@ -1,5 +1,5 @@
-// export const serviceBaseUrl = "https://api.hv.nober.de";
+export const serviceBaseUrl = "https://api.hv.nober.de";
-export const serviceBaseUrl = "http://172.16.3.96:8080";
+// 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"