add atomicclass date

douwe · douwe · commit 12698b0b0021 · 2025-03-20T09:28:13.000+01:00
diff --git a/R/read.R b/R/read.R
@@ -27,7 +27,8 @@ read_cells <- function(drfile, sheet, variables, translate = FALSE, translations
            "character" = as.character(y),
            "numeric" = as.numeric(y),
            "integer" = as.integer(y),
-           "logical" = as.logical(y))
+           "logical" = as.logical(y),
+           "date" = as.integer(y))
   })
 }
 
diff --git a/data-raw/excelguide_schema.json b/data-raw/excelguide_schema.json
@@ -72,7 +72,7 @@
     },
     "atomicclass": {
       "description": "Interpreted type of data, using R-conventions",
-      "enum": [ "numeric", "character", "integer", "logical" ]
+      "enum": [ "numeric", "character", "integer", "logical", "date" ]
     },
     "versionnumber": {
       "description": "Version number with at least major and minor number and optional patch number",
diff --git a/data-raw/guide_competition_1_0_source.yml b/data-raw/guide_competition_1_0_source.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/data-raw/schema_tests/invalid_atomicclass.yml b/data-raw/schema_tests/invalid_atomicclass.yml
@@ -18,10 +18,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/data-raw/schema_tests/invalid_plate_format.yml b/data-raw/schema_tests/invalid_plate_format.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/data-raw/schema_tests/invalid_type.yml b/data-raw/schema_tests/invalid_type.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/data-raw/schema_tests/maximal_version.yml b/data-raw/schema_tests/maximal_version.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/data-raw/schema_tests/missing_location_element.yml b/data-raw/schema_tests/missing_location_element.yml
@@ -26,10 +26,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/data-raw/schema_tests/missing_translations.yml b/data-raw/schema_tests/missing_translations.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/data-raw/schema_tests/missing_version.yml b/data-raw/schema_tests/missing_version.yml
@@ -26,10 +26,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/tests/testthat/testdata/erroneousguides/conflicting_max_version.yml b/tests/testthat/testdata/erroneousguides/conflicting_max_version.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/tests/testthat/testdata/erroneousguides/conflicting_min_version.yml b/tests/testthat/testdata/erroneousguides/conflicting_min_version.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/tests/testthat/testdata/erroneousguides/invalid_platedata_range.yml b/tests/testthat/testdata/erroneousguides/invalid_platedata_range.yml
@@ -29,6 +29,13 @@ locations:
     ranges:
       - A1:M8
       - A11:M19
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/tests/testthat/testdata/erroneousguides/missing_plate_format.yml b/tests/testthat/testdata/erroneousguides/missing_plate_format.yml
@@ -26,10 +26,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false
diff --git a/tests/testthat/testdata/guide_competition_1_0.yml b/tests/testthat/testdata/guide_competition_1_0.yml
@@ -27,10 +27,16 @@ locations:
     atomicclass: numeric
     varname: metadata
     ranges:
-      - A15:B15
       - A17:B17
       - A19:B19
       - A21:B21
+  - sheet: description
+    type: keyvalue
+    translate: true
+    atomicclass: date
+    varname: metadata
+    ranges:
+      - A15:B15
   - sheet: _data
     type: platedata
     translate: false

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ read_cells <- function(drfile, sheet, variables, translate = FALSE, translations`
`27`	`27`	`"character" = as.character(y),`
`28`	`28`	`"numeric" = as.numeric(y),`
`29`	`29`	`"integer" = as.integer(y),`
`30`		`- "logical" = as.logical(y))`
	`30`	`+ "logical" = as.logical(y),`
	`31`	`+ "date" = as.integer(y))`
`31`	`32`	`})`
`32`	`33`	`}`
`33`	`34`