Line edit #465
Merged
Line edit #465
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
yanokwa
reviewed
Jan 30, 2018
briefcase-forms.rst
Outdated
| - In the window which opens up select: guilabel: pull` tab. | ||
| - Select Aggregate 0.9.x or Aggregate 1.0 in the: guilabel: pull data from` the drop-down. | ||
| - Enter the URL of your ODK Aggregate server in guilabel:`url` option. For instance `https://proj1.appspot.com` and click on connect. | ||
| - You can either leave the username blank if the anonymous user is granted Data Viewer permissions or specify an ODK Aggregate user (Account Type 'ODK') that has been granted Data Viewer permissions. |
There was a problem hiding this comment.
The case here is important because it matches the Aggregate UI.
yanokwa
reviewed
Jan 30, 2018
briefcase-forms.rst
Outdated
|
|
||
| .. warning:: | ||
|
|
||
| ODK Briefcase will abort a pull attempt if the local copy of the form definition file differs in any way from the copy being pulled from the server or ODK Collect device. | ||
|
|
||
| .. tip:: | ||
|
|
||
| If the form definition has changed but the changes only affect the question text and do not alter the structure of the collected data (or change the formId or version), you can create a new ODK Briefcase Storage area, pull data into that, then manually copy the instances from there into your original storage area. | ||
| If the form definition has changed but the changes only affect the question text and do not alter the structure of the collected data (or change the formed or version), you can create a new ODK Briefcase Storage area, pull data into that, then manually copy the instances from there into your original storage area. |
There was a problem hiding this comment.
This should be reverted. It's formId as in form identifier.
yanokwa
reviewed
Jan 30, 2018
briefcase-forms.rst
Outdated
|
|
||
| Pulling form data from Aggregate Server | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| .. code-block:: console | ||
|
|
||
| $ java -jar "ODK Briefcase v1.4.4 Production.jar" --form_id market_prices --storage_directory ~/Desktop --aggregate_url https://my_server.appspot.com --odk_username my_username --odk_password my_password | ||
|
|
||
| This command pulls form data with id market_prices from Aggregate server at `https://my_server.appspot.com` and stores data in Briefcase's storage directory on the :file:`~/Desktop` | ||
| This command pulls from data with id market_prices from Aggregate server at `https://my_server.appspot.com` and stores data in Briefcase's storage directory on the: file:`~/Desktop` |
yanokwa
reviewed
Jan 30, 2018
briefcase-api.rst
Outdated
| @@ -21,7 +21,7 @@ The APIs used: | |||
|
|
|||
| 1. OpenRosa Form Discovery API | |||
| 2. download forms and media files using URLs form discovery. | |||
| 3. ``view/submissionList`` to obtain a chunk of submission keys. | |||
| 3. ``view/submissionlist`` to obtain a chunk of submission keys. | |||
There was a problem hiding this comment.
I'm not 100% sure that the API requires it, but to be safe, it should be case-sensitive. This change should be reverted.
yanokwa
reviewed
Jan 30, 2018
briefcase-api.rst
Outdated
| @@ -31,9 +31,9 @@ Push | |||
|
|
|||
| Interfaces used during Push actions. | |||
|
|
|||
| 1. *formUpload* to upload a form and its media files to ODK Aggregate. | |||
| 1. *form upload* to upload a form and its media files to ODK Aggregate. | |||
There was a problem hiding this comment.
I'm not 100% sure that the API requires it, but to be safe, it should be case-sensitive. This change should be reverted.
|
@yanokwa Sorry for the trouble 😅 I have made the requested changes! |
adammichaelwood
approved these changes
Jan 31, 2018
|
Thanks for sending in this PR, @richa208. I'm looking forward to your next! |
|
Sure @yanokwa 😃 |
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.
addresses #96
What is included in this PR?
changes are made to :