[KON-14]: TOTAL COMMIT
Signed-off-by: Dennis Schmitt <dennis.schmitt@pta.de>
diff --git a/proxy.conf-integration.json b/proxy.conf-integration.json
index 27430d8..bc0c49b 100644
--- a/proxy.conf-integration.json
+++ b/proxy.conf-integration.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://entdockergss:9155",
+ "target": "http://localhost:9155",
"secure": false,
"pathRewrite": {
"^/api": ""
diff --git a/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.html b/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.html
index 5f7c80a..d1d46d6 100644
--- a/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.html
+++ b/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.html
@@ -29,12 +29,13 @@
<div class="form-group row">
<label for="expiringDate" class="col-sm-4 col-form-label">{{ 'UserModuleAssignment.ExpiringDate' | translate }}</label>
<div class="input-group col-sm-7">
- <div class="input-group-append">
+ <div class="input-group-prepend">
<button class="btn btn-outline-primary calendar" (click)="expiringDateCalendar.toggle()" type="button">
<i class="fa fa-calendar"></i>
</button>
</div>
<input
+ style="border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 0.25rem;"
class="form-check-input"
type="text"
placeholder="tt.mm.jjjj"
@@ -44,8 +45,13 @@
name="expiringDate"
[ngrxFormControlState]="((userModuleAssignmentSandbox.formState$ | async)?.controls)['expiringDate']"
[ngrxValueConverter]="userModuleAssignmentSandbox.dateValueConverter"
- [readonly]="true"
+ readonly
/>
+ <div class="input-group-append">
+ <button class="btn btn-outline-primary calendar" (click)="reset('expiringDate')" type="button">
+ <i class="fa fa-times-circle" aria-hidden="true"></i>
+ </button>
+ </div>
</div>
</div>
@@ -53,12 +59,13 @@
<div class="form-group row">
<label for="deletionLockUntil" class="col-sm-4 col-form-label">{{ 'UserModuleAssignment.DeletionLockUntil' | translate }}</label>
<div class="input-group col-sm-7">
- <div class="input-group-append">
+ <div class="input-group-prepend">
<button class="btn btn-outline-primary calendar" (click)="deletionLockUntilCalendar.toggle()" type="button">
<i class="fa fa-calendar"></i>
</button>
</div>
<input
+ style="border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 0.25rem;"
class="form-check-input"
type="text"
placeholder="tt.mm.jjjj"
@@ -68,8 +75,13 @@
id="deletionLockUntil"
[ngrxFormControlState]="((userModuleAssignmentSandbox.formState$ | async)?.controls)['deletionLockUntil']"
[ngrxValueConverter]="userModuleAssignmentSandbox.dateValueConverter"
- [readonly]="true"
+ readonly
/>
+ <div class="input-group-append">
+ <button class="btn btn-outline-primary calendar" (click)="reset('deletionLockUntil')" type="button">
+ <i class="fa fa-times-circle" aria-hidden="true"></i>
+ </button>
+ </div>
</div>
</div>
@@ -79,7 +91,7 @@
<div class="col-sm-7">
<input
type="text"
- class="form-check-input"
+ class="form-check-input form-control"
id="assignmentNote"
[ngrxFormControlState]="((userModuleAssignmentSandbox.formState$ | async)?.controls)['assignmentNote']"
/>
diff --git a/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.scss b/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.scss
index 6b13cfb..72511eb 100644
--- a/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.scss
+++ b/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.scss
@@ -24,10 +24,18 @@
width: 100%;
margin: 0px;
}
-.input-group-append > button {
- height: 30px;
+.input-group-prepend > button {
+ height: 28px;
padding: 1px 10px;
margin: 0px;
+ border: 1px solid rgba(0, 0, 0, 0.15);
+}
+.input-group-append > button {
+ left: 176px;
+ height: 28px;
+ padding: 1px 10px;
+ margin: 0px;
+ border: 1px solid rgba(0, 0, 0, 0.15);
}
.input-group > input {
padding-left: 40px;
diff --git a/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.ts b/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.ts
index 3120e2b..6cafd88 100644
--- a/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.ts
+++ b/src/app/shared/components/list-details-view/user-module-assignment/details/details.component.ts
@@ -27,4 +27,8 @@
this.userModuleAssignmentSandbox.registerUserModuleAssignmentEvents();
this.userModuleAssignmentSandbox.newUserModuleAssignmentData();
}
+
+ reset(resetProperty: string) {
+ this.userModuleAssignmentSandbox.clearUserModuleAssignmentPropertyData(resetProperty);
+ }
}
diff --git a/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts b/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts
index 20d9552..908f34d 100644
--- a/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts
+++ b/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts
@@ -141,6 +141,18 @@
this.appState$.dispatch(new ResetAction(userModuleAssignmentDetailsFormReducer.FORM_ID));
}
+ public clearUserModuleAssignmentPropertyData(property: string): void {
+ switch (property) {
+ case 'deletionLockUntil':
+ this.appState$.dispatch(new SetValueAction(userModuleAssignmentDetailsFormReducer.INITIAL_STATE.controls.deletionLockUntil.id, null));
+ break;
+ case 'expiringDate':
+ this.appState$.dispatch(new SetValueAction(userModuleAssignmentDetailsFormReducer.INITIAL_STATE.controls.expiringDate.id, null));
+ default:
+ break;
+ }
+ }
+
public registerUserModuleAssignmentEvents(): void {
// subscribes to formState
this.formState$
