Merge branch 'main' into dev

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

.gitea/workflows/docker.yaml

@@ -41,11 +41,6 @@ jobs:
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
 
-      - name: Restart umbrella.srsoftware.de
-        if: github.ref == 'refs/heads/dev'
-        run: |
-          curl -X POST -H "Authorization: Bearer ${{ secrets.ELDORADO_MAKE_BEARER }}" -d umbrella_25_start https://make.eldorado.srsoftware.de/launch
-
   Clean-Registry:
     runs-on: ubuntu-latest
     steps:

frontend/src/App.svelte

@@ -90,7 +90,7 @@
         {#if messages.warning}
         <span class="warn">{@html messages.warning}</span>
         {/if}
-        <Route path="/"                            component={User} />
+        <Route path="/"                            component={ProjectList} />
         <Route path="/account/:id"                 component={Account} />
         <Route path="/accounting"                  component={Accounts} />
         <Route path="/accounting/new"              component={NewAccount} />

frontend/src/routes/accounting/index.svelte

@@ -44,9 +44,9 @@
 	</span>
 
 	<ul>
-	{#each accounts as account (account.id)}
+	{#each accounts.toSorted((a,b) => a.name.localeCompare(b.name)) as account (account.id)}
 		<li>
-			<a {onclick} href="/account/{account.id}">{account.name} ({account.id})</a>
+			<a {onclick} href="/account/{account.id}">{account.name}</a>
 		</li>
 	{/each}
 	</ul>

frontend/src/routes/task/EasyList.svelte

@@ -137,7 +137,7 @@
         <legend>{t('state_open')}</legend>
         {#if sorted}
         {#each sorted as task}
-            {#if task.status == 20 && match(task)}
+            {#if task.status < 60 && task.status >= 20 && match(task)}
             <div href={`/task/${task.id}/view`} title={task.description.source} task_id={task.id} {onclick} {oncontextmenu} {ontouchstart} {ontouchend} onmousedown={ontouchstart} onmouseup={ontouchend} >
                 {task.name}
             </div>

frontend/src/routes/time/Index.svelte

@@ -1,7 +1,7 @@
 <script>
     import { onMount }                from 'svelte';
     import { useTinyRouter }          from 'svelte-tiny-router';
-    import { api, drop, patch, post } from '../../urls.svelte.js';
+    import { api, drop, get, patch, post } from '../../urls.svelte.js';
     import { error, yikes }           from '../../warn.svelte';
     import { t }         from '../../translations.svelte.js';
     import { timetrack } from '../../user.svelte.js';
@@ -41,10 +41,18 @@
     });
 
     async function addTime(task_id){
-        const url  = api(`time/track_task/${task_id}`);
-        const resp = await post(url,now()); // create new time or return time with assigned tasks
+        let url  = api(`time/track_task/${task_id}`);
+        let resp = await post(url,now()); // create new time or return time with assigned tasks
         if (resp.ok) {
             const track = await resp.json();
+            if (timetrack.running){
+                url  = api(`time/${timetrack.running.id}`);
+                resp = await get(url);
+                if (resp.ok){
+                    let previous = await resp.json();
+                    times[previous.id] = previous;
+                }
+            }
             timetrack.running = track;
         } else {
             error(resp);

time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java

@@ -79,8 +79,15 @@ public class TimeModule extends BaseHandler implements TimeService {
 			if (user.isEmpty()) return unauthorized(ex);
 			var head = path.pop();
 			return switch (head) {
-                case STARTED -> getStartedTime(user.get(),ex);
-				case null, default -> super.doGet(path,ex);
+				case STARTED -> getStartedTime(user.get(),ex);
+				case null -> super.doGet(path,ex);
+				default -> {
+					try {
+						yield sendContent(ex,timeDb.load(Long.parseLong(head)));
+					} catch (NumberFormatException ignored) {
+						yield super.doGet(path,ex);
+					}
+				}
 			};
 		} catch (UmbrellaException e){
 			return send(ex,e);

translations/src/main/resources/de.json

@@ -17,6 +17,7 @@
   "abort": "abbrechen",
   "account": "Konto",
   "accounting": "Konten",
+  "account name": "Konto-Name",
   "accounts": "Konten",
   "actions": "Aktionen",
   "add_login_service": "Login-Service anlegen",
@@ -75,6 +76,7 @@
   "CREATE_USERS": "Nutzer anlegen",
   "create_pdf": "PDF erzeugen",
   "created_with": "erzeugt mit {tool} von {producer}",
+  "currency": "Währung",
   "customer": "Kunde",
   "customer_address": "Adresse",
   "customer_email": "Emailadresse des Kunden",
@@ -162,6 +164,7 @@
   "files": "Dateien",
   "filter": "Filter",
   "filter by tags": "Nach Tags filtern",
+  "first_transaction": "erste Transaktion",
   "footer": "Fuß-Text",
   "foreign_id": "externe Kennung",
   "forgot_pass"  : "Password vergessen?",

translations/src/main/resources/en.json

@@ -17,6 +17,7 @@
   "abort": "abort",
   "account": "account",
   "accounting": "accounting",
+  "account name": "Account name",
   "accounts": "accounts",
   "actions": "actions",
   "add_login_service": "add login service",
@@ -75,6 +76,7 @@
   "CREATE_USERS": "create users",
   "create_pdf": "create PDF",
   "created_with": "created with {tool} by {producer}",
+  "currency": "Currency",
   "customer": "customer",
   "customer_address": "address",
   "customer_email": "customer email address",
@@ -162,6 +164,7 @@
   "files": "files",
   "filter": "filter",
   "filter by tags": "filter by tags",
+  "first_transaction": "first transaction",
   "footer": "footer",
   "foreign_id": "external ID",
   "forgot_pass"  : "forgot password?",
@@ -459,11 +462,11 @@
   "wiki_pages": "wiki pages",
 
   "year": "year",
-  "You have been added to the new project '{project}', created by {user}:\n\n{body}": "You have been added to the new project '{project}', created by {user}:\n\n{body}",
-  "You can view/edit this transaction at {base_url}/account/{id}": "Du kannst diese transaktion unter {base_url}/account/{id} ansehen",
+  "You can view/edit this transaction at {base_url}/account/{id}": "You can view/edit this transaction at {base_url}/account/{id}",
   "You can view/edit this project at {base_url}/project/{id}/view": "You can view/edit this project at {base_url}/project/{id}/view",
   "You can view/edit this task at {base_url}/task/{id}/view": "You can view/edit this task at {base_url}/task/{id}/view",
   "You can view/edit this wiki page at {base_url}/wiki/{id}/view": "You can view/edit this wiki page at {base_url}/wiki/{id}/view",
+  "You have been added to the new project '{project}', created by {user}:\n\n{body}": "You have been added to the new project '{project}', created by {user}:\n\n{body}",
   "You may change your notification settings at {base_url}/message/settings": "You may change your notification settings at {base_url}/message/settings .",
   "Your token to create a new password" : "Your token to create a new password",
   "your_profile": "your profile"