From eb9cd0b4ea9dac9462359870c7ce8ec92399cca6 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Thu, 18 Aug 2022 19:59:21 +0200
Subject: [PATCH] Bugfixes for authoring steps of Proceedings and InProceedings

---
 .../publications/ProceedingsManager.java      |  18 ++-
 .../InProceedingsExtendedPropertiesStep.java  |   2 +-
 .../InProceedingsPropertiesStep.java          |   2 +-
 .../ProceedingsExtendedPropertiesStep.java    |   2 +-
 .../ProceedingsPropertiesStep.java            |   2 +-
 .../edit-extended-properties.xhtml            |   2 +-
 .../ui/inproceedings/edit-inproceedings.xhtml |  22 +--
 .../ui/proceedings/edit-proceedings.xhtml     | 129 +++++++++++-------
 .../ui/SciPublicationsBundle.properties       |   1 +
 .../ui/SciPublicationsBundle_de.properties    |   1 +
 10 files changed, 106 insertions(+), 75 deletions(-)

diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ProceedingsManager.java b/sci-publications/src/main/java/org/scientificcms/publications/ProceedingsManager.java
index f55aabd..96f0e59 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ProceedingsManager.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ProceedingsManager.java
@@ -45,28 +45,32 @@ public class ProceedingsManager {
     @Transactional(Transactional.TxType.REQUIRED)
     public void removeArticleFromProceedings(
         final InProceedings paper,
-        final Proceedings collectedVolume
+        final Proceedings proceedings
     ) {
         Objects.requireNonNull(paper);
-        Objects.requireNonNull(collectedVolume);
+        Objects.requireNonNull(proceedings);
 
-        if (!collectedVolume.equals(paper.getProceedings())
-                || !collectedVolume.getPapers().contains(paper)) {
+        if (paper.getProceedings() == null) {
+            return;
+        }
+        
+        if (!proceedings.getUuid().equals(paper.getProceedings().getUuid())
+                || !proceedings.getPapers().contains(paper)) {
             throw new IllegalArgumentException(
                 String.format(
                     "The provided paper %s is not a paper of the "
                         + "provided proceedings %s.",
                     paper.getUuid(),
-                    collectedVolume.getUuid()
+                    proceedings.getUuid()
                 )
             );
         }
 
         paper.setProceedings(null);
-        collectedVolume.removePaper(paper);
+        proceedings.removePaper(paper);
 
         publicationRepository.save(paper);
-        publicationRepository.save(collectedVolume);
+        publicationRepository.save(proceedings);
     }
 
 }
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsExtendedPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsExtendedPropertiesStep.java
index 96fa941..5787f68 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsExtendedPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsExtendedPropertiesStep.java
@@ -30,7 +30,7 @@ import javax.ws.rs.PathParam;
     bundle = SciPublicationsUiConstants.BUNDLE,
     descriptionKey = "authoringsteps.extendedproperties.description",
     labelKey = "authoringsteps.extendedproperties.label",
-    supportedDocumentType = MonographItem.class
+    supportedDocumentType = InProceedingsItem.class
 )
 public class InProceedingsExtendedPropertiesStep
     extends AbstractPublicationExtendedPropertiesStep<InProceedingsItem, InProceedings> {
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java
index 9966ae5..c0069e3 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsPropertiesStep.java
@@ -47,7 +47,7 @@ import javax.ws.rs.PathParam;
     bundle = SciPublicationsUiConstants.BUNDLE,
     descriptionKey = "authoringsteps.basicproperties.description",
     labelKey = "authoringsteps.basicproperties.label",
-    supportedDocumentType = ArticleInCollectedVolumeItem.class
+    supportedDocumentType = InProceedingsItem.class
 )
 public class InProceedingsPropertiesStep
     extends AbstractPublicationPropertiesStep<InProceedingsItem, InProceedings> {
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsExtendedPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsExtendedPropertiesStep.java
index 13b2825..8fb250f 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsExtendedPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsExtendedPropertiesStep.java
@@ -29,7 +29,7 @@ import javax.ws.rs.PathParam;
     bundle = SciPublicationsUiConstants.BUNDLE,
     descriptionKey = "authoringsteps.extendedproperties.description",
     labelKey = "authoringsteps.extendedproperties.label",
-    supportedDocumentType = CollectedVolumeItem.class
+    supportedDocumentType = ProceedingsItem.class
 )
 public class ProceedingsExtendedPropertiesStep extends AbstractPublicationWithPublisherExtendedPropertiesStep<ProceedingsItem, Proceedings> {
 
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java
index b2b0784..86529de 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsPropertiesStep.java
@@ -423,7 +423,7 @@ public class ProceedingsPropertiesStep
         final String placeOfConference,
         @FormParam("startDate")
         final String startDateParam,
-        @FormParam("endDateParam")
+        @FormParam("endDate")
         final String endDateParam
     ) {
         super.updateProperties(
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-extended-properties.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-extended-properties.xhtml
index c8fc14d..2b76dc8 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-extended-properties.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-extended-properties.xhtml
@@ -5,7 +5,7 @@
       xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
       xmlns:librecms="http://xmlns.jcp.org/jsf/composite/components/librecms"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-extented-properties.xhtml">
+    <ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-extended-properties.xhtml">
 
         <ui:param name="authoringStep" 
                   value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@inproceedings-extendedproperties" />
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-inproceedings.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-inproceedings.xhtml
index f6ab424..4e8e2a2 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-inproceedings.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/inproceedings/edit-inproceedings.xhtml
@@ -78,18 +78,18 @@
                         #{SciCmsInProceedingsPropertiesStepModel.proceedingsTitle}
                     </p>
                 </c:otherwise>
-                <c:if test="#{CmsSelectedDocumentModel.canEdit and SciCmsInProceedingsPropertiesStepModel.proceedingsTitle == null}">
-                    <libreccm:deleteDialog
-                        actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@inproceedings-basicproperties/proceedings/remove"
-                        buttonText="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove']}"
-                        cancelLabel="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.cancel']}"
-                        confirmLabel="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.confirm']}"
-                        dialogId="remove-proceedings-dialog"
-                        dialogTitle="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.title']}"
-                        message="#{SciPublicationsUiMessageBundle.getMessage('inproceedings.basicproperties.proceedings.remove.message', [CmsSelectedDocumentModel.name, SciCmsInProceedingsPropertiesStepModel.proceedingsTitle])}"
-                        />
-                </c:if>
             </c:choose>
+            <c:if test="#{CmsSelectedDocumentModel.canEdit and SciCmsInProceedingsPropertiesStepModel.proceedingsTitle != null}">
+                <libreccm:deleteDialog
+                    actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@inproceedings-basicproperties/proceedings/remove"
+                    buttonText="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove']}"
+                    cancelLabel="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.cancel']}"
+                    confirmLabel="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.confirm']}"
+                    dialogId="remove-proceedings-dialog"
+                    dialogTitle="#{SciPublicationsUiMessageBundle['inproceedings.basicproperties.proceedings.remove.title']}"
+                    message="#{SciPublicationsUiMessageBundle.getMessage('inproceedings.basicproperties.proceedings.remove.message', [CmsSelectedDocumentModel.itemName, SciCmsInProceedingsPropertiesStepModel.proceedingsTitle])}"
+                    />
+            </c:if>
 
         </ui:define>
 
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-proceedings.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-proceedings.xhtml
index a316942..51240b9 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-proceedings.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/proceedings/edit-proceedings.xhtml
@@ -78,38 +78,8 @@
                     </table>
                 </c:otherwise>
             </c:choose>
-
-            <h3 class="mt-5">#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.header']}</h3>
             
-            <bootstrap:formGroupText
-                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.name.help']}"
-                inputId="name-of-conference"
-                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.name.label']}"
-                name="nameOfConference"
-                />
-            
-            <bootstrap:formGroupText
-                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.place.help']}"
-                inputId="place-of-conference"
-                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.place.label']}"
-                name="placeOfConference"
-                />
-            
-            <bootstrap:formGroupDate
-                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.startdate.help']}"
-                inputId="startdate"
-                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.startdate.label']}"
-                name="startDate"
-                />
-            
-            <bootstrap:formGroupDate
-                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.enddate.help']}"
-                inputId="end"
-                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.enddate.label']}"
-                name="endDate"
-                />
-            
-            <h4 class="mt-5">#{SciPublicationsUiMessageBundle['proceedings.basicproperties.organizer.header']}</h3>
+            <h4 class="mt-5">#{SciPublicationsUiMessageBundle['proceedings.basicproperties.organizer.header']}</h4>
             <div class="mb-2">
                 <div class="text-right">
                     <librecms:assetPickerButton
@@ -120,29 +90,84 @@
                 </div>
             </div>
             <librecms:assetPicker 
-                    actionUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/organizer"
-                    assetType="#{SciCmsProceedingsPropertiesStepModel.organizerType}"
-                    assetPickerId="organizer-picker"
-                    baseUrl="#{SciCmsPublicationPropertiesStepModel.baseUrl}"
-                    contentSection="#{ContentSectionModel.sectionName}"
-                    dialogTitle="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.select.dialog.title']}"
-                    formParamName="organizerIdentifier"
+                actionUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/organizer"
+                assetType="#{SciCmsProceedingsPropertiesStepModel.organizerType}"
+                assetPickerId="organizer-picker"
+                baseUrl="#{SciCmsPublicationPropertiesStepModel.baseUrl}"
+                contentSection="#{ContentSectionModel.sectionName}"
+                dialogTitle="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.select.dialog.title']}"
+                formParamName="organizerIdentifier"
+                />
+            <p>
+                #{SciCmsProceedingsPropertiesStepModel.organizer}
+            </p>
+            <c:if test="#{SciCmsProceedingsPropertiesStepModel.organizerUuid != null}">
+                <libreccm:deleteDialog
+                    actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/organizer/@remove"
+                    buttonText="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.remove.label']}"
+                    cancelLabel="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.cancel']}"
+                    confirmLabel="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.confirm']}"
+                    dialogId="organizer-remove"
+                    dialogTitle="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.title']}"
+                    message="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.message']}"
                     />
-                <p>
-                    #{SciCmsProceedingsPropertiesStepModel.organizer}
-                </p>
-                <c:if test="#{SciCmsProceedingsPropertiesStepModel.organzierUuid != null}">
-                    <libreccm:deleteDialog
-                        actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@proceedings-basicproperties/organizer/@remove"
-                            buttonText="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.remove.label']}"
-                            cancelLabel="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.cancel']}"
-                            confirmLabel="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.confirm']}"
-                            dialogId="organizer-remove"
-                            dialogTitle="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.title']}"
-                            message="#{SciPublicationsUiMessageBundle['proceedings.editstep.organizer.message']}"
-                            />
-                </c:if>
+            </c:if>
+            
+        </ui:define>
 
+        
+        <ui:define name="publicationBasicPropertiesForm">
+            <bootstrap:formGroupText
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.name.help']}"
+                inputId="name-of-conference"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.name.label']}"
+                name="nameOfConference"
+                value="#{SciCmsProceedingsPropertiesStepModel.nameOfConference}"
+                />
+
+            <bootstrap:formGroupText
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.place.help']}"
+                inputId="place-of-conference"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.place.label']}"
+                name="placeOfConference"
+                value="#{SciCmsProceedingsPropertiesStepModel.placeOfConference}"
+                />
+
+            <bootstrap:formGroupDate
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.startdate.help']}"
+                inputId="startdate"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.startdate.label']}"
+                name="startDate"
+                value="#{SciCmsProceedingsPropertiesStepModel.startDate}"
+                />
+
+            <bootstrap:formGroupDate
+                help="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.enddate.help']}"
+                inputId="enddate"
+                label="#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.enddate.label']}"
+                name="endDate"
+                value="#{SciCmsProceedingsPropertiesStepModel.endDate}"
+                />
+
+        </ui:define>
+        
+        <ui:define name="publicationBasicPropertiesDl">
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.name.label']}</dt>
+                <dd>#{SciCmsProceedingsPropertiesStepModel.nameOfConference}</dd>
+            </div>
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.place.label']}</dt>
+                <dd>#{SciCmsProceedingsPropertiesStepModel.placeOfConference}</dd>
+            </div>
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.startdate.label']}</dt>
+                <dd>#{SciCmsProceedingsPropertiesStepModel.startDate}</dd>
+            </div>
+            <div>
+                <dt>#{SciPublicationsUiMessageBundle['proceedings.basicproperties.conference.enddate.label']}</dt>
+                <dd>#{SciCmsProceedingsPropertiesStepModel.endDate}</dd>
+            </div>
         </ui:define>
 
         <ui:define name="publicationScripts">
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 8f07224..3176444 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
@@ -526,3 +526,4 @@ inproceedings.basicproperties.proceedings.remove.confirm=Remove
 inproceedings.basicproperties.proceedings.remove.title=Remove paper from Proceedings
 inproceedings.basicproperties.proceedings.remove.message=Are you sure to remove the paper {0} from the Proceedings {1}?
 inproceedings.extendedproperties.header=Edit extended properties of Inproceedings {0}
+proceedings.extendedproperties.header=Extended Properties of Proceedings {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 42b1402..9d42b84 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
@@ -526,3 +526,4 @@ inproceedings.basicproperties.proceedings.remove.confirm=Entfernen
 inproceedings.basicproperties.proceedings.remove.title=Beitrag aus Tagungsband entfernen
 inproceedings.basicproperties.proceedings.remove.message=Sind Sie sicher, dass Sie den Beitrag {0} aus dem Tagungsband {1} entfernen wollen?
 inproceedings.extendedproperties.header=Tagungsbandbeitrag {0} bearbeiten
+proceedings.extendedproperties.header=Erweiterte Eigenschaften des Tagungsbandes {0}