Merge branch...

Merge branch 'feature-c/4211-gethtmlinfo-adapter-pour-clones-de-distributions-representative-sequence' into 'dev'

Resolve "getHTMLinfo : adapter pour clones de distributions, representative sequence"

Closes #4211

See merge request !625

browser/js/clone.js

@@ -1333,9 +1333,12 @@ Clone.prototype = {
         if (isCluster) {
             html += header("clone")
             html += row_1("clone name", this.getName())
-            html += row_1("clone short name", this.getShortName())
-
-            html += "<tr><td>clone size (n-reads (total reads))"
+            if (this.hasSizeConstant()){
+                html += row_1("clone short name", this.getShortName())
+                html += "<tr><td>clone size (n-reads (total reads))"
+            } else if (this.hasSizeDistrib()) {
+                html += "<tr><td title='Current size; depending of the number of clones curently not filtered'>current clone size<br/>(n-reads (total reads))"
+            }
             if (this.normalized_reads && this.m.normalization_mode == this.m.NORM_EXTERNAL) {
                 html += "<br />[normalized]"
             }
@@ -1346,7 +1349,7 @@ Clone.prototype = {
                 if (this.normalized_reads && this.m.normalization_mode == this.m.NORM_EXTERNAL) {
                   html += "<br />[" + this.getReads(this.m.samples.order[j]).toFixed(2) + "]"
                 }
-                if (typeof this.m.db_key.config != 'undefined' ) {
+                if (typeof this.m.db_key.config != 'undefined' && this.hasSizeConstant()) {
                     html += "&emsp;"
                     var sample_set_id = this.m.samples.sequence_file_id[this.m.samples.order[j]];
                     call_reads = "db.get_read('" + this.id + "', "+ this.index +", " + sample_set_id + ')';
@@ -1390,13 +1393,21 @@ Clone.prototype = {
         }
 
         // abundance info
-        html += "<tr><td>size (n-reads (total reads))</td>"
+        if (this.hasSizeConstant()) {
+            html += "<tr><td>size (n-reads (total reads))</td>"
+        } else {
+            html += "<tr><td>total clones size<br/>(n-reads (total reads))</td>"
+        }
         for (var l = 0; l < time_length; l++) {
             html += "<td>" + this.get('reads',this.m.samples.order[l]) + 
                     "  (" + this.m.reads.segmented[this.m.samples.order[l]] + ")</td>"
         }
         html += "</tr>"
-        html += "<tr><td>size (%)</td>"
+        if (this.hasSizeConstant()) {
+            html += "<tr><td>size (%)</td>"
+        } else {
+            html += "<tr><td>total size (%)</td>"
+        }
         for (var m = 0; m < time_length; m++) {
             html += "<td>" + this.getStrSequenceSize(this.m.samples.order[m]) + "</td>"
         }
@@ -1404,9 +1415,13 @@ Clone.prototype = {
 
         
         //segmentation info
-        html += header("segmentation" +
+        if (this.hasSizeConstant()) {
+            html += header("segmentation" +
                 " <button type='button' onclick='m.clones["+ this.index +"].toggle()'>edit</button>" + //Use to hide/display lists 
                 this.getHTMLModifState()) // icon if manual changement
+        } else {
+            html += header("segmentation")
+        }
 
         if (typeof this.stats != 'undefined'){
             var total_stat = [];

browser/test/QUnit/testFiles/clone_test.js

@@ -292,16 +292,35 @@ QUnit.test("name, informations, getHtmlInfo", function(assert) {
     dclone.defineCompatibleClones()
     dclone.updateReadsDistribClones()
     html = m.clones[0].getHtmlInfo();
-
-    // Sequence
-    var notinclude = html.includes("<td>sequence</td>")
-    assert.notOk(notinclude, "getHtmlInfo: if no sequence, no field sequence");
+    console.log( html)
+    // Representative
+    var include = html.includes("<td class='header' colspan='2'>representative sequence</td>")
+    assert.ok(include, "getHtmlInfo: if clone distrib, keep field 'representative sequence'");
+    // Representative
+    include = html.includes("total clones size")
+    assert.ok(include, "getHtmlInfo: if clone distrib, other line name; 'clone size'");
+    // Representative
+    include = html.includes("current clone size")
+    assert.ok(include, "getHtmlInfo: if no sequence, field 'current clone size'");
     // gene V
     assert.includes(html, "<tr><td>V gene (or 5')</td>",
         "getHtmlInfo: distrib clone with seg5 have field segment V");
+    
+    // Sequence
+    var notinclude = html.includes("<td>sequence</td>")
+    assert.notOk(notinclude, "getHtmlInfo: if no sequence, no field sequence");
     // gene J
-    var notinclude = html.includes("<td>J gene (or 3')</td>")
+    notinclude = html.includes("<td>J gene (or 3')</td>")
     assert.notOk(notinclude, "getHtmlInfo: if no seg3, no field segment J");
+    // Edit button
+    notinclude = html.includes("<td class='header' colspan='2'>segmentation <button type='button' onclick='m.clones[0].toggle()'>edit</button></td>")
+    assert.notOk(notinclude, "getHtmlInfo: if clone distrib, no edit button");
+    // clone short name
+    notinclude = html.includes("clone short name")
+    assert.notOk(notinclude, "getHtmlInfo: if clone distrib, no 'clone short name'");
+    // clone short name
+    notinclude = html.includes("db.get_read")
+    assert.notOk(notinclude, "getHtmlInfo: if clone distrib, no download reads buttons");
 });