Merge pull request #75 from statisticsnorway/extend_dato

Extend dato
statisticsnorway · Dec 16, 2024 · a48206f · a48206f
2 parents 163cee4 + 71cf07c
commit a48206f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-konjunk"
-version = "0.1.14"
+version = "0.1.15"
 description = "SSB Konjunk"
 authors = ["Edvard Garmannslund <[email protected]>"]
 license = "MIT"

diff --git a/src/ssb_konjunk/statbank_format.py b/src/ssb_konjunk/statbank_format.py
@@ -2,7 +2,11 @@
 
 
 def format_time_period(
-    df: pd.DataFrame, year: int, quarter: int | str = "", col_name: str = "periode"
+    df: pd.DataFrame,
+    year: int,
+    quarter: int | str = "",
+    col_name: str = "periode",
+    month: int | str = "",
 ) -> pd.DataFrame:
     """Add column with time period.
 
@@ -11,12 +15,15 @@ def format_time_period(
         year: the year.
         quarter: optional, default ''.
         col_name: optional, default 'periode'. The name of the column for the time period.
+        month: optional, default ''.
 
     Returns:
         pd.DataFrame: dataframe with a column with time period.
     """
-    if quarter != "":
+    if quarter != "" and month == "":
         df[col_name] = f"{year}K{int(quarter)}"
+    elif quarter == "" and month != "":
+        df[col_name] = f"{year}M{int(quarter)}"
     else:
         df[col_name] = f"{year}"