Put category tags on column headers. Fixes #45.

openzim · Aug 17, 2019 · 0c8cbf5 · 0c8cbf5
1 parent 10bdcc6
commit 0c8cbf5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/wp1/tables.py b/wp1/tables.py
@@ -33,6 +33,7 @@ def labels_for_classes(sort_qual, sort_imp):
   for k in sort_qual.keys():
     qual_labels[k] = '{{%s}}' % k.decode('utf-8')
   qual_labels[ASSESSED_CLASS] = "{{Assessed-Class}}"
+  qual_labels[UNASSESSED_CLASS] = "'''Unassessed'''"
 
   for k in sort_imp.keys():
     imp_labels[k] = '{{%s}}' % k.decode('utf-8')
@@ -134,10 +135,16 @@ def get_project_categories(wp10db, project_name):
       elif row['c_type'] == b'importance':
         imp_labels[row['c_rating']] = 'Other'
     else:
-      qual_labels[row['c_rating']] = ('{{%s|category=Category:%s}}' %
-                                      (row['c_rating'].decode('utf-8'),
-                                       row['c_category'].decode('utf-8')))
-
+      if row['c_type'] == b'quality':
+        labels = qual_labels
+      elif row['c_type'] == b'importance':
+        labels = imp_labels
+
+      labels[row['c_rating']] = (
+        '{{%s|category=Category:%s}}' % (row['c_rating'].decode('utf-8'),
+                                         row['c_category'].decode('utf-8'))
+      )
+
   return {
     'sort_qual': sort_qual,
     'sort_imp': sort_imp,

diff --git a/wp1/tables_test.py b/wp1/tables_test.py
@@ -54,6 +54,8 @@ def test_labels_for_classes(self):
     for k, actual in actual_qual.items():
       if k == tables.ASSESSED_CLASS:
         expected = '{{Assessed-Class}}'
+      elif k == tables.UNASSESSED_CLASS:
+        expected = "'''Unassessed'''"
       else:
         expected = '{{%s}}' % k.decode('utf-8')
       self.assertEqual(expected, actual)
@@ -364,14 +366,22 @@ def test_db_project_categories(self):
 
   def test_get_project_categories(self):
     expected = {
-      'imp_labels': {b'High-Class': '{{High-Class}}',
-                     b'Low-Class': '{{Low-Class}}',
-                     b'Mid-Class': '{{Mid-Class}}',
-                     b'NA-Class': '{{NA-Class}}',
-                     b'NotA-Class': 'Other',
-                     b'Top-Class': '{{Top-Class}}',
-                     b'Unassessed-Class': 'No-Class',
-                     b'Unknown-Class': '{{Unknown-Class}}'},
+      'imp_labels': {
+        b'High-Class':
+          '{{High-Class|category=Category:High-importance_Catholicism_articles}}',
+        b'Low-Class':
+          '{{Low-Class|category=Category:Low-importance_Catholicism_articles}}',
+        b'Mid-Class':
+          '{{Mid-Class|category=Category:Mid-importance_Catholicism_articles}}',
+        b'NA-Class':
+          '{{NA-Class|category=Category:NA-importance_Catholicism_articles}}',
+        b'NotA-Class': 'Other',
+        b'Top-Class':
+          '{{Top-Class|category=Category:Top-importance_Catholicism_articles}}',
+        b'Unassessed-Class': 'No-Class',
+        b'Unknown-Class':
+          '{{Unknown-Class|category=Category:Unknown-importance_Catholicism_articles}}'
+      },
       'qual_labels': {
         b'A-Class':
           '{{A-Class|category=Category:A-Class_Catholicism_articles}}',
@@ -397,16 +407,10 @@ def test_get_project_categories(self):
           '{{File-Class|category=Category:File-Class_Catholicism_articles}}',
         b'GA-Class':
           '{{GA-Class|category=Category:GA-Class_Catholicism_articles}}',
-        b'High-Class':
-          '{{High-Class|category=Category:High-importance_Catholicism_articles}}',
         b'Image-Class':
           '{{Image-Class|category=Category:Category:Image-Class Catholicism articles}}',
         b'List-Class':
           '{{List-Class|category=Category:List-Class_Catholicism_articles}}',
-        b'Low-Class':
-          '{{Low-Class|category=Category:Low-importance_Catholicism_articles}}',
-        b'Mid-Class':
-          '{{Mid-Class|category=Category:Mid-importance_Catholicism_articles}}',
         b'NA-Class':
           '{{NA-Class|category=Category:NA-Class_Catholicism_articles}}',
         b'NotA-Class': ' style="text-align: center;" | ' "'''Other'''",
@@ -422,17 +426,13 @@ def test_get_project_categories(self):
           '{{Stub-Class|category=Category:Stub-Class_Catholicism_articles}}',
         b'Template-Class':
           '{{Template-Class|category=Category:Template-Class_Catholicism_articles}}',
-        b'Top-Class':
-          '{{Top-Class|category=Category:Top-importance_Catholicism_articles}}',
-        b'Unassessed-Class':
-          '{{Unassessed-Class|category=Category:Unassessed_Catholicism_articles}}',
-        b'Unknown-Class':
-          '{{Unknown-Class|category=Category:Unknown-importance_Catholicism_articles}}'},
+        b'Unassessed-Class': '{{Unassessed-Class|category=Category:Unassessed_Catholicism_articles}}',
+      },
       'sort_imp': self.sort_imp,
       'sort_qual': self.sort_qual,
     }
     actual = tables.get_project_categories(self.wp10db, b'Catholicism')
-
+    self.maxDiff = None
     self.assertEqual(expected, actual)
 
   def test_data_for_stats(self):