From bc194062827514aeb62a110f5b5fd6aeb1683e63 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 24 Jun 2021 19:36:47 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt             |  4 ++++
 ayanova/src/views/ay-report-edit.vue | 35 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index efcf2fcb..cec2d952 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -234,6 +234,10 @@ todo: start testing with real licensing scheme ("notfound")
 
 todo: notify on user login?
 
+todo: report template NAME uniqueness validation rule: can this be unique by ayatype only?
+	seems weird that no two reports of any kind can have same name
+	also the default comes up as "report" sb blank with pre-broken rule saying name is required or at least uniquify it with a timestamp or something
+
 todo: tag based notifications need to be rechecked if tags change, not just the field(s) in question for that notification
 	for example, user makes a workorder with closeby date and tags but tags don't match when saves
 	user realizes missed a critical tag, adds it and saves; notification should then check again if can apply whatever it was
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 1dd9f463..20d99b77 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -80,6 +80,21 @@
                 limit-selection-to="inside"
               ></gz-role-picker>
             </v-col>
+
+            <v-col v-if="showIncludeDescendants" cols="12" sm="6" lg="4" xl="3">
+              <v-checkbox
+                v-model="obj.includeWoItemDescendants"
+                :readonly="formState.readOnly"
+                :label="$ay.t('ReportIncludeAllWorkOrderItemDescendants')"
+                ref="includeWoItemDescendants"
+                data-cy="includeWoItemDescendants"
+                :error-messages="
+                  form().serverErrors(this, 'includeWoItemDescendants')
+                "
+                @change="fieldValueChanged('includeWoItemDescendants')"
+              ></v-checkbox>
+            </v-col>
+
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-checkbox
                 v-model="obj.active"
@@ -450,6 +465,7 @@ export default {
         id: 0,
         concurrency: 0,
         name: "report",
+        includeWoItemDescendants: false,
         active: true,
         notes: "",
         roles: 124927, //all except customers
@@ -583,6 +599,25 @@ Handlebars.registerHelper('loud', function (aString) {
       deep: true
     }
   },
+  computed: {
+    showIncludeDescendants: function() {
+      switch (this.obj.aType) {
+        case window.$gz.type.WorkOrderItemExpense:
+        case window.$gz.type.WorkOrderItemLabor:
+        case window.$gz.type.WorkOrderItemLoan:
+        case window.$gz.type.WorkOrderItemPart:
+        case window.$gz.type.WorkOrderItemPartRequest:
+        case window.$gz.type.WorkOrderItemScheduledUser:
+        case window.$gz.type.WorkOrderItemTask:
+        case window.$gz.type.WorkOrderItemTravel:
+        case window.$gz.type.WorkOrderItemUnit:
+        case window.$gz.type.WorkOrderItemOutsideService:
+          return true;
+        default:
+          return false;
+      }
+    }
+  },
   methods: {
     //alternate method, one editor with tabs example
     //probably should do this way