Changeset 1288


Ignore:
Timestamp:
Feb 14, 2011, 3:16:51 PM (11 years ago)
Author:
Nicklas Nordborg
Message:

References #292: Check/create annotation types, etc. required by reggie

Added PAD and PADcase annotation types to installation. Minor style changes to the installation report form.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/index.jsp

    r1284 r1288  
    5656<base:body>
    5757
    58   <p:path>
     58  <p:path style="margin-top: 20px; margin-bottom: 10px;">
    5959    <p:pathelement title="Reggie" />
    6060  </p:path>
    6161
    62   <table border="0" cellspacing="0" cellpadding="0" width="100%">
     62  <table border="0" cellspacing="0" cellpadding="0" width="100%" style="margin-left: 20px;">
    6363  <tr valign="top">
    6464    <td width="50%">
  • extensions/net.sf.basedb.reggie/trunk/resources/install.jsp

    r1284 r1288  
    150150<base:body onload="init('Validate')">
    151151
    152   <p:path>
     152  <p:path style="margin-top: 20px; margin-bottom: 10px;">
    153153    <p:pathelement title="Reggie" href="<%="index.jsp?ID="+ID%>" />
    154154    <p:pathelement title="Verify/install required items" />
    155155  </p:path>
    156156
    157   <div id="validationResult">Checking; please wait...</div>
     157  <div id="validationResult" style="margin-left: 20px;">Checking; please wait...</div>
    158158
    159   <div class="error" id="errorMessage" style="display: none; width: 800px; margin-left: 0px;"></div>
     159  <div class="error" id="errorMessage" style="display: none; width: 800px; margin-left: 20px; margin-bottom: 0px;"></div>
    160160
    161   <div id="createMissingItems" style="display:none;">
     161  <div id="createMissingItems" style="display:none; margin-left: 20px; margin-top: 10px;">
    162162    <table><tr><td>
    163163    <base:button title="Create missing items" image="add.png" onclick="createMissingItems()"/>
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Reggie.java

    r1285 r1288  
    7272  */
    7373  public static final String ANNOTATION_REASON_IF_NO_SPECIMEN = "ReasonIfNoSpecimen";
     74
     75  /**
     76    The name of the "PAD" annotation type, used
     77    for samples (Specimen). It is a string annotation type.
     78  */
     79  public static final String ANNOTATION_PAD = "PAD";
     80
     81  /**
     82    The name of the "PADcase" annotation type, used
     83    for samples (Case). It is a multi-valued string annotation.
     84  */
     85  public static final String ANNOTATION_PAD_CASE = "PADcase";
    7486
    7587 
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1285 r1288  
    9393        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_REASON_IF_NO_SPECIMEN, Item.SAMPLE, Type.STRING, 0,
    9494            null, sharedToPatientCurator, createIfMissing));
     95        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_PAD, Item.SAMPLE, Type.STRING, 1,
     96            null, sharedToPatientCurator, createIfMissing));
     97        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_PAD_CASE, Item.SAMPLE, Type.STRING, 0,
     98            null, sharedToPatientCurator, createIfMissing));
    9599       
    96100        json.put("checks", jsonChecks);
Note: See TracChangeset for help on using the changeset viewer.