Changeset 1923


Ignore:
Timestamp:
Apr 11, 2013, 7:37:05 AM (9 years ago)
Author:
olle
Message:

Fixes #483. Refs #439. Missing sample data report updated for "no specimen" to report missing items for "PAD reference" and "Laterality":

  • Servlet SampleReportServlet in reggie/src/net/sf/basedb/reggie/servlet/ updated for subtype NO_SPECIMEN to obtain data for missing items for "PAD reference" and "Laterality", and include it in the response JSON script.
  • JSP script samplereportgenerator in reggie/resources/ updated to include columns for "PAD reference" and "Laterality" in the table for missing "no specimen" items.


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

Legend:

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

    r1915 r1923  
    946946    else if (sampleType == 'nospecimen')
    947947    {
    948       numCols = 2;
     948      numCols = 4;
    949949    }
    950950    else if (sampleType == 'blood')
     
    985985    else if (sampleType == 'nospecimen')
    986986    {
     987      subHeaderRow.appendChild(getTableCellElement('PAD', 'reportsubheader'));
     988      subHeaderRow.appendChild(getTableCellElement('Laterality', 'reportsubheader'));
    987989      subHeaderRow.appendChild(getTableCellElement('Sampling', 'reportsubheader'));
    988990    }
     
    10111013    else if (sampleType == 'nospecimen')
    10121014    {
     1015      columnHeaderRow.appendChild(getTableCellElement('reference', 'reportsubheader'));
     1016      columnHeaderRow.appendChild(getTableCellElement('', 'reportsubheader'));
    10131017      columnHeaderRow.appendChild(getTableCellElement('date', 'reportsubheader'));
    10141018    }
     
    10611065      else if (sampleType == 'nospecimen')
    10621066      {
     1067        data = getJSONData(sitesCombined, 'missingPadReference');
     1068        sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
     1069        data = getJSONData(sitesCombined, 'missingLaterality');
     1070        sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
    10631071        data = getJSONData(sitesCombined, 'missingSamplingDateTime');
    10641072        sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
     
    14021410        else if (sampleType == 'nospecimen')
    14031411        {
     1412          data = getJSONData(siteData, 'missingPadReference');
     1413          tableRow.appendChild(getTableCellElement(data, 'reportdata'));
     1414          data = getJSONData(siteData, 'missingLaterality');
     1415          tableRow.appendChild(getTableCellElement(data, 'reportdata'));
    14041416          data = getJSONData(siteData, 'missingSamplingDateTime');
    14051417          tableRow.appendChild(getTableCellElement(data, 'reportdata'));
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/SampleReportServlet.java

    r1813 r1923  
    12691269      else if (sampleType.equals("nospecimen"))
    12701270      {
     1271        // Get PAD reference
     1272        pad = (String) Annotationtype.PAD.getAnnotationValue(dc, manager, s);
     1273        // Get laterality
     1274        laterality = (String) Annotationtype.LATERALITY.getAnnotationValue(dc, manager, s);
    12711275        // Get sampling date
    12721276        samplingDate = (Date) Annotationtype.SAMPLING_DATETIME.getAnnotationValue(dc, manager, s);
     
    13391343        else if (sampleType.equals("nospecimen"))
    13401344        {
     1345          // Update missing PAD reference data
     1346          if (pad == null || pad.equals(""))
     1347          {
     1348            jsonSite = tableUtil.updateJSONObjectCounter(jsonSite, missingPadReferenceKey);
     1349            jsonSitesCombined = tableUtil.updateJSONObjectCounter(jsonSitesCombined, missingPadReferenceKey);
     1350          }
     1351          // Update missing laterality data
     1352          if (laterality == null || laterality.equals(""))
     1353          {
     1354            jsonSite = tableUtil.updateJSONObjectCounter(jsonSite, missingLateralityKey);
     1355            jsonSitesCombined = tableUtil.updateJSONObjectCounter(jsonSitesCombined, missingLateralityKey);
     1356          }
    13411357          // Update missing sampling date data
    13421358          if (samplingDate == null)
Note: See TracChangeset for help on using the changeset viewer.