Changeset 3033


Ignore:
Timestamp:
Dec 15, 2006, 3:30:37 PM (15 years ago)
Author:
Nicklas Nordborg
Message:

References #262, #340: First prototype for experiment overview. Reads most of an
experiment. Limited validation. No presets. No detailed information about an error/warning.

Location:
trunk
Files:
34 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/development/drafts/experiment_overview.txt

    r3024 r3033  
    124124 - invalid annotation value according to annotation type
    125125 - inheriting value from non-parent
     126 - inheriting multiple annotation of the same type (from different parents)
    126127 - annotation type is a protocol parameter
    127128 - annotation type is not valid for the current item type
     129 - missing value for a "Required by MIAME" annotation type (on folder node)
    128130
    129131Note! Annotations are always validated together with the item they are attached to
  • trunk/www/common/annotations/annotate.jsp

    r2978 r3033  
    107107
    108108  String title = "Annotate " +
    109     HTML.encodeTags((item instanceof Nameable ? ((Nameable)item).getName() :
     109    HTML.encodeTags((item instanceof Nameable ? ((Nameable)item).getTitle() :
    110110      (item == null ? " new item" : item.toString())));
    111111
     
    526526          <option value="<%=category.getId()%>"
    527527            title="<%=HTML.encodeTags(category.getDescription())%>"
    528           ><%=HTML.encodeTags(category.getName())%>
     528          ><%=HTML.encodeTags(category.getTitle())%>
    529529          <%
    530530        }
     
    586586            List<?> values = at.getValues();
    587587            Formatter f = FormatterFactory.getTypeFormatter(sc, at.getValueType());           %>
    588             <b><%=HTML.encodeTags(at.getName())%></b> (<%=select%>)<br>
     588            <b><%=HTML.encodeTags(at.getTitle())%></b> (<%=select%>)<br>
    589589            <%
    590590            if (at.getDisplayAsList())
     
    660660            }
    661661            %>
    662             <b><%=HTML.encodeTags(at.getName())%></b>
     662            <b><%=HTML.encodeTags(at.getTitle())%></b>
    663663            (<%=valueType == Type.INT ? "Integer" : "Long"%><%=minMax%>)<br>
    664664            <input <%=clazz%> type="text" name="<%=inputName%>" value=""
     
    685685            }
    686686            %>
    687             <b><%=HTML.encodeTags(at.getName())%></b>
     687            <b><%=HTML.encodeTags(at.getTitle())%></b>
    688688            (<%=valueType == Type.FLOAT ? "Float" : "Double"%><%=minMax%>)<br>
    689689            <input <%=clazz%> type="text" name="<%=inputName%>" value=""
     
    697697            if (maxLength == null) maxLength = 255;
    698698            %>
    699             <b><%=HTML.encodeTags(at.getName())%></b> (String)<br>
     699            <b><%=HTML.encodeTags(at.getTitle())%></b> (String)<br>
    700700            <input <%=clazz%> type="text" name="<%=inputName%>" value=""
    701701              size="<%=width%>" maxlength="<%=maxLength%>"
     
    706706          {
    707707            %>
    708             <b><%=HTML.encodeTags(at.getName())%></b> (Text)<br>
     708            <b><%=HTML.encodeTags(at.getTitle())%></b> (Text)<br>
    709709            <textarea <%=clazz%> name="<%=inputName%>" rows="<%=height%>" cols="<%=width%>"
    710710              onblur="valueOnBlur(this.value)"></textarea>
     
    716716          {
    717717            %>
    718             <b><%=HTML.encodeTags(at.getName())%></b><br>
     718            <b><%=HTML.encodeTags(at.getTitle())%></b><br>
    719719            <input type="radio" name="<%=inputName%>" value="" checked
    720720              onclick="setCurrentValue(null)"><a
     
    734734            <tr>
    735735            <td>
    736               <b><%=HTML.encodeTags(at.getName())%></b> (Date)<br>
     736              <b><%=HTML.encodeTags(at.getTitle())%></b> (Date)<br>
    737737              <input <%=clazz%> type="text" name="<%=inputName%>" value=""
    738738                size="20" maxlength="20" title="Enter date in format: <%=htmlDateFormat%>"
  • trunk/www/include/scripts/newjoust.js

    r2306 r3033  
    197197  {
    198198    var menuItem = this.menuItems[menuItemIndex];
    199     if (!menuItem) return;
     199    if (!menuItem || menuItem.isOpen) return;
    200200    menuItem.isOpen = true;
    201201    Main.show('children'+menuItem.index);
     
    205205 
    206206  /**
     207    Open all menu items in the joust menu.
     208  */
     209  this.openAll = function()
     210  {
     211    for (var i = 0; i < this.menuItems.length; i++)
     212    {
     213      this.open(i);
     214    }
     215  }
     216
     217  /**
     218    Close a menu item.
     219    @param menuItemIndex The index of the menu item to close
     220  */
     221  this.close = function(menuItemIndex)
     222  {
     223    var menuItem = this.menuItems[menuItemIndex];
     224    if (!menuItem || !menuItem.isOpen) return;
     225    menuItem.isOpen = false;
     226    Main.hide('children'+menuItem.index);
     227    this.updateIconsAndText(menuItemIndex);
     228  }
     229 
     230  /**
     231    Open all menu items in the joust menu.
     232  */
     233  this.closeAll = function()
     234  {
     235    for (var i = 0; i < this.menuItems.length; i++)
     236    {
     237      this.close(i);
     238    }
     239  }
     240 
     241  /**
    207242    Select a menu item and load it's URL into the target frame.
    208243    Only one menu item can be selected at a time. Any previously
     
    215250    if (!menuItem) return;
    216251   
     252    if (menuItem.parentItemIndex != -1) this.open(menuItem.parentItemIndex);
    217253    if (menuItemIndex != this.selectedItemIndex)
    218254    {
     
    357393    var docTag = docIcon ? docIcon.getImgTag('docIcon'+this.index) : '';
    358394
    359     var html = '<div class="menuitem" id="menuItem'+this.index+'" onclick="JoustMenu.select('+this.index+', event)" onmouseover="Main.addClass(this, \'hover\')" onmouseout="Main.removeClass(this, \'hover\')">';
     395    var html = '<div class="menuitem" id="menuItem'+this.index+'"';
     396    html += ' onclick="JoustMenu.select('+this.index+', event)"';
     397    html += ' onmouseover="Main.addClass(this, \'hover\')"';
     398    html += ' onmouseout="Main.removeClass(this, \'hover\')" title="' + this.tooltip + '">';
    360399    html += '<table border="0" cellspacing="0" cellpadding="0"><tr><td width="10%">';
    361400    html += indentString;
  • trunk/www/include/styles/main.css

    r2949 r3033  
    332332  border: 0px;
    333333}
    334 
  • trunk/www/views/experiments/bioassaysets/list_bioassaysets.jsp

    r2978 r3033  
    208208      location.href = '../index.jsp?ID=<%=ID%>&experiment_id=<%=experimentId%>&cmd=ViewItem';
    209209    }
     210    function viewOverview()
     211    {
     212      location.href = '../overview/index.jsp?ID=<%=ID%>&experiment_id=<%=experimentId%>';
     213    }
    210214    function switchTab(tabControlId, tabId)
    211215    {
     
    213217      {
    214218        viewExperimentProperties();
     219      }
     220      else if (tabId == 'overview')
     221      {
     222        viewOverview();
    215223      }
    216224      else
     
    245253    </base:buttongroup>
    246254    </t:tab>
     255
     256    <t:tab id="overview" title="Overview"
     257      tooltip="Get an overview of all items in this experiment"/>
     258
    247259    </t:tabcontrol>
    248260
  • trunk/www/views/experiments/view_experiment.jsp

    r2978 r3033  
    126126      location.href = 'bioassaysets/index.jsp?ID=<%=ID%>&experiment_id=<%=itemId%>';
    127127    }
     128    function viewOverview()
     129    {
     130      location.href = 'overview/index.jsp?ID=<%=ID%>&experiment_id=<%=itemId%>';
     131    }
    128132    function switchTab(tabControlId, tabId)
    129133    {
     
    131135      {
    132136        viewBioAssaySets();
     137      }
     138      else if (tabId == 'overview')
     139      {
     140        viewOverview();
    133141      }
    134142      else
     
    460468      <t:tab id="bioassaysets" title="Bioassay sets" />
    461469     
     470      <t:tab id="overview" title="Overview"
     471        tooltip="Get an overview of all items in this experiment" />
     472     
    462473      </t:tabcontrol>
    463 
    464474
    465475  </base:body>
Note: See TracChangeset for help on using the changeset viewer.