From d7687373a669dd6b95a958a55f91f20ad34a8b59 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Sat, 2 Aug 2025 20:34:14 +0200 Subject: [PATCH] import optimization, minor css improvement --- .../java/de/srsoftware/umbrella/core/BaseDb.java | 10 +++++----- .../umbrella/core/api/NoteService.java | 3 --- .../de/srsoftware/umbrella/core/model/Note.java | 10 ++++------ .../srsoftware/umbrella/core/model/Status.java | 7 +++---- frontend/src/routes/tags/TagList.svelte | 6 +++--- .../de/srsoftware/umbrella/notes/NoteModule.java | 2 -- .../de/srsoftware/umbrella/notes/NotesDb.java | 1 - .../srsoftware/umbrella/project/ProjectDb.java | 1 - .../umbrella/project/ProjectModule.java | 1 - .../de/srsoftware/umbrella/project/SqliteDb.java | 6 ------ web/src/main/resources/web/css/default.css | 16 ++++++++++++++-- 11 files changed, 29 insertions(+), 34 deletions(-) diff --git a/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java b/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java index d752413..821ce4b 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java @@ -1,10 +1,6 @@ +/* © SRSoftware 2025 */ package de.srsoftware.umbrella.core; -import de.srsoftware.tools.jdbc.Query; - -import java.sql.Connection; -import java.sql.SQLException; - import static de.srsoftware.tools.jdbc.Condition.equal; import static de.srsoftware.tools.jdbc.Query.replaceInto; import static de.srsoftware.tools.jdbc.Query.update; @@ -14,6 +10,10 @@ import static java.lang.System.Logger.Level.ERROR; import static java.lang.System.Logger.Level.INFO; import static java.text.MessageFormat.format; +import de.srsoftware.tools.jdbc.Query; +import java.sql.Connection; +import java.sql.SQLException; + public abstract class BaseDb { private final System.Logger LOG = System.getLogger(getClass().getInterfaces()[0].getSimpleName()); diff --git a/core/src/main/java/de/srsoftware/umbrella/core/api/NoteService.java b/core/src/main/java/de/srsoftware/umbrella/core/api/NoteService.java index 1204899..7dcfe9f 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/api/NoteService.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/api/NoteService.java @@ -3,9 +3,6 @@ package de.srsoftware.umbrella.core.api; import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.Note; -import de.srsoftware.umbrella.core.model.UmbrellaUser; - -import java.util.Collection; import java.util.Map; public interface NoteService { diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Note.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Note.java index f933e7c..582fb66 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Note.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Note.java @@ -1,18 +1,16 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.core.model; -import de.srsoftware.tools.Mappable; +import static de.srsoftware.umbrella.core.Constants.*; +import static de.srsoftware.umbrella.core.Util.markdown; +import static java.time.ZoneOffset.UTC; +import de.srsoftware.tools.Mappable; import java.sql.ResultSet; import java.sql.SQLException; import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.Map; -import static de.srsoftware.umbrella.core.Constants.*; -import static de.srsoftware.umbrella.core.Util.markdown; -import static java.time.ZoneOffset.UTC; - public record Note(long id, String module, long entityId, long authorId, String text, LocalDateTime timestamp) implements Mappable { public static Note of(ResultSet rs) throws SQLException { return new Note( diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Status.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Status.java index 1c8c3bd..856b6a3 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Status.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Status.java @@ -1,17 +1,16 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.core.model; -import de.srsoftware.tools.Mappable; +import static de.srsoftware.umbrella.core.Constants.CODE; +import static de.srsoftware.umbrella.core.Constants.NAME; +import de.srsoftware.tools.Mappable; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static de.srsoftware.umbrella.core.Constants.CODE; -import static de.srsoftware.umbrella.core.Constants.NAME; - public record Status(String name, int code) implements Mappable { public static final Status PENDING = new Status("PENDING", 10); // was 40 public static final Status OPEN = new Status("OPEN",20); // was 10 diff --git a/frontend/src/routes/tags/TagList.svelte b/frontend/src/routes/tags/TagList.svelte index 8dafa27..35a92fd 100644 --- a/frontend/src/routes/tags/TagList.svelte +++ b/frontend/src/routes/tags/TagList.svelte @@ -100,13 +100,13 @@ {/if}
+ + + {#each tags as tag,idx} show(tag)}>{tag} {/each} - - -
\ No newline at end of file diff --git a/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java b/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java index d56cf46..46645ee 100644 --- a/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java +++ b/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java @@ -19,10 +19,8 @@ import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.Note; import de.srsoftware.umbrella.core.model.Token; import de.srsoftware.umbrella.core.model.UmbrellaUser; - import java.io.IOException; import java.time.LocalDateTime; -import java.util.Collection; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; diff --git a/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java b/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java index e653302..bcbd7ee 100644 --- a/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java +++ b/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java @@ -2,7 +2,6 @@ package de.srsoftware.umbrella.notes; import de.srsoftware.umbrella.core.model.Note; - import java.util.Map; public interface NotesDb { diff --git a/project/src/main/java/de/srsoftware/umbrella/project/ProjectDb.java b/project/src/main/java/de/srsoftware/umbrella/project/ProjectDb.java index 7bf84cf..ad5f2b9 100644 --- a/project/src/main/java/de/srsoftware/umbrella/project/ProjectDb.java +++ b/project/src/main/java/de/srsoftware/umbrella/project/ProjectDb.java @@ -5,7 +5,6 @@ import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.Permission; import de.srsoftware.umbrella.core.model.Project; import de.srsoftware.umbrella.core.model.Status; - import java.util.Map; public interface ProjectDb { diff --git a/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java b/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java index f7885e9..5895e9d 100644 --- a/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java +++ b/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java @@ -4,7 +4,6 @@ package de.srsoftware.umbrella.project; import static de.srsoftware.umbrella.core.ConnectionProvider.connect; import static de.srsoftware.umbrella.core.Constants.*; import static de.srsoftware.umbrella.core.Paths.LIST; -import static de.srsoftware.umbrella.core.Paths.STATES; import static de.srsoftware.umbrella.core.Util.mapValues; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.core.model.Permission.*; diff --git a/project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java b/project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java index f0aee03..f32a059 100644 --- a/project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java +++ b/project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java @@ -5,24 +5,18 @@ import static de.srsoftware.tools.jdbc.Condition.*; import static de.srsoftware.tools.jdbc.Query.*; import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL; import static de.srsoftware.umbrella.core.Constants.*; -import static de.srsoftware.umbrella.core.Constants.TABLE_SETTINGS; import static de.srsoftware.umbrella.core.model.Status.COMPLETE; import static de.srsoftware.umbrella.core.model.Status.OPEN; import static de.srsoftware.umbrella.project.Constants.*; import static java.lang.System.Logger.Level.ERROR; -import static java.lang.System.Logger.Level.INFO; import static java.text.MessageFormat.format; -import de.srsoftware.tools.jdbc.Query; import de.srsoftware.umbrella.core.BaseDb; import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.Permission; import de.srsoftware.umbrella.core.model.Project; import de.srsoftware.umbrella.core.model.Status; - import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css index a3619a2..f90b157 100644 --- a/web/src/main/resources/web/css/default.css +++ b/web/src/main/resources/web/css/default.css @@ -156,7 +156,7 @@ textarea{ padding: 2px; } .kanban .box{ - background: orange; + background: #759eff; position: relative; } .kanban .box .title{ @@ -208,7 +208,19 @@ textarea{ top: 60px; right: 20px; } - +.kanban .state_10 .box, +.kanban .state_100 .box{ + background: #573800; +} +.kanban .state_20 .box{ + background: orange; +} +.kanban .state_40 .box{ + background: khaki; +} +.kanban .state_60 .box{ + background: #d3ff00; +} .project th, .task th{ text-align: right;