Mercurial > gemma
changeset 2601:b9523d876d01
overview2 WIP
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Tue, 12 Mar 2019 14:47:14 +0100 |
parents | 6e6709bab5c4 |
children | 5d0e5159190f |
files | client/src/components/importoverview/AdditionalDetail.vue client/src/components/importoverview/LogDetail.vue client/src/components/importoverview/LogEntry.vue |
diffstat | 3 files changed, 48 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/importoverview/AdditionalDetail.vue Tue Mar 12 14:22:42 2019 +0100 +++ b/client/src/components/importoverview/AdditionalDetail.vue Tue Mar 12 14:47:14 2019 +0100 @@ -1,6 +1,10 @@ <template> <div> - <h1>AdditionalDetail</h1> + <div v-if="isFairwayDimension">Fairwaydimension</div> + <div v-if="isApprovedGaugeMeasurement">AGM</div> + <div v-if="isBottleneck">Bottlenecks</div> + <div v-if="isStretch">Stretch</div> + <div v-if="isSoundingResult">SoundingResult</div> </div> </template> @@ -21,7 +25,27 @@ export default { name: "additionaldetail", - props: ["entry"] + props: ["entry"], + computed: { + kind() { + return this.entry.kind.toUpperCase(); + }, + isFairwayDimension() { + return this.kind === "FD"; + }, + isApprovedGaugeMeasurement() { + return this.kind === "AGM"; + }, + isBottleneck() { + return this.kind === "BN" || this.kind === "UBN"; + }, + isStretch() { + return this.kind === "ST"; + }, + isSoundingResult() { + return this.kind === "SR"; + } + } }; </script>
--- a/client/src/components/importoverview/LogDetail.vue Tue Mar 12 14:22:42 2019 +0100 +++ b/client/src/components/importoverview/LogDetail.vue Tue Mar 12 14:47:14 2019 +0100 @@ -1,21 +1,23 @@ <template> <div> <div class="d-flex fex-row"> - <font-awesome-icon - v-if="entry.id === showAdditional" - @click="toggleAdditionalInfo" - class="my-auto mr-1 text-info pointer" - icon="angle-down" - fixed-width - ></font-awesome-icon> - <font-awesome-icon - v-if="entry.id !== showAdditional" - @click="toggleAdditionalInfo" - class="my-auto mr-1 text-info pointer" - icon="angle-right" - fixed-width - ></font-awesome-icon> - <span class="text-info"><translate>Additional Info</translate></span> + <div v-if="entry.state == 'pending'"> + <font-awesome-icon + v-if="entry.id === showAdditional" + @click="toggleAdditionalInfo" + class="my-auto mr-1 text-info pointer" + icon="angle-down" + fixed-width + ></font-awesome-icon> + <font-awesome-icon + v-if="entry.id !== showAdditional" + @click="toggleAdditionalInfo" + class="my-auto mr-1 text-info pointer" + icon="angle-right" + fixed-width + ></font-awesome-icon> + <span class="text-info"><translate>Additional Info</translate></span> + </div> </div> <AdditionalDetail v-if="entry.id === showAdditional" @@ -37,7 +39,7 @@ icon="angle-right" fixed-width ></font-awesome-icon> - <span class="text-info"><translate>Additional Logs</translate></span> + <span class="text-info"><translate>Logs</translate></span> </div> <AdditionalLog
--- a/client/src/components/importoverview/LogEntry.vue Tue Mar 12 14:22:42 2019 +0100 +++ b/client/src/components/importoverview/LogEntry.vue Tue Mar 12 14:47:14 2019 +0100 @@ -1,6 +1,6 @@ <template> <div> - <div class="d-flex flex-row text-left"> + <div class="logentry d-flex flex-row text-left"> <font-awesome-icon v-if="entry.id === show" @click="toggleDetails" @@ -132,6 +132,9 @@ </script> <style lang="scss" scoped> +.logentry { +} + .kind { width: 10%; }