Verse stats.

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 519d574..3bc943d 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -10,7 +10,7 @@ python-slugify
 python-docx==0.8.11
 Wikidata==0.7
 
 python-docx==0.8.11
 Wikidata==0.7
 

-librarian==2.4.8
+librarian==2.4.9

 
 ## Django
 Django==4.0.6
 
 ## Django
 Django==4.0.6

diff --git a/src/documents/templates/documents/book_detail.html b/src/documents/templates/documents/book_detail.html
index 268fb57..226c4d4 100644 (file)
--- a/src/documents/templates/documents/book_detail.html
+++ b/src/documents/templates/documents/book_detail.html
@@ -188,6 +188,8 @@
             <th>{% trans "characters (with footnotes)" %}</th>
             <th>{% trans "words" %}</th>
             <th>{% trans "words (with footnotes)" %}</th>
             <th>{% trans "characters (with footnotes)" %}</th>
             <th>{% trans "words" %}</th>
             <th>{% trans "words (with footnotes)" %}</th>

+            <th>{% trans "wiersze (+ inne znaki)" %}</th>
+            <th>{% trans "wiersze (+ inne znaki, z przypisami)" %}</th>

           </tr>
         </thead>
         <tbody>
           </tr>
         </thead>
         <tbody>

diff --git a/src/documents/templates/documents/book_stats.html b/src/documents/templates/documents/book_stats.html
index 793eaa2..5ce14de 100644 (file)
--- a/src/documents/templates/documents/book_stats.html
+++ b/src/documents/templates/documents/book_stats.html
@@ -1,9 +1,11 @@
 <tr>
   <td style="padding-left: {{ depth}}.75em;">{{ book.book_info.title|default:"???" }}</td>
 <tr>
   <td style="padding-left: {{ depth}}.75em;">{{ book.book_info.title|default:"???" }}</td>

-  <td>{{ stats.self.chars_with_fn|default_if_none:"?" }}</td>

   <td>{{ stats.self.chars|default_if_none:"?" }}</td>
   <td>{{ stats.self.chars|default_if_none:"?" }}</td>

-  <td>{{ stats.self.words_with_fn|default_if_none:"?" }}</td>
+  <td>{{ stats.self.chars_with_fn|default_if_none:"?" }}</td>

   <td>{{ stats.self.words|default_if_none:"?" }}</td>
   <td>{{ stats.self.words|default_if_none:"?" }}</td>

+  <td>{{ stats.self.words_with_fn|default_if_none:"?" }}</td>
+  <td>{{ stats.self.verses|default_if_none:"?" }} <small>+ {{ stats.self.chars_out_verse|default_if_none:"?" }} zn.</small></td>
+  <td>{{ stats.self.verses_with_fn|default_if_none:"?" }} <small> + {{ stats.self.chars_out_verse_with_fn|default_if_none:"?" }} zn.</small></td>

 </tr>
 {% if stats.parts %}
   {% for part, partstats in stats.parts %}
 </tr>
 {% if stats.parts %}
   {% for part, partstats in stats.parts %}


@@ -11,9 +13,13 @@
   {% endfor %}
   <tr>
     <td style="padding-left: {{ depth}}.75em;">&Sigma;</td>
   {% endfor %}
   <tr>
     <td style="padding-left: {{ depth}}.75em;">&Sigma;</td>

-    <td>{{ stats.total.chars_with_fn }}</td>

     <td>{{ stats.total.chars }}</td>
     <td>{{ stats.total.chars }}</td>

-    <td>{{ stats.total.words_with_fn }}</td>
+    <td>{{ stats.total.chars_with_fn }}</td>

     <td>{{ stats.total.words }}</td>
     <td>{{ stats.total.words }}</td>

+    <td>{{ stats.total.words_with_fn }}</td>
+
+    <td>{{ stats.total.verses }} <small>+ {{ stats.total.chars_out_verse }} zn.</small></td>
+    <td>{{ stats.total.verses_with_fn }} <small> + {{ stats.total.chars_out_verse_with_fn }} zn.</small></td>
+

   </tr>
 {% endif %}
   </tr>
 {% endif %}