From 8e3a98cc56809196ad7afd836c67d6ad52c22044 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Mon, 22 Mar 2021 19:20:00 +0100
Subject: [PATCH] Collapse all results on virtual article display

---
 .../body/search/search-pagedResults.ftl       | 118 +++++++++---------
 1 file changed, 61 insertions(+), 57 deletions(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
index e869d1ec9..9da58b472 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
@@ -57,6 +57,7 @@
         </div>
     </#if>
 
+
     <div class="virtualArticleSwitch">
       <label class="switch">Показать виртуальную статью
         <input id="virtualArticleCheck" type="checkbox" checked="false" onclick="showVirtualArticles();">
@@ -66,6 +67,7 @@
 	  </#if>
     </div>
 
+
     
     <#-- Search results -->
     <ul class="searchhits">
@@ -122,17 +124,20 @@
 </div> <!-- end contentsBrowseGroup -->
 
 <script>
-$('input[type=checkbox]').removeAttr('checked');
-  function showVirtualArticles(){
-    var checkBox = document.getElementById("virtualArticleCheck");
-    if (checkBox.checked == true){
-      $('.excerptSearchResult').hide();
-      $('.virtualArticlePart').show();
-    } else {
-      $('.excerptSearchResult').show();
-      $('.virtualArticlePart').hide();
+  document.addEventListener('DOMContentLoaded', createVirtualCompilation(), false);
+  
+  $('input[type=checkbox]').removeAttr('checked');
+    function showVirtualArticles(){
+      var checkBox = document.getElementById("virtualArticleCheck");
+      if (checkBox.checked == true){
+        $('.searchResult').hide();
+        $('.virtualArticlePart').show();
+      } else {
+        $('.searchResult').show();
+        $('.virtualArticlePart').hide();
+      }
     }
-  }
+    
 	function createNewCompilation() {
    	    var excerpts = $('.virtualArticlePart').toArray();
 	    if (excerpts.length == 0){
@@ -187,54 +192,53 @@ $('input[type=checkbox]').removeAttr('checked');
 	  window.open(newURL,"_self");
 	}
 
+  function createVirtualCompilation(){
+      let workSet = new Set(); 
+	  let biblioSet = new Set(); 
+	  var workDivs = $('.virtualArticleWork');
+	  var biblioDivs = $('.virtualArticleBibliography');
+	  biblioDivs.each(function() {
+	   biblioSet.add($(this).html());
+	  });
+	  workDivs.each(function() {
+	   workSet.add($(this).html());
+	  });
+	  var workArr = Array.from(workSet);
+	  workArr.sort();
+	  var biblioArr = Array.from(biblioSet);
+	  biblioArr.sort();
+	  if (workArr.length > 0 ) {
+	    $('<div class="virtualWorks virtualArticlePart"><button type="button" style="margin-top:16px;border:none;padding: 18px;width: 100%; text-align:left;" class="collapsible">Работы</button><div class="virtualWorks"></div></div>').insertAfter($('.virtualArticlePart').last());
+	    for (let value of workArr){
+	      $('.virtualWorks').last().append( '<div class="work"><p>' + value + '</p></div>' );
+	    }
+	  }
+	  if (biblioArr.length > 0 ) {
+	    $('<div class="virtualBibliography virtualArticlePart"><button type="button" style="margin-top:16px;border:none;padding: 18px;width: 100%; text-align:left;" class="collapsible">Литература</button><div class="virtualBibliography"></div></div>').insertAfter($('.virtualArticlePart').last());
+	    for (let value of biblioArr){
+	      $('.virtualBibliography').last().append( '<div class="bibliography"><p>' + value + '</p></div>' );
+	    }
+	  }
+	  $('.virtualWorks').hide();
+	  $('.virtualBibliography').hide();
+	  $('.virtualArticlePart').hide();
+	  var coll = document.getElementsByClassName("collapsible");
+	  var i;
+	  for (i = 0; i < coll.length; i++) {
+	    coll[i].addEventListener("click", function() {
+	      this.classList.toggle("active");
+	      var content = this.nextElementSibling;
+	      if (content.style.display === "block") {
+	        content.style.display = "none";
+	      } else {
+	        content.style.display = "block";
+	      }
+	    });
+	  }
+  }
+  
+</script>
 
-</script>
-<script>
-  let workSet = new Set(); 
-  let biblioSet = new Set(); 
-  var workDivs = $('.virtualArticleWork');
-  var biblioDivs = $('.virtualArticleBibliography');
-  biblioDivs.each(function() {
-   biblioSet.add($(this).html());
-  });
-  workDivs.each(function() {
-   workSet.add($(this).html());
-  });
-  var workArr = Array.from(workSet);
-  workArr.sort();
-  var biblioArr = Array.from(biblioSet);
-  biblioArr.sort();
-  if (workArr.length > 0 ) {
-    $('<div class="virtualWorks virtualArticlePart"><button type="button" style="margin-top:16px;border:none;padding: 18px;width: 100%; text-align:left;" class="collapsible">Работы</button><div class="virtualWorks"></div></div>').insertAfter($('.virtualArticlePart').last());
-    for (let value of workArr){
-      $('.virtualWorks').last().append( '<div class="work"><p>' + value + '</p></div>' );
-    }
-  }
-  if (biblioArr.length > 0 ) {
-    $('<div class="virtualBibliography virtualArticlePart"><button type="button" style="margin-top:16px;border:none;padding: 18px;width: 100%; text-align:left;" class="collapsible">Литература</button><div class="virtualBibliography"></div></div>').insertAfter($('.virtualArticlePart').last());
-    for (let value of biblioArr){
-      $('.virtualBibliography').last().append( '<div class="bibliography"><p>' + value + '</p></div>' );
-    }
-  }
-</script>
-<script>
-  $('.virtualWorks').hide();
-  $('.virtualBibliography').hide();
-  $('.virtualArticlePart').hide();
-  var coll = document.getElementsByClassName("collapsible");
-  var i;
-  for (i = 0; i < coll.length; i++) {
-    coll[i].addEventListener("click", function() {
-      this.classList.toggle("active");
-      var content = this.nextElementSibling;
-      if (content.style.display === "block") {
-        content.style.display = "none";
-      } else {
-        content.style.display = "block";
-      }
-    });
-  }
-</script>
 ${stylesheets.add('<link rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />',
   				  '<link rel="stylesheet" href="${urls.base}/css/search.css" />',
                   '<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}