Commit f6ea9831 authored by Peter van 't Hof's avatar Peter van 't Hof

Fixed rowspans in flexiprep

parent 098e447a
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
#for (sample <- samples.sortBy(_.name)) #for (sample <- samples.sortBy(_.name))
#{ #{
val sampleRowspan = { val sampleRowspan = {
libraries.size + libraries.filter(_.sampleId == sample.id).size +
settings.count(_._2("paired").getOrElse(false) == true) settings.filter(_._1._1 == sample.id).count(_._2("paired").getOrElse(false) == true)
} }
}# }#
<tr><td rowspan="${sampleRowspan}"> <tr><td rowspan="${sampleRowspan}">
...@@ -124,7 +124,6 @@ ...@@ -124,7 +124,6 @@
#end #end
</td> </td>
#for (lib <- libraries.filter(_.sampleId == sample.id)) #for (lib <- libraries.filter(_.sampleId == sample.id))
#if (Some(lib.id) != libId) <tr> #end
#{ val paired = settings.filter(_._1._1 == sample.id).filter(_._1._2 == lib.id).head._2("paired") == Some(true) }# #{ val paired = settings.filter(_._1._1 == sample.id).filter(_._1._2 == lib.id).head._2("paired") == Some(true) }#
<td #if (paired == true) rowspan="2" #end> <td #if (paired == true) rowspan="2" #end>
#if (multisample) #if (multisample)
......
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
#for (sample <- samples.sortBy(_.name)) #for (sample <- samples.sortBy(_.name))
#{ #{
val sampleRowspan = { val sampleRowspan = {
libraries.size + libraries.filter(_.sampleId == sample.id).size +
settings.count(_._2("paired").getOrElse(false) == true) settings.filter(_._1._1 == sample.id).count(_._2("paired").getOrElse(false) == true)
} }
}# }#
<tr><td rowspan="${sampleRowspan}"> <tr><td rowspan="${sampleRowspan}">
...@@ -129,13 +129,12 @@ ...@@ -129,13 +129,12 @@
#end #end
</td> </td>
#for (lib <- libraries.filter(_.sampleId == sample.id)) #for (lib <- libraries.filter(_.sampleId == sample.id))
#if (Some(libraries.head.id) != libId) <tr> #end
#{ val paired = settings.filter(_._1._1 == sample.id).filter(_._1._2 == lib.id).head._2("paired") == Some(true) }# #{ val paired = settings.filter(_._1._1 == sample.id).filter(_._1._2 == lib.id).head._2("paired") == Some(true) }#
<td #if (paired == true) rowspan="2" #end> <td #if (paired == true) rowspan="2" #end>
#if (multisample) #if (multisample)
<a href="${rootPath}Samples/${sample.name}/Libraries/${lib.name}/index.html">${lib.name}</a> <a href="${rootPath}Samples/${sample.name}/Libraries/${lib.name}/index.html">${lib.name}</a>
#else #else
${libId} ${lib.name}
#end #end
</td> </td>
#{ val reads = if (paired == true) List("R1", "R2") else List("R1") }# #{ val reads = if (paired == true) List("R1", "R2") else List("R1") }#
......
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