Implemented hiding of the keyword lists in case therere is none yet.

Added new view for analysis keywords. Fixed #40.
WebarchivCZ · Jan 13, 2016 · c68e4cc · c68e4cc
1 parent 4b0df14
commit c68e4cc
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 9 deletions.
diff --git a/src/wa_kat/templates/index_vertical.html b/src/wa_kat/templates/index_vertical.html
@@ -113,15 +113,20 @@ <h1 class="text-center">WA KAT</h1>
       </div>
     </div>
 
-    <div class="form-group" id="whole_keyword_list">
+    <div class="form-group" id="whole_keyword_list" style="display: none">
       <label for="keyword_list" class="control-label col-sm-2">Předmětová hesla</label>
-      <span id="whole_user_keyword_list" class="col-sm-5">
+      <span class="col-sm-1"></span>
+      <span id="whole_user_keyword_list" class="col-sm-3">
         <h4>Uživatelské</h4>
-        <span id="user_keyword_list"></span>
+        <span id="user_keyword_list" class="kw_list"></span>
       </span>
-      <span id="whole_aleph_keyword_list" class="col-sm-5">
+      <span id="whole_analysis_keyword_list" class="col-sm-3">
+        <h4>Analýza webu</h4>
+        <span id="analysis_keyword_list" class="kw_list"></span>
+      </span>
+      <span id="whole_aleph_keyword_list" class="col-sm-3">
         <h4>Aleph</h4>
-        <span id="aleph_keyword_list"></span>
+        <span id="aleph_keyword_list" class="kw_list"></span>
       </span>
     </div>
 

diff --git a/src/wa_kat/templates/static/css/wa_kat.css b/src/wa_kat/templates/static/css/wa_kat.css
@@ -46,6 +46,15 @@ body {
     cursor: pointer;
 }
 
-.kw_enum {
+/*.kw_enum {
     list-style-type: none;
+}*/
+
+.whole_keyword_list {
+    margin-bottom: 1em;
+}
+
+.kw_list ol {
+    padding-left: 0;
+    list-style: none;
 }
diff --git a/src/wa_kat/templates/static/py/components/__init__.py b/src/wa_kat/templates/static/py/components/__init__.py
@@ -12,6 +12,7 @@
 from .keyword_handler import KeywordAdder
 from .keyword_handler import UserKeywordHandler
 from .keyword_handler import AlephKeywordHandler
+from .keyword_handler import AanalysisKeywordHandler
 
 from .conspect_handler import ConspectHandler
 

diff --git a/src/wa_kat/templates/static/py/components/keyword_handler.py b/src/wa_kat/templates/static/py/components/keyword_handler.py
@@ -22,6 +22,7 @@ def __init__(self, el_id, whole_id=None):
 
         self.el = document[el_id]
         self.whole_el = document[whole_id]
+        self.all_lists_el = document["whole_keyword_list"]
 
         self.keywords = []
 
@@ -33,6 +34,8 @@ def __init__(self, el_id, whole_id=None):
             </span>
         """
 
+        self._render()
+
     def _render(self):
         """
         Render the HTML code for all the :attr:`keywords` stored in this class.
@@ -42,8 +45,11 @@ def _render(self):
         # hide the list in case that there is no `keyword` to be displayed
         if self.keywords:
             self.whole_el.style.display = "block"
+            self.all_lists_el.style.display = "block"
         else:
             self.whole_el.style.display = "none"
+            if "<li>" not in self.all_lists_el.html:
+                self.all_lists_el.style.display = "none"
 
         # construct the HTML code for each keyword
         html_lines = (
@@ -94,6 +100,7 @@ def remove_keyword(self, keyword):
 
 UserKeywordHandler = KeywordListHandler("user_keyword_list")
 AlephKeywordHandler = KeywordListHandler("aleph_keyword_list")
+AanalysisKeywordHandler = KeywordListHandler("analysis_keyword_list")
 
 
 class KeywordAdder(object):

diff --git a/src/wa_kat/templates/static/py/view.py b/src/wa_kat/templates/static/py/view.py
@@ -18,6 +18,7 @@
 from components import PlaceholderHandler
 from components import UserKeywordHandler
 from components import AlephKeywordHandler
+from components import AanalysisKeywordHandler
 
 
 # Functions & classes =========================================================
@@ -33,6 +34,7 @@ def __init__(self):
         self.conspect_handler = ConspectHandler
         self.user_kw_handler = UserKeywordHandler
         self.aleph_kw_handler = AlephKeywordHandler
+        self.analysis_kw_handler = AanalysisKeywordHandler
 
     @property
     def _url_el(self):
@@ -273,7 +275,13 @@ def place(self, val):
 
     @property
     def keywords(self):
-        return self.aleph_kw_handler.keywords + self.user_kw_handler.keywords
+        dataset = [
+            self.aleph_kw_handler.keywords,
+            self.user_kw_handler.keywords,
+            self.analysis_kw_handler.keywords,
+        ]
+
+        return sum(dataset, [])  # flattened dataset
 
     @property
     def language(self):

diff --git a/src/wa_kat/templates/static/py/wa_kat_main.py b/src/wa_kat/templates/static/py/wa_kat_main.py
@@ -99,7 +99,7 @@ def fill_inputs(values):
         for remote_name in values.keys():
             # special adapter for aleph keyword view
             if remote_name == "keyword_tags":
-                adder = ViewController.aleph_kw_handler.add_keyword
+                adder = ViewController.analysis_kw_handler.add_keyword
                 for keyword in values[remote_name]:
                     adder(keyword["val"])
                 continue
@@ -153,7 +153,19 @@ def on_complete(cls, req):
         alert(resp)
 
         if resp:
-            AnalysisRunnerAdapter.fill_inputs(resp[0])
+            dataset = resp[0]
+            cls._handle_aleph_keyword_view(dataset)
+            AnalysisRunnerAdapter.fill_inputs(dataset)
+
+    @staticmethod
+    def _handle_aleph_keyword_view(dataset):
+        # redirect the keywords to Aleph view
+        adder = ViewController.aleph_kw_handler.add_keyword
+        for keyword in dataset.get("keyword_tags", []):
+            adder(keyword["val"])
+
+        if "keyword_tags" in dataset:
+            del dataset["keyword_tags"]
 
     @classmethod
     def start(cls, ev):