Date format

BrandwatchLtd · Dec 11, 2013 · ee89548 · ee89548
1 parent dd27090
commit ee89548
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 38 deletions.
diff --git a/a.js b/a.js
diff --git a/lib/templates.js b/lib/templates.js
diff --git a/lib/utils.js b/lib/utils.js
@@ -27,7 +27,7 @@ module.exports = {
     if (_.isNumber(val) && _.isFinite(val)) {
       return "<c r='" + ref + "'><v>" + val + "</v></c>";
     } else if (_.isDate(val)) {
-      return "<c r='" + ref + "' t='d'><v>" + (val.toISOString()) + "</v></c>";
+      return "<c r='" + ref + "' t='d' s='2'><v>" + (val.toISOString()) + "</v></c>";
     } else if (_.isBoolean(val)) {
       return "<c r='" + ref + "' t='b'><v>" + (val ? '1' : '0') + "</v></c>";
     } else {

diff --git a/src/templates.coffee b/src/templates.coffee
@@ -8,10 +8,7 @@ module.exports =
   worksheet:
     header: xml """
       <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-      <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" 
-       xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" 
-       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-       mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
+      <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
         <sheetViews>
           <sheetView workbookViewId="0"/>
         </sheetViews>
@@ -29,20 +26,13 @@ module.exports =
       header: xml """
         <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
         <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
-          <Default Extension="rels" 
-           ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
-          <Default Extension="xml" 
-           ContentType="application/xml"/>
-          <Override PartName="/xl/workbook.xml" 
-           ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
-          <Override PartName="/xl/styles.xml" 
-           ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>
-          <Override PartName="/xl/sharedStrings.xml" 
-           ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
-          <Override PartName="/docProps/core.xml" 
-           ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
-          <Override PartName="/docProps/app.xml" 
-           ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
+          <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+          <Default Extension="xml" ContentType="application/xml"/>
+          <Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
+          <Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>
+          <Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
+          <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
+          <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
       """
       sheet: (sheet)-> """
           <Override PartName="/#{esc sheet.path}" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>
@@ -60,20 +50,15 @@ module.exports =
           <Relationship Id="rSheet#{esc sheet.index}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="#{esc sheet.rel}"/>
           """
       footer: xml """
-          <Relationship Id="rId2" 
-           Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" 
-           Target="sharedStrings.xml"/>
-          <Relationship Id="rId3" 
-           Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" 
-           Target="styles.xml"/>
+          <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>
+          <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
         </Relationships>
       """
 
     "xl/workbook.xml":
       header: xml """
         <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-        <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" 
-         xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+        <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
           <fileVersion appName="xl" lastEdited="5" lowestEdited="5" rupBuild="9303"/>
           <workbookPr defaultThemeVersion="124226"/>
           <bookViews>
@@ -103,11 +88,7 @@ module.exports =
 
     "xl/styles.xml": xml """
       <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-      <styleSheet 
-       xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" 
-       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-       mc:Ignorable="x14ac" 
-       xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
+      <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
         <fonts count="1" x14ac:knownFonts="1">
           <font>
             <sz val="11"/>
@@ -137,17 +118,18 @@ module.exports =
         <cellStyleXfs count="1">
           <xf numFmtId="0" fontId="0" fillId="0" borderId="0"/>
         </cellStyleXfs>
-        <cellXfs count="1">
-          <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" />
+        <cellXfs count="3">
+          <xf xfId="0" fontId="0" fillId="0" borderId="0" numFmtId="0"/>
+          <xf xfId="0" fontId="0" fillId="0" borderId="0" numFmtId="0"/>
+          <xf xfId="0" fontId="0" fillId="0" borderId="0" numFmtId="14" applyNumberFormat="1"/>
         </cellXfs>
         <cellStyles count="1">
           <cellStyle name="Normal" xfId="0" builtinId="0"/>
         </cellStyles>
         <dxfs count="0"/>
         <tableStyles count="0" defaultTableStyle="TableStyleMedium2" defaultPivotStyle="PivotStyleLight16"/>
         <extLst>
-          <ext uri="{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" 
-           xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main">
+          <ext uri="{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main">
             <x14:slicerStyles defaultSlicerStyle="SlicerStyleLight1"/>
           </ext>
         </extLst>

diff --git a/src/utils.coffee b/src/utils.coffee
@@ -24,7 +24,7 @@ module.exports =
     if _.isNumber(val) and _.isFinite(val)
       "<c r='#{ref}'><v>#{val}</v></c>"
     else if _.isDate(val)
-      "<c r='#{ref}' t='d'><v>#{val.toISOString()}</v></c>"
+      "<c r='#{ref}' t='d' s='2'><v>#{val.toISOString()}</v></c>"
     else if _.isBoolean(val)
       "<c r='#{ref}' t='b'><v>#{if val then '1' else '0'}</v></c>"
     else