mirror of
https://github.com/apache/superset.git
synced 2024-09-17 11:09:47 -04:00
[annotations] Improves UX on annotation validation, start_dttm, end_dttm (#7326)
This commit is contained in:
parent
06c4610e8e
commit
f504568088
@ -46,7 +46,7 @@ class Annotation(Model, AuditMixinNullable):
|
|||||||
id = Column(Integer, primary_key=True)
|
id = Column(Integer, primary_key=True)
|
||||||
start_dttm = Column(DateTime)
|
start_dttm = Column(DateTime)
|
||||||
end_dttm = Column(DateTime)
|
end_dttm = Column(DateTime)
|
||||||
layer_id = Column(Integer, ForeignKey('annotation_layer.id'))
|
layer_id = Column(Integer, ForeignKey('annotation_layer.id'), nullable=False)
|
||||||
short_descr = Column(String(500))
|
short_descr = Column(String(500))
|
||||||
long_descr = Column(Text)
|
long_descr = Column(Text)
|
||||||
layer = relationship(
|
layer = relationship(
|
||||||
|
@ -18,12 +18,30 @@
|
|||||||
from flask_appbuilder.models.sqla.interface import SQLAInterface
|
from flask_appbuilder.models.sqla.interface import SQLAInterface
|
||||||
from flask_babel import gettext as __
|
from flask_babel import gettext as __
|
||||||
from flask_babel import lazy_gettext as _
|
from flask_babel import lazy_gettext as _
|
||||||
|
from wtforms.validators import StopValidation
|
||||||
|
|
||||||
from superset import appbuilder
|
from superset import appbuilder
|
||||||
from superset.models.annotations import Annotation, AnnotationLayer
|
from superset.models.annotations import Annotation, AnnotationLayer
|
||||||
from .base import DeleteMixin, SupersetModelView
|
from .base import DeleteMixin, SupersetModelView
|
||||||
|
|
||||||
|
|
||||||
|
class StartEndDttmValidator(object):
|
||||||
|
"""
|
||||||
|
Validates dttm fields.
|
||||||
|
"""
|
||||||
|
def __call__(self, form, field):
|
||||||
|
if not form['start_dttm'].data and not form['end_dttm'].data:
|
||||||
|
raise StopValidation(
|
||||||
|
_('annotation start time or end time is required.'),
|
||||||
|
)
|
||||||
|
elif (form['end_dttm'].data and
|
||||||
|
form['start_dttm'].data and
|
||||||
|
form['end_dttm'].data < form['start_dttm'].data):
|
||||||
|
raise StopValidation(
|
||||||
|
_('Annotation end time must be no earlier than start time.'),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class AnnotationModelView(SupersetModelView, DeleteMixin): # noqa
|
class AnnotationModelView(SupersetModelView, DeleteMixin): # noqa
|
||||||
datamodel = SQLAInterface(Annotation)
|
datamodel = SQLAInterface(Annotation)
|
||||||
|
|
||||||
@ -53,17 +71,17 @@ class AnnotationModelView(SupersetModelView, DeleteMixin): # noqa
|
|||||||
annotation needs to add more context.',
|
annotation needs to add more context.',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
validators_columns = {
|
||||||
|
'start_dttm': [
|
||||||
|
StartEndDttmValidator(),
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
def pre_add(self, obj):
|
def pre_add(self, obj):
|
||||||
if not obj.layer:
|
if not obj.start_dttm:
|
||||||
raise Exception('Annotation layer is required.')
|
|
||||||
if not obj.start_dttm and not obj.end_dttm:
|
|
||||||
raise Exception('Annotation start time or end time is required.')
|
|
||||||
elif not obj.start_dttm:
|
|
||||||
obj.start_dttm = obj.end_dttm
|
obj.start_dttm = obj.end_dttm
|
||||||
elif not obj.end_dttm:
|
elif not obj.end_dttm:
|
||||||
obj.end_dttm = obj.start_dttm
|
obj.end_dttm = obj.start_dttm
|
||||||
elif obj.end_dttm < obj.start_dttm:
|
|
||||||
raise Exception('Annotation end time must be no earlier than start time.')
|
|
||||||
|
|
||||||
def pre_update(self, obj):
|
def pre_update(self, obj):
|
||||||
self.pre_add(obj)
|
self.pre_add(obj)
|
||||||
|
Loading…
Reference in New Issue
Block a user