From df573df67bd96b8a870cf9b4c8092a46071e53e9 Mon Sep 17 00:00:00 2001 From: glend17 Date: Thu, 30 Sep 2021 16:30:29 -0700 Subject: [PATCH 01/60] [VSPC-190] Added sorting functionality for space --- .../core/aspects/ExhibitionDataAspect.java | 7 ++++ .../vspace/core/model/impl/Exhibition.java | 4 ++ .../web/staff/ExhibitionSpaceOrderMode.java | 7 ++++ .../staff/ExhibitionSpaceOrderUtility.java | 37 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderMode.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java index a369a242a..4db5af66b 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java @@ -1,5 +1,7 @@ package edu.asu.diging.vspace.core.aspects; import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,6 +27,7 @@ import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.IModuleManager; import edu.asu.diging.vspace.core.services.ISpaceManager; +import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderUtility; @Component @Aspect @@ -41,6 +44,9 @@ public class ExhibitionDataAspect { @Autowired private AuthenticationFacade authFacade; + + @Autowired + ExhibitionSpaceOrderUtility exhibitionSpaceOrderUtility; @After("execution(public * edu.asu.diging.vspace.web..*Controller.*(..))") public void setExhibition(JoinPoint jp) { @@ -61,6 +67,7 @@ public void setExhibition(JoinPoint jp) { * Added to show spaces with null status and accommodate existing spaces with null space status */ publishedSpaces.addAll(spaceManager.getSpacesWithStatus(null)); + publishedSpaces = exhibitionSpaceOrderUtility.sortSpacesAlphabetically(publishedSpaces); ((Model) obj).addAttribute("publishedSpaces", publishedSpaces); } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java index 93e548703..de5df8211 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java @@ -11,6 +11,7 @@ import edu.asu.diging.vspace.core.model.ExhibitionModes; import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderMode; /** * Represents an exhibition that can have a default start space. @@ -33,6 +34,9 @@ public class Exhibition extends VSpaceElement implements IExhibition { @Enumerated(EnumType.STRING) private ExhibitionModes mode; + + @Enumerated(EnumType.STRING) + private ExhibitionSpaceOrderMode spaceOrderMode; private String customMessage; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderMode.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderMode.java new file mode 100644 index 000000000..3f337a5d8 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderMode.java @@ -0,0 +1,7 @@ +package edu.asu.diging.vspace.web.staff; + +public enum ExhibitionSpaceOrderMode { + ALPHABETICAL, + CREATION_DATE, + CUSTOM +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java new file mode 100644 index 000000000..3ab6bef25 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java @@ -0,0 +1,37 @@ +package edu.asu.diging.vspace.web.staff; + +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import org.springframework.stereotype.Component; + +import edu.asu.diging.vspace.core.model.ISpace; + +@Component +public class ExhibitionSpaceOrderUtility { + + public List sortSpacesAlphabetically(List publishedSpaces){ + //TO Do sort alphabetically + /* (non-Javadoc) + * Published spaces to be shown alphabetically by default + */ + Collections.sort(publishedSpaces, new Comparator() { + @Override + public int compare(ISpace space1, ISpace space2) { + return (space1.getName().toLowerCase()).compareTo(space2.getName().toLowerCase()); + } + }); + return publishedSpaces; + } + + public List sortSpacesOnCreationDate(List publishedSpaces){ + Collections.sort(publishedSpaces, new Comparator() { + @Override + public int compare(ISpace space1, ISpace space2) { + return (space1.getCreationDate()).compareTo(space2.getCreationDate()); + } + }); + return publishedSpaces; + } +} From 89b4f236c2251cb3503cc4905c2c94ef9e11d022 Mon Sep 17 00:00:00 2001 From: glend17 Date: Fri, 1 Oct 2021 16:30:45 -0700 Subject: [PATCH 02/60] [VSPC-190] added custom ordering layout page --- .../core/aspects/ExhibitionDataAspect.java | 2 +- .../diging/vspace/core/model/IExhibition.java | 6 + .../vspace/core/model/impl/Exhibition.java | 14 +- .../vspace/core/services/ISpaceManager.java | 2 + .../core/services/impl/SpaceManager.java | 13 + .../web/staff/CustomOrderingController.java | 14 + .../staff/ExhibitionSpaceOrderUtility.java | 25 +- .../WEB-INF/views/layouts/navbar_staff.html | 7 + .../views/staff/spaces/customordering.html | 1966 +++++++++++++++++ 9 files changed, 2043 insertions(+), 6 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java create mode 100644 vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java index 4db5af66b..181c6cbd3 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java @@ -67,7 +67,7 @@ public void setExhibition(JoinPoint jp) { * Added to show spaces with null status and accommodate existing spaces with null space status */ publishedSpaces.addAll(spaceManager.getSpacesWithStatus(null)); - publishedSpaces = exhibitionSpaceOrderUtility.sortSpacesAlphabetically(publishedSpaces); + publishedSpaces = spaceManager.sortPublishedSpacesByGivenOrder(publishedSpaces); ((Model) obj).addAttribute("publishedSpaces", publishedSpaces); } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java index 8c080242c..7f1d4b154 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java @@ -1,5 +1,7 @@ package edu.asu.diging.vspace.core.model; +import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderMode; + public interface IExhibition extends IVSpaceElement { /* @@ -21,5 +23,9 @@ public interface IExhibition extends IVSpaceElement { void setTitle(String title); String getTitle(); + + ExhibitionSpaceOrderMode getSpaceOrderMode(); + + void setSpaceOrderMode(ExhibitionSpaceOrderMode exhibitionSpaceOrderMode); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java index de5df8211..76cd87acb 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java @@ -34,12 +34,12 @@ public class Exhibition extends VSpaceElement implements IExhibition { @Enumerated(EnumType.STRING) private ExhibitionModes mode; + + private String customMessage; @Enumerated(EnumType.STRING) private ExhibitionSpaceOrderMode spaceOrderMode; - private String customMessage; - /* * (non-Javadoc) * @@ -107,5 +107,15 @@ public String getCustomMessage() { public void setCustomMessage(String customMessage) { this.customMessage = customMessage; } + + @Override + public ExhibitionSpaceOrderMode getSpaceOrderMode() { + return spaceOrderMode; + } + + @Override + public void setSpaceOrderMode(ExhibitionSpaceOrderMode spaceOrderMode) { + this.spaceOrderMode = spaceOrderMode; + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java index ec812cdfd..79279faa6 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java @@ -38,4 +38,6 @@ public interface ISpaceManager { Iterable addIncomingLinkInfoToSpaces(Iterable spaces); Page findByNameOrDescription(Pageable requestedPage,String searchText); + + List sortPublishedSpacesByGivenOrder(List publishedSpaces); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java index 63884749c..099a4590a 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java @@ -27,6 +27,7 @@ import edu.asu.diging.vspace.core.factory.IImageFactory; import edu.asu.diging.vspace.core.factory.ISpaceDisplayFactory; import edu.asu.diging.vspace.core.file.IStorageEngine; +import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.IVSImage; import edu.asu.diging.vspace.core.model.display.ISpaceDisplay; @@ -40,6 +41,8 @@ import edu.asu.diging.vspace.core.services.IImageService; import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.impl.model.ImageData; +import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderMode; +import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderUtility; @Transactional @Service @@ -78,6 +81,9 @@ public class SpaceManager implements ISpaceManager { @Autowired private SpaceLinkDisplayRepository spaceLinkDisplayRepo; + + @Autowired + private ExhibitionSpaceOrderUtility exhibitionSpaceOrderUtility; private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -297,4 +303,11 @@ public Iterable addIncomingLinkInfoToSpaces(Iterable spaces) { public Page findByNameOrDescription(Pageable requestedPage, String searchText) { return spaceRepo.findDistinctByNameContainingOrDescriptionContaining(requestedPage, searchText,searchText); } + + @Override + public List sortPublishedSpacesByGivenOrder(List publishedSpaces) { + IExhibition exhibitition = exhibitionManager.findAll().get(0); + return exhibitionSpaceOrderUtility.retrieveSpacesListInGivenOrder(publishedSpaces, exhibitition.getSpaceOrderMode()); + } + } \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java new file mode 100644 index 000000000..3850057e1 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java @@ -0,0 +1,14 @@ +package edu.asu.diging.vspace.web.staff; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +public class CustomOrderingController { + + @RequestMapping("/staff/spaceordering") + public String displayCurrentOrder() { + return "/staff/spaces/customordering"; + } + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java index 3ab6bef25..be1b15172 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java @@ -4,14 +4,18 @@ import java.util.Comparator; import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import edu.asu.diging.vspace.core.data.ExhibitionRepository; import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.services.IExhibitionManager; +import edu.asu.diging.vspace.core.services.impl.SpaceManager; @Component public class ExhibitionSpaceOrderUtility { - - public List sortSpacesAlphabetically(List publishedSpaces){ + + private List sortSpacesAlphabetically(List publishedSpaces){ //TO Do sort alphabetically /* (non-Javadoc) * Published spaces to be shown alphabetically by default @@ -25,7 +29,7 @@ public int compare(ISpace space1, ISpace space2) { return publishedSpaces; } - public List sortSpacesOnCreationDate(List publishedSpaces){ + private List sortSpacesOnCreationDate(List publishedSpaces){ Collections.sort(publishedSpaces, new Comparator() { @Override public int compare(ISpace space1, ISpace space2) { @@ -34,4 +38,19 @@ public int compare(ISpace space1, ISpace space2) { }); return publishedSpaces; } + + public List customSpaceOrder(List publishedSpaces){ + return publishedSpaces; + } + + public List retrieveSpacesListInGivenOrder(List publishedSpaces, ExhibitionSpaceOrderMode mode){ + if(mode == ExhibitionSpaceOrderMode.ALPHABETICAL) { + return sortSpacesAlphabetically(publishedSpaces); + } + else if(mode == ExhibitionSpaceOrderMode.CREATION_DATE) { + return sortSpacesOnCreationDate(publishedSpaces); + }else { + return customSpaceOrder(publishedSpaces); + } + } } diff --git a/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html b/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html index 978e3ef7a..66d1d2cde 100644 --- a/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html +++ b/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html @@ -48,6 +48,13 @@ th:href="@{/staff/user/list}">  Users + +
  • + +  Custom Ordering +
  • + + + + + + + + + + + +
    +
    +
    +

    + Space: [[${space?.name}]] + + +

    +

    [[${space.description}]]

    +
    +
    + +
    + There are no links to this space. + +
    +
    + +
    + +
    + There are no links from this space. + +
    +
    +
    + + +
    +
    + +
    + + +

    + +

    +
    + +
    + + +

    + +

    +
    +
    + +
    + +
    + +   + +   + +   + +   +
    + +
    + + +
    + +
    +
    + +
    + +
    +

    + +

    +
    + + \ No newline at end of file From cead54fda0017583851d7143ea997c3d93df8ef8 Mon Sep 17 00:00:00 2001 From: glend17 Date: Tue, 5 Oct 2021 16:29:48 -0700 Subject: [PATCH 03/60] [VSPC-190] Changed the logic for custom order to input values given by user instead of drag and drop --- .../web/staff/CustomOrderingController.java | 29 +- .../views/staff/spaces/customordering.html | 1986 +---------------- 2 files changed, 65 insertions(+), 1950 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java index 3850057e1..f11adfcc8 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java @@ -1,13 +1,38 @@ package edu.asu.diging.vspace.web.staff; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; +import edu.asu.diging.vspace.core.data.SpaceRepository; +import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.impl.Space; +import edu.asu.diging.vspace.core.model.impl.SpaceStatus; +import edu.asu.diging.vspace.core.services.ISpaceManager; + @Controller public class CustomOrderingController { - + + @Autowired + private ISpaceManager spaceManager; + @RequestMapping("/staff/spaceordering") - public String displayCurrentOrder() { + public String displayCurrentOrder(Model model) { + List spaces = (List) spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED); + spaces.addAll(spaceManager.getSpacesWithStatus(null)); + model.addAttribute("spaces", spaces); + + return "/staff/spaces/customordering"; + } + @RequestMapping("/staff/spaceordering/changeorder") + public String changeDisplayOrder(Model model) { + List spaces = (List) spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED); + spaces.addAll(spaceManager.getSpacesWithStatus(null)); + model.addAttribute("spaces", spaces); + return "/staff/spaces/customordering"; } diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html index cbe09501f..9f98383f8 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html @@ -5,1962 +5,52 @@ - - -
    -
    -
    -

    - Space: [[${space?.name}]] - - -

    -

    [[${space.description}]]

    -
    -
    - -
    - There are no links to this space. - -
    -
    - -
    - -
    - There are no links from this space. - -
    -
    -
    - - -
    -
    - -
    - - -

    - -

    -
    - -
    - - -

    - -

    -
    -
    - -
    - -
    - -   - -   - -   - -   -
    - -
    - - +
    +

    Images

    +
    This virtual exhibition + contains the following images.
    + + + + + + + + + + + + + + + + + +
    Space NameCreated DateOrder +
    [[${space.name}]][[${space.createdBy}]][[${space.creationDate}]] + + + + +
    + - -
    -
    - -
    - -
    -

    - -

    -
    +
    +
    \ No newline at end of file From 2a4e0216981d07c222a4ad2c26bd20089a283573 Mon Sep 17 00:00:00 2001 From: glend17 Date: Wed, 6 Oct 2021 12:37:13 -0700 Subject: [PATCH 04/60] [VSPC-190] Added custom order logic for spaces --- .../data/SpacesCustomOrderRepository.java | 19 ++++++ .../vspace/core/model/ISpacesCustomOrder.java | 13 ++++ .../vspace/core/model/SpacesCustomOrder.java | 64 +++++++++++++++++++ .../services/ISpacesCustomOrderManager.java | 13 ++++ .../impl/SpacesCustomOrderManager.java | 48 ++++++++++++++ ...va => SpacesCustomOrderingController.java} | 2 +- 6 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java rename vspace/src/main/java/edu/asu/diging/vspace/web/staff/{CustomOrderingController.java => SpacesCustomOrderingController.java} (96%) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java new file mode 100644 index 000000000..b9afff98f --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java @@ -0,0 +1,19 @@ +package edu.asu.diging.vspace.core.data; + +import java.util.List; + +import org.javers.spring.annotation.JaversSpringDataAuditable; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.stereotype.Repository; + +import edu.asu.diging.vspace.core.model.SpacesCustomOrder; + +@Repository +@JaversSpringDataAuditable +public interface SpacesCustomOrderRepository extends PagingAndSortingRepository { + @Query("SELECT max(customOrder) FROM SpacesCustomOrder d WHERE d.space.id = ?1") + public Integer findMaxCustomOrder(String spaceId); + + public List findBySpace_IdAndCustomOrderGreaterThan(String spaceId,Integer customOrder); +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java new file mode 100644 index 000000000..200fb4076 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java @@ -0,0 +1,13 @@ +package edu.asu.diging.vspace.core.model; + +public interface ISpacesCustomOrder extends IVSpaceElement { + + String getId(); + + void setId(String id); + + Integer getCustomOrder(); + + void setCustomOrder(Integer customOrder); + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java new file mode 100644 index 000000000..b3a76446d --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java @@ -0,0 +1,64 @@ +package edu.asu.diging.vspace.core.model; + + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.OneToOne; + +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; + +import edu.asu.diging.vspace.core.model.impl.Space; +import edu.asu.diging.vspace.core.model.impl.VSpaceElement; + +@Entity +@Inheritance(strategy = InheritanceType.JOINED) +public class SpacesCustomOrder extends VSpaceElement implements ISpacesCustomOrder { + + @Id + @GeneratedValue(generator = "customorder_id_generator") + @GenericGenerator(name = "customorder_id_generator", + parameters = @Parameter(name = "prefix", value = "CON"), + strategy = "edu.asu.diging.vspace.core.data.IdGenerator") + private String id; + + @OneToOne(targetEntity = Space.class) + private ISpace space; + + private Integer customOrder; + + /* + * (non-Javadoc) + * + * @see edu.asu.diging.vspace.core.model.impl.IContentBlock#getId() + */ + @Override + public String getId() { + return id; + } + + /* + * (non-Javadoc) + * + * @see + * edu.asu.diging.vspace.core.model.impl.IContentBlock#setId(java.lang.String) + */ + @Override + public void setId(String id) { + this.id = id; + } + + @Override + public Integer getCustomOrder() { + return customOrder; + } + + @Override + public void setCustomOrder(Integer customOrder) { + this.customOrder=customOrder; + } + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java new file mode 100644 index 000000000..81c8537f4 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java @@ -0,0 +1,13 @@ +package edu.asu.diging.vspace.core.services; + +import java.util.List; + +import edu.asu.diging.vspace.core.model.SpacesCustomOrder; + +public interface ISpacesCustomOrderManager { + + Integer findMaxContentOrder(String slideId); + + void updateCustomOrder(List spacesCustomOrderCurrentList); + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java new file mode 100644 index 000000000..de2132fe1 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -0,0 +1,48 @@ +package edu.asu.diging.vspace.core.services.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import edu.asu.diging.vspace.core.data.SpacesCustomOrderRepository; +import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; + +@Service +@Transactional(rollbackFor = { Exception.class }) +public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { + + @Autowired + SpacesCustomOrderRepository spacesCustomOrderRepository; + + @Override + public Integer findMaxContentOrder(String spaceId) { + + return spacesCustomOrderRepository.findMaxCustomOrder(spaceId); + } + + @Override + public void updateCustomOrder(List spacesCustomOrderCurrentList) { + + if (spacesCustomOrderCurrentList == null) { + return; + } + List spacesCustomOrderNewList = new ArrayList<>(); + for (SpacesCustomOrder eachSpace : spacesCustomOrderCurrentList) { + String spaceId = eachSpace.getId(); + int customOrder = eachSpace.getCustomOrder(); + Optional spaceCustomOrderOptional = spacesCustomOrderRepository.findById(spaceId); + if (spaceCustomOrderOptional.isPresent()) { + SpacesCustomOrder spaceCustomOrder = spaceCustomOrderOptional.get(); + spaceCustomOrder.setCustomOrder(customOrder); + spacesCustomOrderNewList.add(spaceCustomOrder); + } + } + spacesCustomOrderRepository.saveAll(spacesCustomOrderNewList); + } + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java similarity index 96% rename from vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java rename to vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java index f11adfcc8..40fa32630 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java @@ -14,7 +14,7 @@ import edu.asu.diging.vspace.core.services.ISpaceManager; @Controller -public class CustomOrderingController { +public class SpacesCustomOrderingController { @Autowired private ISpaceManager spaceManager; From 1ac9e32a0a27b8b8dfa6228838566d0c395c32b6 Mon Sep 17 00:00:00 2001 From: glend17 Date: Thu, 7 Oct 2021 16:32:18 -0700 Subject: [PATCH 05/60] [VSPC-190] Added controller to adjust content order and front end changes --- .../staff/SpacesCustomOrderingController.java | 24 ++++++++ .../views/staff/spaces/customordering.html | 58 ++++++------------- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java index 40fa32630..82a7ab3b1 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java @@ -2,23 +2,36 @@ import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import edu.asu.diging.vspace.core.data.SpaceRepository; import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.SpacesCustomOrder; import edu.asu.diging.vspace.core.model.impl.Space; import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.services.ISpaceManager; +import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; @Controller public class SpacesCustomOrderingController { + private final Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired private ISpaceManager spaceManager; + @Autowired + private ISpacesCustomOrderManager spacesCustomOrderManager; + @RequestMapping("/staff/spaceordering") public String displayCurrentOrder(Model model) { List spaces = (List) spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED); @@ -35,5 +48,16 @@ public String changeDisplayOrder(Model model) { return "/staff/spaces/customordering"; } + + @RequestMapping(value = "/staff/spaceordering/update", method = RequestMethod.POST) + public ResponseEntity> adjustContentOrder(@RequestBody List spacesCustomOrderList) { + //try { + spacesCustomOrderManager.updateCustomOrder(spacesCustomOrderList); +// } catch (SpacesCustomOrderDoesNotExistException e) { +// logger.warn("Spaces Custom Order Id does not exist, bad request.", e); +// return new ResponseEntity>(HttpStatus.BAD_REQUEST); +// } + return new ResponseEntity>(spacesCustomOrderList,HttpStatus.OK); + } } diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html index 9f98383f8..e24fcc8cf 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html @@ -13,44 +13,24 @@ -
    -

    Images

    -
    This virtual exhibition - contains the following images.
    -
    - - - - - - - - - - - - - - - - -
    Space NameCreated DateOrder -
    [[${space.name}]][[${space.createdBy}]][[${space.creationDate}]] - - - - -
    - -
    -
    -
    + +
    +
    +
    + + + +
    + +
    +
    + + \ No newline at end of file From bd2eeb0d96d4b9ba515fc248105d0cbea7977376 Mon Sep 17 00:00:00 2001 From: glend17 Date: Fri, 8 Oct 2021 16:32:17 -0700 Subject: [PATCH 06/60] [VSPC-190] Spaces custom order controller related changes --- .../data/SpacesCustomOrderRepository.java | 6 ++ .../vspace/core/model/ISpacesCustomOrder.java | 2 + .../vspace/core/model/SpacesCustomOrder.java | 13 +++- .../services/ISpacesCustomOrderManager.java | 14 ++++- .../impl/SpacesCustomOrderManager.java | 59 ++++++++++++++++++- .../staff/SpacesCustomOrderingController.java | 32 +++------- .../staff/UpdateSpaceStatusController.java | 7 +++ 7 files changed, 105 insertions(+), 28 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java index b9afff98f..86e83c5ea 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java @@ -1,6 +1,7 @@ package edu.asu.diging.vspace.core.data; import java.util.List; +import java.util.Optional; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.springframework.data.jpa.repository.Query; @@ -14,6 +15,11 @@ public interface SpacesCustomOrderRepository extends PagingAndSortingRepository { @Query("SELECT max(customOrder) FROM SpacesCustomOrder d WHERE d.space.id = ?1") public Integer findMaxCustomOrder(String spaceId); + + @Query("SELECT max(customOrder) FROM SpacesCustomOrder") + public Integer findMaxCustomOrder(); public List findBySpace_IdAndCustomOrderGreaterThan(String spaceId,Integer customOrder); + + public Optional findBySpace_Id(String spaceId); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java index 200fb4076..0501813e8 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpacesCustomOrder.java @@ -10,4 +10,6 @@ public interface ISpacesCustomOrder extends IVSpaceElement { void setCustomOrder(Integer customOrder); + ISpace getSpace(); + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java index b3a76446d..761163790 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; -import edu.asu.diging.vspace.core.model.impl.Space; import edu.asu.diging.vspace.core.model.impl.VSpaceElement; @Entity @@ -25,10 +24,15 @@ public class SpacesCustomOrder extends VSpaceElement implements ISpacesCustomOrd strategy = "edu.asu.diging.vspace.core.data.IdGenerator") private String id; - @OneToOne(targetEntity = Space.class) + @OneToOne private ISpace space; private Integer customOrder; + + public SpacesCustomOrder(ISpace space, Integer customOrder) { + this.space = space; + this.customOrder= customOrder; + } /* * (non-Javadoc) @@ -60,5 +64,10 @@ public Integer getCustomOrder() { public void setCustomOrder(Integer customOrder) { this.customOrder=customOrder; } + + @Override + public ISpace getSpace() { + return space; + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java index 81c8537f4..2d6aae3e2 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java @@ -2,12 +2,24 @@ import java.util.List; +import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.model.impl.SpaceStatus; public interface ISpacesCustomOrderManager { - Integer findMaxContentOrder(String slideId); + Integer findMaxCustomOrder(String slideId); void updateCustomOrder(List spacesCustomOrderCurrentList); + + void persistPublishedSpacesToSpacesCustomOrder(); + + List findAll(); + + void updateStatusChange(ISpace space, SpaceStatus status); + + void updateStatusChangeToUnpublished(ISpace space); + + void updateStatusChangeToPublished(ISpace space); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index de2132fe1..dce65ecd5 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -9,7 +9,9 @@ import org.springframework.transaction.annotation.Transactional; import edu.asu.diging.vspace.core.data.SpacesCustomOrderRepository; +import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; @Service @@ -19,8 +21,11 @@ public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { @Autowired SpacesCustomOrderRepository spacesCustomOrderRepository; + @Autowired + SpaceManager spaceManager; + @Override - public Integer findMaxContentOrder(String spaceId) { + public Integer findMaxCustomOrder(String spaceId) { return spacesCustomOrderRepository.findMaxCustomOrder(spaceId); } @@ -44,5 +49,57 @@ public void updateCustomOrder(List spacesCustomOrderCurrentLi } spacesCustomOrderRepository.saveAll(spacesCustomOrderNewList); } + + @Override + public void persistPublishedSpacesToSpacesCustomOrder() { + List spaces = (List) spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED); + spaces.addAll(spaceManager.getSpacesWithStatus(null)); + List spacesCustomOrderNewList = new ArrayList<>(); + for(ISpace space : spaces) { + Optional spaceCustomOrderOptional = spacesCustomOrderRepository.findBySpace_Id(space.getId()); + int customOrder = spacesCustomOrderRepository.findMaxCustomOrder() + 1; + if(!spaceCustomOrderOptional.isPresent()) { + spacesCustomOrderNewList.add(new SpacesCustomOrder(space, customOrder++)); + } + } + spacesCustomOrderRepository.saveAll(spacesCustomOrderNewList); + } + + @Override + public List findAll(){ + return (List) spacesCustomOrderRepository.findAll(); + } + + @Override + public void updateStatusChange(ISpace space, SpaceStatus status) { + if(status == SpaceStatus.PUBLISHED || status == null) { + updateStatusChangeToPublished(space); + }else { + updateStatusChangeToUnpublished(space); + } + } + + @Override + public void updateStatusChangeToPublished(ISpace space) { + List spacesCustomOrderNewList = new ArrayList<>(); + + } + + @Override + public void updateStatusChangeToUnpublished(ISpace space) { + Optional spaceCustomOrderOptional = spacesCustomOrderRepository.findBySpace_Id(space.getId()); + if(spaceCustomOrderOptional.isPresent()) { + SpacesCustomOrder spaceCustomOrder = spaceCustomOrderOptional.get(); + int order = spaceCustomOrder.getCustomOrder(); + List spacesCustomOrderGreaterThan = spacesCustomOrderRepository.findBySpace_IdAndCustomOrderGreaterThan(space.getId(), order); + spacesCustomOrderRepository.delete(spaceCustomOrder); + + for(SpacesCustomOrder spaceIteration : spacesCustomOrderGreaterThan) { + spaceIteration.setCustomOrder(order); + order++; + } + spacesCustomOrderRepository.saveAll(spacesCustomOrderGreaterThan); + } + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java index 82a7ab3b1..4be25e906 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java @@ -13,12 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import edu.asu.diging.vspace.core.data.SpaceRepository; -import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; -import edu.asu.diging.vspace.core.model.impl.Space; -import edu.asu.diging.vspace.core.model.impl.SpaceStatus; -import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; @Controller @@ -26,24 +21,18 @@ public class SpacesCustomOrderingController { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Autowired - private ISpaceManager spaceManager; - @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; @RequestMapping("/staff/spaceordering") - public String displayCurrentOrder(Model model) { - List spaces = (List) spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED); - spaces.addAll(spaceManager.getSpacesWithStatus(null)); - model.addAttribute("spaces", spaces); + public String displayCurrentOrderLanding(Model model) { + spacesCustomOrderManager.persistPublishedSpacesToSpacesCustomOrder(); - return "/staff/spaces/customordering"; + return "redirect:/staff/spaceordering/display"; } - @RequestMapping("/staff/spaceordering/changeorder") - public String changeDisplayOrder(Model model) { - List spaces = (List) spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED); - spaces.addAll(spaceManager.getSpacesWithStatus(null)); + @RequestMapping("/staff/spaceordering/display") + public String displayCurrentOrder(Model model) { + List spaces = spacesCustomOrderManager.findAll(); model.addAttribute("spaces", spaces); return "/staff/spaces/customordering"; @@ -51,13 +40,8 @@ public String changeDisplayOrder(Model model) { @RequestMapping(value = "/staff/spaceordering/update", method = RequestMethod.POST) public ResponseEntity> adjustContentOrder(@RequestBody List spacesCustomOrderList) { - //try { - spacesCustomOrderManager.updateCustomOrder(spacesCustomOrderList); -// } catch (SpacesCustomOrderDoesNotExistException e) { -// logger.warn("Spaces Custom Order Id does not exist, bad request.", e); -// return new ResponseEntity>(HttpStatus.BAD_REQUEST); -// } + spacesCustomOrderManager.updateCustomOrder(spacesCustomOrderList); return new ResponseEntity>(spacesCustomOrderList,HttpStatus.OK); } - + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java index 02be0666f..8e5319954 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java @@ -13,6 +13,7 @@ import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.services.ISpaceManager; +import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; @Controller @@ -20,11 +21,17 @@ public class UpdateSpaceStatusController { @Autowired private ISpaceManager spaceManager; + @Autowired + private ISpacesCustomOrderManager spaceCustomOrderManager; + @RequestMapping(value="/staff/space/{spaceId}/status", method=RequestMethod.POST) public String updateStatus(HttpServletRequest request,RedirectAttributes attributes, @PathVariable("spaceId") String spaceId, @RequestParam("statusParam") SpaceStatus status) { ISpace space = spaceManager.getSpace(spaceId); space.setSpaceStatus(status); spaceManager.storeSpace(space, null,null); + if(status == SpaceStatus.UNPUBLISHED) { + spaceCustomOrderManager.updateStatusChange(space, status); + } attributes.addAttribute("alertType", "success"); attributes.addAttribute("message", "Status successfully updated!"); attributes.addAttribute("showAlert", "true"); From 16fa151de7ecac6fa419ffff5b38bbb5baf55543 Mon Sep 17 00:00:00 2001 From: glend17 Date: Mon, 11 Oct 2021 13:02:55 -0700 Subject: [PATCH 07/60] [VSPC-190] Front-end changes --- .../impl/SpacesCustomOrderManager.java | 8 +- .../staff/SpacesCustomOrderingController.java | 7 +- .../staff/UpdateSpaceStatusController.java | 4 +- .../views/staff/spaces/customordering.html | 109 +++++++++++++++--- 4 files changed, 101 insertions(+), 27 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index dce65ecd5..452808f3d 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -81,7 +81,13 @@ public void updateStatusChange(ISpace space, SpaceStatus status) { @Override public void updateStatusChangeToPublished(ISpace space) { - List spacesCustomOrderNewList = new ArrayList<>(); + Optional spaceCustomOrderOptional = spacesCustomOrderRepository.findBySpace_Id(space.getId()); + if(!spaceCustomOrderOptional.isPresent()) { + int order = spacesCustomOrderRepository.findMaxCustomOrder() + 1; + SpacesCustomOrder spaceCustomOrder = new SpacesCustomOrder(space, order); + spaceCustomOrder.setCustomOrder(order); + spacesCustomOrderRepository.save(spaceCustomOrder); + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java index 4be25e906..32d9bb066 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java @@ -27,18 +27,13 @@ public class SpacesCustomOrderingController { @RequestMapping("/staff/spaceordering") public String displayCurrentOrderLanding(Model model) { spacesCustomOrderManager.persistPublishedSpacesToSpacesCustomOrder(); - - return "redirect:/staff/spaceordering/display"; - } - @RequestMapping("/staff/spaceordering/display") - public String displayCurrentOrder(Model model) { List spaces = spacesCustomOrderManager.findAll(); model.addAttribute("spaces", spaces); return "/staff/spaces/customordering"; } - @RequestMapping(value = "/staff/spaceordering/update", method = RequestMethod.POST) + @RequestMapping(value = "/staff/spaceordering/updateOrder", method = RequestMethod.POST) public ResponseEntity> adjustContentOrder(@RequestBody List spacesCustomOrderList) { spacesCustomOrderManager.updateCustomOrder(spacesCustomOrderList); return new ResponseEntity>(spacesCustomOrderList,HttpStatus.OK); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java index 8e5319954..5d19a0857 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java @@ -29,9 +29,7 @@ public String updateStatus(HttpServletRequest request,RedirectAttributes attribu ISpace space = spaceManager.getSpace(spaceId); space.setSpaceStatus(status); spaceManager.storeSpace(space, null,null); - if(status == SpaceStatus.UNPUBLISHED) { - spaceCustomOrderManager.updateStatusChange(space, status); - } + spaceCustomOrderManager.updateStatusChange(space, status); attributes.addAttribute("alertType", "success"); attributes.addAttribute("message", "Status successfully updated!"); attributes.addAttribute("showAlert", "true"); diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html index e24fcc8cf..a658424be 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html @@ -5,7 +5,89 @@ - + + + - -
    -
    +
    +
    - - - - +

    [[${contents.id}]]

    - \ No newline at end of file From 0af04b2fe576b5e4f1ba6cc89563daee4db04659 Mon Sep 17 00:00:00 2001 From: glend17 Date: Fri, 15 Oct 2021 16:42:13 -0700 Subject: [PATCH 09/60] [VSPC-190] Added re-ordering of spaces --- .../core/services/IExhibitionManager.java | 3 + .../core/services/impl/ExhibitionManager.java | 10 +++ .../impl/SpacesCustomOrderManager.java | 1 + .../vspace/web/staff/SpaceController.java | 6 ++ .../staff/SpacesCustomOrderingController.java | 3 + .../views/staff/spaces/customordering.html | 70 ++++++++++++++++--- .../WEB-INF/views/staff/spaces/spacelist.html | 10 ++- 7 files changed, 94 insertions(+), 9 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExhibitionManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExhibitionManager.java index afd44964b..36e1ab4f6 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExhibitionManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExhibitionManager.java @@ -4,6 +4,7 @@ import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.impl.Exhibition; +import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderMode; /* * (non-Javadoc) @@ -33,5 +34,7 @@ public interface IExhibitionManager { List findAll(); IExhibition getStartExhibition(); + + IExhibition updateSpaceOrderMode(ExhibitionSpaceOrderMode mode); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java index 12902ed23..c985e9b7f 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java @@ -13,6 +13,7 @@ import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.impl.Exhibition; import edu.asu.diging.vspace.core.services.IExhibitionManager; +import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderMode; @Transactional @Service @@ -66,4 +67,13 @@ public IExhibition getStartExhibition() { } return null; } + + @Override + public IExhibition updateSpaceOrderMode(ExhibitionSpaceOrderMode mode) { + // for now we just take the first one created, there shouldn't be more than one + List exhibitions = exhibitRepo.findAllByOrderByIdAsc(); + Exhibition exhibition = exhibitions.get(0); + exhibition.setSpaceOrderMode(mode); + return exhibitRepo.save(exhibition); + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index e4cc46fac..076ad4d51 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -43,6 +43,7 @@ public void updateCustomOrder(List spacesCustomOrderCurrentLi } List spacesCustomOrderNewList = new ArrayList<>(); for (SpacesCustomOrder eachSpace : spacesCustomOrderCurrentList) { + logger.info("custom order is{}",eachSpace.getCustomOrder()); String spaceId = eachSpace.getId(); int customOrder = eachSpace.getCustomOrder(); Optional spaceCustomOrderOptional = spacesCustomOrderRepository.findById(spaceId); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java index 3608f9b09..a0ce0a82a 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java @@ -75,4 +75,10 @@ public ResponseEntity> showSpaceLinks(@PathVariable String id return new ResponseEntity<>(responseData, HttpStatus.OK); } + @RequestMapping(value = "/staff/space/spaceordermode", method = RequestMethod.POST) + public ResponseEntityupdateSpaceOrderMode(String mode) { + List spaceLinkPresent = spaceManager.getIncomingLinks(spaceId); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java index c9e54ae8f..f2a8fe070 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java @@ -1,6 +1,8 @@ package edu.asu.diging.vspace.web.staff; +import java.util.Collections; import java.util.List; +import java.util.Comparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,6 +31,7 @@ public String displayCurrentOrderLanding(Model model) { spacesCustomOrderManager.persistPublishedSpacesToSpacesCustomOrder(); logger.info("before spaces are added"); List spaces = spacesCustomOrderManager.findAll(); + Collections.sort(spaces, Comparator.comparing(SpacesCustomOrder::getCustomOrder)); model.addAttribute("spaces", spaces); logger.info("spaces are added"); return "staff/spaces/customordering"; diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html index 5a38064e3..314dba5b6 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customordering.html @@ -20,11 +20,12 @@ //# sourceURL=click.js var markDown = null; var defaultValue; + $(document).ready(function() { - var timeout=null; - $('#spaceOrder').sortable({ + $('#slideSpace').sortable({ update: function(event,ui) { + console.log('inside sortable'); var jsonObj = []; var blockId; $(this).children().each(function(index,element){ @@ -35,24 +36,72 @@ } item = {} item ["id"] = blockId; - item ["contentOrder"] = index; + item ["customOrder"] = index+1; jsonObj.push(item); $(element.innerHTML).filter('div').attr('data-position',index); }); var token = [[${_csrf.token}]]; if (jsonObj.length != 0){ if (timeout == null){ - timeout = setTimeout(updateContentOrder(jsonObj,token), 1000); + timeout = setTimeout(updateCustomOrder(jsonObj,token), 1000); } else{ clearTimeout(timeout); - timeout = setTimeout(updateContentOrder(jsonObj,token), 1000); + timeout = setTimeout(updateCustomOrder(jsonObj,token), 1000); } } } }); }); + + function updateCustomOrder(jsonObj,token){ + console.log(jsonObj); + $.ajax({ + // ------------- adjusting content order of blocks if their position changed after dragging ---------- + url: "[(@{'/staff/spaceordering/updateOrder'})]", + type: 'POST', + beforeSend: function(){ + $(".loader").remove(); + for(let i=0;i
    ')); + } + $(".loader").show(); + }, + complete: function(){ + $(".loader").hide(); + timeout = null; + }, + cache : false, + contentType: 'application/json; charset=utf-8', + processData :false, + headers:{ + 'X-CSRF-Token':token + }, + data: JSON.stringify(jsonObj), + success: function(data) { + $(".save").remove(); + for(let i=0;i'); + successDiv.append('

    Successfully Saved.

    '); + successDiv.append(''); + successDiv.append('
    '); + $('#'+data[i].id).append(successDiv); + } + }, + error: function(data) { + $(".errInSave").remove(); + for(let i=0;i'); + errorDiv.append('

    We are sorry but something went wrong. Please try again later.

    '); + errorDiv.append(''); + errorDiv.append(''); + } + } + }); + + } - - - - - - - -
    -

    Arrange Spaces Ordering

    - Drag and Drop spaces to arrange custom order in exhibition side navigation tool -
    -
    -
    -

    [[${contents.getSpace().getName()}]]

    -
    -
    -
    -
    - - - \ No newline at end of file From bf06c5328c57e46625eb712ce18122eb0df597fc Mon Sep 17 00:00:00 2001 From: glend17 Date: Wed, 2 Feb 2022 14:06:07 -0700 Subject: [PATCH 26/60] [VSPC-190] displaying the space orders --- .../vspace/core/model/SpacesCustomOrder.java | 6 +- .../diging/vspace/core/model/impl/Space.java | 5 +- .../services/ISpacesCustomOrderManager.java | 7 +- .../impl/SpacesCustomOrderManager.java | 41 ++- .../EditSpacesCustomOrderController.java | 38 +++ .../staff/SpacesCustomOrderingController.java | 23 +- .../staff/forms/SpacesCustomOrderForm.java | 40 +++ .../views/staff/spaces/customorder/add.html | 48 +++- .../spaces/customorder/customordering.html | 4 +- .../views/staff/spaces/customorder/order.html | 253 ++++++++++++++++++ 10 files changed, 441 insertions(+), 24 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SpacesCustomOrderForm.java create mode 100644 vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java index a0994291d..a1cf8a309 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java @@ -10,6 +10,7 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; import javax.persistence.OneToOne; @@ -43,7 +44,10 @@ public void setCustomOrderName(String customOrderName) { this.customOrderName = customOrderName; } - @ManyToMany(mappedBy = "spacesCustomOrder", targetEntity = Space.class) + @ManyToMany(targetEntity = Space.class) + @JoinTable(name = "spaces_custom_orders", + joinColumns = @JoinColumn(name = "SpacesCustomOrder_Id", referencedColumnName="id"), + inverseJoinColumns = @JoinColumn(name = "Space_Id", referencedColumnName="id")) private List customOrderedSpaces; @Override diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java index 385ef943d..e3b0752e2 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java @@ -62,10 +62,7 @@ public class Space extends VSpaceElement implements ISpace { @Transient private Boolean incomingLinks; - @ManyToMany(targetEntity = SpacesCustomOrder.class) - @JoinTable(name = "spaces_custom_orders", - joinColumns = @JoinColumn(name = "Space_Id", referencedColumnName="id"), - inverseJoinColumns = @JoinColumn(name = "SpacesCustomOrder_Id", referencedColumnName="id")) + @ManyToMany(mappedBy="customOrderedSpaces",targetEntity = SpacesCustomOrder.class) private List spacesCustomOrder; /* diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java index fb4d961d7..15b82dd65 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java @@ -5,15 +5,20 @@ import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; import edu.asu.diging.vspace.core.model.impl.SpaceStatus; +import edu.asu.diging.vspace.web.staff.forms.SpacesCustomOrderForm; public interface ISpacesCustomOrderManager { List findAll(); - void createNewCustomOrder(String customOrderName); + SpacesCustomOrder createNewCustomOrder(SpacesCustomOrderForm spacesCustomOrderForm); void addSpaceToCustomOrders(ISpace space); void saveCustomOrders(List spacesCustomOrder); + SpacesCustomOrder getSpaceCustomOrderById(String customSpaceOrderId); + + void updateSpacesCustomOrder(SpacesCustomOrder spacesCustomOrder); + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index 0bc777572..ac7930f0d 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -2,16 +2,23 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import edu.asu.diging.vspace.core.data.SpaceRepository; import edu.asu.diging.vspace.core.data.SpacesCustomOrderRepository; +import edu.asu.diging.vspace.core.model.ISequence; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; +import edu.asu.diging.vspace.web.staff.SpacesCustomOrderingController; +import edu.asu.diging.vspace.web.staff.forms.SpacesCustomOrderForm; /** * SpacesCustomOrderManager is the manager @@ -30,16 +37,23 @@ public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { @Autowired private SpaceRepository spaceRepo; + @Autowired + private ISpaceManager spaceManager; + + private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderManager.class); + @Override - public void createNewCustomOrder(String customOrderName) { + public SpacesCustomOrder createNewCustomOrder(SpacesCustomOrderForm spacesCustomorderForm) { + //TODO add description to spacescustomorder + List orderedSpaces= new ArrayList(); SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); - List spaces = new ArrayList(); - spacesCustomOrder.setCustomOrderName(customOrderName);// use integrity violation exception - spaceRepo.findAll().forEach((space)->spaces.add(space)); - spacesCustomOrder.setCustomOrderedSpaces(spaces); - - spacesCustomOrderRepository.save(spacesCustomOrder); - return; + spacesCustomOrder.setCustomOrderName(spacesCustomorderForm.getName());// use integrity violation exception + for(String spaceId : spacesCustomorderForm.getOrderedSpaces()) { + orderedSpaces.add(spaceManager.getSpace(spaceId)); + } + spacesCustomOrder.setCustomOrderedSpaces(orderedSpaces); + logger.info("spaces list is {}", spacesCustomOrder.getCustomOrderedSpaces().get(0).getId()); + return spacesCustomOrderRepository.save(spacesCustomOrder); } @@ -48,6 +62,12 @@ public List findAll(){ return (List) spacesCustomOrderRepository.findAll(); } + @Override + public SpacesCustomOrder getSpaceCustomOrderById(String customSpaceOrderId) { + Optional spacesCustomOrderOptional = spacesCustomOrderRepository.findById(customSpaceOrderId); + return spacesCustomOrderOptional.get(); + } + @Override public void saveCustomOrders(List spacesCustomOrder) { spacesCustomOrderRepository.saveAll(spacesCustomOrder); @@ -67,5 +87,10 @@ public void addSpaceToCustomOrders(ISpace space) { saveCustomOrders(spacesCustomOrders); return; } + + @Override + public void updateSpacesCustomOrder(SpacesCustomOrder spacesCustomOrder) { + spacesCustomOrderRepository.save((SpacesCustomOrder) spacesCustomOrder); + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java new file mode 100644 index 000000000..d45cc839e --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java @@ -0,0 +1,38 @@ +package edu.asu.diging.vspace.web.staff; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; + +@Controller +public class EditSpacesCustomOrderController { + + @Autowired + private ISpacesCustomOrderManager spacesCustomOrderManager; + + @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/description", method = RequestMethod.POST) + public ResponseEntity saveDescription(@RequestParam("description") String description, @PathVariable("customOrderId") String spacesCustomOrderId) { + SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.getSpaceCustomOrderById(spacesCustomOrderId); + spacesCustomOrder.setDescription(description); + spacesCustomOrderManager.updateSpacesCustomOrder(spacesCustomOrder); + return new ResponseEntity(HttpStatus.OK); + } + + @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/title", method = RequestMethod.POST) + public ResponseEntity saveTitle(@RequestParam("title") String name, @PathVariable("customOrderId") String spacesCustomOrderId) { + SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.getSpaceCustomOrderById(spacesCustomOrderId); + spacesCustomOrder.setCustomOrderName(name); + spacesCustomOrderManager.updateSpacesCustomOrder(spacesCustomOrder); + return new ResponseEntity(HttpStatus.OK); + } + + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java index 2a26c2d68..ef72ba38c 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java @@ -9,6 +9,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +20,7 @@ import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; import edu.asu.diging.vspace.core.services.impl.SpaceManager; +import edu.asu.diging.vspace.web.staff.forms.SpacesCustomOrderForm; /** * SpacesCustomOrderingController is the controller @@ -37,10 +39,7 @@ public class SpacesCustomOrderingController { private ISpaceManager spaceManager; private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderingController.class); - - /** - * This method fetches all spaces - */ + @RequestMapping(value = "/staff/spaceordering/add", method = RequestMethod.GET) public String addSpacesCustomOrders(Model model) { logger.info("inside add spaces custom order"); @@ -50,8 +49,20 @@ public String addSpacesCustomOrders(Model model) { } @RequestMapping(value = "/staff/spaceordering/customorder", method = RequestMethod.POST) - public void createCustomOrder(@PathVariable("customOrderName") String customOrderName) { - spacesCustomOrderManager.createNewCustomOrder(customOrderName); + public String createCustomOrder(@ModelAttribute SpacesCustomOrderForm spacesCustomOrderForm) { + logger.info("creating custom order"); + SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spacesCustomOrderForm); + return "redirect:/staff/spaceordering/" + spacesCustomOrder.getId(); + } + + @RequestMapping(value = "/staff/spaceordering/{orderId}", method = RequestMethod.GET) + public String displaySpacesCustomOrder(Model model, @PathVariable("orderId") String customSpaceOrderId) { + SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.getSpaceCustomOrderById(customSpaceOrderId); + List spaces = spaceManager.getAllSpaces(); + model.addAttribute("customSpaceOrder", spacesCustomOrder); + model.addAttribute("selectedSpaces", spacesCustomOrder.getCustomOrderedSpaces()); + model.addAttribute("allSpaces", spaces); + return "/staff/spaces/customorder/order"; } @RequestMapping(value = "/staff/spaceordering", method = RequestMethod.GET) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SpacesCustomOrderForm.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SpacesCustomOrderForm.java new file mode 100644 index 000000000..69f6c82db --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SpacesCustomOrderForm.java @@ -0,0 +1,40 @@ +package edu.asu.diging.vspace.web.staff.forms; + +import java.util.List; + +import edu.asu.diging.vspace.core.model.ISpace; + +public class SpacesCustomOrderForm { + + private String name; + private String description; + + private List orderedSpaces; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public List getOrderedSpaces() { + return orderedSpaces; + } + + public void setOrderedSpaces(List orderedSpaces) { + this.orderedSpaces = orderedSpaces; + } + + + +} diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html index 590dd2736..c4d6f5bbb 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html @@ -6,6 +6,50 @@ @@ -22,12 +66,12 @@

    Add New Custom Order

    -
    - + diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html index ed1e959fc..81ef6f566 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html @@ -45,8 +45,8 @@

    Custom Orders

    diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html new file mode 100644 index 000000000..59d50a0fa --- /dev/null +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html @@ -0,0 +1,253 @@ + + + + + + + + + + + +
    + +
    +
    +
    +

    Custom Space Order: [[${customSpaceOrder.customOrderName}]]

    +

    [[${customSpaceOrder.description}]]

    + + +
    + +
    + +
    +   Edit Spaces Custom Order title +   Edit slide description +
    +
    + + + +
    + +
    + +
    +
    +
    + + + +
    + +
    +
    +
    + + From 4d5ea90ad6590f6962f678ffeb06a8f1834680c9 Mon Sep 17 00:00:00 2001 From: glend17 Date: Thu, 3 Feb 2022 14:16:50 -0700 Subject: [PATCH 27/60] [VSPC-190] enabled drag and drop for space ordering --- .../EditSpacesCustomOrderController.java | 12 ++ .../views/staff/spaces/customorder/order.html | 165 +++++++++++------- 2 files changed, 111 insertions(+), 66 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java index d45cc839e..1b00da2e0 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java @@ -1,5 +1,9 @@ package edu.asu.diging.vspace.web.staff; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -18,6 +22,8 @@ public class EditSpacesCustomOrderController { @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; + private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderingController.class); + @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/description", method = RequestMethod.POST) public ResponseEntity saveDescription(@RequestParam("description") String description, @PathVariable("customOrderId") String spacesCustomOrderId) { SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.getSpaceCustomOrderById(spacesCustomOrderId); @@ -33,6 +39,12 @@ public ResponseEntity saveTitle(@RequestParam("title") String name, @Pat spacesCustomOrderManager.updateSpacesCustomOrder(spacesCustomOrder); return new ResponseEntity(HttpStatus.OK); } + + @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/spaceorders", method = RequestMethod.POST) + public ResponseEntity saveOrder(@RequestParam("spaceOrder") List spaceOrders) { + logger.info("space order is {}", spaceOrders.get(0)); + return new ResponseEntity(HttpStatus.OK); + } } diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html index 59d50a0fa..f0e83d8f5 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html @@ -2,58 +2,37 @@ + + - + + + @@ -232,21 +270,16 @@

    by [[${customSpaceOrder.modifiedBy}]]. +
    +
    +
    +

    [[${selectedSpace.name}]]

    +
    +
    +
    + -
    -
    -
    - - - -
    - -
    From 137a2fc99e98125a3ed015d174896bbabec5ed59 Mon Sep 17 00:00:00 2001 From: glend17 Date: Mon, 7 Feb 2022 12:50:55 -0700 Subject: [PATCH 28/60] [VSPC-190] staff side display custom order --- .../vspace/core/model/SpacesCustomOrder.java | 3 - .../vspace/core/model/impl/Exhibition.java | 7 +- .../services/ISpacesCustomOrderManager.java | 16 ++- .../impl/SpacesCustomOrderManager.java | 69 ++++++++-- .../EditSpacesCustomOrderController.java | 11 +- .../staff/SpacesCustomOrderingController.java | 45 ++++--- .../views/staff/spaces/customorder/add.html | 124 ++++++++++-------- .../spaces/customorder/customordering.html | 11 ++ .../views/staff/spaces/customorder/order.html | 31 ++--- .../WEB-INF/views/staff/spaces/spacelist.html | 19 ++- 10 files changed, 214 insertions(+), 122 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java index a1cf8a309..5d0dc2420 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java @@ -12,13 +12,10 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; -import edu.asu.diging.vspace.core.model.impl.Module; import edu.asu.diging.vspace.core.model.impl.Space; import edu.asu.diging.vspace.core.model.impl.VSpaceElement; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java index e622dffdf..427d72ada 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java @@ -42,12 +42,9 @@ public class Exhibition extends VSpaceElement implements IExhibition { @Enumerated(EnumType.STRING) private ExhibitionSpaceOrderMode spaceOrderMode; - @OneToOne - @JoinColumn(name = "Space_Custom_Order_Id", referencedColumnName = "Id") - private SpacesCustomOrder spacesCustomOrder; - @OneToOne(targetEntity = SpacesCustomOrder.class) - private String customOrderName; + @JoinColumn(name = "Space_Custom_Order_Id", referencedColumnName = "id") + private SpacesCustomOrder spacesCustomOrder; /* * (non-Javadoc) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java index 15b82dd65..ab1028b3b 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java @@ -4,21 +4,27 @@ import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; -import edu.asu.diging.vspace.core.model.impl.SpaceStatus; -import edu.asu.diging.vspace.web.staff.forms.SpacesCustomOrderForm; public interface ISpacesCustomOrderManager { List findAll(); - SpacesCustomOrder createNewCustomOrder(SpacesCustomOrderForm spacesCustomOrderForm); - void addSpaceToCustomOrders(ISpace space); void saveCustomOrders(List spacesCustomOrder); SpacesCustomOrder getSpaceCustomOrderById(String customSpaceOrderId); - void updateSpacesCustomOrder(SpacesCustomOrder spacesCustomOrder); + void updateSpacesCustomOrderName(String spacesCustomOrderId, String name); + + void updateSpacesCustomOrderDescription(String spacesCustomOrderId, String name); + + void editSpacesCustomOrder(String spacesCustomOrderId, List spaceOrders); + + SpacesCustomOrder createNewCustomOrder(List spaceOrders, String name, String description); + + void setExhibitionSpacesCustomOrder(String customOrderId); + + SpacesCustomOrder getExhibitionCurrentSpacesCustomOrder(); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index ac7930f0d..997a37c59 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -10,15 +10,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import edu.asu.diging.vspace.core.data.SpaceRepository; import edu.asu.diging.vspace.core.data.SpacesCustomOrderRepository; -import edu.asu.diging.vspace.core.model.ISequence; +import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; -import edu.asu.diging.vspace.web.staff.SpacesCustomOrderingController; -import edu.asu.diging.vspace.web.staff.forms.SpacesCustomOrderForm; /** * SpacesCustomOrderManager is the manager @@ -35,20 +33,27 @@ public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { private SpacesCustomOrderRepository spacesCustomOrderRepository; @Autowired - private SpaceRepository spaceRepo; + private ISpaceManager spaceManager; @Autowired - private ISpaceManager spaceManager; + private IExhibitionManager exhibitionManager; private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderManager.class); @Override - public SpacesCustomOrder createNewCustomOrder(SpacesCustomOrderForm spacesCustomorderForm) { - //TODO add description to spacescustomorder + public SpacesCustomOrder createNewCustomOrder(List spaceOrders, + String name, + String description) throws IllegalStateException { + SpacesCustomOrder spacesCustomOrderRepoValue = spacesCustomOrderRepository. + findByCustomOrderName(name).get(0); + if(spacesCustomOrderRepoValue!=null) { + throw new IllegalStateException("Order present"); + } List orderedSpaces= new ArrayList(); SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); - spacesCustomOrder.setCustomOrderName(spacesCustomorderForm.getName());// use integrity violation exception - for(String spaceId : spacesCustomorderForm.getOrderedSpaces()) { + spacesCustomOrder.setCustomOrderName(name); + spacesCustomOrder.setDescription(description); + for(String spaceId : spaceOrders) { orderedSpaces.add(spaceManager.getSpace(spaceId)); } spacesCustomOrder.setCustomOrderedSpaces(orderedSpaces); @@ -89,8 +94,48 @@ public void addSpaceToCustomOrders(ISpace space) { } @Override - public void updateSpacesCustomOrder(SpacesCustomOrder spacesCustomOrder) { - spacesCustomOrderRepository.save((SpacesCustomOrder) spacesCustomOrder); + public void updateSpacesCustomOrderName(String spacesCustomOrderId, String name) { + SpacesCustomOrder spaceCustomOrder = getSpaceCustomOrderById(spacesCustomOrderId); + spaceCustomOrder.setCustomOrderName(name); + spacesCustomOrderRepository.save(spaceCustomOrder); + return; + } + + @Override + public void updateSpacesCustomOrderDescription(String spacesCustomOrderId, String name) { + SpacesCustomOrder spaceCustomOrder = getSpaceCustomOrderById(spacesCustomOrderId); + spaceCustomOrder.setDescription(name); + spacesCustomOrderRepository.save(spaceCustomOrder); + return; + } + + + @Override + public void editSpacesCustomOrder(String spacesCustomOrderId, List spacesIds) { + List spaces = new ArrayList(); + for(String id : spacesIds) { + spaces.add(spaceManager.getSpace(id)); + } + SpacesCustomOrder spaceCustomOrder = getSpaceCustomOrderById(spacesCustomOrderId); + spaceCustomOrder.setCustomOrderedSpaces(spaces); + spacesCustomOrderRepository.save(spaceCustomOrder); + return; + + } + + @Override + public void setExhibitionSpacesCustomOrder(String customOrderId) { + IExhibition exhibition = exhibitionManager.getStartExhibition(); + Optional spacesCustomOrder = spacesCustomOrderRepository + .findById(customOrderId); + exhibition.setSpacesCustomOrder(spacesCustomOrder.get()); + return; + } + + @Override + public SpacesCustomOrder getExhibitionCurrentSpacesCustomOrder() { + IExhibition exhibition = exhibitionManager.getStartExhibition(); + return exhibition.getSpacesCustomOrder(); } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java index 1b00da2e0..6427cc9d9 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java @@ -26,23 +26,20 @@ public class EditSpacesCustomOrderController { @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/description", method = RequestMethod.POST) public ResponseEntity saveDescription(@RequestParam("description") String description, @PathVariable("customOrderId") String spacesCustomOrderId) { - SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.getSpaceCustomOrderById(spacesCustomOrderId); - spacesCustomOrder.setDescription(description); - spacesCustomOrderManager.updateSpacesCustomOrder(spacesCustomOrder); + spacesCustomOrderManager.updateSpacesCustomOrderDescription(spacesCustomOrderId, description); return new ResponseEntity(HttpStatus.OK); } @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/title", method = RequestMethod.POST) public ResponseEntity saveTitle(@RequestParam("title") String name, @PathVariable("customOrderId") String spacesCustomOrderId) { - SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.getSpaceCustomOrderById(spacesCustomOrderId); - spacesCustomOrder.setCustomOrderName(name); - spacesCustomOrderManager.updateSpacesCustomOrder(spacesCustomOrder); + spacesCustomOrderManager.updateSpacesCustomOrderName(spacesCustomOrderId, name); return new ResponseEntity(HttpStatus.OK); } @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/spaceorders", method = RequestMethod.POST) - public ResponseEntity saveOrder(@RequestParam("spaceOrder") List spaceOrders) { + public ResponseEntity saveOrder(@PathVariable("customOrderId") String spacesCustomOrderId, @RequestParam("spaceOrder") List spaceOrders) { logger.info("space order is {}", spaceOrders.get(0)); + spacesCustomOrderManager.editSpacesCustomOrder(spacesCustomOrderId, spaceOrders); return new ResponseEntity(HttpStatus.OK); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java index ef72ba38c..864394d67 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java @@ -9,18 +9,15 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; -import edu.asu.diging.vspace.core.services.impl.SpaceManager; -import edu.asu.diging.vspace.web.staff.forms.SpacesCustomOrderForm; /** * SpacesCustomOrderingController is the controller @@ -48,11 +45,23 @@ public String addSpacesCustomOrders(Model model) { return "staff/spaces/customorder/add"; } - @RequestMapping(value = "/staff/spaceordering/customorder", method = RequestMethod.POST) - public String createCustomOrder(@ModelAttribute SpacesCustomOrderForm spacesCustomOrderForm) { + @RequestMapping(value = "/staff/spaceordering/customorder/add", method = RequestMethod.POST) + public ResponseEntity createCustomOrder(Model model, @RequestParam("spaceOrder") List spaceOrders, + @RequestParam("name") String name, + @RequestParam("description") String description) { logger.info("creating custom order"); - SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spacesCustomOrderForm); - return "redirect:/staff/spaceordering/" + spacesCustomOrder.getId(); + logger.info("name {}", name); + logger.info("description {}", description); + SpacesCustomOrder spacesCustomOrder = null; + try { + spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spaceOrders, name, description); + } + catch(IllegalStateException ex) { + model.addAttribute("showAlert", true); + return new ResponseEntity(HttpStatus.NOT_ACCEPTABLE); + } + model.addAttribute("showAlert", false); + return new ResponseEntity(spacesCustomOrder.getId(), HttpStatus.OK); } @RequestMapping(value = "/staff/spaceordering/{orderId}", method = RequestMethod.GET) @@ -68,17 +77,21 @@ public String displaySpacesCustomOrder(Model model, @PathVariable("orderId") Str @RequestMapping(value = "/staff/spaceordering", method = RequestMethod.GET) public String displayCustomOrders(Model model) { List spacesCustomOrder = spacesCustomOrderManager.findAll(); + SpacesCustomOrder currentExhibitionCurrentSpacesCustomOrder = spacesCustomOrderManager. + getExhibitionCurrentSpacesCustomOrder(); model.addAttribute("customSpaceOrders", spacesCustomOrder); + model.addAttribute("currentSelectedCustomOrder", currentExhibitionCurrentSpacesCustomOrder); return "/staff/spaces/customorder/customordering"; } -// /** -// * This method is the controller to update the custom order of spaces -// */ -// @RequestMapping(value = "/staff/spaceordering/updateOrder/{customOrderName}", method = RequestMethod.POST) -// public ResponseEntity> adjustCustomOrder(@RequestBody List spaces, @PathVariable("customOrderName") String customOrderName) { -// spacesCustomOrderManager.updateCustomOrder(spaces, customOrderName); -// return new ResponseEntity>(spaces, HttpStatus.OK); -// } + @RequestMapping(value = "/staff/spaceordering/setDefault", method = RequestMethod.POST) + public String setExhibitionSpacesCustomOrder(Model model, + @RequestParam("selectedCustomOrderId") String sequenceId) { + logger.info("space id is {}", sequenceId); + spacesCustomOrderManager.setExhibitionSpacesCustomOrder(sequenceId); + return "redirect:/staff/spaceordering"; + } + + } diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html index c4d6f5bbb..b5acdb12a 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html @@ -5,74 +5,92 @@ - +
    +

    Add New Custom Order

    -
    -
    +
    - +
    - -
    -
    - - - +
    - - + Drag and drop to arrange spaces +
    +
    +
    +

    [[${selectedSpace.name}]]

    +
    +
    +
    + +
    \ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html index 81ef6f566..18c2b9ccb 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html @@ -38,6 +38,17 @@

    Custom Orders for Spaces

    +
    +
    + +

    Select Custom Order to be used.

    + + +
    +
    diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html index f0e83d8f5..bef847715 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html @@ -24,14 +24,14 @@ let spaceDivs=[]; $(document).ready(function() { spaceDivs = document.getElementById('sortableSpaces').children; -var spaceIds = []; -let index =0; -//console.log(elements); - for(ele of spaceDivs){ - spaceIds.push(spaceDivs[index].children[0].id); - index++; -} - console.log(spaceIds); + var spaceIds = []; + let index =0; + for(ele of spaceDivs){ + spaceIds.push(spaceDivs[index].children[0].id); + index++; + } + spaceDivs=[]; + spaceDivs = spaceIds; //-------- edit contentblock description custom order Space starts -------- $("#submitDescription").hide() @@ -158,7 +158,6 @@ }); $("#cancelEditTitle").click(function(){ - console.log('hello'); $("#submitTitle").hide() $("#editTitle").show() $("#editSpaceCustomOrderTitle").hide() @@ -173,7 +172,6 @@ spaceDivs = []; $(this).children().each(function(index,element){ spaceDivs.push(element.children[0].id); - //updatedSpaceOrder.push(item); }); } }); @@ -181,7 +179,7 @@ //save order $("#saveOrder").click(function() { var formData = new FormData(); - formData.append('spaceOrders', spaceDivs); + formData.append('spaceOrder', spaceDivs); $.ajax({ url: "[(@{'/staff/spaceordering/'+${customSpaceOrder.id}+'/edit/spaceorders'})]"+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]], type: 'POST', @@ -199,14 +197,6 @@ $(".blur").css("filter","none"); }, success: function(data) { - // replace text box with new description - $("#submitTitle").hide() - $("#cancelEditTitle").hide(); - $("#editTitle").show() - var val = $("#newTitle").val(); - $("#editSpaceCustomOrderTitle").remove() - $("#title").text("SpaceCustomOrder: " + val) - $("#title").data('value', val) // sets value }, error: function(data) { var alert = $(''); @@ -270,6 +260,7 @@

    by [[${customSpaceOrder.modifiedBy}]].

    + Drag and drop to arrange spaces
    @@ -279,6 +270,8 @@

    + +
    diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html index c31e84659..fb63c75ac 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html @@ -72,14 +72,29 @@

    Spaces

    Select how you want to arrange this in the exhibition navigation bar -
    - +

    Select spaces display order.

    + + +
    +
    + +
    From 5a5fc213e904eca7bd869a47278d0c66be8eeca6 Mon Sep 17 00:00:00 2001 From: glend17 Date: Mon, 7 Feb 2022 13:28:45 -0700 Subject: [PATCH 29/60] [VSPC-190] findBySpaceCustomOrderName --- .../diging/vspace/core/data/SpacesCustomOrderRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java index 8ff87ead2..b59f4cc81 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java @@ -13,5 +13,7 @@ @Repository @JaversSpringDataAuditable public interface SpacesCustomOrderRepository extends PagingAndSortingRepository { + + List findByCustomOrderName(String name); } From 23f348da7919e775e1e59d3695eb1886986d9075 Mon Sep 17 00:00:00 2001 From: glend17 Date: Mon, 7 Feb 2022 14:05:46 -0700 Subject: [PATCH 30/60] [VSPC-190] List space orders --- .../vspace/core/services/impl/SpacesCustomOrderManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index 997a37c59..b03481241 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -44,9 +44,9 @@ public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { public SpacesCustomOrder createNewCustomOrder(List spaceOrders, String name, String description) throws IllegalStateException { - SpacesCustomOrder spacesCustomOrderRepoValue = spacesCustomOrderRepository. - findByCustomOrderName(name).get(0); - if(spacesCustomOrderRepoValue!=null) { + List spacesCustomOrderRepoValue = spacesCustomOrderRepository. + findByCustomOrderName(name); + if(!spacesCustomOrderRepoValue.isEmpty()) { throw new IllegalStateException("Order present"); } List orderedSpaces= new ArrayList(); From 47cad20d5122fa03ad3a0710c070e17d9e08207f Mon Sep 17 00:00:00 2001 From: glend17 Date: Tue, 8 Feb 2022 14:14:51 -0700 Subject: [PATCH 31/60] [VSPC-190] bug on delete custom order --- .../services/ISpacesCustomOrderManager.java | 2 + .../impl/SpacesCustomOrderManager.java | 13 ++++ .../staff/AddSpacesCustomOrderController.java | 59 +++++++++++++++++++ .../DeleteSpacesCustomOrderController.java | 30 ++++++++++ .../EditSpacesCustomOrderController.java | 3 +- .../staff/ExhibitionSpaceOrderUtility.java | 19 +++++- ....java => SpacesCustomOrderController.java} | 35 +---------- .../views/staff/spaces/customorder/add.html | 7 +-- .../views/staff/spaces/customorder/order.html | 58 ++++++++++++++++-- 9 files changed, 181 insertions(+), 45 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSpacesCustomOrderController.java rename vspace/src/main/java/edu/asu/diging/vspace/web/staff/{SpacesCustomOrderingController.java => SpacesCustomOrderController.java} (63%) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java index ab1028b3b..d6f37f2a0 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpacesCustomOrderManager.java @@ -27,4 +27,6 @@ public interface ISpacesCustomOrderManager { SpacesCustomOrder getExhibitionCurrentSpacesCustomOrder(); + void deleteSpacesCustomOrderById(String id); + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index b03481241..baa4f4a3b 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -14,6 +14,7 @@ import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.model.impl.Exhibition; import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; @@ -137,5 +138,17 @@ public SpacesCustomOrder getExhibitionCurrentSpacesCustomOrder() { IExhibition exhibition = exhibitionManager.getStartExhibition(); return exhibition.getSpacesCustomOrder(); } + + @Override + public void deleteSpacesCustomOrderById(String id) { + IExhibition exhibition = exhibitionManager.getStartExhibition(); + SpacesCustomOrder spaceCustomOrder = exhibition + .getSpacesCustomOrder(); + if(spaceCustomOrder!=null && spaceCustomOrder.getId().equals(id)) { + exhibition.setSpacesCustomOrder(null); + exhibitionManager.storeExhibition((Exhibition)exhibition); + } + spacesCustomOrderRepository.deleteById(id); + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java new file mode 100644 index 000000000..1c5d5a1f3 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java @@ -0,0 +1,59 @@ +package edu.asu.diging.vspace.web.staff; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.services.ISpaceManager; +import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; + +@Controller +public class AddSpacesCustomOrderController { + + @Autowired + private ISpacesCustomOrderManager spacesCustomOrderManager; + + @Autowired + private ISpaceManager spaceManager; + + private static Logger logger = LoggerFactory.getLogger(AddSpacesCustomOrderController.class); + + @RequestMapping(value = "/staff/spaceordering/add", method = RequestMethod.GET) + public String addSpacesCustomOrders(Model model) { + logger.info("inside add spaces custom order"); + List spaces = spaceManager.getAllSpaces(); + model.addAttribute("spaces", spaces); + return "staff/spaces/customorder/add"; + } + + @RequestMapping(value = "/staff/spaceordering/customorder/add", method = RequestMethod.POST) + public ResponseEntity createCustomOrder(Model model, @RequestParam("spaceOrder") List spaceOrders, + @RequestParam("name") String name, + @RequestParam("description") String description) { + logger.info("creating custom order"); + logger.info("name {}", name); + logger.info("description {}", description); + SpacesCustomOrder spacesCustomOrder = null; + try { + spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spaceOrders, name, description); + } + catch(IllegalStateException ex) { + model.addAttribute("showAlert", true); + return new ResponseEntity(HttpStatus.NOT_ACCEPTABLE); + } + model.addAttribute("showAlert", false); + return new ResponseEntity(spacesCustomOrder.getId(), HttpStatus.OK); + } + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSpacesCustomOrderController.java new file mode 100644 index 000000000..ff18b3251 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSpacesCustomOrderController.java @@ -0,0 +1,30 @@ +package edu.asu.diging.vspace.web.staff; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; + +@Controller +public class DeleteSpacesCustomOrderController { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + ISpacesCustomOrderManager spacesCustomOrderManager; + + @RequestMapping(value = "/staff/space/customorder/{orderId}", method = RequestMethod.DELETE) + public ResponseEntity deleteSpacesCustomOrder(@PathVariable String orderId, Model model) { + spacesCustomOrderManager.deleteSpacesCustomOrderById(orderId); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java index 6427cc9d9..3381458cb 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import edu.asu.diging.vspace.core.model.SpacesCustomOrder; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; @Controller @@ -22,7 +21,7 @@ public class EditSpacesCustomOrderController { @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; - private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderingController.class); + private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderController.class); @RequestMapping(value = "/staff/spaceordering/{customOrderId}/edit/description", method = RequestMethod.POST) public ResponseEntity saveDescription(@RequestParam("description") String description, @PathVariable("customOrderId") String spacesCustomOrderId) { diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java index 186a88019..3370fb137 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionSpaceOrderUtility.java @@ -1,5 +1,6 @@ package edu.asu.diging.vspace.web.staff; +import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -11,6 +12,7 @@ import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.impl.ExhibitionManager; @@ -43,10 +45,21 @@ public int compare(ISpace space1, ISpace space2) { return publishedSpaces; } - public List getCustomSpaceOrder(){ + public List getCustomSpaceOrder(List publishedSpaces){ IExhibition exhibition = exhibitionManager.getStartExhibition(); SpacesCustomOrder spacesCustomOrder = exhibition.getSpacesCustomOrder(); - return spacesCustomOrder.getCustomOrderedSpaces(); + if(spacesCustomOrder == null) { + return sortSpacesAlphabetically(publishedSpaces); + } + List allSpaces = spacesCustomOrder.getCustomOrderedSpaces(); + List spacesToPublish = new ArrayList(); + //only show published spaces + for(ISpace space : allSpaces) { + if(space.getSpaceStatus() == SpaceStatus.PUBLISHED) { + spacesToPublish.add(space); + } + } + return spacesToPublish; } public List retrieveSpacesListInGivenOrder(List publishedSpaces, ExhibitionSpaceOrderMode mode){ @@ -56,7 +69,7 @@ public List retrieveSpacesListInGivenOrder(List publishedSpaces, else if(mode == ExhibitionSpaceOrderMode.CREATION_DATE) { return sortSpacesOnCreationDate(publishedSpaces); }else { - return getCustomSpaceOrder(); + return getCustomSpaceOrder(publishedSpaces); } } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java similarity index 63% rename from vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java rename to vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java index 864394d67..b6671bded 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderingController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java @@ -5,8 +5,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; @@ -20,14 +18,14 @@ import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; /** - * SpacesCustomOrderingController is the controller + * SpacesCustomOrderController is the controller * to allow custom ordering of spaces * @author Glen D'souza * */ @Controller -public class SpacesCustomOrderingController { +public class SpacesCustomOrderController { @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; @@ -35,34 +33,7 @@ public class SpacesCustomOrderingController { @Autowired private ISpaceManager spaceManager; - private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderingController.class); - - @RequestMapping(value = "/staff/spaceordering/add", method = RequestMethod.GET) - public String addSpacesCustomOrders(Model model) { - logger.info("inside add spaces custom order"); - List spaces = spaceManager.getAllSpaces(); - model.addAttribute("spaces", spaces); - return "staff/spaces/customorder/add"; - } - - @RequestMapping(value = "/staff/spaceordering/customorder/add", method = RequestMethod.POST) - public ResponseEntity createCustomOrder(Model model, @RequestParam("spaceOrder") List spaceOrders, - @RequestParam("name") String name, - @RequestParam("description") String description) { - logger.info("creating custom order"); - logger.info("name {}", name); - logger.info("description {}", description); - SpacesCustomOrder spacesCustomOrder = null; - try { - spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spaceOrders, name, description); - } - catch(IllegalStateException ex) { - model.addAttribute("showAlert", true); - return new ResponseEntity(HttpStatus.NOT_ACCEPTABLE); - } - model.addAttribute("showAlert", false); - return new ResponseEntity(spacesCustomOrder.getId(), HttpStatus.OK); - } + private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderController.class); @RequestMapping(value = "/staff/spaceordering/{orderId}", method = RequestMethod.GET) public String displaySpacesCustomOrder(Model model, @PathVariable("orderId") String customSpaceOrderId) { diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html index b5acdb12a..1f1490a12 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html @@ -23,7 +23,9 @@ $("#createOrder").click(function() { var formData = new FormData(); var name = $("#name").val(); - var descripton = $("#description").val(); + //console.log(document.getElementById("description").val()); + var descriptonText = $("#description").val(); + console.log(descriptonText); formData.append('spaceOrder', spaceDivs); formData.append('name', name); formData.append('description', description); @@ -37,14 +39,12 @@ data: formData, enctype: 'multipart/form-data', beforeSend: function(){ - console.log('hello'); }, complete: function(){ }, success: function(data) { }, error: function(data) { - console.log('not successful'); var alert = $(''); $('.error').append(alert); } @@ -60,7 +60,6 @@ //updatedSpaceOrder.push(item); }); - console.log(spaceDivs); } }); diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html index bef847715..cc450659c 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html @@ -23,6 +23,8 @@ -
    -
    +
    + + "Custom order name already exists, try another name." + +
    +
    + + "Custom Order has been Added" +

    Add New Custom Order

    diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html index cc450659c..1fdecb943 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html @@ -249,6 +249,14 @@ }); }); + +$("#closeAlertDelete").click(function() { + $('#errorMsgDelete').hide(); +}); + +$("#closeAlertSave").click(function() { + $('#errorMsgSave').hide(); +}); }); @@ -270,9 +278,17 @@
    "Custom Order has been deleted" +
    "Custom Order has been Saved" +
    From 306b76a6d541765ca55afe19c310401079b8fb5a Mon Sep 17 00:00:00 2001 From: glend17 Date: Wed, 9 Feb 2022 11:29:32 -0700 Subject: [PATCH 33/60] [VSPC-190] adding private field --- .../asu/diging/vspace/core/aspects/ExhibitionDataAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java index 181c6cbd3..ec319a738 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java @@ -46,7 +46,7 @@ public class ExhibitionDataAspect { private AuthenticationFacade authFacade; @Autowired - ExhibitionSpaceOrderUtility exhibitionSpaceOrderUtility; + private ExhibitionSpaceOrderUtility exhibitionSpaceOrderUtility; @After("execution(public * edu.asu.diging.vspace.web..*Controller.*(..))") public void setExhibition(JoinPoint jp) { From 300633d6c6c5bddf2a64dc35bdebcfe28a4e2895 Mon Sep 17 00:00:00 2001 From: glend17 Date: Wed, 9 Feb 2022 13:48:41 -0700 Subject: [PATCH 34/60] [VSPC-190] code cleanup --- .../vspace/core/model/SpacesCustomOrder.java | 2 +- .../impl/SpacesCustomOrderManager.java | 3 +- .../staff/AddSpacesCustomOrderController.java | 1 - .../staff/UpdateSpaceStatusController.java | 7 +- .../core/services/impl/SpaceManagerTest.java | 9 - .../impl/SpacesCustomOrderManagerTest.java | 232 +++++++----------- 6 files changed, 95 insertions(+), 159 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java index 5d0dc2420..a5b7c02f3 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java @@ -26,7 +26,7 @@ public class SpacesCustomOrder extends VSpaceElement implements ISpacesCustomOrd @Id @GeneratedValue(generator = "customorder_id_generator") @GenericGenerator(name = "customorder_id_generator", - parameters = @Parameter(name = "prefix", value = "CON"), + parameters = @Parameter(name = "prefix", value = "SPC"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator") private String id; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index baa4f4a3b..481f01a79 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -48,7 +48,7 @@ public SpacesCustomOrder createNewCustomOrder(List spaceOrders, List spacesCustomOrderRepoValue = spacesCustomOrderRepository. findByCustomOrderName(name); if(!spacesCustomOrderRepoValue.isEmpty()) { - throw new IllegalStateException("Order present"); + throw new IllegalStateException("Order with same name present"); } List orderedSpaces= new ArrayList(); SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); @@ -58,7 +58,6 @@ public SpacesCustomOrder createNewCustomOrder(List spaceOrders, orderedSpaces.add(spaceManager.getSpace(spaceId)); } spacesCustomOrder.setCustomOrderedSpaces(orderedSpaces); - logger.info("spaces list is {}", spacesCustomOrder.getCustomOrderedSpaces().get(0).getId()); return spacesCustomOrderRepository.save(spacesCustomOrder); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java index add565abe..807c26026 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java @@ -31,7 +31,6 @@ public class AddSpacesCustomOrderController { @RequestMapping(value = "/staff/spaceordering/add", method = RequestMethod.GET) public String addSpacesCustomOrders(Model model) { - logger.info("inside add spaces custom order"); List spaces = spaceManager.getAllSpaces(); model.addAttribute("spaces", spaces); return "staff/spaces/customorder/add"; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java index a757b5ba6..ee138d1d7 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java @@ -15,21 +15,16 @@ import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; - @Controller public class UpdateSpaceStatusController { @Autowired private ISpaceManager spaceManager; - @Autowired - private ISpacesCustomOrderManager spaceCustomOrderManager; - @RequestMapping(value="/staff/space/{spaceId}/status", method=RequestMethod.POST) public String updateStatus(HttpServletRequest request,RedirectAttributes attributes, @PathVariable("spaceId") String spaceId, @RequestParam("statusParam") SpaceStatus status) { ISpace space = spaceManager.getSpace(spaceId); space.setSpaceStatus(status); - spaceManager.storeSpace(space, null,null); - //spaceCustomOrderManager.updateStatusChange(space, status); + spaceManager.storeSpace(space, null,null);; attributes.addAttribute("alertType", "success"); attributes.addAttribute("message", "Status successfully updated!"); attributes.addAttribute("showAlert", "true"); diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java index 4f086d12d..f20b3b9c3 100644 --- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java @@ -308,14 +308,5 @@ public void test_getSpacesWithImageId_ImageIdIsNull(){ Assert.assertNull(managerToTest.getSpacesWithImageId(null)); } - @Test - public void test_sortPublishedSpacesByGivenOrder_Default(){ - Space space=new Space(); - space.setId(spaceId1); - publishedSpaces.add(space); - Mockito.when(exhibitionSpaceOrderUtility.retrieveSpacesListInGivenOrder(publishedSpaces, null)).thenReturn(publishedSpaces); - Assert.assertEquals(space, space); - } - } diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java index 7469054bc..dfa8082e4 100644 --- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java @@ -1,143 +1,95 @@ -//package edu.asu.diging.vspace.core.services.impl; -// -//import static org.junit.Assert.assertEquals; -//import static org.mockito.Mockito.doNothing; -//import static org.mockito.Mockito.when; -// -//import java.util.ArrayList; -//import java.util.List; -// -//import org.junit.Assert; -//import org.junit.Before; -//import org.junit.Test; -//import org.mockito.InjectMocks; -//import org.mockito.Mock; -//import org.mockito.Mockito; -//import org.mockito.MockitoAnnotations; -//import java.util.Optional; -// -//import edu.asu.diging.vspace.core.data.SpacesCustomOrderRepository; -//import edu.asu.diging.vspace.core.model.ISpace; -//import edu.asu.diging.vspace.core.model.SpacesCustomOrder; -//import edu.asu.diging.vspace.core.model.impl.Space; -//import edu.asu.diging.vspace.core.model.impl.SpaceStatus; -//import edu.asu.diging.vspace.core.services.ISpaceManager; -// -//public class SpacesCustomOrderManagerTest{ -//// @Mock -//// private SpacesCustomOrderRepository; -//// -//// @Mock -//// ISpaceManager spaceManager; -//// -//// @InjectMocks -//// private SpacesCustomOrderManager serviceToTest; -//// -//// @Before -//// public void setUp() { -//// MockitoAnnotations.initMocks(this); -//// } -//// -//// @Test -//} -// -//public class SpacesCustomOrderManagerTest{ -// -// @Mock -// private SpacesCustomOrderRepository spacesCustomOrderRepository; -// -// @Mock -// private ISpaceManager spaceManager; -// -// @InjectMocks -// private SpacesCustomOrderManager serviceToTest; -// -// @Before -// public void setUp() { -// MockitoAnnotations.initMocks(this); -// -// } -// -// @Test -// public void test_findMaxCustomOrder_success() { -// String id="1"; -// Integer order = 1; -// when(spacesCustomOrderRepository.findMaxCustomOrder(id)).thenReturn(order); -// -// Integer maxCustomOrder = serviceToTest.findMaxCustomOrder(id); -// Assert.assertEquals(maxCustomOrder,order); -// } -// -// @Test -// public void test_updateCustomOrder_success() { -// SpacesCustomOrder firstSpace = new SpacesCustomOrder(); -// firstSpace.setId("SPAC01"); -// firstSpace.setCustomOrder(Integer.valueOf(3)); -// -// SpacesCustomOrder secondSpace = new SpacesCustomOrder(); -// secondSpace.setId("SPAC02"); -// secondSpace.setCustomOrder(Integer.valueOf(4)); -// -// List spacesCustomOrder = new ArrayList<>(); -// spacesCustomOrder.add(firstSpace); -// spacesCustomOrder.add(secondSpace); -// Optional optionalSpacesCustomOrder; -// -// when(spacesCustomOrderRepository.findById("SPAC01")).thenReturn(Optional.of(firstSpace)); -// when(spacesCustomOrderRepository.findById("SPAC02")).thenReturn(Optional.of(secondSpace)); -// -// serviceToTest.updateCustomOrder(spacesCustomOrder); -// assertEquals(Integer.valueOf(3), firstSpace.getCustomOrder()); -// assertEquals(Integer.valueOf(4), secondSpace.getCustomOrder()); -// -// List SpacesCustomList = new ArrayList<>(); -// SpacesCustomList.add(firstSpace); -// SpacesCustomList.add(secondSpace); -// -// Mockito.verify(spacesCustomOrderRepository).saveAll(SpacesCustomList); -// } -// -// @Test -// public void test_persistPublishedSpacesToSpacesCustomOrder_success() { -// SpacesCustomOrder firstSpaceCustomOrder = new SpacesCustomOrder(); -// firstSpaceCustomOrder.setId("SPAC01"); -// firstSpaceCustomOrder.setCustomOrder(Integer.valueOf(3)); -// ISpace space1 = new Space(); -// space1.setId("space1"); -// space1.setSpaceStatus(SpaceStatus.PUBLISHED); -// ISpace space2 = new Space(); -// space2.setId("space2"); -// List spaces = new ArrayList(); -// spaces.add(space1); -// spaces.add(space2); -// when(spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED)).thenReturn(spaces); -// when(spaceManager.getSpacesWithStatus(null)).thenReturn(spaces); -// -// when(spacesCustomOrderRepository.findBySpace_Id(Mockito.anyString())).thenReturn(Optional.of(firstSpaceCustomOrder)); -// -// when(spacesCustomOrderRepository.findMaxCustomOrder()).thenReturn(null); -// -// serviceToTest.persistPublishedSpacesToSpacesCustomOrder(); -// } -// +package edu.asu.diging.vspace.core.services.impl; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.mockito.Spy; + +import java.util.Optional; + +import edu.asu.diging.vspace.core.data.SpacesCustomOrderRepository; +import edu.asu.diging.vspace.core.model.IExhibition; +import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.SpacesCustomOrder; +import edu.asu.diging.vspace.core.model.impl.Exhibition; +import edu.asu.diging.vspace.core.model.impl.Space; +import edu.asu.diging.vspace.core.model.impl.SpaceStatus; +import edu.asu.diging.vspace.core.services.IExhibitionManager; +import edu.asu.diging.vspace.core.services.ISpaceManager; + +public class SpacesCustomOrderManagerTest{ + + @Mock + private SpacesCustomOrderRepository spacesCustomOrderRepository; + + @Mock + private ISpaceManager spaceManager; + + @Mock + private IExhibitionManager exhibitionManager; + + @InjectMocks + private SpacesCustomOrderManager serviceToTest; + + @Spy + private SpacesCustomOrderManager spyManager; + + private String spaceId = "spaceId"; + private String spaceCustomOrderId1, spaceCustomOrderId2; + private IExhibition exhibition = new Exhibition(); + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + spaceCustomOrderId1 = "SPC000000001"; + spaceCustomOrderId2 = "SPC000000001"; + + } + + @Test + public void test_deleteSpaceCustomOrderByIdWithNullSpacesCustomOrder_forSuccess() { + SpacesCustomOrder spacesCustomOrder = null; + Mockito.when(exhibitionManager.getStartExhibition()).thenReturn(exhibition); + serviceToTest.deleteSpacesCustomOrderById(spaceCustomOrderId1); + Mockito.verify(spacesCustomOrderRepository).deleteById(spaceCustomOrderId1); + } + + @Test + public void test_deleteSpaceCustomOrderByIdWithNotNullSpacesCustomOrder_forSuccess() { + SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); + spacesCustomOrder.setId(spaceCustomOrderId1); + exhibition.setSpacesCustomOrder(spacesCustomOrder); + Mockito.when(exhibitionManager.getStartExhibition()).thenReturn(exhibition); + serviceToTest.deleteSpacesCustomOrderById(spaceCustomOrderId1); + Mockito.verify(spacesCustomOrderRepository).deleteById(spaceCustomOrderId1); + Mockito.verify(exhibitionManager).storeExhibition((Exhibition)exhibition); + } + // @Test -// public void test_updateStatusChangeToUnpublished_success() { -// String space1Id="Space1"; -// ISpace space = new Space(); -// space.setId(space1Id); +// public void test_editSpacesCustomOrders_forSuccess() { +// List spaceIds = new ArrayList(); // SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); -// spacesCustomOrder.setCustomOrder(1); -// SpacesCustomOrder spacesCustomOrder2 = new SpacesCustomOrder(); -// spacesCustomOrder2.setCustomOrder(2); -// List spacesCustomOrderList = new ArrayList(); -// spacesCustomOrderList.add(spacesCustomOrder2); -// when(spacesCustomOrderRepository.findBySpace_Id(space1Id)).thenReturn(Optional.of(spacesCustomOrder)); -// when(spacesCustomOrderRepository.findBySpace_IdAndCustomOrderGreaterThan(space1Id,1)).thenReturn(spacesCustomOrderList); -// doNothing().when(spacesCustomOrderRepository).delete(spacesCustomOrder); -// -// assertEquals(Integer.valueOf(2), spacesCustomOrder2.getCustomOrder()); -// serviceToTest.updateStatusChangeToUnpublished(space); +// SpacesCustomOrderManager classToTest = null; +// SpacesCustomOrderManager spy = Mockito.spy(classToTest); +// spaceIds.add("SPC001"); +// spaceIds.add("SPC002"); +// Mockito.doReturn(spacesCustomOrder).when(spy).getSpaceCustomOrderById(spaceCustomOrderId1); +// serviceToTest.editSpacesCustomOrder(spaceCustomOrderId1, spaceIds); +// Mockito.verify(spacesCustomOrderRepository).save(spacesCustomOrder); // } -// -// -//} \ No newline at end of file + + + + +} \ No newline at end of file From 60896b3ad756c2f1d2f6cbd9a824bc7ef18db114 Mon Sep 17 00:00:00 2001 From: glend17 Date: Wed, 9 Feb 2022 13:52:01 -0700 Subject: [PATCH 35/60] [VSPC-190] code cleanup --- .../asu/diging/vspace/core/services/impl/SpaceManagerTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java index f20b3b9c3..910f9c0da 100644 --- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java @@ -35,7 +35,6 @@ import edu.asu.diging.vspace.core.model.impl.VSImage; import edu.asu.diging.vspace.core.services.IImageService; import edu.asu.diging.vspace.core.services.impl.model.ImageData; -import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderUtility; public class SpaceManagerTest { @@ -75,8 +74,6 @@ public class SpaceManagerTest { @Mock private ExhibitionManager exhibitionManager; - @Mock - private ExhibitionSpaceOrderUtility exhibitionSpaceOrderUtility; @InjectMocks From 6e30a2f4c4f7b387538993de5a8eb0467204fa2b Mon Sep 17 00:00:00 2001 From: glend17 Date: Thu, 10 Feb 2022 12:59:09 -0700 Subject: [PATCH 36/60] [VSPC-190] adding unit tests --- .../impl/SpacesCustomOrderManagerTest.java | 74 ++++++++++++------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java index dfa8082e4..498571acc 100644 --- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java @@ -1,30 +1,24 @@ package edu.asu.diging.vspace.core.services.impl; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.mockito.Spy; import java.util.Optional; import edu.asu.diging.vspace.core.data.SpacesCustomOrderRepository; import edu.asu.diging.vspace.core.model.IExhibition; -import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.SpacesCustomOrder; import edu.asu.diging.vspace.core.model.impl.Exhibition; import edu.asu.diging.vspace.core.model.impl.Space; -import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.ISpaceManager; @@ -42,10 +36,6 @@ public class SpacesCustomOrderManagerTest{ @InjectMocks private SpacesCustomOrderManager serviceToTest; - @Spy - private SpacesCustomOrderManager spyManager; - - private String spaceId = "spaceId"; private String spaceCustomOrderId1, spaceCustomOrderId2; private IExhibition exhibition = new Exhibition(); @@ -59,7 +49,6 @@ public void setUp() { @Test public void test_deleteSpaceCustomOrderByIdWithNullSpacesCustomOrder_forSuccess() { - SpacesCustomOrder spacesCustomOrder = null; Mockito.when(exhibitionManager.getStartExhibition()).thenReturn(exhibition); serviceToTest.deleteSpacesCustomOrderById(spaceCustomOrderId1); Mockito.verify(spacesCustomOrderRepository).deleteById(spaceCustomOrderId1); @@ -76,20 +65,55 @@ public void test_deleteSpaceCustomOrderByIdWithNotNullSpacesCustomOrder_forSucce Mockito.verify(exhibitionManager).storeExhibition((Exhibition)exhibition); } -// @Test -// public void test_editSpacesCustomOrders_forSuccess() { -// List spaceIds = new ArrayList(); -// SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); -// SpacesCustomOrderManager classToTest = null; -// SpacesCustomOrderManager spy = Mockito.spy(classToTest); -// spaceIds.add("SPC001"); -// spaceIds.add("SPC002"); -// Mockito.doReturn(spacesCustomOrder).when(spy).getSpaceCustomOrderById(spaceCustomOrderId1); -// serviceToTest.editSpacesCustomOrder(spaceCustomOrderId1, spaceIds); -// Mockito.verify(spacesCustomOrderRepository).save(spacesCustomOrder); -// } + @Test + public void test_editSpacesCustomOrders_Success() { + String spaceId1 = "SPC001"; + String spaceId2 = "SPC002"; + List spaceIdList = new ArrayList(); + spaceIdList.add(spaceId1); + spaceIdList.add(spaceId2); + SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); + when(spacesCustomOrderRepository.findById(spaceCustomOrderId1)).thenReturn(Optional.of(spacesCustomOrder)); + serviceToTest.editSpacesCustomOrder(spaceCustomOrderId1, spaceIdList); + Mockito.verify(spacesCustomOrderRepository).save(spacesCustomOrder); + } + + @Test + public void test_addSpacesToCustomOrders_Success() { + Space space = new Space(); + List spacesCustomOrders = new ArrayList(); + when(spacesCustomOrderRepository.findAll()).thenReturn(spacesCustomOrders); + serviceToTest.addSpaceToCustomOrders(space); + Mockito.verify(spacesCustomOrderRepository).saveAll(spacesCustomOrders); + + } - - + @Test + public void test_updateSpacesCustomOrderName_Success() { + String spaceId1 = "SPC001"; + String spaceId2 = "SPC002"; + List spaceIdList = new ArrayList(); + spaceIdList.add(spaceId1); + spaceIdList.add(spaceId2); + SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); + spacesCustomOrder.setCustomOrderName("hello"); + when(spacesCustomOrderRepository.findById(spaceCustomOrderId1)).thenReturn(Optional.of(spacesCustomOrder)); + serviceToTest.updateSpacesCustomOrderName(spaceCustomOrderId2, "updated"); + Mockito.verify(spacesCustomOrderRepository).save(spacesCustomOrder); + } + + @Test + public void test_updateSpacesCustomOrderDescription_Success() { + String spaceId1 = "SPC001"; + String spaceId2 = "SPC002"; + List spaceIdList = new ArrayList(); + spaceIdList.add(spaceId1); + spaceIdList.add(spaceId2); + SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); + spacesCustomOrder.setCustomOrderName("hello"); + when(spacesCustomOrderRepository.findById(spaceCustomOrderId1)).thenReturn(Optional.of(spacesCustomOrder)); + serviceToTest.updateSpacesCustomOrderDescription(spaceCustomOrderId2, "updated"); + Mockito.verify(spacesCustomOrderRepository).save(spacesCustomOrder); + } } \ No newline at end of file From 8ff419d56de9e33ba889c835d1d5dd43090064fd Mon Sep 17 00:00:00 2001 From: glend17 Date: Thu, 10 Feb 2022 13:08:56 -0700 Subject: [PATCH 37/60] [VSPC-190] code cleanup --- .../edu/asu/diging/vspace/core/model/SpacesCustomOrder.java | 4 ++-- .../diging/vspace/web/staff/UpdateSpaceStatusController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java index a5b7c02f3..be7fcfdc3 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java @@ -43,8 +43,8 @@ public void setCustomOrderName(String customOrderName) { @ManyToMany(targetEntity = Space.class) @JoinTable(name = "spaces_custom_orders", - joinColumns = @JoinColumn(name = "SpacesCustomOrder_Id", referencedColumnName="id"), - inverseJoinColumns = @JoinColumn(name = "Space_Id", referencedColumnName="id")) + joinColumns = @JoinColumn(name = "SpacesCustomOrder_Id", referencedColumnName="id"), + inverseJoinColumns = @JoinColumn(name = "Space_Id", referencedColumnName="id")) private List customOrderedSpaces; @Override diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java index ee138d1d7..2b138df5e 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java @@ -24,7 +24,7 @@ public class UpdateSpaceStatusController { public String updateStatus(HttpServletRequest request,RedirectAttributes attributes, @PathVariable("spaceId") String spaceId, @RequestParam("statusParam") SpaceStatus status) { ISpace space = spaceManager.getSpace(spaceId); space.setSpaceStatus(status); - spaceManager.storeSpace(space, null,null);; + spaceManager.storeSpace(space, null,null); attributes.addAttribute("alertType", "success"); attributes.addAttribute("message", "Status successfully updated!"); attributes.addAttribute("showAlert", "true"); From ba4e9a8f4f947ba05881ae8e959e41217a3de219 Mon Sep 17 00:00:00 2001 From: glend17 Date: Tue, 19 Apr 2022 09:29:42 -0700 Subject: [PATCH 38/60] [VSPC-190] allowing space custom order with same name --- .../core/services/impl/SpacesCustomOrderManager.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index 481f01a79..3eefc3888 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -44,12 +44,7 @@ public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { @Override public SpacesCustomOrder createNewCustomOrder(List spaceOrders, String name, - String description) throws IllegalStateException { - List spacesCustomOrderRepoValue = spacesCustomOrderRepository. - findByCustomOrderName(name); - if(!spacesCustomOrderRepoValue.isEmpty()) { - throw new IllegalStateException("Order with same name present"); - } + String description) { List orderedSpaces= new ArrayList(); SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); spacesCustomOrder.setCustomOrderName(name); From 006f921c066cf6a033eb0a6daeb536caf140e6cd Mon Sep 17 00:00:00 2001 From: glend17 Date: Tue, 19 Apr 2022 09:33:53 -0700 Subject: [PATCH 39/60] [VSPC-190] allowing space custom order with same name --- .../vspace/web/staff/AddSpacesCustomOrderController.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java index 807c26026..0a94aab96 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java @@ -44,13 +44,7 @@ public ResponseEntity createCustomOrder(Model model, @RequestParam("spac return new ResponseEntity("Cannot leave the name field empty", HttpStatus.BAD_REQUEST); } SpacesCustomOrder spacesCustomOrder = null; - try { - spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spaceOrders, name, description); - } - catch(IllegalStateException ex) { - model.addAttribute("showAlert", true); - return new ResponseEntity("Change the name as it already exists", HttpStatus.BAD_REQUEST); - } + spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spaceOrders, name, description); return new ResponseEntity(spacesCustomOrder.getId(), HttpStatus.OK); } From 99862b8588a3ebffa26213d1434529b6311460bb Mon Sep 17 00:00:00 2001 From: Tushar Anand Date: Mon, 15 Aug 2022 13:41:43 -0700 Subject: [PATCH 40/60] [VSPC-190] Implemented PR review comments --- .../core/aspects/ExhibitionDataAspect.java | 5 ++-- .../vspace/core/services/ISpaceManager.java | 2 ++ .../core/services/impl/SpaceManager.java | 23 +++++++++++++++---- .../impl/SpacesCustomOrderManager.java | 10 ++------ .../vspace/web/staff/AddSpaceController.java | 3 ++- .../staff/IExhibitionSpaceOrderUtility.java | 17 ++++++++++++++ .../vspace/web/staff/SpaceController.java | 15 ++++++------ .../WEB-INF/views/staff/spaces/spacelist.html | 4 +++- 8 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/IExhibitionSpaceOrderUtility.java diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java index d118a5943..e8082085e 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java @@ -1,7 +1,5 @@ package edu.asu.diging.vspace.core.aspects; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,6 +27,7 @@ import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderUtility; + @Component @Aspect public class ExhibitionDataAspect { @@ -44,10 +43,12 @@ public class ExhibitionDataAspect { @Autowired private AuthenticationFacade authFacade; + @Autowired private ExhibitionSpaceOrderUtility exhibitionSpaceOrderUtility; + @After("execution(public * edu.asu.diging.vspace.web..*Controller.*(..))") public void setExhibition(JoinPoint jp) { Object[] args = jp.getArgs(); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java index 79279faa6..1af7c97b2 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java @@ -40,4 +40,6 @@ public interface ISpaceManager { Page findByNameOrDescription(Pageable requestedPage,String searchText); List sortPublishedSpacesByGivenOrder(List publishedSpaces); + + void addSpaceToCustomOrders(ISpace space); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java index 279207ca3..b1b40b4f0 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java @@ -44,7 +44,6 @@ import edu.asu.diging.vspace.core.services.ISpaceManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; import edu.asu.diging.vspace.core.services.impl.model.ImageData; -import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderMode; import edu.asu.diging.vspace.web.staff.ExhibitionSpaceOrderUtility; @Transactional @@ -87,13 +86,14 @@ public class SpaceManager implements ISpaceManager { @Autowired private ExhibitionSpaceOrderUtility exhibitionSpaceOrderUtility; - + @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; @Autowired private SpacesCustomOrderRepository spacesCustomOrderRepo; + private final Logger logger = LoggerFactory.getLogger(getClass()); /* @@ -242,6 +242,15 @@ public void deleteSpaceById(String id) { Optional space = spaceRepo.findById(id); if (space.isPresent()) { fromSpaceLinks = spaceLinkRepo.findByTargetSpace(space.get()); + + //To remove the current space from all existing custom orders + List spacesCustomOrder = spacesCustomOrderManager.findAll(); + for(SpacesCustomOrder spaceCustomOrder : spacesCustomOrder) { + List customOrderedSpaces = spaceCustomOrder.getCustomOrderedSpaces(); + if(spaceCustomOrder.getCustomOrderedSpaces().remove(space.get())) { + spacesCustomOrderRepo.save(spaceCustomOrder); + } + } } Exhibition exhibition = (Exhibition) exhibitionManager.getStartExhibition(); // When space has other links attached to it @@ -264,7 +273,7 @@ public void deleteSpaceById(String id) { } // When space has no other links attached to it spaceDisplayRepo.deleteBySpaceId(id); - + //To delete all spaces that exist in custom orders if(space.isPresent()) { List spacesCustomOrder = spacesCustomOrderManager.findAll(); @@ -279,7 +288,6 @@ public void deleteSpaceById(String id) { //Delete the space spaceRepo.deleteById(id); - } } @@ -339,4 +347,11 @@ public List sortPublishedSpacesByGivenOrder(List publishedSpaces return exhibitionSpaceOrderUtility.retrieveSpacesListInGivenOrder(publishedSpaces, exhibition.getSpaceOrderMode()); } + @Override + public void addSpaceToCustomOrders(ISpace space) { + spacesCustomOrderManager.addSpaceToCustomOrders(space); + + } + + } \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index 3eefc3888..3610c258c 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -29,6 +29,8 @@ @Service @Transactional(rollbackFor = { Exception.class }) public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { + + private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderManager.class); @Autowired private SpacesCustomOrderRepository spacesCustomOrderRepository; @@ -39,8 +41,6 @@ public class SpacesCustomOrderManager implements ISpacesCustomOrderManager { @Autowired private IExhibitionManager exhibitionManager; - private static Logger logger = LoggerFactory.getLogger(SpacesCustomOrderManager.class); - @Override public SpacesCustomOrder createNewCustomOrder(List spaceOrders, String name, @@ -71,7 +71,6 @@ public SpacesCustomOrder getSpaceCustomOrderById(String customSpaceOrderId) { @Override public void saveCustomOrders(List spacesCustomOrder) { spacesCustomOrderRepository.saveAll(spacesCustomOrder); - return; } /** @@ -85,7 +84,6 @@ public void addSpaceToCustomOrders(ISpace space) { spaceCustomOrder.getCustomOrderedSpaces().add(space); } saveCustomOrders(spacesCustomOrders); - return; } @Override @@ -93,7 +91,6 @@ public void updateSpacesCustomOrderName(String spacesCustomOrderId, String name) SpacesCustomOrder spaceCustomOrder = getSpaceCustomOrderById(spacesCustomOrderId); spaceCustomOrder.setCustomOrderName(name); spacesCustomOrderRepository.save(spaceCustomOrder); - return; } @Override @@ -101,7 +98,6 @@ public void updateSpacesCustomOrderDescription(String spacesCustomOrderId, Strin SpacesCustomOrder spaceCustomOrder = getSpaceCustomOrderById(spacesCustomOrderId); spaceCustomOrder.setDescription(name); spacesCustomOrderRepository.save(spaceCustomOrder); - return; } @@ -114,7 +110,6 @@ public void editSpacesCustomOrder(String spacesCustomOrderId, List space SpacesCustomOrder spaceCustomOrder = getSpaceCustomOrderById(spacesCustomOrderId); spaceCustomOrder.setCustomOrderedSpaces(spaces); spacesCustomOrderRepository.save(spaceCustomOrder); - return; } @@ -124,7 +119,6 @@ public void setExhibitionSpacesCustomOrder(String customOrderId) { Optional spacesCustomOrder = spacesCustomOrderRepository .findById(customOrderId); exhibition.setSpacesCustomOrder(spacesCustomOrder.get()); - return; } @Override diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java index 5f3fa27aa..c2f60120d 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java @@ -80,9 +80,10 @@ public String addSpace(Model model, @ModelAttribute SpaceForm spaceForm, @Reques }else { creationValue = spaceManager.storeSpace(space, bgImage, filename); } + //add new space to all custom space orders - spacesCustomOrderManager.addSpaceToCustomOrders(space); + spaceManager.addSpaceToCustomOrders(space); if (creationValue != null) { return "redirect:/staff/space/" + creationValue.getElement().getId(); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/IExhibitionSpaceOrderUtility.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/IExhibitionSpaceOrderUtility.java new file mode 100644 index 000000000..3156f470c --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/IExhibitionSpaceOrderUtility.java @@ -0,0 +1,17 @@ +package edu.asu.diging.vspace.web.staff; + +import java.util.List; + +import edu.asu.diging.vspace.core.model.ISpace; + +public interface IExhibitionSpaceOrderUtility { + + List sortSpacesAlphabetically(List publishedSpaces); + + List sortSpacesOnCreationDate(List publishedSpaces); + + List sortSpacesByCustomOrder(List publishedSpaces); + + List sortSpaces(List publishedSpaces, ExhibitionSpaceOrderMode mode); + +} \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java index 2743eab54..7ce9b7acc 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java @@ -55,7 +55,8 @@ public class SpaceController { private IExternalLinkManager externalLinkManager; @Autowired - IExhibitionManager exhibitionManager; + private IExhibitionManager exhibitionManager; + @RequestMapping(STAFF_SPACE_PATH+"{id}") public String showSpace(@PathVariable String id, Model model) { @@ -87,18 +88,18 @@ public ResponseEntity> showSpaceLinks(@PathVariable String id responseData.put("moduleLinks", moduleLinkManager.getLinkDisplays(id)); return new ResponseEntity<>(responseData, HttpStatus.OK); } - - @RequestMapping(value = "/staff/space/spaceordermode", method = RequestMethod.POST) + + @RequestMapping(value = "/staff/space/space/order/mode", method = RequestMethod.POST) public String updateSpaceOrderMode(String mode, @RequestParam String spaceOrderMode) { - IExhibition exhibition; if(spaceOrderMode.equalsIgnoreCase("ALPHABETICAL")) { - exhibition = exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.ALPHABETICAL); + exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.ALPHABETICAL); } else if(spaceOrderMode.equalsIgnoreCase("CREATION_DATE")) { - exhibition = exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.CREATION_DATE); + exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.CREATION_DATE); } else if(spaceOrderMode.equalsIgnoreCase("CUSTOM")) { - exhibition = exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.CUSTOM); + exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.CUSTOM); } return "redirect:/staff/space/list"; } + } diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html index fb63c75ac..dcf0668ac 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html @@ -69,11 +69,13 @@

    Spaces

    This virtual exhibition contains the following spaces. indicates the start space. +
    +
    Select how you want to arrange this in the exhibition navigation bar
    -
    +

    Select spaces display order.

    Select Custom Order to be used.

    Select spaces display order.

    +
    +
    + + +
    +
    Drag and drop to arrange spaces
    +
    +
    +
    +

    [[${selectedSpace.name}]]

    +
    +
    +
    +
    + +
    +
    + \ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html index f95947c3b..8791e73d9 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html @@ -2,7 +2,14 @@
    +
    + + "Custom Order has been Added" +
    + New Order

    Custom Orders for Spaces

    This virtual exhibition contains the following custom orders for spaces.
    From 479a02c441555894f97aa9abddbb95ff6b0d80a1 Mon Sep 17 00:00:00 2001 From: Tushar Anand Date: Wed, 7 Sep 2022 14:54:09 -0700 Subject: [PATCH 44/60] [VSPC-190] Modified UI for custom ordering page. Moved the custom order link to the spaces page. After cresting a new custom order, the application moves to the main custom order page and shows success message. --- .../WEB-INF/views/layouts/navbar_staff.html | 7 - .../spaces/customorder/customordering.html | 120 ++++++++---------- .../WEB-INF/views/staff/spaces/spacelist.html | 30 +++-- 3 files changed, 73 insertions(+), 84 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html b/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html index a4b6d7e81..8f644d12e 100644 --- a/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html +++ b/vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html @@ -48,13 +48,6 @@ th:href="@{/staff/user/list}">  Users -

    • -
  • - -  Custom Ordering -
  • + - -
    -
    - - "Custom Order has been Added" -
    -     + New Order -

    Custom Orders for Spaces

    -
    This virtual exhibition contains the following custom orders for spaces.
    - -
    - - -
    -
    - - -

    Select Custom Order to be used.

    - - - -
    -
    - -
    -

    Custom Orders

    + +
    +
    + + "Custom Order has been Added"
    - - -
    -
    - + + New Order +

    Custom Orders for Spaces

    +
    This virtual exhibition contains the following custom orders for spaces.
    +
    +
    + +
    Select Custom Order to be used.
    + + +
    +
    +
    +
    +

    Custom Orders

    +
    + +
    +
    + diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html index 676af311d..3677f4700 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html @@ -11,8 +11,10 @@ onPageReady($("#deleteSpace"), $('#confirm-space-delete')); $("#list").hide(); $("#grid-btn").hide(); + var spaceOrderElement = document.getElementById('spaceOrderMode'); spaceOrderElement.value=currentCustomMode; + $(function () { $('[data-toggle="tooltip"]').tooltip() }); @@ -59,6 +61,17 @@ .noIncomingLinks:hover+.noIncomingLinkMessage { display: block; } + +.customOrderLinkContainer { + text-align: right; + padding-top: 10px; +} + +.customOrderLink:hover { + text-decoration: underline; + color: blue; +} + @@ -84,17 +97,14 @@

    Spaces

    + +
    + + Manage Custom Order + +
    - From 5296a304a3be85084e16d3f65491e6d87e8be86f Mon Sep 17 00:00:00 2001 From: Tushar Anand Date: Thu, 8 Sep 2022 13:36:09 -0700 Subject: [PATCH 45/60] [VSPC-190] Added back button to navigate on the add new custom order page Added a success popup to indicate successful change of custom order selection Modified some css on spacelist.html --- .../views/staff/spaces/customorder/add.html | 42 ++++++++++++------- .../spaces/customorder/customordering.html | 32 ++++++++++---- .../WEB-INF/views/staff/spaces/spacelist.html | 6 ++- 3 files changed, 56 insertions(+), 24 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html index 2b98ce705..a4f5226e5 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/add.html @@ -27,6 +27,14 @@ position: absolute; top: 8%; width: 65%; + display:none; + } + .goBackContainer { + float: right; + } + .goBackContainer:hover { + cursor: pointer; + font-weight: bold; } @@ -101,12 +109,18 @@ $("#closeAlertFailed").click(function() { $("#errorMsgFailed").hide(); }); - + $("#goBackContainer").click(function() { + window.location.href = "[(@{'/staff/space/order'})]"; + }); });
    +
    + + Go Back +

    Add New Custom Order

    - - -
    -
    - - -
    -
    Drag and drop to arrange spaces
    + + +
    +
    + + +
    +
    Drag and drop to arrange spaces
    -
    -
    -

    [[${selectedSpace.name}]]

    -
    -
    +
    +
    +

    [[${selectedSpace.name}]]

    +
    +
    diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html index f75c25535..15cc8c269 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html @@ -11,16 +11,23 @@ .customOrderText { padding-bottom:10px; } + .successMsgAdded { + position: absolute; + top: 8%; + width: 65%; + display:none; + }
    -
    +
    - "Custom Order has been Added" +
    + New Order

    Custom Orders for Spaces

    @@ -52,7 +68,7 @@

    Custom Orders for Spaces

    - +
    diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html index 3677f4700..d2c0192ca 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html @@ -64,11 +64,13 @@ .customOrderLinkContainer { text-align: right; - padding-top: 10px; + padding: 15px 0; } -.customOrderLink:hover { +.customOrderLink { text-decoration: underline; +} +.customOrderLink:hover { color: blue; } From 7e0a573ad61a8a7f5d344f091936b1cf3285099a Mon Sep 17 00:00:00 2001 From: Tushar Anand Date: Fri, 9 Sep 2022 13:50:51 -0700 Subject: [PATCH 46/60] [VSPC-190] Updated UI for the individual custom order page --- .../views/staff/spaces/customorder/order.html | 662 +++++++++--------- 1 file changed, 345 insertions(+), 317 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html index 971a86ec9..e7ea55172 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/order.html @@ -2,344 +2,372 @@ - - + + + .hova { + background-color: #f2f2f2; + } + .EasyMDEContainer .CodeMirror-wrap{ + overflow-y: scroll; + height: 400px; + } + .editCustomOrder { + background: white; + padding: 25px 40px; + } + .sortableSpaces { + max-height: 385px; + overflow-y: scroll; + } + .paraContent { + cursor: pointer; + border: 1px solid; + padding: 15px; + margin-top: 20px; + } + .para { + margin: 0; + } + .createdDates { + margin-bottom: 0; + } + .goBackContainer { + float: right; + } + .goBackContainer:hover { + cursor: pointer; + font-weight: bold; + } + + + + //------- edit name of custom space order starts -------- + + $("#submitTitle").hide(); + $("#cancelEditTitle").hide(); + + $("#editTitle").click(function() { + // Using data attribute + var spaceCustomOrderTitle = $("#title").text() // gets value without using trim function + $('
    ').insertAfter( "#title" ); + $('#title').text() + $("#newTitle").val(spaceCustomOrderTitle.split(": ")[1]) + $("#editTitle").hide() + $("#submitTitle").show() + $("#cancelEditTitle").show() + }); + + + + // ------ Submit title Custom Space Order ------- + + $("#submitTitle").click(function() { + var formData = new FormData(); + formData.append('title', $("#newTitle").val()); + $.ajax({ + url: "[(@{'/staff/space/order/'+${customSpaceOrder.id}+'/edit/title'})]"+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]], + type: 'POST', + cache : false, + contentType : false, + processData : false, + data: formData, + enctype: 'multipart/form-data', + beforeSend: function(){ + $(".blur").css("filter","blur(3px)"); + $("#spinner").show(); + }, + complete: function(){ + $("#spinner").hide(); + $(".blur").css("filter","none"); + }, + success: function(data) { + // replace text box with new description + $("#submitTitle").hide() + $("#cancelEditTitle").hide(); + $("#editTitle").show() + var val = $("#newTitle").val(); + $("#editSpaceCustomOrderTitle").remove() + $("#title").text("SpaceCustomOrder: " + val) + $("#title").data('value', val) // sets value + }, + error: function(data) { + var alert = $(''); + $('.error').append(alert); + } + }); + + }); + + $("#cancelEditTitle").click(function(){ + $("#submitTitle").hide() + $("#editTitle").show() + $("#editSpaceCustomOrderTitle").hide() + $("#cancelEditTitle").hide() + var spaceCustomOrderTitle = $("#title").text() // gets value + $("#editSequenceTitle").remove() + $("#title").text(spaceCustomOrderTitle) + + }); + $("#sortableSpaces").sortable({ + update: function(event,ui) { + spaceDivs = []; + $(this).children().each(function(index,element){ + spaceDivs.push(element.children[0].id); + }); + } + }); + + //save order + $("#saveOrder").click(function() { + var formData = new FormData(); + formData.append('spaceOrder', spaceDivs); + $.ajax({ + url: "[(@{'/staff/space/order/'+${customSpaceOrder.id}+'/edit/spaceorders'})]"+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]], + type: 'POST', + cache : false, + contentType : false, + processData : false, + data: formData, + enctype: 'multipart/form-data', + beforeSend: function(){ + $(".blur").css("filter","blur(3px)"); + $("#spinner").show(); + }, + complete: function(){ + $("#spinner").hide(); + $(".blur").css("filter","none"); + }, + success: function(data) { + $("#errorMsgSave").show(); + }, + error: function(data) { + var alert = $(''); + $('.error').append(alert); + } + }); + + }); + + + //save order + $("#deleteOrder").click(function() { + var formData = new FormData(); + $.ajax({ + url: "[(@{'/staff/space/customorder/'+${customSpaceOrder.id}})]"+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]], + type: 'DELETE', + cache : false, + contentType : false, + processData : false, + data: formData, + enctype: 'multipart/form-data', + beforeSend: function(){ + $(".blur").css("filter","blur(3px)"); + $("#spinner").show(); + }, + complete: function(){ + $("#spinner").hide(); + $(".blur").css("filter","none"); + }, + success: function(data) { + $("#title").hide(); + $("#description").hide(); + $("#sortableSpaces").hide(); + $("#saveOrder").hide(); + $("#deleteOrder").hide(); + $("#createdDates").hide(); + $("#draganddrop").hide(); + $("#dropdowns").hide(); + $("#errorMsgDelete").show(); + + + }, + error: function(data) { + var alert = $(''); + $('.error').append(alert); + } + }); + + }); + + $("#closeAlertDelete").click(function() { + $('#errorMsgDelete').hide(); + }); + + $("#closeAlertSave").click(function() { + $('#errorMsgSave').hide(); + }); + + $("#goBackContainer").click(function() { + window.location.href = "[(@{'/staff/space/order'})]"; + }); + + if([[${customSpaceOrder.description}]] == "") { + $("#description").hide(); + } + }); + - -
    -
    - "Custom Order has been deleted" - -
    -
    - "Custom Order has been Saved" - -
    -
    -
    -
    -

    Custom Space Order: [[${customSpaceOrder.customOrderName}]]

    -

    [[${customSpaceOrder.description}]]

    - - -
    - - -
    - "Custom Order has been deleted" - +
    + +
    -
    - "Custom Order has been Saved" - +
    -
    -
    -

    Custom Space Order: [[${customSpaceOrder.customOrderName}]]

    -

    [[${customSpaceOrder.description}]]

    - - -
    - - -
    - Edit
    - - - +

    [[${customSpaceOrder.description}]]

    - +
    + + + +
    From ab17daec04fc8fc25947eed1360b8e6dfb149ef4 Mon Sep 17 00:00:00 2001 From: Tushar Anand Date: Thu, 15 Sep 2022 10:56:33 -0700 Subject: [PATCH 50/60] VSPC-190 Fixed indentation issue --- .../asu/diging/vspace/core/services/impl/ExhibitionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java index c98488ea9..a28e68a76 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java @@ -149,7 +149,7 @@ private IExhibitionLanguage addExhibitionLanguage(Exhibition exhibition, Map lan return exhibitionLanguage; } - @Override + @Override public IExhibition updateSpaceOrderMode(ExhibitionSpaceOrderMode mode) { Exhibition exhibition = (Exhibition) getStartExhibition(); exhibition.setSpaceOrderMode(mode); From 89c871169ed309751914193f460681a8ed959761 Mon Sep 17 00:00:00 2001 From: Tushar Anand Date: Tue, 27 Sep 2022 12:32:25 -0700 Subject: [PATCH 51/60] [VSPC-190] PR review comments incorporated --- .../core/data/SpacesCustomOrderRepository.java | 2 -- .../vspace/core/model/SpacesCustomOrder.java | 17 +++++++++-------- .../diging/vspace/core/model/impl/Space.java | 4 ---- .../services/impl/SpacesCustomOrderManager.java | 14 +++++++++++++- .../staff/AddSpacesCustomOrderController.java | 3 +-- .../staff/EditSpacesCustomOrderController.java | 2 +- .../vspace/web/staff/SpaceController.java | 10 ++-------- .../web/staff/SpacesCustomOrderController.java | 11 +++-------- .../spaces/customorder/customordering.html | 2 +- .../views/staff/spaces/customorder/order.html | 8 +++++++- 10 files changed, 37 insertions(+), 36 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java index b59f4cc81..838515613 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpacesCustomOrderRepository.java @@ -1,10 +1,8 @@ package edu.asu.diging.vspace.core.data; import java.util.List; -import java.util.Optional; import org.javers.spring.annotation.JaversSpringDataAuditable; -import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.stereotype.Repository; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java index 949cae6bb..73ca1764a 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/SpacesCustomOrder.java @@ -12,6 +12,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; +import javax.persistence.OrderColumn; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -37,6 +38,7 @@ public class SpacesCustomOrder extends VSpaceElement implements ISpacesCustomOrd @JoinTable(name = "spaces_custom_orders", joinColumns = @JoinColumn(name = "SpacesCustomOrder_Id", referencedColumnName="id"), inverseJoinColumns = @JoinColumn(name = "Space_Id", referencedColumnName="id")) + @OrderColumn private List customOrderedSpaces; @Override @@ -49,14 +51,6 @@ public void setId(String id) { this.id = id; } - public List getCustomOrderedSpaces() { - return customOrderedSpaces; - } - - public void setCustomOrderedSpaces(List customOrderedSpaces) { - this.customOrderedSpaces = customOrderedSpaces; - } - public String getCustomOrderName() { return customOrderName; } @@ -64,6 +58,13 @@ public String getCustomOrderName() { public void setCustomOrderName(String customOrderName) { this.customOrderName = customOrderName; } + + public List getCustomOrderedSpaces() { + return customOrderedSpaces; + } + public void setCustomOrderedSpaces(List customOrderedSpaces) { + this.customOrderedSpaces = customOrderedSpaces; + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java index 6c2f5ada8..66018dd30 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Space.java @@ -7,9 +7,6 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Transient; @@ -27,7 +24,6 @@ import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.ISpaceLink; import edu.asu.diging.vspace.core.model.IVSImage; -import edu.asu.diging.vspace.core.model.SpacesCustomOrder; @Entity public class Space extends VSpaceElement implements ISpace { diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index 4dd8de2c1..b22700b08 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -93,7 +93,11 @@ public void updateSpacesCustomOrderNameDescription(String spacesCustomOrderId, S spacesCustomOrderRepository.save(spaceCustomOrder); } - + /** + * This method edits the custom order + * @param spacesCustomOrderId + * @param spacesIds + */ @Override public void editSpacesCustomOrder(String spacesCustomOrderId, List spacesIds) { List spaces = new ArrayList(); @@ -106,6 +110,10 @@ public void editSpacesCustomOrder(String spacesCustomOrderId, List space } + /** + * This method sets the custom order to be used on exhibition page + * @param customOrderId + */ @Override public void setExhibitionSpacesCustomOrder(String customOrderId) { IExhibition exhibition = exhibitionManager.getStartExhibition(); @@ -114,6 +122,10 @@ public void setExhibitionSpacesCustomOrder(String customOrderId) { exhibition.setSpacesCustomOrder(spacesCustomOrder.get()); } + /** + * This method deletes the custom order by id + * @param id + */ @Override public void deleteSpacesCustomOrderById(String id) { IExhibition exhibition = exhibitionManager.getStartExhibition(); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java index 7014e0c15..57b1dd9d5 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java @@ -39,8 +39,7 @@ public ResponseEntity createCustomOrder(Model model, @RequestParam("spac if(name == null || name.isEmpty()) { return new ResponseEntity("Cannot leave the name field empty", HttpStatus.BAD_REQUEST); } - SpacesCustomOrder spacesCustomOrder = null; - spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spaceOrders, name, description); + SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.createNewCustomOrder(spaceOrders, name, description); return new ResponseEntity(spacesCustomOrder.getId(), HttpStatus.OK); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java index 7934f70b3..8516d15f8 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpacesCustomOrderController.java @@ -23,7 +23,7 @@ public class EditSpacesCustomOrderController { @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; - @RequestMapping(value = "/staff/space/order/{customOrderId}/edit/titleDescription", method = RequestMethod.POST) + @RequestMapping(value = "/staff/space/order/{customOrderId}/edit/info", method = RequestMethod.POST) public ResponseEntity saveTitleDescription(@RequestParam("title") String title, @RequestParam("description") String description, @PathVariable("customOrderId") String spacesCustomOrderId) { spacesCustomOrderManager.updateSpacesCustomOrderNameDescription(spacesCustomOrderId, title, description); return new ResponseEntity(HttpStatus.OK); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java index 2909207f0..8b269ad74 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java @@ -90,14 +90,8 @@ public ResponseEntity> showSpaceLinks(@PathVariable String id } @RequestMapping(value = "/staff/space/order/mode", method = RequestMethod.POST) - public String updateSpaceOrderMode(String mode, @RequestParam String spaceOrderMode) { - if(spaceOrderMode.equalsIgnoreCase("ALPHABETICAL")) { - exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.ALPHABETICAL); - } else if(spaceOrderMode.equalsIgnoreCase("CREATION_DATE")) { - exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.CREATION_DATE); - } else if(spaceOrderMode.equalsIgnoreCase("CUSTOM")) { - exhibitionManager.updateSpaceOrderMode(ExhibitionSpaceOrderMode.CUSTOM); - } + public String updateSpaceOrderMode(String mode, @RequestParam ExhibitionSpaceOrderMode spaceOrderMode) { + exhibitionManager.updateSpaceOrderMode(spaceOrderMode); return "redirect:/staff/space/list"; } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java index ec00c4d75..68e244b70 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java @@ -30,19 +30,14 @@ public class SpacesCustomOrderController { @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; - @Autowired - private ISpaceManager spaceManager; - @Autowired private IExhibitionManager exhibitionManager; @RequestMapping(value = "/staff/space/order/{orderId}", method = RequestMethod.GET) public String displaySpacesCustomOrder(Model model, @PathVariable("orderId") String customSpaceOrderId) { SpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.getSpaceCustomOrderById(customSpaceOrderId); - List spaces = spaceManager.getAllSpaces(); model.addAttribute("customSpaceOrder", spacesCustomOrder); model.addAttribute("selectedSpaces", spacesCustomOrder.getCustomOrderedSpaces()); - model.addAttribute("allSpaces", spaces); return "/staff/spaces/customorder/order"; } @@ -56,10 +51,10 @@ public String displayCustomOrders(Model model) { return "/staff/spaces/customorder/customordering"; } - @RequestMapping(value = "/staff/space/order/setDefault", method = RequestMethod.POST) + @RequestMapping(value = "/staff/space/order/setExhibitionCustomOrder", method = RequestMethod.POST) public String setExhibitionSpacesCustomOrder(Model model, - @RequestParam("selectedCustomOrderId") String sequenceId) { - spacesCustomOrderManager.setExhibitionSpacesCustomOrder(sequenceId); + @RequestParam("selectedCustomOrderId") String orderId) { + spacesCustomOrderManager.setExhibitionSpacesCustomOrder(orderId); return "redirect:/staff/space/order"; } diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html index 7cc066f94..3c29ab818 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html @@ -86,7 +86,7 @@

    Custom Orders for Spaces

    This virtual exhibition contains the following custom orders for spaces.
    -
    +
    Select Custom Order to be used
    + +
    +
    +
    +

    [[${selectedSpace.name}]]

    +
    +
    +
    +
    + +
    +
    + +
    + + -
    + diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java index ed9ef9795..66b509864 100644 --- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManagerTest.java @@ -43,18 +43,17 @@ public void setUp() { MockitoAnnotations.initMocks(this); spaceCustomOrderId1 = "SPC000000001"; spaceCustomOrderId2 = "SPC000000001"; - } @Test - public void test_deleteSpaceCustomOrderById_withNullSpacesCustomOrder() { + public void test_deleteSpaceCustomOrderById_customOrderNotSet() { Mockito.when(exhibitionManager.getStartExhibition()).thenReturn(exhibition); serviceToTest.delete(spaceCustomOrderId1); Mockito.verify(spacesCustomOrderRepository).deleteById(spaceCustomOrderId1); } @Test - public void test_deleteSpaceCustomOrderById_withNotNullSpacesCustomOrder() { + public void test_deleteSpaceCustomOrderById_customOrderSet() { SpacesCustomOrder spacesCustomOrder = new SpacesCustomOrder(); spacesCustomOrder.setId(spaceCustomOrderId1); exhibition.setSpacesCustomOrder(spacesCustomOrder); @@ -88,7 +87,7 @@ public void test_addSpacesToCustomOrders_success() { } @Test - public void test_updateSpacesCustomOrderNameDescription_updateName() { + public void test_updateSpacesCustomOrder_updateName() { String spaceId1 = "SPC001"; String spaceId2 = "SPC002"; List spaceIdList = new ArrayList(); @@ -102,7 +101,7 @@ public void test_updateSpacesCustomOrderNameDescription_updateName() { } @Test - public void test_updateSpacesCustomOrderNameDescription_updateDescription() { + public void test_updateSpacesCustomOrder_updateDescription() { String spaceId1 = "SPC001"; String spaceId2 = "SPC002"; List spaceIdList = new ArrayList(); From a380c849688bb7bac52a2b3d6076916222ffdbcc Mon Sep 17 00:00:00 2001 From: Tushar Anand Date: Tue, 6 Dec 2022 13:58:00 -0700 Subject: [PATCH 56/60] [VSPC-190] moved the request mapping to a new controller --- .../vspace/web/staff/SpaceController.java | 12 ----- .../staff/SpacesCustomOrderController.java | 23 --------- .../web/staff/StaffSpaceController.java | 50 +++++++++++++++++++ 3 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceController.java diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java index 739d7c529..f0b3642ea 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java @@ -13,12 +13,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import edu.asu.diging.vspace.core.model.ExhibitionSpaceOrderMode; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.impl.SpaceLink; -import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.IExternalLinkManager; import edu.asu.diging.vspace.core.services.IModuleLinkManager; import edu.asu.diging.vspace.core.services.IModuleManager; @@ -49,9 +46,6 @@ public class SpaceController { @Autowired private IExternalLinkManager externalLinkManager; - - @Autowired - private IExhibitionManager exhibitionManager; @Autowired @@ -90,11 +84,5 @@ public ResponseEntity> showSpaceLinks(@PathVariable String id return new ResponseEntity<>(responseData, HttpStatus.OK); } - @RequestMapping(value = "/staff/space/order/mode", method = RequestMethod.POST) - public String updateSpaceOrderMode(String mode, @RequestParam ExhibitionSpaceOrderMode spaceOrderMode) { - exhibitionManager.updateSpaceOrderMode(spaceOrderMode); - return "redirect:/staff/space/list"; - } - } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java index e9b223bcb..823535f47 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpacesCustomOrderController.java @@ -6,12 +6,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpacesCustomOrder; -import edu.asu.diging.vspace.core.model.impl.SpacesCustomOrder; -import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; /** @@ -27,9 +23,6 @@ public class SpacesCustomOrderController { @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; - @Autowired - private IExhibitionManager exhibitionManager; - @RequestMapping(value = "/staff/space/order/{orderId}", method = RequestMethod.GET) public String displaySpacesCustomOrder(Model model, @PathVariable("orderId") String customSpaceOrderId) { ISpacesCustomOrder spacesCustomOrder = spacesCustomOrderManager.get(customSpaceOrderId); @@ -38,20 +31,4 @@ public String displaySpacesCustomOrder(Model model, @PathVariable("orderId") Str return "/staff/spaces/customorder/order"; } - @RequestMapping(value = "/staff/space/order", method = RequestMethod.GET) - public String displayCustomOrders(Model model) { - model.addAttribute("customSpaceOrders", spacesCustomOrderManager.findAll()); - model.addAttribute("currentSelectedCustomOrder", exhibitionManager.getStartExhibition().getSpacesCustomOrder()); - return "/staff/spaces/customorder/customordering"; - } - - @RequestMapping(value = "/staff/space/order/setExhibitionCustomOrder", method = RequestMethod.POST) - public String setExhibitionSpacesCustomOrder(Model model, - @RequestParam("selectedCustomOrderId") String orderId) { - spacesCustomOrderManager.setExhibitionSpacesCustomOrder(orderId); - return "redirect:/staff/space/order"; - } - - - } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceController.java new file mode 100644 index 000000000..4bb8e70ca --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceController.java @@ -0,0 +1,50 @@ +package edu.asu.diging.vspace.web.staff; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import edu.asu.diging.vspace.core.model.ExhibitionSpaceOrderMode; +import edu.asu.diging.vspace.core.services.IExhibitionManager; +import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; + +/** + * StaffSpaceController is the controller + * to set mode of order of spaces on exhibition side, change custom order selection + * @author Tushar Anand + * + */ + +@Controller +public class StaffSpaceController { + + @Autowired + private ISpacesCustomOrderManager spacesCustomOrderManager; + + @Autowired + private IExhibitionManager exhibitionManager; + + @RequestMapping(value = "/staff/space/order", method = RequestMethod.GET) + public String displayCustomOrders(Model model) { + model.addAttribute("customSpaceOrders", spacesCustomOrderManager.findAll()); + model.addAttribute("currentSelectedCustomOrder", exhibitionManager.getStartExhibition().getSpacesCustomOrder()); + return "/staff/spaces/customorder/customordering"; + } + + @RequestMapping(value = "/staff/space/order/setExhibitionCustomOrder", method = RequestMethod.POST) + public String setExhibitionSpacesCustomOrder(Model model, + @RequestParam("selectedCustomOrderId") String orderId) { + spacesCustomOrderManager.setExhibitionSpacesCustomOrder(orderId); + return "redirect:/staff/space/order"; + } + + @RequestMapping(value = "/staff/space/order/mode", method = RequestMethod.POST) + public String updateSpaceOrderMode(String mode, @RequestParam ExhibitionSpaceOrderMode spaceOrderMode) { + exhibitionManager.updateSpaceOrderMode(spaceOrderMode); + return "redirect:/staff/space/list"; + } + +} From 981c87caf29f62842552e65b2da6d6f1a29d0b22 Mon Sep 17 00:00:00 2001 From: pkharge Date: Tue, 19 Sep 2023 16:17:54 -0700 Subject: [PATCH 57/60] [VSPC-190] review comments --- .../diging/vspace/core/model/IExhibition.java | 10 +++++++++ .../impl/ExhibitionSpaceOrderUtility.java | 5 +++++ .../impl/SpacesCustomOrderManager.java | 22 +++++++++++-------- .../staff/AddSpacesCustomOrderController.java | 3 +-- ...a => StaffSpaceCustomOrderController.java} | 2 +- 5 files changed, 30 insertions(+), 12 deletions(-) rename vspace/src/main/java/edu/asu/diging/vspace/web/staff/{StaffSpaceController.java => StaffSpaceCustomOrderController.java} (97%) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java index 4e65387ad..30b1ddecb 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibition.java @@ -2,6 +2,8 @@ import java.util.List; +import edu.asu.diging.vspace.core.model.impl.SpacesCustomOrder; + public interface IExhibition extends IVSpaceElement { /* @@ -38,4 +40,12 @@ public interface IExhibition extends IVSpaceElement { void setPreviewId(String previewId); + SpacesCustomOrder getSpacesCustomOrder(); + + void setSpacesCustomOrder(SpacesCustomOrder spacesCustomOrder); + + void setSpaceOrderMode(ExhibitionSpaceOrderMode spaceOrderMode); + + ExhibitionSpaceOrderMode getSpaceOrderMode(); + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionSpaceOrderUtility.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionSpaceOrderUtility.java index 13f25daa5..dcec9943b 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionSpaceOrderUtility.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionSpaceOrderUtility.java @@ -16,6 +16,11 @@ import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.IExhibitionSpaceOrderUtility; +/** + * Utility class for Exhibition Spaces custom order + * @author prachikharge + * + */ @Component public class ExhibitionSpaceOrderUtility implements IExhibitionSpaceOrderUtility { diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java index 0a82e9963..80228c682 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpacesCustomOrderManager.java @@ -70,8 +70,9 @@ public Iterable findAll(){ @Override public ISpacesCustomOrder get(String customSpaceOrderId) { Optional spacesCustomOrderOptional = spacesCustomOrderRepository.findById(customSpaceOrderId); - if(spacesCustomOrderOptional.isPresent()) + if(spacesCustomOrderOptional.isPresent()) { return spacesCustomOrderOptional.get(); + } return null; } @@ -93,10 +94,15 @@ public void addSpaceToCustomOrders(ISpace space) { save(spacesCustomOrders); } + + + @Override /** - *This method updates the custom order name or description + * This method updates the custom order name and description + * @param spacesCustomOrderId + * @param title + * @param description */ - @Override public void updateNameAndDescription(String spacesCustomOrderId, String title, String description) { ISpacesCustomOrder spaceCustomOrder = get(spacesCustomOrderId); spaceCustomOrder.setCustomOrderName(title); @@ -105,17 +111,15 @@ public void updateNameAndDescription(String spacesCustomOrderId, String title, S } /** - * This method edits the custom order + * This method updated custom order of spaces * @param spacesCustomOrderId * @param spacesIds */ @Override public void updateSpaces(String spacesCustomOrderId, List spacesIds) { List spaces = new ArrayList(); - for(String id : spacesIds) { - if(spaceManager.getSpace(id) != null) - spaces.add(spaceManager.getSpace(id)); - } + spacesIds.stream().filter(spaceId -> spaceManager.getSpace(spaceId) != null) + .map(id -> spaces.add(spaceManager.getSpace(id))); ISpacesCustomOrder spaceCustomOrder = get(spacesCustomOrderId); spaceCustomOrder.setCustomOrderedSpaces(spaces); spacesCustomOrderRepository.save((SpacesCustomOrder)spaceCustomOrder); @@ -135,7 +139,7 @@ public void setExhibitionSpacesCustomOrder(String customOrderId) { } /** - * This method deletes the custom order by id + * This method deletes the @{SpaceCustomOrder} object with the given id. * @param id */ @Override diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java index 7214fc961..52f3ece8e 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpacesCustomOrderController.java @@ -25,8 +25,7 @@ public class AddSpacesCustomOrderController { @RequestMapping(value = "/staff/space/order/add", method = RequestMethod.GET) public String addSpacesCustomOrders(Model model) { - List spaces = spaceManager.getAllSpaces(); - model.addAttribute("spaces", spaces); + model.addAttribute("spaces", spaceManager.getAllSpaces()); return "staff/spaces/customorder/add"; } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceCustomOrderController.java similarity index 97% rename from vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceController.java rename to vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceCustomOrderController.java index 4bb8e70ca..5e01435d5 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceCustomOrderController.java @@ -19,7 +19,7 @@ */ @Controller -public class StaffSpaceController { +public class StaffSpaceCustomOrderController { @Autowired private ISpacesCustomOrderManager spacesCustomOrderManager; From 1f6e703f575ad989df39ba2950d43b2c53b1ac13 Mon Sep 17 00:00:00 2001 From: pkharge Date: Thu, 21 Sep 2023 16:06:37 -0700 Subject: [PATCH 58/60] [VSPC-190] review comments --- .../StaffSpaceCustomOrderController.java | 10 ++------ .../UpdateStaffSpaceOrderModeController.java | 24 +++++++++++++++++++ .../spaces/customorder/customordering.html | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateStaffSpaceOrderModeController.java diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceCustomOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceCustomOrderController.java index 5e01435d5..1eda30999 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceCustomOrderController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceCustomOrderController.java @@ -12,7 +12,7 @@ import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager; /** - * StaffSpaceController is the controller + * StaffSpaceCustomOrderController is the controller * to set mode of order of spaces on exhibition side, change custom order selection * @author Tushar Anand * @@ -34,17 +34,11 @@ public String displayCustomOrders(Model model) { return "/staff/spaces/customorder/customordering"; } - @RequestMapping(value = "/staff/space/order/setExhibitionCustomOrder", method = RequestMethod.POST) + @RequestMapping(value = "/staff/space/order/{orderId}/set", method = RequestMethod.POST) public String setExhibitionSpacesCustomOrder(Model model, @RequestParam("selectedCustomOrderId") String orderId) { spacesCustomOrderManager.setExhibitionSpacesCustomOrder(orderId); return "redirect:/staff/space/order"; } - @RequestMapping(value = "/staff/space/order/mode", method = RequestMethod.POST) - public String updateSpaceOrderMode(String mode, @RequestParam ExhibitionSpaceOrderMode spaceOrderMode) { - exhibitionManager.updateSpaceOrderMode(spaceOrderMode); - return "redirect:/staff/space/list"; - } - } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateStaffSpaceOrderModeController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateStaffSpaceOrderModeController.java new file mode 100644 index 000000000..4d9dd65c4 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateStaffSpaceOrderModeController.java @@ -0,0 +1,24 @@ +package edu.asu.diging.vspace.web.staff; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import edu.asu.diging.vspace.core.model.ExhibitionSpaceOrderMode; +import edu.asu.diging.vspace.core.services.IExhibitionManager; + + +@Controller +public class UpdateStaffSpaceOrderModeController { + + @Autowired + private IExhibitionManager exhibitionManager; + + @RequestMapping(value = "/staff/space/order/mode", method = RequestMethod.POST) + public String updateSpaceOrderMode(String mode, @RequestParam ExhibitionSpaceOrderMode spaceOrderMode) { + exhibitionManager.updateSpaceOrderMode(spaceOrderMode); + return "redirect:/staff/space/list"; + } +} diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html index 03bacbc76..bed5c4d8b 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/customorder/customordering.html @@ -47,7 +47,7 @@

    Custom Orders for Spaces

    This virtual exhibition contains the following custom orders for spaces.
    -
    +
    Select Custom Order to be used