Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -750,9 +750,15 @@
"name": {
"label": "Titelname | Titelnamen"
},
"volumeNumber": "Bandnummer",
"volumeNumber": {
"label": "Bandnummer",
"short": "Bd.:"
},
"editionNumber": "Ausgabenr.",
"editionStatement": "Auflage",
"editionStatement": {
"label": "Auflage",
"short": "Aufl.:"
},
"firstPublishedInPrint": "Print-Erscheinungsdatum",
"firstPublishedOnline": "Online-Erscheinungsdatum",
"firstAuthor": {
Expand Down Expand Up @@ -1773,6 +1779,11 @@
}
}
},
"error": {
"missingName": {
"label": "- Kein Titel -"
}
},
"editStatus": {
"label": "Bearbeitungs-Status",
"In Progress": {
Expand Down
15 changes: 13 additions & 2 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -750,9 +750,15 @@
"name": {
"label": "Title Name | Title Names"
},
"volumeNumber": "Volume no.",
"volumeNumber": {
"label": "Volume no.",
"short": "Vol.:"
},
"editionNumber": "Edition no.",
"editionStatement": "Edition Statement",
"editionStatement": {
"label": "Edition Statement",
"short": "Ed.:"
},
"firstPublishedInPrint": "First Published (Print)",
"firstPublishedOnline": "First Published (Online)",
"firstAuthor": {
Expand Down Expand Up @@ -1763,6 +1769,11 @@
}
}
},
"error": {
"missingName": {
"label": "- Missing Title -"
}
},
"editStatus": {
"label": "Editing Status",
"In Progress": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@
})),
prices: tipp._embedded.prices,
popup: {
value: (this.ttl ? tipp.pkg.name : (tipp.name || tipp.title?.name || this.$i18n.t('component.tipp.label') + ' ' + tipp.id)),
value: (this.ttl ? tipp.pkg.name : this.buildDisplayName(tipp)),
label: 'tipp',
type: 'GokbAddTitlePopup'
},
Expand All @@ -658,6 +658,30 @@

this.loading = false
}
},
buildDisplayName(tipp) {
let result = (tipp.name || tipp.title?.name || this.$i18n.t('component.tipp.label') + ' ' + tipp.id)

if (!!tipp.name) {
if (tipp.volumeNumber || tipp.editionStatement) {
result = result + " ("

if (tipp.volumeNumber) {
result = result + this.$i18n.t('component.title.volumeNumber.short') + " " + tipp.volumeNumber
}
if (tipp.editionStatement) {
if (tipp.volumeNumber) {
result = result + ", "
}

result = result + this.$i18n.t('component.title.editionStatement.short') + " " + tipp.editionStatement
}

result = result + ")"
}
}

return
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,15 @@
v-model="packageTitleItem.editionStatement"
:disabled="isReadonly"
dense
:label="$t('component.title.editionStatement')"
:label="$t('component.title.editionStatement.label')"
/>
</v-col>
<v-col cols="3">
<gokb-text-field
v-model="packageTitleItem.volumeNumber"
:disabled="isReadonly"
dense
:label="$t('component.title.volumeNumber')"
:label="$t('component.title.volumeNumber.label')"
/>
</v-col>
</v-row>
Expand Down
4 changes: 2 additions & 2 deletions src/views/edit/edit-tipp-view.vue
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
v-model="packageTitleItem.volumeNumber"
:disabled="isReadonly"
dense
:label="$t('component.title.volumeNumber')"
:label="$t('component.title.volumeNumber.label')"
/>
</v-col>
</v-row>
Expand Down Expand Up @@ -400,7 +400,7 @@
v-model="packageTitleItem.editionStatement"
:disabled="isReadonly"
dense
:label="$t('component.title.editionStatement')"
:label="$t('component.title.editionStatement.label')"
/>
</v-col>
</v-row>
Expand Down
4 changes: 2 additions & 2 deletions src/views/edit/edit-title-view.vue
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@
<gokb-number-field
v-model="titleItem.volumeNumber"
:disabled="isReadonly"
:label="$t('component.title.volumeNumber')"
:label="$t('component.title.volumeNumber.label')"
:api-errors="errors.volumeNumber"
dense
/>
</v-col>
<v-col>
<gokb-text-field
v-model="titleItem.editionStatement"
:label="$t('component.title.editionStatement')"
:label="$t('component.title.editionStatement.label')"
:disabled="isReadonly"
:api-errors="errors.editionStatement"
dense
Expand Down
56 changes: 35 additions & 21 deletions src/views/search/search-title-view.vue
Original file line number Diff line number Diff line change
Expand Up @@ -204,27 +204,19 @@
},
methods: {
_transformForTable (data) {
return data.map(({
id,
name,
type,
status,
publishedFrom,
publisher,
dateFirstInPrint,
dateFirstOnline,
_embedded,
_links
}) => ({
id,
type: this.$i18n.tc('component.title.type.' + type),
startDate: (dateFirstInPrint || (dateFirstOnline || publishedFrom))?.substr(0, 4),
link: { value: name, route: EDIT_TITLE_ROUTE, id: 'id' },
linkTwo: publisher ? { value: publisher.name, route: EDIT_PROVIDER_ROUTE, id: 'publisherId' } : undefined,
publisher: _embedded.publisher.map(pub => pub.name).join(', '),
status: status?.value,
deleteUrl: _links?.delete?.href || undefined,
updateUrl: _links?.update?.href || undefined
return data.map(item => ({
...item,
type: this.$i18n.tc('component.title.type.' + item.type),
startDate: (item.dateFirstInPrint || (item.dateFirstOnline || item.publishedFrom))?.substr(0, 4),
link: {
value: item.type === 'Book' ? this.buildMonographName(item.name, item.volumeNumber, item.editionStatement) : item.name,
route: EDIT_TITLE_ROUTE, id: 'id'
},
linkTwo: item.publisher ? { value: item.publisher.name, route: EDIT_PROVIDER_ROUTE, id: 'publisherId' } : undefined,
publisher: item._embedded.publisher.map(pub => pub.name).join(', '),
status: item.status?.value,
deleteUrl: item._links?.delete?.href || undefined,
updateUrl: item._links?.update?.href || undefined
}))
},
_transformForExport (data) {
Expand Down Expand Up @@ -259,6 +251,28 @@
this.messageToConfirm = { text: 'popups.confirm.retire.list', vars: [this.selectedItems.length, this.$i18n.tc('component.title.label', this.selectedItems.length)] }
this.parameterToConfirm = undefined
this.confirmationPopUpVisible = true
},
buildMonographName(name, volume, edition) {
let result = name

if (volume || edition) {
result = result + " ("

if (volume) {
result = result + this.$i18n.t('component.title.volumeNumber.short') + " " + volume
}
if (edition) {
if (volume) {
result = result + ", "
}

result = result + this.$i18n.t('component.title.editionStatement.short') + " " + edition
}

result = result + ")"
}

return result
}
}
}
Expand Down