CSS improvements

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

core/src/main/java/de/srsoftware/umbrella/core/BaseHandler.java

@@ -2,9 +2,11 @@
 package de.srsoftware.umbrella.core;
 
 import static de.srsoftware.tools.Optionals.nullable;
+import static de.srsoftware.umbrella.core.ModuleRegistry.translator;
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.WARNING;
 import static java.net.HttpURLConnection.*;
+import static java.text.MessageFormat.format;
 
 import com.sun.net.httpserver.HttpExchange;
 import de.srsoftware.tools.Path;
@@ -72,7 +74,9 @@ public abstract class BaseHandler extends PathHandler {
 	}
 
 	public boolean send(HttpExchange ex, UmbrellaException e) throws IOException {
-		return sendContent(ex,e.statusCode(),e.getMessage());
+		String lang = languages(ex).stream().findFirst().orElse(null);
+		var translatedMessage = translator().translate(lang,e.getMessage());
+		return sendContent(ex,e.statusCode(),format(translatedMessage,e.fills()));
 	}
 
 	public boolean unauthorized(HttpExchange ex) throws IOException {

core/src/main/java/de/srsoftware/umbrella/core/exceptions/UmbrellaException.java

@@ -13,13 +13,15 @@ import static java.text.MessageFormat.format;
 
 public class UmbrellaException extends RuntimeException{
 	private final int statusCode;
+	private Object[] fills;
 
 	public UmbrellaException(String message, Object ... fills){
 		this(HTTP_SERVER_ERROR,message,fills);
 	}
 
 	public UmbrellaException(int statusCode, String message, Object ... fills){
-		super(fills == null || fills.length<1 ? message : format(message,fills));
+		super(message);
+		this.fills = fills;
 		this.statusCode = statusCode;
 	}
 
@@ -34,6 +36,10 @@ public class UmbrellaException extends RuntimeException{
 		return new UmbrellaException(message,fills);
 	}
 
+	public Object[] fills(){
+		return fills;
+	}
+
 	public static UmbrellaException forbidden(String message, Object... fills) {
 		return new UmbrellaException(HTTP_FORBIDDEN,message,fills);
 	}

frontend/src/Components/LineEditor.svelte

@@ -22,8 +22,12 @@
     async function applyEdit(){
         let success = await onSet(editValue);
         if (success) {
-            value = editValue;
+            if (success == 'reset'){
-            editing=false;
+                editValue = value;
+            } else {
+                value   = editValue;
+            }
+            editing = false;
         } else {
             editValue = value;
         }

frontend/src/Components/Menu.svelte

@@ -10,6 +10,7 @@ import TimeRecorder from './TimeRecorder.svelte';
 let key = $state(null);
 const router  = useTinyRouter();
 const modules = $state([]);
+let expand = $state(false);
 
 async function fetchModules(){
     const url  = `${location.protocol}//${location.host.replace('5173','8080')}/legacy/user/modules`;
@@ -27,6 +28,7 @@ async function fetchModules(){
 
 function onclick(e){
     e.preventDefault();
+    expand = false;
     let href = e.target.getAttribute('href');
     if (href) router.navigate(href);
     return false;
@@ -34,6 +36,7 @@ function onclick(e){
 
 async function search(e){
     e.preventDefault();
+    expand = false;
     router.navigate(`/search?key=${key}`);
     return false;
 }
@@ -47,11 +50,12 @@ onMount(fetchModules);
     }
 </style>
 
-<nav>
+<nav class={expand?"expanded":"collapsed"}>
     <form onsubmit={search}>
         <input type="text" bind:value={key} />
         <button type="submit">{t('search')}</button>
     </form>
+	<button class="symbol" onclick={e => expand = !expand}></button>
     <a href="/user"     {onclick} class="user">{t('users')}</a>
     <a href="/company"  {onclick} class="company">{t('companies')}</a>
     <a href="/project"  {onclick} class="project">{t('projects')}</a>
@@ -72,7 +76,7 @@ onMount(fetchModules);
     {#if module.name.trim()}<a href={module.url}>{module.name}</a>{/if}
     {/each}
     {#if user.name }
-    <a onclick={logout}>{t('logout_user',{user:user.name})}</a>
+    <a class="logout" onclick={logout}>{t('logout_user',{user:user.name})}</a>
     {/if}
     <TimeRecorder />
 </nav>

frontend/src/routes/document/PositionList.svelte

@@ -14,6 +14,23 @@
     } = $props();
 
     let editable = $derived(document.state == 1);
+    let sums = $derived.by(calcSums);
+
+    function calcSums(){
+        let data  = {}
+        let net   = 0;
+        let gross = 0;
+        for (let pos of Object.values(document.positions)){
+            let net_price = pos.unit_price * pos.amount;
+            let tax       = +pos.tax;
+            data[tax]     = net_price + (data[tax] ? data[tax] : 0);
+            net          += net_price;
+        }
+        for (let [tax, price] of Object.entries(data)) gross += price * (+tax+100)/100;
+        data['net']   = net/100;
+        data['gross'] = (gross/100).toFixed(2);
+        return data;
+    }
 
     async function updatePositions(resp){
         let json           = await resp.json();
@@ -22,7 +39,7 @@
     }
 
     async function movePos(number,step){
-        const url = api(`document/${document.id}/position`);
+        const url  = api(`document/${document.id}/position`);
         const resp = await fetch(url,{
             method     : 'PATCH',
             credentials: 'include',
@@ -38,7 +55,7 @@
     async function drop(number){
         let confirmed = confirm(t('confirm_deletion').replace('{pos}',document.positions[number].item));
         if (!confirmed) return;
-        const url = api(`document/${document.id}/position`);
+        const url  = api(`document/${document.id}/position`);
         const resp = await fetch(url,{
             method     : 'DELETE',
             credentials: 'include',
@@ -73,9 +90,9 @@
         <tr class="sums">
             <td colspan="2"></td>
             <td>{t('net_sum')}</td>
-            <td>{document.net_sum/100}&nbsp;{document.currency}</td>
+            <td>{sums['net']}&nbsp;{document.currency}</td>
             <td colspan="2">{t('gross_sum')}</td>
-            <td>{document.gross_sum/100}&nbsp;{document.currency}</td>
+            <td>{sums['gross']}&nbsp;{document.currency}</td>
             <td></td>
         </tr>
     </tbody>

frontend/src/routes/project/Kanban.svelte

@@ -78,8 +78,10 @@
             if (!tasks[user_id][state]) tasks[user_id][state] = {};
             tasks[user_id][state][task.id] = task;
             yikes();
+            return 'reset';
         } else {
             error(resp);
+            return false;
         }
     }
 
@@ -255,7 +257,7 @@
                     {/if}
                 {/each}
                 <div class="add_task">
-                    <LineEditor value={t('add_object',{object:t('task')})} editable={true} onSet={(name) => create(name,uid,state)}/>
+                    <LineEditor value={t('add_object',{object:t('task')})} editable={true} onSet={(name) => create(name,u.id,state)}/>
                 </div>
             </div>
         {/each}

frontend/src/routes/task/EasyList.svelte

@@ -73,7 +73,7 @@
     }
 
     function measured(evt,duration,d){
-        if (d > 100) return;
+        if (d > 10) return;
         if (duration < 500){
             onclick(evt);
         } else {

project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java

@@ -137,7 +137,7 @@ CREATE TABLE IF NOT EXISTS {0} (
 			if (rs.next()) project = Project.of(rs);
 			rs.close();
 
-			if (project == null) throw UmbrellaException.notFound("No project found for id {0}",projectId);
+			if (project == null) throw UmbrellaException.notFound("no_project_for_id",projectId);
 
 			rs = select(ALL).from(TABLE_CUSTOM_STATES).where(PROJECT_ID,equal(projectId)).exec(db);
 			var states = project.allowedStates();

task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java

@@ -270,7 +270,7 @@ CREATE TABLE IF NOT EXISTS {0} (
 	public Task load(long taskId) throws UmbrellaException {
 		var map = load(List.of(taskId));
 		var task = map.get(taskId);
-		if (task == null) throw UmbrellaException.notFound("No task found for id {0}",taskId);
+		if (task == null) throw UmbrellaException.notFound("no_task_for_id",taskId);
 		return task;
 	}
 

translations/src/main/resources/de.json

@@ -183,6 +183,8 @@
   "new_password": "neues Passwort",
   "new_property": "neue Eigenschaft",
   "no_company": "keine Firma",
+  "no_project_for_id": "Kein Projekt mit ID {0} gefunden!",
+  "no_task_for_id": "Keine Aufgabe mit ID {0} gefunden!",
   "note": "Notiz",
   "notes": "Notizen",
   "not_recent_version": "Die ist nicht die neuste Version dieser Seite!",

translations/src/main/resources/en.json

@@ -183,6 +183,8 @@
   "new_password": "new password",
   "new_property": "new property",
   "no_company": "no company",
+  "no_project_for_id": "No project found for id {0}",
+  "no_task_for_id": "No task found for id {0}",
   "note": "note",
   "notes": "notes",
   "not_recent_version": "This is not the current version of this page!",
@@ -322,4 +324,4 @@
   "year": "year",
   "your_password_reset_token" : "Your token to create a new password",
   "your_profile": "your profile"
-}
+}

web/src/main/resources/web/css/bloodshed-color.css

@@ -307,4 +307,11 @@ tr:hover .taglist .tag button {
 
 .easylist .filter{
 	background: black;
+}
+
+@media screen and (max-width: 900px) {
+	#app nav a{
+		background: black;
+		color: red;
+	}
 }

web/src/main/resources/web/css/bloodshed.css

@@ -426,6 +426,58 @@ a.wikilink{
     float: right;
 }
 
+@media screen and (min-width: 900px) {
+	#app nav > button.symbol{
+		display: none;
+	}
+}
+
+@media screen and (max-width: 900px) {
+	body{
+		padding-top: 30px;
+	}
+	#app nav{
+        grid-template-columns: 33% 34% 33%;
+		display: grid;
+		padding: 0 10px;
+		position: absolute;
+		left: 0;
+		right: 0;
+    }
+    #app nav form{
+    	grid-column-end: span 2;
+    }
+    #app nav .logout{
+    	grid-column-end: 4;
+    }
+
+	#app nav.collapsed a{
+		display: none;
+	}
+
+	#app nav a {
+	  font-size: 19px !important;
+	  display: grid;
+	  text-align: center;
+	  border: 1px solid;
+	  margin: 5px;
+	  border-radius: 7px;
+	}
+
+	#app nav a::before {
+      font-size: 30px;
+    }
+	#app nav .timetracking{
+		grid-column-end: span 3;
+		font-size: 19px;
+		text-align: center;
+	}
+	#app nav.expanded .timetracking{
+		display: none;
+	}
+}
+
+
 @media screen and (max-width: 600px) {
     .grid2{
         display: grid;
@@ -455,6 +507,18 @@ a.wikilink{
 	.easylist input{
 		font-size: 20px;
 	}
+	#app nav{
+		grid-template-columns: auto auto;
+	}
+	#app nav form{
+		grid-column-end: span 1;
+	}
+    #app nav .logout{
+    	grid-column-end: 3;
+    }
+    #app nav.expanded .timetracking{
+    	grid-column-end: span 2;
+    }
 }
 
 fieldset.vcard{

web/src/main/resources/web/css/default-color.css

@@ -297,4 +297,11 @@ tr:hover .taglist .tag button {
 
 .easylist .filter{
 	background: black;
+}
+
+@media screen and (max-width: 900px) {
+	#app nav a{
+		background: black;
+		color: orange;
+	}
 }

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

@@ -504,8 +504,83 @@ a.wikilink{
     float: right;
 }
 
+@media screen and (min-width: 900px) {
+	#app nav > button.symbol{
+		display: none;
+	}
+}
+
+@media screen and (max-width: 900px) {
+	body{
+		padding-top: 30px;
+	}
+	#app nav{
+        grid-template-columns: 33% 34% 33%;
+		display: grid;
+		padding: 0 10px;
+		position: absolute;
+		left: 0;
+		right: 0;
+    }
+    #app nav form{
+    	grid-column-end: span 2;
+    }
+    #app nav .logout{
+    	grid-column-end: 4;
+    }
+
+	#app nav.collapsed a{
+		display: none;
+	}
+
+	#app nav a {
+	  font-size: 19px !important;
+	  display: grid;
+	  text-align: center;
+	  border: 1px solid;
+	  margin: 5px;
+	  border-radius: 7px;
+	}
+
+	#app nav a::before {
+      font-size: 30px;
+    }
+	#app nav .timetracking{
+		grid-column-end: span 3;
+		font-size: 19px;
+		text-align: center;
+	}
+	#app nav.expanded .timetracking{
+		display: none;
+	}
+    .grid3 {
+        grid-template-columns: auto auto;
+    }
+
+    .grid3 .properties{
+    	grid-column-end: span 2;
+    	order: 1;
+    }
+    .grid3 .tags{
+		order: 2;
+	}
+    .grid3 .notes{
+    	grid-column-end: span 2;
+    	order: 3;
+    }
+
+	.grid3 .locations{
+		order: 5;
+	}
+	.grid3 .items{
+		order: 6;
+	}
+}
+
+
 @media screen and (max-width: 600px) {
-    .grid2{
+    .grid2,
+    .grid3{
         display: grid;
         grid-template-columns: auto;
     }
@@ -533,6 +608,21 @@ a.wikilink{
 	.easylist input{
 		font-size: 20px;
 	}
+	#app nav{
+		grid-template-columns: auto auto;
+	}
+	#app nav form,
+    .grid3 .notes,
+    .grid3 .tags,
+    .grid3 .properties{
+		grid-column-end: span 1;
+	}
+    #app nav .logout{
+    	grid-column-end: 3;
+    }
+    #app nav.expanded .timetracking{
+    	grid-column-end: span 2;
+    }
 }
 
 fieldset.vcard{

web/src/main/resources/web/css/winter-color.css

@@ -282,4 +282,11 @@ tr:hover .taglist .tag button {
 .easylist fieldset {
 	border-color: blue;
 	color: blue;
+}
+
+@media screen and (max-width: 900px) {
+	#app nav a{
+		background: white;
+		color: blue;
+	}
 }

web/src/main/resources/web/css/winter.css

@@ -426,6 +426,58 @@ a.wikilink{
     float: right;
 }
 
+@media screen and (min-width: 900px) {
+	#app nav > button.symbol{
+		display: none;
+	}
+}
+
+@media screen and (max-width: 900px) {
+	body{
+		padding-top: 30px;
+	}
+	#app nav{
+        grid-template-columns: 33% 34% 33%;
+		display: grid;
+		padding: 0 10px;
+		position: absolute;
+		left: 0;
+		right: 0;
+    }
+    #app nav form{
+    	grid-column-end: span 2;
+    }
+    #app nav .logout{
+    	grid-column-end: 4;
+    }
+
+	#app nav.collapsed a{
+		display: none;
+	}
+
+	#app nav a {
+	  font-size: 19px !important;
+	  display: grid;
+	  text-align: center;
+	  border: 1px solid;
+	  margin: 5px;
+	  border-radius: 7px;
+	}
+
+	#app nav a::before {
+      font-size: 30px;
+    }
+	#app nav .timetracking{
+		grid-column-end: span 3;
+		font-size: 19px;
+		text-align: center;
+	}
+	#app nav.expanded .timetracking{
+		display: none;
+	}
+}
+
+
 @media screen and (max-width: 600px) {
     .grid2{
         display: grid;
@@ -455,6 +507,18 @@ a.wikilink{
 	.easylist input{
 		font-size: 20px;
 	}
+	#app nav{
+		grid-template-columns: auto auto;
+	}
+	#app nav form{
+		grid-column-end: span 1;
+	}
+    #app nav .logout{
+    	grid-column-end: 3;
+    }
+    #app nav.expanded .timetracking{
+    	grid-column-end: span 2;
+    }
 }
 
 fieldset.vcard{