Merge pull request #7 from onaio/review_changes

JM: Made changes after reviewing the merged package

Author: jmunene

demo/Basics_of_ona.R.Rmd

@@ -1,3 +1,8 @@
+---
+output: 
+  html_document: 
+    keep_md: yes
+---
 <link href="http://kevinburke.bitbucket.org/markdowncss/markdown.css" rel="stylesheet"></link>
 An introduction to Ona.R
 ========================================================
@@ -34,7 +39,7 @@ Question: what kind of beast did we just download?
 str(good_eats)
 ```
 
-R tells us something like `'data.frame':  78 obs. of  19 variables:` as well as `Formal class 'onaData' [package ".GlobalEnv"] with 5 slots`. What this means is that onaData objects can be dealt with data.frames (which makes them very convenient!) and well as "objects" with more properties (such as `form`, which is derived from your XLSform). The `form` gives ona.R information about the exact question that was asked, and the type of the question asked (was it `text` or `select one`? or was it a `date`?), which lets the library change the types of the values to make them right, which is basically the power of this package.
+R tells us something like `'data.frame':  1103 obs. of  24 variables:` as well as `Formal class 'onaData' [package "ona"] with 5 slots`. What this means is that onaData objects can be dealt with data.frames (which makes them very convenient!) and well as "objects" with more properties (such as `form`, which is derived from your XLSform). The `form` gives ona.R information about the exact question that was asked, and the type of the question asked (was it `text` or `select one`? or was it a `date`?), which lets the library change the types of the values to make them right, which is basically the power of this package.
 
 For simplicity, if you want just a data frame and not this complicated onaData object, you can always use the `data.frame` method.
 

demo/Basics_of_ona.R.html

@@ -24,4 +24,4 @@ How about riskiness of the food he is trying and reporting about... has that cha
 ```{r plot2, warning=FALSE, message=FALSE, fig.height=5, fig.width=7}
 qplot(data=good_eats_data, x=submit_date, fill=risk_factor)
 ```
-Looks like it has! mberg's getting riskier as time goes on.
+Looks like it has mberg's getting riskier as time goes on.

demo/Basics_of_ona.R_files/figure-html/plot1-1.png

@@ -42,8 +42,7 @@ qplot(data=good_eats_readable, x=submit_date, fill=`Risk Factor`)
 
 For multi-lingual forms, the `replaceAllNamesWithLabels` function takes a language argument:
 ```{r RD.6, warning=FALSE, message=FALSE}
-pde <- onaDownload("points_d_eau", "Roxance")
-pde_fr <- replaceAllNamesWithLabels(pde, language="French")
-qplot(data=pde_fr, x=`A-6.6 Qui gère cette source/ ce point d’eau ?`) +
-    coord_flip()
+waterpoint <- onaDownload("waterpoint", "mberg","mberg")
+waterpoint_swa <- replaceAllNamesWithLabels(waterpoint, language="Swahili")
+qplot(data=waterpoint_swa,x=`Siku ya kukaguliwa`,y=`Hali ya kisima`)
 ```

demo/Basics_of_ona.R_files/figure-html/plot1-2.png

@@ -109,10 +109,10 @@ test_that("adding photo urls works", {
                         which(good_eats_with_photo_urls$food_photo_URL_medium == ""))))
   # check one of the URLs
   expect_equal(subset(good_eats_with_photo_urls, description == "Fistikli")$location_photo_URL_original,
-               "https://api.ona.io/attachment/?media_file=mberg/attachments/1460139580042.jpg")
+               "https://api.ona.io/attachment/?media_file=mberg/attachments/1460708481327.jpg")
   expect_equal(subset(good_eats_with_photo_urls, description == "Fistikli")$location_photo_URL_medium,
-               "https://api.ona.io/attachment/medium?media_file=mberg/attachments/1460139580042.jpg")
+               "https://api.ona.io/attachment/medium?media_file=mberg/attachments/1460708481327.jpg")
   expect_equal(subset(good_eats_with_photo_urls, description == "Fistikli")$location_photo_URL_small,
-               "https://api.ona.io/attachment/small?media_file=mberg/attachments/1460139580042.jpg")
+               "https://api.ona.io/attachment/small?media_file=mberg/attachments/1460708481327.jpg")
 })