Debug/test date parsing

Author: bbimber

LDK/resources/web/LDK/ConvertUtils.js

@@ -4,6 +4,8 @@ Ext4.ns('LDK');
  * Static helpers designed to help with type conversion in JS.
  */
 LDK.ConvertUtils = new function(){
+    var verboseLogging = false;
+
     var DATEFORMATS = LABKEY.Utils.getDateAltFormats().split('|');
     DATEFORMATS.push('Y/m/d H:i:s');
     DATEFORMATS.push('n-j-Y');
@@ -40,6 +42,10 @@ LDK.ConvertUtils = new function(){
 
             // Therefore special case this format and append the browser's time zone:
             if (format === 'c' && value.length === 10) {
+                if (this.verboseLogging) {
+                    console.log('switching from c for Y-m-d format')
+                }
+
                 format = 'Y-m-d';
             }
 
@@ -48,6 +54,12 @@ LDK.ConvertUtils = new function(){
                 result = Ext4.Date.clearTime(parsedDate);
             }
         }
+
+        if (this.verboseLogging) {
+            console.log('Parsing, raw value: ' + value);
+            console.log('format: ' + format);
+            console.log(result);
+        }
         return result;
     }
 
@@ -113,6 +125,10 @@ LDK.ConvertUtils = new function(){
                     }, this);
                 }
             }, this);
+        },
+
+        setVerboseLogging: function(val) {
+            this.verboseLogging = val;
         }
     }
 };

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -1498,7 +1498,7 @@ private void samplesTableTest() throws Exception
         Ext4FieldRef.getForLabel(this, "Comment").setValue("I removed these samples");
 
         // TODO: for debugging date. ultimately remove
-        checker().withScreenshot("LabModulesTestDate1");
+        BaseWebDriverTest.getCurrentTest().getArtifactCollector().dumpPageSnapshot("LabModulesTestDate1");
 
         // Debug date parsing
         String clientFormattedString = (String)executeScript("return Ext4.Date.format(LDK.ConvertUtils.parseDate('2017-01-02'), 'Y-m-d');");
@@ -1520,7 +1520,7 @@ private void samplesTableTest() throws Exception
         {
             Assert.assertEquals("I removed these samples", row.get("remove_comment"));
             Assert.assertEquals(getUserId(), row.get("removedby"));
-            Assert.assertEquals("2017-01-02", dateFormat.format(row.get("dateremoved")));
+            Assert.assertEquals("Incorrect date, raw value: " + row.get("dateremoved"), "2017-01-02", dateFormat.format(row.get("dateremoved")));
         }
     }
 

laboratory/resources/web/laboratory/window/AssaySpreadsheetImportWindow.js

@@ -62,6 +62,9 @@ Ext4.define('Laboratory.ext.AssaySpreadsheetImportWindow', {
                         return;
                     }
 
+                    // TODO: debugging, ultimately remove this
+                    LDK.ConvertUtils.setVerboseLogging(true);
+
                     var models = LDK.StoreUtils.getModelsFromText({
                         store: win.targetGrid.store,
                         text: text
@@ -77,6 +80,9 @@ Ext4.define('Laboratory.ext.AssaySpreadsheetImportWindow', {
 
                     win.targetGrid.store.add(toAdd);
 
+                    // TODO: debugging, ultimately remove this
+                    LDK.ConvertUtils.setVerboseLogging(false);
+
                     win.close();
                 }
             },{