Changeset 2241

Timestamp:

Feb 21, 2014, 8:59:52 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #562, #545 and #546. Only display pool name once if the flow cell only contains one pool.

Location:

extensions/net.sf.basedb.reggie/trunk/resources

Files:

• analysis/sequencing_confirm.jsp (modified) (1 diff)
• libprep/flowcell_registration.jsp (modified) (1 diff)
• libprep/sequencing_ended.jsp (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/resources/analysis/sequencing_confirm.jsp

@@ -55 +55 @@
       if (lastPoolNum - firstPoolNum == numPools - 1)
       {
-        // Display: PoolN -- PoolY
-        name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
+        if (numPools > 1)
+        {
+          // Display: PoolN -- PoolY
+          name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
+        }
+        else
+        {
+          name += flowCell.pools[0].name;
+        }
       }
       else

extensions/net.sf.basedb.reggie/trunk/resources/libprep/flowcell_registration.jsp

@@ -57 +57 @@
       if (lastPoolNum - firstPoolNum == numPools - 1)
       {
-        // Display: PoolN -- PoolY
-        name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
+        if (numPools > 1)
+        {
+          // Display: PoolN -- PoolY
+          name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
+        }
+        else
+        {
+          name += flowCell.pools[0].name;
+        }
       }
       else

extensions/net.sf.basedb.reggie/trunk/resources/libprep/sequencing_ended.jsp

@@ -56 +56 @@
       if (lastPoolNum - firstPoolNum == numPools - 1)
       {
-        // Display: PoolN -- PoolY
-        name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
+        if (numPools > 1)
+        {
+          // Display: PoolN -- PoolY
+          name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
+        }
+        else
+        {
+          name += flowCell.pools[0].name;
+        }
       }
       else