main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
3 changed files with 6 additions and 8 deletions
Showing only changes of commit 95f5c4af57 - Show all commits

View File

@@ -689,8 +689,7 @@ class Assay(ModelSQL, ModelView):
'assay.line', 'assay', "Assay Lines" 'assay.line', 'assay', "Assay Lines"
) )
document = fields.Binary("Analysis", filename='filename') analysis = fields.Many2One('document.incoming',"Analysis")
filename = fields.Char('Analysis')
class AssayLine(ModelSQL, ModelView): class AssayLine(ModelSQL, ModelView):
"Assay Line" "Assay Line"
@@ -1110,10 +1109,10 @@ class Line(metaclass=PoolMeta):
if line.assays: if line.assays:
for assay in line.assays: for assay in line.assays:
if not assay.lines and assay.document: if not assay.lines and assay.analysis:
file_data = assay.document or b"" file_data = assay.analysis.data or b""
logger.info(f"File size: {len(file_data)} bytes") logger.info(f"File size: {len(file_data)} bytes")
file_name = assay.file_name or "document" file_name = assay.analysis.name or "document"
response = requests.post( response = requests.post(
"http://62.72.36.116:8006/ocr-parse-assay", "http://62.72.36.116:8006/ocr-parse-assay",

View File

@@ -9,8 +9,8 @@
<field name="status"/> <field name="status"/>
<label name="lab"/> <label name="lab"/>
<field name="lab"/> <field name="lab"/>
<label name="filename"/> <label name="analysis"/>
<field name="filename"/> <field name="analysis"/>
<newline/> <newline/>
<field name="lines" colspan="4"/> <field name="lines" colspan="4"/>
</form> </form>

View File

@@ -4,5 +4,4 @@
<field name="type"/> <field name="type"/>
<field name="status"/> <field name="status"/>
<field name="lab"/> <field name="lab"/>
<field name="document"/>
</tree> </tree>