fix saving append issues

Author: Stephanie Reeder

odmtools/controller/logicEditTools.py

@@ -274,7 +274,7 @@ def save_appending(self, var = None, method =None, qcl = None, overwrite = False
             if self._record:
 
                 self._script(
-                    "edit_service.save_appending(%s, %s, %s, %s)\n" % (self.saveFactory(var, method, qcl)+ [overwrite]),
+                    "edit_service.save_appending(%s, %s, %s, " % self.saveFactory(var, method, qcl)+str(overwrite )+")\n",
                     'black')
                 #self._script("edit_service.save(%s, %s, %s, saveAs=%s)\n" % (var, method, qcl, isSave), 'black')
                 Publisher.sendMessage("scroll")

odmtools/controller/pageIntro.py

@@ -29,8 +29,6 @@ def __init__(self, parent, title):
                                                   #style=wx.TAB_TRAVERSAL)
         self.sizer.Add(self.pnlIntroduction, 85, wx.ALL, 5)
 
-
-
         self.pnlIntroduction.rbSave.Bind(wx.EVT_RADIOBUTTON, self.OnBtnSaveRadiobutton)
         self.pnlIntroduction.rbSaveAs.Bind(wx.EVT_RADIOBUTTON, self.OnBtnSaveAsRadiobutton)
         self.pnlIntroduction.rbSaveExisting.Bind(wx.EVT_RADIOBUTTON, self.OnBtnSaveExistingRadiobuton)
@@ -43,24 +41,19 @@ def SetPrev(self, prev):
 
     def GetNext(self):
        return self.next
+
     def GetPrev(self):
         return self.prev
 
-
     # Handlers for pnlIntro events.
     def OnBtnSaveRadiobutton(self, event):
-
-        print "in saveRadioButton"
         Publisher.sendMessage("wizChangeSave", event = event)
         #event.Skip()
 
     def OnBtnSaveAsRadiobutton(self, event):
-        print "in saveAsRadioButton"
         Publisher.sendMessage("wizChangeSave", event = event)        #event.Skip()
 
     def OnBtnSaveExistingRadiobuton(self, event):
         Publisher.sendMessage("wizChangeSave", event = event)
-        print "in saveExistingRadioButton"
         #event.Skip()
-	
-	
+

odmtools/gui/wizSave.py

@@ -328,13 +328,11 @@ def on_wizard_finished(self, event):
         elif rbSaveAsExisting:
             keyword = "overwrite"
 
-            if self.pgExisting.pnlExisting.rbAppend:
+            if self.pgExisting.pnlExisting.rbAppend.GetValue():
                 keyword = "append to"
 
-            message = "You are about to "+keyword+" an existing series,\nthis action cannot be undone.\nWould you like to continue?\n"
-            cont = wx.MessageBox(message,
-                                      'Are you  sure?',
-                                      wx.YES_NO | wx.ICON_QUESTION)
+            message = "You are about to " + keyword + " an existing series,\nthis action cannot be undone.\nWould you like to continue?\n"
+            cont = wx.MessageBox(message, 'Are you sure?', wx.YES_NO | wx.ICON_QUESTION)
             if cont == 2:
                 closeSuccessful = True
             else:

odmtools/odmservices/edit_service.py

@@ -510,7 +510,7 @@ def updateSeries(self, var=None, method=None, qcl=None, is_new_series=False, ove
             series.end_date_time = datetime.datetime.strptime(str(np.max(dvs["LocalDateTime"])), form)
             series.end_date_time_utc = datetime.datetime.strptime(str(np.max(dvs["DateTimeUTC"])), form)
             #TODO figure out how to calculate the new value count
-            series.value_count = series.value_count+len(dvs)
+            series.value_count = series.value_count+len(dvs)#set test series value count to 19
 
             # if overwrite:
             #     if dbend >dfstart:
@@ -536,7 +536,7 @@ def updateSeries(self, var=None, method=None, qcl=None, is_new_series=False, ove
                     self.memDB.series_service.delete_values_by_series(series, startdate=dfstart)
                 else:
                     #remove values from df
-                    dvs = dvs[dvs["LocalDateTime"] >= dbend]
+                    dvs = dvs[dvs["LocalDateTime"] > dbend]
 
 
 

odmtools/odmservices/series_service.py

@@ -512,7 +512,6 @@ def save_new_series(self, series, dvs):
                 self._edit_session.rollback()
                 raise e
 
-
         logger.debug("A new series was added to the database, series id: "+str(series.id))
         return True
 
@@ -524,7 +523,6 @@ def save_values(self, values):
         """
         values.to_sql(name="datavalues", if_exists='append', con=self._session_factory.engine, index=False)
 
-
     def create_new_series(self, data_values, site_id, variable_id, method_id, source_id, qcl_id):
         """