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

fiscal year

Browse Source
This commit is contained in:
Wolfgang Ludger Hottgenroth
2022-01-24 16:11:02 +01:00
parent ab365c65a1
commit b748ba7a77
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -34,14 +34,14 @@ export class AccountComponent implements OnInit {
account: Account account: Account
accountEntries: DN_AccountEntry[] accountEntries: DN_AccountEntry[]
accountEntriesDataSource: MatTableDataSource<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 saldo: Saldo
accountEntryCategories: AccountEntryCategory[] accountEntryCategories: AccountEntryCategory[]
accountEntryCategoriesMap: Map<number, AccountEntryCategory> accountEntryCategoriesMap: Map<number, AccountEntryCategory>
accountEntryCategoriesInverseMap: Map<string, AccountEntryCategory> accountEntryCategoriesInverseMap: Map<string, AccountEntryCategory>
presetDueAt: FormControl presetFiscalYear: FormControl
constructor( constructor(
private accountService: AccountService, private accountService: AccountService,
@ -99,7 +99,7 @@ export class AccountComponent implements OnInit {
description: formData.value.description, description: formData.value.description,
account: this.account.id, account: this.account.id,
created_at: formData.value.createdAt, created_at: formData.value.createdAt,
due_at: formData.value.dueAt, fiscal_year: formData.value.fiscalYear,
amount: formData.value.amount, amount: formData.value.amount,
id: 0, id: 0,
document_no: uniquenumber.number, document_no: uniquenumber.number,
@ -148,11 +148,7 @@ export class AccountComponent implements OnInit {
private async init(): Promise<void> { private async init(): Promise<void> {
let currentDate = new Date() let currentDate = new Date()
let y = currentDate.getFullYear().toString() let y = currentDate.getFullYear().toString()
let m = (currentDate.getMonth()+1).toString() this.presetFiscalYear = new FormControl(`${y}`)
if (m.length == 1) {
m = `0${m}`
}
this.presetDueAt = new FormControl(`${y}-${m}-01`)
this.messageService.add(`AccountComponent.init, account: ${this.selectedAccountId}`) this.messageService.add(`AccountComponent.init, account: ${this.selectedAccountId}`)
this.getAccount() this.getAccount()
await this.getAccountEntryCategories() await this.getAccountEntryCategories()