Hunger aangepast

globalcoffeeplatform · Feb 14, 2019 · 9bcba7f · 9bcba7f
1 parent 393bd70
commit 9bcba7f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/docs/source/explanation.rst b/docs/source/explanation.rst
@@ -201,6 +201,8 @@ Total household income
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 Total household income in USD
 
@@ -211,6 +213,8 @@ Household members
 
 **Type**: *integer*
 
+**Minimum**: *1*
+
 
 Number of adults in the household
 
@@ -251,9 +255,9 @@ Are young workers (those under age 18) working in hazardous conditions (applying
 ------------
 Hunger days
 
-**Type**: *string*
+**Type**: *integer*
 
-**Allowed values**: '0 days', '1-9 days', '10-19 days', '20-29 days', '30 or more days'
+**Minimum**: *0*
 
 
 Whether the household was food secure during the last production year (report 0 days of food insecurity--i.e., not skipping meals or significantly reducing food intake because food was not available).
@@ -464,34 +468,44 @@ The average daily wage rate paid for coffee production
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.2.2.2 wagesHarvesting
 ***********************
 The average daily wage rate paid for harvesting
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.2.2.3 wagesProcessing
 ***********************
 The average daily wage rate paid for processing
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.2.2.4 ruralMinimumWage
 ************************
 Rural minimum wage
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.2.2.5 nationalMinimumWage
 ***************************
 National minimum wage
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.3 economic
 ^^^^^^^^^^^^
@@ -808,13 +822,17 @@ Total coffee revenue
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.3.4.2 kgSold
 **************
 kg of GBE sold
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.3.5 sustainablePurchases
 --------------------------
@@ -835,6 +853,8 @@ Volume of sustainable purchases
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.3.5.2 proportionOfTotal
 *************************
@@ -884,6 +904,8 @@ Absolute area in ha
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 3.4.1.1 proportiesOfFarm
 ************************
@@ -1251,6 +1273,8 @@ Area of the plot
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 4.1.5 thirdPartyIds
 -------------------
@@ -1276,6 +1300,8 @@ Yield
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 kgs of GBE (harvested)
 
@@ -1301,6 +1327,8 @@ The percentage, 0-100
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 The percentage, from 0 to 100 with decimals allowed
 
@@ -1313,6 +1341,8 @@ A positive number > 0
 
 **Type**: *number*
 
+**Minimum**: *0*
+
 
 A positive number starting at 0 with decimals allowed
 

diff --git a/generator/GenerateTests.cs b/generator/GenerateTests.cs
@@ -194,6 +194,7 @@ private void WriteProperties(string propertyName, JObject objectProperties, int
                 if (objectProperties.GetValue("enum") is JArray enums)
                     _sb.AppendLine(MakeBold("Allowed values") + ": '" + string.Join("', '", enums) + "'\n");
             }
+            if (objectProperties.ContainsKey("minimum"))_sb.AppendLine(MakeBold("Minimum") + ": " + MakeItalic(objectProperties.GetValue("minimum").ToString()) + "\n");
 
             if (objectProperties.ContainsKey("$ref"))
             {
@@ -210,8 +211,6 @@ private void WriteProperties(string propertyName, JObject objectProperties, int
             if (objectProperties.ContainsKey("$pattern-validator"))
                 _sb.AppendLine(MakeLink("Pattern validator", objectProperties.GetValue("$pattern-validator").ToString()));
 
-            // TODO: Write if property is optional or not
-
             if (objectProperties.ContainsKey("description")) AppendMultiLines(objectProperties.GetValue("description").ToString());
             if (objectProperties.ContainsKey("$extended-description")) AppendMultiLines(objectProperties.GetValue("$extended-description").ToString());
 

diff --git a/schema/global-coffee-data-standard.schema.json b/schema/global-coffee-data-standard.schema.json
@@ -193,14 +193,8 @@
               "title": "Hunger days",
               "description": "Whether the household was food secure during the last production year (report 0 days of food insecurity--i.e., not skipping meals or significantly reducing food intake because food was not available).",
               "$extended-description": "The simple approach depends on asking the producer the number of days during the last production year that any member of household cut food consumption due to lack of food. It is good practice to ask this question in ranges of days to help with farmer recall: 0 days; 1-9 days, 10-19 days; 20-29 days; 30 or more days in the past year. Producers that answer '0 days' are considered to be food secure. Optimally, the approach would also include the months when food insecurity occurred in order to understand the times of year when producers experience more or less food security.\\nMore comprehensive nutritional indicators can be expensive and require significant technical ability, time and resources to carry out effectively, so instead the focus is on days of food insecurity as a proxy. Note that while this survey question is often asked to the head of household, this indicator is best expressed when it includes multiple perspectives in the household. This indicator is an important human development issue and a core indicator for social justice.",
-              "type": "string",
-              "enum": [
-                "0 days",
-                "1-9 days",
-                "10-19 days",
-                "20-29 days",
-                "30 or more days"
-              ]
+              "type": "integer",
+              "minimum": 0
             }
           }
         }