Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OSUG
JMMC
jmmc-jmdcui-docker
Commits
ea7b7a5a
Commit
ea7b7a5a
authored
Jan 23, 2020
by
Guillaume Mella
Browse files
remove com column
parent
f392a448
Changes
3
Hide whitespace changes
Inline
Side-by-side
jmdc-ui/jmdc_app/alembic/versions/20190724_59e01862a009.py
View file @
ea7b7a5a
...
...
@@ -38,7 +38,6 @@ def upgrade():
sa
.
Column
(
'band_code'
,
sa
.
Integer
(),
nullable
=
True
),
sa
.
Column
(
'notes'
,
sa
.
String
(
length
=
255
),
nullable
=
True
),
sa
.
Column
(
'bibcode'
,
sa
.
String
(
length
=
19
),
nullable
=
True
),
sa
.
Column
(
'com'
,
sa
.
String
(
length
=
255
),
nullable
=
True
),
sa
.
PrimaryKeyConstraint
(
'id'
,
name
=
op
.
f
(
'pk_star_info'
))
)
op
.
create_table
(
'submission'
,
...
...
jmdc-ui/jmdc_app/models/star_info.py
View file @
ea7b7a5a
...
...
@@ -79,7 +79,6 @@ class StarInfo(Base):
'BANDCODE'
:
{
'field'
:
'band_code'
,
'must'
:
False
,
'check'
:
'check_band_code'
},
'NOTES'
:
{
'field'
:
'notes'
,
'must'
:
False
},
'BIBCODE'
:
{
'field'
:
'bibcode'
,
'must'
:
True
,
'check'
:
'check_bibcode'
,
'alternate'
:
'REFERENCE'
},
'COM'
:
{
'field'
:
'com'
,
'must'
:
False
,
'alternate'
:
'REFERENCE'
},
'REFERENCE'
:
{
'must'
:
False
,
'parse'
:
'parse_reference'
},
'SINPE'
:
{
'field'
:
'sinpe'
,
'must'
:
False
,
'check'
:
'check_bool'
,
'parse'
:
'parse_sinpe'
},
# SIMBAD Id Not Precise Enough
},
...
...
@@ -130,7 +129,6 @@ class StarInfo(Base):
band_code
=
Column
(
Integer
)
notes
=
Column
(
String
(
255
))
bibcode
=
Column
(
String
(
19
))
com
=
Column
(
String
(
255
))
sinpe
=
Column
(
Boolean
)
star_info_entry
=
relationship
(
'StarInfoEntry'
,
back_populates
=
'star_info'
)
...
...
@@ -421,7 +419,7 @@ class StarInfo(Base):
self
.
append_warning
(
field_name
,
"bibcode portion is incompletely specified"
)
self
.
set_field_value
(
'bibcode'
,
bibcode
)
if
comment
:
self
.
set_field_value
(
'com'
,
comment
)
self
.
append_warning
(
'bibcode'
,
'bibcode extract ignore next part : %s'
%
comment
)
# force parsing before checking since starname check depends on this field
def
parse_sinpe
(
self
,
field_name
,
field_info
,
value
):
...
...
jmdc-ui/jmdc_app/templates/moderate-submission.jinja2
View file @
ea7b7a5a
...
...
@@ -21,7 +21,6 @@
<th>BAND_CODE</th>
<th>NOTES</th>
<th>BIBCODE</th>
<th>COM</th>
<th>SINPE</th>
</tr>
</thead>
...
...
@@ -41,7 +40,6 @@
<td>{{ entry.star_info.band_code or '' }}</td>
<td>{{ entry.star_info.notes or '' }}</td>
<td><a href="https://ui.adsabs.harvard.edu/abs/{{ entry.star_info.bibcode or '' }}/abstract">{{ entry.star_info.bibcode or '' }}</a></td>
<td>{{ entry.star_info.com or '' }}</td>
<td>{{ entry.star_info.sinpe or '' }}</td>
</tr>
<tr>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment