story/VSPC-150

vspace/src/main/java/edu/asu/diging/vspace/core/model/IReference.java

@@ -57,5 +57,10 @@ public interface IReference extends IVSpaceElement {
     void setId(String id);
 
     String getId();
+
+    void setVisibility(boolean visible);
+
+    boolean getVisibility();
+
 
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/SortByField.java

@@ -4,7 +4,8 @@
 import java.util.List;
 
 public enum SortByField {
-    CREATION_DATE("creationDate"), FILENAME("filename"), NAME("name"), CREATED_BY("createdBy");
+    CREATION_DATE("creationDate"), FILENAME("filename"), NAME("name"), CREATED_BY("createdBy"), 
+    AUTHOR("author"), YEAR("year"), TITLE("title");
 
     private final String value;
 
@@ -18,7 +19,7 @@ public String getValue() {
 
     public static List<String> getAllValues() {
         List<String> allValues = new ArrayList<>();
-        for(SortByField sbf : SortByField.values()) {
+        for (SortByField sbf : SortByField.values()) {
             allValues.add(sbf.getValue());
         }
         return allValues;

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Reference.java

@@ -53,6 +53,8 @@ public class Reference extends VSpaceElement implements IReference {
     private String type;
 
     private String note;
+
+    private boolean visibility;
 
     @Override
     public String getTitle() {
@@ -182,4 +184,13 @@ public void setBiblios(List<BiblioBlock> biblios) {
         this.biblios = biblios;
     }
 
+    @Override
+    public void setVisibility(boolean visibility) {
+        this.visibility = visibility;
+    }
+
+    @Override
+    public boolean getVisibility() {
+        return visibility;
+    }
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ReferenceData.java

@@ -13,6 +13,7 @@ public class ReferenceData {
     private String editors;  
     private String type;
     private String note;
+    private String visibility;
 
 
     public String getTitle() {
@@ -81,5 +82,11 @@ public String getNote() {
     public void setNote(String note) {
         this.note = note;
     }
+    public String getVisibility() {
+        return note;
+    }
+    public void setVisibility(String visibility) {
+        this.visibility = visibility;
+    }
 }
 

vspace/src/main/java/edu/asu/diging/vspace/core/services/IReferenceManager.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.data.domain.Page;
+
 import edu.asu.diging.vspace.core.model.IBiblioBlock;
 import edu.asu.diging.vspace.core.model.IReference;
 import edu.asu.diging.vspace.core.model.impl.Reference;
@@ -10,7 +12,7 @@ public interface IReferenceManager {
 
     IReference getReference(String referenceId);
 
-    IReference createReference(String biblioId, String title, String author,String year,String journal, String url, String volume,String issue, String pages,String editor, String type, String note);
+    IReference createReference(String biblioId, String title, String author,String year,String journal, String url, String volume,String issue, String pages,String editor, String type, String note, String visibility);
 
     void updateReference(IReference reference);
 
@@ -19,5 +21,11 @@ public interface IReferenceManager {
     void deleteReferences(List<IReference> references, String BiblioId);
 
     List<IReference> getReferencesForBiblio(String biblioId);
+
+    List<IReference> getAllReferences(int pageNo, String sortedBy, String order);
+
+    long getTotalReferenceCount();
+
+    long getTotalPages();
 
 }

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ReferenceManager.java

@@ -7,11 +7,17 @@
 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.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 import edu.asu.diging.vspace.core.data.ReferenceRepository;
 import edu.asu.diging.vspace.core.model.IBiblioBlock;
 import edu.asu.diging.vspace.core.model.IReference;
+import edu.asu.diging.vspace.core.model.SortByField;
 import edu.asu.diging.vspace.core.model.impl.BiblioBlock;
 import edu.asu.diging.vspace.core.model.impl.Reference;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
@@ -27,9 +33,13 @@
 
     @Autowired
     private IContentBlockManager contentBlockManager;
+
+    @Value("${page_size}")
+    private int pageSize;
 
     @Override
-    public IReference createReference(String biblioId, String title, String author,String year,String journal, String url, String volume,String issue, String pages,String editor, String type, String note) {
+    public IReference createReference(String biblioId, String title, String author,String year,String journal, String url, String volume,String issue, String pages,String editor, String type, String note, String visibility) {
+
     	IReference reference = new Reference();
         reference.setAuthor(author);
         reference.setTitle(title);
@@ -42,6 +52,13 @@
         reference.setEditors(editor);
         reference.setType(type);
         reference.setNote(note);
+        if(visibility == "Private") {
+        	reference.setVisibility(false);
+        }
+        else {
+        	reference.setVisibility(true);
+        }
+
         BiblioBlock biblio = contentBlockManager.getBiblioBlock(biblioId);
         reference.getBiblios().add(biblio);
         return referenceRepo.save((Reference) reference);
@@ -81,4 +98,47 @@
     public List<IReference> getReferencesForBiblio(String biblioId) {
         return new ArrayList<>(referenceRepo.findByBiblios_Id(biblioId));
     }
+
+    @Override
+    public List<IReference> getAllReferences(int pageNo, String sortedBy, String order) {
+        Sort sortingParameters = getSortingParameters(sortedBy, order);
+        if (pageNo < 1) {
+            pageNo = 1;
+        }
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, sortingParameters);
+        Page<Reference> references = referenceRepo.findAll(pageable);
+        if (references.getContent().size() == 0 && references.getTotalPages() > 0) {
+            pageable = PageRequest.of(references.getTotalPages() - 1, pageSize, sortingParameters);
+            references = referenceRepo.findAll(pageable);
+        }
+        List<IReference> results = new ArrayList<>();
+        if (references != null) {
+            references.getContent().forEach(ref -> results.add(ref));
+        }
+        return results;
+    }
+
+    @Override
+    public long getTotalReferenceCount() {
+        return referenceRepo.count();
+    }
+
+    @Override
+    public long getTotalPages() {
+        long count = referenceRepo.count();
+        return (count % pageSize == 0) ? count / pageSize : (count / pageSize) + 1;
+    }
+
+    private Sort getSortingParameters(String sortedBy, String order) {
+        Sort sortingParameters = Sort.by(SortByField.CREATION_DATE.getValue()).descending();
+        if (sortedBy != null && SortByField.getAllValues().contains(sortedBy)) {
+            sortingParameters = Sort.by(sortedBy);
+        }
+        if (order != null && order.equalsIgnoreCase(Sort.Direction.ASC.toString())) {
+            sortingParameters = sortingParameters.ascending();
+        } else {
+            sortingParameters = sortingParameters.descending();
+        }
+        return sortingParameters;
+    }
 }

vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddReferenceController.java

@@ -23,7 +23,8 @@ public class AddReferenceController {
 
     @RequestMapping(value = "/staff/module/{id}/slide/{slideId}/bibliography/{biblioId}/reference/add", 
                     method = RequestMethod.POST)
-    public ResponseEntity<IReference> addReference(@PathVariable("id") String moduleId, 
+    public ResponseEntity<Reference> addReference(@PathVariable("id") String moduleId, 
+
                                                   @PathVariable("slideId") String slideId, 
                                                   @PathVariable("biblioId") String biblioId, 
                                                   @RequestBody ReferenceData referenceData, 
@@ -40,9 +41,10 @@ public ResponseEntity<IReference> addReference(@PathVariable("id") String module
             referenceData.getPages(), 
             referenceData.getEditors(), 
             referenceData.getType(), 
-            referenceData.getNote()
+            referenceData.getNote(),
+            referenceData.getVisibility()
         );
 
-        return ResponseEntity.ok(ref);
+        return ResponseEntity.ok((Reference) ref);
     }
 }

vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditReferenceController.java

@@ -65,7 +65,6 @@ public ResponseEntity<String> editReference(@PathVariable("id") String slideId,
         reference.setEditors(editor);
         reference.setType(type);
         reference.setNote(note);
-
         referenceManager.updateReference(reference);
         return new ResponseEntity<String>(HttpStatus.OK);
     }

vspace/src/main/java/edu/asu/diging/vspace/web/staff/ListReferencesController.java

@@ -0,0 +1,71 @@
+package edu.asu.diging.vspace.web.staff;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import edu.asu.diging.vspace.core.model.IReference;
+import edu.asu.diging.vspace.core.model.SortByField;
+import edu.asu.diging.vspace.core.services.IReferenceManager;
+
+@Controller
+public class ListReferencesController {
+
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private IReferenceManager referenceManager;
+
+    @RequestMapping("/staff/references/list")
+    public String listReferencesWithoutNum(Model model,
+            @RequestParam(value = "sort", required = false) String sortedBy,
+            @RequestParam(value = "order", required = false) String order) {
+        return String.format("redirect:/staff/references/list/1?sort=%s&order=%s", 
+                sortedBy, order);
+    }
+
+    @RequestMapping("/staff/references/list/{page}")
+    public String listReferences(@PathVariable(required = false) String page,
+            @RequestParam(value = "sort", required = false) String sortedBy,
+            @RequestParam(value = "order", required = false) String order, 
+            Model model, 
+            RedirectAttributes attributes) {
+        int pageNo;
+        page = StringUtils.isEmpty(page) ? "1" : page;
+
+        try {
+            pageNo = Integer.parseInt(page);
+            if (pageNo < 1) {
+                pageNo = 1;
+            }
+        } catch (NumberFormatException numberFormatException) {
+            pageNo = 1;
+        }
+
+        List<IReference> references = referenceManager.getAllReferences(pageNo, sortedBy, order);
+
+        model.addAttribute("totalPages", referenceManager.getTotalPages());
+        model.addAttribute("currentPageNumber", pageNo);
+        model.addAttribute("totalReferenceCount", referenceManager.getTotalReferenceCount());
+        model.addAttribute("references", references);
+        model.addAttribute("sortProperty",
+                (sortedBy == null || sortedBy.equals("")) 
+                        ? SortByField.CREATION_DATE.getValue() : sortedBy);
+        model.addAttribute("order",
+                (order == null || order.equals("")) 
+                        ? Sort.Direction.DESC.toString().toLowerCase() : order);
+
+        return "staff/references/referencelist";
+    }
+}
+

vspace/src/main/webapp/WEB-INF/views/exhibition/module.html

@@ -149,6 +149,30 @@
         function closeModal(){
         	$("#moduleOverviewModal").hide();
         }
+
+        document.addEventListener('DOMContentLoaded', function() {
+          const sortSelect = document.getElementById('referenceSort');
+          const refList = document.getElementById('referenceList');
+
+          sortSelect.addEventListener('change', function() {
+            const sortBy = this.value;
+            let items = Array.from(refList.getElementsByTagName('li'));
+
+            items.sort((a, b) => {
+              const aValue = a.querySelector('.referenceDiv').getAttribute('data-' + sortBy);
+              const bValue = b.querySelector('.referenceDiv').getAttribute('data-' + sortBy);
+
+              if (sortBy === 'year') {
+                return parseInt(aValue) - parseInt(bValue);
+              } else {
+                return aValue.localeCompare(bValue);
+              }
+            });
+
+            refList.innerHTML = '';
+            items.forEach(item => refList.appendChild(item));
+          });
+        });
 </script>
 </head>
 <body>

vspace/src/main/webapp/WEB-INF/views/layouts/navbar_staff.html

@@ -35,20 +35,27 @@
 			               <span class="icon-2x2-grid secondary"></span><span class="custom_Text">&nbsp;Modules</span>
 			            </a>
 			        </li>
-		            <li class="nav-item" sec:authorize="hasAnyRole('ADMIN', 'STAFF')">
-			            <a class="nav-link"
-			               th:style="${currentPage == 'images' ? 'active' : '' }"
-			               th:href="@{/staff/images/list}"> 
-			               <span class="icon-image secondary"></span><span class="custom_Text">&nbsp;Images</span>
-			            </a>
-			        </li>
-		            <li class="nav-item" sec:authorize="hasRole('ADMIN')">
-			            <a class="nav-link"
-			               th:style="${currentPage == 'users' ? 'active' : '' }"
-			               th:href="@{/staff/user/list}"> 
-			               <span class="icon-user secondary"></span><span class="custom_Text">&nbsp;Users</span>
-			            </a>
-			        </li>
+	            <li class="nav-item" sec:authorize="hasAnyRole('ADMIN', 'STAFF')">
+		            <a class="nav-link"
+		               th:style="${currentPage == 'images' ? 'active' : '' }"
+		               th:href="@{/staff/images/list}"> 
+		               <span class="icon-image secondary"></span><span class="custom_Text">&nbsp;Images</span>
+		            </a>
+		        </li>
+	            <li class="nav-item" sec:authorize="hasAnyRole('ADMIN', 'STAFF')">
+		            <a class="nav-link"
+		               th:style="${currentPage == 'references' ? 'active' : '' }"
+		               th:href="@{/staff/references/list}"> 
+		               <span class="icon-book-open secondary"></span><span class="custom_Text">&nbsp;References</span>
+		            </a>
+		        </li>
+	            <li class="nav-item" sec:authorize="hasRole('ADMIN')">
+		            <a class="nav-link"
+		               th:style="${currentPage == 'users' ? 'active' : '' }"
+		               th:href="@{/staff/user/list}"> 
+		               <span class="icon-user secondary"></span><span class="custom_Text">&nbsp;Users</span>
+		            </a>
+		        </li>
 			         <li class="nav-item" sec:authorize="hasAnyRole('ADMIN', 'STAFF')">
 			            <a class="nav-link"
 			               th:style="${currentPage == 'AboutPage' ? 'active' : '' }"