From 38a5a145f9a27cfde33b1aad7bf2bbc7ea4b3eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C5=BEe=20=C5=BDitnik?= <anze.zitnik@xlab.si>
Date: Fri, 27 May 2022 13:34:42 +0200
Subject: [PATCH] Display 'targetValue' attribute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Squashed commit of the following:
commit a19afbabad93e6654d7eefdf3c78335d5c051e6b
Author: Anže Žitnik <anze.zitnik@xlab.si>
Date: Fri May 27 13:33:56 2022 +0200
Version up: 0.1.3
commit a2bf39a78579f0c17b215e96026a5a7c9edf9270
Author: Anže Žitnik <anze.zitnik@xlab.si>
Date: Thu May 26 17:39:06 2022 +0200
Add targetValue property.
Rearrange properties in infoBox.
Don't show 'code' if same as 'name'.
commit d7dd3b66c66fc8718787e1347c6f72f405fc1dfa
Merge: 0bedbed3 dc3d4b90
Author: Anže Žitnik <anze.zitnik@xlab.si>
Date: Fri May 20 10:04:47 2022 +0200
Merge branch 'master' into develop
commit 0bedbed33cd8a0f5e58a570e51f7cdfe6d854f3f
Author: Anže Žitnik <anze.zitnik@xlab.si>
Date: Fri May 20 10:00:02 2022 +0200
Minor fix in instructions.
commit 8df42ada6f9eab247280c26b8518661ed721681f
Author: Anže Žitnik <anze.zitnik@xlab.si>
Date: Fri May 20 09:47:09 2022 +0200
Revert "Updated getting for CI from package.json"
This reverts commit 64b5b5152b2e065db8b31313ed756a8df10d61e2.
commit e318c48589b14d32dd727584926c1318016192bb
Author: Anže Žitnik <anze.zitnik@xlab.si>
Date: Fri May 20 09:31:26 2022 +0200
Version up - 1.1.2
commit 95f07516f8593fdfc4e1c43e13020b6909cc661f
Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
Date: Thu May 19 19:26:49 2022 +0200
Added word breaking, permanent node description box option, instructions
commit 64b5b5152b2e065db8b31313ed756a8df10d61e2
Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
Date: Thu May 19 19:25:53 2022 +0200
Updated getting for CI from package.json
---
package.json | 2 +-
src/components/Tree.vue | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index cd767540..86a3d2bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cce-frontend",
- "version": "0.1.2",
+ "version": "0.1.3",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/src/components/Tree.vue b/src/components/Tree.vue
index 659047e6..2ad5f1e1 100644
--- a/src/components/Tree.vue
+++ b/src/components/Tree.vue
@@ -7,20 +7,21 @@
<p v-if="hoveredNode?.state == 'UNSELECTED'"><b>State:</b> Unselected</p>
<p v-if="hoveredNode?.state == 'SET' && hoveredNode?.conformant"><b>State:</b> Compliant</p>
<p v-if="hoveredNode?.state == 'SET' && !hoveredNode?.conformant"><b>State:</b> Non compliant</p>
- <p v-if="hoveredNode?.value != null"><b>Value:</b> {{hoveredNode.value}}</p>
- <p v-if="hoveredNode?.weight != null"><b>Weight:</b> {{hoveredNode.weight}}</p>
- <p v-if="hoveredNode?.code != null"><b>Code:</b> {{hoveredNode.code}}</p>
- <p v-if="hoveredNode?.description != null"><b>Description:</b> {{hoveredNode.description}}</p>
+ <p v-if="hoveredNode?.code != null && hoveredNode.code != hoveredNode.name"><b>Code:</b> {{hoveredNode.code}}</p>
+ <p v-if="hoveredNode?.timestamp != null"><b>Timestamp:</b> {{formatDate(hoveredNode.timestamp)}}</p>
<p v-if="hoveredNode?.id != null"><b>Assesment result id:</b> {{hoveredNode.id}}</p>
<p v-if="hoveredNode?.metricId != null"><b>Metric id:</b> {{hoveredNode.metricId}}</p>
<p v-if="hoveredNode?.assessmentResult != null"><b>Assessment result:</b> {{hoveredNode.assessmentResult}}</p>
<p v-if="hoveredNode?.evidenceId != null"><b>Evidence id:</b> {{hoveredNode.evidenceId}}</p>
+ <p v-if="hoveredNode?.targetValue != null"><b>Target value:</b> {{hoveredNode.targetValue}}</p>
<p v-if="hoveredNode?.noncomplianceComments != null"><b>Noncompliance comments:</b> {{hoveredNode.noncomplianceComments}}</p>
- <p v-if="hoveredNode?.timestamp != null"><b>Timestamp:</b> {{formatDate(hoveredNode.timestamp)}}</p>
+ <p v-if="hoveredNode?.value != null"><b>Value:</b> {{hoveredNode.value}}</p>
+ <p v-if="hoveredNode?.weight != null"><b>Weight:</b> {{hoveredNode.weight}}</p>
<p v-if="hoveredNode?.threshold != null"><b>Threshold:</b> {{hoveredNode.threshold}}</p>
<p v-if="hoveredNode?.resource?.id != null"><b>Resource id:</b> {{hoveredNode.resource.id}}</p>
<p v-if="hoveredNode?.resource?.resourceType != null"><b>Resource type:</b> {{hoveredNode.resource.resourceType}}</p>
<p v-if="hoveredNode?.resource?.weight != null"><b>Resource weight:</b> {{hoveredNode.resource.weight}}</p>
+ <p v-if="hoveredNode?.description != null"><b>Description:</b> {{hoveredNode.description}}</p>
</div>
<div style="display: flex;">
<button class="btn btn-outline-primary" @click="controlScale('bigger')">Zoom in</button>
--
GitLab