Merge pull request #1116 from BCStudentSoftwareDevTeam/1115-Event-Att…

…achment-Filenames 1115 event attachment filenames
BCStudentSoftwareDevTeam · Jan 19, 2024 · 7a30058 · 7a30058
2 parents b4d1ecd + 822675c
commit 7a30058
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/static/js/displayFilesMacro.js b/app/static/js/displayFilesMacro.js
@@ -1,4 +1,5 @@
 $(document).ready(function(){
+    $("a.fileName").tooltip()
     $(".removeAttachment").on("click", function(){
         let fileId=  $(this).data("id")
         let deleteLink = $(this).data("delete-url")

diff --git a/app/templates/admin/createEvent.html b/app/templates/admin/createEvent.html
@@ -244,7 +244,8 @@
           {% if filepaths %}
           <div class="form-group mb-5">
             {% from 'displayFilesMacro.html' import displayFiles %}
-            {{ displayFiles(filepaths, 'Event Attachments', '/deleteEventFile', '{{course.id}}') }}
+            <!-- {{eventData.id}} -->
+            {{ displayFiles(filepaths, 'Event Attachments', '/deleteEventFile', eventData.id, (eventData.id|string) + "/") }}  
           </div>
             {% endif %}
           </div>

diff --git a/app/templates/displayFilesMacro.html b/app/templates/displayFilesMacro.html
@@ -1,4 +1,4 @@
-{% macro displayFiles(filepaths, titleName, deleteLink, databaseId)  %}
+{% macro displayFiles(filepaths, titleName, deleteLink, databaseId, prefixToRemove="")  %}
 <table>
     <tr>
         <td class="py-2"><strong>Display</strong></td>
@@ -19,8 +19,9 @@
                 {% endif %}
             </td>
             <td class="py-2 px-3" >
-                {% set filename = key[:8] + "..." + key[-10:] if key|length > 25 else key %}
-                <a class="mr-5 fileName" data-filename='{{ key }}' href="{{ value[0] }}" target="_blank">{{ filename }}</a>
+                {% set filename = key.removeprefix(prefixToRemove) %}
+                {% set shortname = filename[:8] + "..." + filename[-10:] if filename|length > 25 else filename %}
+                <a class="mr-5 fileName" data-filename='{{ filename }}' href="{{ value[0] }}" target="_blank" data-toggle="tooltip" data-placement="top" title="{{filename}}" aria-labelledby="{{filename}}">{{ shortname }}</a>
             </td>
             <td style="text-align:center">
                 <button