Skip to content

Commit 5c5bf3f

Browse files
committed
dl
1 parent 73df7e5 commit 5c5bf3f

5 files changed

Lines changed: 29 additions & 23 deletions

File tree

angular-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jasmarty-app",
3-
"version": "2.4.81",
3+
"version": "2.4.82",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve --host 0.0.0.0 --port 3000 --proxy-config proxy.config.ts",

angular-app/src/app/components/_wipf/daylog/daylog.dialogDay.html

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,30 @@ <h1 mat-dialog-title>Id: {{data.id}}</h1>
55
<input matInput type="date" [(ngModel)]="data.date">
66
</mat-form-field>
77
<br>
8-
<mat-form-field>
9-
<mat-label>Tagestext</mat-label>
10-
<input matInput [(ngModel)]="data.tagestext">
11-
</mat-form-field>
12-
13-
@if (data?.tagestext?.length === 0 || data?.tagestext === "TODO") {
14-
<div style="margin-bottom: 4px;">
15-
<!-- TODO: ausbauen, laden von DB -->
16-
<button class="btn btn-wipf-mini" (click)="setText('A HO')">HO</button>
17-
<button class="btn btn-wipf-mini" (click)="setText('A NM')">NM</button>
18-
<button class="btn btn-wipf-mini" (click)="setText('Urlaub')">U</button>
19-
<button class="btn btn-wipf-mini" (click)="setText('Feiertag')">F</button>
20-
<button class="btn btn-wipf-mini" (click)="setText('Krank')">K</button>
21-
</div>
8+
<mat-form-field>
9+
<mat-label>Tagestext</mat-label>
10+
<input matInput [(ngModel)]="data.tagestext">
11+
@if(data?.tagestext?.length > 0){
12+
<button class="btn btn-for-icon" (click)="setText('')">
13+
<mat-icon svgIcon="trash" aria-hidden="false" title="trash"></mat-icon>
14+
</button>
2215
}
16+
</mat-form-field>
17+
18+
@if (data?.tagestext?.length === 0 || data?.tagestext === "TODO") {
19+
<div style="margin-bottom: 4px;">
20+
<!-- TODO: ausbauen, laden von DB -->
21+
<button class="btn btn-wipf-mini" (click)="setText('A HO')">HO</button>
22+
<button class="btn btn-wipf-mini" (click)="setText('A NM')">NM</button>
23+
<button class="btn btn-wipf-mini" (click)="setText('Urlaub')">U</button>
24+
<button class="btn btn-wipf-mini" (click)="setText('Feiertag')">F</button>
25+
<button class="btn btn-wipf-mini" (click)="setText('Krank')">K</button>
26+
</div>
27+
}
28+
29+
</mat-dialog-content>
2330

24-
</mat-dialog-content>
25-
<mat-dialog-actions align="end">
26-
<button class="btn btn-wipf-dialog" (click)="onNoClick()">Abbrechen</button>
27-
<button class="btn btn-wipf-dialog" [mat-dialog-close]="data">Speichern</button>
28-
</mat-dialog-actions>
31+
<mat-dialog-actions align="end">
32+
<button class="btn btn-wipf-dialog" (click)="onNoClick()">Abbrechen</button>
33+
<button class="btn btn-wipf-dialog" [mat-dialog-close]="data">Speichern</button>
34+
</mat-dialog-actions>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>de.wipf</groupId>
88
<artifactId>jasmarty</artifactId>
9-
<version>2.4.81</version>
9+
<version>2.4.82</version>
1010
<properties>
1111
<maven.compiler.source>21</maven.compiler.source>
1212
<maven.compiler.target>21</maven.compiler.target>

scripts/startJar.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java --add-opens java.base/java.lang=ALL-UNNAMED -Dlog4j2.formatMsgNoLookups=True -jar ../target/jasmarty-2.4.81-runner.jar
1+
java --add-opens java.base/java.lang=ALL-UNNAMED -Dlog4j2.formatMsgNoLookups=True -jar ../target/jasmarty-2.4.82-runner.jar

src/main/java/org/wipf/jasmarty/logic/base/MainHome.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class MainHome {
4141
AuthKeyService authKeyService;
4242

4343
private static final Logger LOGGER = Logger.getLogger("_MainHome_");
44-
public static final String VERSION = "2.4.81";
44+
public static final String VERSION = "2.4.82";
4545
public static final String AUTH_KEY_NAME = "authKey";
4646

4747
/**

0 commit comments

Comments
 (0)