diff --git a/ayanova/src/components/date-time-v2-control.vue b/ayanova/src/components/date-time-v2-control.vue
index 007cfa88..44780766 100644
--- a/ayanova/src/components/date-time-v2-control.vue
+++ b/ayanova/src/components/date-time-v2-control.vue
@@ -1,39 +1,33 @@
 <template>
-  <div>
-    <v-row>
-      {{ internalValue }}
-      <v-col cols="6">
-        <v-text-field
-          ref="dateField"
-          :value="dateControlFormat()"
-          @input="handleDateInput"
-          :readonly="readonly"
-          :disabled="disabled"
-          :label="label"
-          :rules="rules"
-          type="date"
-        ></v-text-field>
-      </v-col>
-      <v-col cols="6">
-        <v-text-field
-          ref="timeField"
-          :value="timeControlFormat()"
-          @input="handleTimeInput"
-          :readonly="readonly"
-          :disabled="disabled"
-          type="time"
-        ></v-text-field>
-      </v-col>
-      <v-col cols="12">
-        <p
-          v-show="error"
-          class="form__error v-messages theme--light error--text"
-        >
-          {{ error }}
-        </p>
-      </v-col>
-    </v-row>
-  </div>
+  <!-- <div> -->
+  <v-row>
+    <v-col cols="6">
+      <v-text-field
+        ref="dateField"
+        :value="dateControlFormat()"
+        @input="handleDateInput"
+        :readonly="readonly"
+        :disabled="disabled"
+        :label="label"
+        :rules="rules"
+        type="date"
+        :error-messages="allErrors()"
+        :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
+      ></v-text-field>
+    </v-col>
+    <v-col cols="6">
+      <v-text-field
+        ref="timeField"
+        :value="timeControlFormat()"
+        @input="handleTimeInput"
+        :readonly="readonly"
+        :disabled="disabled"
+        type="time"
+        :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
+      ></v-text-field>
+    </v-col>
+  </v-row>
+  <!-- </div> -->
 </template>
 <script>
 /*  Xeslint-disable */
@@ -54,15 +48,28 @@ export default {
   props: {
     label: String,
     rules: Array,
+    "error-messages": { type: Array, default: null },
     value: { type: String, default: null },
     readonly: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
     error: {
       type: String,
       required: false
-    }
+    },
+    testId: String
   },
   methods: {
+    allErrors() {
+      //  console.log("allErrors:",this.errorMessages)
+      let ret = "";
+      if (this.error != null) {
+        ret = this.error;
+      }
+      if (this.errorMessages != null && this.errorMessages.length > 0) {
+        ret += this.errorMessages.toString();
+      }
+      return ret;
+    },
     dateControlFormat() {
       //yyyy-mm-dd
       return window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index 4a9cfe65..587ffe38 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -101,7 +101,7 @@
             </v-col>
 
             <v-col cols="12" sm="6" lg="4" xl="3">
-              <gz-date-time-picker
+              <gz-date-time-2-picker
                 :label="$ay.t('WidgetEndDate')"
                 :rules="[form().datePrecedence(this, 'startDate', 'endDate')]"
                 :error-messages="form().serverErrors(this, 'endDate')"
@@ -111,7 +111,7 @@
                 ref="endDate"
                 testId="endDate"
                 @input="fieldValueChanged('endDate')"
-              ></gz-date-time-picker>
+              ></gz-date-time-2-picker>
             </v-col>
             <v-col
               v-if="form().showMe(this, 'Active')"