sunc and update webapp 16-10

Author: Devamitta

exporter/webapp/data_classes.py

@@ -1,19 +1,16 @@
-from db.models import DpdRoot, Lookup
+from db.models import DpdHeadword, DpdRoot, Lookup
 from tools.configger import config_test
 from tools.date_and_time import year_month_day_dash
-from tools.degree_of_completion import degree_of_completion
 from tools.meaning_construction import (
     make_grammar_line,
-    make_meaning_combo_html,
-    summarize_construction,
 )
 
 
 class HeadwordData:
-    def __init__(self, i, fc, fi, fs):
-        self.meaning = make_meaning_combo_html(i)
-        self.summary = summarize_construction(i)
-        self.complete = degree_of_completion(i)
+    def __init__(self, i: DpdHeadword, fc, fi, fs):
+        self.meaning = i.meaning_combo_html
+        self.summary = i.construction_summary
+        self.complete = i.degree_of_completion_html
         self.grammar = make_grammar_line(i)
         self.i = self.convert_newlines(i)
         self.fc = fc

exporter/webapp/data_classes_ru.py

@@ -1,4 +1,4 @@
-from db.models import DpdRoot, Lookup
+from db.models import DpdHeadword, DpdRoot, Lookup
 from tools.tools_for_ru_exporter import (
     make_ru_meaning,
     ru_make_grammar_line,
@@ -8,14 +8,13 @@
 from tools.configger import config_test
 from tools.date_and_time import year_month_day_dash
 from tools.degree_of_completion_ru import rus_degree_of_completion
-from tools.meaning_construction import summarize_construction, make_meaning_combo_html
 
 
 class HeadwordData:
-    def __init__(self, i, fc, fi, fs):
-        self.meaning = make_meaning_combo_html(i)
+    def __init__(self, i: DpdHeadword, fc, fi, fs):
+        self.meaning = i.meaning_combo_html
         self.ru_meaning = make_ru_meaning(i)
-        self.summary = summarize_construction(i)
+        self.summary = i.construction_summary
         self.rus_complete = rus_degree_of_completion(i)
         self.ru_grammar = ru_make_grammar_line(i)
         self.ru_pos = ru_replace_abbreviations(i.pos, "gram")

exporter/webapp/main.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from contextlib import contextmanager
 import re
 
@@ -222,7 +223,7 @@ def update_history(
     if history_tuple in history_list:
         history_list.remove(history_tuple)
     history_list.insert(0, history_tuple)
-    return history_list[:25]
+    return history_list[:250]
 
 
 if __name__ == "__main__":

exporter/webapp/main_ru.py

@@ -310,7 +310,7 @@ def update_history(
     if history_tuple in history_list:
         history_list.remove(history_tuple)
     history_list.insert(0, history_tuple)
-    return history_list[:25]
+    return history_list[:250]
 
 
 if __name__ == "__main__":

exporter/webapp/ru_templates/deconstructor.html

@@ -1,15 +1,24 @@
 <h3>деконструктор: {{d.headword}}</h3>
-<div class='dpd'>
-    <p>
-        {% for deconstruction in d.deconstructions: %}
-            {{deconstruction}}
-        {% if not loop.last: %}
-            <br>
-        {% endif %}
-        {% endfor %}
-    </p>
-    <p class='footer'>
-        Эти разбиения слов создаются автоматически. <a class="link" href="https://docs.google.com/forms/d/1iMD9sCSWFfJAFCFYuG9HRIyrr9KFRy0nAOVApM998wM/viewform?usp=pp_url&entry.438735500={{d.lookup_key}}&entry.326955045=Деконструктор&entry.1433863141={{d.app_name}}+{{d.date}}" target="_blank">Предложения приветствуются здесь.</a>
-        <br>Ошибки в деконструкции обычно вызваны отсутствием слова в словаре. <a class="link" href="https://docs.google.com/forms/d/e/1FAIpQLSfResxEUiRCyFITWPkzoQ2HhHEvUS5fyg68Rl28hFH6vhHlaA/viewform?usp=pp_url&entry.1433863141={{d.app_name}}+{{d.date}}" target="_blank">Добавьте отсутствующие слова здесь</a>.
-    </p>
+<div class="dpd">
+  <p>
+    {% for deconstruction in d.deconstructions: %} {{deconstruction}} {% if not
+    loop.last: %}
+    <br />
+    {% endif %} {% endfor %}
+  </p>
+  <p class="footer">
+    Эти разбиения слов создаются автоматически. Подробнее
+    <a
+      class="link"
+      href="https://https://devamitta.github.io/dpd.rus/features/deconstructor/"
+      target="_blank">в документации</a>. Предложения приветствуются
+    <a
+      class="link"
+      href="https://docs.google.com/forms/d/1iMD9sCSWFfJAFCFYuG9HRIyrr9KFRy0nAOVApM998wM/viewform?usp=pp_url&entry.438735500={{d.headword}}&entry.326955045=Деконструктор&entry.1433863141={{d.app_name}}+{{d.date}}"
+      target="_blank">здесь</a>. Ошибки в деконструкции обычно вызваны отсутствием слова в словаре. Вы можете
+    <a
+      class="link"
+      href="https://docs.google.com/forms/d/e/1FAIpQLSfResxEUiRCyFITWPkzoQ2HhHEvUS5fyg68Rl28hFH6vhHlaA/viewform?usp=pp_url&entry.1433863141={{d.app_name}}+{{d.date}}"
+      target="_blank">добавить отсутствующие слова здесь</a>.
+  </p>
 </div>