diff options
Diffstat (limited to 'animism-align')
8 files changed, 15 insertions, 10 deletions
diff --git a/animism-align/cli/app/controllers/annotation_controller.py b/animism-align/cli/app/controllers/annotation_controller.py index 962d8f5..cd70d80 100644 --- a/animism-align/cli/app/controllers/annotation_controller.py +++ b/animism-align/cli/app/controllers/annotation_controller.py @@ -14,11 +14,15 @@ class AnnotationView(CrudView): def on_create(self, session, form, item): if 'paragraph_id' in form: item.paragraph_id = form['paragraph_id'] + if 'start_ts' in form: + item.start_ts = form['start_ts'] if 'settings' in form: item.settings = form['settings'] def on_update(self, session, form, item): if 'paragraph_id' in form: item.paragraph_id = form['paragraph_id'] + if 'start_ts' in form: + item.start_ts = form['start_ts'] if 'settings' in form: item.settings = form['settings'] diff --git a/animism-align/cli/app/sql/models/annotation.py b/animism-align/cli/app/sql/models/annotation.py index cc53bd6..2b42eac 100644 --- a/animism-align/cli/app/sql/models/annotation.py +++ b/animism-align/cli/app/sql/models/annotation.py @@ -34,6 +34,6 @@ class Annotation(Base): class AnnotationForm(ModelForm): class Meta: model = Annotation - exclude = ['settings'] + exclude = ['start_ts', 'settings'] def get_session(): return Session() diff --git a/animism-align/frontend/app/views/align/components/annotations/annotation.form.js b/animism-align/frontend/app/views/align/components/annotations/annotation.form.js index 7d66272..f4620bc 100644 --- a/animism-align/frontend/app/views/align/components/annotations/annotation.form.js +++ b/animism-align/frontend/app/views/align/components/annotations/annotation.form.js @@ -16,7 +16,9 @@ import { } from './annotationForms' const ANNOTATION_TYPES = [ - 'sentence', 'header', 'paragraph_end', 'video', 'image', 'image_carousel', + 'sentence', 'header', 'paragraph_end', + 'video', + 'image', 'image_carousel', ].map(name => ({ name, label: capitalize(name.replace('_', ' ')) })) class AnnotationForm extends Component { @@ -110,7 +112,6 @@ class AnnotationForm extends Component { } render() { const { timeline, annotation, media } = this.props - if (!annotation.start_ts) return <div></div> return ( <div className='annotationForm' diff --git a/animism-align/frontend/app/views/align/containers/annotations.container.js b/animism-align/frontend/app/views/align/containers/annotations.container.js index e199bd6..9c12f9a 100644 --- a/animism-align/frontend/app/views/align/containers/annotations.container.js +++ b/animism-align/frontend/app/views/align/containers/annotations.container.js @@ -18,10 +18,11 @@ class Annotations extends Component { super(props) } render() { + console.log(this.props.annotation) return ( <div className='annotations'> <AnnotationIndex /> - {this.props.annotation.start_ts && + {this.props.annotation.id && <AnnotationForm /> } </div> diff --git a/animism-align/frontend/app/views/site/site.actions.js b/animism-align/frontend/app/views/site/site.actions.js index 90e7249..b200f32 100644 --- a/animism-align/frontend/app/views/site/site.actions.js +++ b/animism-align/frontend/app/views/site/site.actions.js @@ -10,10 +10,9 @@ export const loadProject = () => dispatch => { actions.paragraph.index(), actions.media.index(), ]).then(() => { - console.log(arguments) actions.viewer.loadSections() }).catch(err => { - console.error(err) + // console.error(err) }) } diff --git a/animism-align/frontend/app/views/viewer/nav/viewer.nav.js b/animism-align/frontend/app/views/viewer/nav/viewer.nav.js index a0a9a1a..ab268a4 100644 --- a/animism-align/frontend/app/views/viewer/nav/viewer.nav.js +++ b/animism-align/frontend/app/views/viewer/nav/viewer.nav.js @@ -16,7 +16,7 @@ class ViewerNav extends Component { <div className="viewer-nav"> <div className='nav-row main-nav'> <div> - <span className="section-link link"> + <span className="section-link link" onClick={() => actions.viewer.showSection('sections')}> <Arrow type={'up'} /> {ROMAN_NUMERALS[0]} {'. '} diff --git a/animism-align/frontend/app/views/viewer/nav/viewer.router.js b/animism-align/frontend/app/views/viewer/nav/viewer.router.js index e352af5..93305cc 100644 --- a/animism-align/frontend/app/views/viewer/nav/viewer.router.js +++ b/animism-align/frontend/app/views/viewer/nav/viewer.router.js @@ -14,8 +14,8 @@ class ViewerRouter extends Component { case 'transcript': actions.viewer.showSection('transcript') break - case 'nav': - actions.viewer.showSection('nav') + case 'sections': + actions.viewer.showSection('sections') break case 'checklist': actions.viewer.showSection('checklist') diff --git a/animism-align/frontend/app/views/viewer/nav/viewer.sections.nav.js b/animism-align/frontend/app/views/viewer/nav/viewer.sections.nav.js index dcccfd5..f4ab93a 100644 --- a/animism-align/frontend/app/views/viewer/nav/viewer.sections.nav.js +++ b/animism-align/frontend/app/views/viewer/nav/viewer.sections.nav.js @@ -27,7 +27,7 @@ class ViewerSectionsNav extends Component { </span> </div> <div> - <span className="transcript-link link"> + <span className="transcript-link link" onClick={() => actions.viewer.showSection('transcript')}> {'Transcript'} </span> </div> |