Code

add support for merged datasets#1082

Code

Merged

ukanga merged 88 commits intomasteronaio/onadata:masterfrom merged-datasetsonaio/onadata:merged-datasetsCopy head branch name to clipboardAug 24, 2017

+3,019-584

Commits

Commits on Aug 24, 2017

• NM/UK: correct #egg portion of github hosted packages

  Show description for bcaed61
  

  Ona KE code machine

  authored and

  ukanga

  committed
  bcaed61

  Copy full SHA for bcaed61

• NM/UK: update dev pip requirements

  Show description for fe20a3f
  

  Ona KE code machine

  authored and

  ukanga

  committed
  fe20a3f

  Copy full SHA for fe20a3f

• NM/UK: initial MergedXForm model

  Show description for 64ef600
  

  Ona KE code machine

  authored and

  ukanga

  committed
  64ef600

  Copy full SHA for 64ef600

• NM/UK: add PyxformTestCase for markdown XLSForm support into TestAbstractViewSet

  Show description for 1e11bec
  

  Ona KE code machine

  authored and

  ukanga

  committed
  1e11bec

  Copy full SHA for 1e11bec

• NM/UK: set or create default user project in tests

  Show description for 0ca1313
  

  Ona KE code machine

  authored and

  ukanga

  committed
  0ca1313

  Copy full SHA for 0ca1313

• NM/UK: add MergedXFormSerializer

  Show description for c8ec7cf
  

  Ona KE code machine

  authored and

  ukanga

  committed
  c8ec7cf

  Copy full SHA for c8ec7cf

• NM/UK: initial MergedXFormViewSet with tests

  Show description for f589347
  

  Ona KE code machine

  authored and

  ukanga

  committed
  f589347

  Copy full SHA for f589347

• NM/UK: Test merged datasets get list and retrieve

  Show description for 09d9bf1
  

  Ona KE code machine

  authored and

  ukanga

  committed
  09d9bf1

  Copy full SHA for 09d9bf1

• NM/UK: Expose an endpoint to retrieve mewrged dataset JSON and XML

  Show description for 1db4f43
  

  Ona KE code machine

  authored and

  ukanga

  committed
  1db4f43

  Copy full SHA for 1db4f43

• NM/UK: Add validation for the MergedXFormSerializer

  Show description for 19e86dd
  

  Ona KE code machine

  authored and

  ukanga

  committed
  19e86dd

  Copy full SHA for 19e86dd

• NM/UK: consistent root node "data" for model instance markdown forms

  Show description for ebf29e4
  

  Ona KE code machine

  authored and

  ukanga

  committed
  ebf29e4

  Copy full SHA for ebf29e4

• NM/UK: initial implementation of the merged dataset data endpoint

  Show description for d3f2a55
  

  Ona KE code machine

  authored and

  ukanga

  committed
  d3f2a55

  Copy full SHA for d3f2a55

• initial api documentation for merged datasets

  Show description for 765d5fd
  

  Ona KE code machine

  authored and

  ukanga

  committed
  765d5fd

  Copy full SHA for 765d5fd

• NM/UK: Remove guideline comments

  Show description for 2d0e981
  

  Ona KE code machine

  authored and

  ukanga

  committed
  2d0e981

  Copy full SHA for 2d0e981

• NM/UK: use XFormPermissions in MergedXFormViewset permission_classes

  Show description for 8f68ca5
  

  Ona KE code machine

  authored and

  ukanga

  committed
  8f68ca5

  Copy full SHA for 8f68ca5

• NM/UK: add view_mergedxform permission

  Show description for 461d473
  

  Ona KE code machine

  authored and

  ukanga

  committed
  461d473

  Copy full SHA for 461d473

• NM/UK: set values of user and created_by properties of a MergedXForm

  Show description for 6f64e04
  

  Ona KE code machine

  authored and

  ukanga

  committed
  6f64e04

  Copy full SHA for 6f64e04

• NM/UK: add PublicDatasetsFilter

  Show description for 2aa96ab
  

  Ona KE code machine

  authored and

  ukanga

  committed
  2aa96ab

  Copy full SHA for 2aa96ab

• NM/UK: Add object permissions filter & PublicDatasetsFilter to MergedXFormViewset

  Show description for 50eb3ee
  

  Ona KE code machine

  authored and

  ukanga

  committed
  50eb3ee

  Copy full SHA for 50eb3ee

• NM/UK: merged datasets api endpoint should be api/v1/merged-datasets

  Show description for 371d98c
  

  Ona KE code machine

  authored and

  ukanga

  committed
  371d98c

  Copy full SHA for 371d98c

• NM/UK: Update docs to use double quotes for JSON

  Show description for 4dca2a8
  

  urbanslug

  authored and

  ukanga

  committed
  4dca2a8

  Copy full SHA for 4dca2a8

• Add docs on differences between xforms & merged xforms

  Show description for 64e752b
  

  urbanslug

  authored and

  ukanga

  committed
  64e752b

  Copy full SHA for 64e752b

• Make data endpoint respond to GET

  Show description for 70c34e3
  

  urbanslug

  authored and

  ukanga

  committed
  70c34e3

  Copy full SHA for 70c34e3

• Prevent PATCH and PUT merged datasets

  Show description for 8efbcb3
  

  urbanslug

  authored and

  ukanga

  committed
  8efbcb3

  Copy full SHA for 8efbcb3

• In progress: include num_of_submissions in merged datasets form json

  Show description for a6d50e6
  

  urbanslug

  authored and

  ukanga

  committed
  a6d50e6

  Copy full SHA for a6d50e6

• add MergedXForm to set_api_permissions_for_user

  ukanga

  committed
  c2c5a26

  Copy full SHA for c2c5a26

• Set xform permissions, merged dataset should also appear in the forms endpoint

  ukanga

  committed
  70fec09

  Copy full SHA for 70fec09

• introduce pylint config file .pylintrc

  ukanga

  committed
  48b72ba

  Copy full SHA for 48b72ba

• add is_merged field to XForm model to show forms that are as a result of a merged dataset

  ukanga

  committed
  55191fe

  Copy full SHA for 55191fe

• refactor merged_xform_serializer

  ukanga

  committed
  4357501

  Copy full SHA for 4357501

• check is_merged_dataset in /forms list endpoint

  ukanga

  committed
  4cba415

  Copy full SHA for 4cba415

• Revert "In progress: include num_of_submissions in merged datasets form json"

  Show description for 965c94a
  ukanga

  committed
  965c94a

  Copy full SHA for 965c94a

• remoove unnecessary test

  ukanga

  committed
  7d334fd

  Copy full SHA for 7d334fd

• add num_of_submissions at the merged dataset endpoint

  ukanga

  committed
  f2876c6

  Copy full SHA for f2876c6

• return appropriate data for a merged dataset

  ukanga

  committed
  95c0e67

  Copy full SHA for 95c0e67

• return appropriate data for a merged dataset

  ukanga

  committed
  ca87cb6

  Copy full SHA for ca87cb6

• refactor tests

  ukanga

  committed
  0be11f5

  Copy full SHA for 0be11f5

• return correct count for num_of_submissions for merged datasets at the forms endpoint

  ukanga

  committed
  fb98088

  Copy full SHA for fb98088

• set number of submissions in on merged dataset creation

  ukanga

  committed
  45e1785

  Copy full SHA for 45e1785

• Return data instances for a merged dataset

  ukanga

  committed
  2bbd4b2

  Copy full SHA for 2bbd4b2

• test csv export for merged datasets

  ukanga

  committed
  10d067c

  Copy full SHA for 10d067c

• correct spelling for aggregate function number_of_submissions

  ukanga

  committed
  30478fa

  Copy full SHA for 30478fa

• update OsmData filter to include special case for merged datasets

  ukanga

  committed
  a79f7c5

  Copy full SHA for a79f7c5

• update instances_with_geopoints if any of the merged xforms have instances with geopoints

  ukanga

  committed
  be53142

  Copy full SHA for be53142

• add is_merged_dataset to ProjectXFormSerializer

  ukanga

  committed
  013ad5a

  Copy full SHA for 013ad5a

• update dev.pip dependencies

  ukanga

  committed
  3a6f876

  Copy full SHA for 3a6f876

• pylint cleanup on charts_viewset.py

  ukanga

  committed
  1f4ca51

  Copy full SHA for 1f4ca51

• charts endpoint support for merged datasets

  ukanga

  committed
  9c6b4c0

  Copy full SHA for 9c6b4c0

• update travis dependencies

  ukanga

  committed
  93e8ab9

  Copy full SHA for 93e8ab9

• refactor PyxformTestCase to use PyxformMarkdown

  ukanga

  committed
  7dce2fd

  Copy full SHA for 7dce2fd

• setself.project for merged datasets tests when creating it

  ukanga

  committed
  1941fa2

  Copy full SHA for 1941fa2

• show id, id_string, title, num submissions for xforms in merged datasets

  ukanga

  committed
  af41083

  Copy full SHA for af41083

• add project info to merged datasets xforms

  ukanga

  committed
  9777fe4

  Copy full SHA for 9777fe4

• update to passing tests

  ukanga

  committed
  bc6668c

  Copy full SHA for bc6668c

• revert to XLSForm/pyxform

  ukanga

  committed
  d2ddaa0

  Copy full SHA for d2ddaa0

• set project for test

  ukanga

  committed
  5fa73b3

  Copy full SHA for 5fa73b3

• 27 api endpoints

  ukanga

  committed
  3b8693c

  Copy full SHA for 3b8693c

• add missing is_merged_dataset to test

  ukanga

  committed
  dcd0fc1

  Copy full SHA for dcd0fc1

• re-order widget response in tests

  ukanga

  committed
  271dd4c

  Copy full SHA for 271dd4c

• add isort as a dev dependency

  ukanga

  committed
  f5698e5

  Copy full SHA for f5698e5

• show last_submission_time of a merged dataset

  ukanga

  committed
  bab7458

  Copy full SHA for bab7458

• Prevent submissions to a merged xform

  ukanga

  committed
  e673b8b

  Copy full SHA for e673b8b

• A merged dataset should not allow data collection

  Show description for d2ea69a
  ukanga

  committed
  d2ea69a

  Copy full SHA for d2ea69a

• last_submission_time for merged datasets at the forms endpoint

  ukanga

  committed
  258e1b2

  Copy full SHA for 258e1b2

• refactor get_or_create_opendata() as a helper function

  ukanga

  committed
  fd8b91e

  Copy full SHA for fd8b91e

• Data for merged datasets for open datasets

  ukanga

  committed
  61d2cec

  Copy full SHA for 61d2cec

• add _xform_id to exports

  ukanga

  committed
  d24b9d7

  Copy full SHA for d24b9d7

• return merged datasets data for filtered datasets

  ukanga

  committed
  b9b817b

  Copy full SHA for b9b817b

• pick extra export columns from settings

  ukanga

  committed
  1ae99f0

  Copy full SHA for 1ae99f0

• refactor test to inlude docstrings

  ukanga

  committed
  b162c44

  Copy full SHA for b162c44

• include XFORM_ID in mongo to dict

  ukanga

  committed
  f1f8613

  Copy full SHA for f1f8613

• Don't override EXTRA_COLUMNS setting in tests

  Show description for 517ab01
  ukanga

  committed
  517ab01

  Copy full SHA for 517ab01

• code & docs cleanup

  ukanga

  committed
  aacf6b5

  Copy full SHA for aacf6b5

• remove ID => _id from ignored columns in CSV exports

  ukanga

  committed
  1003cf4

  Copy full SHA for 1003cf4

• Create survey object from merging forms

  Show description for bfd98d5
  ukanga

  committed
  bfd98d5

  Copy full SHA for bfd98d5

• Validate no matching fields for merged datasets

  ukanga

  committed
  a21c81a

  Copy full SHA for a21c81a

• change order of tests

  ukanga

  committed
  25c0581

  Copy full SHA for 25c0581

• add missing import

  ukanga

  committed
  27efe98

  Copy full SHA for 27efe98

• maintain order of questions on merged dataset

  ukanga

  committed
  4ee161a

  Copy full SHA for 4ee161a

• Support rest services merged datasets

  ukanga

  committed
  15cbce7

  Copy full SHA for 15cbce7

• Update TextIt service to handle merged datasets

  ukanga

  committed
  a33778a

  Copy full SHA for a33778a

• Test merged datasets with groups

  ukanga

  committed
  10ba548

  Copy full SHA for 10ba548

• Merge forms by xpath and type

  ukanga

  committed
  fbddf87

  Copy full SHA for fbddf87

• Delete _xpath only if present

  ukanga

  committed
  1d32598

  Copy full SHA for 1d32598

• KML export support merged datasets

  ukanga

  committed
  b6f2eb4

  Copy full SHA for b6f2eb4

• refactor _publish_md to _publish_markdown

  ukanga

  committed
  9d6deb8

  Copy full SHA for 9d6deb8

• Attachment export support merged datasets

  ukanga

  committed
  3e91f5c

  Copy full SHA for 3e91f5c

• remove PyxformMarkdown in tests

  Show description for d3534e3
  ukanga

  committed
  d3534e3

  Copy full SHA for d3534e3