Merge branch 'dev' of https://github.com/Big-Life-Lab/covid-19-wastew…

…ater into dev

README.md

@@ -78,8 +78,11 @@ Addresses issues: #59, #84, #90, #92, #93, #96, #97, #99, #102, #103, #104, #113
   - New `detected`: Gene copies or variant detected in the sampleGene or variant copies. Detected = 1. Gene or variant copiesNot detected = 0.
   - New `propVar`: Proportion of variant in sample.
   - `SiteMeasure` table, `type` variable
-    - `wwBOD5c`, 5 day biochemical oxygen demand
+    - `wwBOD5t`, 5 day total biochemical oxygen demand
+    - `wwBOD5c`, 5 day carbonaceous biochemical oxygen demand
     - `wwPtot`, Total phosphates
+    - `wwPP`, Total phosphorous
+    - ,
   - New `dailyAvg`: Average value taken over a 24h period, in the `SiteMeasure` table, `aggregation` variable
   - The `SiteMeasure` table now has a categorical `unit` variable with the following options
 

site/VariableCategory.csv

@@ -125,6 +125,10 @@ SiteMeasure,type,wwOPhos,Ortho-phosphate concentration.,Concentration d'ortho-ph
 SiteMeasure,type,wwNH4N,"Ammonium nitrogen concentration, as N.","Concentrsation d'azote ammoniacal, exprim� en N."
 SiteMeasure,type,wwTN,"Total nitrogen concentration, as N.","Azote total, exprim� en N"
 SiteMeasure,type,wwpH,pH of the wastewater.,pH
+SiteMeasure,type,wwBOD5t,5 day total biochemical oxygen demand,Demande biochimique totale en oxygene sur 5 jours
+SiteMeasure,type,wwBOD5c,5 day carbonaceous biochemical oxygen demand,Demande biochinique carbonnee en oxygene sur 5 jours
+SiteMeasure,type,wwPtot,Total phosphates,Phosphates totaux
+SiteMeasure,type,wwPP,Total phosphorous,Phosphore total
 SiteMeasure,type,wwCond,Conductivity of the wastewater.,Conductivit�
 SiteMeasure,aggregation,single,"This value is not an aggregate measurement in any way (ie. not a mean, median, max or any other) and can be a replicate value.","La valeur n'a subi aucune agr�gation (donc, la valeur n'est pas une moyenne, un maximum, etc.). La valeur peut �tre un r�plica."
 SiteMeasure,aggregation,mean,Arithmetic mean,Moyenne arithm�tique.