Merge branch 'develop' into feature/pricelist
This commit is contained in:
commit
be1854d7c1
|
@ -65,8 +65,10 @@ class Job(db.Model, ModelSerializeMixin):
|
||||||
end: Optional[datetime] = db.Column(UtcDateTime)
|
end: Optional[datetime] = db.Column(UtcDateTime)
|
||||||
type: Union[JobType, int] = db.relationship("JobType")
|
type: Union[JobType, int] = db.relationship("JobType")
|
||||||
comment: Optional[str] = db.Column(db.String(256))
|
comment: Optional[str] = db.Column(db.String(256))
|
||||||
locked: bool = db.Column(db.Boolean())
|
locked: bool = db.Column(db.Boolean(), default=False, nullable=False)
|
||||||
services: list[Service] = db.relationship("Service", back_populates="job_")
|
services: list[Service] = db.relationship(
|
||||||
|
"Service", back_populates="job_", cascade="save-update, merge, delete, delete-orphan"
|
||||||
|
)
|
||||||
required_services: float = db.Column(db.Numeric(precision=4, scale=2, asdecimal=False), nullable=False)
|
required_services: float = db.Column(db.Numeric(precision=4, scale=2, asdecimal=False), nullable=False)
|
||||||
|
|
||||||
event_ = db.relationship("Event", back_populates="jobs")
|
event_ = db.relationship("Event", back_populates="jobs")
|
||||||
|
|
|
@ -15,7 +15,6 @@ from . import event_controller, permissions, EventPlugin
|
||||||
from ...utils.HTTP import no_content
|
from ...utils.HTTP import no_content
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def dict_get(self, key, default=None, type=None):
|
def dict_get(self, key, default=None, type=None):
|
||||||
"""Same as .get from MultiDict"""
|
"""Same as .get from MultiDict"""
|
||||||
try:
|
try:
|
||||||
|
@ -340,11 +339,11 @@ def modify_event(event_id, current_session):
|
||||||
event.start = dict_get(data, "start", event.start, type=from_iso_format)
|
event.start = dict_get(data, "start", event.start, type=from_iso_format)
|
||||||
event.end = dict_get(data, "end", event.end, type=from_iso_format)
|
event.end = dict_get(data, "end", event.end, type=from_iso_format)
|
||||||
event.name = dict_get(data, "name", event.name, type=str)
|
event.name = dict_get(data, "name", event.name, type=str)
|
||||||
event.description = dict_get(data, "description", event.description, type=str)
|
event.description = dict_get(data, "description", event.description, type=str)
|
||||||
if "type" in data:
|
if "type" in data:
|
||||||
event_type = event_controller.get_event_type(data["type"])
|
event_type = event_controller.get_event_type(data["type"])
|
||||||
event.type = event_type
|
event.type = event_type
|
||||||
|
|
||||||
event_controller.update()
|
event_controller.update()
|
||||||
return jsonify(event)
|
return jsonify(event)
|
||||||
|
|
||||||
|
@ -427,7 +426,7 @@ def update_job(event_id, job_id, current_session: Session):
|
||||||
"""
|
"""
|
||||||
if not current_session.user_.has_permission(permissions.EDIT):
|
if not current_session.user_.has_permission(permissions.EDIT):
|
||||||
raise Forbidden
|
raise Forbidden
|
||||||
|
|
||||||
data = request.get_json()
|
data = request.get_json()
|
||||||
if not data:
|
if not data:
|
||||||
raise BadRequest
|
raise BadRequest
|
||||||
|
@ -510,4 +509,5 @@ def lock_job(job_id, current_session: Session):
|
||||||
raise BadRequest
|
raise BadRequest
|
||||||
return no_content()
|
return no_content()
|
||||||
|
|
||||||
|
|
||||||
# TODO: JobTransfer
|
# TODO: JobTransfer
|
||||||
|
|
|
@ -738,7 +738,7 @@ def set_picture(identifier, current_session):
|
||||||
|
|
||||||
|
|
||||||
@PriceListPlugin.blueprint.route("/drinks/<int:identifier>/picture", methods=["GET"])
|
@PriceListPlugin.blueprint.route("/drinks/<int:identifier>/picture", methods=["GET"])
|
||||||
#@headers({"Cache-Control": "private, must-revalidate"})
|
# @headers({"Cache-Control": "private, must-revalidate"})
|
||||||
def _get_picture(identifier):
|
def _get_picture(identifier):
|
||||||
"""Get Picture
|
"""Get Picture
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue