Changeset 3822


Ignore:
Timestamp:
Apr 4, 2016, 11:16:02 AM (6 years ago)
Author:
Nicklas Nordborg
Message:

References #861: YellowLabel? tracking wizard

Added flag icon to RNA that has been flagged. Re-designed the table so that the icons have separate columns in order to keep the dates aligned when the number of icons are not the same.

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

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/yellowlabel/list.js

    r3821 r3822  
    113113      }
    114114      html += '</td>';
    115       html += '<td class="dottedleft"><span class="link linked-item" data-item-type="SAMPLE" data-item-id="'+sp.id+'">'+Strings.encodeTags(sp.name)+'</span>';
    116       html += '<img class="link case-summary" data-name="'+Strings.encodeTags(sp.name)+'" src="../images/case_summary.png">';
    117       html += '</td>';
     115      html += '<td class="dottedleft"><span class="link linked-item" data-item-type="SAMPLE" data-item-id="'+sp.id+'">'+Strings.encodeTags(sp.name)+'</span></td>';
     116      html += '<td class="iconcol-1"><img class="link case-summary" data-name="'+Strings.encodeTags(sp.name)+'" src="../images/case_summary.png"></td>';
    118117      html += '<td>'+Strings.encodeTags(sp.site.name) + '</td>';
    119118      html += '<td>'+Reggie.reformatDate(sp.SamplingDate)+'</td>';
    120119      html += '<td>'+Reggie.reformatDate(sp.ArrivalDate)+'</td>';
    121       html += '<td class="dottedleft">'+(rna ? Reggie.reformatDate(rna.QiacubeDate)+yellow.asItemLink(rna, 'EXTRACT'):'')+'</td>';
    122       html += '<td class="dottedleft">'+(lib ? Reggie.reformatDate(lib.creationDate)+yellow.asItemLink(lib, 'EXTRACT'):'')+'</td>';
    123       html += '<td class="dottedleft">'+(raw ? Reggie.reformatDate(raw.creationDate)+yellow.asItemLink(raw, 'RAWBIOASSAY'):'')+'</td>';
    124       html += '<td class="dottedleft">'+(pilotReport ? Reggie.reformatDate(pilotReport.lastUpdatedDate):'') + yellow.asFileLink(pilotReport, 'pdffile.png')+'</td>';
     120      html += '<td class="dottedleft">'+(rna ? Reggie.reformatDate(rna.QiacubeDate):'')+'</td>';
     121      html += '<td class="iconcol-2">'+yellow.asItemLink(rna, 'EXTRACT')+yellow.asFlag(rna)+'</td>';
     122      html += '<td class="dottedleft">'+(lib ? Reggie.reformatDate(lib.creationDate):'')+'</td>';
     123      html += '<td class="iconcol-1">'+yellow.asItemLink(lib, 'EXTRACT')+'</td>';
     124      html += '<td class="dottedleft">'+(raw ? Reggie.reformatDate(raw.creationDate):'')+'</td>';
     125      html += '<td class="iconcol-1">'+yellow.asItemLink(raw, 'RAWBIOASSAY')+'</td>';
     126      html += '<td class="dottedleft">'+(pilotReport ? Reggie.reformatDate(pilotReport.lastUpdatedDate):'')+'</td>';
     127      html += '<td class="iconcol-1">'+yellow.asFileLink(pilotReport, 'pdffile.png')+'</td>';
    125128      html += '<td class="dottedleft">'+Reggie.reformatDate(sp.CompletedDate)+'</td>';
    126129      html += '</tr>';
     
    252255  }
    253256 
     257  yellow.asFlag = function(item)
     258  {
     259    var html = '';
     260    if (item && item.Flag)
     261    {
     262      html += '<img class="flagged" src="'+home+'/images/flag.png" title="'+Strings.encodeTags(item.Flag)+'">';
     263    }
     264    return html;
     265  }
     266 
    254267  yellow.asItemLink = function(item, itemType)
    255268  {
  • extensions/net.sf.basedb.reggie/trunk/resources/yellowlabel/list.jsp

    r3812 r3822  
    5353{
    5454  text-align: center;
    55   width: 4.5em;
    5655}
    5756
     
    6463#specimenTable tr td:first-child, #specimenTable tr th:first-child
    6564{
    66   width: 2em;
    67   max-width: 3em;
     65  width: 6em;
    6866  text-align: right;
    6967  padding-right: 3px;
     
    9088}
    9189
    92 .linked-item img, .linked-file img, #specimenTable .case-summary
     90.iconcol-1
     91{
     92  width: 20px;
     93}
     94
     95.iconcol-2
     96{
     97  width: 40px;
     98}
     99
     100.iconcol-1 img, .iconcol-2 img
    93101{
    94102  float: right;
     
    135143        <tr>
    136144          <th class="index"></th>
    137           <th class="dottedleft" colspan="4">Specimen</th>
    138           <th class="dottedleft" colspan="1">RNA</th>
    139           <th class="dottedleft" colspan="1">Library</th>
    140           <th class="dottedleft" colspan="1">Raw bioassay</th>
    141           <th class="dottedleft" colspan="1">Reports</th>
    142           <th class="dottedleft" colspan="1">Completed</th>
     145          <th class="dottedleft" colspan="5">Specimen</th>
     146          <th class="dottedleft" colspan="2">RNA</th>
     147          <th class="dottedleft" colspan="2">Library</th>
     148          <th class="dottedleft" colspan="2">Raw bioassay</th>
     149          <th class="dottedleft" colspan="2">Reports</th>
     150          <th class="dottedleft" colspan="2">Completed</th>
    143151        </tr>
    144152   
    145153        <tr>
    146154          <th></th>
    147           <th class="dottedleft">Name</th>
     155          <th class="dottedleft" colspan="2">Name</th>
    148156          <th>Site</th>
    149157          <th>Sampling date</th>
    150158          <th>Arrival date</th>
    151           <th class="dottedleft">Extraction date</th>
    152           <th class="dottedleft">Created date</th>
    153           <th class="dottedleft">Created date</th>
    154           <th class="dottedleft">Pilot report</th>
     159          <th class="dottedleft" colspan="2">Extraction date</th>
     160          <th class="dottedleft" colspan="2">Created date</th>
     161          <th class="dottedleft" colspan="2">Created date</th>
     162          <th class="dottedleft" colspan="2">Pilot report</th>
    155163          <th class="dottedleft">Date</th>
    156164        </tr>
     
    158166        <tr>
    159167          <th><base:icon image="check_uncheck.png" id="check_uncheck" /></th>
    160           <th class="dottedleft"></th>
     168          <th class="dottedleft" colspan="2"></th>
    161169          <th>
    162170            <select name="siteFilter" id="siteFilter">
     
    166174          <th><input type="text" name="samplingDateFilter" id="samplingDateFilter"></th>
    167175          <th><input type="text" name="arrivalDateFilter" id="arrivalDateFilter"></th>
    168           <th class="dottedleft"><input type="text" name="extractionDateFilter" id="extractionDateFilter"></th>
    169           <th class="dottedleft"><input type="text" name="libraryDateFilter" id="libraryDateFilter"></th>
    170           <th class="dottedleft"><input type="text" name="rawBioAssayDateFilter" id="rawBioAssayDateFilter"></th>
    171           <th class="dottedleft"><input type="text" name="pilotReportDateFilter" id="pilotReportDateFilter"></th>
     176          <th class="dottedleft" colspan="2"><input type="text" name="extractionDateFilter" id="extractionDateFilter"></th>
     177          <th class="dottedleft" colspan="2"><input type="text" name="libraryDateFilter" id="libraryDateFilter"></th>
     178          <th class="dottedleft" colspan="2"><input type="text" name="rawBioAssayDateFilter" id="rawBioAssayDateFilter"></th>
     179          <th class="dottedleft" colspan="2"><input type="text" name="pilotReportDateFilter" id="pilotReportDateFilter"></th>
    172180          <th class="dottedleft"><input type="text" name="completedDateFilter" id="completedDateFilter"></th>
    173181        </tr>
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/YellowLabelServlet.java

    r3821 r3822  
    121121          {
    122122            rna.loadAnnotations(dc, manager, "QiacubeDate", Annotationtype.QIACUBE_DATE, Reggie.CONVERTER_DATE_TO_STRING);
     123            rna.loadAnnotations(dc, manager, "Flag", Annotationtype.FLAG, null);
    123124            sp.setAnnotation("rna", rna.asJSONObject());
    124125           
Note: See TracChangeset for help on using the changeset viewer.