fixed order

Litteraturbanken · Sep 2, 2024 · 7b0374b · 7b0374b
1 parent aa1dca5
commit 7b0374b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 11 deletions.
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -359,7 +359,8 @@ window.littb = angular
                 templateUrl: require("../views/library.html"),
                 controller: "libraryCtrl",
                 reloadOnSearch: false,
-                title: "E-böcker för nedladdning"
+                title: "E-böcker för nedladdning",
+                isEpub: true
             })
             .when("/ljudarkivet", {
                 templateUrl: require("../views/audiolist.html"),
@@ -714,6 +715,8 @@ littb.run(function ($rootScope, $location, $rootElement, $q, $timeout, bkgConf)
 
         if (newRoute.isReader) {
             $rootElement.addClass(`page-reading`)
+        } else if (newRoute.isEpub) {
+            $rootElement.addClass("page-epub")
         } else if (newRoute.controller != null ? newRoute.controller.replace : undefined) {
             $rootElement.addClass(`page-${newRoute.controller.replace("Ctrl", "")}`)
         }

diff --git a/app/scripts/library_controller.js b/app/scripts/library_controller.js
@@ -224,6 +224,12 @@ littb.controller(
 
         s.keywords_aux = $location.search().keywords_aux?.split(",") || []
 
+        s.onKeywordAuxChange = keywords => {
+            console.log("🚀 ~ keywords:", keywords, s.keyword_aux)
+            s.keywords_aux = keywords
+            s.refreshData()
+        }
+
         s.onSliderChange = () => {
             $location.search("intervall", s.filters["sort_date_imprint.date:range"].join(","))
             s.parts_page.current = 1
@@ -711,7 +717,6 @@ littb.controller(
             try {
                 let { titles, hits, suggest } = await backend.relevanceSearch(
                     "etext,faksimil,pdf,etext-part,faksimil-part,author,presentations,sol,litteraturkartan,wordpress",
-                    // "etext,faksimil,pdf,etext-part,faksimil-part,author",
                     {
                         filter_string: s.rowfilter,
                         keyword_aux: [...s.keywords_aux, ...maybeHide1800],

diff --git a/app/scripts/search_controller.js b/app/scripts/search_controller.js
@@ -466,8 +466,8 @@ littb.controller(
                 args.include_modernized = false
             }
 
-            // args.sort_field = "sortfield"
-            args.sort_field = null
+            args.sort_field = "sortfield"
+            // args.sort_field = null
 
             return args
         }

diff --git a/app/scripts/services.js b/app/scripts/services.js
@@ -8,9 +8,9 @@ import { fromFilters } from "./query.ts"
 const littb = angular.module("littbApp")
 let SIZE_VALS = [625, 750, 1100, 1500, 2050]
 
-// let STRIX_URL = "http://" + location.host.split(":")[0] + ":5001"
+let STRIX_URL = "http://" + location.host.split(":")[0] + ":5001"
 // let STRIX_URL = "https://litteraturbanken.se/api"
-let STRIX_URL = "/api"
+// let STRIX_URL = "/api"
 
 if (
     _.str.startsWith(location.host, "red.l") ||
@@ -1273,7 +1273,7 @@ littb.factory("SearchData", function (backend, $q, $http, $location) {
             delete params.query
             $http({
                 url: `${STRIX_URL}/search_count/${query}`,
-                params: _.omit(params, "number_of_fragments", "from", "to"),
+                params: _.omit(params, "number_of_fragments", "from", "to", "sort_field"),
                 cache: true
             }).then(response => {
                 c.log("count all", response)

diff --git a/app/scripts/util.js b/app/scripts/util.js
@@ -150,7 +150,6 @@ littb.factory("util", function util($location, $filter) {
             return output
         }),
         getKeywordTextfilter(filterObj) {
-            console.log("🚀 ~ file: util.js:153 ~ filterObj", filterObj)
             // sample
             // {
             //     gender: "main_author.gender:female",

diff --git a/app/styles/styles.scss b/app/styles/styles.scss
@@ -2234,7 +2234,7 @@ body > .header {
     }
 }
 
-.page-library {
+.page-library, .page-epub {
 
     display : inline-flex;
     width : 100%;
@@ -2714,6 +2714,19 @@ body > .header {
     } // #mainview
 }
 
+.page-epub {
+    #leftCorridor {
+        .mainnav a {
+            color: white;
+
+            &:hover {
+                color: white;
+                opacity: 0.5;
+            }
+        }
+    }
+}
+
 .page-biblinfo {
 
     #mainview {

diff --git a/app/views/library.html b/app/views/library.html
@@ -205,7 +205,7 @@ <h1 class="text-6xl sm:ml-12">{{:: isLibrary ? 'Botanisera i biblioteket' : 'Hä
                             class="block"
                             label="Avgränsa sökningen"
                             model="keywords_aux"
-                            on-change="keywords_aux = keywords; refreshData()"
+                            on-change="onKeywordAuxChange(keywords)"
                         ></keyword-select>
                     </div>
 
@@ -214,7 +214,7 @@ <h1 class="text-6xl sm:ml-12">{{:: isLibrary ? 'Botanisera i biblioteket' : 'Hä
                             logiskt OCH iställer för ELLER. Du får färre träffar, som då ingår i alla valda samlingar. </span>
                         
                     </div> -->
-                    <div class="title_select_container">
+                    <div class="title_select_container" ng-if="isLibrary">
                         <select
                             multiple
                             class="filter_select keyword_select"