Passing filename as the default form id parameter. #389
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #389 +/- ##
==========================================
+ Coverage 82.42% 82.42% +<.01%
==========================================
Files 23 23
Lines 3260 3261 +1
Branches 763 763
==========================================
+ Hits 2687 2688 +1
+ Misses 433 432 -1
- Partials 140 141 +1
Continue to review full report at Codecov.
|
lognaturel
requested changes
Oct 23, 2019
There was a problem hiding this comment.
Apologies for not noticing this problem in the pyxform/tests/test_expected_output/survey_no_name.xml test output originally! I think some clearer naming would help make it more explicit what the relationship between the existing form_name parameter and the new parameter is. Previously I didn't realize that form_name was being used for the root node, the form title and the form ID.
pyxform/xls2json.py
Outdated
| workbook_dict, form_name=None, default_language="default", warnings=None | ||
| workbook_dict, | ||
| form_name=None, | ||
| form_id=None, |
There was a problem hiding this comment.
How about calling this new parameter fallback_form_name so it's clear that it's a companion to form_name that's only used as a fallback?
There was a problem hiding this comment.
Updated to fallback_form_name. I think it makes sense to call it that way.
pyxform/xls2json.py
Outdated
| @@ -1316,7 +1320,10 @@ def parse_file_to_json( | |||
| if warnings is None: | |||
| warnings = [] | |||
| workbook_dict = parse_file_to_workbook_dict(path, file_object) | |||
| return workbook_to_json(workbook_dict, default_name, default_language, warnings) | |||
| default_form_id = unicode(get_filename(path)) | |||
There was a problem hiding this comment.
I think calling this local value fallback_form_name would also be more helpful.
lognaturel
approved these changes
Oct 25, 2019
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Feb 27, 2020
Modify the 'test_spaced_xlsform' to ensure that a file with an invalid filename is caught and handled. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Feb 27, 2020
Modify the 'test_spaced_xlsform' to ensure that a file with an invalid filename is caught and handled. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Feb 27, 2020
Modify the 'test_spaced_xlsform' to ensure that a file with an invalid filename is caught and handled. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 2, 2020
Modify the 'test_spaced_xlsform' to ensure that a file with an invalid filename is caught and handled. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 2, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 2, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 3, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 3, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 13, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 27, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 27, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
DavisRayM
added a commit
to onaio/onadata
that referenced
this pull request
Mar 27, 2020
Update the error raised when an id_string is invalid. PyXForm now utilizes the filename as the form_id if it's not explicitly set in the settings sheet. More Info: XLSForm/pyxform#389
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #388.
Introduce a new parameter for the
workbook_to_jsonby passing the xls filename as the default value for the form_id. This will be replaced with value from thesettingstab if supplied.