hv2/hv2-all-in-one
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

due_at fix

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2022-01-06 21:06:16 +01:00
parent 422a8d37ab
commit 2fc7922707
10 changed files with 191 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ui/hv2-ui/src/app/account/account.component.html
View File

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

3
ui/hv2-ui/src/app/account/account.component.ts
View File

@ -33,7 +33,7 @@ export class AccountComponent implements OnInit {
account: Account
accountEntries: DN_AccountEntry[]
accountEntriesDataSource: MatTableDataSource<DN_AccountEntry>
accountEntriesDisplayedColumns: string[] = [ "description", "document_no", "amount", "createdAt", "category", "overhead_relevant" ]
accountEntriesDisplayedColumns: string[] = [ "description", "document_no", "amount", "createdAt", "dueAt", "category", "overhead_relevant" ]
saldo: Saldo
accountEntryCategories: AccountEntryCategory[]
@ -98,6 +98,7 @@ export class AccountComponent implements OnInit {
description: formData.value.description,
account: this.account.id,
created_at: formData.value.createdAt,
due_at: formData.value.dueAt,
amount: formData.value.amount,
id: 0,
document_no: uniquenumber.number,

2
ui/hv2-ui/src/app/data-objects.ts
View File

@ -191,6 +191,7 @@ export interface AccountEntry {
description: string
account: number
created_at: string
due_at: string
amount: number
document_no: number
account_entry_category: number
@ -200,6 +201,7 @@ export const NULL_AccountEntry: AccountEntry = {
,description: ''
,account: undefined
,created_at: ''
,due_at: ''
,amount: undefined
,document_no: undefined
,account_entry_category: undefined