From 3e4e5931b2dd48739278186ca23a5b508e9cfcce Mon Sep 17 00:00:00 2001 From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com> Date: Fri, 5 Jun 2020 11:17:55 -0700 Subject: [PATCH 01/47] [VSPC-78] Module layout changes for bigger and smaller screens --- .../src/main/webapp/WEB-INF/views/exhibition/module.jsp | 9 +++++++++ vspace/src/main/webapp/resources/extra/Module_1.css | 9 ++++++++- .../webapp/resources/extra/Module_1___slideshow___1.css | 7 +++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp index 109526491..df2ab78a4 100644 --- a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp @@ -28,6 +28,15 @@ body { function closeLangNav() { document.getElementById("myLangSidenav").style.width = "0"; } + $( document ).ready(function() { + if($.browser.chrome) { + alert(1); + } else if ($.browser.mozilla) { + alert(2); + } else if ($.browser.msie) { + alert(3); + } + });
diff --git a/vspace/src/main/webapp/resources/extra/Module_1.css b/vspace/src/main/webapp/resources/extra/Module_1.css index 13fd1417b..4635fc38c 100644 --- a/vspace/src/main/webapp/resources/extra/Module_1.css +++ b/vspace/src/main/webapp/resources/extra/Module_1.css @@ -5,8 +5,8 @@ } .Group_8_Class { - /* text-align: center; */ text-align: -webkit-center; + text-align: -moz-center; } .Module_header_Class { @@ -200,4 +200,11 @@ a, a:hover, a:focus { .emptyPlace{ /* min-height: 100%; */ height: 700px; +} + +@media only screen and (max-width: 800px) { + /* For mobile phones: */ + [class*="exit_to_space_Class"] { + top: 45%; + } } \ No newline at end of file diff --git a/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css b/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css index 22267aee2..0c77de951 100644 --- a/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css +++ b/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css @@ -210,4 +210,11 @@ a, a:hover, a:focus { .language-picker { display: inline-block; position: relative; +} + +@media only screen and (max-width: 800px) { + /* For mobile phones: */ + [class*="Group_7_Class"] { + width: 98%; + } } \ No newline at end of file From c870b57dcdfc96a0f93f6a4e13f31261cad17939 Mon Sep 17 00:00:00 2001 From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com> Date: Mon, 8 Jun 2020 09:07:46 -0700 Subject: [PATCH 02/47] [VSPC-78] Deleting debug code added in jsp file. --- .../src/main/webapp/WEB-INF/views/exhibition/module.jsp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp index df2ab78a4..109526491 100644 --- a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp @@ -28,15 +28,6 @@ body { function closeLangNav() { document.getElementById("myLangSidenav").style.width = "0"; } - $( document ).ready(function() { - if($.browser.chrome) { - alert(1); - } else if ($.browser.mozilla) { - alert(2); - } else if ($.browser.msie) { - alert(3); - } - });
From f1078db8acd45d81436cf7b76a41dabe878e6260 Mon Sep 17 00:00:00 2001 From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com> Date: Tue, 9 Jun 2020 16:08:24 -0700 Subject: [PATCH 03/47] Story/vspc 77 (#124) * [VSPC-77] Changes using media query for mobile screen size. * [VSPC-77] Saving updates to the code for minimum height * [VSPC-77] Changes for links positioning * [VSPC-77] Link positioning for space layout for smaller screen size. * [VSPC-77] removing wrongly printed value from console. * [VSPC-77] Links positioning for mobile screens * [VSPC-77] Space description position fix. * [VSPC-77] Links positioning changes for mobile screens * [VSPC-77] Changes with respect to image width as per screen resolution. * [VSPC-77] Width fix for changing window sizes * [VSPC-77] Fix for intermittent issue of links repositioning * [VSPC-77] Adding back the debugging line of code for sourceURL. --- .../webapp/WEB-INF/views/exhibition/space.jsp | 132 ++++++++++++------ .../src/main/webapp/resources/extra/Home.css | 30 ++-- 2 files changed, 111 insertions(+), 51 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp index 10e81c797..e8bea27a8 100644 --- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp @@ -8,16 +8,29 @@ + + + + + + +" + rel="stylesheet"> + + + + + + + +
+ + + + +
+
+ +
+ ${message}
+ +
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp index e8bea27a8..768bad188 100644 --- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp @@ -54,7 +54,7 @@ function openSpaceDescription(){ $(window).on("load", function() { let spaceHeight = $("#bgImage").css("height"); - $("#Module_1").css("min-height",spaceHeight); + $("#Module_1").css("height",spaceHeight); $( window ).resize(function() { console.log("In Resize"); $("#space a").remove(); From 6408999fd90e35010623769034348aeed0cb3e20 Mon Sep 17 00:00:00 2001 From: Sagar Khar <44152998+Sagar-k93@users.noreply.github.com> Date: Fri, 19 Jun 2020 15:13:57 -0600 Subject: [PATCH 05/47] [VSPC-96] Updated project for spring security 5.3.3. (#130) Co-authored-by: skhar --- vspace/pom.xml | 2 +- .../authority/SimpleGrantedAuthority.java | 68 +++++++++++++++++++ .../spring/appServlet/servlet-context.xml | 2 +- .../webapp/WEB-INF/spring/root-context.xml | 2 +- 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 vspace/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java diff --git a/vspace/pom.xml b/vspace/pom.xml index c2d9cf2b4..c19bccbea 100644 --- a/vspace/pom.xml +++ b/vspace/pom.xml @@ -12,7 +12,7 @@ 1.7.5 5.0.7.RELEASE Kay-SR8 - 4.1.5.RELEASE + 5.3.3.RELEASE 3.10.1 0.5 admin diff --git a/vspace/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java b/vspace/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java new file mode 100644 index 000000000..4d6c0e701 --- /dev/null +++ b/vspace/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java @@ -0,0 +1,68 @@ +package org.springframework.security.core.authority; +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.util.Assert; + +/** + * Basic concrete implementation of a {@link GrantedAuthority}. + * + *

+ * Stores a {@code String} representation of an authority granted to the + * {@link org.springframework.security.core.Authentication Authentication} object. + * + * @author Luke Taylor + */ +public final class SimpleGrantedAuthority implements GrantedAuthority { + + private static final long serialVersionUID = 410L; + + private final String role; + + public SimpleGrantedAuthority(String role) { + Assert.hasText(role, "A granted authority textual representation is required"); + this.role = role; + } + + @Override + public String getAuthority() { + return role; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + + if (obj instanceof SimpleGrantedAuthority) { + return role.equals(((SimpleGrantedAuthority) obj).role); + } + + return false; + } + + @Override + public int hashCode() { + return this.role.hashCode(); + } + + @Override + public String toString() { + return this.role; + } +} \ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/vspace/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml index c42241463..6da33ba7a 100644 --- a/vspace/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml +++ b/vspace/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.1.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-5.3.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd"> diff --git a/vspace/src/main/webapp/WEB-INF/spring/root-context.xml b/vspace/src/main/webapp/WEB-INF/spring/root-context.xml index dbdaff37a..2a87404a7 100644 --- a/vspace/src/main/webapp/WEB-INF/spring/root-context.xml +++ b/vspace/src/main/webapp/WEB-INF/spring/root-context.xml @@ -11,7 +11,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.1.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-5.3.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd"> From 3b6296cfe4b2e6567eec6bb2768f20a8a88c30e3 Mon Sep 17 00:00:00 2001 From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com> Date: Wed, 24 Jun 2020 13:20:56 -0700 Subject: [PATCH 06/47] Story/VSPC-79 (#131) * [VSPC-79] Changes to delete Space * [VSPC-79] Delete Space Changes * [VSPC-79] Delete linked Modules, External links and spaces * [VSPC-79]Reverting commits * [VSPC-79] Changes to delete Space Links * [VSPC-79] Indentation Fix --- .../vspace/core/data/ExternalLinkDisplayRepository.java | 3 +++ .../core/data/display/ModuleLinkDisplayRepository.java | 3 +++ .../core/data/display/SpaceLinkDisplayRepository.java | 7 +++++-- .../asu/diging/vspace/core/services/impl/LinkManager.java | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java index 8a69a45d7..21da1ee24 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java @@ -7,6 +7,7 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.stereotype.Repository; +import edu.asu.diging.vspace.core.model.IExternalLink; import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay; @Repository @@ -15,4 +16,6 @@ public interface ExternalLinkDisplayRepository extends PagingAndSortingRepositor @Query("SELECT d FROM ExternalLinkDisplay d WHERE d.externalLink.space.id = ?1") public List findExternalLinkDisplaysForSpace(String spaceId); + + public void deleteByExternalLink(IExternalLink link); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/ModuleLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/ModuleLinkDisplayRepository.java index 5e289f521..de3afc123 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/ModuleLinkDisplayRepository.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/ModuleLinkDisplayRepository.java @@ -7,6 +7,7 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.stereotype.Repository; +import edu.asu.diging.vspace.core.model.IModuleLink; import edu.asu.diging.vspace.core.model.display.impl.ModuleLinkDisplay; @Repository @@ -15,4 +16,6 @@ public interface ModuleLinkDisplayRepository extends PagingAndSortingRepository< @Query("SELECT d FROM ModuleLinkDisplay d WHERE d.link.space.id = ?1") public List findModuleLinkDisplaysForSpace(String spaceId); + + public void deleteByLink(IModuleLink link); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SpaceLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SpaceLinkDisplayRepository.java index c5e52304e..bb6608d6a 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SpaceLinkDisplayRepository.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SpaceLinkDisplayRepository.java @@ -7,12 +7,15 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.stereotype.Repository; +import edu.asu.diging.vspace.core.model.ISpaceLink; import edu.asu.diging.vspace.core.model.display.impl.SpaceLinkDisplay; @Repository @JaversSpringDataAuditable public interface SpaceLinkDisplayRepository extends PagingAndSortingRepository { - @Query("SELECT d FROM SpaceLinkDisplay d WHERE d.link.sourceSpace.id = ?1") - public List findSpaceLinkDisplaysForSpace(String spaceId); + @Query("SELECT d FROM SpaceLinkDisplay d WHERE d.link.sourceSpace.id = ?1") + public List findSpaceLinkDisplaysForSpace(String spaceId); + + public void deleteByLink(ISpaceLink space); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java index 04e31d0da..dbd674330 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java @@ -172,6 +172,7 @@ public void deleteSpaceLink(String linkId) { ISpace space = linkOptional.get().getSourceSpace(); ISpaceLink link = linkOptional.get(); space.getSpaceLinks().remove(link); + spaceLinkDisplayRepo.deleteByLink(link); spaceLinkRepo.delete((SpaceLink) link); } @@ -185,6 +186,7 @@ public void deleteModuleLink(String linkId) { ISpace space = linkOptional.get().getSpace(); IModuleLink link = linkOptional.get(); space.getModuleLinks().remove(link); + moduleLinkDisplayRepo.deleteByLink(link); moduleLinkRepo.delete((ModuleLink) link); } @@ -198,6 +200,7 @@ public void deleteExternalLink(String linkId) { ISpace space = linkOptional.get().getSpace(); IExternalLink link = linkOptional.get(); space.getExternalLinks().remove(link); + externalLinkDisplayRepo.deleteByExternalLink(link); externalLinkRepo.delete((ExternalLink) link); } From fa04057a20b4d4d219fb73071ad4389c383f2458 Mon Sep 17 00:00:00 2001 From: Sagar Khar <44152998+Sagar-k93@users.noreply.github.com> Date: Fri, 26 Jun 2020 12:50:40 -0600 Subject: [PATCH 07/47] Story/vspc 71 (#107) * [VSPC-71] Added field 'Mode' on exhibition config page. * [VSPC-71] Added changes to show custom message on UI if site is in different modes. * [VSPC-71] Changes to remove existing message when user chooses offline mode. * [VSPC-71] Setting up AOP for Exhibition view on mode changes. * [VSPC-71] Exhibition only shown if user is logged in or exhibition is active. * [VSPC-71] Added modal when user is logged in and sees exhibition if exhibition is down. * [VSPC-71] Changes to show popup only once in exhibition page. * [VSPC-71] Added new page to redirect public users if exhibition not up. * [VSPC-71] Formatting changes. * [VSPC-71] Made changes to address pr comments. * [VSPC-71] Verified values present before querying them in array. * [VSPC-71] Created new package for all public view related controllers. * [VSPC-71] Removed unnecessary code blocks. * [VSPC-71] Formatting changes. * [VSPC-71] Changes to make mode enum and modemessage to customMessage. * [VSPC-71] Removed getAllValues method from ExhibitionModes enum. * [VSPC-71] Changes to configcontroller to store null if exhibition mode is not offline. * [VSPC-71] Modified customMessage to be retained when mode is changed. * [VSPC-71] Formatting changes in config.jsp * [VSPC-71] Change to show correct message on exhibition page pop up for maintenance mode. * [VSPC-71] Changes to handle nullpointer exception when invalid space is accessed. * [VSPC-71] Formatting changes. * [VSPC-71] Changes to let aspect around public view controller get by passed if not called for space view. * [VSPC-71] Changed aspect to validate for modules and spaces in exhibition. * [VSPC-71] Removed the comments and prints. * [VSPC-71] Added constants for prefixes and divided complex method into parts. * [VSPC-71] Divided functionality into multiple methods in aspect for exhibition. * [VSPC-71] Merged with develop and moved exhibition controllers to publicview package. * [VSPC-71] Added changes based on pr review comments. * [VSPC-71] Indentation changes. * [VSPC-71] Indentation changes. * [VSPC-71] Moved ExhibitionSpaceController to publicview package. * [VSPC-71] Placed the message after pop up back in spaces page. * [VSPC-71] Made changes to exhibition aspect. * [VSPC-71] Changes for naming convention and exhibitionModes. * [VSPC-71] Added comments to aspect methods. * [VSPC-71] Removed the pop up for the exhibition view. * [VSPC-71] Added image for exhibition maintenance page. * [VSPC-71] Made changes as per review comments. * [VSPC-71] To add Exhibition status in dashboard. Co-authored-by: skhar --- .../web/admin/ListUsersController.java | 37 ++++ .../core/aspects/ExhibitionDataAspect.java | 116 ++++++++++- .../vspace/core/model/ExhibitionModes.java | 21 ++ .../asu/diging/vspace/core/model/IPrefix.java | 7 + .../diging/vspace/core/model/IdPrefix.java | 17 ++ .../vspace/core/model/impl/Exhibition.java | 28 ++- .../diging/vspace/core/model/impl/Module.java | 3 +- .../diging/vspace/core/model/impl/Space.java | 183 +++++++++--------- .../services/impl/SpaceDisplayManager.java | 24 ++- .../web/exception/SpaceNotFoundException.java | 2 +- .../ExhibitionModuleController.java | 2 +- .../ExhibitionSequencesController.java | 2 +- .../ExhibitionSlideController.java | 2 +- .../ExhibitionSpaceController.java | 13 +- .../ExhibitionConfigurationController.java | 24 ++- vspace/src/main/webapp/WEB-INF/tiles-defs.xml | 9 + .../webapp/WEB-INF/tiles/skeleton_bt4.jsp | 12 +- .../WEB-INF/views/exhibition/maintenance.jsp | 11 ++ .../WEB-INF/views/exhibition/module.jsp | 2 +- .../WEB-INF/views/exhibition/notFound.jsp | 13 ++ .../webapp/WEB-INF/views/exhibition/space.jsp | 25 ++- .../WEB-INF/views/staff/exhibit/config.jsp | 74 +++++-- .../webapp/WEB-INF/views/staff/users/list.jsp | 4 +- .../resources/maintenance/img/maintenance.png | Bin 0 -> 23330 bytes 24 files changed, 475 insertions(+), 156 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/simpleusers/web/admin/ListUsersController.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/ExhibitionModes.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/IPrefix.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/IdPrefix.java rename vspace/src/main/java/edu/asu/diging/vspace/web/{ => publicview}/ExhibitionModuleController.java (97%) rename vspace/src/main/java/edu/asu/diging/vspace/web/{ => publicview}/ExhibitionSequencesController.java (98%) rename vspace/src/main/java/edu/asu/diging/vspace/web/{ => publicview}/ExhibitionSlideController.java (99%) rename vspace/src/main/java/edu/asu/diging/vspace/web/{ => publicview}/ExhibitionSpaceController.java (81%) create mode 100644 vspace/src/main/webapp/WEB-INF/views/exhibition/maintenance.jsp create mode 100644 vspace/src/main/webapp/WEB-INF/views/exhibition/notFound.jsp create mode 100644 vspace/src/main/webapp/resources/maintenance/img/maintenance.png diff --git a/vspace/src/main/java/edu/asu/diging/simpleusers/web/admin/ListUsersController.java b/vspace/src/main/java/edu/asu/diging/simpleusers/web/admin/ListUsersController.java new file mode 100644 index 000000000..6aca7af06 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/simpleusers/web/admin/ListUsersController.java @@ -0,0 +1,37 @@ +package edu.asu.diging.simpleusers.web.admin; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.AbstractController; + +import edu.asu.diging.simpleusers.core.config.ConfigurationProvider; +import edu.asu.diging.simpleusers.core.service.IUserManager; +import edu.asu.diging.vspace.core.services.IExhibitionManager; + +@Controller +public class ListUsersController extends AbstractController { + + public final static String REQUEST_MAPPING_PATH = "list"; + + @Autowired + private ConfigurationProvider configProvider; + + @Autowired + private IUserManager userManager; + + @Autowired + private IExhibitionManager exhibitionManager; + + @Override + protected ModelAndView handleRequestInternal(HttpServletRequest arg0, HttpServletResponse arg1) throws Exception { + ModelAndView model = new ModelAndView(); + model.addObject("users", userManager.findAll()); + model.addObject("exhibition",exhibitionManager.getStartExhibition()); + model.setViewName(configProvider.getUserListView()); + return model; + } +} 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 1d9117993..3834b9d16 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,19 +1,30 @@ package edu.asu.diging.vspace.core.aspects; - +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import java.util.List; - import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.After; +import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.ui.Model; +import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; - +import edu.asu.diging.vspace.core.auth.impl.AuthenticationFacade; +import edu.asu.diging.vspace.core.model.ExhibitionModes; +import edu.asu.diging.vspace.core.model.IModule; +import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.IdPrefix; +import edu.asu.diging.vspace.core.model.impl.Exhibition; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.services.IExhibitionManager; +import edu.asu.diging.vspace.core.services.IModuleManager; import edu.asu.diging.vspace.core.services.ISpaceManager; @Component @@ -26,6 +37,12 @@ public class ExhibitionDataAspect { @Autowired private ISpaceManager spaceManager; + @Autowired + private IModuleManager moduleManager; + + @Autowired + private AuthenticationFacade authFacade; + @After("execution(public * edu.asu.diging.vspace.web..*Controller.*(..))") public void setExhibition(JoinPoint jp) { Object[] args = jp.getArgs(); @@ -33,10 +50,10 @@ public void setExhibition(JoinPoint jp) { Class returnType = signature.getReturnType(); // only if there is a model object injected and if we're returning a string // (assuming that returning a string implies rendering of a view afterwards - if (args != null && returnType == String.class) { - for (Object obj : args) { - if (obj instanceof Model && !(obj instanceof RedirectAttributes)) { - if (!((Model) obj).containsAttribute("exhibition")) { + if(args!=null && returnType==String.class) { + for(Object obj : args) { + if(obj instanceof Model && !(obj instanceof RedirectAttributes)) { + if(!((Model) obj).containsAttribute("exhibition")) { ((Model) obj).addAttribute("exhibition", exhibitionManager.getStartExhibition()); } if (!((Model) obj).containsAttribute("publishedSpaces")) { @@ -48,7 +65,92 @@ public void setExhibition(JoinPoint jp) { ((Model) obj).addAttribute("publishedSpaces", publishedSpaces); } } + } + } + } + + @Around("execution(public * edu.asu.diging.vspace.web.publicview..*Controller.*(..))") + public Object showExhibition(ProceedingJoinPoint jp) throws Throwable { + Object[] args = jp.getArgs(); + MethodSignature signature = (MethodSignature) jp.getSignature(); + int indexOfModel = (Arrays.asList(signature.getParameterTypes())).indexOf(Model.class); + Exhibition exhibition = (Exhibition) exhibitionManager.getStartExhibition(); + // If there is no exhibition, we go back to root url page. + if(exhibition==null) { + return "redirect:/"; + } + //If no exhibition mode has been setup for existing exhibition, we skip modes and aspects. + if(exhibition.getMode() == null) { + return jp.proceed(); + } + Map ids = getIds(args, signature); + String spaceId = ids.getOrDefault(IdPrefix.SPACEID, ""); + String moduleId = ids.getOrDefault(IdPrefix.MODULEID, ""); + return redirectRequest(jp, spaceId, moduleId, indexOfModel, exhibition); + } + + + /** + * Based on exhibition mode, get the redirect page or pass control to controller. + * @param jp The joinpoint variable, used to fetch request parameters and proceed with the request. + * @param spaceId Current spaceId that is requested to be viewed by user. + * @param moduleId The moduleId that the user has requested to view. + * @param modelIndex Index of the model information in the reuest parameters. + * @param exhibition Current exhibition that is being shown to user. + * @return returns the page to load upon aspect completion. + * @throws Throwable + */ + private Object redirectRequest(ProceedingJoinPoint jp, String spaceId, String moduleId, int modelIndex, Exhibition exhibition) throws Throwable{ + ISpace space = spaceManager.getSpace(spaceId); + IModule module = moduleManager.getModule(moduleId); + Object[] args = jp.getArgs(); + ExhibitionModes exhibitionMode = exhibition.getMode(); + // If exhibition is set to offline, set the custom message or default message. + if(exhibitionMode.equals(ExhibitionModes.OFFLINE)) { + String modeValue = exhibition.getCustomMessage().equals("") == false ? exhibition.getCustomMessage() : exhibitionMode.getValue(); + ((Model) args[modelIndex]).addAttribute("modeValue", modeValue); + } + // If exhibition is set to maintenance, set the default message. + if(exhibitionMode.equals(ExhibitionModes.MAINTENANCE)) { + ((Model) args[modelIndex]).addAttribute("modeValue", exhibitionMode.getValue()); + } + // If user is not logged in and exhibition is not active, show maintenance page. + if(authFacade.getAuthenticatedUser()==null && !exhibitionMode.equals(ExhibitionModes.ACTIVE)) { + return "maintenance"; + } + // If the space and module Id is not found, show message on screen. + if(space==null && module==null) { + return "notFound"; + } + // If user is logged in and exhibition is not active, show exhibition with pop up message. + if(authFacade.getAuthenticatedUser()!=null && !exhibitionMode.equals(ExhibitionModes.ACTIVE)) { + return jp.proceed(); + } + return jp.proceed(); + } + + + /** + * Method to get the space or module id's from the request body. + * @param args The request parameters from the original request. + * @param signature Contains the information about the arguments present in args. + * @return A map with spaceId and moduleId from the request args. + */ + private Map getIds(Object[] args, MethodSignature signature) { + Map res = new HashMap<>(); + for(int i=0; i 2) { + String prefix = ((String) args[i]).substring(0,3); + if(prefix.equalsIgnoreCase(IdPrefix.SPACEID.getValue())) { + res.put(IdPrefix.SPACEID, (String) args[i]); + } + if(prefix.equalsIgnoreCase(IdPrefix.MODULEID.getValue())) { + res.put(IdPrefix.MODULEID, (String) args[i]); + } + } } } + return res; } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ExhibitionModes.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ExhibitionModes.java new file mode 100644 index 000000000..903c67ec9 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ExhibitionModes.java @@ -0,0 +1,21 @@ +package edu.asu.diging.vspace.core.model; + +import java.util.ArrayList; +import java.util.List; + +public enum ExhibitionModes { + + ACTIVE(""), + MAINTENANCE("This exhibition is currently under maintenance. Please check back later."), + OFFLINE("This exhibition is currently offline. Please check back later."); + + private final String value; + + private ExhibitionModes(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IPrefix.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IPrefix.java new file mode 100644 index 000000000..af0dd772b --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IPrefix.java @@ -0,0 +1,7 @@ +package edu.asu.diging.vspace.core.model; + +public interface IPrefix { + + public static String SPACE_PREFIX = "SPA"; + public static String MODULE_PREFIX = "MOD"; +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IdPrefix.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IdPrefix.java new file mode 100644 index 000000000..ece583ce3 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IdPrefix.java @@ -0,0 +1,17 @@ +package edu.asu.diging.vspace.core.model; + +public enum IdPrefix { + + SPACEID(IPrefix.SPACE_PREFIX), + MODULEID(IPrefix.MODULE_PREFIX); + + private final String value; + + private IdPrefix(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} 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 a9886b746..93e548703 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 @@ -1,11 +1,14 @@ package edu.asu.diging.vspace.core.model.impl; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToOne; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; +import edu.asu.diging.vspace.core.model.ExhibitionModes; import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpace; @@ -20,9 +23,7 @@ public class Exhibition extends VSpaceElement implements IExhibition { @Id @GeneratedValue(generator = "exhibit_id_generator") - @GenericGenerator(name = "exhibit_id_generator", - parameters = @Parameter(name = "prefix", value = "EXH"), - strategy = "edu.asu.diging.vspace.core.data.IdGenerator") + @GenericGenerator(name = "exhibit_id_generator", parameters = @Parameter(name = "prefix", value = "EXH"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator") private String id; @OneToOne(targetEntity = Space.class) @@ -30,6 +31,11 @@ public class Exhibition extends VSpaceElement implements IExhibition { private String title; + @Enumerated(EnumType.STRING) + private ExhibitionModes mode; + + private String customMessage; + /* * (non-Javadoc) * @@ -81,5 +87,21 @@ public String getTitle() { public void setTitle(String title) { this.title = title; } + + public ExhibitionModes getMode() { + return mode; + } + + public void setMode(ExhibitionModes mode) { + this.mode = mode; + } + + public String getCustomMessage() { + return customMessage; + } + + public void setCustomMessage(String customMessage) { + this.customMessage = customMessage; + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Module.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Module.java index e1eaa1412..e0e8b73ed 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Module.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Module.java @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import edu.asu.diging.vspace.core.model.IModule; +import edu.asu.diging.vspace.core.model.IPrefix; import edu.asu.diging.vspace.core.model.ISequence; import edu.asu.diging.vspace.core.model.ISlide; @@ -23,7 +24,7 @@ public class Module extends VSpaceElement implements IModule { @Id @GeneratedValue(generator = "module_id_generator") @GenericGenerator(name = "module_id_generator", - parameters = @Parameter(name = "prefix", value = "MOD"), + parameters = @Parameter(name = "prefix", value = IPrefix.MODULE_PREFIX), strategy = "edu.asu.diging.vspace.core.data.IdGenerator") private String id; 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 6204ac646..cc04c88c6 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 @@ -15,6 +15,7 @@ import edu.asu.diging.vspace.core.model.IExternalLink; import edu.asu.diging.vspace.core.model.IModuleLink; +import edu.asu.diging.vspace.core.model.IPrefix; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.ISpaceLink; import edu.asu.diging.vspace.core.model.IVSImage; @@ -22,95 +23,95 @@ @Entity public class Space extends VSpaceElement implements ISpace { - @Id - @GeneratedValue(generator = "space_id_generator") - @GenericGenerator(name = "space_id_generator", - parameters = @Parameter(name = "prefix", value = "SPA"), - strategy = "edu.asu.diging.vspace.core.data.IdGenerator") - private String id; - - @OneToMany(mappedBy="sourceSpace", targetEntity=SpaceLink.class) - private List spaceLinks; - - @OneToMany(mappedBy = "space", targetEntity=ModuleLink.class) - private List moduleLinks; - - @OneToMany(mappedBy = "space", targetEntity=ExternalLink.class) - private List externalLinks; - - @OneToOne(targetEntity=VSImage.class) - @NotFound(action=NotFoundAction.IGNORE) - private IVSImage image; - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getId() - */ - @Override - public String getId() { - return id; - } - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setId(java.lang.String) - */ - @Override - public void setId(String id) { - this.id = id; - } - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getSpaceLinks() - */ - @Override - public List getSpaceLinks() { - return spaceLinks; - } - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setSpaceLinks(java.util.List) - */ - @Override - public void setSpaceLinks(List spaceLinks) { - this.spaceLinks = spaceLinks; - } - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getModuleLinks() - */ - @Override - public List getModuleLinks() { - return moduleLinks; - } - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setModuleLinks(java.util.List) - */ - @Override - public void setModuleLinks(List moduleLinks) { - this.moduleLinks = moduleLinks; - } - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getExternalLinks() - */ - @Override - public List getExternalLinks() { - return externalLinks; - } - - /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setExternalLinks(java.util.List) - */ - @Override - public void setExternalLinks(List externalLinks) { - this.externalLinks = externalLinks; - } - - public IVSImage getImage() { - return image; - } - - public void setImage(IVSImage image) { - this.image = image; - } + @Id + @GeneratedValue(generator = "space_id_generator") + @GenericGenerator(name = "space_id_generator", + parameters = @Parameter(name = "prefix", value = IPrefix.SPACE_PREFIX), + strategy = "edu.asu.diging.vspace.core.data.IdGenerator") + private String id; + + @OneToMany(mappedBy="sourceSpace", targetEntity=SpaceLink.class) + private List spaceLinks; + + @OneToMany(mappedBy = "space", targetEntity=ModuleLink.class) + private List moduleLinks; + + @OneToMany(mappedBy = "space", targetEntity=ExternalLink.class) + private List externalLinks; + + @OneToOne(targetEntity=VSImage.class) + @NotFound(action=NotFoundAction.IGNORE) + private IVSImage image; + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getId() + */ + @Override + public String getId() { + return id; + } + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setId(java.lang.String) + */ + @Override + public void setId(String id) { + this.id = id; + } + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getSpaceLinks() + */ + @Override + public List getSpaceLinks() { + return spaceLinks; + } + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setSpaceLinks(java.util.List) + */ + @Override + public void setSpaceLinks(List spaceLinks) { + this.spaceLinks = spaceLinks; + } + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getModuleLinks() + */ + @Override + public List getModuleLinks() { + return moduleLinks; + } + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setModuleLinks(java.util.List) + */ + @Override + public void setModuleLinks(List moduleLinks) { + this.moduleLinks = moduleLinks; + } + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#getExternalLinks() + */ + @Override + public List getExternalLinks() { + return externalLinks; + } + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.model.impl.ISpacee#setExternalLinks(java.util.List) + */ + @Override + public void setExternalLinks(List externalLinks) { + this.externalLinks = externalLinks; + } + + public IVSImage getImage() { + return image; + } + + public void setImage(IVSImage image) { + this.image = image; + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceDisplayManager.java index 3dac377ac..dfbd398f3 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceDisplayManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceDisplayManager.java @@ -3,12 +3,15 @@ import java.io.IOException; import java.util.List; +import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Service; +import org.springframework.web.servlet.resource.HttpResource; import edu.asu.diging.vspace.core.data.display.SpaceDisplayRepository; import edu.asu.diging.vspace.core.factory.ISpaceDisplayFactory; @@ -54,16 +57,17 @@ public class SpaceDisplayManager implements ISpaceDisplayManager { */ @Override public ISpaceDisplay getBySpace(ISpace space) { - IVSImage image = space.getImage(); + IVSImage image = space!=null ? space.getImage():null; List displays = spaceDisplayRepo.getBySpace(space); - ISpaceDisplay display = displays.isEmpty() ? null : displays.get(0); - if (display == null ) { + ISpaceDisplay display = displays.isEmpty() ? null:displays.get(0); + if(display==null) { display = displayFactory.createSpaceDisplay(); } - if (image != null) { - if (image.getWidth() <= 0 || image.getHeight() <= 0) { + if(image!=null) { + if(image.getWidth()<=0 || image.getHeight()<=0) { try { - ImageData data = imageService.getImageData(storage.getImageContent(image.getId(), image.getFilename())); + ImageData data = imageService + .getImageData(storage.getImageContent(image.getId(), image.getFilename())); image.setWidth(data.getWidth()); image.setHeight(data.getHeight()); } catch (IOException e) { @@ -71,19 +75,19 @@ public ISpaceDisplay getBySpace(ISpace space) { return display; } } - - if (image.getWidth() <= maxBgImageWidth && image.getHeight() <= maxBgImageHeight) { + + if(image.getWidth()<=maxBgImageWidth && image.getHeight()<=maxBgImageHeight) { display.setWidth(image.getWidth()); display.setHeight(image.getHeight()); return display; } - + ImageData data = imageService.getImageDimensions(image, maxBgImageWidth, maxBgImageHeight); display.setHeight(data.getHeight()); display.setWidth(data.getWidth()); spaceDisplayRepo.save((SpaceDisplay) display); } - + return display; } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/exception/SpaceNotFoundException.java b/vspace/src/main/java/edu/asu/diging/vspace/web/exception/SpaceNotFoundException.java index f3adddd32..847ea374a 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/exception/SpaceNotFoundException.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/exception/SpaceNotFoundException.java @@ -8,7 +8,7 @@ public class SpaceNotFoundException extends Exception { private static final long serialVersionUID = 1L; public SpaceNotFoundException(String id) { - super("Space not found"); + super("Space with id "+ id +" not found"); } } \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionModuleController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionModuleController.java similarity index 97% rename from vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionModuleController.java rename to vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionModuleController.java index 115a42e0d..edbdabebb 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionModuleController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionModuleController.java @@ -1,4 +1,4 @@ -package edu.asu.diging.vspace.web; +package edu.asu.diging.vspace.web.publicview; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSequencesController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSequencesController.java similarity index 98% rename from vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSequencesController.java rename to vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSequencesController.java index b42206171..71f3be608 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSequencesController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSequencesController.java @@ -1,4 +1,4 @@ -package edu.asu.diging.vspace.web; +package edu.asu.diging.vspace.web.publicview; import java.util.List; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java similarity index 99% rename from vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSlideController.java rename to vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java index e0a2eeaec..65bb7e2ca 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSlideController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java @@ -1,4 +1,4 @@ -package edu.asu.diging.vspace.web; +package edu.asu.diging.vspace.web.publicview; import java.util.List; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSpaceController.java similarity index 81% rename from vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSpaceController.java rename to vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSpaceController.java index 122461d0d..9cf2584f1 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSpaceController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSpaceController.java @@ -1,4 +1,4 @@ -package edu.asu.diging.vspace.web; +package edu.asu.diging.vspace.web.publicview; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -6,8 +6,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import edu.asu.diging.vspace.core.model.IExhibition; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.impl.SpaceStatus; +import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.ILinkManager; import edu.asu.diging.vspace.core.services.ISpaceDisplayManager; import edu.asu.diging.vspace.core.services.ISpaceManager; @@ -21,16 +23,21 @@ public class ExhibitionSpaceController { @Autowired private ISpaceDisplayManager spaceDisplayManager; + @Autowired + private IExhibitionManager exhibitManager; + @Autowired private ILinkManager linkManager; - @RequestMapping(value="/exhibit/space/{id}") + @RequestMapping(value = "/exhibit/space/{id}") public String space(@PathVariable("id") String id, Model model) { ISpace space = spaceManager.getSpace(id); /* (non-Javadoc) * Below null check is added to accommodate already existing spaces with null space status */ if(space.getSpaceStatus() == null || space.getSpaceStatus().equals(SpaceStatus.PUBLISHED)) { + IExhibition exhibition = exhibitManager.getStartExhibition(); + model.addAttribute("exhibitionConfig", exhibition); model.addAttribute("space", space); model.addAttribute("spaceLinks", linkManager.getSpaceLinkDisplays(id)); model.addAttribute("moduleList", linkManager.getModuleLinkDisplays(id)); @@ -45,4 +52,4 @@ public String space(@PathVariable("id") String id, Model model) { } return "space"; } -} +} \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionConfigurationController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionConfigurationController.java index aaf23c98b..d8e729edd 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionConfigurationController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionConfigurationController.java @@ -1,9 +1,12 @@ package edu.asu.diging.vspace.web.staff; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import javax.servlet.http.HttpServletRequest; +import org.javers.common.collections.Arrays; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -15,6 +18,7 @@ import edu.asu.diging.vspace.core.data.SpaceRepository; import edu.asu.diging.vspace.core.factory.impl.ExhibitionFactory; +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.core.model.impl.Exhibition; @@ -40,12 +44,12 @@ public class ExhibitionConfigurationController { public String showExhibitions(Model model) { // for now we assume there is just one exhibition IExhibition exhibition = exhibitManager.getStartExhibition(); - if (exhibition != null) { + if(exhibition!=null) { model.addAttribute("exhibition", exhibition); } else { model.addAttribute("exhibition", new Exhibition()); } - + model.addAttribute("exhibitionModes", Arrays.asList(ExhibitionModes.values())); model.addAttribute("spacesList", spaceRepo.findAll()); return "staff/exhibit/config"; } @@ -60,26 +64,30 @@ public String showExhibitions(Model model) { */ @RequestMapping(value = "/staff/exhibit/config", method = RequestMethod.POST) public RedirectView createOrUpdateExhibition(HttpServletRequest request, - @RequestParam(required = false, name = "exhibitionParam") String exhibitID, - @RequestParam("spaceParam") String spaceID, @RequestParam("title") String title, RedirectAttributes attributes) - throws IOException { + @RequestParam(required = false, name = "exhibitionParam") String exhibitID, + @RequestParam("spaceParam") String spaceID, @RequestParam("title") String title, + @RequestParam("exhibitMode") ExhibitionModes exhibitMode, + @RequestParam(value = "customMessage", required = false, defaultValue = "") String customMessage, + RedirectAttributes attributes) throws IOException { ISpace startSpace = spaceManager.getSpace(spaceID); Exhibition exhibition; - if (exhibitID == null || exhibitID.isEmpty()) { + if(exhibitID==null || exhibitID.isEmpty()) { exhibition = (Exhibition) exhibitFactory.createExhibition(); } else { exhibition = (Exhibition) exhibitManager.getExhibitionById(exhibitID); } - exhibition.setStartSpace(startSpace); exhibition.setTitle(title); + exhibition.setMode(exhibitMode); + if(exhibitMode.equals(ExhibitionModes.OFFLINE) && !customMessage.equals(ExhibitionModes.OFFLINE.getValue())) { + exhibition.setCustomMessage(customMessage); + } exhibition = (Exhibition) exhibitManager.storeExhibition(exhibition); attributes.addAttribute("alertType", "success"); attributes.addAttribute("message", "Successfully Saved!"); attributes.addAttribute("showAlert", "true"); return new RedirectView(request.getContextPath() + "/staff/exhibit/config"); } - } diff --git a/vspace/src/main/webapp/WEB-INF/tiles-defs.xml b/vspace/src/main/webapp/WEB-INF/tiles-defs.xml index 58f29539e..1989f4a33 100644 --- a/vspace/src/main/webapp/WEB-INF/tiles-defs.xml +++ b/vspace/src/main/webapp/WEB-INF/tiles-defs.xml @@ -66,6 +66,10 @@ + + + + @@ -121,6 +125,11 @@ + + + + + diff --git a/vspace/src/main/webapp/WEB-INF/tiles/skeleton_bt4.jsp b/vspace/src/main/webapp/WEB-INF/tiles/skeleton_bt4.jsp index 07bcd8bf2..56c08b277 100644 --- a/vspace/src/main/webapp/WEB-INF/tiles/skeleton_bt4.jsp +++ b/vspace/src/main/webapp/WEB-INF/tiles/skeleton_bt4.jsp @@ -3,11 +3,9 @@ <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - - - + @@ -52,6 +50,14 @@

- \ No newline at end of file + diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/notFound.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/notFound.jsp new file mode 100644 index 000000000..78e2d2c50 --- /dev/null +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/notFound.jsp @@ -0,0 +1,13 @@ +<%@ page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="sec" + uri="http://www.springframework.org/security/tags"%> + + +
+The space or module could not be found. +
\ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp index 768bad188..a034ec784 100644 --- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp @@ -2,7 +2,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> - "> @@ -56,9 +55,8 @@ $(window).on("load", function() { let spaceHeight = $("#bgImage").css("height"); $("#Module_1").css("height",spaceHeight); $( window ).resize(function() { - console.log("In Resize"); - $("#space a").remove(); - drawLinks(); + $("#space a").remove(); + drawLinks(); }); drawLinks(); }); @@ -70,7 +68,7 @@ function drawLinks() { var posY = $("#space").position().top; var link = $(''); link.attr('href', ''); - + if ("${link.type}" == 'ALERT') { var linkDisplay = $('
From 0d5bdce2d277f7bbdd282a54db2e7aca1a5c0d36 Mon Sep 17 00:00:00 2001 From: Sagar Khar <44152998+Sagar-k93@users.noreply.github.com> Date: Wed, 8 Jul 2020 10:55:18 -0600 Subject: [PATCH 09/47] Story/vspc 81 (#134) * [VSPC-81] Completed the icon resize and icon positioning to center. * [VSPC-81] Icon changes to sequence page. * [VSPC-81] Removed commented code. Co-authored-by: skhar --- vspace/.classpath | 55 ++++++++++-------- .../staff/modules/sequences/sequence.jsp | 56 ++++++++++++------- .../main/webapp/resources/extra/Sequence.css | 8 +++ 3 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 vspace/src/main/webapp/resources/extra/Sequence.css diff --git a/vspace/.classpath b/vspace/.classpath index 08ea4af33..8452cabca 100644 --- a/vspace/.classpath +++ b/vspace/.classpath @@ -1,50 +1,59 @@ - + - - + + - + - - + + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - - + + - + diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/sequences/sequence.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/modules/sequences/sequence.jsp index 1cd4a26bf..b2bb6b43a 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/sequences/sequence.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/sequences/sequence.jsp @@ -3,8 +3,13 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -" rel="stylesheet"> - +" + rel="stylesheet"> +" + rel="stylesheet"> +
  1. -
    -

    Sequence: ${sequence.name}

    -     - - +
    +
    +

    Sequence: ${sequence.name}

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

    Description:

    -
    +
    diff --git a/vspace/src/main/webapp/resources/extra/Sequence.css b/vspace/src/main/webapp/resources/extra/Sequence.css new file mode 100644 index 000000000..37330bd8b --- /dev/null +++ b/vspace/src/main/webapp/resources/extra/Sequence.css @@ -0,0 +1,8 @@ +.loaderAjax { + display: none; + background-color: rgb(255,255,255); + position: fixed; + z-index: 99999; + left: 50%; + top: 50%; +} \ No newline at end of file From dd4fa8ab85522b5acc56dcdd9076b94b4c4155a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 13:00:00 -0400 Subject: [PATCH 10/47] Bump mysql-connector-java from 8.0.11 to 8.0.16 in /vspace (#133) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vspace/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vspace/pom.xml b/vspace/pom.xml index c19bccbea..e4219fb80 100644 --- a/vspace/pom.xml +++ b/vspace/pom.xml @@ -257,7 +257,7 @@ mysql mysql-connector-java - 8.0.11 + 8.0.16 From d9b60952eea7bfc63e22d6c60a8289c4f86d5d46 Mon Sep 17 00:00:00 2001 From: Neehaarika Dasari <37390861+Neehaarika@users.noreply.github.com> Date: Tue, 14 Jul 2020 18:11:13 -0500 Subject: [PATCH 11/47] Story/vspc 25 (#86) * [VSPC-25] Branching Points. * [VSPC-25] Creating branching point. * [VSPC-25] Backend inheritance fixed. * [VSPC-25] Branching Point. * [VSPC-25] Branching point choice selection. * [VSPC-25] DB not getting updated for Choice. * [VSPC-25] Retrieving Choices to front end. * [VSPC-25] backend Issue. * [VSPC-25] Backend db fix. * [VSPC-25] Saving Choice data with Branching Point. * [VSPC-25] Pulling the choices to UI * [VSPC-25] Adding Choice blocks. * [VSPC-25] Choice blocks Display. * [VSPC-25] Done with Add Choice part for Branching Points. * [VSPC-25] BranchingPoints and Choice Blocks completed. * [VSPC-25] minor adjustments. * [VSPC-25] Addressing Comments for first review. * [VSPC-25] Addressing the comments. * [VSPC-25] Addressed comments. * [VSPC-25] Addressing comments. * [VSPC-25] addressing comments and front end changes. * [VSPC-25] Multiple choices to Slide issue - DB * [VSPC-25] DB Issue * [VSPC-25] Test commit * [VSPC-25]Fixing added choice link issue and JSON * [VSPC-25] Changes addressing review comments * [VSPC-25] Defaulting to add all branch choices * [VSPC-25]Cleaning the file for comments and unused imports * [VSPC-25] slide jsp clean up * [VSPC-25] Changes addressing review comments * [VSPC-25] Changes for saving choices and choiceBlocks * [VSPC-25] Changes addressing review comments and edit slide * [VSPC-25] Slide Edit in single icon click * [VSPC-25] Addressing review comments and changes for showAll choices * [VSPC-25] Changes to add selected or all choices to blocks * [VSPC-25] Fixing codefactor related issues * [VSPC-25] Review comment fixes with respect to showsAll flag * [VSPC-25] Removing unwanted code of setting all choices * [VSPC-25] changes to ignore already existing choice links * [VSPC-25] Addressing review comments * [VSPC-25] Addressing review comments * [VSPC-25] Fixing indentation issue * [VSPC-25] Addressing review comments * [VSPC-25] Changes to delete ChoiceBlocks * [VSPC-25] Fixing blank choice content block * [VSPC-25] Fix for loading choices list on adding new block * [VSPC-25] Backend code changes * [VSPC-25] Fixing test case * [VSPC-25] Addressing review comments * [VSPC-25] UI Fixes * [VSPC-25] removing deleteAll to fix build issue * [VSPC-25] Adding reason in a comment for deleteAll on choiceRepo * Update SlideManager.java * Update slide.jsp * [VSPC-25]Disabling submit button if no choice is selected * [VSPC-25] cleaning console log Co-authored-by: Neehaarika Co-authored-by: Neehaarika Co-authored-by: Neehaarika Co-authored-by: Prashant Ravindra Jadhav Co-authored-by: Julia Damerow --- .../vspace/config/PersistenceJPAConfig.java | 2 +- .../data/ChoiceContentBlockRepository.java | 13 + .../core/factory/IChoiceBlockFactory.java | 13 + .../vspace/core/factory/IChoiceFactory.java | 11 + .../vspace/core/factory/ISlideFactory.java | 3 +- .../core/factory/impl/ChoiceBlockFactory.java | 31 ++ .../core/factory/impl/ChoiceFactory.java | 32 ++ .../core/factory/impl/SequenceFactory.java | 4 +- .../core/factory/impl/SlideFactory.java | 30 +- .../core/factory/impl/SpaceFactory.java | 2 +- .../asu/diging/vspace/core/model/IChoice.java | 1 + .../vspace/core/model/IChoiceBlock.java | 15 + .../vspace/core/model/display/SlideType.java | 6 + .../core/model/impl/BranchingPoint.java | 5 +- .../diging/vspace/core/model/impl/Choice.java | 8 +- .../vspace/core/model/impl/ChoiceBlock.java | 48 +++ .../vspace/core/model/impl/Sequence.java | 4 +- .../core/services/IContentBlockManager.java | 7 + .../vspace/core/services/ISlideManager.java | 14 +- .../services/impl/ContentBlockManager.java | 73 +++- .../core/services/impl/ModuleManager.java | 1 + .../core/services/impl/SlideManager.java | 79 +++- .../web/staff/AddChoiceBlockController.java | 33 ++ .../vspace/web/staff/AddSlideController.java | 25 +- .../staff/DeleteChoiceBlockController.java | 38 ++ .../vspace/web/staff/EditSlideController.java | 55 +++ .../vspace/web/staff/SlideController.java | 29 +- .../vspace/web/staff/forms/SlideForm.java | 16 + vspace/src/main/webapp/WEB-INF/tiles-defs.xml | 4 + .../WEB-INF/views/staff/modules/module.jsp | 10 +- .../views/staff/modules/slides/add.jsp | 74 +++- .../views/staff/modules/slides/edit.jsp | 92 +++++ .../views/staff/modules/slides/slide.jsp | 344 ++++++++++++++---- .../webapp/WEB-INF/views/staff/spaces/add.jsp | 2 +- .../services/impl/ChoiceBlockFactoryTest.java | 50 +++ .../core/services/impl/ChoiceFactoryTest.java | 57 +++ .../services/impl/SequenceFactoryTest.java | 2 - 37 files changed, 1105 insertions(+), 128 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/data/ChoiceContentBlockRepository.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceBlockFactory.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceFactory.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactory.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactory.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoiceBlock.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/SlideType.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ChoiceBlock.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteChoiceBlockController.java create mode 100644 vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/edit.jsp create mode 100644 vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ChoiceBlockFactoryTest.java create mode 100644 vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ChoiceFactoryTest.java diff --git a/vspace/src/main/java/edu/asu/diging/vspace/config/PersistenceJPAConfig.java b/vspace/src/main/java/edu/asu/diging/vspace/config/PersistenceJPAConfig.java index 9ebc1d449..61b2616ec 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/config/PersistenceJPAConfig.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/config/PersistenceJPAConfig.java @@ -89,4 +89,4 @@ Properties additionalProperties() { properties.setProperty("hibernate.ejb.naming_strategy", "org.hibernate.cfg.ImprovedNamingStrategy"); return properties; } -} \ No newline at end of file +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ChoiceContentBlockRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ChoiceContentBlockRepository.java new file mode 100644 index 000000000..e005faf49 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ChoiceContentBlockRepository.java @@ -0,0 +1,13 @@ +package edu.asu.diging.vspace.core.data; + +import org.javers.spring.annotation.JaversSpringDataAuditable; +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.stereotype.Repository; + +import edu.asu.diging.vspace.core.model.impl.ChoiceBlock; + +@Repository +@JaversSpringDataAuditable +public interface ChoiceContentBlockRepository extends PagingAndSortingRepository { + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceBlockFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceBlockFactory.java new file mode 100644 index 000000000..83d2138ee --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceBlockFactory.java @@ -0,0 +1,13 @@ +package edu.asu.diging.vspace.core.factory; + +import java.util.List; + +import edu.asu.diging.vspace.core.model.IChoice; +import edu.asu.diging.vspace.core.model.IChoiceBlock; +import edu.asu.diging.vspace.core.model.ISlide; + +public interface IChoiceBlockFactory { + + IChoiceBlock createChoiceBlock(ISlide slide, Integer contentOrder, List choices, boolean showsAll); + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceFactory.java new file mode 100644 index 000000000..b303096ca --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IChoiceFactory.java @@ -0,0 +1,11 @@ +package edu.asu.diging.vspace.core.factory; + +import java.util.List; + +import edu.asu.diging.vspace.core.model.IChoice; + +public interface IChoiceFactory { + + List createChoices(List choices); + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideFactory.java index cf55fb7df..20a865b05 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideFactory.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideFactory.java @@ -2,10 +2,11 @@ import edu.asu.diging.vspace.core.model.IModule; import edu.asu.diging.vspace.core.model.ISlide; +import edu.asu.diging.vspace.core.model.display.SlideType; import edu.asu.diging.vspace.web.staff.forms.SlideForm; public interface ISlideFactory { - ISlide createSlide(IModule modfule, SlideForm form); + ISlide createSlide(IModule module, SlideForm form, SlideType type); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactory.java new file mode 100644 index 000000000..36b5587ef --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactory.java @@ -0,0 +1,31 @@ +package edu.asu.diging.vspace.core.factory.impl; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import edu.asu.diging.vspace.core.factory.IChoiceBlockFactory; +import edu.asu.diging.vspace.core.model.IChoice; +import edu.asu.diging.vspace.core.model.IChoiceBlock; +import edu.asu.diging.vspace.core.model.ISlide; +import edu.asu.diging.vspace.core.model.impl.ChoiceBlock; + +@Service +public class ChoiceBlockFactory implements IChoiceBlockFactory { + + /* (non-Javadoc) + * @see edu.asu.diging.vspace.core.factory.impl.IChoiceBlockFactory#createChoiceBlock(edu.asu.diging.vspace.core.model.impl.ISlide, java.lang.Integer, + * edu.asu.diging.vspace.core.model.impl.IChoice) + */ + @Override + public IChoiceBlock createChoiceBlock(ISlide slide, Integer contentOrder, List choices, boolean showsAll) { + IChoiceBlock choiceBlock = new ChoiceBlock(); + choiceBlock.setSlide(slide); + choiceBlock.setContentOrder(contentOrder); + choiceBlock.setShowsAll(showsAll); + if(!showsAll) { + choiceBlock.setChoices(choices); + } + return choiceBlock; + } +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactory.java new file mode 100644 index 000000000..bfaf49a9d --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactory.java @@ -0,0 +1,32 @@ +package edu.asu.diging.vspace.core.factory.impl; + +import java.util.List; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import edu.asu.diging.vspace.core.factory.IChoiceFactory; +import edu.asu.diging.vspace.core.model.IChoice; +import edu.asu.diging.vspace.core.model.ISequence; +import edu.asu.diging.vspace.core.model.impl.Choice; +import edu.asu.diging.vspace.core.services.ISequenceManager; + +@Service +public class ChoiceFactory implements IChoiceFactory { + + @Autowired + private ISequenceManager sequenceManager; + + /* + * (non-Javadoc) + * + * @see + * edu.asu.diging.vspace.core.factory.impl.IChoiceFactory#createChoices(java.util.List) + */ + @Override + public List createChoices(List sequenceIds) { + List sequences=sequenceIds.stream().map(sequenceId->sequenceManager.getSequence(sequenceId)).collect(Collectors.toList()); + return sequences.stream().map(sequence -> new Choice(sequence)).collect(Collectors.toList()); + } +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SequenceFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SequenceFactory.java index 01cb1836a..ceab01523 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SequenceFactory.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SequenceFactory.java @@ -17,8 +17,8 @@ public class SequenceFactory implements ISequenceFactory{ * (non-Javadoc) * * @see - * edu.asu.diging.vspace.core.factory.impl.IImageFactory#createImage(java.lang. - * String, java.lang.String) + * edu.asu.diging.vspace.core.factory.impl.IImageFactory#createImage(edu.asu.diging.vspace.core.model.IModule, + * edu.asu.diging.vspace.web.staff.forms.SequenceForm, java.util.list) */ @Override public ISequence createSequence(IModule module, SequenceForm sequenceForm, List slides) { diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideFactory.java index 09bc95c1b..139e401cf 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideFactory.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideFactory.java @@ -1,34 +1,50 @@ package edu.asu.diging.vspace.core.factory.impl; import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import edu.asu.diging.vspace.core.factory.IChoiceFactory; import edu.asu.diging.vspace.core.factory.ISlideFactory; +import edu.asu.diging.vspace.core.model.IBranchingPoint; +import edu.asu.diging.vspace.core.model.IChoice; import edu.asu.diging.vspace.core.model.IContentBlock; import edu.asu.diging.vspace.core.model.IModule; import edu.asu.diging.vspace.core.model.ISlide; +import edu.asu.diging.vspace.core.model.display.SlideType; +import edu.asu.diging.vspace.core.model.impl.BranchingPoint; import edu.asu.diging.vspace.core.model.impl.Slide; import edu.asu.diging.vspace.web.staff.forms.SlideForm; @Service public class SlideFactory implements ISlideFactory { + + @Autowired + private IChoiceFactory choiceFactory; /* * (non-Javadoc) * * @see - * edu.asu.diging.vspace.core.factory.impl.ISlideFactory#createSlide(java.lang. - * String, java.lang.String) + * edu.asu.diging.vspace.core.factory.impl.ISlideFactory#createSlide(edu.asu.diging.vspace.core.model.IModule, edu.asu.diging.vspace.web.staff.forms.SlideForm) */ @Override - public ISlide createSlide(IModule module, SlideForm form) { - ISlide slide = new Slide(); + public ISlide createSlide(IModule module, SlideForm form, SlideType type) { - slide.setContents(new ArrayList()); + ISlide slide; + if(type.equals(SlideType.SLIDE)) { + slide = new Slide(); + } else { + slide = new BranchingPoint(); + List choices = choiceFactory.createChoices(form.getChoices()); + ((IBranchingPoint) slide).setChoices(choices); + } slide.setName(form.getName()); slide.setDescription(form.getDescription()); slide.setModule(module); - return slide; - } + slide.setContents(new ArrayList()); + return slide; + } } \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactory.java index 55668ed4f..373769f59 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactory.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactory.java @@ -11,7 +11,7 @@ public class SpaceFactory implements ISpaceFactory { /* (non-Javadoc) - * @see edu.asu.diging.vspace.core.factory.impl.ISpaceFactory#createSpace(edu.asu.diging.vspace.web.staff.forms.SpaceForm, java.lang.String) + * @see edu.asu.diging.vspace.core.factory.impl.ISpaceFactory#createSpace(edu.asu.diging.vspace.web.staff.forms.SpaceForm) */ @Override public ISpace createSpace(SpaceForm form) { diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoice.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoice.java index bcfda0b36..d5eaeb76b 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoice.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoice.java @@ -5,4 +5,5 @@ public interface IChoice extends IVSpaceElement { ISequence getSequence(); void setSequence(ISequence link); + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoiceBlock.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoiceBlock.java new file mode 100644 index 000000000..bb1076ea6 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IChoiceBlock.java @@ -0,0 +1,15 @@ +package edu.asu.diging.vspace.core.model; + +import java.util.List; + +public interface IChoiceBlock extends IContentBlock { + + List getChoices(); + + void setChoices(List choices); + + void setShowsAll(boolean showsAll); + + boolean isShowsAll(); + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/SlideType.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/SlideType.java new file mode 100644 index 000000000..6e0f536cb --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/SlideType.java @@ -0,0 +1,6 @@ +package edu.asu.diging.vspace.core.model.display; + +public enum SlideType { + + SLIDE, BRANCHING_POINT; +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/BranchingPoint.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/BranchingPoint.java index 616b91bda..abfa09311 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/BranchingPoint.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/BranchingPoint.java @@ -2,7 +2,9 @@ import java.util.List; +import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.JoinTable; import javax.persistence.OneToMany; import edu.asu.diging.vspace.core.model.IBranchingPoint; @@ -11,7 +13,8 @@ @Entity public class BranchingPoint extends Slide implements IBranchingPoint { - @OneToMany(targetEntity = Choice.class) + @OneToMany(targetEntity = Choice.class, cascade=CascadeType.ALL) + @JoinTable(name="BP_choices") private List choices; /* diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java index a362fc5c4..2f9cb5e1e 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java @@ -20,10 +20,16 @@ public class Choice extends VSpaceElement implements IChoice { parameters = @Parameter(name = "prefix", value = "CHO"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator") private String id; - + @OneToOne(targetEntity = Sequence.class) private ISequence sequence; + public Choice() {} + + public Choice(ISequence sequence) { + this.sequence=sequence; + } + /* * (non-Javadoc) * diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ChoiceBlock.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ChoiceBlock.java new file mode 100644 index 000000000..24f070e67 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ChoiceBlock.java @@ -0,0 +1,48 @@ +package edu.asu.diging.vspace.core.model.impl; + +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.ManyToMany; + +import edu.asu.diging.vspace.core.model.IChoice; +import edu.asu.diging.vspace.core.model.IChoiceBlock; + +@Entity +public class ChoiceBlock extends ContentBlock implements IChoiceBlock { + + @ManyToMany(targetEntity = Choice.class) + private List choices; + + private boolean showsAll; + + /* + * (non-Javadoc) + * + * @see edu.asu.diging.vspace.core.model.impl.IChoice#getChoices() + */ + @Override + public List getChoices() { + return choices; + } + + /* + * (non-Javadoc) + * + * @see edu.asu.diging.vspace.core.model.impl.IChoice#setChoices(edu.asu.diging.vspace.core.model.impl.IChoice) + */ + @Override + public void setChoices(List choices) { + this.choices = choices; + } + + @Override + public boolean isShowsAll() { + return showsAll; + } + + @Override + public void setShowsAll(boolean showsAll) { + this.showsAll = showsAll; + } +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Sequence.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Sequence.java index d1671779b..d29ea18cd 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Sequence.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Sequence.java @@ -8,7 +8,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; +import javax.persistence.ManyToOne; import javax.persistence.OrderColumn; import org.hibernate.annotations.GenericGenerator; @@ -28,7 +28,7 @@ public class Sequence extends VSpaceElement implements ISequence { strategy = "edu.asu.diging.vspace.core.data.IdGenerator") private String id; - @OneToOne(targetEntity = Module.class) + @ManyToOne(targetEntity = Module.class) private IModule module; @ManyToMany(targetEntity = Slide.class) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java index efad4ec16..f39fbe3aa 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java @@ -4,6 +4,7 @@ import edu.asu.diging.vspace.core.exception.BlockDoesNotExistException; import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException; +import edu.asu.diging.vspace.core.model.IChoiceBlock; import edu.asu.diging.vspace.core.model.IContentBlock; import edu.asu.diging.vspace.core.model.IImageBlock; import edu.asu.diging.vspace.core.model.ITextBlock; @@ -23,13 +24,19 @@ CreationReturnValue createImageBlock(String slideId, byte[] image, String filena void deleteImageBlockById(String blockid) throws BlockDoesNotExistException; + void deleteChoiceBlockById(String blockid) throws BlockDoesNotExistException; + void updateTextBlock(TextBlock textBlock); IImageBlock getImageBlock(String imgBlockId); ITextBlock getTextBlock(String textBlockId); + IChoiceBlock getChoiceBlock(String choiceBlockId); + void updateImageBlock(IImageBlock imageBlock, byte[] image, String filename, Integer contentOrder) throws ImageCouldNotBeStoredException; + IChoiceBlock createChoiceBlock(String slideId, List selectedChoices, Integer contentOrder, boolean showsAll); + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java index a0f3ac83a..b08b27249 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java @@ -1,20 +1,30 @@ package edu.asu.diging.vspace.core.services; +import edu.asu.diging.vspace.core.model.IBranchingPoint; +import edu.asu.diging.vspace.core.model.IModule; +import edu.asu.diging.vspace.core.model.ISlide; +import edu.asu.diging.vspace.core.model.display.SlideType; import java.util.List; -import edu.asu.diging.vspace.core.model.ISlide; import edu.asu.diging.vspace.core.model.impl.Sequence; import edu.asu.diging.vspace.core.model.impl.Slide; +import edu.asu.diging.vspace.core.model.IChoice; import edu.asu.diging.vspace.web.staff.forms.SlideForm; public interface ISlideManager { ISlide getSlide(String slideId); - ISlide createSlide(String moduleId, SlideForm slideForm); + ISlide createSlide(IModule module, SlideForm slideForm, SlideType type); void updateSlide(Slide slide); + IBranchingPoint createBranchingPoint(IModule module, SlideForm slideForm, SlideType type); + + void updateBranchingPoint(IBranchingPoint branchingPoint, List editedChoices); + + IChoice getChoice(String choiceId); + void deleteSlideById(String slideId, String moduleId); List getSlideSequences(String slideId, String moduleId); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java index 412b92381..0a62a9106 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import javax.transaction.Transactional; @@ -11,30 +12,42 @@ import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.stereotype.Service; +import edu.asu.diging.vspace.core.data.ChoiceContentBlockRepository; import edu.asu.diging.vspace.core.data.ImageContentBlockRepository; import edu.asu.diging.vspace.core.data.ImageRepository; import edu.asu.diging.vspace.core.data.TextContentBlockRepository; import edu.asu.diging.vspace.core.exception.BlockDoesNotExistException; import edu.asu.diging.vspace.core.exception.FileStorageException; import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException; +import edu.asu.diging.vspace.core.factory.IChoiceBlockFactory; import edu.asu.diging.vspace.core.factory.IImageBlockFactory; import edu.asu.diging.vspace.core.factory.IImageFactory; import edu.asu.diging.vspace.core.factory.ITextBlockFactory; import edu.asu.diging.vspace.core.file.IStorageEngine; +import edu.asu.diging.vspace.core.model.IChoice; +import edu.asu.diging.vspace.core.model.IChoiceBlock; import edu.asu.diging.vspace.core.model.IContentBlock; import edu.asu.diging.vspace.core.model.IImageBlock; import edu.asu.diging.vspace.core.model.ISlide; import edu.asu.diging.vspace.core.model.ITextBlock; import edu.asu.diging.vspace.core.model.IVSImage; +import edu.asu.diging.vspace.core.model.impl.ChoiceBlock; import edu.asu.diging.vspace.core.model.impl.ImageBlock; import edu.asu.diging.vspace.core.model.impl.TextBlock; import edu.asu.diging.vspace.core.model.impl.VSImage; import edu.asu.diging.vspace.core.services.IContentBlockManager; +import edu.asu.diging.vspace.core.services.ISlideManager; @Transactional @Service public class ContentBlockManager implements IContentBlockManager { + @Autowired + private ISlideManager slideManager; + + @Autowired + private IImageFactory imageFactory; + @Autowired private ITextBlockFactory textBlockFactory; @@ -42,19 +55,19 @@ public class ContentBlockManager implements IContentBlockManager { private IImageBlockFactory imageBlockFactory; @Autowired - private SlideManager slideManager; + private IChoiceBlockFactory choiceBlockFactory; @Autowired - private TextContentBlockRepository textBlockRepo; + private ImageRepository imageRepo; @Autowired - private ImageContentBlockRepository imageBlockRepo; + private TextContentBlockRepository textBlockRepo; @Autowired - private IImageFactory imageFactory; + private ImageContentBlockRepository imageBlockRepo; @Autowired - private ImageRepository imageRepo; + private ChoiceContentBlockRepository choiceBlockRepo; @Autowired private IStorageEngine storage; @@ -74,8 +87,7 @@ public List getAllContentBlocks(String slideId) { /* * (non-Javadoc) * - * @see - * edu.asu.diging.vspace.core.services.impl.IContentBlock#createTextBlock(java. + * @see edu.asu.diging.vspace.core.services.impl.ITextBlock#createTextBlock(java. * lang.String, java.lang.String) */ @Override @@ -177,6 +189,27 @@ public void deleteImageBlockById(String id) throws BlockDoesNotExistException { } + /** + * Delete a choices block using an id + * + * @param id - id of resource to be deleted. If the id is null then the + * functions returns nothing. + * + */ + + @Override + public void deleteChoiceBlockById(String id) throws BlockDoesNotExistException { + if (id == null) { + return; + } + try { + choiceBlockRepo.deleteById(id); + } catch (EmptyResultDataAccessException e) { + throw new BlockDoesNotExistException(e); + } + + } + public void updateTextBlock(TextBlock textBlock) { textBlockRepo.save((TextBlock) textBlock); } @@ -207,4 +240,30 @@ public ITextBlock getTextBlock(String textBlockId) { } return null; } + + @Override + public IChoiceBlock getChoiceBlock(String choiceBlockId) { + Optional choiceBlock = choiceBlockRepo.findById(choiceBlockId); + if (choiceBlock.isPresent()) { + return choiceBlock.get(); + } + return null; + } + + /* + * (non-Javadoc) + * + * @see edu.asu.diging.vspace.core.services.impl.IChoiceBlock#createTextBlock(java. + * lang.String, java.lang.String, java.lang.Integer) + */ + @Override + public IChoiceBlock createChoiceBlock(String slideId, List selectedChoices, Integer contentOrder, boolean showsAll) { + List choices = new ArrayList(); + if(!showsAll) { + choices = selectedChoices.stream().map(choice -> slideManager.getChoice(choice)).collect(Collectors.toList()); + } + IChoiceBlock choiceBlock = choiceBlockFactory.createChoiceBlock(slideManager.getSlide(slideId), contentOrder, choices, showsAll); + return choiceBlockRepo.save((ChoiceBlock)choiceBlock); + } + } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java index 1fd7d5ba1..5d8b6e06d 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java @@ -31,6 +31,7 @@ public class ModuleManager implements IModuleManager { @Autowired private SequenceRepository sequenceRepo; + /* * (non-Javadoc) * diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java index ce2c7e558..12022115f 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java @@ -4,28 +4,36 @@ import java.util.Iterator; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import edu.asu.diging.vspace.core.data.BranchingPointRepository; +import edu.asu.diging.vspace.core.data.ChoiceRepository; import edu.asu.diging.vspace.core.data.SequenceRepository; import edu.asu.diging.vspace.core.data.SlideRepository; +import edu.asu.diging.vspace.core.factory.impl.ChoiceFactory; import edu.asu.diging.vspace.core.factory.impl.SlideFactory; +import edu.asu.diging.vspace.core.model.IBranchingPoint; +import edu.asu.diging.vspace.core.model.IChoice; import edu.asu.diging.vspace.core.model.IModule; import edu.asu.diging.vspace.core.model.ISlide; +import edu.asu.diging.vspace.core.model.display.SlideType; +import edu.asu.diging.vspace.core.model.impl.BranchingPoint; +import edu.asu.diging.vspace.core.model.impl.Choice; import edu.asu.diging.vspace.core.model.impl.Sequence; import edu.asu.diging.vspace.core.model.impl.Slide; import edu.asu.diging.vspace.core.services.ISlideManager; import edu.asu.diging.vspace.web.staff.forms.SlideForm; + @Service public class SlideManager implements ISlideManager { - @Autowired - private ModuleManager moduleManager; - @Autowired private SlideFactory slideFactory; @@ -34,15 +42,49 @@ public class SlideManager implements ISlideManager { @Autowired private SequenceRepository sequenceRepo; - + + @Autowired + private BranchingPointRepository bpointRepo; + + @Autowired + private ChoiceRepository choiceRepo; + + @Autowired + private ChoiceFactory choiceFactory; + private final Logger logger = LoggerFactory.getLogger(getClass()); - + @Override - public ISlide createSlide(String moduleId, SlideForm slideForm) { - IModule module = moduleManager.getModule(moduleId); - ISlide slide = slideFactory.createSlide(module, slideForm); - slideRepo.save((Slide) slide); - return slide; + public ISlide createSlide(IModule module, SlideForm slideForm, SlideType type) { + ISlide slide = slideFactory.createSlide(module, slideForm, type); + return slideRepo.save((Slide) slide); + } + + @Override + public IBranchingPoint createBranchingPoint(IModule module, SlideForm slideForm, SlideType type) { + ISlide branchingPoint = slideFactory.createSlide(module, slideForm, type); + return bpointRepo.save((BranchingPoint) branchingPoint); + } + + @Override + public void updateBranchingPoint(IBranchingPoint branchingPoint, List editedChoiceSequenceIds) { + List existingChoices=branchingPoint.getChoices(); + List existingChoiceSequenceIds=existingChoices.stream().map(choiceSequence -> choiceSequence.getSequence().getId()).collect(Collectors.toList()); + List deletedChoiceSequenceIds = (List) CollectionUtils.subtract(existingChoiceSequenceIds, editedChoiceSequenceIds); + List addedChoiceSequenceIds = (List) CollectionUtils.subtract(editedChoiceSequenceIds,existingChoiceSequenceIds); + List newlyAddedChoices = choiceFactory.createChoices(addedChoiceSequenceIds); + existingChoices.addAll(newlyAddedChoices); + List choicesToDelete = existingChoices.stream().filter(choice -> deletedChoiceSequenceIds.contains(choice.getSequence().getId())).collect(Collectors.toList()); + existingChoices.removeIf(choice -> deletedChoiceSequenceIds.contains(choice.getSequence().getId())); + branchingPoint.setChoices(existingChoices); + bpointRepo.save((BranchingPoint) branchingPoint); + /* + * We did not use deleteAll on choiceRepo as choicesToDelete is a list of IChoice + * and cannot be casted into Choice and objects of other type can also implement IChoice + */ + for(IChoice deletedChoice : choicesToDelete) { + choiceRepo.deleteById(deletedChoice.getId()); + } } @Override @@ -54,6 +96,15 @@ public ISlide getSlide(String slideId) { return null; } + @Override + public IChoice getChoice(String choiceId) { + Optional choice = choiceRepo.findById(choiceId); + if (choice.isPresent()) { + return choice.get(); + } + return null; + } + @Override public void updateSlide(Slide slide) { slideRepo.save((Slide) slide); @@ -61,12 +112,12 @@ public void updateSlide(Slide slide) { @Override public void deleteSlideById(String slideId, String moduleId) { - + if(slideId == null) { logger.error("Slide Id cannot be null."); return; } - + List sequences = sequenceRepo.findSequencesForModule(moduleId); Slide slideObj = (Slide) getSlide(slideId); List slideObjToRemove = new ArrayList<>(); @@ -81,9 +132,9 @@ public void deleteSlideById(String slideId, String moduleId) { } } try { - + slideRepo.delete((Slide) getSlide(slideId)); - + } catch (IllegalArgumentException exception) { logger.error("Unable to delete slide.", exception); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java new file mode 100644 index 000000000..504ba127d --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java @@ -0,0 +1,33 @@ +package edu.asu.diging.vspace.web.staff; + +import java.io.IOException; +import java.util.List; + +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.IChoiceBlock; +import edu.asu.diging.vspace.core.services.IContentBlockManager; + +@Controller +public class AddChoiceBlockController { + + @Autowired + private IContentBlockManager contentBlockManager; + + @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/choice/content", method = RequestMethod.POST) + public ResponseEntity addChoiceBlock(@PathVariable("id") String slideId, + @PathVariable("moduleId") String moduleId, + @RequestParam("contentOrder") Integer contentOrder, @RequestParam("selectedChoices") List selectedChoices, + @RequestParam("showsAll") boolean showsAll) throws IOException { + + IChoiceBlock choiceBlock = contentBlockManager.createChoiceBlock(slideId, selectedChoices, contentOrder, showsAll); + return new ResponseEntity<>(choiceBlock, HttpStatus.OK); + } +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideController.java index 2de8d9bb3..2a9a1536d 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideController.java @@ -10,7 +10,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import edu.asu.diging.vspace.core.model.IBranchingPoint; +import edu.asu.diging.vspace.core.model.IChoiceBlock; +import edu.asu.diging.vspace.core.model.IModule; +import edu.asu.diging.vspace.core.model.display.SlideType; +import edu.asu.diging.vspace.core.services.IContentBlockManager; import edu.asu.diging.vspace.core.services.ISlideManager; +import edu.asu.diging.vspace.core.services.impl.ModuleManager; import edu.asu.diging.vspace.web.staff.forms.SlideForm; @Controller @@ -19,10 +25,18 @@ public class AddSlideController { @Autowired private ISlideManager slideManager; + @Autowired + private ModuleManager moduleManager; + + @Autowired + private IContentBlockManager contentBlockManager; + @RequestMapping(value = "/staff/module/{id}/slide/add", method = RequestMethod.GET) public String showAddSlide(@PathVariable("id") String moduleId, Model model) { model.addAttribute("moduleId", moduleId); model.addAttribute("slide", new SlideForm()); + model.addAttribute("sequences", moduleManager.getModuleSequences(moduleId)); + return "staff/module/slide/add"; } @@ -30,8 +44,15 @@ public String showAddSlide(@PathVariable("id") String moduleId, Model model) { public String addSlide(Model model, @PathVariable("moduleId") String moduleId, @ModelAttribute SlideForm slideForm, Principal principal) { - slideManager.createSlide(moduleId, slideForm); - + IModule module = moduleManager.getModule(moduleId); + SlideType type = slideForm.getType().isEmpty() ? null : SlideType.valueOf(slideForm.getType()); + if(type.equals(SlideType.BRANCHING_POINT)) { + IBranchingPoint branchingPoint = slideManager.createBranchingPoint(module, slideForm, type); + IChoiceBlock choiceBlock = contentBlockManager.createChoiceBlock(branchingPoint.getId(), null, 0, true); + } else { + slideManager.createSlide(module, slideForm, type); + } + return "redirect:/staff/module/{moduleId}"; } } \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteChoiceBlockController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteChoiceBlockController.java new file mode 100644 index 000000000..2a5217232 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteChoiceBlockController.java @@ -0,0 +1,38 @@ +package edu.asu.diging.vspace.web.staff; + +import java.io.IOException; + +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.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import edu.asu.diging.vspace.core.exception.BlockDoesNotExistException; +import edu.asu.diging.vspace.core.services.IContentBlockManager; + +@Controller +public class DeleteChoiceBlockController { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private IContentBlockManager contentBlockManager; + + @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/choiceBlock/{blockId}", method = RequestMethod.DELETE) + public ResponseEntity deleteChoiceBlock(@PathVariable("blockId") String blockId) throws IOException { + try { + contentBlockManager.deleteChoiceBlockById(blockId); + } catch (BlockDoesNotExistException e) { + logger.warn("Choice Block Id does not exist, bad request.", e); + return new ResponseEntity(HttpStatus.BAD_REQUEST); + } + + return new ResponseEntity(HttpStatus.OK); + } + +} \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideController.java index 1c2a65317..145269693 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideController.java @@ -1,17 +1,28 @@ package edu.asu.diging.vspace.web.staff; +import java.util.List; +import java.util.stream.Collectors; + 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.ModelAttribute; 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.factory.IChoiceFactory; +import edu.asu.diging.vspace.core.model.IBranchingPoint; import edu.asu.diging.vspace.core.model.ISlide; +import edu.asu.diging.vspace.core.model.display.SlideType; +import edu.asu.diging.vspace.core.model.impl.BranchingPoint; import edu.asu.diging.vspace.core.model.impl.Slide; import edu.asu.diging.vspace.core.services.ISlideManager; +import edu.asu.diging.vspace.core.services.impl.ModuleManager; +import edu.asu.diging.vspace.web.staff.forms.SlideForm; @Controller public class EditSlideController { @@ -19,6 +30,12 @@ public class EditSlideController { @Autowired private ISlideManager slideManager; + @Autowired + private ModuleManager moduleManager; + + @Autowired + private IChoiceFactory choiceFactory; + @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/edit/description", method = RequestMethod.POST) public ResponseEntity saveDescription(@RequestParam("description") String description, @PathVariable("moduleId") String moduleId, @PathVariable("slideId") String slideId) { @@ -36,4 +53,42 @@ public ResponseEntity saveTitle(@RequestParam("title") String title, slideManager.updateSlide((Slide) slide); return new ResponseEntity(HttpStatus.OK); } + + @RequestMapping(value="/staff/module/{moduleId}/slide/{slideId}/edit", method=RequestMethod.GET) + public String show(Model model, @PathVariable("moduleId") String moduleId, @PathVariable("slideId") String slideId) { + ISlide slide = slideManager.getSlide(slideId); + SlideForm slideForm = new SlideForm(); + slideForm.setName(slide.getName()); + slideForm.setDescription(slide.getDescription()); + if(slide instanceof BranchingPoint) { + slideForm.setType(SlideType.BRANCHING_POINT.toString()); + IBranchingPoint branchingPoint = (IBranchingPoint) slide; + List choices = branchingPoint.getChoices().stream().map(choice -> choice.getSequence().getId()).collect(Collectors.toList()); + slideForm.setChoices(choices); + model.addAttribute("choices", choices); + } + else { + slideForm.setType(SlideType.SLIDE.toString()); + } + model.addAttribute("slideForm", slideForm); + model.addAttribute("slideId", slideId); + model.addAttribute("moduleId", moduleId); + model.addAttribute("sequences", moduleManager.getModuleSequences(moduleId)); + return "staff/module/slide/edit"; + } + + @RequestMapping(value="/staff/module/{moduleId}/slide/{slideId}/edit", method=RequestMethod.POST) + public String save(@ModelAttribute SlideForm slideForm, @PathVariable("moduleId") String moduleId, @PathVariable("slideId") String slideId) { + ISlide slide = slideManager.getSlide(slideId); + slide.setName(slideForm.getName()); + slide.setDescription(slideForm.getDescription()); + SlideType type = slideForm.getType().isEmpty() ? null : SlideType.valueOf(slideForm.getType()); + if(type.equals(SlideType.BRANCHING_POINT)) { + List editedChoices = slideForm.getChoices(); + slideManager.updateBranchingPoint((IBranchingPoint)slide, editedChoices); + } else { + slideManager.updateSlide((Slide)slide); + } + return "redirect:/staff/module/{moduleId}/slide/{slideId}"; + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java index 23301c388..58ef11734 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java @@ -1,16 +1,29 @@ package edu.asu.diging.vspace.web.staff; +import java.security.Principal; +import java.util.List; + import javax.transaction.Transactional; 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.ModelAttribute; 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.model.IBranchingPoint; +import edu.asu.diging.vspace.core.model.IContentBlock; +import edu.asu.diging.vspace.core.model.ISequence; +import edu.asu.diging.vspace.core.model.ISlide; +import edu.asu.diging.vspace.core.model.impl.BranchingPoint; import edu.asu.diging.vspace.core.services.impl.ContentBlockManager; import edu.asu.diging.vspace.core.services.impl.ModuleManager; import edu.asu.diging.vspace.core.services.impl.SlideManager; +import edu.asu.diging.vspace.web.staff.forms.SequenceForm; @Transactional @Controller @@ -27,12 +40,22 @@ public class SlideController { @RequestMapping("/staff/module/{moduleId}/slide/{id}") public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) { - + + ISlide slide = slideManager.getSlide(id); model.addAttribute("module", moduleManager.getModule(moduleId)); - model.addAttribute("slide", slideManager.getSlide(id)); + model.addAttribute("slide", slide); model.addAttribute("slideContents", contentBlockManager.getAllContentBlocks(id)); - + if(slideManager.getSlide(id) instanceof BranchingPoint) { + model.addAttribute("choices", ((IBranchingPoint)slide).getChoices()); + } return "staff/module/slide/contents"; } + + @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/contents", method = RequestMethod.GET) + public ResponseEntity> getAllContentBlocks(Model model, @PathVariable("moduleId") String moduleId, @PathVariable("id") String slideId, @ModelAttribute SequenceForm sequenceForm, + Principal principal) { + List slideContents = contentBlockManager.getAllContentBlocks(slideId); + return new ResponseEntity>(slideContents, HttpStatus.OK); + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SlideForm.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SlideForm.java index f0cf9136c..8632427f6 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SlideForm.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/SlideForm.java @@ -1,9 +1,13 @@ package edu.asu.diging.vspace.web.staff.forms; +import java.util.List; + public class SlideForm { private String name; private String description; + private String type; + private List choices; public String getName() { return name; @@ -17,4 +21,16 @@ public String getDescription() { public void setDescription(String description) { this.description = description; } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public List getChoices() { + return choices; + } + public void setChoices(List choices) { + this.choices = choices; + } } diff --git a/vspace/src/main/webapp/WEB-INF/tiles-defs.xml b/vspace/src/main/webapp/WEB-INF/tiles-defs.xml index 1989f4a33..9f1a18d8d 100644 --- a/vspace/src/main/webapp/WEB-INF/tiles-defs.xml +++ b/vspace/src/main/webapp/WEB-INF/tiles-defs.xml @@ -167,6 +167,10 @@ + + + + diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/module.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/modules/module.jsp index f5d9bae63..8853a1197 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/module.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/module.jsp @@ -26,7 +26,6 @@ function deleteSlide(slideId) { }); } - function checkSlideInSequence(slideId) { $.ajax({ url: "" + slideId + "/sequences" + '?${_csrf.parameterName}=${_csrf.token}', @@ -51,6 +50,10 @@ function checkSlideInSequence(slideId) { $(document).ready(function($) { + $("#addSlideButton").on("click", function(e) { + $("#createSlideAlert").show(); + }); + $("#closeSlide").click(function (){ $("#deleteSlideAlert").data('value', 0); $('#deleteSlideAlert').modal('hide'); @@ -114,7 +117,7 @@ $(document).ready(function($) { + + + + +
    - -
    + +
    - -
    - + +
    \ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/edit.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/edit.jsp new file mode 100644 index 000000000..9963dfb6e --- /dev/null +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/edit.jsp @@ -0,0 +1,92 @@ +<%@ page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +" rel="stylesheet"> + + + + +

    Edit Slide: ${slideForm.name}

    + + + + +
    + + +
    + +
    + + + + + + +
    + + + +
    + + +
    + + +     " class="btn btn-light btn-sm">Cancel + \ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp index a6b3b4d96..8edea60a0 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp @@ -2,6 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> + + + +

    Spaces

    This virtual exhibition @@ -13,14 +20,54 @@ href=""> ${space.name} (Created on ${space.creationDate} by - ${space.createdBy}) " - data-call-on-success="" - data-call-on-error="" - data-toggle="modal" data-target="#confirm-delete">
    2. + ${space.createdBy}) + ', '?${_csrf.parameterName}=${_csrf.token}',$('#headerSpaceValue'))" class="checkSpaceLinkPresent" > + + + - - - \ No newline at end of file + + + + + + diff --git a/vspace/src/main/webapp/resources/extra/space.js b/vspace/src/main/webapp/resources/extra/space.js new file mode 100644 index 000000000..dea7ca84f --- /dev/null +++ b/vspace/src/main/webapp/resources/extra/space.js @@ -0,0 +1,72 @@ +function checkExhibitionStartSpace(baseUrl) { + return $.ajax({ + url: baseUrl + "exhibit/start", + type: 'GET', + cache : false, + contentType : false + }); +} + + +function checkSpaceLinkPresent(spaceId, baseUrl, params, header){ + $('#finalWarning').hide(); + checkExhibitionStartSpace(baseUrl).done(function(value) { + var obj = JSON.parse(value); + if(obj.startSpace == spaceId) { + $('#finalWarning').show(); + $('#exhibitionMessage').show(); + } + else { + $('#exhibitionMessage').hide(); + } + }); + var urlToLoad = baseUrl + "space/list"; + var dataUrl = baseUrl + "space/" +spaceId + params; + + $.ajax({ + url: baseUrl + "spaceLink/" + spaceId + "/spaces" + params, + type: 'GET', + cache : false, + contentType : false, + success: function(data) { + if(data.length > 0){ + header.data('spaceValue', spaceId); + $('#deleteSpace').attr('data-toggle', 'modal'); + $('#deleteSpace').attr('data-target', "#confirm-space-delete"); + $('#deleteSpace').attr('data-url', dataUrl); + $('#deleteSpace').attr('data-record-id', spaceId); + $('#deleteSpace').attr('data-call-on-success', urlToLoad); + $('#deleteSpace').attr('data-call-on-error', urlToLoad); + $('#warningMessage').show(); + $('#finalWarning').show(); + } + else{ + $('#deleteSpace').attr('data-toggle', 'modal'); + $('#deleteSpace').attr('data-target', "#confirm-space-delete"); + $('#deleteSpace').attr('data-url', dataUrl); + $('#deleteSpace').attr('data-record-id', spaceId); + $('#deleteSpace').attr('data-call-on-success', urlToLoad); + $('#deleteSpace').attr('data-call-on-error', urlToLoad); + $('#warningMessage').hide(); + } + $('#confirm-space-delete').modal('show'); + } + }); +} + +function onPageReady(deleteSpace, confirmDelete) { + confirmDelete.on('click', '.btn-ok', function(e) { + var url = deleteSpace.data('url'); + var urlToLoad = deleteSpace.data('call-on-success'); + $.ajax({ + url : url, + type : 'DELETE', + success : function(response) { + window.location.href = urlToLoad; + }, + error : function(errorMessage) { + window.location.href = urlToLoad+"?showAlert=true&alertType=danger&message="+errorMessage.responseText; + } + }); + }); +} \ No newline at end of file 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 3408da14a..18480903a 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 @@ -11,7 +11,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.dao.EmptyResultDataAccessException; import edu.asu.diging.vspace.core.data.ImageRepository; import edu.asu.diging.vspace.core.data.SpaceLinkRepository; @@ -29,9 +28,8 @@ import edu.asu.diging.vspace.core.model.IVSImage; import edu.asu.diging.vspace.core.model.display.ISpaceDisplay; import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay; -import edu.asu.diging.vspace.core.model.impl.Sequence; -import edu.asu.diging.vspace.core.model.impl.Slide; import edu.asu.diging.vspace.core.model.impl.Space; +import edu.asu.diging.vspace.core.model.impl.SpaceLink; import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.model.impl.VSImage; import edu.asu.diging.vspace.core.services.IImageService; @@ -72,17 +70,26 @@ public class SpaceManagerTest { @Mock private ISpaceDisplayFactory spaceDisplayFactory; + @Mock + private ExhibitionManager exhibitionManager; + + @InjectMocks private SpaceManager managerToTest; private final String IMG_FILENAME = "img"; private final String IMG_CONTENT_TYPE = "content/type"; + private String spaceId = "spaceId"; private String spaceId1, spaceId2; + private String spaceLinkId1; + private SpaceLink spaceLink; + @Before public void setUp() { MockitoAnnotations.initMocks(this); spaceId1 = "SPA000000001"; spaceId2 = "SPA000000001"; + spaceLinkId1 = "SPL000000001"; } @@ -116,23 +123,59 @@ public void test_storeSpace_success() throws FileStorageException { Mockito.verify(spaceDisplayRepo).save((SpaceDisplay)spaceDisplay); } - - - @Test(expected = SpaceDoesNotExistException.class) - public void test_deleteSpaceById_whenIdIsNull() throws SpaceDoesNotExistException { - Mockito.doThrow(IllegalArgumentException.class) - .when(spaceRepo).deleteById(null); + @Test + public void test_deleteSpaceById_whenIdIsNull() throws SpaceDoesNotExistException{ managerToTest.deleteSpaceById(null); + Mockito.verify(spaceDisplayRepo, Mockito.never()).deleteBySpaceId(null); + Mockito.verify(spaceRepo, Mockito.never()).deleteById(null); } - @Test(expected = SpaceDoesNotExistException.class) - public void test_deleteSpaceById_forNonExistentId() throws SpaceDoesNotExistException { - String imgId = "imgId"; - Mockito.doThrow(EmptyResultDataAccessException.class) - .when(spaceRepo).deleteById(imgId); - managerToTest.deleteSpaceById(imgId); + @Test + public void test_deleteSpaceById_forNonExistentId() { + managerToTest.deleteSpaceById(spaceId); + Mockito.verify(spaceDisplayRepo).deleteBySpaceId(spaceId); + Mockito.verify(spaceRepo).deleteById(spaceId); } + @Test + public void test_deleteSpaceById_forSuccess() { + managerToTest.deleteSpaceById(spaceId1); + Mockito.verify(spaceDisplayRepo).deleteBySpaceId(spaceId1); + Mockito.verify(spaceRepo).deleteById(spaceId1); + } + + @Test + public void test_deleteSpaceById_whenSpaceHasLinks() { + ISpace space = new Space(); + spaceLink = new SpaceLink(); + space.setId(spaceId2); + spaceLink.setId(spaceLinkId1); + spaceLink.setTargetSpace(space); + Mockito.when(spaceLinkRepo.getLinkedSpaces(spaceId1)).thenReturn(Arrays.asList(spaceLink)); + managerToTest.deleteSpaceById(spaceId1); + Mockito.verify(spaceLinkRepo).deleteBySourceSpaceId(spaceId1); + Mockito.verify(spaceLinkDisplayRepo).deleteBySpaceLinkId(spaceLinkId1); + Mockito.verify(spaceDisplayRepo).deleteBySpaceId(spaceId1); + Mockito.verify(spaceRepo).deleteById(spaceId1); + } + + @Test + public void test_deleteSpaceById_whenLinksToSpace() { + Space space = new Space(); + spaceLink = new SpaceLink(); + space.setId(spaceId1); + spaceLink.setId(spaceLinkId1); + spaceLink.setTargetSpace(space); + Mockito.when(spaceLinkRepo.getLinkedFromSpaces(spaceId1)).thenReturn(Arrays.asList(spaceLink)); + managerToTest.deleteSpaceById(spaceId1); + Assert.assertEquals(spaceLink.getTargetSpace(), null); + Mockito.verify(spaceLinkRepo).deleteBySourceSpaceId(spaceId1); + Mockito.verify(spaceLinkRepo).save(spaceLink); + Mockito.verify(spaceDisplayRepo).deleteBySpaceId(spaceId1); + Mockito.verify(spaceRepo).deleteById(spaceId1); + } + + @Test public void test_getSpacesWithStatus_whenStatusIsNull() throws SpaceDoesNotExistException{ Space space=new Space(); From 84511a077555e2e40ba5b563a998e01fb75e6d81 Mon Sep 17 00:00:00 2001 From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com> Date: Wed, 22 Jul 2020 09:52:23 -0700 Subject: [PATCH 13/47] Story/VSPC-94 (#129) * [VSPC-94] link to startSequence and branch point options * [VSPC-94] Fixing sidebar UI issue * [VSPC-94]cleaning css file * [VSPC-94] choices on public slides * [VSPC-94] null check on initial load * [VSPC-94] fixing indentation * [VSPC-94] Addressing review comments * [VSPC-94] Addressing review comments * [VSPC-94] common styling for tooltip * [VSPC-94]To previous branching point implementation * [VSPC-94]Indentation fix * [VSPC-94]Adding Inner class and paramters BP and choice Id * [VSPC-94] Addressing review comments * [VSPC-94] Addressing review comments * [VSPC-94] Addressing review comments * [VSPC-94] Addressing review comments * [VSPC-94] resolving complex method * [VSPC-94] null check in SequenceController * [VSPC-94] Using String format to generate redirect link * [VSPC-94]using formatter for all the variable in redirect url * [VSPC-94] spaceId to variable in redirect url --- .../core/aspects/ExhibitionDataAspect.java | 9 +- .../core/model/impl/SequenceHistory.java | 51 +++++ .../ExhibitionSequencesController.java | 14 +- .../publicview/ExhibitionSlideController.java | 38 +++- .../WEB-INF/views/exhibition/module.jsp | 192 ++++++++++++------ .../main/webapp/resources/extra/Module_1.css | 58 +++++- .../extra/Module_1___slideshow___1.css | 4 +- 7 files changed, 276 insertions(+), 90 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SequenceHistory.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 3834b9d16..e858148fa 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,27 +1,26 @@ package edu.asu.diging.vspace.core.aspects; import java.util.Arrays; import java.util.HashMap; -import java.util.Map; import java.util.List; +import java.util.Map; + import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.After; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.ui.Model; -import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; + import edu.asu.diging.vspace.core.auth.impl.AuthenticationFacade; import edu.asu.diging.vspace.core.model.ExhibitionModes; import edu.asu.diging.vspace.core.model.IModule; import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.IdPrefix; import edu.asu.diging.vspace.core.model.impl.Exhibition; -import edu.asu.diging.vspace.core.model.ISpace; import edu.asu.diging.vspace.core.model.impl.SpaceStatus; import edu.asu.diging.vspace.core.services.IExhibitionManager; import edu.asu.diging.vspace.core.services.IModuleManager; @@ -140,7 +139,7 @@ private Map getIds(Object[] args, MethodSignature signature) { Map res = new HashMap<>(); for(int i=0; i 2) { + if(args[i] != null && ((String) args[i]).length() > 2) { String prefix = ((String) args[i]).substring(0,3); if(prefix.equalsIgnoreCase(IdPrefix.SPACEID.getValue())) { res.put(IdPrefix.SPACEID, (String) args[i]); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SequenceHistory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SequenceHistory.java new file mode 100644 index 000000000..d3a93155d --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SequenceHistory.java @@ -0,0 +1,51 @@ +package edu.asu.diging.vspace.core.model.impl; + +import java.util.Stack; + +import org.springframework.context.annotation.Scope; +import org.springframework.context.annotation.ScopedProxyMode; +import org.springframework.stereotype.Component; + +@Component +@Scope(value="session", proxyMode = ScopedProxyMode.TARGET_CLASS) +public class SequenceHistory{ + + class SequenceHistoryData{ + String sequenceId; + String branchingPointId; + public SequenceHistoryData(String sequenceId, String branchingPointId) { + this.sequenceId = sequenceId; + this.branchingPointId = branchingPointId; + } + public String getSequenceId() { + return sequenceId; + } + public String getBranchingPointId() { + return branchingPointId; + } + + } + + private Stack sequenceSlideHistory = new Stack<>(); + + public void addToHistory(String choiceId, String branchingPointId) { + sequenceSlideHistory.push(new SequenceHistoryData(choiceId, branchingPointId)); + } + + public boolean hasHistory() { + return !sequenceSlideHistory.isEmpty(); + } + + public void popFromHistory() { + sequenceSlideHistory.pop(); + } + + public String peekBranchingPointId() { + return sequenceSlideHistory.peek().getBranchingPointId(); + } + + public String peekSequenceId() { + return sequenceSlideHistory.peek().getSequenceId(); + } + +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSequencesController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSequencesController.java index 71f3be608..b8dd75708 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSequencesController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSequencesController.java @@ -7,6 +7,7 @@ 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.RequestParam; import edu.asu.diging.vspace.core.model.IModule; import edu.asu.diging.vspace.core.model.ISequence; @@ -34,8 +35,10 @@ public class ExhibitionSequencesController { @RequestMapping(value = "/exhibit/{spaceId}/module/{moduleId}/sequence/{sequenceId}") public String sequence(Model model, @PathVariable("sequenceId") String sequenceId, - @PathVariable("moduleId") String moduleId, @PathVariable("spaceId") String spaceId) - throws ModuleNotFoundException, SequenceNotFoundException, SlidesInSequenceNotFoundException, SpaceNotFoundException { + @PathVariable("moduleId") String moduleId, @PathVariable("spaceId") String spaceId, + @RequestParam(required = false, name="branchingPoint") String branchingPointId, + @RequestParam(required = false, name="previousSequenceId") String previousSequenceId) + throws ModuleNotFoundException, SequenceNotFoundException, SlidesInSequenceNotFoundException, SpaceNotFoundException { ISpace space = spaceManager.getSpace(spaceId); if (space == null) { throw new SpaceNotFoundException(spaceId); @@ -54,12 +57,15 @@ public String sequence(Model model, @PathVariable("sequenceId") String sequenceI if (sequenceExist==null) { throw new SequenceNotFoundException(sequenceId); } - + List slides = sequenceManager.getSequence(sequenceId).getSlides(); if (slides.size() == 0) { throw new SlidesInSequenceNotFoundException(); } String firstSlideId = slides.get(0).getId(); - return "redirect:/exhibit/{spaceId}/module/" + moduleId + "/sequence/" + sequenceId + "/slide/" + firstSlideId; + + return String.format("redirect:/exhibit/%s/module/%s/sequence/%s/slide/%s?branchingPoint=%s&previousSequenceId=%s", + spaceId,moduleId,sequenceId,firstSlideId,(branchingPointId != null ? branchingPointId : ""),(previousSequenceId != null ? previousSequenceId : "")); + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java index 65bb7e2ca..e7dce7ef3 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java @@ -8,12 +8,15 @@ 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.exception.SpaceDoesNotExistException; import edu.asu.diging.vspace.core.model.IModule; import edu.asu.diging.vspace.core.model.ISequence; import edu.asu.diging.vspace.core.model.ISlide; import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.impl.BranchingPoint; +import edu.asu.diging.vspace.core.model.impl.SequenceHistory; import edu.asu.diging.vspace.core.services.IModuleManager; import edu.asu.diging.vspace.core.services.ISequenceManager; import edu.asu.diging.vspace.core.services.ISpaceManager; @@ -39,12 +42,18 @@ public class ExhibitionSlideController { @Autowired private ISpaceManager spaceManager; + @Autowired + private SequenceHistory sequenceHistory; + @RequestMapping(value = "/exhibit/{spaceId}/module/{moduleId}/sequence/{sequenceId}/slide/{slideId}", method = RequestMethod.GET) public String slide(Model model, @PathVariable("slideId") String slideId, @PathVariable("moduleId") String moduleId, - @PathVariable("sequenceId") String sequenceId, @PathVariable("spaceId") String spaceId) - throws ModuleNotFoundException, SequenceNotFoundException, - SlidesInSequenceNotFoundException, SlideNotFoundException, SpaceDoesNotExistException, - SpaceNotFoundException { + @PathVariable("sequenceId") String sequenceId, @PathVariable("spaceId") String spaceId, + @RequestParam(required=false, name="back") boolean back, + @RequestParam(required = false, name="branchingPoint") String branchingPointId, + @RequestParam(required = false, name="previousSequenceId") String previousSequenceId) + throws ModuleNotFoundException, SequenceNotFoundException, + SlidesInSequenceNotFoundException, SlideNotFoundException, SpaceDoesNotExistException, + SpaceNotFoundException { ISpace space = spaceManager.getSpace(spaceId); if (space == null) { @@ -79,8 +88,8 @@ public String slide(Model model, @PathVariable("slideId") String slideId, @PathV model.addAttribute("firstSlide", module.getStartSequence().getSlides().get(0).getId()); String nextSlideId = ""; String prevSlideId = ""; - int slideIndex = 0; - slideIndex = sequenceSlides.indexOf(sildeManager.getSlide(slideId)); + ISlide currentSlide = sildeManager.getSlide(slideId); + int slideIndex = sequenceSlides.indexOf(currentSlide); int slideSize = sequenceSlides.size(); if (slideSize > slideIndex + 1) { nextSlideId = sequenceSlides.get(slideIndex + 1).getId(); @@ -88,12 +97,27 @@ public String slide(Model model, @PathVariable("slideId") String slideId, @PathV if (slideIndex > 0) { prevSlideId = sequenceSlides.get(slideIndex - 1).getId(); } + model.addAttribute("sequences",moduleManager.getModuleSequences(moduleId)); model.addAttribute("sequence",sequenceExist); model.addAttribute("slides", sequenceSlides); model.addAttribute("currentSequenceId", sequenceId); model.addAttribute("nextSlide", nextSlideId); model.addAttribute("prevSlide", prevSlideId); - model.addAttribute("currentSlideCon", sildeManager.getSlide(slideId)); + model.addAttribute("currentSlideCon", currentSlide); + if(currentSlide instanceof BranchingPoint) { + model.addAttribute("choices", ((BranchingPoint)currentSlide).getChoices()); + if(back && sequenceHistory.peekBranchingPointId().equalsIgnoreCase(slideId)) { + sequenceHistory.popFromHistory(); + } + } + if(branchingPointId!=null && !branchingPointId.isEmpty()){ + sequenceHistory.addToHistory(previousSequenceId,branchingPointId); + } + if(sequenceHistory.hasHistory()) { + model.addAttribute("showBackToPreviousChoice", true); + model.addAttribute("previousSequenceId", sequenceHistory.peekSequenceId()); + model.addAttribute("previousBranchingPointId", sequenceHistory.peekBranchingPointId()); + } model.addAttribute("numOfSlides", sequenceSlides.size()); model.addAttribute("currentNumOfSlide", slideIndex + 1); model.addAttribute("spaceId", spaceId); diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp index a33f48604..ea1068447 100644 --- a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp @@ -28,87 +28,147 @@ body { function closeLangNav() { document.getElementById("myLangSidenav").style.width = "0"; } + function openNav(){ + document.getElementById("mySidenav").style.width = "170px"; + document.getElementById("mySidenav").style.height = "700px"; + } + function closeNav(){ + document.getElementById("mySidenav").style.width = "0px"; + } - -
    - -
    -

    ${module.name}

    -
    -
    -

    Slide ${currentNumOfSlide}/${numOfSlides}

    -
    -
    - - "> -
    - +
    + +
    +

    ${module.name}

    +
    +
    +

    Slide ${currentNumOfSlide}/${numOfSlides}

    +
    +
    + + "> +
    + + class="Ellipse_11_Class" rx="20" ry="20" + cx="20" cy="20"> - + + class="Icon_ionic_ios_arrow_back_Class" + d="M 17.28610038757324 23.69940376281738 L 30.53693389892578 10.45899486541748 C 31.51693534851074 9.478996276855469 31.51693534851074 7.894316673278809 30.53693389892578 6.92474365234375 C 29.55693244934082 5.944746017456055 27.97225761413574 5.95517110824585 26.99225997924805 6.92474365234375 L 11.9795093536377 21.92706680297852 C 11.03078651428223 22.87578582763672 11.00993728637695 24.39791297912598 11.90652942657471 25.3779125213623 L 26.98183441162109 40.48448944091797 C 27.47183418273926 40.97449111938477 28.11821746826172 41.21427917480469 28.75417137145996 41.21427917480469 C 29.39012908935547 41.21427917480469 30.0365104675293 40.97449111938477 30.52651405334473 40.48448944091797 C 31.50650978088379 39.50448989868164 31.50650978088379 37.91981506347656 30.52651405334473 36.95023727416992 L 17.28610038757324 23.69940376281738 Z"> -
    -     - - - "> -
    - +
    +     +     + + "> +
    + + class="Ellipse_12_Class" rx="20" ry="20" + cx="20" cy="20"> - + + class="Icon_ionic_ios_arrow_forward_Class" + d="M 25.23231887817383 23.69813346862793 L 11.98148345947266 10.45771980285645 C 11.00148582458496 9.47772216796875 11.00148582458496 7.893041610717773 11.98148345947266 6.923468589782715 C 12.96148300170898 5.953895568847656 14.54616165161133 5.953895092010498 15.52616119384766 6.923468589782715 L 30.53891181945801 21.92579460144043 C 31.48763275146484 22.8745174407959 31.50848388671875 24.39664649963379 30.61189270019531 25.37664222717285 L 15.53658676147461 40.48322677612305 C 15.04658699035645 40.97322463989258 14.40020561218262 41.2130126953125 13.76424789428711 41.2130126953125 C 13.1282901763916 41.2130126953125 12.48190879821777 40.97322463989258 11.99190902709961 40.48322677612305 C 11.0119104385376 39.50322723388672 11.0119104385376 37.91854858398438 11.99190902709961 36.948974609375 L 25.23231887817383 23.69813346862793 Z"> -
    -     -     -
    - "> -
    - +
    +     + +
    + "> +
    + + class="Ellipse_5_be_Class" rx="22" ry="22" + cx="22" cy="22"> - -
    -     -
    -

    ${currentSlideCon.name}

    - - - " /> - - -
    -

    ${contents.text}

    -
    -     -     + + Go To Space +
    + + "> +
    + + + + + + Go To Start Sequence of Module +
    +     + + "> +
    + + + + + + Go To Previous Branching Choice
    +     -
    - +
    +

    ${currentSlideCon.name}

    + + + " /> + + +
    +

    ${contents.text}

    +
    +     + + + +     +
    +     +
    diff --git a/vspace/src/main/webapp/resources/extra/Module_1.css b/vspace/src/main/webapp/resources/extra/Module_1.css index 4635fc38c..96d119cc5 100644 --- a/vspace/src/main/webapp/resources/extra/Module_1.css +++ b/vspace/src/main/webapp/resources/extra/Module_1.css @@ -85,17 +85,16 @@ a, a:hover, a:focus { } .sidenav { - height: 1000px;; width: 0; position: absolute; z-index: 1; - top: 0; - left: 0; + top: -4px; + left: 0px; overflow-x: hidden; background: #fff; transition: 0.5s; box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.19); - padding-top: 60px; + padding-top: 26px; word-break: break-all; } @@ -109,7 +108,7 @@ a, a:hover, a:focus { .sidenav .closebtn { position: absolute; - top: 0; + top: 8px; right: 3px; margin-left: 50px; } @@ -117,6 +116,7 @@ a, a:hover, a:focus { .sidenav .dropdown-item { padding: 0px; } + .barPosition { position: absolute; color: dimgrey; @@ -158,7 +158,27 @@ a, a:hover, a:focus { width: 50px; height: 44px; left: 4%; - top: 28%; + top: 30%; + overflow: visible; + cursor: pointer; +} + +.exit_to_branchingPoint_Class { + position: absolute; + width: 50px; + height: 44px; + left: 4%; + top: 40%; + overflow: visible; + cursor: pointer; +} + +.exit_to_previousChoice_Class { + position: absolute; + width: 50px; + height: 44px; + left: 4%; + top: 50%; overflow: visible; cursor: pointer; } @@ -207,4 +227,30 @@ a, a:hover, a:focus { [class*="exit_to_space_Class"] { top: 45%; } +} + +.tooltiptext { + visibility: hidden; + width: 120px; + color: white; + text-align: center; + font-size: 12px padding: 3px 0; + border-radius: 6px; + position: absolute; + z-index: 1; + left: -38px; + top: 46px; + background: rgba(0, 0, 0, 0.6); +} + +.exit_to_space_Class:hover .tooltiptext { + visibility: visible; +} + +.exit_to_branchingPoint_Class:hover .tooltiptext { + visibility: visible; +} + +.exit_to_previousChoice_Class:hover .tooltiptext { + visibility: visible; } \ No newline at end of file diff --git a/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css b/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css index 0c77de951..5c460b289 100644 --- a/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css +++ b/vspace/src/main/webapp/resources/extra/Module_1___slideshow___1.css @@ -81,8 +81,8 @@ filter: drop-shadow(3px 3px 20px rgba(0, 0, 0, 0.251)); position: absolute; overflow: visible; - width: 104px; - height: 104px; + width: 45px; + height: 45px; left: 0px; top: 0px; } From 23ed51d196692262a78c9b32ef8e0559c2e0e11d Mon Sep 17 00:00:00 2001 From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com> Date: Thu, 23 Jul 2020 13:35:11 -0700 Subject: [PATCH 14/47] Story/VSPC-101 (#136) * [VSPC-101] Fixing general issue while choiceBlock creation * [VSPC-101] Fix for showing sequences * [VSPC-101] Fix for distorted content order * [VSPC-101]Fixing indentation * [VSPC-101] Addressing review comments * [VSPC-92] Removing console log --- .../diging/vspace/core/model/impl/Choice.java | 3 +++ .../web/staff/AddChoiceBlockController.java | 17 +++++++++++++++-- .../vspace/web/staff/SlideController.java | 9 +++++---- .../views/staff/modules/slides/slide.jsp | 14 +++++++------- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java index 2f9cb5e1e..e3370faa9 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Choice.java @@ -8,6 +8,8 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; +import com.fasterxml.jackson.annotation.JsonIgnore; + import edu.asu.diging.vspace.core.model.IChoice; import edu.asu.diging.vspace.core.model.ISequence; @@ -21,6 +23,7 @@ public class Choice extends VSpaceElement implements IChoice { strategy = "edu.asu.diging.vspace.core.data.IdGenerator") private String id; + @JsonIgnore @OneToOne(targetEntity = Sequence.class) private ISequence sequence; diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java index 504ba127d..dfb84d2ae 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddChoiceBlockController.java @@ -1,7 +1,10 @@ package edu.asu.diging.vspace.web.staff; import java.io.IOException; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam; import edu.asu.diging.vspace.core.model.IChoiceBlock; +import edu.asu.diging.vspace.core.model.ISequence; import edu.asu.diging.vspace.core.services.IContentBlockManager; @Controller @@ -22,12 +26,21 @@ public class AddChoiceBlockController { private IContentBlockManager contentBlockManager; @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/choice/content", method = RequestMethod.POST) - public ResponseEntity addChoiceBlock(@PathVariable("id") String slideId, + public ResponseEntity> addChoiceBlock(@PathVariable("id") String slideId, @PathVariable("moduleId") String moduleId, @RequestParam("contentOrder") Integer contentOrder, @RequestParam("selectedChoices") List selectedChoices, @RequestParam("showsAll") boolean showsAll) throws IOException { IChoiceBlock choiceBlock = contentBlockManager.createChoiceBlock(slideId, selectedChoices, contentOrder, showsAll); - return new ResponseEntity<>(choiceBlock, HttpStatus.OK); + /*After annotating sequence attribute with JsonIgnore in Choice model to fix stack overflow issue + * the sequences are not returned as part of choiceBlock object, hence sequences are explicitly passed + * as part of Response in a list form*/ + Map responseData = new HashMap(); + responseData.put("choiceBlock",choiceBlock); + if(!choiceBlock.isShowsAll()) { + List selectedSequences = choiceBlock.getChoices().stream().map(choice->choice.getSequence()).collect(Collectors.toList()); + responseData.put("selectedSequences",selectedSequences); + } + return new ResponseEntity<>(responseData, HttpStatus.OK); } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java index 58ef11734..ec2e70699 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java @@ -17,7 +17,6 @@ import edu.asu.diging.vspace.core.model.IBranchingPoint; import edu.asu.diging.vspace.core.model.IContentBlock; -import edu.asu.diging.vspace.core.model.ISequence; import edu.asu.diging.vspace.core.model.ISlide; import edu.asu.diging.vspace.core.model.impl.BranchingPoint; import edu.asu.diging.vspace.core.services.impl.ContentBlockManager; @@ -40,17 +39,19 @@ public class SlideController { @RequestMapping("/staff/module/{moduleId}/slide/{id}") public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) { - + ISlide slide = slideManager.getSlide(id); model.addAttribute("module", moduleManager.getModule(moduleId)); model.addAttribute("slide", slide); - model.addAttribute("slideContents", contentBlockManager.getAllContentBlocks(id)); + List slideContents = contentBlockManager.getAllContentBlocks(id); + model.addAttribute("slideContents", slideContents); + model.addAttribute("contentCount",slideContents.size()>0 ? slideContents.get(slideContents.size()-1).getContentOrder() : 0); if(slideManager.getSlide(id) instanceof BranchingPoint) { model.addAttribute("choices", ((IBranchingPoint)slide).getChoices()); } return "staff/module/slide/contents"; } - + @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/contents", method = RequestMethod.GET) public ResponseEntity> getAllContentBlocks(Model model, @PathVariable("moduleId") String moduleId, @PathVariable("id") String slideId, @ModelAttribute SequenceForm sequenceForm, Principal principal) { diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp index 8edea60a0..563fa8260 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.jsp @@ -5,7 +5,7 @@ @@ -32,11 +33,11 @@ $( document ).ready(function() { var link; if ("${link.type}" == "ALERT") { - link = $(''); + link = $(''); } else if ("${link.type}" == "IMAGE" && "${link.image.id}" != "") { - link = $('" />'); + link = $('" />'); } else { - link = $('

    ${link.link.name}

    '); + link = $('

    ${link.link.name}

    '); } link.css('position', 'absolute'); link.css('left', ${link.positionX} + posX); @@ -45,10 +46,31 @@ $( document ).ready(function() { link.find("span").css('fill', 'red'); link.css('color', 'red'); link.css('font-size', "10px"); - + var inputRotation = document.createElement("input"); + inputRotation.setAttribute("type", "hidden"); + inputRotation.setAttribute("id", "spaceLinkRotation-${link.link.id}"); + inputRotation.setAttribute("value", "${link.rotation}"); + var inputLabel = document.createElement("input"); + inputLabel.setAttribute("type", "hidden"); + inputLabel.setAttribute("id", "spaceLinkLabel-${link.link.id}"); + inputLabel.setAttribute("value", "${link.link.name}"); + var inputType = document.createElement("input"); + inputType.setAttribute("type", "hidden"); + inputType.setAttribute("id", "spaceLinkType-${link.link.id}"); + inputType.setAttribute("value", "${link.type}"); + var inputLinkedSpace = document.createElement("input"); + inputLinkedSpace.setAttribute("type", "hidden"); + inputLinkedSpace.setAttribute("id", "spaceLinkTarget-${link.link.id}"); + inputLinkedSpace.setAttribute("value", "${link.link.targetSpace.id}"); + + //append to form element that you want . + $("#space").append(inputRotation); + $("#space").append(inputLabel); + $("#space").append(inputType); + $("#space").append(inputLinkedSpace); $("#space").append(link); - $(".label-${loop.index}").css({ + $(".slabel-${link.link.id}").css({ 'transform': 'rotate(0deg)', 'left': ${link.positionX} + posX - 10, 'top': ${link.positionY} + posY + 16, @@ -57,7 +79,11 @@ $( document ).ready(function() { $('[data-link-id="${link.link.id}"]').css('cursor', 'pointer'); $('[data-link-id="${link.link.id}"]').click(function(e) { - makeSpaceLinksEditable("${link.link.name}", "${link.link.id}"); + var rotation = document.getElementById("spaceLinkRotation-${link.link.id}").value; + var label = document.getElementById("spaceLinkLabel-${link.link.id}").value; + var type = document.getElementById("spaceLinkType-${link.link.id}").value; + var targetSpace = document.getElementById("spaceLinkTarget-${link.link.id}").value; + makeSpaceLinksEditable(label, "${link.link.id}", rotation ,targetSpace,"${link.positionX}","${link.positionY}","${link.id}",type); }); } @@ -68,11 +94,11 @@ $( document ).ready(function() { var posX = $("#bgImage").position().left; var posY = $("#bgImage").position().top; if ("${link.type}" == "ALERT") { - link = $(''); + link = $(''); } else if ("${link.type}" == "IMAGE" && "${link.image.id}" != "") { - link = $('" />'); + link = $('" />'); } else { - link = $('

    ${link.link.name}

    '); + link = $('

    ${link.link.name}

    '); } link.css('position', 'absolute'); link.css('left', ${link.positionX} + posX); @@ -82,9 +108,30 @@ $( document ).ready(function() { link.css('color', 'red'); link.css('font-size', "10px"); + var inputRotation = document.createElement("input"); + inputRotation.setAttribute("type", "hidden"); + inputRotation.setAttribute("id", "moduleLinkRotation-${link.link.id}"); + inputRotation.setAttribute("value", "${link.rotation}"); + var inputLabel = document.createElement("input"); + inputLabel.setAttribute("type", "hidden"); + inputLabel.setAttribute("id", "moduleLinkLabel-${link.link.id}"); + inputLabel.setAttribute("value", "${link.link.name}"); + var inputType = document.createElement("input"); + inputType.setAttribute("type", "hidden"); + inputType.setAttribute("id", "moduleLinkType-${link.link.id}"); + inputType.setAttribute("value", "${link.type}"); + var inputLinkedSpace = document.createElement("input"); + inputLinkedSpace.setAttribute("type", "hidden"); + inputLinkedSpace.setAttribute("id", "moduleLinkTarget-${link.link.id}"); + inputLinkedSpace.setAttribute("value", "${link.link.module.id}"); + + $("#space").append(inputRotation); + $("#space").append(inputLabel); + $("#space").append(inputType); + $("#space").append(inputLinkedSpace); $("#space").append(link); - $(".mlabel-${loop.index}").css({ + $(".mlabel-${link.link.id}").css({ 'transform': 'rotate(0deg)', 'left': ${link.positionX} + posX - 10, 'top': ${link.positionY} + posY + 16, @@ -93,7 +140,11 @@ $( document ).ready(function() { $('[data-link-id="${link.link.id}"]').css('cursor', 'pointer'); $('[data-link-id="${link.link.id}"]').click(function(e) { - makeModuleLinksEditable("${link.link.name}", "${link.link.id}"); + var rotation = document.getElementById("moduleLinkRotation-${link.link.id}").value; + var label = document.getElementById("moduleLinkLabel-${link.link.id}").value; + var type = document.getElementById("moduleLinkType-${link.link.id}").value; + var targetModule = document.getElementById("moduleLinkTarget-${link.link.id}").value; + makeModuleLinksEditable(label, "${link.link.id}",rotation,targetModule,"${link.positionX}","${link.positionY}","${link.id}", type); }); } @@ -104,9 +155,9 @@ $( document ).ready(function() { var posY = $("#bgImage").position().top; var link ; if ("${link.type}" == "IMAGE" && "${link.image.id}" != "") { - link = $('" />'); + link = $('" />'); } else { - link = $('

    ${link.externalLink.name}

    '); + link = $('

    ${link.externalLink.name}

    '); } link.css('position', 'absolute'); link.css('left', ${link.positionX} + posX); @@ -114,9 +165,25 @@ $( document ).ready(function() { link.css('color', 'blue'); link.css('font-size', "12px"); + var inputLabel = document.createElement("input"); + inputLabel.setAttribute("type", "hidden"); + inputLabel.setAttribute("id", "externalLinkLabel-${link.externalLink.id}"); + inputLabel.setAttribute("value", "${link.externalLink.name}"); + var inputType = document.createElement("input"); + inputType.setAttribute("type", "hidden"); + inputType.setAttribute("id", "externalLinkType-${link.externalLink.id}"); + inputType.setAttribute("value", "${link.type}"); + var inputExternalLinkURL = document.createElement("input"); + inputExternalLinkURL.setAttribute("type", "hidden"); + inputExternalLinkURL.setAttribute("id", "externalLinkTarget-${link.externalLink.id}"); + inputExternalLinkURL.setAttribute("value", "${link.externalLink.externalLink}"); + + $("#space").append(inputLabel); + $("#space").append(inputType); + $("#space").append(inputExternalLinkURL); $("#space").append(link); - $("#label-${loop.index}").css({ + $(".elabel-${link.externalLink.id}").css({ 'transform': 'rotate(0deg)', 'left': ${link.positionX} + posX - 10, 'top': ${link.positionY} + posY + 16, @@ -125,10 +192,13 @@ $( document ).ready(function() { $('[data-link-id="${link.externalLink.id}"]').css('cursor', 'pointer'); $('[data-link-id="${link.externalLink.id}"]').click(function(e) { - makeExternalLinksEditable("${link.externalLink.name}", "${link.externalLink.id}"); + var label = document.getElementById("externalLinkLabel-${link.externalLink.id}").value; + var type = document.getElementById("externalLinkType-${link.externalLink.id}").value; + var targetLink = document.getElementById("externalLinkTarget-${link.externalLink.id}").value; + makeExternalLinksEditable(label,"${link.externalLink.id}",targetLink,"${link.positionX}","${link.positionY}","${link.id}",type); }); } - + // --------- draggable modals ----------- $("#createSpaceLinkAlert").draggable(); @@ -137,14 +207,16 @@ $( document ).ready(function() { $("#createExternalLinkAlert").draggable(); $("#changeBgImgAlert").draggable(); - $("#spaceLinkInfo").draggable(); - $("#externalLinkInfo").draggable(); - $("#moduleLinkInfo").draggable(); - + $("#editModuleLinkInfo").draggable(); + $("#editSpaceLinkInfo").draggable(); + $("#editExternalLinkInfo").draggable(); // store where a user clicked on an image var storeX; var storeY; + var selectedModuleLinkId; + var selectedSpaceLinkId; + var selectedExternalLinkId; // -------- buttons that open modals (e.g. to create space links) ------ $("#addSpaceLinkButton").click(function(e) { @@ -164,6 +236,7 @@ $( document ).ready(function() { showSpaceLink(createSpaceLinkInfo()); }); + hideLinkInfoTabs(); $("#createSpaceLinkAlert").show(); }); @@ -183,6 +256,7 @@ $( document ).ready(function() { showModuleLink(createModuleLinkInfo()); }); + hideLinkInfoTabs(); $("#createModuleLinkAlert").show(); }); @@ -204,6 +278,7 @@ $( document ).ready(function() { showExternalLinks(createExternalLinkInfo()); }); + hideLinkInfoTabs(); $("#createExternalLinkAlert").show(); }); @@ -247,6 +322,9 @@ $( document ).ready(function() { var linkData = JSON.parse(data); $("#bgImage").off("click"); spaceLinkInfo["id"] = linkData["id"]; + spaceLinkInfo["displayId"]=linkData["displayId"]; + spaceLinkInfo["x"]=linkData["x"]; + spaceLinkInfo["y"]=linkData["y"]; showSpaceLink(spaceLinkInfo, true); $("#space_label").attr("id",""); $("#link").attr("id",""); @@ -300,6 +378,9 @@ $( document ).ready(function() { var linkData = JSON.parse(data); $("#bgImage").off("click"); moduleLinkInfo["id"] = linkData["id"]; + moduleLinkInfo["displayId"]=linkData["displayId"]; + moduleLinkInfo["x"]=linkData["x"]; + moduleLinkInfo["y"]=linkData["y"]; showModuleLink(moduleLinkInfo, true); $("#module_label").attr("id",""); $("#link").attr("id",""); @@ -309,6 +390,122 @@ $( document ).ready(function() { } }); }); + $("#editModuleLinkBtn").click(function(e) { + e.preventDefault(); + var linkId = $("#moduleLinkIdEdit").val(); + if(storeX == undefined || storeY == undefined){ + $("#errorMsg").text("Please click on the image to specify where the new link should be located."); + $('#errorAlert').show(); + return; + } + var linkedModules = $("#moduleLinkIdEdit").val(); + $("#moduleLinkXEdit").val(storeX); + $("#moduleLinkYEdit").val(storeY); + var form = $("#editModuleLinkForm"); + var formData = new FormData(form[0]); + var moduleLinkInfo = editModuleLinkInfo(); + $.ajax({ + type: "POST", + url: "", + cache: false, + contentType: false, + processData: false, + enctype: 'multipart/form-data', + data: formData, + success: function(data){ + var linkData = JSON.parse(data); + $("#bgImage").off("click"); + moduleLinkInfo["id"] = linkData["id"]; + moduleLinkInfo["displayId"]=linkData["displayId"]; + moduleLinkInfo["x"]=linkData["x"]; + moduleLinkInfo["y"]=linkData["y"]; + $('#moduleLinkRotation-'+selectedModuleLinkId).val(linkData["rotation"]); + $('#moduleLinkLabel-'+selectedModuleLinkId).val(linkData["label"]); + $('#moduleLinkType-'+selectedModuleLinkId).val(linkData["dislpayType"]); + $('#moduleLinkTarget-'+selectedModuleLinkId).val(linkData["linkedId"]); + showModuleLinkEdit(moduleLinkInfo, true); + hideLinkInfoTabs(); + } + }); + }); + + $("#editSpaceLinkBtn").click(function(e) { + e.preventDefault(); + var linkId = $("#spaceLinkIdEdit").val(); + if (storeX == undefined || storeY == undefined) { + $("#errorMsg").text("Please click on the image to specify where the new link should be located.") + $('#errorAlert').show(); + return; + } + var linkedSpace = $("#spaceLinkIdEdit").val(); + $("#spaceLinkXEdit").val(storeX); + $("#spaceLinkYEdit").val(storeY); + + var form = $("#editSpaceLinkForm"); + var formData = new FormData(form[0]); + var spaceLinkInfo = editSpaceLinkInfo(); + $.ajax({ + type: "POST", + url: "", + cache: false, + contentType : false, + processData : false, + enctype: 'multipart/form-data', + data: formData, + success: function(data) { + var linkData = JSON.parse(data); + $("#bgImage").off("click"); + spaceLinkInfo["id"] = linkData["id"]; + spaceLinkInfo["displayId"]=linkData["displayId"]; + spaceLinkInfo["x"]=linkData["x"]; + spaceLinkInfo["y"]=linkData["y"]; + showSpaceLinkEdit(spaceLinkInfo, true); + $('#spaceLinkRotation-'+selectedSpaceLinkId).val(linkData["rotation"]); + $('#spaceLinkLabel-'+selectedSpaceLinkId).val(linkData["label"]); + $('#spaceLinkType-'+selectedSpaceLinkId).val(linkData["dislpayType"]); + $('#spaceLinkTarget-'+selectedSpaceLinkId).val(linkData["linkedId"]); + hideLinkInfoTabs(); + } + }); + }); + + $("#editExternalLinkBtn").click(function(e) { + e.preventDefault(); + var linkId = $("#externalLinkIdEdit").val(); + if (storeX == undefined || storeY == undefined) { + $("#errorMsg").text("Please click on the image to specify where the new link should be located.") + $('#errorAlert').show(); + return; + } + var linkedSpace = $("#externalLinkIdEdit").val(); + $("#externalLinkXEdit").val(storeX); + $("#externalLinkYEdit").val(storeY); + var form = $("#editExternalLinkForm"); + var formData = new FormData(form[0]); + var externalLinkInfo = editExternalLinkInfo(); + $.ajax({ + type: "POST", + url: "", + cache: false, + contentType : false, + processData : false, + enctype: 'multipart/form-data', + data: formData, + success: function(data) { + var linkData = JSON.parse(data); + $("#bgImage").off("click"); + externalLinkInfo["id"] = linkData["id"]; + externalLinkInfo["displayId"]=linkData["displayId"]; + externalLinkInfo["x"]=linkData["x"]; + externalLinkInfo["y"]=linkData["y"]; + $('#externalLinkLabel-'+selectedExternalLinkId).val(linkData["label"]); + $('#externalLinkType-'+selectedExternalLinkId).val(linkData["dislpayType"]); + $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]); + showExternalLinkEdit(editExternalLinkInfo, true); + hideLinkInfoTabs(); + } + }); + }); $("#createExternalLinkBtn").click(function(e) { var payload = {}; @@ -339,6 +536,9 @@ $( document ).ready(function() { var linkData = JSON.parse(data); $("#bgImage").off("click"); externalLinkInfo["id"] = linkData["id"]; + externalLinkInfo["displayId"]=linkData["displayId"]; + externalLinkInfo["x"]=linkData["x"]; + externalLinkInfo["y"]=linkData["y"]; showExternalLinks(externalLinkInfo, true); $("#ext_label").attr("id",""); $("#link").attr("id",""); @@ -352,12 +552,13 @@ $( document ).ready(function() { // ------------- other buttons ------------ $("#deleteSpaceLinkButton").click(function() { - var linkId = $("#spaceLinkId").val(); + var linkId = $("#spaceLinkIdValueEdit").val(); $.ajax({ url: "" + linkId + "?${_csrf.parameterName}=${_csrf.token}", method: "DELETE", success:function(data) { $('[data-link-id="' + linkId + '"]').remove(); + hideLinkInfoTabs(); $('a#'+linkId).remove(); if ($("div#outgoingLinks a").length < 2) { $("#noLinksOnSpace").show(); @@ -372,25 +573,25 @@ $( document ).ready(function() { $("#deleteModuleLinkButton").click(function() { - var linkId = $("#moduleLinkId").val(); + var linkId = $("#moduleLinkIdValueEdit").val(); $.ajax({ url: "" + linkId + "?${_csrf.parameterName}=${_csrf.token}", method: "DELETE", success:function(data) { $('[data-link-id="' + linkId + '"]').remove(); - $("#moduleLinkInfo").hide(); + hideLinkInfoTabs(); } }); }); $("#deleteExternalLinkButton").click(function() { - var linkId = $("#externalLinkId").val(); + var linkId = $("#externalLinkIdValueEdit").val(); $.ajax({ url: "" + linkId + "?${_csrf.parameterName}=${_csrf.token}", method: "DELETE", success:function(data) { $('[data-link-id="' + linkId + '"]').remove(); - $("#externalLinkInfo").hide(); + hideLinkInfoTabs(); } }); }); @@ -432,6 +633,23 @@ $( document ).ready(function() { $('#link').css('transform', 'rotate(' +$('#moduleLinkRotation').val()+ 'deg)'); }); + $('#moduleLinkRotationEdit').change(function() { + $('#link').css('transform', 'rotate(' +$('#moduleLinkRotationEdit').val()+ 'deg)'); + }); + + $(".modulelink-targetEdit").change(function() { + showModuleLinkEdit(editModuleLinkInfo()); + }); + + $(".spacelink-targetEdit").change(function() { + showSpaceLinkEdit(editSpaceLinkInfo()); + }); + + $(".externallink-targetEdit").change(function() { + showExternalLinkEdit(editExternalLinkInfo()); + }); + + $("#spaceLinkImage").change(function() { if (this.files && this.files[0]) { linkIconReader.readAsDataURL(this.files[0]); @@ -474,7 +692,7 @@ $( document ).ready(function() { var link; if (spaceLink["type"] == "ALERT") { - link = $(''); + link = $(''); } else if(spaceLink["type"] == "IMAGE" && linkIcon) { link = $(''); } else { @@ -486,7 +704,7 @@ $( document ).ready(function() { 'top': spaceLink["y"] + posY + 16, 'color': 'red' }); - link = $(''); + link = $(''); } if(show) { link.find("div").css('fill', 'red'); @@ -502,12 +720,14 @@ $( document ).ready(function() { link.attr("data-link-id", spaceLink["id"]); link.css('cursor', 'pointer'); link.click(function(e) { - makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"]); + makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"], spaceLink["rotation"], spaceLink["linkedSpace"], spaceLink["x"], spaceLink["y"], spaceLink["displayId"], spaceLink["type"]); }); + space_label.attr("data-link-id", spaceLink["id"]); + space_label.attr("class", "slabel-"+spaceLink["id"]); space_label.css('cursor', 'pointer'); space_label.click(function(e) { - makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"]); + makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"], spaceLink["rotation"], spaceLink["linkedSpace"], spaceLink["x"], spaceLink["y"], spaceLink["displayId"], spaceLink["type"]); }); } @@ -527,9 +747,9 @@ $( document ).ready(function() { var link; if (moduleLink["type"] == "ALERT") { - link = $(''); + link = $(''); } else if(moduleLink["type"] == "IMAGE" && moduleLinkIcon) { - link = $(''); + link = $(''); } else { $(module_label).css({ 'position': 'absolute', @@ -539,7 +759,7 @@ $( document ).ready(function() { 'top': moduleLink["y"] + posY + 16, 'color': 'red' }); - link = $(''); + link = $(''); } if(show) { link.find("div").css('fill', 'red'); @@ -555,12 +775,13 @@ $( document ).ready(function() { link.attr("data-link-id", moduleLink["id"]); link.css('cursor', 'pointer'); link.click(function(e) { - makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"]); + makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"], moduleLink["rotation"], moduleLink["linkedModule"], moduleLink["x"], moduleLink["y"], moduleLink["displayId"], moduleLink["type"]); }); module_label.attr("data-link-id", moduleLink["id"]); module_label.css('cursor', 'pointer'); + module_label.attr("class", "mlabel-"+moduleLink["id"]); module_label.click(function(e) { - makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"]); + makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"], moduleLink["rotation"], moduleLink["linkedModule"], moduleLink["x"], moduleLink["y"], moduleLink["displayId"], moduleLink["type"]); }); } @@ -570,6 +791,50 @@ $( document ).ready(function() { feather.replace(); } + function showModuleLinkEdit(moduleLink, show) { + moduleLink["x"]=storeX; + moduleLink["y"]=storeY; + var selectedLinkClass = '.moduleLink-'+selectedModuleLinkId; + var selectedLabelClass = '.mlabel-'+selectedModuleLinkId; + updateLinkProperties(selectedLinkClass,selectedLabelClass,moduleLink["rotation"],moduleLink["x"],moduleLink["y"],moduleLink["moduleLinkLabel"]); + } + + function showSpaceLinkEdit(spaceLink, show) { + spaceLink["x"]=storeX; + spaceLink["y"]=storeY; + var selectedLinkClass = '.spaceLink-'+selectedSpaceLinkId; + var selectedLabelClass = '.slabel-'+selectedSpaceLinkId; + updateLinkProperties(selectedLinkClass,selectedLabelClass,spaceLink["rotation"],spaceLink["x"],spaceLink["y"],spaceLink["spaceLinkLabel"]); + } + + function showExternalLinkEdit(externalLink, show) { + externalLink["x"]=storeX; + externalLink["y"]=storeY; + var selectedLinkClass = '.externalLink-'+selectedExternalLinkId; + var selectedLabelClass = '.elabel-'+selectedExternalLinkId; + updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],externalLink["x"],externalLink["y"],externalLink["externalLinkLabel"]); + } + + function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel){ + var posX = $("#bgImage").position().left; + var posY = $("#bgImage").position().top; + $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'}); + $(selectedLinkClass).css({ 'left': x + posX}); + $(selectedLinkClass).css({ 'top': y + posY}); + $(selectedLabelClass).text(linkLabel); + $(selectedLabelClass).css({ 'left': x + posX - 10}); + $(selectedLabelClass).css({ 'top': y + posY + 16}); + feather.replace(); + } + + function hideLinkInfoTabs(){ + $("#editExternalLinkInfo").hide(); + $("#editSpaceLinkInfo").hide(); + $("#editModuleLinkInfo").hide(); + $("#errorMsg").text(""); + $('#errorAlert').hide(); + } + function showExternalLinks(externalLink) { $("#ext_label").remove(); $("#link").remove(); @@ -590,7 +855,7 @@ $( document ).ready(function() { 'top': externalLink["y"] + posY + 16, 'color': 'blue' }); - link = $(''); + link = $(''); } link.css('position', 'absolute'); @@ -604,15 +869,14 @@ $( document ).ready(function() { link.css('cursor', 'pointer'); link.attr('href', externalLink["url"]); link.click(function(e) { - makeExternalLinksEditable(externalLink["spaceLinkLabel"], externalLink["id"]); + makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"]); }); ext_label.attr("data-link-id", externalLink["id"]); ext_label.css('cursor', 'pointer'); - ext_label.attr("data-link-id", externalLink["id"]); - ext_label.css('cursor', 'pointer'); + ext_label.attr("class", "elabel-"+externalLink["id"]); ext_label.click(function(e) { - makeExternalLinksEditable(externalLink["spaceLinkLabel"], externalLink["id"]); + makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"]); }); } @@ -654,28 +918,28 @@ $( document ).ready(function() { $("#changeBgImgAlert").hide(); }); - $("#closeSpaceLinkInfo").click(function(e) { + $("#closeEditModuleLinkInfo").click(function(e) { e.preventDefault(); - $("#spaceLinkInfoLabel").text(""); - $("#spaceLinkId").val(""); + $("#moduleLinkInfoLabel").text(""); + $("#moduleLinkId").val(""); resetHighlighting(); - $("#spaceLinkInfo").hide(); - }); + $("#editModuleLinkInfo").hide(); + }); - $("#closeModuleLinkInfo").click(function(e) { + $("#closeEditSpaceLinkInfo").click(function(e) { e.preventDefault(); - $("#moduleLinkInfoLabel").text(""); - $("#moduleLinkId").val(""); + $("#spaceLinkInfoLabel").text(""); + $("#spaceLinkId").val(""); resetHighlighting(); - $("#moduleLinkInfo").hide(); + $("#editSpaceLinkInfo").hide(); }); - $("#closeExternalLinkInfo").click(function(e) { - e.preventDefault(); - $("#externalLinkInfoLabel").text(""); + $("#closeEditExternalLinkInfo").click(function(e) { + e.preventDefault(); + $("#externalLinkInfoLabel").text(""); $("#externalLinkId").val(""); resetHighlighting(); - $("#externalLinkInfo").hide(); + $("#editExternalLinkInfo").hide(); }); // --------- Utility functions ------------- @@ -696,6 +960,7 @@ $( document ).ready(function() { info["y"] = storeY; info["type"] = $("#extType").val(); info["externalLinkLabel"] = $("#externalLinkLabel").val(); + info["externalLinkURL"] = $("#externalLink").val(); return info; } @@ -710,46 +975,132 @@ $( document ).ready(function() { return info; } - function makeSpaceLinksEditable(spaceLinkName, spaceLinkId) { + function editModuleLinkInfo() { + var info = {}; + info["x"] = storeX; + info["y"] = storeY; + info["rotation"] = $("#moduleLinkRotationEdit").val(); + info["linkedModule"] = $("#moduleLinkIdEdit").val(); + info["moduleLinkLabel"] = $("#moduleLinkLabelEdit").val(); + info["type"] = $("#typeEdit").val(); + return info; + } + + function editSpaceLinkInfo() { + var info = {}; + info["x"] = storeX; + info["y"] = storeY; + info["rotation"] = $("#spaceLinkRotationEdit").val(); + info["linkedSpace"] = $("#spaceLinkIdEdit").val(); + info["spaceLinkLabel"] = $("#spaceLinkLabelEdit").val(); + info["type"] = $("#typeSpaceEdit").val(); + return info; + } + + function editExternalLinkInfo() { + var info = {}; + info["x"] = storeX; + info["y"] = storeY; + info["type"] = $("#extTypeEdit").val(); + info["externalLinkLabel"] = $("#externalLinkLabelEdit").val(); + info["externalLinkURL"] = $("#externalLinkURLEdit").val(); + return info; + } + + function makeSpaceLinksEditable(spaceLinkName, spaceLinkId, rotation, selectedSpaceId, posXEdit, posYEdit, displayLinkId, linkType) { $("#spaceLinkInfoLabel").text(spaceLinkName); $("#spaceLinkId").val(spaceLinkId); + selectedSpaceLinkId=spaceLinkId; + storeX=posXEdit; + storeY=posYEdit; + $("#spaceLinkInfoLabel").text(spaceLinkName); + $("#spaceLinkDisplayId").val(displayLinkId); + $("#spaceLinkInfoLabelEdit").text(spaceLinkName); + $("#spaceLinkLabelEdit").val(spaceLinkName); + $("#spaceLinkId").val(spaceLinkId); + $("#spaceLinkIdValueEdit").val(spaceLinkId); + $("#spaceLinkRotationEdit").val(rotation); + $('#typeSpaceEdit option[value="'+linkType+'"]').attr("selected", "selected"); + $('#spaceLinkIdEdit option[value="'+selectedSpaceId+'"]').attr("selected", "selected"); resetHighlighting(); - $('[data-link-id="' + spaceLinkId + '"]').css("color", "#c1bb88"); $('div[data-link-id="' + spaceLinkId + '"]').removeClass("alert-primary"); $('div[data-link-id="' + spaceLinkId + '"]').addClass("alert-warning"); $('img[data-link-id="' + spaceLinkId + '"]').css("border", "solid 1px #c1bb88"); - $("#moduleLinkInfo").hide(); - $("#externalLinkInfo").hide(); - $("#spaceLinkInfo").show(); + + $("#bgImage").on("click", function(e){ + e.preventDefault(); + var posX = $(this).position().left; + var posY = $(this).position().top; + storeX = e.pageX - $(this).offset().left; + storeY = e.pageY - $(this).offset().top; + showSpaceLinkEdit(editSpaceLinkInfo()); + }); + hideLinkInfoTabs(); + $("#editSpaceLinkInfo").show(); } - function makeModuleLinksEditable(moduleLinkName, moduleLinkId) { + function makeModuleLinksEditable(moduleLinkName, moduleLinkId, rotation, selectedModuleId, posXEdit, posYEdit, displayLinkId, linkType) { + selectedModuleLinkId=moduleLinkId; + storeX=posXEdit; + storeY=posYEdit; $("#moduleLinkInfoLabel").text(moduleLinkName); + $("#moduleLinkDisplayId").val(displayLinkId); + $("#moduleLinkInfoLabelEdit").text(moduleLinkName); + $("#moduleLinkLabelEdit").val(moduleLinkName); $("#moduleLinkId").val(moduleLinkId); - resetHighlighting(); - + $("#moduleLinkIdValueEdit").val(moduleLinkId); + $("#moduleLinkRotationEdit").val(rotation); + $('#typeEdit option[value="'+linkType+'"]').attr("selected", "selected"); + $('#moduleLinkIdEdit option[value="'+selectedModuleId+'"]').attr("selected", "selected"); + resetHighlighting(); $('[data-link-id="' + moduleLinkId + '"]').css("color", "#c1bb88"); $('div[data-link-id="' + moduleLinkId + '"]').removeClass("alert-primary"); $('div[data-link-id="' + moduleLinkId + '"]').addClass("alert-warning"); $('img[data-link-id="' + moduleLinkId + '"]').css("border", "solid 1px #c1bb88"); - $("#externalLinkInfo").hide(); - $("#spaceLinkInfo").hide(); - $("#moduleLinkInfo").show(); + + $("#bgImage").on("click", function(e){ + e.preventDefault(); + var posX = $(this).position().left; + var posY = $(this).position().top; + storeX = e.pageX - $(this).offset().left; + storeY = e.pageY - $(this).offset().top; + showModuleLinkEdit(editModuleLinkInfo()); + }); + hideLinkInfoTabs(); + $("#editModuleLinkInfo").show(); } - function makeExternalLinksEditable(linkName, linkId) { + function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType) { + selectedExternalLinkId=linkId; + storeX=posXEdit; + storeY=posYEdit; $("#externalLinkInfoLabel").text(linkName); $("#externalLinkId").val(linkId); + $("#externalLinkDisplayId").val(displayLinkId); + $("#externalLinkInfoLabelEdit").text(linkName); + $("#externalLinkLabelEdit").val(linkName); + $("#externalLinkIdValueEdit").val(linkId); + $("#externalLinkURLEdit").val(externalLinkURL); + $('#extTypeEdit option[value="'+linkType+'"]').attr("selected", "selected"); resetHighlighting(); $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88"); $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary"); $('div[data-link-id="' + linkId + '"]').addClass("alert-warning"); $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88"); - $("#spaceLinkInfo").hide(); - $("#moduleLinkInfo").hide(); + + $("#bgImage").on("click", function(e){ + e.preventDefault(); + var posX = $(this).position().left; + var posY = $(this).position().top; + storeX = e.pageX - $(this).offset().left; + storeY = e.pageY - $(this).offset().top; + showExternalLinkEdit(editExternalLinkInfo()); + }); + hideLinkInfoTabs(); $("#externalLinkInfo").show(); + $("#editExternalLinkInfo").show(); } function resetHighlighting() { @@ -767,22 +1118,26 @@ $( document ).ready(function() { - \ No newline at end of file +
    diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManagerTest.java new file mode 100644 index 000000000..c56bf17bf --- /dev/null +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManagerTest.java @@ -0,0 +1,179 @@ +package edu.asu.diging.vspace.core.services.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +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 edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository; +import edu.asu.diging.vspace.core.data.ExternalLinkRepository; +import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException; +import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException; +import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException; +import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory; +import edu.asu.diging.vspace.core.factory.IExternalLinkFactory; +import edu.asu.diging.vspace.core.model.IExternalLink; +import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.display.DisplayType; +import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay; +import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay; +import edu.asu.diging.vspace.core.model.impl.ExternalLink; +import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue; +import edu.asu.diging.vspace.core.model.impl.Space; + +public class ExternalLinkManagerTest { + + @Mock + private ExternalLinkRepository externalLinkRepo; + + @Mock + private ExternalLinkDisplayRepository externalLinkDisplayRepo; + + @Mock + private SpaceManager spaceManager; + + @Mock + private IExternalLinkFactory externalLinkFactory; + + @Mock + private IExternalLinkDisplayFactory externalLinkDisplayFactory; + + @InjectMocks + private ExternalLinkManager managerToTest = new ExternalLinkManager(); + + private String spaceId1; + private String externalLinkURL; + + @Before + public void init() { + MockitoAnnotations.initMocks(this); + spaceId1 = "SPA000000014"; + externalLinkURL = "www.google.com"; + } + + @Test + public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException { + + Space space = new Space(); + space.setId(spaceId1); + Mockito.when(spaceManager.getSpace(space.getId())).thenReturn(space); + + IExternalLink externalLink = new ExternalLink(); + ExternalLinkValue externalLinkValue = new ExternalLinkValue(externalLinkURL); + externalLink.setId("EXL001"); + externalLink.setTarget(externalLinkValue); + Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space); + Mockito.when(externalLinkFactory.createExternalLink("New External Link", space)).thenReturn(externalLink); + + Mockito.when(externalLinkRepo.save((ExternalLink) externalLink)).thenReturn((ExternalLink)externalLink); + + IExternalLinkDisplay externalDisplayLink = new ExternalLinkDisplay(); + externalDisplayLink.setId("EXLD001"); + + externalDisplayLink.setPositionX(10); + externalDisplayLink.setPositionY(30); + externalDisplayLink.setRotation(40); + externalDisplayLink.setType(DisplayType.ARROW); + externalDisplayLink.setExternalLink(externalLink); + Mockito.when(externalLinkDisplayFactory.createExternalLinkDisplay(externalLink)).thenReturn(externalDisplayLink); + + Mockito.when(externalLinkRepo.save((ExternalLink) externalLink)).thenReturn((ExternalLink)externalLink); + Mockito.when(externalLinkDisplayRepo.save((ExternalLinkDisplay)externalDisplayLink)).thenReturn((ExternalLinkDisplay)externalDisplayLink); + + IExternalLinkDisplay savedExternalLinkDisplay1 = managerToTest.createLink("New External Link", spaceId1, 10, 30, 40, "EXL001", "New External Link", DisplayType.ARROW, null, null); + Assert.assertEquals(externalDisplayLink.getId(), savedExternalLinkDisplay1.getId()); + Assert.assertEquals(externalDisplayLink.getName(), savedExternalLinkDisplay1.getName()); + Assert.assertEquals(new Double(externalDisplayLink.getPositionX()), new Double(savedExternalLinkDisplay1.getPositionX())); + Assert.assertEquals(new Double(externalDisplayLink.getPositionY()), new Double(savedExternalLinkDisplay1.getPositionY())); + Assert.assertEquals(externalDisplayLink.getRotation(), savedExternalLinkDisplay1.getRotation()); + Assert.assertEquals(externalDisplayLink.getType(), savedExternalLinkDisplay1.getType()); + Assert.assertEquals(externalDisplayLink.getExternalLink(), savedExternalLinkDisplay1.getExternalLink()); + Assert.assertEquals(externalDisplayLink.getExternalLink().getTarget().getValue(), savedExternalLinkDisplay1.getExternalLink().getTarget().getValue()); + Mockito.verify(externalLinkDisplayRepo).save((ExternalLinkDisplay)externalDisplayLink); + } + + @Test + public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException { + ISpace space = new Space(); + space.setId(spaceId1); + ExternalLinkDisplay externalLinkDisplay = new ExternalLinkDisplay(); + IExternalLink externalLink = new ExternalLink(); + externalLink.setId("EXL001"); + externalLink.setSpace(space); + externalLink.setTarget(new ExternalLinkValue("stackOverflow.com")); + externalLinkDisplay.setId("EXLD001"); + + externalLinkDisplay.setExternalLink(externalLink); + + externalLinkDisplay.setName("TestExternalEdited"); + externalLinkDisplay.setPositionX(100); + externalLinkDisplay.setPositionY(300); + externalLinkDisplay.setType(DisplayType.ALERT); + + Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space); + ExternalLink newExternalLink = new ExternalLink(); + newExternalLink.setId("externalLink1"); + Optional mockExternalLink = Optional.of((ExternalLink)externalLink); + Mockito.when(externalLinkRepo.findById(externalLink.getId())).thenReturn(mockExternalLink); + + Optional mockExternalLinkDisplay = Optional.of((ExternalLinkDisplay)externalLinkDisplay); + Mockito.when(externalLinkDisplayRepo.findById(externalLinkDisplay.getId())).thenReturn(mockExternalLinkDisplay); + + Mockito.when(externalLinkRepo.save((ExternalLink) externalLink)).thenReturn((ExternalLink)externalLink); + Mockito.when(externalLinkDisplayRepo.save((ExternalLinkDisplay)externalLinkDisplay)).thenReturn((ExternalLinkDisplay)externalLinkDisplay); + + IExternalLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestExternalNew", spaceId1, 20, 40, 0, "www.google.com", "TestExternalNew", "EXL001", "EXLD001", DisplayType.ARROW, null, null); + Assert.assertEquals(externalLinkDisplay.getId(), actualUpdatedLink.getId()); + Assert.assertEquals(externalLinkDisplay.getName(), actualUpdatedLink.getName()); + Assert.assertEquals(new Double(externalLinkDisplay.getPositionX()), new Double(actualUpdatedLink.getPositionX())); + Assert.assertEquals(new Double(externalLinkDisplay.getPositionY()), new Double(actualUpdatedLink.getPositionY())); + Assert.assertEquals(externalLinkDisplay.getExternalLink().getId(), actualUpdatedLink.getExternalLink().getId()); + Assert.assertEquals(externalLinkDisplay.getExternalLink().getTarget().getValue(), actualUpdatedLink.getExternalLink().getTarget().getValue()); + Assert.assertEquals(externalLinkDisplay.getType(), actualUpdatedLink.getType()); + } + + @Test + public void test_deleteLink_linkPresent() { + ISpace space = new Space(); + space.setId(spaceId1); + ExternalLinkDisplay externalLinkDisplay = new ExternalLinkDisplay(); + IExternalLink externalLink = new ExternalLink(); + externalLink.setId("EXL001"); + externalLink.setSpace(space); + + List externalLinks = new ArrayList(); + externalLinks.add(externalLink); + + space.setExternalLinks(externalLinks); + ExternalLinkValue target = new ExternalLinkValue("www.google.com"); + target.setId("EXT001"); + externalLink.setTarget(target); + + externalLinkDisplay.setId("SPLD001"); + externalLinkDisplay.setExternalLink(externalLink); + + externalLinkDisplay.setName("TestExternal"); + externalLinkDisplay.setPositionX(10); + externalLinkDisplay.setPositionY(30); + externalLinkDisplay.setPositionY(20); + externalLinkDisplay.setType(DisplayType.ARROW); + + Optional mockExternalLink = Optional.of((ExternalLink)externalLink); + Mockito.when(externalLinkRepo.findById(externalLink.getId())).thenReturn(mockExternalLink); + + Optional mockExternalLinkDisplay = Optional.of((ExternalLinkDisplay)externalLinkDisplay); + Mockito.when(externalLinkDisplayRepo.findById(externalLinkDisplay.getId())).thenReturn(mockExternalLinkDisplay); + + managerToTest.deleteLink("EXL001"); + + Mockito.verify(externalLinkDisplayRepo).deleteByExternalLink(externalLink); + Mockito.verify(externalLinkRepo).delete((ExternalLink)externalLink); + } +} diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ModuleLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ModuleLinkManagerTest.java new file mode 100644 index 000000000..a05606fb6 --- /dev/null +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ModuleLinkManagerTest.java @@ -0,0 +1,199 @@ +package edu.asu.diging.vspace.core.services.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +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 edu.asu.diging.vspace.core.data.ModuleLinkRepository; +import edu.asu.diging.vspace.core.data.display.ModuleLinkDisplayRepository; +import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException; +import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException; +import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException; +import edu.asu.diging.vspace.core.factory.IModuleLinkDisplayFactory; +import edu.asu.diging.vspace.core.factory.IModuleLinkFactory; +import edu.asu.diging.vspace.core.model.IModule; +import edu.asu.diging.vspace.core.model.IModuleLink; +import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.display.DisplayType; +import edu.asu.diging.vspace.core.model.display.IModuleLinkDisplay; +import edu.asu.diging.vspace.core.model.display.impl.ModuleLinkDisplay; +import edu.asu.diging.vspace.core.model.impl.Module; +import edu.asu.diging.vspace.core.model.impl.ModuleLink; +import edu.asu.diging.vspace.core.model.impl.Space; + +public class ModuleLinkManagerTest { + @Mock + private ModuleLinkRepository moduleLinkRepo; + + @Mock + private ModuleLinkDisplayRepository moduleLinkDisplayRepo; + + @Mock + private SpaceManager spaceManager; + + @Mock + private ModuleManager moduleManager; + + @Mock + private IModuleLinkFactory moduleLinkFactory; + + @Mock + private IModuleLinkDisplayFactory moduleLinkDisplayFactory; + + @InjectMocks + private ModuleLinkManager managerToTest = new ModuleLinkManager(); + + private String spaceId1; + + @Before + public void init() { + MockitoAnnotations.initMocks(this); + spaceId1 = "SPA000000014"; + } + + @Test + public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException { + + Space space = new Space(); + space.setId(spaceId1); + Mockito.when(spaceManager.getSpace(space.getId())).thenReturn(space); + + IModuleLink moduleLink = new ModuleLink(); + Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space); + Mockito.when(moduleLinkFactory.createModuleLink("New Module Link", space)).thenReturn(moduleLink); + + IModule target = new Module(); + target.setId("MOD001"); + Mockito.when(moduleManager.getModule("MOD001")).thenReturn(target); + + moduleLink.setTarget(target); + + IModuleLinkDisplay moduleDisplayLink = new ModuleLinkDisplay(); + moduleDisplayLink.setId("MDLD001"); + moduleDisplayLink.setPositionX(10); + moduleDisplayLink.setPositionY(30); + moduleDisplayLink.setRotation(40); + moduleDisplayLink.setType(DisplayType.ARROW); + Mockito.when(moduleLinkFactory.createModuleLink("New Module Link", space)).thenReturn(moduleLink); + moduleDisplayLink.setLink(moduleLink); + + Mockito.when(moduleLinkDisplayFactory.createModuleLinkDisplay(moduleLink)).thenReturn(moduleDisplayLink); + + Mockito.when(moduleLinkRepo.save((ModuleLink) moduleLink)).thenReturn((ModuleLink)moduleLink); + Mockito.when(moduleLinkDisplayRepo.save((ModuleLinkDisplay)moduleDisplayLink)).thenReturn((ModuleLinkDisplay)moduleDisplayLink); + + IModuleLinkDisplay savedModuleLinkDisplay1 = managerToTest.createLink("New Module Link", spaceId1, 10, 30, 40, "MOD001", "New Module Link", DisplayType.ARROW, null, null); + Assert.assertEquals(moduleDisplayLink.getId(), savedModuleLinkDisplay1.getId()); + Assert.assertEquals(moduleDisplayLink.getName(), savedModuleLinkDisplay1.getName()); + Assert.assertEquals(new Double(moduleDisplayLink.getPositionX()), new Double(savedModuleLinkDisplay1.getPositionX())); + Assert.assertEquals(new Double(moduleDisplayLink.getPositionY()), new Double(savedModuleLinkDisplay1.getPositionY())); + Assert.assertEquals(moduleDisplayLink.getRotation(), savedModuleLinkDisplay1.getRotation()); + Assert.assertEquals(moduleDisplayLink.getLink().getId(), savedModuleLinkDisplay1.getLink().getId()); + Assert.assertEquals(moduleDisplayLink.getType(), savedModuleLinkDisplay1.getType()); + Assert.assertEquals(moduleDisplayLink.getLink().getTarget().getId(), savedModuleLinkDisplay1.getLink().getTarget().getId()); + Mockito.verify(moduleLinkDisplayRepo).save((ModuleLinkDisplay)moduleDisplayLink); + } + + @Test + public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException { + ISpace space = new Space(); + space.setId(spaceId1); + ModuleLinkDisplay moduleLinkDisplay = new ModuleLinkDisplay(); + IModuleLink moduleLink = new ModuleLink(); + moduleLink.setId("MOL001"); + moduleLink.setSpace(space); + + IModule target = new Module(); + target.setId("MOD001"); + Mockito.when(moduleManager.getModule("MOD001")).thenReturn(target); + + moduleLink.setTarget(target); + moduleLinkDisplay.setId("MDLD001"); + moduleLinkDisplay.setLink(moduleLink); + + moduleLinkDisplay.setName("TestModule"); + moduleLinkDisplay.setPositionX(10); + moduleLinkDisplay.setPositionY(30); + moduleLinkDisplay.setPositionY(20); + moduleLinkDisplay.setType(DisplayType.ARROW); + + Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space); + ModuleLink newModuleLink = new ModuleLink(); + newModuleLink.setId("moduleLink1"); + Optional mockModuleLink = Optional.of((ModuleLink)moduleLink); + Mockito.when(moduleLinkRepo.findById(moduleLink.getId())).thenReturn(mockModuleLink); + + Optional mockModuleLinkDisplay = Optional.of((ModuleLinkDisplay)moduleLinkDisplay); + Mockito.when(moduleLinkDisplayRepo.findById(moduleLinkDisplay.getId())).thenReturn(mockModuleLinkDisplay); + + + ModuleLinkDisplay moduleLinkDisplayUpdated = moduleLinkDisplay; + moduleLinkDisplayUpdated.setName("TestModuleEdited"); + moduleLinkDisplayUpdated.setPositionX(100); + moduleLinkDisplayUpdated.setPositionY(300); + moduleLinkDisplayUpdated.setRotation(180); + moduleLinkDisplayUpdated.setType(DisplayType.ALERT); + + IModule newTarget = new Module(); + newTarget.setId("MOD002"); + Mockito.when(moduleManager.getModule("MOD002")).thenReturn(newTarget); + moduleLinkDisplayUpdated.getLink().setTarget(newTarget); + + Mockito.when(moduleLinkRepo.save((ModuleLink) moduleLink)).thenReturn((ModuleLink)moduleLink); + Mockito.when(moduleLinkDisplayRepo.save((ModuleLinkDisplay)moduleLinkDisplay)).thenReturn((ModuleLinkDisplay)moduleLinkDisplayUpdated); + + IModuleLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestModuleEdited", spaceId1, 100, 300, 180, "MOD002", "TestModuleEdited", "MOL001", "MDLD001", DisplayType.ALERT, null, null); + Assert.assertEquals(moduleLinkDisplayUpdated.getId(), actualUpdatedLink.getId()); + Assert.assertEquals(moduleLinkDisplayUpdated.getName(), actualUpdatedLink.getName()); + Assert.assertEquals(new Double(moduleLinkDisplayUpdated.getPositionX()), new Double(actualUpdatedLink.getPositionX())); + Assert.assertEquals(new Double(moduleLinkDisplayUpdated.getPositionY()), new Double(actualUpdatedLink.getPositionY())); + Assert.assertEquals(moduleLinkDisplayUpdated.getLink().getTarget(), actualUpdatedLink.getLink().getTarget()); + Assert.assertEquals(moduleLinkDisplayUpdated.getType(), actualUpdatedLink.getType()); + } + + @Test + public void test_deleteLink_linkPresent() { + ISpace space = new Space(); + space.setId("SPA001"); + ModuleLinkDisplay moduleLinkDisplay = new ModuleLinkDisplay(); + IModuleLink moduleLink = new ModuleLink(); + moduleLink.setId("MOL005"); + moduleLink.setSpace(space); + + List moduleLinks = new ArrayList(); + moduleLinks.add(moduleLink); + + space.setModuleLinks(moduleLinks); + IModule target = new Module(); + target.setId("MOD005"); + moduleLink.setTarget(target); + + moduleLinkDisplay.setId("MDLD001"); + moduleLinkDisplay.setLink(moduleLink); + + moduleLinkDisplay.setName("TestModule"); + moduleLinkDisplay.setPositionX(10); + moduleLinkDisplay.setPositionY(30); + moduleLinkDisplay.setPositionY(20); + moduleLinkDisplay.setType(DisplayType.ARROW); + + Optional mockModuleLink = Optional.of((ModuleLink)moduleLink); + Mockito.when(moduleLinkRepo.findById(moduleLink.getId())).thenReturn(mockModuleLink); + + Optional mockModuleLinkDisplay = Optional.of((ModuleLinkDisplay)moduleLinkDisplay); + Mockito.when(moduleLinkDisplayRepo.findById(moduleLinkDisplay.getId())).thenReturn(mockModuleLinkDisplay); + + managerToTest.deleteLink("MOL005"); + + Mockito.verify(moduleLinkDisplayRepo).deleteByLink(moduleLink); + Mockito.verify(moduleLinkRepo).delete((ModuleLink)moduleLink); + } +} diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceLinkManagerTest.java new file mode 100644 index 000000000..800d8782b --- /dev/null +++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceLinkManagerTest.java @@ -0,0 +1,201 @@ +package edu.asu.diging.vspace.core.services.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +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 edu.asu.diging.vspace.core.data.SpaceLinkRepository; +import edu.asu.diging.vspace.core.data.display.SpaceLinkDisplayRepository; +import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException; +import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException; +import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException; +import edu.asu.diging.vspace.core.factory.ISpaceLinkFactory; +import edu.asu.diging.vspace.core.factory.impl.SpaceLinkDisplayFactory; +import edu.asu.diging.vspace.core.model.ISpace; +import edu.asu.diging.vspace.core.model.ISpaceLink; +import edu.asu.diging.vspace.core.model.display.DisplayType; +import edu.asu.diging.vspace.core.model.display.ISpaceLinkDisplay; +import edu.asu.diging.vspace.core.model.display.impl.SpaceLinkDisplay; +import edu.asu.diging.vspace.core.model.impl.Space; +import edu.asu.diging.vspace.core.model.impl.SpaceLink; + +public class SpaceLinkManagerTest { + @Mock + private SpaceLinkRepository spaceLinkRepo; + + @Mock + private SpaceLinkDisplayRepository spaceLinkDisplayRepo; + + @Mock + private SpaceManager spaceManager; + + @Mock + private ISpaceLinkFactory spaceLinkFactory; + + @Mock + private SpaceLinkDisplayFactory spaceLinkDisplayFactory; + + @InjectMocks + private SpaceLinkManager managerToTest = new SpaceLinkManager(); + + private String spaceId1, spaceId2, spaceId3; + + @Before + public void init() { + MockitoAnnotations.initMocks(this); + spaceId1 = "SPA000000001"; + spaceId2 = "SPA000000002"; + spaceId3 = "SPA000000003"; + } + + @Test + public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException { + + ISpace space = new Space(); + space.setId(spaceId1); + Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space); + ISpaceLink spaceLink = new SpaceLink(); + spaceLink.setId("SPL001"); + Mockito.when(spaceLinkRepo.save((SpaceLink)spaceLink)).thenReturn((SpaceLink) spaceLink); + + Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space); + Mockito.when(spaceLinkFactory.createSpaceLink("New Space Link", space)).thenReturn(spaceLink); + + ISpace target = new Space(); + target.setId(spaceId2); + Mockito.when(spaceManager.getSpace(spaceId2)).thenReturn(target); + + spaceLink.setTargetSpace(target); + ISpaceLinkDisplay spaceDisplayLink = new SpaceLinkDisplay(); + spaceDisplayLink.setId("SPLD001"); + spaceDisplayLink.setPositionX(10); + spaceDisplayLink.setPositionY(30); + spaceDisplayLink.setRotation(40); + spaceDisplayLink.setType(DisplayType.ARROW); + Mockito.when(spaceLinkFactory.createSpaceLink("New Space Link", space)).thenReturn(spaceLink); + spaceDisplayLink.setLink(spaceLink); + + Mockito.when(spaceLinkDisplayFactory.createSpaceLinkDisplay(spaceLink)).thenReturn(spaceDisplayLink); + + Mockito.when(spaceLinkRepo.save((SpaceLink) spaceLink)).thenReturn((SpaceLink)spaceLink); + Mockito.when(spaceLinkDisplayRepo.save((SpaceLinkDisplay)spaceDisplayLink)).thenReturn((SpaceLinkDisplay)spaceDisplayLink); + + ISpaceLinkDisplay savedSpaceLinkDisplay = managerToTest.createLink("New Space Link", spaceId1, 10, 30, 40, spaceId2, "New Space Link", DisplayType.ARROW, null, null); + Assert.assertEquals(spaceDisplayLink.getId(), savedSpaceLinkDisplay.getId()); + Assert.assertEquals(spaceDisplayLink.getName(), savedSpaceLinkDisplay.getName()); + Assert.assertEquals(new Double(spaceDisplayLink.getPositionX()), new Double(savedSpaceLinkDisplay.getPositionX())); + Assert.assertEquals(new Double(spaceDisplayLink.getPositionY()), new Double(savedSpaceLinkDisplay.getPositionY())); + Assert.assertEquals(spaceDisplayLink.getRotation(), savedSpaceLinkDisplay.getRotation()); + Assert.assertEquals(spaceDisplayLink.getLink().getId(), savedSpaceLinkDisplay.getLink().getId()); + Assert.assertEquals(spaceDisplayLink.getType(), savedSpaceLinkDisplay.getType()); + Assert.assertEquals(spaceDisplayLink.getLink().getTargetSpace(), savedSpaceLinkDisplay.getLink().getTargetSpace()); + Mockito.verify(spaceLinkDisplayRepo).save((SpaceLinkDisplay)spaceDisplayLink); + } + + @Test + public void test_deleteLink_linkPresent() { + ISpace space = new Space(); + space.setId("SPA001"); + SpaceLinkDisplay spaceLinkDisplay = new SpaceLinkDisplay(); + ISpaceLink spaceLink = new SpaceLink(); + spaceLink.setId("SPL001"); + spaceLink.setSourceSpace(space); + + List spaceLinks = new ArrayList(); + spaceLinks.add(spaceLink); + + space.setSpaceLinks(spaceLinks); + ISpace target = new Space(); + target.setId(spaceId2); + spaceLink.setTargetSpace(target); + + spaceLinkDisplay.setId("SPLD001"); + spaceLinkDisplay.setLink(spaceLink); + + spaceLinkDisplay.setName("TestSpace"); + spaceLinkDisplay.setPositionX(10); + spaceLinkDisplay.setPositionY(30); + spaceLinkDisplay.setPositionY(20); + spaceLinkDisplay.setType(DisplayType.ARROW); + + Optional mockSpaceLink = Optional.of((SpaceLink)spaceLink); + Mockito.when(spaceLinkRepo.findById(spaceLink.getId())).thenReturn(mockSpaceLink); + + Optional mockSpaceLinkDisplay = Optional.of((SpaceLinkDisplay)spaceLinkDisplay); + Mockito.when(spaceLinkDisplayRepo.findById(spaceLinkDisplay.getId())).thenReturn(mockSpaceLinkDisplay); + + managerToTest.deleteLink("SPL001"); + + Mockito.verify(spaceLinkDisplayRepo).deleteByLink(spaceLink); + Mockito.verify(spaceLinkRepo).delete((SpaceLink)spaceLink); + } + + @Test + public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException { + ISpace space = new Space(); + space.setId(spaceId1); + SpaceLinkDisplay spaceLinkDisplay = new SpaceLinkDisplay(); + ISpaceLink spaceLink = new SpaceLink(); + spaceLink.setId("SPL002"); + spaceLink.setSourceSpace(space); + + ISpace target = new Space(); + target.setId(spaceId2); + + Mockito.when(spaceManager.getSpace(spaceId2)).thenReturn(target); + + spaceLink.setTargetSpace(target); + + spaceLinkDisplay.setId("SPLD001"); + spaceLinkDisplay.setLink(spaceLink); + + spaceLinkDisplay.setName("TestSpace"); + spaceLinkDisplay.setPositionX(10); + spaceLinkDisplay.setPositionY(30); + spaceLinkDisplay.setPositionY(20); + spaceLinkDisplay.setType(DisplayType.ARROW); + + Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space); + SpaceLink newSpaceLink = new SpaceLink(); + newSpaceLink.setId("spaceLink1"); + Optional mockSpaceLink = Optional.of((SpaceLink)spaceLink); + Mockito.when(spaceLinkRepo.findById(spaceLink.getId())).thenReturn(mockSpaceLink); + + Optional mockSpaceLinkDisplay = Optional.of((SpaceLinkDisplay)spaceLinkDisplay); + Mockito.when(spaceLinkDisplayRepo.findById(spaceLinkDisplay.getId())).thenReturn(mockSpaceLinkDisplay); + + + SpaceLinkDisplay spaceLinkDisplayUpdated = spaceLinkDisplay; + spaceLinkDisplayUpdated.setName("TestSpaceEdited"); + spaceLinkDisplayUpdated.setPositionX(100); + spaceLinkDisplayUpdated.setPositionY(300); + spaceLinkDisplayUpdated.setRotation(180); + spaceLinkDisplayUpdated.setType(DisplayType.ALERT); + + ISpace newTarget = new Space(); + newTarget.setId(spaceId3); + + Mockito.when(spaceManager.getSpace(spaceId3)).thenReturn(newTarget); + + spaceLinkDisplayUpdated.getLink().setTargetSpace(newTarget); + + Mockito.when(spaceLinkRepo.save((SpaceLink) spaceLink)).thenReturn((SpaceLink)spaceLink); + Mockito.when(spaceLinkDisplayRepo.save((SpaceLinkDisplay)spaceLinkDisplay)).thenReturn((SpaceLinkDisplay)spaceLinkDisplayUpdated); + + ISpaceLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestSpaceEdited", spaceId1, 100, 300, 180, spaceId3, "TestSpaceEdited", "SPL002", "SPLD001", DisplayType.ALERT, null, null); + Assert.assertEquals(spaceLinkDisplayUpdated.getId(), actualUpdatedLink.getId()); + Assert.assertEquals(spaceLinkDisplayUpdated.getName(), actualUpdatedLink.getName()); + Assert.assertEquals(new Double(spaceLinkDisplayUpdated.getPositionX()), new Double(actualUpdatedLink.getPositionX())); + Assert.assertEquals(new Double(spaceLinkDisplayUpdated.getPositionY()), new Double(actualUpdatedLink.getPositionY())); + Assert.assertEquals(spaceLinkDisplayUpdated.getLink().getTargetSpace(), actualUpdatedLink.getLink().getTargetSpace()); + Assert.assertEquals(spaceLinkDisplayUpdated.getType(), actualUpdatedLink.getType()); + } +} From b8ba09037c46b2c25d8e0b3ee86cc898b92adc29 Mon Sep 17 00:00:00 2001 From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com> Date: Wed, 5 Aug 2020 08:09:34 -0700 Subject: [PATCH 24/47] Story/VSPC 107 (#143) * [VSPC-107] Changes to show previous branching point name on hover * [VSPC-107] adding branching point slide data in model --- .../vspace/web/publicview/ExhibitionSlideController.java | 2 +- vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java index 1fc58bbc1..b4efdf484 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSlideController.java @@ -119,7 +119,7 @@ public String slide(Model model, @PathVariable("slideId") String slideId, @PathV if(sequenceHistory.hasHistory()) { model.addAttribute("showBackToPreviousChoice", true); model.addAttribute("previousSequenceId", sequenceHistory.peekSequenceId()); - model.addAttribute("previousBranchingPointId", sequenceHistory.peekBranchingPointId()); + model.addAttribute("previousBranchingPoint", ((BranchingPoint)slideManager.getSlide(sequenceHistory.peekBranchingPointId()))); } model.addAttribute("numOfSlides", sequenceSlides.size()); diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp index d7bc2b8e1..4bb78559e 100644 --- a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.jsp @@ -112,7 +112,7 @@ body { - "> + ">
    - Go To Previous Branching Choice + Go back to ${previousBranchingPoint.name}
    From 0f4864df387ad5201ef78a0047daba4e6462c23a Mon Sep 17 00:00:00 2001 From: Sagar Khar <44152998+Sagar-k93@users.noreply.github.com> Date: Thu, 6 Aug 2020 13:41:55 -0700 Subject: [PATCH 25/47] Bug/vspc 109 (#145) * [VSPC-109] Added validation for spacelink label and target space to be not null. * [VSPC-109] Added validations for external link. * [VSPC-109] Added indentation to space.jsp. * [VSPC-109] Error message fixed on screen and disappears on cancel button. Co-authored-by: skhar --- .../WEB-INF/views/staff/spaces/space.jsp | 1382 ++++++++--------- 1 file changed, 689 insertions(+), 693 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp index e7b134f55..fd23e9ee2 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp +++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp @@ -1,11 +1,12 @@ <%@ page pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> - - + + - -

    - Space: ${space.name} "> + Space: ${space.name} ">

    - - - - -

    - -

    -     + + + + +

    + +

    +
    - - - - -

    - -

    -     + + + + +

    + +

    +
    + + +
    Description:

    - ${space.description}

    + ${space.description}

    + + + + value="/staff/space/${space.id}/spacelink?${_csrf.parameterName}=${_csrf.token}" + var="postUrl" />
    - +
    + value="/staff/space/${space.id}/modulelink?${_csrf.parameterName}=${_csrf.token}" + var="postUrl" />
    - +
    - - + action="${postUrl}?${_csrf.parameterName}=${_csrf.token}" + enctype="multipart/form-data"> + +
    - -
    -
    - +
    - +
    - +
    - +

    -