Changeset 13263

Timestamp:

17 Sep 2015, 06:26:01 (9 years ago)

Author:

Henrik Bettermann

Message:

Show file size of pdf documents in the documents section.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/documents/fileviewlets.py (modified) (3 diffs)
• src/waeup/kofa/documents/tests/test_browser.py (modified) (1 diff)
• src/waeup/kofa/students/export.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -5 +5 @@
 =======================
 
-* no changes yet
+* Show file size of pdf documents in the documents section.
 
 1.3.2 (2015-09-14)

main/waeup.kofa/trunk/src/waeup/kofa/documents/fileviewlets.py

@@ -18 +18 @@
 
 import grok
+from zope.component import getUtility
+from waeup.kofa.interfaces import IExtFileStore
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.browser.layout import UtilityView
 from waeup.kofa.browser.fileviewlets import (
     FileDisplay, FileUpload, Image)
+from waeup.kofa.utils.helpers import file_size
 
 from waeup.kofa.documents.document import PDFDocument
@@ -46 +49 @@
     @property
     def download_filename(self):
-        return u"%s.pdf" % self.context.document_id
+        file = getUtility(IExtFileStore).getFileByContext(
+            self.context, attr=self.download_name)
+        fs = file_size(file)/1024.0
+        return u"%s.pdf (%.1f kB)" % (self.context.document_id, fs)
 
 
@@ -62 +68 @@
     @property
     def download_filename(self):
-        return u"%s.pdf" % self.context.document_id
+        file = getUtility(IExtFileStore).getFileByContext(
+            self.context, attr=self.download_name)
+        fs = file_size(file)/1024.0
+        return u"%s.pdf (%.1f kB)" % (self.context.document_id, fs)
 
 

main/waeup.kofa/trunk/src/waeup/kofa/documents/tests/test_browser.py

@@ -147 +147 @@
         self.browser.getControl(
             name='upload_pdfscanmanageupload').click()
-        self.assertTrue(
-            'href="http://localhost/app/documents/DOC1/file.pdf">DOC1.pdf</a>'
+        # The file size is shown
+        self.assertTrue(
+            'href="http://localhost/app/documents/DOC1/file.pdf">DOC1.pdf (23.7 kB)</a>'
+            in self.browser.contents)
+        # Also on display page the file size is displayed.
+        self.browser.open(self.container_path + '/DOC1')
+        self.assertTrue(
+            'href="http://localhost/app/documents/DOC1/file.pdf">DOC1.pdf (23.7 kB)</a>'
             in self.browser.contents)
         # The file can be found in the file system

main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

@@ -324 +324 @@
     catalog. It searches for students in the course tickets catalog and
     exports those course tickets which belong to the given course code and
-    also meet level and (level_)session passed through at the same time.
+    also meet level and session passed through at the same time.
     This happens if the exporter is called at course level in the academic
     section.