Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
9a1e3231d6
|
|||
0075416fc3
|
|||
47e96c10b1
|
@ -116,7 +116,7 @@ $$;
|
|||||||
CREATE TRIGGER maintain_ledger_trigger
|
CREATE TRIGGER maintain_ledger_trigger
|
||||||
AFTER INSERT ON account_entry_t
|
AFTER INSERT ON account_entry_t
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
WHEN (NEW.account != 1000 AND NEW.account_entry_category NOT IN (3, 4))
|
WHEN (NEW.account != 1000 AND NEW.account_entry_category NOT IN (3, 4, 29))
|
||||||
EXECUTE FUNCTION maintain_ledger();
|
EXECUTE FUNCTION maintain_ledger();
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
Saldo: {{saldo?.saldo | number:'1.2-2'}} €
|
Saldo: {{saldo?.saldo | number:'1.2-2'}} €
|
||||||
</div>
|
</div>
|
||||||
<div id="secondBlock">
|
<div id="secondBlock">
|
||||||
<table mat-table [dataSource]="accountEntriesDataSource" matSort #zftable>
|
<table mat-table [dataSource]="accountEntriesDataSource" #zftable>
|
||||||
<ng-container matColumnDef="createdAt">
|
<ng-container matColumnDef="createdAt">
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Datum</th>
|
<th mat-header-cell *matHeaderCellDef >Datum</th>
|
||||||
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.created_at | date}}</td>
|
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.created_at | date}}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container matColumnDef="fiscalYear">
|
<ng-container matColumnDef="fiscalYear">
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Jahr</th>
|
<th mat-header-cell *matHeaderCellDef >Jahr</th>
|
||||||
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.fiscal_year}}</td>
|
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.fiscal_year}}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container matColumnDef="description">
|
<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>
|
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.description}}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container matColumnDef="document_no">
|
<ng-container matColumnDef="document_no">
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Belegnummer</th>
|
<th mat-header-cell *matHeaderCellDef >Belegnummer</th>
|
||||||
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.document_no}}</td>
|
<td mat-cell *matCellDef="let element">{{element.rawAccountEntry.document_no}}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container matColumnDef="amount">
|
<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>
|
<td mat-cell *matCellDef="let element" class="rightaligned">{{element.rawAccountEntry.amount | number:'1.2-2'}} €</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container matColumnDef="category">
|
<ng-container matColumnDef="category">
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Kategorie</th>
|
<th mat-header-cell *matHeaderCellDef >Kategorie</th>
|
||||||
<td mat-cell *matCellDef="let element">{{element.accountEntryCategory}}</td>
|
<td mat-cell *matCellDef="let element">{{element.accountEntryCategory}}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container matColumnDef="overhead_relevant">
|
<ng-container matColumnDef="overhead_relevant">
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>BK relevant</th>
|
<th mat-header-cell *matHeaderCellDef >BK relevant</th>
|
||||||
<td mat-cell *matCellDef="let element">{{element.overheadRelevant}}</td>
|
<td mat-cell *matCellDef="let element">{{element.overheadRelevant}}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<tr mat-header-row *matHeaderRowDef="accountEntriesDisplayedColumns"></tr>
|
<tr mat-header-row *matHeaderRowDef="accountEntriesDisplayedColumns"></tr>
|
||||||
|
@ -3,7 +3,6 @@ import { Component, Input, OnInit, OnChanges, ViewChild } from '@angular/core';
|
|||||||
import { FormControl } from '@angular/forms';
|
import { FormControl } from '@angular/forms';
|
||||||
import { MatButton } from '@angular/material/button';
|
import { MatButton } from '@angular/material/button';
|
||||||
import { MatExpansionPanel } from '@angular/material/expansion';
|
import { MatExpansionPanel } from '@angular/material/expansion';
|
||||||
import { MatSort } from '@angular/material/sort';
|
|
||||||
import { MatTableDataSource } from '@angular/material/table';
|
import { MatTableDataSource } from '@angular/material/table';
|
||||||
import { AccountEntryCategoryService, AccountEntryService, AccountService } from '../data-object-service';
|
import { AccountEntryCategoryService, AccountEntryService, AccountService } from '../data-object-service';
|
||||||
import { Account, AccountEntry, AccountEntryCategory, NULL_AccountEntry } from '../data-objects';
|
import { Account, AccountEntry, AccountEntryCategory, NULL_AccountEntry } from '../data-objects';
|
||||||
@ -32,7 +31,6 @@ export class AccountComponent implements OnInit {
|
|||||||
@Input() shallBeRentPayment: boolean
|
@Input() shallBeRentPayment: boolean
|
||||||
@ViewChild('addAccountEntryButton') addAccountEntryButton: MatButton
|
@ViewChild('addAccountEntryButton') addAccountEntryButton: MatButton
|
||||||
|
|
||||||
@ViewChild(MatSort) sort: MatSort;
|
|
||||||
|
|
||||||
account: Account
|
account: Account
|
||||||
accountEntries: DN_AccountEntry[]
|
accountEntries: DN_AccountEntry[]
|
||||||
@ -172,8 +170,4 @@ export class AccountComponent implements OnInit {
|
|||||||
this.init()
|
this.init()
|
||||||
}
|
}
|
||||||
|
|
||||||
ngAfterViewInit(): void {
|
|
||||||
this.accountEntriesDataSource.sort = this.sort;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -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 serviceBaseUrl = "http://localhost:8080"
|
||||||
export const authserviceBaseUrl = "https://authservice.hottis.de"
|
export const authserviceBaseUrl = "https://authservice.hottis.de"
|
||||||
export const applicationId = "hv2"
|
export const applicationId = "hv2"
|
||||||
|
Reference in New Issue
Block a user