Add instrument varian vistapro #729
Conversation
…tResult to 0.0 and commented on the and commented on the test
| errors.append(_("No file selected")) | ||
|
|
||
| parser = VistaPROICPParser(infile) | ||
| if parser: |
There was a problem hiding this comment.
You can remove this condition cause it will always be met.
| elif sample == 'clientsid': | ||
| sam = ['getClientSampleID'] | ||
| elif sample == 'sample_clientsid': | ||
| sam = ['getSampleID', 'getClientSampleID'] |
There was a problem hiding this comment.
Maybe is out of the scope of this particular import interface, but I would be nice to move all the logic above (that is shared among almost all instruments) to somewhere else (e.g. a function get_instrument_import_search_criteria, etc. inside instruments.__init__.py)
There was a problem hiding this comment.
I've created a file called instruments/utils.py because I could not import get_instrument_import_search_criteria when it is on the instruments.__init__.py since icp.py is also imported on instruments.__init__.py
| def parse_headerline(self, line): | ||
| """ Parses header lines | ||
| """ | ||
| if self._end_header is True: |
There was a problem hiding this comment.
Better use if self._end_header: instead. See PEP8 recommendations
| return self.parse_headerline(line) | ||
| else: | ||
| return self.parse_resultsline(line) | ||
|
|
There was a problem hiding this comment.
I'd replace the code by the following:
if self._end_header:
return self.parse_resultsline(line)
return self.parse_headerline(line)| "total_results": self.getResultsTotalCount()} | ||
| ) | ||
|
|
||
| def zeroValueDefaultInstrumentResults(self, column_name, result, line): |
There was a problem hiding this comment.
The name of this function is confusing. ' get_result(self, column_name, result, line)` would be better imo
| result = float(result) | ||
| if result < 0.0: | ||
| result = 0.0 | ||
| except ValueError: |
There was a problem hiding this comment.
You can take advantage of api.is_floatable and api.to_float here. Something like:
if api.is_floatable(result):
result = api.to_float(result)
return result > 0.0 and result or 0.0
self.err("No valid number ${result} in column (${column_name})",
...| return json.dumps(results) | ||
|
|
||
|
|
||
| class Export(BrowserView): |
|
Thanks for review @xispa I've pushed the requested changes |
Description of the issue/feature this PR addresses
Linked issue: https://github.com/senaite/senaite.core/issues/
Current behavior before PR
Desired behavior after PR is merged
--
I confirm I have tested this PR thoroughly and coded it according to PEP8
and Plone's Python styleguide standards.