Adding Commit Date in Footer

src/main/docker/gitsearch.yml

@@ -20,6 +20,7 @@ services:
       - APPLICATION_GITLAB_GENERALACCESSTOKEN=${APPLICATION_GITLAB_GENERALACCESSTOKEN}
       - gitBranch=${GIT_BRANCH}
       - gitCommitId=${COMMIT_ID}
+      - gitCommitDate=${COMMIT_DATE}
 
     ports:
       - 10084:8080

src/main/java/at/ac/uibk/gitsearch/config/ApplicationProperties.java

@@ -192,8 +192,9 @@ public class ApplicationProperties {
 		public String toString() {
 			return "DeploymentInfo [" + commitId + "/" + branch + "]";
 		}
-		private String commitId;
-    	private String branch;
+		private String commitId = "---";
+    	private String branch = "---";
+    	private String deploymentDate = ""; 
 		/**
 		 * @return the commitId
 		 */
@@ -218,5 +219,17 @@ public class ApplicationProperties {
 		public void setBranch(String branch) {
 			this.branch = branch;
 		}
+		/**
+		 * @return the deploymentDate
+		 */
+		public String getDeploymentDate() {
+			return deploymentDate;
+		}
+		/**
+		 * @param deploymentDate the deploymentDate to set
+		 */
+		public void setDeploymentDate(String deploymentDate) {
+			this.deploymentDate = deploymentDate;
+		}
     }
 }

src/main/java/at/ac/uibk/gitsearch/web/rest/ApplicationInfoResource.java

@@ -37,7 +37,7 @@ public class ApplicationInfoResource {
     @GetMapping("/applicationInfo/deploymentInfo")
     public ApplicationProperties.DeploymentInfo getApplicationInfo() {
         final DeploymentInfo deploymentInfo = applicationProperties.getDeploymentInfo();
-        if(deploymentInfo==null || "${git.branch}".equals(deploymentInfo.getBranch())) {
+        if(deploymentInfo==null || "${gitBranch}".equals(deploymentInfo.getBranch())) {
         	return new ApplicationProperties.DeploymentInfo(); // application info is not initialized properly! Return an empty info
         }
 		return deploymentInfo;

src/main/resources/config/application.yml

@@ -173,4 +173,5 @@ application:
     highlight-post: </strong></mark>
   deployment-info:
     commit-id: "${gitCommitId}"
-    branch: "${gitBranch}"
\ No newline at end of file
+    branch: "${gitBranch}"
+    deploymentDate: ${gitCommitDate}
\ No newline at end of file

src/main/webapp/app/core/application/applicationInfo.service.ts

@@ -7,6 +7,7 @@ import { SERVER_API_URL } from 'app/app.constants';
 export class DeploymentInfo {
   branch = '';
   commitId = '';
+  deploymentDate = '';
 }
 @Injectable({ providedIn: 'root' })
 export class ApplicationInfoService {

src/main/webapp/app/layouts/footer/footer.component.html

@@ -22,7 +22,7 @@
               <li><a href="https://artemis.codeability.uibk.ac.at/#/datenschutz"  jhiTranslate="global.footer.privacy">Privacy</a></li>
             </ul>
           </div>
-           <div style="float: right; font-size: 50%;padding-top: 15px;" *ngIf="applicationInfoService.getDeploymentInfo().branch">{{applicationInfoService.getDeploymentInfo().branch}}/{{applicationInfoService.getDeploymentInfo().commitId}}</div>
+           <div style="float: right; font-size: 50%;padding-top: 15px;" *ngIf="applicationInfoService.getDeploymentInfo().branch">{{applicationInfoService.getDeploymentInfo().branch}}/{{applicationInfoService.getDeploymentInfo().commitId}} ({{applicationInfoService.getDeploymentInfo().deploymentDate}})</div>
       </div>
     </div>
   </div>