Skip to content
Snippets Groups Projects
Commit 5fd5e279 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

DOC: Add TODOs

parent bb57fabe
No related branches found
No related tags found
1 merge request!1Restructure and add integration tests
Pipeline #54742 failed
......@@ -24,5 +24,6 @@ RETURNED = db.Property(name="returned", datatype=db.DATETIME)
BOX_NUMBER = db.Property(name="Number", datatype=db.TEXT)
# Other Strings
# TODO: Adapt datamodel and remove name override
BOX_RETURNED = "Box (returned)"
BOX_BORROWED = "Box (borrowed)"
......@@ -26,8 +26,8 @@ import caosdb as db
from caosadvancedtools.serverside.helper import get_timestamp, print_success
from .box_loan import (BOX, BOX_BORROWED, DESTINATION, F_LOAN, LENT, S_LENT,
S_LOAN_ACCEPTED, assert_loan_state, get_borrower_names,
get_loan, main, set_location, set_property)
S_LOAN_ACCEPTED, assert_loan_state, get_borrower_names,
get_loan, main, set_location, set_property)
def _set_lent_box(loan):
......@@ -35,6 +35,7 @@ def _set_lent_box(loan):
This stores the version of the box when it was delivered to the borrower.
"""
# TODO: Adapt datamodel and remove name override
box_prop = loan.get_property(BOX)
box_prop.name = BOX_BORROWED
box_prop.value = str(box_prop.value) + "@HEAD"
......
......@@ -26,9 +26,9 @@ import caosdb as db
from caosadvancedtools.serverside.helper import get_timestamp, print_success
from .box_loan import (BOX, BOX_BORROWED, BOX_RETURNED, CONTENT, F_LOAN,
RETURNED, RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURNED,
assert_loan_state, get_borrower_names, get_loan, main,
set_location, set_property)
RETURNED, RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURNED,
assert_loan_state, get_borrower_names, get_loan, main,
set_location, set_property)
def _set_returned_box(loan):
......@@ -37,6 +37,7 @@ def _set_returned_box(loan):
This stores the version of the box that was returned by a borrower.
"""
box_id = loan.get_property(BOX_BORROWED).value.split("@")[0]
# TODO: Adapt datamodel and remove name override
loan.add_property(property=BOX,
name=BOX_RETURNED,
value=box_id + "@HEAD")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment