Changeset 1726

Timestamp:

Oct 4, 2012, 3:49:43 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #418: Dates are not parsed correctly by the sample report generator

Hope this doesn't break some other wizard...

Location:

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

Files:

• bloodform.jsp (modified) (3 diffs)
• edit_dnarna_details.jsp (modified) (2 diffs)
• extraction_registration.jsp (modified) (2 diffs)
• histology_block.jsp (modified) (1 diff)
• histology_glass.jsp (modified) (5 diffs)
• histology_protocol2.jsp (modified) (2 diffs)
• histology_work_list.jsp (modified) (1 diff)
• persinfo.jsp (modified) (3 diffs)
• reggie.js (modified) (4 diffs)
• rnaqc_aliquot.jsp (modified) (3 diffs)
• rnaqc_plate_import.jsp (modified) (1 diff)
• samplereportgenerator.jsp (modified) (4 diffs)
• specimentube.jsp (modified) (2 diffs)

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

@@ -195 +195 @@
   if (!isValidDate)
   {
-    var dayInMonth = parseInt(datePart.substring(-2)); // Last two characters
+    var dayInMonth = parseInt(datePart.substring(-2), 10); // Last two characters
     if (dayInMonth > 60)
     {
@@ -348 +348 @@
     if (pnr.length == 10 && pnrIsValid) 
     {
-      var year = fullYear(parseInt(pnr.substr(0, 2)));
+      var year = fullYear(parseInt(pnr.substr(0, 2), 10));
       pnr = year + pnr.substr(2);
     }
@@ -483 +483 @@
   if (frm.copyConsent.checked && frm.copyConsent.value)
   {
-    bloodInfo.copyConsent = parseInt(frm.copyConsent.value);
+    bloodInfo.copyConsent = parseInt(frm.copyConsent.value, 10);
   }
 

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

@@ -62 +62 @@
   var frm = document.forms['details'];
 
-  lysate.qiacubePosition = parseInt(frm.qiacubePosition.value);
+  lysate.qiacubePosition = parseInt(frm.qiacubePosition.value, 10);
   lysate.originalQuantity = parseFloat(frm.lysateOriginalQuantity.value);
   lysate.processedQuantity = parseFloat(frm.lysateUsedQuantity.value);
@@ -84 +84 @@
   
   // Qiacube position
-  var qiacubePosition = parseInt(frm.qiacubePosition.value);
+  var qiacubePosition = parseInt(frm.qiacubePosition.value, 10);
   if (!(qiacubePosition > 0) || !(qiacubePosition <= 12))
   {

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

@@ -550 +550 @@
   submitInfo.lysates = selectedLysates;
   submitInfo.lysisDate = frm.lysisDate.value;
-  submitInfo.lysisProtocol = parseInt(frm.lysisProtocol.value);
+  submitInfo.lysisProtocol = parseInt(frm.lysisProtocol.value, 10);
   submitInfo.qiacubeDate = frm.qiacubeDate.value;
-  submitInfo.qiacubeRunNo = parseInt(frm.qiacubeRunNo.value);
+  submitInfo.qiacubeRunNo = parseInt(frm.qiacubeRunNo.value, 10);
   submitInfo.qiacubeOperator = frm.qiacubeOperator.value;
-  submitInfo.dnaProtocol = parseInt(frm.dnaProtocol.value);
-  submitInfo.rnaProtocol = parseInt(frm.rnaProtocol.value);
-  submitInfo.ftProtocol = parseInt(frm.ftProtocol.value);
+  submitInfo.dnaProtocol = parseInt(frm.dnaProtocol.value, 10);
+  submitInfo.rnaProtocol = parseInt(frm.rnaProtocol.value, 10);
+  submitInfo.ftProtocol = parseInt(frm.ftProtocol.value, 10);
 
   if (debug) Main.debug(JSON.stringify(submitInfo));
@@ -669 +669 @@
     return;
   }
-  if (!(parseInt(runNumber) >= 1))
+  if (!(parseInt(runNumber, 10) >= 1))
   {
     setInputStatus('qiacubeRunNo', 'Must be at least 1', 'invalid');

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

@@ -272 +272 @@
   
   workList.moveDate = frm.moveDate.value;
-  workList.protocolId = parseInt(frm.histologyProtocol[frm.histologyProtocol.selectedIndex].value);
+  workList.protocolId = parseInt(frm.histologyProtocol[frm.histologyProtocol.selectedIndex].value, 10);
 
   for (var blockNo = 0; blockNo < workList.blocks.length; blockNo++)

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

@@ -332 +332 @@
   {
     var field = frm[wells[i]];
-    if (!(parseInt(field.value) > 0))
+    if (!(parseInt(field.value, 10) > 0))
     {
       setInputStatus(field.name, null, 'invalid');
@@ -358 +358 @@
 {
   var frm = document.forms['reggie'];
-  if (!(parseInt(frm[field].value) > 0))
+  if (!(parseInt(frm[field].value, 10) > 0))
   {
     frm[field].focus();
@@ -380 +380 @@
     var field = frm[wells[i]];
     field.disabled = true;
-    if (parseInt(field.value) > maxIndex)
-    {
-      maxIndex = parseInt(field.value);
+    if (parseInt(field.value, 10) > maxIndex)
+    {
+      maxIndex = parseInt(field.value, 10);
     }
   }
@@ -538 +538 @@
     if (frm[field])
     {
-      well.GoodStain = parseInt(frm[field].value);
+      well.GoodStain = parseInt(frm[field].value, 10);
     }
   }
@@ -559 +559 @@
   var submitInfo = new Object();
   paraffinBlock.stainDate = frm.stainDate.value;
-  paraffinBlock.protocolId = parseInt(frm.stainingProtocol[frm.stainingProtocol.selectedIndex].value);
+  paraffinBlock.protocolId = parseInt(frm.stainingProtocol[frm.stainingProtocol.selectedIndex].value, 10);
   submitInfo.paraffinBlock = paraffinBlock;
   

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

@@ -150 +150 @@
     if (numLabelsPerBlock == null) return;
     
-    if (!parseInt(numLabelsPerBlock)) 
+    if (!parseInt(numLabelsPerBlock, 10)) 
     {
       alert('"' + numLabelsPerBlock + '" is not a valid number');
@@ -158 +158 @@
     var url = 'Histology.servlet?ID=<%=ID%>&cmd=DownloadHEGlassLabels';
     url += '&workListId=<%=listId%>';
-    url += '&numSlides=' + parseInt(numLabelsPerBlock);
+    url += '&numSlides=' + parseInt(numLabelsPerBlock, 10);
     
     location.href = url;

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

@@ -220 +220 @@
   for (var i = 0; i < frm.histology.length; i++)
   {
-    if (frm.histology[i].selected) histology[histology.length] = parseInt(frm.histology[i].value);
+    if (frm.histology[i].selected) histology[histology.length] = parseInt(frm.histology[i].value, 10);
   }
   

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

@@ -226 +226 @@
   if (!isValidDate)
   {
-    var dayInMonth = parseInt(datePart.substring(-2)); // Last two characters
+    var dayInMonth = parseInt(datePart.substring(-2), 10); // Last two characters
     if (dayInMonth > 60)
     {
@@ -463 +463 @@
   if (pnr.length == 10 && pnrIsValid) 
   {
-    var year = fullYear(parseInt(pnr.substr(0, 2)));
+    var year = fullYear(parseInt(pnr.substr(0, 2), 10));
     pnr = year + pnr.substr(2);
   }
@@ -805 +805 @@
   if (frm.copyConsent.checked && frm.copyConsent.value)
   {
-    caseInfo.copyConsent = parseInt(frm.copyConsent.value);
+    caseInfo.copyConsent = parseInt(frm.copyConsent.value, 10);
   }
 

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

@@ -169 +169 @@
   for (var i = 0; i < 9; i++)
   {
-    var digit = parseInt(pnr.substr(i, 1));
+    var digit = parseInt(pnr.substr(i, 1), 10);
     var tmp = factor * digit;
     sum += tmp >= 10 ? tmp - 9: tmp;
@@ -177 +177 @@
   var control = 10 - (sum % 10);
   if (control == 10) control = 0;
-  return (control == parseInt(pnr.substr(9, 1)))
+  return (control == parseInt(pnr.substr(9, 1), 10))
 }
 
@@ -207 +207 @@
   if (shortDate.length == 4 && Dates.isDate(shortDate, 'MMdd'))
   {
-    var month = parseInt(shortDate.substring(0,2));
-    var date = parseInt(shortDate.substring(2));
+    var month = parseInt(shortDate.substring(0,2), 10);
+    var date = parseInt(shortDate.substring(2), 10);
     if ((month > (currentDate.getMonth()+1))  ||
         ( (month == (currentDate.getMonth()+1)) && (date > currentDate.getDate())) )
@@ -218 +218 @@
   else if (shortDate.length == 6 && Dates.isDate(shortDate, 'yyMMdd'))
   {
-    var year = parseInt(shortDate.substring(0,2));    
+    var year = parseInt(shortDate.substring(0,2), 10);    
     fullDateString = ((2000+year)>currentYear ? "19" : "20") + fullDateString;
   } 

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

@@ -656 +656 @@
   }
   
-  var colC = parseInt(column)-1;
+  var colC = parseInt(column, 10)-1;
   if (isNaN(colC) || colC < 0 || colC >= selectedBioPlate.geometry.columns)
   {
@@ -767 +767 @@
   
   var protocol = new Object();
-  protocol.id = parseInt(frm.protocols[frm.protocols.selectedIndex].value);
+  protocol.id = parseInt(frm.protocols[frm.protocols.selectedIndex].value, 10);
   if (protocol.id != 0)
   {
@@ -777 +777 @@
   {
     var rnaQc = new Object();
-    rnaQc.parentId = parseInt(selectedRnaExtracts[i].id);
+    rnaQc.parentId = parseInt(selectedRnaExtracts[i].id, 10);
     rnaQc.name = selectedRnaExtracts[i].nextRnaQcName;
     rnaQc.row = frm['row'+i].value;

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

@@ -151 +151 @@
 {
   var frm = document.forms['reggie'];
-  var csvId = parseInt(frm['csv.id'].value);
-  var gxdStdId = parseInt(frm['gxd.std.id'].value);
-  var gxdHiId = parseInt(frm['gxd.hi.id'].value);
-  var pdfId = parseInt(frm['pdf.id'].value);
+  var csvId = parseInt(frm['csv.id'].value, 10);
+  var gxdStdId = parseInt(frm['gxd.std.id'].value, 10);
+  var gxdHiId = parseInt(frm['gxd.hi.id'].value, 10);
+  var pdfId = parseInt(frm['pdf.id'].value, 10);
   
   if (!csvId)

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

@@ -94 +94 @@
       {
         fdate = frm.fromdate.value;
-        fdate = new Date(fdate.substr(0,4), parseInt(fdate.substr(4,2))-1, fdate.substr(6,2));
+        fdate = new Date(fdate.substr(0,4), parseInt(fdate.substr(4,2), 10)-1, fdate.substr(6,2));
       }
     }
@@ -109 +109 @@
       {
         tdate = frm.todate.value;
-        tdate = new Date(tdate.substr(0,4), parseInt(tdate.substr(4,2))-1, tdate.substr(6,2));
+        tdate = new Date(tdate.substr(0,4), parseInt(tdate.substr(4,2), 10)-1, tdate.substr(6,2));
       }
     }
@@ -371 +371 @@
         if (currentYear == startDate.getFullYear())
         {
-          colspan =  11-parseInt(startDate.getMonth())+1;
+          colspan =  11-startDate.getMonth()+1;
           if (endDate.getFullYear() == currentYear)
           {
-            colspan = colspan - (11-parseInt(endDate.getMonth()));
+            colspan = colspan - (11-endDate.getMonth());
           }
         }
         else if (currentYear == endDate.getFullYear()) 
-          colspan = parseInt(endDate.getMonth()+1);
+          colspan = endDate.getMonth()+1;
         else
           colspan = 12;
@@ -560 +560 @@
         columnCounter++;        
       }while (columnCounter< numCols)     
-      tableRow.appendChild(getTableCellElement(parseInt(grandTotal), 'rowsummary'));
+      tableRow.appendChild(getTableCellElement(grandTotal, 'rowsummary'));
       reportTable.appendChild(tableRow);
     }

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

@@ -422 +422 @@
     {
       nextWellRow = response.freeRow;
-      nextWellColumn = parseInt(response.freeColumn)+1;   
+      nextWellColumn = parseInt(response.freeColumn, 10)+1;   
       
       nextWellColumn = nextWellColumn + tubeIndex;
@@ -553 +553 @@
       {
         nextWellRow = response.freeRow;
-        nextWellColumn = parseInt(response.freeColumn)+1;
+        nextWellColumn = parseInt(response.freeColumn, 10)+1;
         if( (nextWellColumn + tubeIndex) > response.columns)
         {