documentlist: Show solution type

Fixes fsmi#124... nobody said anything of filtering
Kha · Aug 18, 2015 · 2d75873 · 2d75873
1 parent 108e2c4
commit 2d75873
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/css/fontello.css b/css/fontello.css
@@ -1,10 +1,6 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../fonts/fontello.eot');
-  src: url('../fonts/fontello.eot#iefix') format('embedded-opentype'),
-       url('../fonts/fontello.woff') format('woff'),
-       url('../fonts/fontello.ttf') format('truetype'),
-       url('../fonts/fontello.svg#fontello') format('svg');
+  src: url('../fonts/fontello.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }
@@ -14,7 +10,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../fonts/fontello.svg#fontello') format('svg');
+    src: url('../font/fontello.svg?9104068#fontello') format('svg');
   }
 }
 */
@@ -77,3 +73,5 @@
 .icon-sort-down:before { content: '\e811'; } /* '' */
 .icon-sort-up:before { content: '\e812'; } /* '' */
 .icon-barcode:before { content: '\e813'; } /* '' */
+.icon-ajust:before { content: '\e814'; } /* '' */
+.icon-circle:before { content: '\e815'; } /* '' */
diff --git a/fonts/config.json b/fonts/config.json
@@ -96,6 +96,18 @@
       "code": 59411,
       "src": "fontawesome"
     },
+    {
+      "uid": "ca90da02d2c6a3183f2458e4dc416285",
+      "css": "ajust",
+      "code": 59412,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "130380e481a7defc690dfb24123a1f0c",
+      "css": "circle",
+      "code": 59413,
+      "src": "fontawesome"
+    },
     {
       "uid": "422e07e5afb80258a9c4ed1706498f8a",
       "css": "circle-empty",

diff --git a/fonts/fontello.woff b/fonts/fontello.woff
diff --git a/js/vm/documentlist.js b/js/vm/documentlist.js
@@ -40,6 +40,12 @@ export default class DocumentList {
       new DocumentType({list: this, name: 'oral reexam', title: 'mündliche Nachprüfung', icon: '<span class="icon-chat"><strong style="margin-left: -2px; cursor: default">!</strong></span>'}),
     ];
     this.documentTypeByName = indexBy(this.documentTypes, t => t.name);
+    this.solutionTypeByName = {
+      'official': {title: 'Offizielle Lösung', iconClass: 'icon-circle'},
+      'inofficial': {title: 'Inoffizielle Lösung', iconClass: 'icon-ajust'},
+      'none': {title: 'Ohne Lösung', iconClass: 'icon-circle-empty'},
+    };
+
     this.typeFilter = new Filter({column: 'document_type', operator: 'in_', value: ['written', 'oral', 'oral reexam']});
 
     this.coll = new Collection({

diff --git a/views/documentlist.html b/views/documentlist.html
@@ -1,7 +1,8 @@
 <table id="documentlist" class="table" style="min-width: 710px"><!-- sum of widths since col min-width is ignored -->
   <colgroup>
     <col style="width: 20px">
-    <col style="width: 70px">
+    <col style="width: 35px">
+    <col style="width: 35px">
     <col style="min-width: 130px">
     <col style="width: 100px">
     <col style="width: 90px">
@@ -12,7 +13,7 @@
   <thead>
     <tr class="text-nowrap">
       <td class="td-compact">#</td>
-      <td class="td-compact" data-bind="foreach: documentTypes">
+      <td colspan="2" class="td-compact" data-bind="foreach: documentTypes">
         <div data-bind="visible: totalCount">
           <input type="checkbox" data-bind="checked: selected"><span data-bind="attr: {title: title}, html: icon"></span> <span data-bind="text: count + '/' + (totalCount === undefined ? '' : totalCount)"></span>
         </div>
@@ -44,6 +45,9 @@
     <td class="td-compact" data-bind="with: $parent.documentTypeByName[documentType]">
       <span data-bind="attr: {title: title}, html: icon"></span>
     </td>
+    <td class="td-compact" data-bind="with: $parent.solutionTypeByName[solution]">
+      <span data-bind="attr: {title: title}, css: iconClass"></span>
+    </td>
     <td>
       <ul class="lecture-list-cell" data-bind="foreach: lectures">
         <li data-bind="text: name"></li>