From 6b53c448c8c712fcd2a5fee0844d24a7182b5b81 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 25 Mar 2020 17:08:57 +0100
Subject: [PATCH] 69940: Processes - date format, back button and hiding empty
 fields

---
 resources/i18n/en.json5                       |  2 ++
 .../detail/process-detail.component.html      | 22 +++++++++----------
 .../overview/process-overview.component.html  |  4 ++--
 .../overview/process-overview.component.ts    |  5 +++++
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index c06d33da8c..90efd4f437 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -1538,6 +1538,8 @@
 
   "process.page.detail.arguments.empty" : "This process doesn't contain any arguments",
 
+  "process.page.detail.back" : "Back",
+
   "process.page.detail.output" : "Process Output",
 
   "process.page.detail.output.alert" : "Work in progress - Process output is not available yet",
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 602e3306f8..d73b817ddc 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -5,24 +5,22 @@
     <div>{{ process?.scriptName }}</div>
   </ds-process-detail-field>
 
-  <ds-process-detail-field id="process-arguments" [title]="'process.page.detail.arguments'">
-    <ds-alert *ngIf="files?.length === 0" [content]="'process.page.detail.arguments.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
+  <ds-process-detail-field *ngIf="process?.parameters && process?.parameters?.length > 0" id="process-arguments" [title]="'process.page.detail.arguments'">
     <div *ngFor="let argument of process?.parameters">{{ argument?.name }} {{ argument?.value }}</div>
   </ds-process-detail-field>
 
   <div *ngVar="(filesRD$ | async)?.payload?.page as files">
-    <ds-process-detail-field *ngIf="files" id="process-files" [title]="'process.page.detail.output-files'">
-      <ds-alert *ngIf="files?.length === 0" [content]="'process.page.detail.output-files.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
-      <div *ngIf="files?.length > 0">
-        <div *ngFor="let file of files">
-          <span><a [href]="file?._links?.content?.href">{{getFileName(file)}}</a></span>
-          <span>({{file?.sizeBytes | dsFileSize}})</span>
-        </div>
+    <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files" [title]="'process.page.detail.output-files'">
+      <div *ngFor="let file of files">
+        <span><a [href]="file?._links?.content?.href">{{getFileName(file)}}</a></span>
+        <span>({{file?.sizeBytes | dsFileSize}})</span>
       </div>
     </ds-process-detail-field>
   </div>
 
-  <ds-process-detail-field id="process-output" [title]="'process.page.detail.output'">
-    <pre class="font-weight-bold text-secondary bg-light p-3">{{'process.page.detail.output.alert' | translate}}</pre>
-  </ds-process-detail-field>
+  <!--<ds-process-detail-field id="process-output" [title]="'process.page.detail.output'">-->
+    <!--<pre class="font-weight-bold text-secondary bg-light p-3">{{'process.page.detail.output.alert' | translate}}</pre>-->
+  <!--</ds-process-detail-field>-->
+
+  <a class="btn btn-light mt-3" [routerLink]="'/processes'">{{'process.page.detail.back' | translate}}</a>
 </div>
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index fef4b72776..6240d15e30 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -23,8 +23,8 @@
           <td><a [routerLink]="['/processes/', process.processId]">{{process.processId}}</a></td>
           <td><a [routerLink]="['/processes/', process.processId]">{{process.scriptName}}</a></td>
           <td *ngVar="(getEpersonName(process.userId) | async) as ePersonName">{{ePersonName}}</td>
-          <td>{{process.startTime}}</td>
-          <td>{{process.endTime}}</td>
+          <td>{{process.startTime | date:dateFormat}}</td>
+          <td>{{process.endTime | date:dateFormat}}</td>
           <td>{{process.processStatus}}</td>
         </tr>
       </tbody>
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 86a2aecbf5..29fbb9d733 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -40,6 +40,11 @@ export class ProcessOverviewComponent implements OnInit {
     pageSize: 20
   });
 
+  /**
+   * Date format to use for start and end time of processes
+   */
+  dateFormat = 'yyyy-MM-dd HH:mm:ss';
+
   constructor(protected processService: ProcessDataService,
               protected ePersonService: EPersonDataService) {
   }