Browse Source

import optimization, minor css improvement

feature/entityId
Stephan Richter 3 months ago
parent
commit
d7687373a6
  1. 10
      core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java
  2. 3
      core/src/main/java/de/srsoftware/umbrella/core/api/NoteService.java
  3. 10
      core/src/main/java/de/srsoftware/umbrella/core/model/Note.java
  4. 7
      core/src/main/java/de/srsoftware/umbrella/core/model/Status.java
  5. 6
      frontend/src/routes/tags/TagList.svelte
  6. 2
      notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
  7. 1
      notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java
  8. 1
      project/src/main/java/de/srsoftware/umbrella/project/ProjectDb.java
  9. 1
      project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
  10. 6
      project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java
  11. 16
      web/src/main/resources/web/css/default.css

10
core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java

@ -1,10 +1,6 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.core; 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.Condition.equal;
import static de.srsoftware.tools.jdbc.Query.replaceInto; import static de.srsoftware.tools.jdbc.Query.replaceInto;
import static de.srsoftware.tools.jdbc.Query.update; 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.lang.System.Logger.Level.INFO;
import static java.text.MessageFormat.format; import static java.text.MessageFormat.format;
import de.srsoftware.tools.jdbc.Query;
import java.sql.Connection;
import java.sql.SQLException;
public abstract class BaseDb { public abstract class BaseDb {
private final System.Logger LOG = System.getLogger(getClass().getInterfaces()[0].getSimpleName()); private final System.Logger LOG = System.getLogger(getClass().getInterfaces()[0].getSimpleName());

3
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.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Note; import de.srsoftware.umbrella.core.model.Note;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.util.Collection;
import java.util.Map; import java.util.Map;
public interface NoteService { public interface NoteService {

10
core/src/main/java/de/srsoftware/umbrella/core/model/Note.java

@ -1,18 +1,16 @@
/* © SRSoftware 2025 */ /* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.model; 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.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Map; 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 record Note(long id, String module, long entityId, long authorId, String text, LocalDateTime timestamp) implements Mappable {
public static Note of(ResultSet rs) throws SQLException { public static Note of(ResultSet rs) throws SQLException {
return new Note( return new Note(

7
core/src/main/java/de/srsoftware/umbrella/core/model/Status.java

@ -1,17 +1,16 @@
/* © SRSoftware 2025 */ /* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.model; 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.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; 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 record Status(String name, int code) implements Mappable {
public static final Status PENDING = new Status("PENDING", 10); // was 40 public static final Status PENDING = new Status("PENDING", 10); // was 40
public static final Status OPEN = new Status("OPEN",20); // was 10 public static final Status OPEN = new Status("OPEN",20); // was 10

6
frontend/src/routes/tags/TagList.svelte

@ -100,13 +100,13 @@
{/if} {/if}
<div class="taglist"> <div class="taglist">
<span class="tag editor">
<input type="text" bind:value={newTag} onkeyup={typed} autofocus />
</span>
{#each tags as tag,idx} {#each tags as tag,idx}
<span class="tag"> <span class="tag">
<span onclick={() => show(tag)}>{tag}</span> <span onclick={() => show(tag)}>{tag}</span>
<button onclick={() => drop(tag)} class="symbol"></button> <button onclick={() => drop(tag)} class="symbol"></button>
</span> </span>
{/each} {/each}
<span class="tag editor">
<input type="text" bind:value={newTag} onkeyup={typed} autofocus />
</span>
</div> </div>

2
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.Note;
import de.srsoftware.umbrella.core.model.Token; import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;

1
notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java

@ -2,7 +2,6 @@
package de.srsoftware.umbrella.notes; package de.srsoftware.umbrella.notes;
import de.srsoftware.umbrella.core.model.Note; import de.srsoftware.umbrella.core.model.Note;
import java.util.Map; import java.util.Map;
public interface NotesDb { public interface NotesDb {

1
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.Permission;
import de.srsoftware.umbrella.core.model.Project; import de.srsoftware.umbrella.core.model.Project;
import de.srsoftware.umbrella.core.model.Status; import de.srsoftware.umbrella.core.model.Status;
import java.util.Map; import java.util.Map;
public interface ProjectDb { public interface ProjectDb {

1
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.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.Constants.*; import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Paths.LIST; 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.Util.mapValues;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Permission.*; import static de.srsoftware.umbrella.core.model.Permission.*;

6
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.*;
import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL; import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
import static de.srsoftware.umbrella.core.Constants.*; 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.COMPLETE;
import static de.srsoftware.umbrella.core.model.Status.OPEN; import static de.srsoftware.umbrella.core.model.Status.OPEN;
import static de.srsoftware.umbrella.project.Constants.*; import static de.srsoftware.umbrella.project.Constants.*;
import static java.lang.System.Logger.Level.ERROR; import static java.lang.System.Logger.Level.ERROR;
import static java.lang.System.Logger.Level.INFO;
import static java.text.MessageFormat.format; import static java.text.MessageFormat.format;
import de.srsoftware.tools.jdbc.Query;
import de.srsoftware.umbrella.core.BaseDb; import de.srsoftware.umbrella.core.BaseDb;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Permission; import de.srsoftware.umbrella.core.model.Permission;
import de.srsoftware.umbrella.core.model.Project; import de.srsoftware.umbrella.core.model.Project;
import de.srsoftware.umbrella.core.model.Status; import de.srsoftware.umbrella.core.model.Status;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

16
web/src/main/resources/web/css/default.css

@ -156,7 +156,7 @@ textarea{
padding: 2px; padding: 2px;
} }
.kanban .box{ .kanban .box{
background: orange; background: #759eff;
position: relative; position: relative;
} }
.kanban .box .title{ .kanban .box .title{
@ -208,7 +208,19 @@ textarea{
top: 60px; top: 60px;
right: 20px; 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, .project th,
.task th{ .task th{
text-align: right; text-align: right;

Loading…
Cancel
Save