diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 762883aa..d74855f0 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -49,6 +49,10 @@ TODO: Date picker is not immediately updating the view when a selection is made
 	- Time picker works properly
 	- diagnose this with the standalone date-picker component for custom field and then port to the dateAndTime picker which exhibits the same issue
 
+TODO: Date picker and time picker were copied from dateAndTime picker and seem to be retaining the full date and time when they should really only have a single part or is that wrong?
+	- i.e. Date picker is still accessing the time and factoring it in and Time picker is still using the date
+		- DateOnly method used in time picker and timeonly method used in datepicker when setting the value
+
 TODO: Change detection dirty tracking not quite right on the widget form:
 	- Make a new record then click into each field and edit it and notice the save button doesn't enable
 	- But, if you tab between controls it *does* enable so somehow it's not firing a change event or something
diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue
index 1f75634b..0bfecd95 100644
--- a/ayanova/src/components/date-control.vue
+++ b/ayanova/src/components/date-control.vue
@@ -15,7 +15,7 @@
               :error="!!error"
             ></v-text-field>
           </template>
-          <v-date-picker v-model="dateOnly" @input="dlgdate = false">
+          <v-date-picker v-model="dateOnly">
             <v-spacer></v-spacer>
             <v-btn text color="primary" @click="dlgdate = false">Close</v-btn>
           </v-date-picker>
@@ -38,7 +38,7 @@
 /*  Xeslint-disable */
 export default {
   beforeCreate() {
-    //debugger;
+    //debugger;@input="dlgdate = false"
     //this is a nothing line as a test
     //check pre-requisites exist just in case
     if (window.$gz.errorHandler.devMode()) {
@@ -65,8 +65,10 @@ export default {
     date() {
       //this tortuous fuckery is required so that the input and change events only fire on a real change, not initial page load
       //also it shouldn't signal a change if the values are the same and nothing was effectively changed
+
       var hasChanged = false;
-      if (this.oldDate != null && this.date != this.oldDate) {
+
+      if (this.date != this.oldDate) {
         hasChanged = true;
       }
       this.oldDate = this.date;