From 232232517f6dd7e3b1de609a2fad0dc43c7f73b8 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Wed, 6 Apr 2022 11:30:33 +0200
Subject: [PATCH 1/3] =?UTF-8?q?gestion=20des=20affichages=20des=20listes?=
=?UTF-8?q?=20de=20ref=C3=A9rence=20et=20donn=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ui/src/components/common/CollapsibleTree.vue | 2 +-
ui/src/views/datatype/DataTypeTableView.vue | 2 +-
.../references/ReferencesManagementView.vue | 18 ++++++++++++++++++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ui/src/components/common/CollapsibleTree.vue b/ui/src/components/common/CollapsibleTree.vue
index 06a8dc97e..cc421df9a 100644
--- a/ui/src/components/common/CollapsibleTree.vue
+++ b/ui/src/components/common/CollapsibleTree.vue
@@ -132,6 +132,7 @@
:radioName="radioName"
@optionChecked="onInnerOptionChecked"
:applicationTitle="applicationTitle"
+ :lineCount = child.lineCountChild
/>
</div>
</template>
@@ -166,7 +167,6 @@ export default class CollapsibleTree extends Vue {
onInnerOptionChecked(value) {
this.$emit("optionChecked", value);
}
-
stopPropagation(event) {
event.stopPropagation();
}
diff --git a/ui/src/views/datatype/DataTypeTableView.vue b/ui/src/views/datatype/DataTypeTableView.vue
index ec37b2e7d..0d6ec488e 100644
--- a/ui/src/views/datatype/DataTypeTableView.vue
+++ b/ui/src/views/datatype/DataTypeTableView.vue
@@ -253,7 +253,7 @@
{{ variable.id }}
</p>
<a class="card-header-icon">
- <b-icon :icon="props.open ? 'sort-down' : 'sort-up'"> </b-icon>
+ <b-icon :icon="props.open ? 'chevron-up' : 'chevron-down'"> </b-icon>
</a>
</div>
</template>
diff --git a/ui/src/views/references/ReferencesManagementView.vue b/ui/src/views/references/ReferencesManagementView.vue
index 3976e60d2..a5d549759 100644
--- a/ui/src/views/references/ReferencesManagementView.vue
+++ b/ui/src/views/references/ReferencesManagementView.vue
@@ -122,6 +122,24 @@ export default class ReferencesManagementView extends Vue {
for (let i=0; i<=this.application.referenceSynthesis.length-1 ; i++) {
if (this.application.referenceSynthesis[i].referenceType === ref.label) {
return this.application.referenceSynthesis[i].lineCount;
+ } else {
+ for (let n=0; n<ref.children.length; n++) {
+ if( this.application.referenceSynthesis[i].referenceType === ref.children[n].label) {
+ ref.children[n] = {
+ ...ref.children[n],
+ lineCountChild : this.application.referenceSynthesis[i].lineCount,
+ };
+ } else {
+ for (let j=0; j<ref.children[n].children.length; j++) {
+ if( this.application.referenceSynthesis[i].referenceType === ref.children[n].children[j].label) {
+ ref.children[n].children[j] = {
+ ...ref.children[n].children[j],
+ lineCountChild : this.application.referenceSynthesis[i].lineCount,
+ };
+ }
+ }
+ }
+ }
}
}
}
--
GitLab
From 7671efb66e0d335219f522d31d1bc37c8fd5aa28 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Fri, 8 Apr 2022 12:03:59 +0200
Subject: [PATCH 2/3] mise en forme collapse tree
---
ui/src/components/common/CollapsibleTree.vue | 8 +++++---
ui/src/style/_common.scss | 7 +++++++
ui/src/views/datatype/DataTypesManagementView.vue | 3 ++-
ui/src/views/references/ReferencesManagementView.vue | 10 +++++++++-
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ui/src/components/common/CollapsibleTree.vue b/ui/src/components/common/CollapsibleTree.vue
index cc421df9a..3b990222e 100644
--- a/ui/src/components/common/CollapsibleTree.vue
+++ b/ui/src/components/common/CollapsibleTree.vue
@@ -1,10 +1,10 @@
<template>
- <div style="margin-bottom: 10px; border: 1px solid white">
+ <div>
<div
:class="`columns CollapsibleTree-header ${
option.children && option.children.length !== 0 ? 'clickable' : ''
} ${option.children && option.children.length !== 0 && displayChildren ? '' : 'mb-1'}`"
- :style="`background-color:rgba(240, 245, 245, ${1 - level / 2})`"
+ :style="`margin:0px;`"
@click="displayChildren = !displayChildren"
@keypress.enter="displayChildren = !displayChildren"
>
@@ -196,13 +196,15 @@ $row-height: 40px;
align-items: center;
padding: 0.75rem;
}
+.CollapsibleTree-header.clickable {
+ border-bottom: 0.35rem solid white;
+}
.CollapsibleTree-header {
display: flex;
align-items: center;
height: $row-height;
padding: 0.75rem;
justify-content: space-between;
- margin: -7px;
.file-icon {
margin-right: 0;
diff --git a/ui/src/style/_common.scss b/ui/src/style/_common.scss
index bbd81a615..8ea3eb436 100644
--- a/ui/src/style/_common.scss
+++ b/ui/src/style/_common.scss
@@ -196,3 +196,10 @@ a.dropdown-item.is-active, .dropdown .dropdown-menu .has-link a.is-active, butto
margin: auto;
}
}
+
+.liste:nth-child(2n) {
+ background-color: rgba(239, 239, 239,0.5);
+}
+.liste {
+ background-color: rgb(239, 239, 239);
+}
\ No newline at end of file
diff --git a/ui/src/views/datatype/DataTypesManagementView.vue b/ui/src/views/datatype/DataTypesManagementView.vue
index e1ae218e1..90e55defd 100644
--- a/ui/src/views/datatype/DataTypesManagementView.vue
+++ b/ui/src/views/datatype/DataTypesManagementView.vue
@@ -17,7 +17,8 @@
<AvailablityChart v-if="false" />
<div>
<CollapsibleTree
- v-for="data in dataTypes"
+ v-for="(data,i) in dataTypes"
+ :id="i+1"
:key="data.id"
:option="{
...data,
diff --git a/ui/src/views/references/ReferencesManagementView.vue b/ui/src/views/references/ReferencesManagementView.vue
index a5d549759..e262e0e03 100644
--- a/ui/src/views/references/ReferencesManagementView.vue
+++ b/ui/src/views/references/ReferencesManagementView.vue
@@ -11,10 +11,12 @@
</h1>
<div>
<CollapsibleTree
- v-for="ref in references"
+ class="liste"
+ v-for="(ref, i) in references"
:key="ref.id"
:option="ref"
:level="0"
+ :id="i+1"
:onClickLabelCb="(event, label) => openRefDetails(event, label)"
:onUploadCb="(label, refFile) => uploadReferenceCsv(label, refFile)"
:buttons="buttons"
@@ -167,3 +169,9 @@ export default class ReferencesManagementView extends Vue {
}
}
</script>
+<style lang="scss" scoped>
+.liste {
+ margin-bottom: 10px;
+ border: 1px solid white;
+}
+</style>
\ No newline at end of file
--
GitLab
From 5bf948edea2971a440d1ed2c6a899f135ffc52a9 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Fri, 8 Apr 2022 12:07:34 +0200
Subject: [PATCH 3/3] fait sur datatype aussi
---
ui/src/views/datatype/DataTypesManagementView.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ui/src/views/datatype/DataTypesManagementView.vue b/ui/src/views/datatype/DataTypesManagementView.vue
index 90e55defd..2f51c15b2 100644
--- a/ui/src/views/datatype/DataTypesManagementView.vue
+++ b/ui/src/views/datatype/DataTypesManagementView.vue
@@ -17,6 +17,7 @@
<AvailablityChart v-if="false" />
<div>
<CollapsibleTree
+ class="liste"
v-for="(data,i) in dataTypes"
:id="i+1"
:key="data.id"
@@ -293,4 +294,8 @@ export default class DataTypesManagementView extends Vue {
overflow-wrap: break-word;
}
}
+.liste {
+ margin-bottom: 10px;
+ border: 1px solid white;
+}
</style>
--
GitLab