From 95fa10272056c959cc50ffc606c5e78b8be976b5 Mon Sep 17 00:00:00 2001
From: Fabio Formosa <fabio.formosa@gmail.com>
Date: Mon, 1 Nov 2021 16:17:29 +0100
Subject: [PATCH] #39 changed the appearance of the fields in the config param
 form

---
 .../scheduler-config.component.html           | 14 +++++++++---
 .../scheduler-config.component.ts             |  2 ++
 .../quartzmanager/dto/JobKeyDTO.java          | 22 +++++--------------
 .../quartzmanager/dto/TriggerKeyDTO.java      | 22 +++++--------------
 .../src/main/resources/application.yml        |  2 +-
 5 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.html b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.html
index fce2ade..cf39730 100644
--- a/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.html
+++ b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.html
@@ -14,13 +14,15 @@
 	<mat-card-content *ngIf="existsATriggerInProgress() || enabledTriggerForm">
 		<div fxLayout="column">
 			<form name="configForm" fxFlex="1 1 100%" #configForm="ngForm">
-				<mat-form-field >
+				<mat-form-field [appearance]="enabledTriggerForm ? 'fill': 'none'">
+          <mat-label>Freq [Num per day]</mat-label>
 					<input [readonly]="!enabledTriggerForm"
                  matInput placeholder="Freq [Num per day]" name="triggerPerDay" type="number"
                  [(ngModel)]="config.triggerPerDay"
           >
 				</mat-form-field>
-				<mat-form-field>
+				<mat-form-field [appearance]="enabledTriggerForm ? 'fill': 'none'">
+          <mat-label>Max Occurrences</mat-label>
 					<input [readonly]="!enabledTriggerForm"
             matInput placeholder="Max Occurrences" name="maxCount" type="number"
             [(ngModel)]="config.maxCount"
@@ -41,8 +43,14 @@
 
 				<br>
 
+        <button mat-raised-button
+                type="button"
+                *ngIf="enabledTriggerForm"
+                (click)="cancelConfigForm()">
+          Cancel
+        </button>
 				<button mat-raised-button
-					 	type="button"
+					 	type="button" color="primary"
                 *ngIf="enabledTriggerForm"
 						(click)="submitConfig()">
 						Submit
diff --git a/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts
index 6106e8c..7da523a 100644
--- a/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts
+++ b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts
@@ -49,6 +49,8 @@ export class SchedulerConfigComponent implements OnInit {
 
   existsATriggerInProgress = (): boolean => this.fetchedTriggers && this.triggerInProgress;
 
+  cancelConfigForm = () => this.enabledTriggerForm = false;
+
   submitConfig = () => {
     const schedulerServiceCall = this.existsATriggerInProgress() ? this.schedulerService.updateConfig : this.schedulerService.saveConfig;
 
diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobKeyDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobKeyDTO.java
index d1b302e..b8390b3 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobKeyDTO.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobKeyDTO.java
@@ -1,25 +1,15 @@
 package it.fabioformosa.quartzmanager.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
 @Builder
 public class JobKeyDTO {
   private String name;
   private String group;
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setGroup(String group) {
-    this.group = group;
-  }
-
-  public String getGroup() {
-    return group;
-  }
 }
diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerKeyDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerKeyDTO.java
index 2992b48..4ef0f11 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerKeyDTO.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerKeyDTO.java
@@ -1,25 +1,15 @@
 package it.fabioformosa.quartzmanager.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
 @Builder
 public class TriggerKeyDTO {
   private String name;
   private String group;
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setGroup(String group) {
-    this.group = group;
-  }
-
-  public String getGroup() {
-    return group;
-  }
 }
diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml
index eb534ff..0b9e144 100644
--- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml
+++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml
@@ -26,7 +26,7 @@ logging:
     org.springframework.security: INFO
     org.springframework.boot.autoconfigure.security: INFO
     it.fabioformosa: DEBUG
-    org.quartz: DEBUG
+    org.quartz: INFO
     
 quartz-manager:
   persistence: