change order

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

@@ -1,24 +1,24 @@
 <div id="firstBlock">
-<form (ngSubmit)="addAccountEntry()">
+<form (ngSubmit)="addAccountEntry(accountEntryForm)" #accountEntryForm="ngForm">
 <mat-form-field appearance="outline" id="addEntryfield">
     <mat-label>Datum</mat-label>
-    <input matInput name="createdAt" [(ngModel)]="newAccountEntry.created_at" [matDatepicker]="createdAtPicker"/>
+    <input matInput ngModel name="createdAt" [matDatepicker]="createdAtPicker"/>
     <mat-datepicker-toggle matSuffix [for]="createdAtPicker"></mat-datepicker-toggle>
     <mat-datepicker #createdAtPicker></mat-datepicker>
 </mat-form-field>
-<mat-form-field appearance="outline">
+<mat-form-field appearance="outline" *ngIf="!shallBeRentPayment">
     <mat-label>Kategorie</mat-label>
-    <mat-select [(ngModel)]="newAccountEntry.account_entry_category" name="category" [disabled]="shallBeRentPayment">
+    <mat-select ngModel name="category" [disabled]="shallBeRentPayment">
         <mat-option *ngFor="let p of accountEntryCategories" [value]="p.id">{{p.description}}</mat-option>
     </mat-select>
 </mat-form-field>
 <mat-form-field appearance="outline">
     <mat-label>Betrag (€)</mat-label>
-    <input matInput type="number" name="amount" [(ngModel)]="newAccountEntry.amount"/>
+    <input matInput type="number" name="amount" ngModel/>
 </mat-form-field>
 <mat-form-field appearance="outline">
     <mat-label>Beschreibung</mat-label>
-    <input matInput name="description" [(ngModel)]="newAccountEntry.description"/>
+    <input matInput name="description" ngModel/>
 </mat-form-field>
 <button #addAccountEntryButton type="submit" mat-raised-button color="primary">Buchung speichern</button>
 </form>

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

@@ -5,6 +5,7 @@ import { MatExpansionPanel } from '@angular/material/expansion';
 import { MatTableDataSource } from '@angular/material/table';
 import { AccountEntryCategoryService, AccountEntryService, AccountService } from '../data-object-service';
 import { Account, AccountEntry, AccountEntryCategory, NULL_AccountEntry } from '../data-objects';
+import { ErrorDialogService } from '../error-dialog.service';
 import { ExtApiService } from '../ext-data-object-service';
 import { Saldo } from '../ext-data-objects';
 import { MessageService } from '../message.service';
@@ -39,7 +40,6 @@ export class AccountComponent implements OnInit {
   accountEntryCategoriesMap: Map<number, AccountEntryCategory>
   accountEntryCategoriesInverseMap: Map<string, AccountEntryCategory>
 
-  newAccountEntry: AccountEntry = NULL_AccountEntry
 
 
   constructor(
@@ -47,7 +47,8 @@ export class AccountComponent implements OnInit {
     private accountEntryService: AccountEntryService,
     private extApiService: ExtApiService,
     private accountEntryCategoryService: AccountEntryCategoryService,
-    private messageService: MessageService
+    private messageService: MessageService,
+    private errorDialogService: ErrorDialogService
   ) { }
 
 
@@ -87,20 +88,39 @@ export class AccountComponent implements OnInit {
     }
   }
 
-  async addAccountEntry(): Promise<void> {
+  async addAccountEntry(formData: any): Promise<void> {
-      try {
+    try {
-        this.addAccountEntryButton.disabled = true
+      this.addAccountEntryButton.disabled = true
-        this.newAccountEntry.account = this.account.id
+      this.messageService.add(`${JSON.stringify(formData.value, undefined, 4)}`)
-        this.messageService.add(`addAccountEntry: ${ JSON.stringify(this.newAccountEntry, undefined, 4) }`)
+      let newAccountEntry: AccountEntry = {
-        this.newAccountEntry = await this.accountEntryService.postAccountEntry(this.newAccountEntry)
+        description: formData.value.description,
-        this.messageService.add(`New accountEntry created: ${this.newAccountEntry.id}`)
+        account: this.account.id,
-        this.newAccountEntry = { 'account': this.account.id, 'amount': undefined, 'created_at': '', 'description': '', 'id': 0, 'account_entry_category': 0 }
+        created_at: formData.value.createdAt,
-        this.getAccountEntries()
+        amount: formData.value.amount,
-      } catch (err) {
+        id: 0,
-        this.messageService.add(`Error in addAccountEntry: ${JSON.stringify(err, undefined, 4)}`)
+        account_entry_category: 0
-        } finally {
-        this.addAccountEntryButton.disabled = false
       }
+
+      if (this.shallBeRentPayment) {
+        newAccountEntry.account_entry_category = this.accountEntryCategoriesInverseMap.get('Mietzahlung').id
+        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) }`)
+      newAccountEntry = await this.accountEntryService.postAccountEntry(newAccountEntry)
+      this.messageService.add(`New accountEntry created: ${newAccountEntry.id}`)
+
+      formData.reset()
+      this.getAccountEntries()
+    } catch (err) {
+      this.messageService.add(`Error in addAccountEntry: ${JSON.stringify(err, undefined, 4)}`)
+      this.errorDialogService.openDialog('AccountComponent', 'addAccountEntry', JSON.stringify(err, undefined, 4))
+    } finally {
+      this.addAccountEntryButton.disabled = false
+    }
   }
 
   async getAccountEntryCategories(): Promise<void> {
@@ -123,10 +143,6 @@ export class AccountComponent implements OnInit {
     this.messageService.add(`AccountComponent.init, account: ${this.selectedAccountId}`)
     this.getAccount()
     await this.getAccountEntryCategories()
-    if (this.shallBeRentPayment) {
-      this.messageService.add('shall be rentpayment')
-      this.newAccountEntry.account_entry_category = this.accountEntryCategoriesInverseMap.get('Mietzahlung').id
-    }
   }
 
   ngOnInit(): void {
@@ -137,4 +153,5 @@ export class AccountComponent implements OnInit {
     this.init()
   }
 
+
 }

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

@@ -48,7 +48,8 @@ import { NoteComponent } from './note/note.component'
 import { MatMomentDateModule, MAT_MOMENT_DATE_ADAPTER_OPTIONS } from '@angular/material-moment-adapter';
 import { EnterPaymentComponent } from './enter-payment/enter-payment.component';
 import { HomeComponent } from './home/home.component';
-import { LedgerComponent } from './ledger/ledger.component'
+import { LedgerComponent } from './ledger/ledger.component';
+import { ErrorDialogComponent } from './error-dialog/error-dialog.component'
 
 registerLocaleData(localeDe)
 
@@ -78,7 +79,8 @@ registerLocaleData(localeDe)
     NoteComponent,
     EnterPaymentComponent,
     HomeComponent,
-    LedgerComponent
+    LedgerComponent,
+    ErrorDialogComponent
   ],
   imports: [
     BrowserModule,

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.10.38:5000";
-export const serviceBaseUrl = "http://localhost:8080"
+// export const serviceBaseUrl = "http://localhost:8080"
 export const authserviceBaseUrl = "https://authservice.hottis.de"
 export const applicationId = "hv2"

ui/hv2-ui/src/app/error-dialog-data.ts

@@ -0,0 +1,6 @@
+
+export interface ErrorDialogData {
+    module: string,
+    func: string,
+    msg: string
+}

ui/hv2-ui/src/app/error-dialog.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ErrorDialogService } from './error-dialog.service';
+
+describe('ErrorDialogService', () => {
+  let service: ErrorDialogService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ErrorDialogService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/error-dialog.service.ts

@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { ErrorDialogComponent } from './error-dialog/error-dialog.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ErrorDialogService {
+
+  constructor(public dialog: MatDialog) { }
+
+  openDialog(module: string, func: string, msg: string): void {
+    const dialogRef = this.dialog.open(ErrorDialogComponent, {
+      width: '450px',
+      data: { module: module, func: func, msg: msg }
+    })
+  }
+}

ui/hv2-ui/src/app/error-dialog/error-dialog.component.html

@@ -0,0 +1,11 @@
+<h1>Fehler</h1>
+
+<h2>Module</h2>
+<p>{{data.module}}</p>
+
+<h2>Function</h2>
+<p>{{data.func}}</p>
+    
+<h2>Message</h2>
+<p>{{data.msg}}</p>
+    

ui/hv2-ui/src/app/error-dialog/error-dialog.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ErrorDialogComponent } from './error-dialog.component';
+
+describe('ErrorDialogComponent', () => {
+  let component: ErrorDialogComponent;
+  let fixture: ComponentFixture<ErrorDialogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ErrorDialogComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ErrorDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/error-dialog/error-dialog.component.ts

@@ -0,0 +1,24 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { ErrorDialogData } from '../error-dialog-data';
+
+@Component({
+  selector: 'app-error-dialog',
+  templateUrl: './error-dialog.component.html',
+  styleUrls: ['./error-dialog.component.css']
+})
+export class ErrorDialogComponent implements OnInit {
+
+  constructor(
+    public dialogRef: MatDialogRef<ErrorDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: ErrorDialogData
+  ) { }
+
+  onNoClick(): void {
+    this.dialogRef.close()
+  }
+
+  ngOnInit(): void {
+  }
+
+}

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

@@ -6,17 +6,6 @@
     </mat-card-header>
     <mat-card-content>
         <mat-accordion>
-            <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 [selectedAccountId]="incomeAccountId" [shallBeRentPayment]="false"></app-account>
-            </mat-expansion-panel>
             <mat-expansion-panel (opened)="collapseExpenseDetails = true"
                                  (closed)="collapseExpenseDetails = false">
                 <mat-expansion-panel-header>
@@ -26,7 +15,18 @@
                     <mat-panel-description>
                     </mat-panel-description>
                 </mat-expansion-panel-header>
-                <app-account [selectedAccountId]="expenseAccountId" [shallBeRentPayment]="false"></app-account>
+                <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>
     </mat-card-content>

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

@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { AccountComponent } from '../account/account.component';
 import { Account } from '../data-objects';
 import { ExtApiService } from '../ext-data-object-service';
 import { MessageService } from '../message.service';
@@ -18,6 +19,9 @@ export class LedgerComponent implements OnInit {
   collapseIncomeDetails: boolean = false
   collapseExpenseDetails: boolean = false
 
+  @ViewChild('incomeAccountComponent') incomeAccountComponent: AccountComponent
+  @ViewChild('expenseAccountComponent') expenseAccountComponent: AccountComponent
+  
 
   constructor(
     private extApiService: ExtApiService,