Changeset 3534

Timestamp:

Oct 8, 2015, 1:38:17 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #812: Pilot report wizard

Adding link to the pilot report in the case summary page.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/reports/case-summary.js (modified) (1 diff)
• resources/reports/case_summary.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/CaseSummaryServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/reports/case-summary.js

@@ -749 +749 @@
           var job = raw.job;
           var geneReport = raw.geneReport;
+          var pilotReport = raw.pilotReport;
           cs.addColumn('rawBioAssays.date', cs.asJob(job, truncateAt));
           cs.addColumn('rawBioAssays.result', (raw.result && raw.result != 'Successful') ? cs.asFailInfo(raw.result, 'error.png') : null);
           cs.addColumn('rawBioAssays.geneReport', geneReport && geneReport.type == 'FILE' ? 'Yes '+cs.asFileLink(geneReport, 'pdffile.png') : 'No');
+          cs.addColumn('rawBioAssays.pilotReport', pilotReport && pilotReport.type == 'FILE' ? 'Yes '+cs.asFileLink(pilotReport, 'pdffile.png') : 'No');
           cs.addColumn('rawBioAssays.comment', cs.truncate(a.comment, truncateAt));
         }

extensions/net.sf.basedb.reggie/trunk/resources/reports/case_summary.jsp

@@ -858 +858 @@
               <th>Gene report</th>
             </tr>
+            <tr id="rawBioAssays.pilotReport">
+              <th>Pilot report</th>
+            </tr>
             <tr id="rawBioAssays.comment" class="comment dynamic-column">
               <th>Comment</th>

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/CaseSummaryServlet.java

@@ -39 +39 @@
 import net.sf.basedb.reggie.Reggie;
 import net.sf.basedb.reggie.Site;
+import net.sf.basedb.reggie.XmlConfig;
 import net.sf.basedb.reggie.dao.AlignedSequences;
 import net.sf.basedb.reggie.dao.Annotationtype;
@@ -65 +66 @@
 import net.sf.basedb.reggie.dao.Subtype;
 import net.sf.basedb.reggie.pdf.GeneReportWorker;
+import net.sf.basedb.reggie.pdf.PilotReportWorker;
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.error.ThrowableUtil;
@@ -943 +945 @@
     {
       raw.loadAnnotations(dc, "result", Annotationtype.ANALYSIS_RESULT, null);
-      JSONObject jsonGeneReport = JsonUtil.loadLinkedItem(dc, rba, Reggie.getConfig().getConfig("rscript/gene-report/pdf-name", null, GeneReportWorker.DEFAULT_PDF_NAME));
-      if (jsonGeneReport != null) raw.setAnnotation("geneReport", jsonGeneReport);
+      XmlConfig cfg = Reggie.getConfig();
+      raw.setAnnotation("geneReport", JsonUtil.loadLinkedItem(dc, rba, cfg.getConfig("rscript/gene-report/pdf-name", null, GeneReportWorker.DEFAULT_PDF_NAME)));
+      raw.setAnnotation("pilotReport", JsonUtil.loadLinkedItem(dc, rba, cfg.getConfig("rscript/pilot-report/pdf-name", null, PilotReportWorker.DEFAULT_PDF_NAME)));
     }
     raw.setAnnotation("comment", rba.getDescription());