Merge pull request #1 from kazuyanagimoto/dev

v0.0.2

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: typstcv
 Type: Package
 Title: CV for Quarto & Typst
-Version: 0.0.1
+Version: 0.0.2
 Authors@R: 
     person(given = "Kazuharu",
            family = "Yanagimoto",

NEWS.md

@@ -0,0 +1,9 @@
+## 0.0.2
+
+Bug Fixes:
+
+- `format_date()` now correctly sorts after the formatting step. This was causing the dates to be sorted as strings, rather than as dates.
+
+## 0.0.1
+
+- Initial GitHub submission

R/utils.R

@@ -14,6 +14,14 @@
 #' @export
 #'
 #' @examples
+#' work <- data.frame(
+#'   title = c("Technical Assistant", "Junior Professor", "Associate Professor"),
+#'   location = c("Bern, Switzerland", "Bern, Switzerland", "Zürich, Switzerland"),
+#'   start = as.Date(c("1902-01-01", "1908-01-01", "1909-01-01")),
+#'   end = as.Date(c("1908-01-01", "1909-01-01", "1911-01-01")),
+#'   description = c("Federal Patent Office", "University of Bern", "University of Zürich")
+#' )
+#' 
 #' work |>
 #'   format_date(end = "end", date_format = "%Y", sort_by = "start") |>
 #'   resume_entry()
@@ -29,6 +37,18 @@ format_date <- function(data,
                         sort_by = "none",
                         decreasing = TRUE) {
 
+  # Sort
+  if (sort_by == "start") {
+    data <- data[order(data[[start]], decreasing = decreasing), ]
+  } else if (sort_by == "end" && !is.null(end)) {
+    data <- data[order(data[[end]], decreasing = decreasing), ]
+  } else if (sort_by == "none") {
+    # Do nothing
+  } else {
+    stop("Invalid sort_by value. Use 'none', 'start' or 'end'")
+  }
+
+  # Format start date
   data[[start]] <- format(data[[start]], date_format)
   data[[start]][is.na(data[[start]])] <- replace_na
 
@@ -41,16 +61,5 @@ format_date <- function(data,
     data[[colname_date]] <- paste(data[[start]], data[[end]], sep = sep)
   }
 
-  # Sort
-  if (sort_by == "start") {
-    data <- data[order(data[[start]], decreasing = decreasing), ]
-  } else if (sort_by == "end" && !is.null(end)) {
-    data <- data[order(data[[end]], decreasing = decreasing), ]
-  } else if (sort_by == "none") {
-    # Do nothing
-  } else {
-    stop("Invalid sort_by value. Use 'none', 'start' or 'end'")
-  }
-
   return(data)
 }