Changeset 7616

Timestamp:

Mar 4, 2019, 7:44:18 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2149: Batch item importers should be able to use an annotation for item identification

Added "Is identifier" to the annotation type edit, view and list pages.

Location:

trunk/www

Files:

• admin/annotationtypes/edit_annotationtype.jsp (modified) (1 diff)
• admin/annotationtypes/index.jsp (modified) (1 diff)
• admin/annotationtypes/list_annotationtypes.jsp (modified) (2 diffs)
• admin/annotationtypes/view_annotationtype.jsp (modified) (1 diff)
• include/scripts/main-2.js (modified) (1 diff)

trunk/www/admin/annotationtypes/edit_annotationtype.jsp

@@ -374 +374 @@
         </td>
       </tr>
+      <%
+      if (valueType == Type.STRING || valueType == Type.INT || valueType == Type.LONG)
+      {
+        %>
+        <tr>
+          <th><label for="identifier">Is identifier</label></th>
+          <td><input type="checkbox" name="identifier" id="identifier" value="1" 
+            <%=(annotationType != null && annotationType.isIdentifier()) || 
+              (annotationType == null && Values.getBoolean(cc.getPropertyValue("identifier"))) ? "checked" : ""%>
+            >
+          </td>
+          <td></td>
+        </tr>
+        <%
+      }
+      %>
       <tr>
         <th><label for="required_for_miame">Required for MIAME</label></th>

trunk/www/admin/annotationtypes/index.jsp

@@ -210 +210 @@
       annotationType.setDisableInheritance(Values.getBoolean(request.getParameter("disable_inheritance")));
       annotationType.setProjectAnnotations(Values.getBoolean(request.getParameter("project_annotations")));
+      annotationType.setIdentifier(Values.getBoolean(request.getParameter("identifier")));
       if (annotationType.getValueType().canEnumerate())
       {

trunk/www/admin/annotationtypes/list_annotationtypes.jsp

@@ -265 +265 @@
       />
       <tbl:columndef 
+        id="isIdentifier"
+        property="identifier"
+        datatype="boolean"
+        title="Is identifier"
+        sortable="true" 
+        filterable="true"
+        exportable="true"
+      />
+      <tbl:columndef 
         id="requiredForMiame"
         property="requiredForMiame"
@@ -636 +645 @@
                   HTML.encodeTags(Values.getString(item.getValues(), ", ", true, FormatterFactory.getTypeFormatter(sc, item.getValueType()) )) : 
                   "<i>- no -</i>"%></tbl:cell>
+                <tbl:cell column="isIdentifier"><%=item.isIdentifier() ? "yes" : "no"%></tbl:cell>
                 <tbl:cell column="requiredForMiame"><%=item.isRequiredForMiame() ? "yes" : "no"%></tbl:cell>
                 <tbl:cell column="isProtocolParameter"><%=item.isProtocolParameter() ? "yes" : "no"%></tbl:cell>

trunk/www/admin/annotationtypes/view_annotationtype.jsp

@@ -285 +285 @@
         <th>Multiplicity</th>
         <td><%=annotationType.getMultiplicity() == 0 ? "<i>- unlimited -</i>" : annotationType.getMultiplicity()%></td>
+      </tr>
+      <tr>
+        <th>Is identifier</th>
+        <td><%=annotationType.isIdentifier() ? "yes" : "no"%></td>
       </tr>
       <tr>

trunk/www/include/scripts/main-2.js

@@ -2020 +2020 @@
     controllers = [];
     controllers['ANNOTATION'] = { url:'common/annotations/index.jsp', width:750, height:500, edit:true, popup:true, noAnyToAny:true };
-    controllers['ANNOTATIONTYPE'] = { url:'admin/annotationtypes/index.jsp', width:600, height:400 };
+    controllers['ANNOTATIONTYPE'] = { url:'admin/annotationtypes/index.jsp', width:750, height:500 };
     controllers['ANNOTATIONTYPECATEGORY'] = { url:'admin/annotationtypecategories/index.jsp', width:600, height:400 };
     controllers['ANYTOANY'] = { url:'common/anytoany/index.jsp', width:600, height:400, popup:true, noAnyToAny:true };