Merge branch 'main' into module/stock

frontend/src/routes/task/View.svelte

@@ -214,11 +214,11 @@
         <MarkdownEditor bind:value={task.description} editable={true} onSet={val => update({description:val})} />
     </div>
     {/if}
-    {#if task.start_date}
+    {#if !showSettings && task.start_date}
         <div>{t('start_date')}</div>
         <div class="start date">{task.start_date}</div>
     {/if}
-    {#if task.due_date}
+    {#if !showSettings && task.due_date}
         <div>{t('due_date')}</div>
         <div class="due date">{task.due_date}</div>
     {/if}
@@ -226,14 +226,6 @@
         <div>{t('estimated_time')}</div>
         <div class="estimated time">{task.estimated_time} h</div>
     {/if}
-    <div>{t('members')}</div>
-    <div class="members">
-        <ul>
-            {#each Object.values(task.members) as member}
-            <li>{member.user.name} ({t('permission_'+member.permission.name.toLowerCase())})</li>
-            {/each}
-        </ul>
-    </div>
     {#if showSettings}
         <div>{t('extended_settings')}</div>
         <label>
@@ -251,7 +243,6 @@
         <div>
             <PermissionEditor members={task.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
         </div>
-
         <div>{t('start_date')}</div>
         <div>
             <input type="date" bind:value={task.start_date} onchange={() => update({start_date:task.start_date})} />
@@ -276,6 +267,15 @@
         <div>
             <RequiredTasks {task} />
         </div>
+    {:else}
+    <div>{t('members')}</div>
+    <div class="members">
+        <ul>
+            {#each Object.values(task.members) as member}
+            <li>{member.user.name} ({t('permission_'+member.permission.name.toLowerCase())})</li>
+            {/each}
+        </ul>
+    </div>
     {/if}
 
     <div>