Merge pull request #159 from miguelcleon/timeseriesexportupdate

update for exporting time series data.
ODM2 · Aug 17, 2017 · 3a828df · 3a828df
2 parents 6ecc850 + d9be623
commit 3a828df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/odm2admin/models.py b/odm2admin/models.py
@@ -2933,12 +2933,13 @@ def csvheader():
     def csvoutput(self):
         # s = str(self.valueid)
         # s += ', {0}'.format(self.datavalue)
-        s = ', {0}'.format(self.valuedatetime)
+        s = '{0}'.format(self.valuedatetime)
         # s += ',\" {0}\"'.format(self.resultid.resultid.variableid.variablecode)
         # s += ',\" {0}\"'.format(self.resultid.resultid.unitsid.unitsname)
         # s += ',\" {0}\"'.format(self.resultid.resultid.processing_level)
         s += ',\" {0}\"'.format(
             self.samplingfeaturename)
+        s += ','
         # s += ', {0}'.format(self.timeaggregationinterval)
         # s += ', {0},'.format(self.timeaggregationintervalunitsid)
         s = buildCitation(s, self)

diff --git a/odm2admin/views.py b/odm2admin/views.py
@@ -2384,6 +2384,8 @@ def emailspreadsheet2(request, resultValuesSeries, profileResult=True):
                                             unit +
                                             processingCode+str(myresults.resultid))
             ):
+                myfile.write(",")
+                myfile.write(",")
                 myfile.write(",")
                 position += 1
             myfile.write(myresults.csvoutputShort())