Commit 06427f8d authored by pjvan_thof's avatar pjvan_thof

Fix some code warnings

parent 6854083d
......@@ -138,9 +138,6 @@ trait ReportBuilder extends ToolCommand {
/** default args that are passed to all page withing the report */
def pageArgs: Map[String, Any] = Map()
private var done = 0
private var total = 0
private var _sampleId: Option[Int] = None
protected[report] def sampleId: Option[Int] = _sampleId
private var _libId: Option[Int] = None
......@@ -234,7 +231,7 @@ trait ReportBuilder extends ToolCommand {
Await.result(baseFilesFuture, Duration.Inf)
Await.result(jobsFutures, Duration.Inf)
logger.info(s"Done, $done pages generated")
logger.info(s"Done")
}
/** This must be implemented, this will be the root page of the report */
......@@ -304,9 +301,7 @@ trait ReportBuilder extends ToolCommand {
for {
f1 <- subPageJobs
f2 <- renderFuture
} yield {
f2 :: f1
}
} yield f2 :: f1
}
def pipelineName: String
......@@ -317,15 +312,15 @@ trait ReportBuilder extends ToolCommand {
.getFiles(runId, sample = sampleId.map(SampleId), library = libraryId.map(LibraryId))
.map(_.groupBy(_.pipelineId))
val modulePages = dbFiles.map(_.map {
case (pipelineId, files) =>
val moduleSections = files.groupBy(_.moduleId).map {
case (moduleId, files) =>
case (pipelineId, pFiles) =>
val moduleSections = pFiles.groupBy(_.moduleId).map {
case (moduleId, mFiles) =>
val moduleName: Future[String] = moduleId match {
case Some(id) => summary.getModuleName(pipelineId, id).map(_.getOrElse("Pipeline"))
case _ => Future.successful("Pipeline")
}
moduleName.map(_ -> ReportSection("/nl/lumc/sasc/biopet/core/report/files.ssp",
Map("files" -> files)))
Map("files" -> mFiles)))
}
val moduleSectionsSorted = moduleSections.find(_._1 == "Pipeline") ++ moduleSections
.filter(_._1 != "Pipeline")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment