diff --git a/ayanova/src/components/days-of-week-control.vue b/ayanova/src/components/days-of-week-control.vue
new file mode 100644
index 00000000..4262b6df
--- /dev/null
+++ b/ayanova/src/components/days-of-week-control.vue
@@ -0,0 +1,83 @@
+<template>
+  <v-select
+    :items="availableRoles"
+    item-text="name"
+    item-value="id"
+    multiple
+    chips
+    deletable-chips
+    :value="selectedValue"
+    @input="handleInput"
+    :readonly="readonly"
+    :disabled="disabled"
+    :label="label"
+    :rules="rules"
+    :error-messages="errorMessages"
+    :data-cy="'roleinput:' + testId"
+  ></v-select>
+</template>
+<script>
+/*  Xeslint-disable */
+export default {
+  async created() {
+    await window.$gz.enums.fetchEnumList("AuthorizationRoles");
+    let rawRoles = window.$gz.enums.getSelectionList("AuthorizationRoles");
+    if (this.limitSelectionTo == null) {
+      this.availableRoles = rawRoles;
+    } else {
+      if (this.limitSelectionTo == "inside") {
+        //CustomerRestricted=2048, Customer=4096
+        this.availableRoles = rawRoles.filter(
+          z => z.id != 2048 && z.id != 4096
+        );
+      } else {
+        this.availableRoles = rawRoles.filter(
+          z => z.id == 2048 || z.id == 4096
+        );
+      }
+    }
+  },
+  data() {
+    return {
+      internalValue: null,
+      availableRoles: []
+    };
+  },
+  props: {
+    label: { type: String, default: null },
+    rules: { type: Array, default: undefined },
+    errorMessages: { type: Array, default: null },
+    value: { type: Number, default: 0 },
+    readonly: { type: Boolean, default: false },
+    disabled: { type: Boolean, default: false },
+    limitSelectionTo: { type: String, default: null }, //"inside" - no customer roles, "outside" - no non-customer roles
+    testId: { type: String, default: null }
+  },
+  computed: {
+    selectedValue() {
+      let ret = [];
+      if (this.value != null && this.value != 0) {
+        for (let i = 0; i < this.availableRoles.length; i++) {
+          let role = this.availableRoles[i];
+          if (!!(this.value & role.id)) {
+            ret.push(role.id);
+          }
+        }
+      }
+      return ret;
+    }
+  },
+  methods: {
+    handleInput(value) {
+      let newValue = 0;
+      if (value != null && value != [] && value.length > 0) {
+        for (let i = 0; i < value.length; i++) {
+          let role = value[i];
+          newValue = newValue | role;
+        }
+      }
+      this.$emit("input", newValue);
+    }
+  }
+};
+</script>
diff --git a/ayanova/src/components/pm-header.vue b/ayanova/src/components/pm-header.vue
index 5a684d10..3be7e72c 100644
--- a/ayanova/src/components/pm-header.vue
+++ b/ayanova/src/components/pm-header.vue
@@ -135,6 +135,69 @@
         </v-row>
       </v-col>
 
+      ExcludeDaysOfWeek
+      <v-col cols="12" sm="6" lg="4" xl="3">
+        <v-checkbox
+          v-model="value.excludeDaysOfWeek"
+          label="Monday"
+          value="0"
+        ></v-checkbox>
+        <v-checkbox
+          v-model="value.excludeDaysOfWeek"
+          label="Monday"
+          value="0"
+        ></v-checkbox>
+        <v-checkbox
+          v-model="value.excludeDaysOfWeek"
+          label="Monday"
+          value="0"
+        ></v-checkbox>
+        <v-checkbox
+          v-model="value.excludeDaysOfWeek"
+          label="Monday"
+          value="0"
+        ></v-checkbox>
+        <v-checkbox
+          v-model="value.excludeDaysOfWeek"
+          label="Monday"
+          value="0"
+        ></v-checkbox>
+        <v-checkbox
+          v-model="value.excludeDaysOfWeek"
+          label="Monday"
+          value="0"
+        ></v-checkbox>
+        <v-checkbox
+          v-model="value.excludeDaysOfWeek"
+          label="Monday"
+          value="0"
+        ></v-checkbox>
+      </v-col>
+
+      <v-col cols="12" sm="6" lg="4" xl="3">
+        <gz-date-time-picker
+          :label="$ay.t('PMNextServiceDate')"
+          v-model="value.nextServiceDate"
+          :readonly="formState.readOnly"
+          ref="nextServiceDate"
+          data-cy="nextServiceDate"
+          :error-messages="form().serverErrors(this, 'nextServiceDate')"
+          @input="fieldValueChanged('nextServiceDate')"
+        ></gz-date-time-picker>
+      </v-col>
+
+      <v-col cols="12" sm="6" lg="4" xl="3">
+        <gz-date-time-picker
+          :label="$ay.t('PMStopGeneratingDate')"
+          v-model="value.stopGeneratingDate"
+          :readonly="formState.readOnly"
+          ref="stopGeneratingDate"
+          data-cy="stopGeneratingDate"
+          :error-messages="form().serverErrors(this, 'stopGeneratingDate')"
+          @input="fieldValueChanged('stopGeneratingDate')"
+        ></gz-date-time-picker>
+      </v-col>
+
       <!-- ##################################################################################### -->
       <v-col
         v-if="