diff --git a/ayanova/src/components/gzdateandtimepicker.vue b/ayanova/src/components/gzdateandtimepicker.vue
index e7cf1027..1a8bfbfe 100644
--- a/ayanova/src/components/gzdateandtimepicker.vue
+++ b/ayanova/src/components/gzdateandtimepicker.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <v-menu
+    <!-- <v-menu
       ref="menu"
-      v-model="menu2"
+      v-model="show"
       :close-on-content-click="false"
       :nudge-right="40"
       :return-value.sync="time"
@@ -13,28 +13,43 @@
       max-width="290px"
       min-width="290px"
     >
-      <template v-slot:activator="{ on }">
-        <v-text-field
-          v-model="time"
-          prepend-inner-icon="fa-calendar-alt"
-          @click:prepend-inner="sproing('CLICK DATE')"
-          append-icon="fa-clock"
-          @click:append="sproing('CLICK TIME')"
-          readonly
-          v-on="on"
-        ></v-text-field>
-      </template>
-      <v-time-picker
-        v-if="menu2"
+       <template v-slot:activator="{ on }">
+      <v-text-field
+        v-model="value"
+        prepend-inner-icon="fa-calendar-alt"
+        @click:prepend-inner="sproing('DATE')"
+        append-icon="fa-clock"
+        @click:append="sproing('TIME')"
+        readonly
+        v-on="on"
+      ></v-text-field>
+    
+    -->
+    
+      <v-text-field
+        v-model="value"
+        prepend-inner-icon="fa-calendar-alt"
+        @click:prepend-inner="sproing('DATE')"
+        append-icon="fa-clock"
+        @click:append="sproing('TIME')"
+        readonly       
+      ></v-text-field>
+      <gz-date-picker v-if="show.datePicker" v-bind:value="value"></gz-date-picker>
+      <gz-time-picker v-if="show.timePicker" v-bind:value="value"></gz-time-picker>
+  
+
+    <!-- <v-time-picker
+        v-if="show.timePicker"
         v-bind:value="value"
         v-on:input="$emit('input', $event.target.value)"
       ></v-time-picker>
-    </v-menu>
+    </v-menu>-->
   </div>
 </template>
 
 
 <script>
+/*  eslint-disable */
 /*
 TODO:
 Add the date picker
@@ -50,6 +65,10 @@ export default {
   },
   data() {
     return {
+      show: {
+        timePicker: false,
+        datePicker: false
+      },
       time: null,
       menu2: false,
       modal2: false
@@ -57,8 +76,16 @@ export default {
   },
   mounted() {},
   methods: {
-    sproing: function(msg) {
-      alert(msg);
+    sproing: function(sproingUp) {
+      if (sproingUp == "DATE") {
+        this.show.datePicker = true;
+        this.show.timePicker = false;
+      } else {
+        this.show.datePicker = false;
+        this.show.timePicker = true;
+      }
+      //debugger;
+      //console.log(this.show);
     }
   }
 };