Merge pull request #166 from OHDSI/network_performance_changes

Network performance report: default settings and minor changes
OHDSI · Aug 15, 2022 · be83107 · be83107
2 parents 1c42be9 + 69d7c55
commit be83107
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 12 deletions.
diff --git a/src/interface/components/Pivot/Pivot.vue b/src/interface/components/Pivot/Pivot.vue
@@ -164,7 +164,7 @@
                 class="pa-3"
                 label="Aggregate attribute"
                 :menu-props="{ bottom: true, offsetY: true }"
-                :items="getDisplayedAttributes"
+                :items="getAggregateValues"
               ></v-select>
             </div>
           </v-card>
@@ -212,9 +212,13 @@ export default {
     VuePivottable,
     draggable,
   },
+
   props: {
     data: { type: Array, required: true, default: () => [] },
     attributes: { type: Array, required: false, default: () => [] },
+    aggregators: { type: Array, required: false, default: () => [] },
+    aggregateAttrs: { type: Array, required: false, default: () => [] },
+    defaults: { type: Object, required: false, default: () => {} },
     eventListener: { type: Function, required: false, default: function () {} },
   },
   data() {
@@ -223,8 +227,7 @@ export default {
       selectedFilterAttributes: [],
       selectedCols: [],
       selectedFilterValues: {},
-      aggregators: ["Count", "Sum"],
-      aggregateFunction: "Count",
+      aggregateFunction: "",
       aggregateValue: [""],
     };
   },
@@ -241,11 +244,31 @@ export default {
         {}
       );
     },
+    getAggregateValues: function () {
+      if (this.aggregateAttrs.length) {
+        return this.aggregateAttrs;
+      } else {
+        return this.getDisplayedAttributes;
+      }
+    },
     getDisplayedAttributes: function () {
       return this.attributes;
     },
   },
+  created() {
+    this.load();
+  },
   methods: {
+    load: function () {
+      this.selectedRows = this.defaults?.rows ? this.defaults.rows : [];
+      this.selectedCols = this.defaults?.columns ? this.defaults.columns : [];
+      this.aggregateFunction = this.defaults?.aggregateFunction
+        ? this.defaults?.aggregateFunction
+        : this.aggregators[0];
+      this.aggregateValue = this.defaults?.aggregateValue
+        ? this.defaults?.aggregateValue
+        : [this.getAggregateValues[0]];
+    },
     removeRows(i) {
       this.$delete(this.selectedRows, i);
     },

diff --git a/src/interface/views/network/NetworkPerformance.vue b/src/interface/views/network/NetworkPerformance.vue
@@ -3,14 +3,13 @@
     <v-card>
       <Pivot
         :data="getData['networkPerformance']"
-        :attributes="[
-          'TASK',
-          'TIMING',
-          'PACKAGE',
-          'CATEGORY',
-          'SOURCE',
-          'RELEASE',
-        ]"
+        :attributes="['TASK', 'PACKAGE', 'CATEGORY', 'SOURCE']"
+        :defaults="{
+          rows: ['SOURCE'],
+          columns: ['PACKAGE'],
+        }"
+        :aggregators="['Sum']"
+        :aggregate-attrs="['TIMING']"
       />
     </v-card>
   </v-container>
@@ -29,4 +28,9 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+>>> table.pvtTable tbody tr td {
+  text-decoration: none;
+  cursor: default;
+}
+</style>
diff --git a/src/interface/views/release/DataQualityResults.vue b/src/interface/views/release/DataQualityResults.vue
@@ -451,6 +451,7 @@
                   'CDM_TABLE_NAME',
                   'FAILED',
                 ]"
+                :aggregators="['Count']"
               >
               </Pivot>
             </v-container>