From 1c087fae322a1b07bb7bd554ee10ff473c47c727 Mon Sep 17 00:00:00 2001
From: Fin Reinhard <fin.reinhard@icloud.com>
Date: Tue, 22 Jan 2019 20:51:03 +0000
Subject: [PATCH] Merge branch 'master' into feature/15-archive-view-url

---
 borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java
index 119aa9a..0169269 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java
@@ -38,6 +38,15 @@
     @Getter
     @Setter
     private String[] environmentVariables;
+    @Getter
+    @Setter
+    private String createTime;
+    @Getter
+    @Setter
+    private String startTime;
+    @Getter
+    @Setter
+    private String stopTime;
 
     public JsonJob() {
     }
@@ -55,6 +64,9 @@
         this.commandLineAsString = borgJob.getCommandLineAsString();
         this.description = borgJob.getDescription();
         environmentVariables = borgJob.getCommand().getRepoConfig().getEnvironmentVariables();
+        this.createTime = borgJob.getCreateTime();
+        this.startTime = borgJob.getStartTime();
+        this.stopTime = borgJob.getStopTime();
     }
 
     /**

--
Gitblit v1.10.0