Merge branch 'main' into development

flaskinventory/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.0.4"
+__version__ = "1.1.0"
 
 import logging
 import json

flaskinventory/templates/add/newsource.html

@@ -498,10 +498,10 @@ <h3 class="mb-4">Information about the Audience</h3>
                 <input name="audience_size" type="number" step="1" min="1900" max="2100" class="form-control form-control-lg" id="audience-size-year" aria-describedby="audience-size-year-feedback" placeholder="YYYY">
                 <div id="audience-size-year-feedback"></div>
             </div>
-            <div id="group-audience-size-datafrom" class="mb-5">
-                <label for="audience-size-datafrom" class="form-label fw-bold fs-5">Where did you get this number (i.e., number of sold copies per issue) from? Please type the name of the data source or paste a link.<span class="text-muted mx-1">(optional)</span></label>
-                <input name="audience_size|datafrom" type="text" class="form-control form-control-lg" id="audience-size-datafrom" aria-describedby="audience-size-datafrom-feedback" placeholder="Please specify name or a link">
-                <div id="audience-size-datafrom-feedback"></div>
+            <div id="group-audience-size-data_from" class="mb-5">
+                <label for="audience-size-data_from" class="form-label fw-bold fs-5">Where did you get this number (i.e., number of sold copies per issue) from? Please type the name of the data source or paste a link.<span class="text-muted mx-1">(optional)</span></label>
+                <input name="audience_size|data_from" type="text" class="form-control form-control-lg" id="audience-size-data_from" aria-describedby="audience-size-data_from-feedback" placeholder="Please specify name or a link">
+                <div id="audience-size-data_from-feedback"></div>
             </div>
 
         </div>
@@ -869,7 +869,7 @@ <h4 class="mb-4">
                     Value
                 </h4>
             </div>
-            <div id='summary-audience_size_datafrom' hidden>
+            <div id='summary-audience_size_data_from' hidden>
                 <h6 class="text-muted mb-1">
                     Where did you get this number from?
                 </h6>

flaskinventory/templates/main/about.html

@@ -68,6 +68,16 @@ <h1>About</h1>
 
 # Changelog
 
+### 24 Aug 2022 (Version 1.1.0): Advanced Queries 🎉
+
+ - Complete overhaul of query system
+ - Entries can now be queried according to assorted predicates (i.e. variables). 
+    Results are presented in a paginated table. 
+ - Individual views now also lead to proper query pages. 
+        E.g, you can now view all news sources included in a data archive or dataset.
+ - Minor update: *Meteor* now has `<meta>` tags
+ - Some minor UI tweaks
+
 ### 18 Aug 2022 (Version 1.0.4): Bug Fixes & UI Improvements
 
  - Fixed bug that prevented addresses to be deleted from Organizations

flaskinventory/templates/query/sidebar.html

@@ -104,11 +104,24 @@ <h5 class="flex-grow-1">Query </h5>
 
 
 function rearrange() {
-    // let all = document.querySelectorAll('[data-entities]')
     for (predicate of correctOrder) {
         let el = document.getElementById(predicate).parentElement
         sortedContainer.appendChild(el)
     }
+    let all = document.querySelectorAll('[data-entities]')
+    for (el of all) {
+        if (el.checked) {
+            if (el.parentElement.parentElement.id != sortedContainer.id) {
+                sortedContainer.appendChild(el.parentElement)
+            }
+        }
+        if (el.value && el.type !== 'checkbox') {
+            console.log(el)
+            if (el.parentElement.parentElement.id != sortedContainer.id) {
+                sortedContainer.appendChild(el.parentElement)
+            }
+        }
+    }
 }