ayanova/src/views/home-review.vue

@@ -20,26 +20,26 @@
 
           <v-col cols="12" sm="6" lg="4" xl="3">
             <gz-date-time-picker
-              :label="$ay.t('ReviewStartDate')"
+              :label="$ay.t('ReviewDueDate')"
-              v-model="obj.startDate"
+              v-model="obj.dueDate"
               :readonly="formState.readOnly"
-              ref="startDate"
+              ref="dueDate"
-              testId="startDate"
+              testId="dueDate"
-              :error-messages="form().serverErrors(this, 'startDate')"
+              :error-messages="form().serverErrors(this, 'dueDate')"
-              @input="fieldValueChanged('startDate')"
+              @input="fieldValueChanged('dueDate')"
             ></gz-date-time-picker>
           </v-col>
 
           <v-col cols="12" sm="6" lg="4" xl="3">
             <gz-date-time-picker
-              :label="$ay.t('ReviewStopDate')"
+              :label="$ay.t('ReviewCompletedDate')"
-              :rules="[form().datePrecedence(this, 'startDate', 'stopDate')]"
+              :rules="[form().datePrecedence(this, 'dueDate', 'completedDate')]"
-              :error-messages="form().serverErrors(this, 'stopDate')"
+              :error-messages="form().serverErrors(this, 'completedDate')"
-              v-model="obj.stopDate"
+              v-model="obj.completedDate"
               :readonly="formState.readOnly"
-              ref="stopDate"
+              ref="completedDate"
-              testId="stopDate"
+              testId="completedDate"
-              @input="fieldValueChanged('stopDate')"
+              @input="fieldValueChanged('completedDate')"
             ></gz-date-time-picker>
           </v-col>
 
@@ -56,27 +56,19 @@
             ></v-textarea>
           </v-col>
 
-          <v-col
+          <v-col cols="12">
-            v-if="form().showMe(this, 'ReviewColor')"
+            <v-textarea
-            cols="12"
+              v-model="obj.completionNotes"
-            sm="6"
-            lg="4"
-            xl="3"
-          >
-            <!-- https://vuetifyjs.com/en/components/color-pickers -->
-            <span class="v-label v-label--active theme--light">
-              {{ $ay.t("ReviewColor") }}
-            </span>
-            <v-color-picker
-              v-model="obj.color"
               :readonly="formState.readOnly"
-              hide-mode-switch
+              :label="$ay.t('ReviewCompletionNotes')"
-              mode="hexa"
+              :error-messages="form().serverErrors(this, 'completionNotes')"
-              :error-messages="form().serverErrors(this, 'color')"
+              ref="completionNotes"
-              ref="color"
+              data-cy="completionNotes"
-              @input="fieldValueChanged('color')"
+              @input="fieldValueChanged('completionNotes')"
-            ></v-color-picker>
+              auto-grow
+            ></v-textarea>
           </v-col>
+
           <!-- --------------------------------- -->
 
           <v-col v-if="form().showMe(this, 'Tags')" cols="12">
@@ -208,6 +200,8 @@ export default {
         //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
         //I.E. Serial, usertype fields, ACTIVE
         //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
+        //{"data":{"id":2,"concurrency":1257740,"name":"Follow up on this unit","notes":"Additional text about this unit","wiki":null,"customFields":null,"tags":["completed.review","v7-import"],
+        //"dueDate":"2019-03-21T22:00:00Z","completedDate":"2019-03-21T22:00:00Z","completionNotes":null,"userId":2,"assignedByUserId":1,"objectId":9,"objectType":31,"overDue":false}}
         {
           id: 0,
           concurrency: 0,
@@ -217,10 +211,14 @@ export default {
           wiki: null,
           customFields: "{}",
           tags: [],
-          startDate: window.$gz.locale.nowUTC8601String(),
+          dueDate: null,
-          stopDate: null,
+          completedDate: null,
+          completionNotes: null,
           userId: window.$gz.store.state.userId,
-          color: "#FFFFFFFF"
+          assignedByUserId: window.$gz.store.state.userId,
+          objectId: null,
+          objectType: null,
+          overDue: false
         },
 
       tab: 0,