Changeset 15946 for main/waeup.kofa/trunk/src

Timestamp:

23 Jan 2020, 14:19:15 (5 years ago)

Author:

Henrik Bettermann

Message:

Make further adjustments for fileupload in the applicants section.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• browser.py (modified) (2 diffs)
• browser_templates/applicantdisplaypage.pt (modified) (2 diffs)
• browser_templates/applicanteditpage.pt (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -1003 +1003 @@
         return False
 
+    def display_fileupload(self, filename):
+        """This method can be used in custom packages to avoid unneccessary
+        file uploads.
+        """
+        return True
+
     @property
     def form_fields(self):
@@ -1059 +1065 @@
                 else:
                     self.upload_success = False
-        self.max_file_upload_size = 1024 * getUtility(IStudentsUtils).MAX_KB
+        self.max_file_upload_size = string_from_bytes(
+            1024*getUtility(IStudentsUtils).MAX_KB)
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt

@@ -20 +20 @@
 <table i18n:domain="waeup.kofa" class="form-table">
   <tbody>
+    <tal:files condition="view/file_links">
+      <tr>
+        <td class="separator" colspan=2>
+          Files
+        </td>
+      </tr>
+      <tr>
+        <td colspan=2>
+          <span tal:replace="structure view/file_links" />
+        </td>
+      </tr>
+    </tal:files>
     <tal:widgets content="structure provider:widgets" />
     <tr tal:condition="view/getCourseAdmitted">
@@ -37 +49 @@
       </td>
     </tr>
-    <tal:files>
-      <tr>
-        <td class="separator" colspan=2>
-          Files
-        </td>
-      </tr>
-      <tr>
-        <td colspan=2>
-          <span tal:replace="structure view/file_links" />
-        </td>
-      </tr>
-    </tal:files>
   </tbody>
 </table>

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt

@@ -46 +46 @@
       <tal:files>
         <tr tal:repeat="filename view/additional_files">
-          <td class="fieldname">
-            <span tal:replace="python:filename[0]">FILENAME</span>
-          </td>
-          <td>
-            <p tal:condition="python:view.file_exists(filename[1])">
-              <a tal:attributes="href python:filename[1]"i18n:translate="">
-                Download pdf file
-              </a>
-            </p>
-            <div class="input-group half">
-              <div class="input-group-btn">
-                <div class="btn btn-default btn-file">
-                  Select&hellip;
-                <input type="file" tal:attributes="name python:filename[1]" />
+          <tal:cond tal:condition="python:view.display_fileupload(filename)">
+            <td class="fieldname">
+              <span tal:replace="python:filename[0]">FILENAME</span>:
+            </td>
+            <td>
+              <p tal:condition="python:view.file_exists(filename[1])">
+                <a tal:attributes="href python:filename[1]"i18n:translate="">
+                  Download pdf file
+                </a>
+              </p>
+              <div class="input-group half">
+                <div class="input-group-btn">
+                  <div class="btn btn-default btn-file">
+                    Select&hellip;
+                  <input type="file" tal:attributes="name python:filename[1]" />
+                  </div>
                 </div>
+                <input type="text" class="form-control" readonly>
               </div>
-              <input type="text" class="form-control" readonly>
-            </div>
-            <span i18n:translate="">
-              PDF files only. Max. file size:
-            </span>
-            <span tal:replace="view/max_file_upload_size">10 KB</span>
-          </td>
+              <span i18n:translate="">
+                PDF files only. Max. file size:
+              </span>
+              <span tal:replace="view/max_file_upload_size">10 KB</span>
+            </td>
+          </tal:cond>
         </tr>
       </tal:files>

main/waeup.kofa/trunk/src/waeup/kofa/applicants/utils.py

@@ -44 +44 @@
     #: respective display or input widget.
     SEPARATORS_DICT = {
+      'form.applicant_id': _(u'Base Data'),
       'form.course1': _(u'Desired Study Courses'),
       'form.notice': _(u'Application Process Data'),