Export RF to XLSX can't cope with multiple filters

[Luuk]

Actually the same issue as #430, but for RF (rf_export.py; line 387):

Task remapp.exports.rf_export.rfxlsx[97e5cc1f-b1c6-47d1-86d6-27d0463ad6b3] raised unexpected: MultipleObjectsReturned('get() returned more than one XrayFilters -- it returned 2!',)

[Ed McDonagh]

Thanks for the report @LuukO

It is the same in that it is the .get() that is triggering the error when there is more than one filter (should be .all()), but different in that the DX code has a method of looping through the filters, which needs to be added to the RF export.

Is this something you want to have a go at? Maybe by forking the repo on bitbucket, checking out the issue442RFfilterexports branch, making your changes and sending me a pull request aimed at that branch.

[Ed McDonagh]

I don't think my fluoro kit has multiple filters, just different thickensses of copper, which is why I didn't spot it!

[Ed McDonagh]

ref #442 Solved multiple x-ray filter issue in export of RF data Removed unused and double imports Solved issue with non-existing data (Philips Veradius doesn't send a.o. kVp / minimum filter thickness) Added comments marked with LO for later review (not related to current issue)

Signed-off-by: UMCN\z627112 [e-mail]

→ <<cset 66ce8f28afa4>>

[Ed McDonagh]

Rearranged the protocol sheet data gathering from that proposed by @LuukO. Reference to https://docs.djangoproject.com/en/1.10/ref/models/querysets/#all added by @LuukO would indicate fix for ref #430 is not suitable. Possibly need to check for .first() or stick with get() and check for MultipleObjectsReturned. Refs #442.

→ <<cset 344fa4a34f43>>

[Ed McDonagh]

Fixed try/except/else mistake. Refs #442

→ <<cset 12b8fdad9923>>

[Ed McDonagh]

Removed concept of pre-testing to check for tables for DX csv export. Dropped use of export_safe too, using replace_comma instead. Might not have been a good idea as now have unicode errors so currently broken. Refs #430, #442

→ <<cset c76adeb4cf22>>

[Ed McDonagh]

All unicode errors resolved. DX export to csv should now work more robustly! Need to see what is happening with filters on the skeletal survey example I have. Refs #430, #442

→ <<cset e3789d896d69>>

[Ed McDonagh]

Removed use of replace_comma on each field in dx csv in favour of checking for commas just before writing the line. Refs #430, #442

→ <<cset 3380dda7226e>>

[Ed McDonagh]

Changed name of get_filters to _get_xray_filterinfo to match rf version. Refs #430, #442

→ <<cset 6697aba758ef>>

[Ed McDonagh]

Added fluoro export tests for single filter (Siemens) and multiple filters (Philips). Philips file not in repo yet. Refs #442

→ <<cset 1714a4b8493a>>

[Ed McDonagh]

Replaced _get_xray_filterinfo in rf_export to be the same as the one from dx_export. Need to add a test with no filters. Refs #442

→ <<cset adbabc3e20a9>>

[Ed McDonagh]

Adding cleanup to new RF export test. Refs #442.

→ <<cset d654d0919794>>

[Ed McDonagh]

Commenting out tests involving the Allura RDSR until I get permission to share it to the repo. Refs #442

→ <<cset f5a57c2fa3ec>>

[Ed McDonagh]

Adding ref #430 and #442 to changes

→ <<cset acb2069515ae>>

[Ed McDonagh]

Adding ref #430 and #442 to changes

→ <<cset ef9f77515678>>

[Ed McDonagh]

Throwing in a placeholder comment to release notes refs #430, #442

→ <<cset f65d7c2b52be>>

[Luuk]

Ed,

no problem for me using the Allura RDSR I provided in the repo.

Best regards,

Luuk

[Ed McDonagh]

Adding Philips RF RDSR and associated filter export tests to the repository. Refs #442

→ <<cset 369f6c151a53>>

[Ed McDonagh]

Thanks @LuukO - I had the other one prepared and I've been given permission now. But I'll keep that offer in mind if I need a second one!

[Ed McDonagh]

Merging issue430-442errorcatching back into develop. Fixes #442, refs #430,#449,#454,#458

→ <<cset 4089c23ddffc>>