Merge pull request #59 from TzippylExl/february2022

February2022 - Add new field "'Service Temporarily Unavailable' Until Date"

Author: ori229

cloudapp/src/app/ecollection/ecollection.component.html

@@ -502,6 +502,22 @@ <h2>Service Fields</h2>
         <mat-datepicker #serviceUnavailablePicker></mat-datepicker>    
       </mat-form-field>  
     </div>               
+    <div class="field-title">{{'Form.ServiceFields.service_unavailable_until_date' | translate}}</div>
+    <div>
+      <mat-form-field>
+        <mat-select value='NONE' data-action="service_unavailable_until_date" (selectionChange)="toggle($event, 'service')">
+          <mat-option *ngFor="let action of [ 'none', 'clear', 'replace' ]" [value]="action.toUpperCase()">{{'Form.Actions.'+action | translate}}</mat-option>
+        </mat-select>
+      </mat-form-field>  
+    </div>    
+    <div>
+      <mat-form-field>
+        <mat-label>{{'Form.ServiceFields.service_unavailable_until_date' | translate}}</mat-label>
+        <input matInput [matDatepicker]="serviceUnavailableUntilPicker" [formControl]="serviceForm.get('service_unavailable_until_date')">
+        <mat-datepicker-toggle matSuffix [for]="serviceUnavailableUntilPicker"></mat-datepicker-toggle>
+        <mat-datepicker #serviceUnavailableUntilPicker></mat-datepicker>    
+      </mat-form-field>  
+    </div>               
     <div class="field-title">{{'Form.ServiceFields.active_from_date' | translate}}</div>
     <div>
       <mat-form-field>

cloudapp/src/app/models/eservice.ts

@@ -16,6 +16,7 @@ export class EService {
   service_temporarily_unavailable: Value = new Value();
   service_unavailable_reason: string = "";
   service_unavailable_date: string = "";
+  service_unavailable_until_date: string = "";
   active_from_date: string = "";
   active_until_date: string = "";
 }

cloudapp/src/app/services/ecollection.service.ts

@@ -45,7 +45,7 @@ export class EcollectionService {
         src[key] = key.includes("_date") ? null : "";
       }
     }
-    ['activation_date', 'expected_activation_date', 'service_unavailable_date', 'active_from_date', 'active_until_date'].forEach(f=>this.formatDate(src, f));
+    ['activation_date', 'expected_activation_date', 'service_unavailable_date', 'service_unavailable_until_date', 'active_from_date', 'active_until_date'].forEach(f=>this.formatDate(src, f));
     ['is_suppressed_from_cdi', 'activate_new_portfolios'].forEach(f=>this.formatBoolean(src, f));
     return Object.assign(orig, src);
   }

cloudapp/src/i18n/en.json

@@ -36,9 +36,10 @@
 			"activation_status":"Activation Status",
 			"activation_status.value":"Activation Status",
 			"activate_new_portfolios": "Activate new portfolios",
-			"service_temporarily_unavailable.value": "Service temporarily unavailable",
-			"service_unavailable_reason": "Service unavailable reason",
-			"service_unavailable_date": "Service unavailable date",
+			"service_temporarily_unavailable.value": "Display service temporarily unavailable message",
+			"service_unavailable_reason": "Service unavailablity display message",
+			"service_unavailable_date": "Display unavailable message from date",
+			"service_unavailable_until_date": "Display unavailable message until date",
 			"public_note" : "Public Note",
 			"url_type_override" : "URL type (override)",
 			"dynamic_url_override" : "Dynamic URL (override)",