Prechádzať zdrojové kódy

Vereinheitlichung der Rechner

Leonard Schulz 2 rokov pred
rodič
commit
e1265e23d2

+ 3 - 0
frontend_angular/wbs-rechner-angular/angular.json

@@ -96,5 +96,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

+ 7 - 3
frontend_angular/wbs-rechner-angular/src/app/app.component.html

@@ -17,6 +17,10 @@
     <div content>
         <ng-container *ngFor="let income of person.incomes; let i = index">
         <div class="label_box">
+          <div class="label-container">
+            <label for="einkommen_nummer">Einkommen Nr.</label>
+            <input type="number" [(ngModel)]="income.index" disabled id="einkommen_nummer">
+          </div>
           <div class="label-container">
             <label for="typ">Typ</label>
             <select [(ngModel)]="income.type" (change)="calculateTotalIncome(person.index)">
@@ -43,11 +47,11 @@
           
           <div class="label-container">
             <label for="loschen">Löschen</label>
-            <a class="delete-button button" title="{{ income.index }}. Einkommen der {{person.index}}. Person löschen" (click)="deleteIncome(person.index, income.index)">&times;</a>
+            <a class="delete-button button" title="{{ income.index }}. Einkommen der {{person.index}}. Person löschen" (click)="deleteIncome(person.index, income.index)">&times; Löschen</a>
           </div>
         </div>
         </ng-container>
-        <button (click)="addIncome(person.index)" class="calculateButton">Einkommen hinzufügen</button>
+        <button (click)="addIncome(person.index)" class="calculateButton">+ Einkommen hinzufügen</button>
   </div>
   </app-headerbox>
 </div>
@@ -83,7 +87,7 @@
     </ng-container>
 
 
-    <button (click)="calculateWBS()" class="calculateButton">WBS berechnen</button>
+    <button (click)="calculateWBS()" class="calculateButton">⚙ WBS berechnen</button>
 
     <div *ngIf="resultReady">
       <div class="label-container">

+ 1 - 1
frontend_angular/wbs-rechner-angular/src/app/wbs.service.ts

@@ -13,7 +13,7 @@ import { WBS } from './wbs.interface';
 
 
 export class WbsService {
- private baseUrl = 'http://localhost:3100';
+ private baseUrl = 'http://lschulz.one:3100';
 
 
     constructor(private http: HttpClient) {}

+ 3 - 3
frontend_react/wbs-rechner-react/src/App.tsx

@@ -102,11 +102,11 @@ class App extends React.Component<{}, AppState> {
                   </div>
                   <div className="label-container">
                     <label htmlFor={'delete_' + p.index + '_' + inindex}>Löschen</label>
-                    <button className="delete-button" id={'delete_' + p.index + '_' + inindex} onClick={() => this.deleteIncome(pindex, inindex)} title={(inindex + 1) + ' Einkommen der ' + p.index + ' Person löschen'} >&times;</button>
+                    <button className="delete-button" id={'delete_' + p.index + '_' + inindex} onClick={() => this.deleteIncome(pindex, inindex)} title={(inindex + 1) + ' Einkommen der ' + p.index + ' Person löschen'} >&times; Löschen</button>
                   </div>
                 </div>
               )}
-              <button onClick={() => this.addIncome(p.index)} className="calculateButton">Einkommen hinzufügen</button>
+              <button onClick={() => this.addIncome(p.index)} className="calculateButton">+ Einkommen hinzufügen</button>
             </div>
           </Headerbox>
         )
@@ -138,7 +138,7 @@ class App extends React.Component<{}, AppState> {
             </div>
           )}
 
-          <button onClick={this.calculateWBS.bind(this)} className="calculateButton">WBS berechnen</button>
+          <button onClick={this.calculateWBS.bind(this)} className="calculateButton">⚙ WBS berechnen</button>
 
           {this.state.wbsResult ?
             <div>