Merge branch 'dev' into feature/#1128-multi-file-input-dateianzahl-ko…

…nfigurierbar

digiwf-apps/package.json

@@ -2,6 +2,7 @@
   "name": "@muenchen/digiwf-apps",
   "description": "Vue JS Monorepo with Lerna and Vite",
   "scripts": {
+    "api": "lerna run api",
     "init": "npm install && npm run clean && lerna bootstrap",
     "clean": "lerna clean --yes && lerna exec rimraf dist",
     "refresh": "lerna bootstrap",

digiwf-apps/packages/apps/digiwf-tasklist/components.d.ts

@@ -7,6 +7,7 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    AppHelpMenu: typeof import('./src/components/UI/help/AppHelpMenu.vue')['default']
     AppJsonForm: typeof import('./src/components/schema/AppJsonForm.vue')['default']
     AppJsonRenderer: typeof import('./src/components/schema/AppJsonRenderer.vue')['default']
     AppKeyBindingsDialog: typeof import('./src/components/UI/help/AppKeyBindingsDialog.vue')['default']
@@ -24,20 +25,23 @@ declare module '@vue/runtime-core' {
     BaseForm: typeof import('./src/components/form/BaseForm.vue')['default']
     BaseLdapInput: typeof import('./src/components/form/BaseLdapInput.vue')['default']
     BaseMarkdownOutput: typeof import('./src/components/form/BaseMarkdownOutput.vue')['default']
-    ContrastModeSelection: typeof import('./src/components/UI/ContrastModeSelection.vue')['default']
     CsvOutput: typeof import('./src/components/form/CsvOutput.vue')['default']
     DwfButton: typeof import('./src/components/common/DwfButton.vue')['default']
     FileOutput: typeof import('./src/components/form/FileOutput.vue')['default']
     GroupTaskItem: typeof import('./src/components/task/GroupTaskItem.vue')['default']
+    HelpIcon: typeof import('./src/components/UI/icons/HelpIcon.vue')['default']
     HighContrastIcon: typeof import('./src/components/UI/icons/HighContrastIcon.vue')['default']
     ImageOutput: typeof import('./src/components/form/ImageOutput.vue')['default']
     KeyBindingLine: typeof import('./src/components/UI/help/KeyBindingLine.vue')['default']
+    KeyboardAccessibilityIcon: typeof import('./src/components/UI/icons/KeyboardAccessibilityIcon.vue')['default']
+    KeyboardIcon: typeof import('./src/components/UI/icons/KeyboardAccessibilityIcon.vue')['default']
     LoadingFab: typeof import('./src/components/UI/LoadingFab.vue')['default']
     PdfOutput: typeof import('./src/components/form/PdfOutput.vue')['default']
     ProcessDefinitionItem: typeof import('./src/components/process/ProcessDefinitionItem.vue')['default']
     ProcessInstanceItem: typeof import('./src/components/process/ProcessInstanceItem.vue')['default']
     SearchField: typeof import('./src/components/common/SearchField.vue')['default']
     SortBySelect: typeof import('./src/components/common/SortBySelect.vue')['default']
+    StatementIcon: typeof import('./src/components/UI/icons/StatementIcon.vue')['default']
     TaskFollowUpDialog: typeof import('./src/components/task/TaskFollowUpDialog.vue')['default']
     TaskItem: typeof import('./src/components/task/TaskItem.vue')['default']
     TaskList: typeof import('./src/components/task/TaskList.vue')['default']
@@ -77,10 +81,12 @@ declare module '@vue/runtime-core' {
     VListItem: typeof import('vuetify/lib')['VListItem']
     VListItemAvatar: typeof import('vuetify/lib')['VListItemAvatar']
     VListItemContent: typeof import('vuetify/lib')['VListItemContent']
+    VListItemGroup: typeof import('vuetify/lib')['VListItemGroup']
     VListItemSubtitle: typeof import('vuetify/lib')['VListItemSubtitle']
     VListItemTitle: typeof import('vuetify/lib')['VListItemTitle']
     VMain: typeof import('vuetify/lib')['VMain']
     VMenu: typeof import('vuetify/lib')['VMenu']
+    VMessages: typeof import('vuetify/lib')['VMessages']
     VMultiUserInput: typeof import('./src/components/schema/VMultiUserInput.vue')['default']
     VNavigationDrawer: typeof import('vuetify/lib')['VNavigationDrawer']
     VProgressCircular: typeof import('vuetify/lib')['VProgressCircular']

digiwf-apps/packages/apps/digiwf-tasklist/src/App.vue

@@ -24,42 +24,24 @@
       <v-spacer/>
       <span>{{ stage?.displayName }}</span>
       <v-spacer/>
-      <v-btn
-        icon
-        aria-label="Tastaturbedienungsanleitung öffnen"
-        @click="openKeyBindingsDialoge"
-      >
-        <v-icon>mdi-keyboard</v-icon>
-      </v-btn>
+      <app-help-menu
+        @openKeyBindingsDialoge="openKeyBindingsDialoge"
+        @closeKeyBindingsDialoge="closeKeyBindingsDialoge"
+      />
 
       {{ username }}
 
-      <v-menu offset-y>
-        <template v-slot:activator="{ on, attrs }">
-          <v-btn
-            aria-label="Avatar Icon Button"
-            text
-            fab
-            v-bind="attrs"
-            v-on="on"
-          >
-            <v-icon
-              aria-label="Avatar Icon"
-              class="white--text" >
-              mdi-account-circle
-            </v-icon>
-          </v-btn>
-        </template>
-        <v-list>
-          <v-list-item>
-            <v-list-item-title>
-              <contrast-mode-selection/>
-            </v-list-item-title>
-          </v-list-item>
-        </v-list>
-      </v-menu>
-
-
+      <v-btn
+        aria-label="Avatar Icon"
+        text
+        fab
+      >
+        <v-icon
+          aria-label="Avatar Icon"
+          class="white--text">
+          mdi-account-circle
+        </v-icon>
+      </v-btn>
     </v-app-bar>
 
     <v-navigation-drawer
@@ -201,14 +183,14 @@ import Vue from "vue";
 import { Component, Watch } from "vue-property-decorator";
 import { InfoTO, ServiceInstanceTO, UserTO, } from "@muenchen/digiwf-engine-api-internal";
 import AppMenuList from "./components/UI/appMenu/AppMenuList.vue";
-import AppKeyBindingsDialog from "./components/UI/help/AppKeyBindingsDialog.vue";
-import { apiGatewayUrl } from "./utils/envVariables";
-import { queryClient } from "./middleware/queryClient";
+import AppHelpMenu from "./components/UI/help/AppHelpMenu.vue";
+import {apiGatewayUrl} from "./utils/envVariables";
+import {queryClient} from "./middleware/queryClient";
 import ContrastModeSelection from "./components/UI/ContrastModeSelection.vue";
 import StageInfoService, { StageInfo} from "./api/StageInfoService";
 
 @Component({
-  components: {AppKeyBindingsDialog, ContrastModeSelection, AppMenuList}
+  components: {AppHelpMenu, AppMenuList}
 })
 export default class App extends Vue {
   drawer = true;

digiwf-apps/packages/apps/digiwf-tasklist/src/api/tasks/tasksApiCalls.ts

@@ -53,7 +53,7 @@ export const callCancelTaskInTaskService = (taskId: string): Promise<void> => {
 
 export const callCompleteTaskInTaskService = (taskId: string, variables: TaskVariables): Promise<void> => {
   const cfg = ApiConfig.getTasklistAxiosConfig(FetchUtils.getPOSTConfig({}));
-  return TaskApiFactory(cfg).completeTask(taskId, variables)
+  return TaskApiFactory(cfg).completeTask(taskId, { variables: variables })
     .then(() => Promise.resolve())
     .catch((e: AxiosError) => {
     if(e.response?.status === 400) {
@@ -76,7 +76,7 @@ export const callDeferTask = (taskId: string, followUpDate: string): Promise<voi
 
 export const callSaveTaskInTaskService = (taskId: string, variables: TaskVariables): Promise<void> => {
   const cfg = ApiConfig.getTasklistAxiosConfig(FetchUtils.getPOSTConfig({}));
-  return TaskApiFactory(cfg).saveTaskVariables(taskId, variables)
+  return TaskApiFactory(cfg).saveTaskVariables(taskId, { variables : variables })
     .then(() => Promise.resolve())
     .catch((e: AxiosError) => {
       if(e.response?.status === 400) {