Changeset 3812


Ignore:
Timestamp:
Mar 23, 2016, 9:05:43 AM (6 years ago)
Author:
Nicklas Nordborg
Message:

References #861: YellowLabel? tracking wizard

Added column for "Completed date".

Location:
extensions/net.sf.basedb.reggie/trunk/resources/yellowlabel
Files:
2 edited

Legend:

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

    r3811 r3812  
    2222    Events.addEventHandler('rawBioAssayDateFilter', 'change', yellow.filterOnChange);
    2323    Events.addEventHandler('pilotReportDateFilter', 'change', yellow.filterOnChange);
     24    Events.addEventHandler('completedDateFilter', 'change', yellow.filterOnChange);
    2425
    2526    Buttons.addClickHandler('check_uncheck', yellow.selectAll);
     
    99100      {
    100101        numCompleted++;
    101         html += Reggie.reformatDate(sp.CompletedDate);
    102102      }
    103103      html += '</td>';
     
    112112      html += '<td class="dottedleft">'+(raw ? Reggie.reformatDate(raw.creationDate)+yellow.asItemLink(raw, 'RAWBIOASSAY'):'')+'</td>';
    113113      html += '<td class="dottedleft">'+(pilotReport ? Reggie.reformatDate(pilotReport.lastUpdatedDate):'') + yellow.asFileLink(pilotReport, 'pdffile.png')+'</td>';
     114      html += '<td class="dottedleft">'+Reggie.reformatDate(sp.CompletedDate)+'</td>';
    114115      html += '</tr>';
    115116    }
     
    190191    filter.addDateCriteria(ItemProperty.RawDate, frm.rawBioAssayDateFilter.value);
    191192    filter.addDateCriteria(ItemProperty.PilotReportDate, frm.pilotReportDateFilter.value);
     193    filter.addDateCriteria(ItemProperty.CompletedDate, frm.completedDateFilter.value);
    192194
    193195    var numActive = 0;
     
    472474    return item.pilotReport ? item.pilotReport.lastUpdatedDate : null;
    473475  }
     476 
     477  p.CompletedDate = function(item)
     478  {
     479    return item.CompletedDate;
     480  }
    474481
    475482  return p;
  • extensions/net.sf.basedb.reggie/trunk/resources/yellowlabel/list.jsp

    r3811 r3812  
    6464#specimenTable tr td:first-child, #specimenTable tr th:first-child
    6565{
    66   width: 6em;
    67   max-width: 7em;
     66  width: 2em;
     67  max-width: 3em;
    6868  text-align: right;
    69   padding-right: 0.5em;
     69  padding-right: 3px;
    7070  white-space: nowrap;
    7171  font-weight: bold;
     
    140140          <th class="dottedleft" colspan="1">Raw bioassay</th>
    141141          <th class="dottedleft" colspan="1">Reports</th>
     142          <th class="dottedleft" colspan="1">Completed</th>
    142143        </tr>
    143144   
     
    152153          <th class="dottedleft">Created date</th>
    153154          <th class="dottedleft">Pilot report</th>
     155          <th class="dottedleft">Date</th>
    154156        </tr>
    155157       
     
    168170          <th class="dottedleft"><input type="text" name="rawBioAssayDateFilter" id="rawBioAssayDateFilter"></th>
    169171          <th class="dottedleft"><input type="text" name="pilotReportDateFilter" id="pilotReportDateFilter"></th>
     172          <th class="dottedleft"><input type="text" name="completedDateFilter" id="completedDateFilter"></th>
    170173        </tr>
    171174      </thead>
Note: See TracChangeset for help on using the changeset viewer.