Skip to content

Commit 653d3a1

Browse files
committed
- added new column info icon + tooltip
- refactoring and fixes
1 parent 8bdc03f commit 653d3a1

File tree

9 files changed

+1176
-954
lines changed

9 files changed

+1176
-954
lines changed

ScrumTool/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
<failOnMissingWebXml>false</failOnMissingWebXml>
2020

2121
<!-- Spring -->
22-
<spring.version>2.4.10</spring.version>
22+
<spring.version>2.4.11</spring.version>
2323

2424
<!-- Vaadin -->
25-
<vaadin.version>14.7.0</vaadin.version>
25+
<vaadin.version>14.7.1</vaadin.version>
2626
<clipboardhelper.vaadin.addon.version>1.1.2</clipboardhelper.vaadin.addon.version>
2727

2828
<lombok.version>1.18.20</lombok.version>
2929
<kotlin-reflect.version>1.5.21</kotlin-reflect.version>
30-
<reactor-core.version>3.4.9</reactor-core.version>
31-
<guava.version>30.1.1-jre</guava.version>
30+
<reactor-core.version>3.4.10</reactor-core.version>
31+
<guava.version>31.0.1-jre</guava.version>
3232
<commons-collections4.version>4.4</commons-collections4.version>
3333
<h2.version>1.4.200</h2.version>
3434
<markdown-area.version>1.0.2</markdown-area.version>

ScrumTool/src/main/java/com/fo0/vaadin/scrumtool/ui/data/table/TKBColumn.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public class TKBColumn implements Serializable, IDataOrder {
4040

4141
private String name;
4242

43+
private String description;
44+
4345
@Builder.Default
4446
private int dataOrder = -1;
4547

ScrumTool/src/main/java/com/fo0/vaadin/scrumtool/ui/export/ExportJson.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
import com.fo0.vaadin.scrumtool.ui.data.repository.KBDataRepository;
44
import com.fo0.vaadin.scrumtool.ui.data.table.TKBData;
5+
import com.fo0.vaadin.scrumtool.ui.session.SessionUtils;
56
import com.fo0.vaadin.scrumtool.ui.utils.SpringContext;
67
import com.google.gson.Gson;
7-
import com.vaadin.flow.component.notification.Notification;
8-
import com.vaadin.flow.component.notification.Notification.Position;
98
import java.util.UUID;
10-
import java.util.concurrent.TimeUnit;
119

1210
/**
1311
* @author fo0
@@ -43,10 +41,19 @@ public static String importAsJson(String json, boolean newId) {
4341
}
4442

4543
TKBData data = gson.fromJson(json, TKBData.class);
46-
if(newId){
47-
data.setId(UUID.randomUUID().toString());
44+
if (newId) {
45+
data.setId(UUID.randomUUID()
46+
.toString());
4847
}
4948

49+
// clear current users
50+
data.getUser()
51+
.getUsers()
52+
.clear();
53+
54+
// set new current owner
55+
data.setOwnerId(SessionUtils.getSessionId());
56+
5057
repository.save(data);
5158
return data.getId();
5259
}

0 commit comments

Comments
 (0)