From 5fd5e279b69fab12980556c5cf8a1c41a31c9cdb Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Fri, 30 Aug 2024 16:22:01 +0200
Subject: [PATCH] DOC: Add TODOs
---
loanpy/src/loan/conf.py | 1 +
loanpy/src/loan/confirm_loan.py | 5 +++--
loanpy/src/loan/manual_return.py | 7 ++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/loanpy/src/loan/conf.py b/loanpy/src/loan/conf.py
index fcfb165..a2eeb2e 100644
--- a/loanpy/src/loan/conf.py
+++ b/loanpy/src/loan/conf.py
@@ -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)"
diff --git a/loanpy/src/loan/confirm_loan.py b/loanpy/src/loan/confirm_loan.py
index cf4fab5..f503f8e 100755
--- a/loanpy/src/loan/confirm_loan.py
+++ b/loanpy/src/loan/confirm_loan.py
@@ -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"
diff --git a/loanpy/src/loan/manual_return.py b/loanpy/src/loan/manual_return.py
index 0505088..06fec35 100755
--- a/loanpy/src/loan/manual_return.py
+++ b/loanpy/src/loan/manual_return.py
@@ -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")
--
GitLab