Menu
▾
▴
[Bika-checkins] SF.net SVN: bika:[3444] tracer
|
From: <ann...@us...> - 2013-11-26 12:44:29
|
Revision: 3444
http://sourceforge.net/p/bika/code/3444
Author: anneline
Date: 2013-11-26 12:44:24 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
sample results
Modified Paths:
--------------
tracer/BikaSettings.py
tracer/Client.py
tracer/Project.py
tracer/profiles/default/types/Client.xml
tracer/profiles/default/types/Project.xml
tracer/skins/bika/import.pt
tracer/skins/bika/import_samples_form.pt
Added Paths:
-----------
tracer/skins/bika/import_labresults.cpy
tracer/skins/bika/import_labresults.cpy.metadata
tracer/skins/bika/import_labresults_form.pt
tracer/skins/bika/import_labresults_results.pt
Modified: tracer/BikaSettings.py
===================================================================
--- tracer/BikaSettings.py 2013-11-18 12:23:45 UTC (rev 3443)
+++ tracer/BikaSettings.py 2013-11-26 12:44:24 UTC (rev 3444)
@@ -192,6 +192,14 @@
i18n_domain=I18N_DOMAIN,
)
),
+ FileField('ExampleLabResultsImportFile',
+ widget=FileWidget(
+ showLink=True,
+ label='Example Lab Results Import File',
+ label_msgid='label_example_labresults_import_file',
+ i18n_domain=I18N_DOMAIN,
+ )
+ ),
PrefixesField('Prefixes'),
))
Modified: tracer/Client.py
===================================================================
--- tracer/Client.py 2013-11-18 12:23:45 UTC (rev 3443)
+++ tracer/Client.py 2013-11-26 12:44:24 UTC (rev 3444)
@@ -109,12 +109,6 @@
'action': 'string:${object_url}/client_attachments',
'permissions': (ListFolderContents,),
},
- {'id': 'sampleimports',
- 'name': 'imports',
- 'action': 'string:${object_url}/import_samples_form',
- 'condition': 'python:not here.setup_state',
- 'permissions': (ListFolderContents,),
- },
{'id': 'sampleexports',
'name': 'exports',
'action': 'string:${object_url}/export_samples_form',
Modified: tracer/Project.py
===================================================================
--- tracer/Project.py 2013-11-18 12:23:45 UTC (rev 3443)
+++ tracer/Project.py 2013-11-26 12:44:24 UTC (rev 3444)
@@ -118,6 +118,11 @@
'action': 'string:${object_url}/import_samples_form',
'permissions': (ListFolderContents,),
},
+ {'id': 'import_labresults',
+ 'name': 'Import results',
+ 'action': 'string:${object_url}/import_labresults_form',
+ 'permissions': (ListFolderContents,),
+ },
{'id': 'export_samples',
'name': 'Export samples',
'action': 'string:${object_url}/export_samples_form',
Modified: tracer/profiles/default/types/Client.xml
===================================================================
--- tracer/profiles/default/types/Client.xml 2013-11-18 12:23:45 UTC (rev 3443)
+++ tracer/profiles/default/types/Client.xml 2013-11-26 12:44:24 UTC (rev 3444)
@@ -106,12 +106,6 @@
visible="True">
<permission value="List folder contents"/>
</action>
- <action title="ARImports" action_id="imports" category="object"
- condition_expr=""
- url_expr="string:${object_url}/client_arimports"
- visible="True">
- <permission value="List folder contents"/>
- </action>
<action title="Attachments" action_id="attachments" category="object"
condition_expr="python:here.bika_settings.settings.getAttachmentsPermitted()"
url_expr="string:${object_url}/client_attachments"
Modified: tracer/profiles/default/types/Project.xml
===================================================================
--- tracer/profiles/default/types/Project.xml 2013-11-18 12:23:45 UTC (rev 3443)
+++ tracer/profiles/default/types/Project.xml 2013-11-26 12:44:24 UTC (rev 3444)
@@ -61,12 +61,18 @@
visible="True">
<permission value="List folder contents"/>
</action>
- <action title="import sample batch" action_id="import_samples" category="object"
+ <action title="import samples" action_id="import_samples" category="object"
condition_expr=""
url_expr="string:${object_url}/import_samples_form"
visible="True">
<permission value="List folder contents"/>
</action>
+ <action title="import results" action_id="import_labresults" category="object"
+ condition_expr=""
+ url_expr="string:${object_url}/import_labresults_form"
+ visible="True">
+ <permission value="List folder contents"/>
+ </action>
<action title="export samples" action_id="export_samples" category="object"
condition_expr=""
url_expr="string:${object_url}/export_samples_form"
Modified: tracer/skins/bika/import.pt
===================================================================
--- tracer/skins/bika/import.pt 2013-11-18 12:23:45 UTC (rev 3443)
+++ tracer/skins/bika/import.pt 2013-11-26 12:44:24 UTC (rev 3444)
@@ -40,7 +40,7 @@
</select>
</div>
<div class="field">
- <label i18n:translate="label_import_file"
+ <label i18n:translate="label_import_data_file"
>Select input data file</label><br/>
<input type="file" name="csvfile" size="30"/>
</div>
Added: tracer/skins/bika/import_labresults.cpy
===================================================================
--- tracer/skins/bika/import_labresults.cpy (rev 0)
+++ tracer/skins/bika/import_labresults.cpy 2013-11-26 12:44:24 UTC (rev 3444)
@@ -0,0 +1,20 @@
+## Script (Python) "import_samples"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind state=state
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+sit = context.sample_import_tool
+project = context.REQUEST.ProjectID
+contact = context.REQUEST.Contact
+sampletype = context.REQUEST.SampleType
+utmsystem = context.REQUEST.UTMSystem
+analyses = context.REQUEST.Analyses
+infile = context.REQUEST.csvfile
+result = sit.import_file(infile.readlines(), infile.filename, project, contact, sampletype, utmsystem, analyses, state)
+
+return state
Added: tracer/skins/bika/import_labresults.cpy.metadata
===================================================================
--- tracer/skins/bika/import_labresults.cpy.metadata (rev 0)
+++ tracer/skins/bika/import_labresults.cpy.metadata 2013-11-26 12:44:24 UTC (rev 3444)
@@ -0,0 +1,7 @@
+[default]
+title=Add analysis requests
+proxy=Manager,Anonymous
+
+[actions]
+action.failure=traverse_to:string:project_samples
+action.success=traverse_to:string:project_samples
Added: tracer/skins/bika/import_labresults_form.pt
===================================================================
--- tracer/skins/bika/import_labresults_form.pt (rev 0)
+++ tracer/skins/bika/import_labresults_form.pt 2013-11-26 12:44:24 UTC (rev 3444)
@@ -0,0 +1,70 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+ lang="en"
+ metal:use-macro="here/main_template/macros/master"
+ i18n:domain="bika">
+
+<head>
+ <metal:block fill-slot="top_slot"
+ tal:define="dummy python:request.set('enable_border', 1)" />
+</head>
+
+
+<body>
+
+<div metal:fill-slot="main">
+
+<h1>
+<tal:block replace="structure python:getattr(here, here.getIcon(1))"/>
+
+<span i18n:translate="heading_import_labresults"
+ >Import lab results to project</span>
+<span tal:content="here/Title"/>
+</h1>
+
+<p>
+ Import a csv file containing the following columns:
+ <br/>
+ sample (reqd), analysis, result
+ <br/>
+ The first column must be sample id, with column header of 'sample'
+</p>
+<tal:example
+ tal:define="samplefile python:here.bika_settings.settings.getExampleLabResultsImportFile();
+ filename python:getattr(samplefile, 'filename', '')">
+<a href="" title="Click to download"
+ tal:condition=filename
+ tal:attributes="href string:${here/bika_settings/settings/absolute_url}/at_download/ExampleLabResultsImportFile">
+<img src="" tal:attributes="src string:${portal/absolute_url}/file.png">
+<span i18n:translate="heading_example_labresults_file">Example lab results file</span>
+</a>
+</tal:example>
+<br/>
+
+<form action="import_labresults_results" method="post" name="import_results"
+ enctype="multipart/form-data">
+
+<input type="hidden" name="form.submitted" value="1" />
+<input type="hidden" name="ProjectID" value=""
+ tal:attributes="value here/getId">
+<input type="hidden" name="getInputType" value="labresults"/>
+
+
+<div class="field">
+ <label i18n:translate="label_import_sample_file"
+ >Select data file for mass sample import</label><br/>
+ <input type="file" name="csvfile" size="60"/>
+
+<input tabindex=""
+ class="standalone"
+ type="submit"
+ name="submit"
+ value="Import samples"
+ i18n:attributes="value"
+ />
+</div>
+
+</form>
+</div>
+
+</body>
+</html>
Added: tracer/skins/bika/import_labresults_results.pt
===================================================================
--- tracer/skins/bika/import_labresults_results.pt (rev 0)
+++ tracer/skins/bika/import_labresults_results.pt 2013-11-26 12:44:24 UTC (rev 3444)
@@ -0,0 +1,45 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+ lang="en"
+ metal:use-macro="here/main_template/macros/master"
+ i18n:domain="bika">
+
+<head>
+ <metal:block fill-slot="top_slot"
+ tal:define="dummy python:request.set('disable_border', 1)" />
+</head>
+
+
+<body>
+
+<div metal:fill-slot="main">
+<div metal:use-macro="here/document_actions/macros/document_actions">
+Document actions (print, sendto etc)
+</div>
+<h1>
+<tal:block replace="structure python:getattr(here, here.getIcon(1))"/>
+<span i18n:translate="heading_import_results"
+ >Imported data results</span>
+</h1>
+
+<div
+tal:define="
+ errors python:here.import_samples();
+ ">
+<dl>
+
+<tal:check tal:condition="errors">
+<dt i18n:translate="heading_errors">Errors</dt>
+<tal:errors
+ tal:repeat="errs errors">
+<dd tal:content="errs"/>
+</tal:errors>
+</tal:check>
+
+</dl>
+
+</div>
+</div>
+
+</body>
+</html>
+
Modified: tracer/skins/bika/import_samples_form.pt
===================================================================
--- tracer/skins/bika/import_samples_form.pt 2013-11-18 12:23:45 UTC (rev 3443)
+++ tracer/skins/bika/import_samples_form.pt 2013-11-26 12:44:24 UTC (rev 3444)
@@ -17,7 +17,7 @@
<tal:block replace="structure python:getattr(here, here.getIcon(1))"/>
<span i18n:translate="heading_import_samples"
- >Import samples to project</span>
+ >Import samples to </span>
<span tal:content="here/Title"/>
</h1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
