Merge pull request #307 from ODM2/use_api2

Use api2

Author: Stephanie Reeder

ODMTools.py

@@ -23,7 +23,8 @@
 #import psycopg2
 
 tool = LoggerTool()
-logger = tool.setupLogger('main',  'odmtools.log', 'a', logging.INFO)
+# logger = tool.setupLogger('main',  'odmtools.log', 'a', logging.INFO)
+logger = tool.setupLogger('main',  'odmtools.log', 'a', logging.DEBUG)
 wx.Log.SetLogLevel(0)
 
 
@@ -56,6 +57,7 @@ def OnInit(self):
         kwargs['taskServer'] = self.taskserver
         kwargs['memdb']= self.memdb
         self.frame = frmODMToolsMain(**kwargs)
+        self.frame.CenterOnScreen()
         self.frame.Show(True)
         app= self.frame
         return True

odmtools/common/taskServer.py

@@ -130,13 +130,12 @@ def worker(cls, dispatcher):
                 result = Statistics(task)
             if task_type == "InitEditValues":
                 connection = SeriesService("sqlite:///:memory:")
+                # connection._
                 df = task[1]
                 logger.debug("Load series from db")
-                df.to_sql(name="DataValues", con=connection._connection.engine, flavor='sqlite', index = False, chunksize = 10000)
-# =======
-#                 logger.debug("Load series_service from db")
-#                 df.to_sql(name="DataValues", con=connection._session_factory.engine, flavor='sqlite', index = False, chunksize = 10000)
-# >>>>>>> origin/update_cvs
+                #setSchema(self.mem_service._session_factory.engine)
+                df.to_sql(name="timeseriesresultvalues", con=connection._connection.engine, flavor='sqlite', index = False, chunksize = 10000)
+
                 logger.debug("done loading database")
                 result = connection
             if task_type == "UpdateEditDF":

odmtools/controller/frmBulkInsert.py …tools/controller/BulkInsertController.pyodmtools/controller/frmBulkInsert.py renamed to odmtools/controller/BulkInsertController.py odmtools/controller/frmBulkInsert.py renamed to odmtools/controller/BulkInsertController.py

@@ -2,7 +2,7 @@
     Bulk Insert of points
 """
 import wx
-import odmtools.view.clsBulkInsert as clsBulkInsert
+import odmtools.view.BulkInsertView as clsBulkInsert
 import odmtools.controller.olvAddPoint as olv
 import pandas as pd
 from pandas.parser import CParserError
@@ -13,13 +13,12 @@
 __author__ = 'Jacob'
 
 
-class BulkInsert(clsBulkInsert.BulkInsert):
+class BulkInsertController(clsBulkInsert.BulkInsertView):
     def __init__(self, parent):
-        clsBulkInsert.BulkInsert.__init__(self, parent)
+        clsBulkInsert.BulkInsertView.__init__(self, parent)
         self.parent = parent
 
-        self.col = ['DataValue', 'Date', 'Time', 'UTCOffSet', 'CensorCode', 'ValueAccuracy', 'OffSetValue',
-               'OffSetType', 'QualifierCode', 'LabSampleCode']
+        self.columns = ["DataValue", "Date", "Time", "UTFOffset", "CensorCode", "QualityCode", "TimeAggregationInterval", "TimeAggregationUnitID", "Annotation"]
 
     def obtainFilePath(self):
         ## Obtain CSV filepath
@@ -53,16 +52,10 @@ def readDataFromCSV(self, filepath):
 
         try:
             #data = pd.read_csv(filepath, skiprows=[1], engine='c', lineterminator='\n')
-            data = pd.read_csv(csv_data, skiprows=[1], engine='c', converters={0: str.strip,
-                                1: str.strip,
-                                2: str.strip,
-                                3: str.strip,
-                                4: str.strip,
-                                5: str.strip,
-                                6: str.strip,
-                                7: str.strip,
-                                8: str.strip,
-                                9: str.strip})
+            data = pd.read_csv(csv_data, skiprows=[1], engine='c', converters={
+                0: str.strip, 1: str.strip, 2: str.strip, 3: str.strip,
+                4: str.strip, 5: str.strip, 6: str.strip, 7: str.strip,
+                8: str.strip})
         except CParserError as e:
             message = "There was an issue trying to parse your file. "\
                                          "Please compare your csv with the template version as the file"\
@@ -112,6 +105,7 @@ def loadIntoDataFrame(self, data):
 
         dlg.Destroy()
         return pointList
+
     def onUpload(self, event):
         """Reads csv into pandas object
 
@@ -143,7 +137,7 @@ def onUpload(self, event):
         self.parent.Raise()
         event.Skip()
 
-    def onTemplate(self, event):
+    def onDownloadTemplateButton(self, event):
         """
                 DataValues: Floats or -9999 (No data value)
                 Date: --+ String
@@ -160,28 +154,25 @@ def onTemplate(self, event):
         :param event:
         :return:
         """
-        saveFileDialog = wx.FileDialog(self, "Save Bulk Insert Template", "", "", "CSV files (*.csv)|*.csv", wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-        value = saveFileDialog.ShowModal()
+
+        file_dialog = wx.FileDialog(self, "Save Bulk Insert Template", "", "", "CSV files (*.csv)|*.csv", wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
+        value = file_dialog.ShowModal()
         if value == wx.ID_CANCEL:
             return
-        filepath = saveFileDialog.GetPath()
-        df = pd.DataFrame(columns=self.col)
+        filepath = file_dialog.GetPath()
+        df = pd.DataFrame(columns=self.columns)
         df.loc[0] = ['FLOAT|INT', 'YYYY-MM-DD', 'HH:MM:SS', 'INT', 'gt|nc|lt|nd|pnq', 'FLOAT', 'FLOAT',
-                     'String', 'String', 'String']
-        df.loc[1] = ['-9999', '2005-06-29', '14:20:15', '-7', 'nc', "1.2", "1", "NULL", "NULL", "NULL"]
+                     'String', 'String']
+        df.loc[1] = ['-9999', '2005-06-29', '14:20:15', '-7', 'nc', "1.2", "1", "NULL", "NULL"]
         df.to_csv(filepath, index=False)
-
-        self.EndModal(0) # Denver
-        #self.Hide()
-        self.parent.Raise()
+        self.onClose(None)
 
     def onClose(self, event):
-        self.EndModal(0) # Denver
-        #self.Hide()
+        self.EndModal(0)
         self.parent.Raise()
 
 if __name__ == '__main__':
     app = wx.App(useBestVisual=True)
-    m = BulkInsert(None)
+    m = BulkInsertController(None)
     m.Show()
     app.MainLoop()

odmtools/controller/NewFlagValuesController.py

@@ -0,0 +1,65 @@
+import wx
+from odmtools.view.NewFlagValuesView import NewFlagValuesView
+import odmtools.controller.olvAddPoint
+
+
+class NewFlagValuesController(NewFlagValuesView):
+    def __init__(self, parent, series_service, qualifier_choice, record_service):
+
+        NewFlagValuesView.__init__(self, parent)
+        self.parent = parent
+        self.series_service = series_service
+        self.qualifer_choice = qualifier_choice
+        self.record_service = record_service
+        self.__new_annotation = "New Annontation"
+
+        if self.qualifer_choice:
+            annotations = self.series_service.get_all_annotations()
+            self.append_items_to_annotation(annotations)
+
+        self.annotation_combo.Append(self.__new_annotation)
+        self.annotation_combo.SetSelection(0)
+
+        self.cancel_button.Bind(wx.EVT_BUTTON, self.on_cancel)
+        self.Bind(wx.EVT_CLOSE, self.on_cancel)
+        self.ok_button.Bind(wx.EVT_BUTTON, self.on_ok)
+        self.MakeModal(True)
+
+    def append_items_to_annotation(self, annotations):
+        if not isinstance(annotations, list):
+            print "type(annotations) must be list of annotations"
+            return
+
+        for item in annotations:
+            self.annotation_combo.Append(str(item.AnnotationCode + ":" + item.AnnotationText))
+
+    def on_cancel(self, event):
+        self.MakeModal(False)
+        self.Destroy()
+
+        if event:
+            event.Skip()
+
+    def on_ok(self, event):
+        selection = self.annotation_combo.GetValue()
+        if selection == self.__new_annotation:
+            code = self.code_textbox.GetValue()
+            text = self.text_textbox.GetValue()
+
+            annotation = self.series_service.create_annotation(code, text)
+        else:
+            code = selection.split(':')[0]
+            annotation = self.series_service.get_annotation_by_code(code)
+        self.record_service.flag(annotation.AnnotationID)
+
+        if isinstance(self.parent, odmtools.controller.olvAddPoint.OLVAddPoint):
+            self.parent.refresh_annotations()
+
+        self.on_cancel(event)
+
+if __name__ == '__main__':
+    app = wx.App(False)
+    controller = NewFlagValuesController(None, None, None, None)
+    controller.Show()
+    app.MainLoop()
+

odmtools/controller/WizardActionController.py

@@ -0,0 +1,55 @@
+import wx
+from odmtools.view.WizardActionView import WizardActionView
+from wx.wizard import WizardPageSimple
+from odm2api.ODM2.models import Affiliations
+
+
+# Should we rename this to Affiliations instead of actions? Action is created else where
+class WizardActionController(WizardPageSimple):
+    def __init__(self, parent, affiliations):
+        WizardPageSimple.__init__(self, parent)
+        self.action_view = WizardActionView(self)
+        self.affiliations = affiliations
+
+        master_sizer = wx.BoxSizer(wx.VERTICAL)
+        master_sizer.Add(self.action_view, 1, wx.EXPAND | wx.RIGHT, 0)
+        self.SetSizer(master_sizer)
+
+        if self.affiliations is None:
+            return
+        # Populate table with the affiliations
+        self.populate_affiliations_table()
+
+    def populate_affiliations_table(self):
+        """
+        self.affiliations must be a list affiliations
+        :return:
+        """
+        if not isinstance(self.affiliations, list):
+            return
+        if not len(self.affiliations) and not isinstance(self.affiliations[0], Affiliations):
+            return
+
+        data = []
+        for affiliation in self.affiliations:
+            data.append([
+                affiliation.PersonObj.PersonFirstName + " " + affiliation.PersonObj.PersonLastName,
+                affiliation.OrganizationObj.OrganizationName
+            ])
+
+        columns = ["Person", "Organization"]
+        self.action_view.affiliations_table.set_columns(columns)
+        self.action_view.affiliations_table.set_table_content(data)
+
+    def get_affiliation(self):
+        index = self.action_view.affiliations_table.GetFirstSelected()
+        return self.affiliations[index]
+
+
+
+
+if __name__ == '__main__':
+    app = wx.App(False)
+    controller = WizardActionController(None, None)
+    controller.Show()
+    app.MainLoop()