From 813d5d1136f7539d8131bf58828847f8d0a9db5f Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 3 Jun 2021 20:45:55 +0200 Subject: [PATCH] Some improvments for the person edit step --- .../ContactableEntityEditStepModel.java | 8 ++ .../assets/PersonEditStep.java | 45 ++++++++--- .../assets/PersonEditStepModel.java | 6 +- .../contentsections/assets/PersonNameRow.java | 79 +++++++++++++++++++ .../components/librecms/assetPicker.xhtml | 11 ++- .../assets/edit-contactable.xhtml | 3 +- .../assets/person/edit-person.xhtml | 6 +- .../ui/MvcAssetStepsBundle.properties | 12 ++- .../ui/MvcAssetStepsBundle_de.properties | 12 ++- .../content-sections/cms-assetpicker.ts | 11 ++- 10 files changed, 166 insertions(+), 27 deletions(-) create mode 100644 ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonNameRow.java diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java index 35e66d93f..7e509cf10 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java @@ -32,6 +32,7 @@ import java.util.Optional; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.inject.Named; +import javax.servlet.ServletContext; /** * @@ -44,11 +45,18 @@ public class ContactableEntityEditStepModel { @Inject private GlobalizationHelper globalizationHelper; + @Inject + private ServletContext servletContext; + private Map availableContactEntryKeys; private List contactEntries; private PostalAddress postalAddress; + + public String getContextPath() { + return servletContext.getContextPath(); + } public Map getAvailableContactEntryKeys() { return Collections.unmodifiableMap(availableContactEntryKeys); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStep.java index 007009da1..c3e6969ed 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStep.java @@ -30,6 +30,9 @@ import org.librecms.ui.contentsections.ContentSectionNotFoundException; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Optional; import javax.enterprise.context.RequestScoped; @@ -95,18 +98,25 @@ public class PersonEditStep extends AbstractContactableEntityEditStep { if (getAsset() instanceof Person) { editStepModel.setBirthdate( Optional - .ofNullable(getPerson().getBirthdate()) - .map( - birthdate -> birthdate.format( - DateTimeFormatter - .ofLocalizedDate(FormatStyle.SHORT) - .withLocale( - globalizationHelper.getNegotiatedLocale() - ) - .withZone(ZoneId.systemDefault()))) - .orElse("") + .ofNullable(getPerson().getBirthdate()) + .map( + birthdate -> birthdate.format( + DateTimeFormatter + .ofLocalizedDate(FormatStyle.SHORT) + .withLocale( + globalizationHelper.getNegotiatedLocale() + ) + .withZone(ZoneId.systemDefault()))) + .orElse("") ); - editStepModel.setPersonNames(getPerson().getPersonNames()); + final List personNames = new ArrayList<>(); + for (int i = 0; i < getPerson().getPersonNames().size(); i++) { + personNames.add( + buildPersonNameRow(i, getPerson().getPersonNames().get(i)) + ); + } + Collections.reverse(personNames); + editStepModel.setPersonNames(personNames); } else { throw new AssetNotFoundException( assetUi.showAssetNotFound( @@ -271,4 +281,17 @@ public class PersonEditStep extends AbstractContactableEntityEditStep { } } + private PersonNameRow buildPersonNameRow( + final int index, final PersonName personName + ) { + final PersonNameRow row = new PersonNameRow(); + row.setIndex(index); + row.setSurname(personName.getSurname()); + row.setPrefix(personName.getPrefix()); + row.setSuffix(personName.getSuffix()); + row.setGivenName(personName.getGivenName()); + + return row; + } + } diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStepModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStepModel.java index bf55ca30d..8ed42fc5b 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStepModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonEditStepModel.java @@ -35,15 +35,15 @@ import javax.inject.Named; @Named("CmsPersonEditStepModel") public class PersonEditStepModel { - private List personName; + private List personName; private String birthdate; - public List getPersonNames() { + public List getPersonNames() { return Collections.unmodifiableList(personName); } - protected void setPersonNames(final List personNames) { + protected void setPersonNames(final List personNames) { this.personName = new ArrayList<>(personNames); } diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonNameRow.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonNameRow.java new file mode 100644 index 000000000..714886a00 --- /dev/null +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PersonNameRow.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2021 LibreCCM Foundation. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ +package org.librecms.ui.contentsections.assets; + +/** + * + * @author Jens Pelzetter + */ +public class PersonNameRow { + + private int index; + + private String prefix; + + private String surname; + + private String givenName; + + private String suffix; + + public int getIndex() { + return index; + } + + public void setIndex(final int index) { + this.index = index; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(final String prefix) { + this.prefix = prefix; + } + + public String getSurname() { + return surname; + } + + public void setSurname(final String surname) { + this.surname = surname; + } + + public String getGivenName() { + return givenName; + } + + public void setGivenName(final String givenName) { + this.givenName = givenName; + } + + public String getSuffix() { + return suffix; + } + + public void setSuffix(final String suffix) { + this.suffix = suffix; + } + + + +} diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml index 54ac85f63..42a8aeaba 100644 --- a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml +++ b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml @@ -8,7 +8,7 @@ required="true" shortDescription="Base URL for the actions of the asset picker." type="String" /> - + -
- @@ -213,6 +213,7 @@ actionUrl="#{actionBaseUrl}/postaladdress" assetType="#{CmsContactableEditStepModel.postalAddressType}" assetPickerId="postaladdress-picker" + contextPath="#{CmsContactableEditStepModel.contextPath}" contentSection="#{ContentSectionModel.sectionName}" formParamName="postalAddressIdentifier" /> diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml index 1b9c8ce73..e39ab92bd 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml @@ -105,7 +105,7 @@ - + #{personName.prefix} #{personName.surname} #{personName.givenName} @@ -124,7 +124,7 @@ id="personname-edit-dialog-#{personName.hashCode()}" tabindex="-1">
-
@@ -192,7 +192,7 @@ id="personname-remove-dialog-#{personName.hashCode()}" tabindex="-1">
-
diff --git a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties index 7d9a28f46..e076acc42 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties @@ -257,7 +257,7 @@ person.personname.givenname.help=The name of the person. person.personname.suffix.help=Suffixes of the name, for example Ph.D. person.personname.suffix.label=Suffix person.personname.edit.dialog.close=Cancel -person.personname.edit.dialog.submit=Add name +person.personname.edit.dialog.submit=Save person.personname.remove=Remove person name person.personname.remove.dialog.title=Remove Person Name person.personname.remove.dialog.close=Cancel @@ -273,3 +273,13 @@ contactable.postaladdress.set=Set postal address person.personname.givenname.label=Given name person.personname.add.dialog.close=Cancel person.personname.add.dialog.submit=Add person name +person.personname.edit.dialog.title=Edit person name +contactable.contactentries.add.close=Cancel +assetpicker.title=Select asset +assetpicker.close=Cancel +assetpicker.filter.help=Filter for finding assets. +assetpicker.filter.label=Filter +assetpicker.select=Select asset +assetpicker.column.name=Name +assetpicker.column.type=Type +assetpicker.column.action=Action diff --git a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties index 9308444e0..e835306f4 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties @@ -257,7 +257,7 @@ person.personname.givenname.help=Der Name der Person. person.personname.suffix.help=Suffixe des Namens, zum Beispiel Ph.D. person.personname.suffix.label=Suffix person.personname.edit.dialog.close=Abbrechen -person.personname.edit.dialog.submit=Namen hinzuf\u00fcgen +person.personname.edit.dialog.submit=Speichern person.personname.remove=Namen entfernen person.personname.remove.dialog.title=Namen entfernen person.personname.remove.dialog.close=Abbrechen @@ -273,3 +273,13 @@ contactable.postaladdress.set=Postanschrift setzen person.personname.givenname.label=Vorname person.personname.add.dialog.close=Abbrechen person.personname.add.dialog.submit=Personenamen hinzuf\u00fcgen +person.personname.edit.dialog.title=Personenname bearbeiten +contactable.contactentries.add.close=Abbrechen +assetpicker.title=Asset ausw\u00e4hlen +assetpicker.close=Abbrechen +assetpicker.filter.help=Filter zum finden von Assets. +assetpicker.filter.label=Filter +assetpicker.select=Asset ausw\u00e4hlen +assetpicker.column.name=Name +assetpicker.column.type=Typ +assetpicker.column.action=Aktion diff --git a/ccm-cms/src/main/typescript/content-sections/cms-assetpicker.ts b/ccm-cms/src/main/typescript/content-sections/cms-assetpicker.ts index 2c1464c00..65d9a48f0 100644 --- a/ccm-cms/src/main/typescript/content-sections/cms-assetpicker.ts +++ b/ccm-cms/src/main/typescript/content-sections/cms-assetpicker.ts @@ -1,7 +1,7 @@ import * as $ from "jquery"; document.addEventListener("DOMContentLoaded", function (event) { - const assetPickers = document.querySelectorAll("ccm-cms-asset-picker"); + const assetPickers = document.querySelectorAll(".ccm-cms-asset-picker"); for (let i = 0; i < assetPickers.length; i++) { initAssetPicker(assetPickers[i]); @@ -11,12 +11,15 @@ document.addEventListener("DOMContentLoaded", function (event) { async function initAssetPicker(assetPickerElem: Element) { const assetPickerId = assetPickerElem.getAttribute("id"); const assetType = getAssetType(assetPickerElem); + const contextPath = assetPickerElem.getAttribute("data-contextpath"); const contentSection = assetPickerElem.getAttribute("data-contentsection"); + const fetchUrl = contextPath + ? `./${contextPath}/content-sections/${contentSection}/assets/?type=${assetType}` + : `./content-sections/${contentSection}/assets/?type=${assetType}`; + try { - const response = await fetch( - `/content-sections/${contentSection}/assets/?type=${assetType}` - ); + const response = await fetch(fetchUrl); if (response.ok) { const assets = (await response.json()) as [];