fix bug when accesing existing sourc

Author: sreeder

odmtools/controller/pageSource.py

@@ -44,6 +44,8 @@ def __init__(self, parent, title, service_manager, src):
             self.panel.lstSource.SetStringItem(num_items, 8, str(s.state))
             self.panel.lstSource.SetStringItem(num_items, 9, str(s.zip_code))
             self.panel.lstSource.SetStringItem(num_items, 10, str(s.citation))
+            self.panel.lstSource.SetStringItem(num_items, 11, str(s.id))
+
 
             if s.organization == src.organization:
                 index = i
@@ -101,9 +103,9 @@ def getSource(self):
             s = self.prev_val
         elif self.rbSelect.Value:
             index = self.lstSource.GetFirstSelected()
-            code = self.lstSource.GetItem(index, 0).GetText()
+            code = self.lstSource.GetItem(index, 11).GetText()
             logger.debug(code)
-            s = self.series_service.get_source_by_org(code)
+            s = self.series_service.get_src_by_id(code)
         elif self.rbCreate.Value:
             s = self.createdSrc
         return s
@@ -122,6 +124,8 @@ def show_new_src(self, src):
         self.txtNewSrc.SetStringItem(0, 9, str(src.citation))
         self.txtNewSrc.SetStringItem(0, 10, str(src.iso_metadata_id))
 
+
+
         self.txtNewSrc.Focus(0)
         self.txtNewSrc.Select(0)
         self.txtNewSrc.Enable(True)

odmtools/gui/wizSave.py

@@ -392,13 +392,13 @@ def on_wizard_finished(self, event):
             else:
                 Method = self.record_service.create_method(Method)
 
-            s= self.series_service.source_exists(Source)
+            s= self.record_service.get_src(Source)
             if s:
                 if Source == self.currSeries.source:
                     Source = None
                 else:
                     # Source = self.record_service.get_source(Source)
-                    Source = source
+                    Source = s
             else:
                 Source = self.record_service.create_source(Source)
 

odmtools/odmservices/series_service.py

@@ -46,8 +46,6 @@ def get_db_version(self):
     def get_all_sources(self):
         return self._edit_session.query(Source).order_by(Source.id).all()
 
-    def get_source_by_org(self, org):
-        return self._edit_session.query(Source).filter(Source.organization == org).first()
 
     def get_src_by_id(self, src_id):
         try:

odmtools/view/clsWizSource.py

@@ -43,8 +43,10 @@ def __init__(self,prnt,id,pos,size,style,name):
         self.lstSource.InsertColumn(8, 'State')
         self.lstSource.InsertColumn(9, 'ZipCode')
         self.lstSource.InsertColumn(10, 'Citation')
+        self.lstSource.InsertColumn(11, 'ID')
         self.lstSource.SetColumnWidth(0, 100)
         self.lstSource.SetColumnWidth(1, 100)
+        self.lstSource.SetColumnWidth(11, 0)
 
         self.lstSource.Bind(wx.EVT_LIST_ITEM_SELECTED,
                             self.OnListCtrl1ListItemSelected)