Changeset 7857

Timestamp:

Oct 20, 2020, 8:20:12 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2224: Files should be annotatable

Added support for annotations to file list, view and edit pages.

Location:

trunk/www/filemanager/files

Files:

• edit_file.jsp (modified) (2 diffs)
• files.js (modified) (4 diffs)
• index.jsp (modified) (1 diff)
• list_files.jsp (modified) (7 diffs)
• view_file.jsp (modified) (1 diff)

trunk/www/filemanager/files/edit_file.jsp

@@ -133 +133 @@
   %>
   <base:page type="popup" title="<%=title%>" id="edit-page">
-  <base:head scripts="tabcontrol-2.js,~files.js" styles="tabcontrol.css">
+  <base:head scripts="tabcontrol-2.js,subtypes.js,~files.js" styles="tabcontrol.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
@@ -300 +300 @@
       </table>
     </t:tab>
+    <t:tab id="annotations" title="Annotations" helpid="annotations.edit">
+      <jsp:include page="../../common/annotations/annotate_frameset.jsp">
+        <jsp:param name="item_type" value="<%=itemType.name()%>" />
+        <jsp:param name="item_id" value="<%=itemId%>" />
+        <jsp:param name="ID" value="<%=ID%>" />
+      </jsp:include>
+    </t:tab>
     </t:tabcontrol>
     </form>

trunk/www/filemanager/files/files.js

@@ -43 +43 @@
       // Tab validation
       TabControl.addTabValidator('settings.info', fileManager.validateFile);
+      TabControl.addTabActivateListener('settings.annotations', fileManager.loadAnnotationsFrame);
 
       // MIME type
@@ -79 +80 @@
       Buttons.addClickHandler('moveOffline', fileManager.moveToLocation);
       
+      TabControl.addTabActivateListener('main.annotations', AnnotationsList.loadOnce);
       TabControl.addTabActivateListener('main.history', History.loadOnce);
     }
@@ -387 +389 @@
     if (TabControl.validateActiveTab('settings'))
     {
+      Annotations.saveModifiedAnnotationsToForm(frm);
       frm.submit();
     }
@@ -428 +431 @@
     }
   }
+  
+  fileManager.loadAnnotationsFrame = function()
+  {
+    Annotations.autoLoadEditFrame(null, ItemSubtype.getSubtypeId('subtype_id'), null);
+  }
+
 
   return fileManager;

trunk/www/filemanager/files/index.jsp

@@ -236 +236 @@
       }
       
+      // Annotations tab
+      Base.updateAnnotations(dc, file, file, request);
+      
       // OnSave extensions
       invoker.render(OnSaveRenderer.ON_SAVE);

trunk/www/filemanager/files/list_files.jsp

@@ -35 +35 @@
   import="net.sf.basedb.core.Directory"
   import="net.sf.basedb.core.ItemSubtype"
+  import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultIterator"
@@ -54 +55 @@
   import="net.sf.basedb.core.plugin.GuiContext"
   import="net.sf.basedb.core.plugin.Plugin"
+  import="net.sf.basedb.core.snapshot.AnnotationLoaderUtil"
+  import="net.sf.basedb.core.snapshot.AnnotationTypeFilter"
+  import="net.sf.basedb.core.snapshot.AnnotationSnapshot"
+  import="net.sf.basedb.core.snapshot.AnnotationSetSnapshot"
+  import="net.sf.basedb.core.snapshot.SnapshotManager"
   import="net.sf.basedb.util.Enumeration"
   import="net.sf.basedb.util.ShareableUtil"
@@ -74 +80 @@
   import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerUtil"
   import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerContext"
+  import="net.sf.basedb.clients.web.util.ProjectSpecificInfoFilter"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
   import="java.util.Iterator"
@@ -104 +111 @@
 ItemResultIterator<File> files = null;
 ItemResultIterator<Directory> directories = null;
+List<AnnotationLoaderUtil> annotationLoaders = new ArrayList<AnnotationLoaderUtil>();
 try
 {
@@ -113 +121 @@
   Unit bytes = UnitUtil.getUnit(dc, Quantity.STORAGE_SIZE, "B");
   Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
+
+  ItemQuery<AnnotationType> annotationTypeQuery = Base.getAnnotationTypesQuery(itemType);
+  SnapshotManager manager = new SnapshotManager();
+  ProjectSpecificInfoFilter psInfo = new ProjectSpecificInfoFilter();
+  for (AnnotationType at : annotationTypeQuery.list(dc))
+  {
+    annotationLoaders.add(new AnnotationLoaderUtil(dc, manager, at));
+  }
 
   // Get all file types
@@ -512 +528 @@
         datatype="string"
       />
+      <%
+      for (AnnotationLoaderUtil loader : annotationLoaders)
+      {
+        AnnotationType at = loader.getAnnotationType();
+        Formatter<Object> formatter = FormatterFactory.getTypeFormatter(sc, at.getValueType());
+        Enumeration<String, String> annotationEnum = null;
+        if (at.isEnumeration())
+        {
+          annotationEnum = new Enumeration<String, String>();
+          if (!at.getDisplayAsList()) annotationEnum.add("", "-none-");
+          List<?> values = at.getValues();
+          for (Object value : values)
+          {
+            String encoded = HTML.encodeTags(value.toString());
+            annotationEnum.add(encoded, encoded);
+          }
+        }
+        %>
+        <tbl:columndef 
+          id="<%=(loader.isSearchingInheritedAnnotations() ? "ia" : "at")+at.getId()%>"
+          title="<%=HTML.encodeTags(at.getName())+(loader.isSearchingInheritedAnnotations() ? " [I]" : " [A]")%>" 
+          property="<%=(loader.isSearchingInheritedAnnotations() ? "##" : "#")+at.getId()%>"
+          annotation="true"
+          datatype="<%=at.getValueType().getStringValue()%>"
+          enumeration="<%=annotationEnum%>"
+          smartenum="<%=at.getDisplayAsList() %>"
+          sortable="<%=at.getMultiplicity() == 1 && !loader.isSearchingInheritedAnnotations()%>" 
+          filterable="true" 
+          exportable="true"
+          formatter="<%=formatter%>"
+          unit="<%=at.getDefaultUnit()%>"
+        />
+        <%
+      }
+      %>
       <tbl:columndef 
         id="xt-columns" 
@@ -1002 +1053 @@
                   %>
                 </tbl:cell>
+                <%
+                if (item.isAnnotated())
+                {
+                  AnnotationSetSnapshot snapshot = manager.getSnapshot(dc, item.getAnnotationSet().getId());
+                  for (AnnotationLoaderUtil loader : annotationLoaders)
+                  {
+                    %>
+                    <tbl:cell 
+                      column="<%=(loader.isSearchingInheritedAnnotations() ? "ia" : "at")+loader.getId()%>"
+                      ><%
+                      if (loader.find(snapshot, psInfo.reset())) 
+                      {
+                        %><tbl:cellvalue 
+                          list="<%=loader.getValues()%>"
+                          suffix="<%=loader.getUnitSymbol()%>"
+                          clazz="<%=psInfo.overridesDefaultAnnotation() ? "ps-annotation" : null%>"
+                        /><%
+                      }
+                      %></tbl:cell>
+                    <%
+                  }
+                }
+                %>
                 <tbl:xt-cells dc="<%=dc%>" item="<%=item%>">
                   <tbl:cell column="xt-columns" />

trunk/www/filemanager/files/view_file.jsp

@@ -350 +350 @@
       </jsp:include>
     </t:tab>
+    <t:tab id="annotations" title="Annotations" 
+      tooltip="View annotation values" clazz="white">
+      <jsp:include page="../../common/annotations/list_frameset.jsp">
+        <jsp:param name="item_type" value="<%=itemType.name()%>" />
+        <jsp:param name="item_id" value="<%=itemId%>" />
+        <jsp:param name="ID" value="<%=ID%>" />
+      </jsp:include>
+    </t:tab>
+    
     <t:tab id="history" title="History"
       tooltip="Displays a log with the history of this item"