CL Filter

Author: ToWipf

angular-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jasmarty-app",
-  "version": "2.4.80",
+  "version": "2.4.81",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 3000 --proxy-config proxy.config.ts",

angular-app/src/app/components/_wipf/checkliste/checkliste.component.html

@@ -35,6 +35,16 @@ <h3>CheckListe</h3>
 
       @if (view =='checkliste') {
       <div class="iconbox">
+        Zeige nur offenes:
+        <button class="btn btn-wipf-default btn-for-icon" (click)="filterDone()">
+          @if (bFilterDone){
+            <mat-icon svgIcon="ok" aria-hidden="false" title="Zeige Offenes"></mat-icon>
+          }
+          @else {
+            <mat-icon svgIcon="round" aria-hidden="false" title="Zeige Offenes"></mat-icon>
+          }
+        </button>
+        <br>
         Liste zurücksezten:
         <button class="btn btn-wipf-default btn-for-icon" (click)="resetListe()">
           <mat-icon svgIcon="trash" aria-hidden="false" title="Reset Liste"></mat-icon>

angular-app/src/app/components/_wipf/checkliste/checkliste.component.ts

@@ -8,10 +8,10 @@ import { ServiceRest } from 'src/app/service/serviceRest';
 import { ServiceWipf } from 'src/app/service/serviceWipf';
 
 @Component({
-    selector: 'app-checkliste',
-    templateUrl: './checkliste.component.html',
-    styleUrls: ['./checkliste.component.less'],
-    standalone: false
+  selector: 'app-checkliste',
+  templateUrl: './checkliste.component.html',
+  styleUrls: ['./checkliste.component.less'],
+  standalone: false
 })
 export class ChecklisteComponent implements OnInit {
 
@@ -34,6 +34,8 @@ export class ChecklisteComponent implements OnInit {
   public lastNewPrio: number = 0;
   public offeneItems: number = 0;
   public sFilter: string = "";
+  public bFilterDone: boolean = false;
+  public verkListBackupForFilter;
   private selectedClID: number;
 
   @ViewChild(MatSort, { static: true }) sort: MatSort;
@@ -365,6 +367,8 @@ export class ChecklisteComponent implements OnInit {
   }
 
   public checkItemVerkn(iverk: CheckListeVerkn): void {
+    this.bFilterDone = false;
+    this.verkListBackupForFilter = [];
     iverk.checked = !iverk.checked;
     this.rest.postNoWartenDialog('checkliste/verkn/save', iverk).then((res: any) => {
       this.ladeChecklistenView(this.viewCL);
@@ -379,12 +383,31 @@ export class ChecklisteComponent implements OnInit {
     });
   }
 
+  public filterDone(): void {
+    this.bFilterDone = !this.bFilterDone;
+
+    if (this.bFilterDone) {
+      this.verkListBackupForFilter = [...this.dataSourceCheckListeVerkn.data];
+      // this.dataSourceCheckListeVerkn.data = this.dataSourceCheckListeVerkn.data.filter((clv: CheckListeVerkn) => {
+      // !clv.checked;
+      // });
+      this.dataSourceCheckListeVerkn.data =
+        this.dataSourceCheckListeVerkn.data.filter(
+          clv => !clv.checked
+        );
+    }
+    else {
+      this.dataSourceCheckListeVerkn.data = [...this.verkListBackupForFilter];
+    }
+
+    this.applyFilter();
+  }
 }
 
 @Component({
-    selector: 'app-checklisteliste-dialog',
-    templateUrl: './checkliste.dialog.checkliste.html',
-    standalone: false
+  selector: 'app-checklisteliste-dialog',
+  templateUrl: './checkliste.dialog.checkliste.html',
+  standalone: false
 })
 export class CheckListeDialogCheckListe implements OnInit {
   constructor(public dialog: MatDialog, private rest: ServiceRest, public dialogRef: MatDialogRef<CheckListeDialogCheckListe>, @Inject(MAT_DIALOG_DATA) public data: CheckListeListe) {
@@ -424,9 +447,9 @@ export class CheckListeDialogCheckListe implements OnInit {
 }
 
 @Component({
-    selector: 'app-checklistetypes-dialog',
-    templateUrl: './checkliste.dialog.type.html',
-    standalone: false
+  selector: 'app-checklistetypes-dialog',
+  templateUrl: './checkliste.dialog.type.html',
+  standalone: false
 })
 export class CheckListeDialogType {
   constructor(public dialog: MatDialog, public dialogRef: MatDialogRef<CheckListeDialogType>, @Inject(MAT_DIALOG_DATA) public data: CheckListeType) {
@@ -444,9 +467,9 @@ export class CheckListeDialogType {
 }
 
 @Component({
-    selector: 'app-checklisteitem-dialog',
-    templateUrl: './checkliste.dialog.item.html',
-    standalone: false
+  selector: 'app-checklisteitem-dialog',
+  templateUrl: './checkliste.dialog.item.html',
+  standalone: false
 })
 export class CheckListeDialogItem {
   constructor(public dialog: MatDialog, private rest: ServiceRest, public dialogRef: MatDialogRef<CheckListeDialogItem>, @Inject(MAT_DIALOG_DATA) public data: CheckListeItem) {

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.wipf</groupId>
 	<artifactId>jasmarty</artifactId>
-	<version>2.4.80</version>
+	<version>2.4.81</version>
 	<properties>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>

scripts/startJar.sh

@@ -1 +1 @@
-java --add-opens java.base/java.lang=ALL-UNNAMED -Dlog4j2.formatMsgNoLookups=True -jar ../target/jasmarty-2.4.80-runner.jar
+java --add-opens java.base/java.lang=ALL-UNNAMED -Dlog4j2.formatMsgNoLookups=True -jar ../target/jasmarty-2.4.81-runner.jar

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

@@ -41,7 +41,7 @@ public class MainHome {
 	AuthKeyService authKeyService;
 
 	private static final Logger LOGGER = Logger.getLogger("_MainHome_");
-	public static final String VERSION = "2.4.80";
+	public static final String VERSION = "2.4.81";
 	public static final String AUTH_KEY_NAME = "authKey";
 
 	/**