Merge branch 'master' of https://github.com/c5sire/brapiTS

Author: c5sire

.gitignore

@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 .DS_Store
+brapiTS.Rproj

brapiTS.Rproj

@@ -1,20 +1,17 @@
 Version: 1.0
 
-RestoreWorkspace: No
-SaveWorkspace: No
+RestoreWorkspace: Default
+SaveWorkspace: Default
 AlwaysSaveHistory: Default
 
 EnableCodeIndexing: Yes
 UseSpacesForTab: Yes
 NumSpacesForTab: 2
 Encoding: UTF-8
 
-RnwWeave: knitr
+RnwWeave: Sweave
 LaTeX: pdfLaTeX
 
-AutoAppendNewline: Yes
-StripTrailingWhitespace: Yes
-
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source

inst/apps/brapi/data/.gitignore

@@ -1,2 +1,5 @@
 .~lock.calls.csv#
 .DS_Store
+.~lock.programs.csv#
+.~lock.trials.csv#
+.~lock.trials_additionalInfo.csv#

inst/apps/brapi/data/trials.csv

@@ -1,10 +1,10 @@
 trialDbId,trialName,programDbId,name,startDate,endDate,active
 101,Peru Yield Trial 1,1,Program 1,1/1/2013,7/5/2013,FALSE
-101,Peru Yield Trial 2,1,Program 1,6/1/2014,1/15/2015,FALSE
-101,Ghana Genotype Trial 1,2,Program 2,5/1/2011,12/15/2011,FALSE
-101,Ghana Yield Trial 1,3,Program 3,7/1/2012,2/1/2013,FALSE
-101,Ghana Yield Trial 2,3,Program 3,8/15/2013,2/28/2014,FALSE
-101,Ghana Yield Trial 3,3,Program 3,9/22/2014,3/21/2015,TRUE
-101,Mozambique Yield Trial,4,Program 4,5/12/2011,11/30/2011,FALSE
-101,Mozambique Genotype Trial,4,Program 4,2/17/2012,8/21/2012,FALSE
-101,Demo Yield Trial,6,Program 6,3/24/2016,10/21/2016,TRUE
+102,Peru Yield Trial 2,1,Program 1,6/1/2014,1/15/2015,FALSE
+103,Ghana Genotype Trial 1,2,Program 2,5/1/2011,12/15/2011,FALSE
+104,Ghana Yield Trial 1,3,Program 3,7/1/2012,2/1/2013,FALSE
+105,Ghana Yield Trial 2,3,Program 3,8/15/2013,2/28/2014,FALSE
+106,Ghana Yield Trial 3,3,Program 3,9/22/2014,3/21/2015,TRUE
+107,Mozambique Yield Trial,4,Program 4,5/12/2011,11/30/2011,FALSE
+108,Mozambique Genotype Trial,4,Program 4,2/17/2012,8/21/2012,FALSE
+109,Demo Yield Trial,6,Program 6,3/24/2016,10/21/2016,TRUE

inst/apps/brapi/data/trials_additionalInfo.csv

@@ -1,9 +1,9 @@
 trialDbId,donorName,specialProject,collaborator,fundingUSD
-1,Donor1,Project1,NA,NA
-3,Donor2,NA,NationalPartner1,300000
-4,Donor1,Project2,NA,NA
-5,NA,NA,NA,NA
-6,NA,NA,NA,NA
-7,NA,Project2,NA,1000000
-8,Donor1,NA,NationalPartner1,NA
-9,NA,Project1,NA,500000
+101,Donor1,Project1,NA,NA
+103,Donor2,NA,NationalPartner1,300000
+104,Donor1,Project2,NA,NA
+105,NA,NA,NA,NA
+106,NA,NA,NA,NA
+107,NA,Project2,NA,1000000
+108,Donor1,NA,NationalPartner1,NA
+109,NA,Project1,NA,500000