diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index 428178dd..fb8d93c8 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -76,6 +76,44 @@
           auto-grow
         ></v-textarea>
       </v-col>
+
+      <v-col
+        v-if="form().showMe(this, 'WorkOrderCloseByDate')"
+        cols="12"
+        sm="6"
+        lg="4"
+        xl="3"
+      >
+        <gz-date-time-picker
+          :label="$ay.t('WorkOrderCloseByDate')"
+          v-model="value.completeByDate"
+          :readonly="formState.readOnly"
+          ref="completeByDate"
+          data-cy="completeByDate"
+          :error-messages="form().serverErrors(this, 'completeByDate')"
+          @input="fieldValueChanged('completeByDate')"
+        ></gz-date-time-picker>
+      </v-col>
+
+      <v-col
+        v-if="form().showMe(this, 'ProjectId')"
+        cols="12"
+        sm="6"
+        lg="4"
+        xl="3"
+      >
+        <gz-pick-list
+          :aya-type="$ay.ayt().Project"
+          :show-edit-icon="true"
+          v-model="value.projectId"
+          :readonly="formState.readOnly"
+          :label="$ay.t('Project')"
+          ref="projectId"
+          data-cy="projectId"
+          :error-messages="form().serverErrors(this, 'projectId')"
+          @input="fieldValueChanged('projectId')"
+        ></gz-pick-list>
+      </v-col>
     </v-row>
   </div>
 </template>
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 730d3d2f..7a1f5a42 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -68,7 +68,7 @@
                     :readonly="formState.readOnly"
                     :disabled="obj.id === 1"
                     ref="roles"
-                    test-id="roles"
+                    data-cy="roles"
                     :error-messages="form().serverErrors(this, 'roles')"
                     @input="fieldValueChanged('roles')"
                     limit-selection-to="inside"
@@ -138,7 +138,7 @@
                     v-model="obj.lastLogin"
                     readonly
                     ref="lastLogin"
-                    test-id="lastLogin"
+                    data-cy="lastLogin"
                   ></gz-date-time-picker>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 0a75943f..8e714ade 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -74,7 +74,7 @@
                 v-model="obj.roles"
                 :readonly="formState.readOnly"
                 ref="roles"
-                test-id="roles"
+                data-cy="roles"
                 :error-messages="form().serverErrors(this, 'roles')"
                 @input="fieldValueChanged('roles')"
                 limit-selection-to="inside"
diff --git a/ayanova/src/views/cust-customer-note.vue b/ayanova/src/views/cust-customer-note.vue
index 97c61d81..32c923fd 100644
--- a/ayanova/src/views/cust-customer-note.vue
+++ b/ayanova/src/views/cust-customer-note.vue
@@ -48,7 +48,7 @@
             v-model="obj.noteDate"
             :readonly="formState.readOnly"
             ref="noteDate"
-            test-id="noteDate"
+            data-cy="noteDate"
             :error-messages="form().serverErrors(this, 'noteDate')"
             @input="fieldValueChanged('noteDate')"
           ></gz-date-time-picker>
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index f9c4c8f9..1d5a99b4 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -268,7 +268,7 @@
                     v-model="obj.contractExpires"
                     :readonly="formState.readOnly"
                     ref="contractExpires"
-                    test-id="contractExpires"
+                    data-cy="contractExpires"
                     :error-messages="
                       form().serverErrors(this, 'contractExpires')
                     "
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 7f4c9560..51c2e1ac 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -206,7 +206,7 @@
                     v-model="obj.contractExpires"
                     :readonly="formState.readOnly"
                     ref="contractExpires"
-                    test-id="contractExpires"
+                    data-cy="contractExpires"
                     :error-messages="
                       form().serverErrors(this, 'contractExpires')
                     "
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 90af3c4d..bd0c41be 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -78,7 +78,7 @@
                     v-model="obj.roles"
                     :readonly="formState.readOnly"
                     ref="roles"
-                    test-id="roles"
+                    data-cy="roles"
                     :error-messages="form().serverErrors(this, 'roles')"
                     @input="fieldValueChanged('roles')"
                     limit-selection-to="outside"
@@ -125,7 +125,7 @@
                     v-model="obj.lastLogin"
                     readonly
                     ref="lastLogin"
-                    test-id="lastLogin"
+                    data-cy="lastLogin"
                   ></gz-date-time-picker>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue
index bc86813b..1b573a3d 100644
--- a/ayanova/src/views/home-reminder.vue
+++ b/ayanova/src/views/home-reminder.vue
@@ -24,7 +24,7 @@
               v-model="obj.startDate"
               :readonly="formState.readOnly"
               ref="startDate"
-              test-id="startDate"
+              data-cy="startDate"
               :error-messages="form().serverErrors(this, 'startDate')"
               @input="fieldValueChanged('startDate')"
             ></gz-date-time-picker>
@@ -38,7 +38,7 @@
               v-model="obj.stopDate"
               :readonly="formState.readOnly"
               ref="stopDate"
-              test-id="stopDate"
+              data-cy="stopDate"
               @input="fieldValueChanged('stopDate')"
             ></gz-date-time-picker>
           </v-col>
diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue
index 19b0e338..5b84d309 100644
--- a/ayanova/src/views/home-review.vue
+++ b/ayanova/src/views/home-review.vue
@@ -68,7 +68,7 @@
                   (!selfAssigned && !currentUserIsASupervisor)
               "
               ref="dueDate"
-              test-id="dueDate"
+              data-cy="dueDate"
               :error-messages="form().serverErrors(this, 'dueDate')"
               @input="fieldValueChanged('dueDate')"
             ></gz-date-time-picker>
@@ -95,7 +95,7 @@
               v-model="obj.completedDate"
               :readonly="formState.readOnly"
               ref="completedDate"
-              test-id="completedDate"
+              data-cy="completedDate"
               @input="fieldValueChanged('completedDate')"
             ></gz-date-time-picker>
           </v-col>
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index df93a8a8..dafa82bd 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -76,7 +76,7 @@
               v-model="obj.orderedDate"
               :readonly="formState.readOnly"
               ref="orderedDate"
-              test-id="orderedDate"
+              data-cy="orderedDate"
               :error-messages="form().serverErrors(this, 'orderedDate')"
               @input="fieldValueChanged('orderedDate')"
             ></gz-date-time-picker>
@@ -94,7 +94,7 @@
               v-model="obj.expectedReceiveDate"
               :readonly="formState.readOnly"
               ref="expectedReceiveDate"
-              test-id="expectedReceiveDate"
+              data-cy="expectedReceiveDate"
               :error-messages="form().serverErrors(this, 'expectedReceiveDate')"
               @input="fieldValueChanged('expectedReceiveDate')"
             ></gz-date-time-picker>
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index 75ef6de3..fddfe2b7 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -44,7 +44,7 @@
               v-model="obj.dateRequested"
               readonly
               ref="dateRequested"
-              test-id="dateRequested"
+              data-cy="dateRequested"
             ></gz-date-picker>
           </v-col>
           <v-col cols="12" sm="6" lg="4" xl="3">
diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue
index fbd138d6..3f6b2266 100644
--- a/ayanova/src/views/svc-project.vue
+++ b/ayanova/src/views/svc-project.vue
@@ -69,7 +69,7 @@
               v-model="obj.dateStarted"
               :readonly="formState.readOnly"
               ref="dateStarted"
-              test-id="dateStarted"
+              data-cy="dateStarted"
               :error-messages="form().serverErrors(this, 'dateStarted')"
               @input="fieldValueChanged('dateStarted')"
             ></gz-date-time-picker>
@@ -91,7 +91,7 @@
               v-model="obj.dateCompleted"
               :readonly="formState.readOnly"
               ref="dateCompleted"
-              test-id="dateCompleted"
+              data-cy="dateCompleted"
               @input="fieldValueChanged('dateCompleted')"
             ></gz-date-time-picker>
           </v-col>
diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue
index aa5f02f9..1a6862d7 100644
--- a/ayanova/src/views/svc-unit-model.vue
+++ b/ayanova/src/views/svc-unit-model.vue
@@ -86,7 +86,7 @@
               v-model="obj.introducedDate"
               :readonly="formState.readOnly"
               ref="introducedDate"
-              test-id="introducedDate"
+              data-cy="introducedDate"
               :error-messages="form().serverErrors(this, 'introducedDate')"
               @input="fieldValueChanged('introducedDate')"
             ></gz-date-picker>
@@ -122,7 +122,7 @@
               v-model="obj.discontinuedDate"
               :readonly="formState.readOnly"
               ref="discontinuedDate"
-              test-id="discontinuedDate"
+              data-cy="discontinuedDate"
               :error-messages="form().serverErrors(this, 'discontinuedDate')"
               @input="fieldValueChanged('discontinuedDate')"
             ></gz-date-picker>
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index d5cb7381..4575bf0e 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -159,7 +159,7 @@
                     v-model="obj.contractExpires"
                     :readonly="formState.readOnly"
                     ref="contractExpires"
-                    test-id="contractExpires"
+                    data-cy="contractExpires"
                     :error-messages="
                       form().serverErrors(this, 'contractExpires')
                     "
@@ -279,7 +279,7 @@
                     v-model="obj.purchasedDate"
                     :readonly="formState.readOnly"
                     ref="purchasedDate"
-                    test-id="purchasedDate"
+                    data-cy="purchasedDate"
                     :error-messages="form().serverErrors(this, 'purchasedDate')"
                     @input="fieldValueChanged('purchasedDate')"
                   ></gz-date-time-picker>
diff --git a/ayanova/src/views/svc-work-order-status-edit.vue b/ayanova/src/views/svc-work-order-status-edit.vue
index 35802d80..3e6f3987 100644
--- a/ayanova/src/views/svc-work-order-status-edit.vue
+++ b/ayanova/src/views/svc-work-order-status-edit.vue
@@ -48,7 +48,7 @@
               v-model="obj.selectRoles"
               :readonly="formState.readOnly"
               ref="selectRoles"
-              test-id="selectRoles"
+              data-cy="selectRoles"
               :error-messages="form().serverErrors(this, 'selectRoles')"
               @input="fieldValueChanged('selectRoles')"
               limit-selection-to="inside"
@@ -61,7 +61,7 @@
               v-model="obj.removeRoles"
               :readonly="formState.readOnly"
               ref="removeRoles"
-              test-id="removeRoles"
+              data-cy="removeRoles"
               :error-messages="form().serverErrors(this, 'removeRoles')"
               @input="fieldValueChanged('removeRoles')"
               limit-selection-to="inside"
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 64b02975..e0202d76 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -1072,6 +1072,8 @@ async function fetchTranslatedText(vm) {
     "Customer",
     "WorkOrderSerialNumber",
     "WorkOrderSummary",
+    "WorkOrderCloseByDate",
+    "Project",
     "NewStatus",
     "WorkOrderStatus",
     "WorkOrderCustom1",
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index 89a07473..290b7fd9 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -84,7 +84,7 @@
                 v-model="obj.startDate"
                 :readonly="formState.readOnly"
                 ref="startDate"
-                test-id="startDate"
+                data-cy="startDate"
                 :error-messages="form().serverErrors(this, 'startDate')"
                 @input="fieldValueChanged('startDate')"
               ></gz-date-time-picker>
@@ -98,7 +98,7 @@
                 v-model="obj.endDate"
                 :readonly="formState.readOnly"
                 ref="endDate"
-                test-id="endDate"
+                data-cy="endDate"
                 @input="fieldValueChanged('endDate')"
               ></gz-date-time-picker>
             </v-col>