Switching to save instance

This commit is contained in:
lwark
2025-02-04 09:17:01 -06:00
parent f19706649c
commit 05421cc1d4
6 changed files with 376 additions and 123 deletions

View File

@@ -10,7 +10,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
from sqlalchemy.ext.hybrid import hybrid_property
from datetime import date, datetime, timedelta
from tools import check_authorization, setup_lookup, Report, Result, check_regex_match, yaml_regex_creator, timezone
from typing import List, Literal, Generator, Any, Tuple
from typing import List, Literal, Generator, Any, Tuple, Dict, AnyStr
from pandas import ExcelFile
from pathlib import Path
from . import Base, BaseClass, Organization, LogMixin
@@ -861,7 +861,7 @@ class SubmissionType(BaseClass):
@classproperty
def omni_removes(cls):
return super().omni_removes + ["template_file", "defaults", "instances"]
return super().omni_removes + ["defaults", "instances"]
@classproperty
def basic_template(cls) -> bytes:
@@ -1167,7 +1167,10 @@ class SubmissionTypeKitTypeAssociation(BaseClass):
@property
def name(self):
return f"{self.submission_type.name} -> {self.kit_type.name}"
try:
return f"{self.submission_type.name} -> {self.kit_type.name}"
except AttributeError:
return "Blank SubmissionTypeKitTypeAssociation"
@classmethod
@setup_lookup
@@ -1378,6 +1381,16 @@ class KitTypeReagentRoleAssociation(BaseClass):
dicto['required']['instance_attr'] = bool(dicto['required']['instance_attr'])
return dicto
@classproperty
def json_edit_fields(cls) -> dict:
dicto = dict(
sheet="str",
expiry=dict(column="int", row="int"),
lot=dict(column="int", row="int"),
name=dict(column="int", row="int")
)
return dicto
class SubmissionReagentAssociation(BaseClass):
"""
@@ -1932,7 +1945,6 @@ class Process(BaseClass):
if value not in field:
field.append(value)
@classmethod
@setup_lookup
def query(cls,