diff --git a/src/test/java/fr/inra/oresing/rest/OreSiResourcesTest.java b/src/test/java/fr/inra/oresing/rest/OreSiResourcesTest.java
index 05466322be27f15bdade9e2ad38490bc18975c88..b7112eaee221b53141c3a4453bb3c443993f97a3 100644
--- a/src/test/java/fr/inra/oresing/rest/OreSiResourcesTest.java
+++ b/src/test/java/fr/inra/oresing/rest/OreSiResourcesTest.java
@@ -861,7 +861,6 @@ public class OreSiResourcesTest {
.andExpect(MockMvcResultMatchers.status().is2xxSuccessful());
}
}
-
@Test
public void addDuplicatedTest() throws Exception {
authenticationService.addUserRightCreateApplication(userId);
@@ -1078,15 +1077,15 @@ on test le dépôt d'un fichier récursif
.andExpect(MockMvcResultMatchers.status().is2xxSuccessful());
}
// le nombre de ligne est inchangé
- /*try (InputStream refStream = fixtures.getClass().getResourceAsStream(dataWithoutDuplicateds)) {
+ try (InputStream refStream = fixtures.getClass().getResourceAsStream(dataWithoutDuplicateds)) {
final String response = mockMvc.perform(get("/api/v1/applications/duplicated/data/dty")
.cookie(authCookie))
.andExpect(status().is2xxSuccessful())
- .andExpect(jsonPath("$.totalRows", IsEqual.equalTo(4
+ .andExpect(jsonPath("$.totalRows", IsEqual.equalTo(8
)))
.andReturn().getResponse().getContentAsString();
log.debug(response);
- }*/
+ }
}
@Test
diff --git a/src/test/java/fr/inra/oresing/rest/RelationalServiceTest.java b/src/test/java/fr/inra/oresing/rest/RelationalServiceTest.java
index 20450ca125daf6242da14008618f35969d930444..fbcb3014e21ee6e02ba3273aa9778dea63c5c271 100644
--- a/src/test/java/fr/inra/oresing/rest/RelationalServiceTest.java
+++ b/src/test/java/fr/inra/oresing/rest/RelationalServiceTest.java
@@ -48,6 +48,7 @@ public class RelationalServiceTest {
fixtures.addApplicationFORET();
fixtures.addApplicationAcbb();
fixtures.addApplicationRecursivity();
+
}
@Test
diff --git a/ui2/src/components/common/AuthorizationTable.vue b/ui2/src/components/common/AuthorizationTable.vue
index 362f4f31a74f28065ef72402c5372cf10189864f..77bb99b720f010db1c82239e2c9d28ec69e1297f 100644
--- a/ui2/src/components/common/AuthorizationTable.vue
+++ b/ui2/src/components/common/AuthorizationTable.vue
@@ -50,43 +50,42 @@
<b-field
v-else-if="column.display && indexColumn == 'extraction'"
:field="indexColumn"
- class="row"
- style="margin-top: 6px"
+ class="row columns"
>
- <div class="columns">
+ <div class="column">
<b-icon
:icon="
(statesIcons && statesIcons[indexColumn] && statesIcons[indexColumn][index]) ||
'square'
"
- class="column"
size="is-medium"
type="is-primary"
@click.native="selectCheckbox($event, index, indexColumn, scope)"
/>
- <b-taginput
- v-if="
+ <div class="columns">
+ <b-taginput
+ v-if="
states &&
states[indexColumn] &&
- states[indexColumn][index] == 1 &&
+ states[indexColumn][index] === 1 &&
localAuthorizationsTree &&
localAuthorizationsTree[indexColumn] &&
localAuthorizationsTree[indexColumn][index]
"
- v-model="localAuthorizationsTree[indexColumn][index].dataGroups"
- :data="dataGroups"
- :open-on-focus="true"
- :placeholder="$t('dataTypeAuthorizations.data-groups-placeholder')"
- :value="dataGroups.id"
- autocomplete
- class="column"
- field="label"
- type="is-primary"
- @input.capture="selectCheckbox($event, index, indexColumn, scope)"
- >
- </b-taginput>
- <div
- v-if="
+ v-model="localAuthorizationsTree[indexColumn][index].dataGroups"
+ :data="dataGroups"
+ :open-on-focus="true"
+ :placeholder="$t('dataTypeAuthorizations.data-groups-placeholder')"
+ :value="dataGroups.id"
+ autocomplete
+ class="column"
+ field="label"
+ type="is-primary"
+ @input.capture="selectCheckbox($event, index, indexColumn, scope)"
+ >
+ </b-taginput>
+ <div
+ v-if="
states &&
states[indexColumn] &&
states[indexColumn][index] == 1 &&
@@ -94,24 +93,24 @@
localAuthorizationsTree[indexColumn] &&
localAuthorizationsTree[indexColumn][index]
"
- class="column"
- >
- <b-datepicker
- v-model="localAuthorizationsTree[indexColumn][index].from"
- :date-parser="parseDate"
- :placeholder="
+ class="column"
+ >
+ <b-datepicker
+ v-model="localAuthorizationsTree[indexColumn][index].from"
+ :date-parser="parseDate"
+ :placeholder="
$t('dataTypesRepository.placeholder-datepicker') +
' dd-MM-YYYY, dd-MM-YYYY hh, dd-MM-YYYY hh:mm, dd-MM-YYYY hh:mm:ss'
"
- editable
- icon="calendar"
- @remove.capture="() => selectCheckbox($event, index, indexColumn, scope)"
- @input.capture="selectCheckbox($event, index, indexColumn, scope, 'from')"
- >
- </b-datepicker>
- </div>
- <div
- v-if="
+ editable
+ icon="calendar"
+ @remove.capture="() => selectCheckbox($event, index, indexColumn, scope)"
+ @input.capture="selectCheckbox($event, index, indexColumn, scope, 'from')"
+ >
+ </b-datepicker>
+ </div>
+ <div
+ v-if="
states &&
states[indexColumn] &&
states[indexColumn][index] == 1 &&
@@ -119,20 +118,21 @@
localAuthorizationsTree[indexColumn] &&
localAuthorizationsTree[indexColumn][index]
"
- class="column"
- >
- <b-datepicker
- v-model="localAuthorizationsTree[indexColumn][index].to"
- :date-parser="parseDate"
- :placeholder="
+ class="column"
+ >
+ <b-datepicker
+ v-model="localAuthorizationsTree[indexColumn][index].to"
+ :date-parser="parseDate"
+ :placeholder="
$t('dataTypesRepository.placeholder-datepicker') +
' dd-MM-YYYY, dd-MM-YYYY hh, dd-MM-YYYY hh:mm, dd-MM-YYYY hh:mm:ss'
"
- editable
- icon="calendar"
- @input="selectCheckbox($event, index, indexColumn, scope, 'to')"
- >
- </b-datepicker>
+ editable
+ icon="calendar"
+ @input="selectCheckbox($event, index, indexColumn, scope, 'to')"
+ >
+ </b-datepicker>
+ </div>
</div>
</div>
</b-field>
@@ -664,4 +664,13 @@ p {
ul.rows {
margin-bottom: 12px;
}
+.row.columns {
+ margin-top: 0;
+ .column {
+ padding-top: 0;
+ .columns {
+ margin-top: 0;
+ }
+ }
+}
</style>
diff --git a/ui2/src/main.js b/ui2/src/main.js
index 323d1de40fc69e7953d29f69ec682fdb780918e8..5dd6832d41e4c79370cb9b9ea6a6e87d277142bc 100644
--- a/ui2/src/main.js
+++ b/ui2/src/main.js
@@ -180,4 +180,4 @@ const app = new Vue({
i18n,
render: (h) => h(App),
}).$mount("#app");
-export default app;
\ No newline at end of file
+export default app;
diff --git a/ui2/src/style/_common.scss b/ui2/src/style/_common.scss
index 2829156e0e9a0855847f7565a931463b0c7d7db3..c62d1a63e57a0f49ac39551e544092d5c4af696e 100644
--- a/ui2/src/style/_common.scss
+++ b/ui2/src/style/_common.scss
@@ -180,4 +180,7 @@ a.dropdown-item.is-active, .dropdown .dropdown-menu .has-link a.is-active, butto
.textarea:not([rows]) {
min-height: 4em;
+}
+.icon.has-text-primary.is-medium {
+ width: 32px;
}
\ No newline at end of file
diff --git a/ui2/src/views/application/ApplicationsView.vue b/ui2/src/views/application/ApplicationsView.vue
index 947032e6faf2ae34bd66d46757bfb147d66cf126..a28d7b41edadd3a916d5709a1afa711d8f84a5ed 100644
--- a/ui2/src/views/application/ApplicationsView.vue
+++ b/ui2/src/views/application/ApplicationsView.vue
@@ -126,11 +126,24 @@
</div>
<div class="card-content">
<div class="content">
- <p v-html="$t('applications.version', {'applicationName': application.localName,'version':application.configuration.application.version})" />
+ <p
+ v-html="
+ $t('applications.version', {
+ applicationName: application.localName,
+ version: application.configuration.application.version,
+ })
+ "
+ />
<p class="comment">
- <span :class="application.comment?'has-text-primary':'has-text-warning'">
- {{ application.comment?$t("applications.comment"):$t("applications.no-comment") }}
- </span>
+ <span
+ :class="application.comment ? 'has-text-primary' : 'has-text-warning'"
+ >
+ {{
+ application.comment
+ ? $t("applications.comment")
+ : $t("applications.no-comment")
+ }}
+ </span>
<span>{{ application.comment }}</span>
</p>
</div>
@@ -316,7 +329,7 @@ export default class ApplicationsView extends Vue {
.column {
display: grid;
- .comment{
+ .comment {
display: flex;
align-items: center;
align-content: start;
@@ -356,8 +369,9 @@ export default class ApplicationsView extends Vue {
}
}
-.control.has-icons-left .icon, .control.has-icons-right .icon {
+.control.has-icons-left .icon,
+.control.has-icons-right .icon {
top: 5px;
left: 5px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/ui2/src/views/authorizations/DataTypeAuthorizationInfoView.vue b/ui2/src/views/authorizations/DataTypeAuthorizationInfoView.vue
index 211a72fd8a1c3386befffd45bef61e41f2f35454..e78036aea3a4ba49f21d4356da2c82704a43c525 100644
--- a/ui2/src/views/authorizations/DataTypeAuthorizationInfoView.vue
+++ b/ui2/src/views/authorizations/DataTypeAuthorizationInfoView.vue
@@ -153,10 +153,10 @@ export default class DataTypeAuthorizationInfoView extends Vue {
columnsVisible = {
label: { title: "Label", display: true },
//dataGroups: {title: this.$t('dataTypeAuthorizations.data-groups'), display: true},
+ extraction: { title: "Extraction", display: true },
admin: { title: "Admin", display: true },
depot: { title: "Dépôt", display: true },
publication: { title: "Publication", display: true },
- extraction: { title: "Extraction", display: true },
};
period = this.periods.FROM_DATE_TO_DATE;
startDate = null;
diff --git a/ui2/src/views/authorizations/DataTypeAuthorizationsView.vue b/ui2/src/views/authorizations/DataTypeAuthorizationsView.vue
index 9001497cd67a4c140b2f9c479fbed3977b9e80d2..04f039d24732f35b49026b077adf4384f20d4b57 100644
--- a/ui2/src/views/authorizations/DataTypeAuthorizationsView.vue
+++ b/ui2/src/views/authorizations/DataTypeAuthorizationsView.vue
@@ -16,7 +16,7 @@
<div class="rows">
<div class="row">
<div class="columns">
- <div class="card column is-2">
+ <div class="column is-offset-10 is-2">
<b-button icon-left="plus" type="is-primary is-right" @click="addAuthorization">
{{ $t("dataTypeAuthorizations.add-auhtorization") }}
</b-button>
diff --git a/ui2/src/views/references/ReferenceTableView.vue b/ui2/src/views/references/ReferenceTableView.vue
index 673c46dc76cab4a6ec0e54bc04c98264c8120411..cb3ce58a98abd0c8d0b69d2ab5a314b55a422b89 100644
--- a/ui2/src/views/references/ReferenceTableView.vue
+++ b/ui2/src/views/references/ReferenceTableView.vue
@@ -29,7 +29,31 @@
:sticky="column.key"
v-slot="props"
>
- <span v-if="column.id != '#'">
+ <span v-if="column.id === 'propriétés de taxons'">
+ <b-button
+ class="btnModal"
+ type="is-primary"
+ icon-left="external-link-square-alt"
+ @click="showModal(props.row['nom du taxon déterminé'])" rounded />
+ <b-modal
+ v-show="isSelectedName === props.row['nom du taxon déterminé']"
+ v-model="isCardModalActive"
+ >
+ <div class="card">
+ <div class="card-header">
+ <div class="title card-header-title">
+ <p field="name">{{ column.id }}</p>
+ </div>
+ </div>
+ <div class="card-content">
+ <!-- TO DO Ã mettre en forme
+ <b-table :data="data" :columns="columns"/> -->
+ {{ props.row["propriétés de taxons"] }}
+ </div>
+ </div>
+ </b-modal>
+ </span>
+ <span v-else-if="column.id !== '#'">
{{ props.row[column.id] }}
</span>
<b-collapse v-else :open="false">
@@ -94,6 +118,15 @@ export default class ReferenceTableView extends Vue {
tableValues = [];
currentPage = 1;
perPage = 15;
+ // show modal and cards
+ isSelectedName = "";
+ isCardModalActive = false;
+
+ showModal(name) {
+ this.isSelectedName = name;
+ this.isCardModalActive = true;
+ console.log(this.tableValues[0]);
+ }
async created() {
await this.init();