From e6b7297e3d457676af6a7f96872203d57f5ea8ed Mon Sep 17 00:00:00 2001 From: jotty Date: Fri, 8 Feb 2019 14:48:48 +0100 Subject: [PATCH] export for MP list --- .../timetrack/modules/SessionControl.java | 4 ++++ .../timetrack/modules/done/DoneModel.java | 15 +++++++++++++++ src/main/webapp/pages/done/init.xhtml | 5 +++++ 3 files changed, 24 insertions(+) diff --git a/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java b/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java index 3d7370d..7676e46 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java +++ b/src/main/java/de/jottyfan/timetrack/modules/SessionControl.java @@ -31,6 +31,10 @@ public class SessionControl { public String doLogout() { bean.setLogin(null); + bean.setSecret(null); + bean.setForename(null); + bean.setSurname(null); + bean.setUsername(null); return Pages.START.get(); } diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java index c19c0d9..e0ca2a1 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java @@ -1,6 +1,7 @@ package de.jottyfan.timetrack.modules.done; import java.io.Serializable; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.ArrayList; @@ -159,6 +160,20 @@ public class DoneModel implements Model, Serializable { } } + public String getAttach() { + StringBuilder buf = new StringBuilder(); + String thatday = new SimpleDateFormat("dd.MM.yyyy").format(day); + for (DailySummaryBean sdb : allJobs) { + buf.append(thatday).append("\t"); + buf.append(sdb.getDuration()).append("\t"); + buf.append(sdb.getProjectName()).append("\t"); + buf.append(sdb.getModuleName()).append("\t"); + buf.append(sdb.getJobName()).append("\t"); + buf.append("\n"); + } + return buf.toString(); + } + public void setBean(DoneBean bean) { this.bean = bean; } diff --git a/src/main/webapp/pages/done/init.xhtml b/src/main/webapp/pages/done/init.xhtml index 10354de..59601e3 100644 --- a/src/main/webapp/pages/done/init.xhtml +++ b/src/main/webapp/pages/done/init.xhtml @@ -43,6 +43,11 @@ + +

+ +

+