Giving up variables.R

Ecnama · Dec 2, 2024 · 1e64d82 · 1e64d82
1 parent 30aae2c
commit 1e64d82
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,3 +1,3 @@
 ^\.lintr$
 ^LICENSE\.md$
-^\.github$
+^\.github$
diff --git a/.lintr b/.lintr
@@ -5,4 +5,3 @@ linters: linters_with_defaults(
 	object_name_linter = object_name_linter(styles = c("snake_case", "symbols", "SNAKE_CASE"))
   ) # see vignette("lintr")
 encoding: "UTF-8"
-
diff --git a/LICENSE b/LICENSE
@@ -1,2 +1,2 @@
 YEAR: 2024
-COPYRIGHT HOLDER: Hector Vernet, Marie Revol, Noemie Wawrzyniak, Amance Graindorge
+COPYRIGHT HOLDER: Hector Vernet, Marie Revol, Noemie Wawrzyniak, Amance Graindorge
diff --git a/R/input.R b/R/input.R
@@ -1,7 +1,10 @@
 library(openxlsx)
 library(readODS)
 
-source("R/variables.R")
+# Prefixes of the head of the wishes columns
+Q2_PREFIX <- "Q02_Voeux->"
+Q3_PREFIX <- "Q03_VoeuxEMIR->"
+Q4_PREFIX <- "Q04_voeuxMICA->"
 
 #' Reads the file and selects the needed columns
 #'
@@ -98,4 +101,4 @@ parse_file <- function(file_path) {
         data[i, 3:(length(synthesized_wishes) + 2)] <- synthesized_wishes
     }
     return(data)
-}
+}
diff --git a/R/variables.R b/R/variables.R
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -12,4 +12,4 @@ library(mockr)
 library(openxlsx)
 library(readODS)
 
-test_check("ADSPlanner")
+test_check("ADSPlanner")
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
@@ -169,4 +169,4 @@ parse_file_output <- data.frame(
     Aff_V3_S1 = c(NA_character_, NA_character_, NA_character_),
     Aff_V3_S2 = c(NA_character_, NA_character_, NA_character_),
     Aff_V3_S3 = c(NA_character_, NA_character_, NA_character_)
-)
+)
diff --git a/tests/testthat/test-input.R b/tests/testthat/test-input.R
@@ -77,4 +77,4 @@ test_that("parse_file throws error for invalid data", {
         synthesize_wishes = function(wishes) stop("Unknown filière")
     )
     expect_error(parse_file("../data/test_file.xlsx"), "Error while synthesizing the wishes \\(l\\.1\\): Unknown filière")
-})
+})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@ linters: linters_with_defaults(
		object_name_linter = object_name_linter(styles = c("snake_case", "symbols", "SNAKE_CASE"))
		) # see vignette("lintr")
		encoding: "UTF-8"
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,4 +77,4 @@ test_that("parse_file throws error for invalid data", { @@
             synthesize_wishes = function(wishes) stop("Unknown filière")
         )
         expect_error(parse_file("../data/test_file.xlsx"), "Error while synthesizing the wishes \\(l\\.1\\): Unknown filière")
-    })
+    })