From cdf9ff8d94394c56d99d5ac25db2a13d5f8df32c Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 23 Jul 2022 13:58:55 +0200 Subject: [PATCH] XHTML for editing the properties of a collected volume. --- .../ArticleInCollectedVolumeRow.java | 10 + .../CollectedVolumePropertiesStep.java | 1 + .../CollectedVolumePropertiesStepModel.java | 8 +- .../edit-collectedvolume.xhtml | 85 +++++++ .../contenttypes/ui/edit-publication.xhtml | 231 +++++++++--------- .../ui/SciPublicationsBundle.properties | 12 + .../ui/SciPublicationsBundle_de.properties | 12 + 7 files changed, 243 insertions(+), 116 deletions(-) create mode 100644 sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/collectedvolume/edit-collectedvolume.xhtml diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeRow.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeRow.java index 1e5c20a..d56ed97 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeRow.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeRow.java @@ -8,11 +8,21 @@ import java.util.Comparator; */ public class ArticleInCollectedVolumeRow implements Comparable { + + private String articleUuid; private String title; private String chapter; + public String getArticleUuid() { + return articleUuid; + } + + public void setArticleUuid(final String articleUuid) { + this.articleUuid = articleUuid; + } + public String getTitle() { return title; } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStep.java index 98fca9c..969b883 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStep.java @@ -279,6 +279,7 @@ public class CollectedVolumePropertiesStep ) { final ArticleInCollectedVolumeRow row = new ArticleInCollectedVolumeRow(); + row.setArticleUuid(article.getUuid()); row.setTitle( globalizationHelper.getValueFromLocalizedString( article.getTitle() diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStepModel.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStepModel.java index 41e684d..83e28ad 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStepModel.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/CollectedVolumePropertiesStepModel.java @@ -1,5 +1,7 @@ package org.scientificcms.publications.ui.contenttypes; +import org.scientificcms.publications.ArticleInCollectedVolume; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -16,7 +18,7 @@ import javax.inject.Named; public class CollectedVolumePropertiesStepModel { private List articles; - + public List getArticles() { return Collections.unmodifiableList(articles); } @@ -25,6 +27,8 @@ public class CollectedVolumePropertiesStepModel { this.articles = new ArrayList<>(articles); } - + public String getArticleType() { + return ArticleInCollectedVolume.class.getName(); + } } diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/collectedvolume/edit-collectedvolume.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/collectedvolume/edit-collectedvolume.xhtml new file mode 100644 index 0000000..2b72bf9 --- /dev/null +++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/collectedvolume/edit-collectedvolume.xhtml @@ -0,0 +1,85 @@ +]> + + + + + + + + + + + + + + + +

#{SciPublicationsUiMessageBundle['collectedvolume.aricles.none']}

+
+ + + + + + + + + + + + + + + + + + + +
#{SciPublicationsUiMessageBundle['collectedvolume.basicproperties.articles.title']}#{SciPublicationsUiMessageBundle['collectedvolume.basicproperties.articles.chapter']} + #{SciPublicationsUiMessageBundle['collectedvolume.basicproperties.articles.actions']} +
#{article.title}#{article.chapter} + + + + #{SciPublicationsUiMessageBundle['collectedvolume.basicproperties.articles.actions.edit']} + + + + +
+
+
+ +
+ +
+ + diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml index f7535d5..82d2346 100644 --- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml +++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml @@ -261,11 +261,13 @@ name="editor" /> - - -

#{SciPublicationsUiMessageBundle['basicproperties.authors.none']}

-
- + + + +

#{SciPublicationsUiMessageBundle['basicproperties.authors.none']}

+
+ + - - - - - - - - - - - - - - + + + + +
#{SciPublicationsUiMessageBundle['basicproperties.authors.table.name']} - #{SciPublicationsUiMessageBundle['basicproperties.authors.table.editor']} - - #{SciPublicationsUiMessageBundle['basicproperties.authors.table.actions']} -
- - #{author.authorName} - - - - #{SciPublicationsUiMessageBundle['basicproperties.authors.table.editor.yes']} - - - #{SciPublicationsUiMessageBundle['basicproperties.authors.table.editor.no']} - - - - - + + +
+
+
+ diff --git a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties index 0293a00..a461f99 100644 --- a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties +++ b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties @@ -434,3 +434,15 @@ collectedvolume.createstep.description=Create a new collected volume. collectedvolume.createform.submit=Create collected volume articleincollectedvolume.createform.submit=Create article in collected volume articleincollectedvolume.createform.title=Create a new article in a collected volume +collectedvolume.basicproperties.header=Edit basic properties of collected volume {0} +collectedvolume.basicproperties.articles.add.label=Add article to collected volume +collectedvolume.aricles.none=This collected volume has no articles yet. +collectedvolume.basicproperties.articles.title=Title +collectedvolume.basicproperties.articles.chapter=Chapter +collectedvolume.basicproperties.articles.actions=Actions +collectedvolume.basicproperties.articles.actions.edit=Edit article +collectedvolume.basicproperties.articles.actions.remove=Remove article +collectedvolume.basicproperties.articles.actions.cancel=Cancel +collectedvolume.basicproperties.articles.actions.remove.confirm=Remove article +collectedvolume.basicproperties.articles.actions.remove.title=Confirm removal of article +collectedvolume.basicproperties.articles.actions.remove.message=Are you sure to remove the article {1} from the collected volume {0}. diff --git a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties index d1a0a5d..f2c18cb 100644 --- a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties +++ b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties @@ -434,3 +434,15 @@ collectedvolume.createstep.description=Einen neuen Sammelband anlegen. collectedvolume.createform.submit=Sammelband anlegen articleincollectedvolume.createform.submit=Sammelbandartikel anlegen articleincollectedvolume.createform.title=Einen neuen Sammelbandartikel anlegen +collectedvolume.basicproperties.header=Basiseigenschaften des Sammelbands {0} bearbeiten +collectedvolume.basicproperties.articles.add.label=Einen Artikel zum Sammelband hinzuf\u00fcgen +collectedvolume.aricles.none=Diesem Sammelband wurden noch keine Publikationen zugeordnet. +collectedvolume.basicproperties.articles.title=Titel +collectedvolume.basicproperties.articles.chapter=Kapitel +collectedvolume.basicproperties.articles.actions=Aktionen +collectedvolume.basicproperties.articles.actions.edit=Artikel bearbeiten +collectedvolume.basicproperties.articles.actions.remove=Artikel entfernen +collectedvolume.basicproperties.articles.actions.cancel=Abbrechen +collectedvolume.basicproperties.articles.actions.remove.confirm=Artikel entfernen +collectedvolume.basicproperties.articles.actions.remove.title=Entfernen des Artikels best\u00e4tigen +collectedvolume.basicproperties.articles.actions.remove.message=Sind Sie sicher dass Sie den Artikel {1} aus dem Sammelband {0} entfernen wollen?