Skip to content

Commit 00c3b79

Browse files
author
sreeder
committed
update source creation
1 parent 69af6cc commit 00c3b79

File tree

7 files changed

+38
-26
lines changed

7 files changed

+38
-26
lines changed

‎odmtools/controller/frmSource.py‎ renamed to ‎odmtools/controller/frmCreateSource.py‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Subclass of clsSource, which is generated by wxFormBuilder."""
22

33
import wx
4-
from odmtools.view.clsSource import clsSource
4+
from odmtools.view.clsCreateSource import clsSource
55
from odmtools.odmdata import Source
66

77

@@ -14,6 +14,9 @@ def __init__(self, parent, service_man, prev_src):
1414
self.source = None
1515
self.series_service = self.service_man.get_series_service()
1616

17+
# name_list = [x.title for x in self.series_service.get_iso_metadata()]
18+
# self.chMeta.AppendItems(name_list)
19+
1720
def getSource(self):
1821
return self.source
1922

@@ -24,19 +27,18 @@ def onOkClick(self, event):
2427
if self.all_fields_full():
2528
self.EndModal(wx.ID_OK)
2629
else:
27-
wx.MessageDialog(None, "Source was not created, A Value is missing", " ", wx.OK).ShowModal()
30+
wx.MessageDialog(None, "All required source fields must be completed.", " ", wx.OK).ShowModal()
2831

2932
def all_fields_full(self):
30-
return (self.txtOrg.GetValue() is not None) and \
33+
return (self.txtOrg.GetValue() != '') and \
3134
(self.txtDescrip.GetValue() != '') and \
32-
(self.txtLink.GetValue() is not None) and \
33-
(self.txtName.GetValue() is not None) and \
34-
(self.txtPhone.GetValue() is not None) and \
35-
(self.txtEmail.GetValue() is not None) and \
36-
(self.txtAddress.GetValue() is not None) and \
37-
(self.txtCity.GetValue() is not None) and \
35+
(self.txtName.GetValue() != '') and \
36+
(self.txtPhone.GetValue() != '') and \
37+
(self.txtEmail.GetValue() != '') and \
38+
(self.txtAddress.GetValue() != '') and \
39+
(self.txtCity.GetValue() != '') and \
3840
(self.txtState.GetValue() != '') and \
39-
(self.txtZip.GetValue() is not None) and \
41+
(self.txtZip.GetValue() != '') and \
4042
(self.txtCitation.GetValue() != '')
4143

4244
def createSource(self):

‎odmtools/controller/logicEditTools.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def get_qcl(self, q):
368368
Publisher.sendMessage("scroll")
369369

370370
return qcl
371-
def get_src(self, s):
371+
def get_source(self, s):
372372
src = self._edit_service.get_source(s.id)
373373
if self._record:
374374
self._script('new_src = series_service.get_src_by_id(%s)\n' % (src.id))

‎odmtools/controller/pageSource.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import wx.wizard as wiz
33
from odmtools.view.clsWizSource import clsSource
44
from wx.lib.pubsub import pub as Publisher
5-
from odmtools.controller.frmSource import frmCreateSource
5+
from odmtools.controller.frmCreateSource import frmCreateSource
66

77

88

@@ -29,6 +29,9 @@ def __init__(self, parent, title, service_manager, src):
2929
self.panel = pnlSource(self, id=wx.ID_ANY, title=u'pnlSource', service_manager=service_manager, src=src)
3030
self.sizer.Add(self.panel, 85, wx.ALL, 5)
3131

32+
33+
34+
3235
srcs = series_service.get_all_sources()
3336
index = 0
3437
for s, i in zip(srcs, range(len(srcs))):

‎odmtools/gui/wizSave.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ def on_wizard_finished(self, event):
392392
else:
393393
Method = self.record_service.create_method(Method)
394394

395-
s= self.record_service.get_src(Source)
395+
s= self.series_service.source_exists(Source)
396396
if s:
397397
if Source == self.currSeries.source:
398398
Source = None

‎odmtools/odmservices/edit_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,8 @@ def get_filter_list(self):
340340
# true or false list the length of the entire series. true indicate the point is selected
341341
return self._filter_list
342342

343-
def get_src(self, src_id):
344-
return self.memDB.series_service.get_src_by_ic(src_id)
343+
def get_source(self, src_id):
344+
return self.memDB.series_service.get_src_by_id(src_id)
345345

346346
def get_qcl(self, qcl_id):
347347
return self.memDB.series_service.get_qcl_by_id(qcl_id)

‎odmtools/odmservices/series_service.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from odmtools.odmdata import QualityControlLevel
1818
from odmtools.odmdata import ODMVersion
1919
from odmtools.odmdata import Source
20+
from odmtools.odmdata import ISOMetadata
2021
from odmtools.common.logger import LoggerTool
2122
import pandas as pd
2223

@@ -454,6 +455,12 @@ def get_data_value_by_id(self, id):
454455
except:
455456
return None
456457

458+
def get_iso_metadata(self):
459+
try:
460+
return self._edit_session.query(ISOMetadata).filter_by(id=id).first()
461+
except:
462+
return None
463+
457464

458465

459466

‎odmtools/view/clsSource.py‎ renamed to ‎odmtools/view/clsCreateSource.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ def __init__(self, parent):
3030
sizerOrganization.SetFlexibleDirection(wx.BOTH)
3131
sizerOrganization.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
3232

33-
self.lblOrg = wx.StaticText(self, wx.ID_ANY, u"Organization", wx.DefaultPosition, wx.DefaultSize,
33+
self.lblOrg = wx.StaticText(self, wx.ID_ANY, u"Organization*", wx.DefaultPosition, wx.DefaultSize,
3434
wx.ALIGN_RIGHT)
3535
self.lblOrg.Wrap(-1)
3636
sizerOrganization.Add(self.lblOrg, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
3737

3838
self.txtOrg = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
3939
sizerOrganization.Add(self.txtOrg, 1, wx.ALL | wx.EXPAND, 5)
4040

41-
self.lblDescrip = wx.StaticText(self, wx.ID_ANY, u"Description", wx.DefaultPosition, wx.DefaultSize,
41+
self.lblDescrip = wx.StaticText(self, wx.ID_ANY, u"Description*", wx.DefaultPosition, wx.DefaultSize,
4242
wx.ALIGN_RIGHT)
4343
self.lblDescrip.Wrap(-1)
4444
sizerOrganization.Add(self.lblDescrip, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
@@ -61,14 +61,14 @@ def __init__(self, parent):
6161
sizerContact.SetFlexibleDirection(wx.BOTH)
6262
sizerContact.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
6363

64-
self.lblName = wx.StaticText(self, wx.ID_ANY, u" Name", wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT)
64+
self.lblName = wx.StaticText(self, wx.ID_ANY, u" Name*", wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT)
6565
self.lblName.Wrap(-1)
6666
sizerContact.Add(self.lblName, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
6767

6868
self.txtName = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
6969
sizerContact.Add(self.txtName, 1, wx.ALL | wx.EXPAND, 5)
7070

71-
self.lblPhone = wx.StaticText(self, wx.ID_ANY, u"Phone", wx.DefaultPosition, wx.DefaultSize, 0)
71+
self.lblPhone = wx.StaticText(self, wx.ID_ANY, u"Phone*", wx.DefaultPosition, wx.DefaultSize, 0)
7272
self.lblPhone.Wrap(-1)
7373
sizerContact.Add(self.lblPhone, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
7474

@@ -82,14 +82,14 @@ def __init__(self, parent):
8282
sizerAddress.SetFlexibleDirection(wx.BOTH)
8383
sizerAddress.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
8484

85-
self.lblEmail = wx.StaticText(self, wx.ID_ANY, u" Email", wx.DefaultPosition, wx.DefaultSize, 0)
85+
self.lblEmail = wx.StaticText(self, wx.ID_ANY, u" Email*", wx.DefaultPosition, wx.DefaultSize, 0)
8686
self.lblEmail.Wrap(-1)
8787
sizerAddress.Add(self.lblEmail, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT | wx.ALL, 5)
8888

8989
self.txtEmail = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
9090
sizerAddress.Add(self.txtEmail, 0, wx.ALL | wx.EXPAND, 5)
9191

92-
self.lblAddress = wx.StaticText(self, wx.ID_ANY, u"Address", wx.DefaultPosition, wx.DefaultSize, 0)
92+
self.lblAddress = wx.StaticText(self, wx.ID_ANY, u"Address*", wx.DefaultPosition, wx.DefaultSize, 0)
9393
self.lblAddress.Wrap(-1)
9494
sizerAddress.Add(self.lblAddress, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
9595

@@ -103,14 +103,14 @@ def __init__(self, parent):
103103
sizerDetails.SetFlexibleDirection(wx.BOTH)
104104
sizerDetails.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
105105

106-
self.lblCity = wx.StaticText(self, wx.ID_ANY, u"City", wx.DefaultPosition, wx.DefaultSize, 0)
106+
self.lblCity = wx.StaticText(self, wx.ID_ANY, u"City*", wx.DefaultPosition, wx.DefaultSize, 0)
107107
self.lblCity.Wrap(-1)
108108
sizerDetails.Add(self.lblCity, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
109109

110110
self.txtCity = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
111111
sizerDetails.Add(self.txtCity, 1, wx.ALL | wx.EXPAND, 5)
112112

113-
self.lblState = wx.StaticText(self, wx.ID_ANY, u"State", wx.DefaultPosition, wx.DefaultSize, 0)
113+
self.lblState = wx.StaticText(self, wx.ID_ANY, u"State*", wx.DefaultPosition, wx.DefaultSize, 0)
114114
self.lblState.Wrap(-1)
115115
sizerDetails.Add(self.lblState, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
116116

@@ -119,7 +119,7 @@ def __init__(self, parent):
119119
)
120120
sizerDetails.Add(self.txtState, 0, wx.ALL, 5)
121121

122-
self.lblZip = wx.StaticText(self, wx.ID_ANY, u"ZipCode", wx.DefaultPosition, wx.DefaultSize, 0)
122+
self.lblZip = wx.StaticText(self, wx.ID_ANY, u"ZipCode*", wx.DefaultPosition, wx.DefaultSize, 0)
123123
self.lblZip.Wrap(-1)
124124
sizerDetails.Add(self.lblZip, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
125125

@@ -134,14 +134,14 @@ def __init__(self, parent):
134134
sizerCitation.SetFlexibleDirection(wx.BOTH)
135135
sizerCitation.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
136136

137-
self.lblCitation = wx.StaticText(self, wx.ID_ANY, u" Citation", wx.DefaultPosition, wx.DefaultSize, 0)
137+
self.lblCitation = wx.StaticText(self, wx.ID_ANY, u" Citation*", wx.DefaultPosition, wx.DefaultSize, 0)
138138
self.lblCitation.Wrap(-1)
139139
sizerCitation.Add(self.lblCitation, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
140140

141141
self.txtCitation = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
142142
sizerCitation.Add(self.txtCitation, 0, wx.ALL | wx.EXPAND, 5)
143143

144-
self.lblMetadata = wx.StaticText(self, wx.ID_ANY, u"Metadata", wx.DefaultPosition, wx.DefaultSize, 0)
144+
self.lblMetadata = wx.StaticText(self, wx.ID_ANY, u"Metadata*", wx.DefaultPosition, wx.DefaultSize, 0)
145145
self.lblMetadata.Wrap(-1)
146146
sizerCitation.Add(self.lblMetadata, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
147147

0 commit comments

Comments
 (0)