From 2e1ed492ab3a789e2173091977c88064b2edef92 Mon Sep 17 00:00:00 2001
From: Moene <arnold.moene@wur.nl>
Date: Tue, 11 Jan 2022 00:19:12 +0100
Subject: [PATCH] correction of extend_names added inclusion of extend_names

---
 programme_name_analysis.ipynb |  2 +-
 survey_helpers.py             | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/programme_name_analysis.ipynb b/programme_name_analysis.ipynb
index d6db438..d51ef62 100644
--- a/programme_name_analysis.ipynb
+++ b/programme_name_analysis.ipynb
@@ -17,7 +17,7 @@
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "from toggle_cell import toggle_code as hide_code\n",
-    "from survey_helpers import q_number, q_name, plot_pies, plot_bar, plot_ranking\n",
+    "from survey_helpers import q_number, q_name, plot_pies, plot_bar, plot_ranking, extend_names\n",
     "%matplotlib inline"
    ]
   },
diff --git a/survey_helpers.py b/survey_helpers.py
index 41de87c..422a20a 100644
--- a/survey_helpers.py
+++ b/survey_helpers.py
@@ -184,14 +184,14 @@ def plot_ranking(mydf, split_by, orders, include_all = True, transpose=False):
             plt.tight_layout()
             plt.title('%s: %s'%(q_name[split_by],prog))
 
-def extend_names(mydf, survey='students'):
+def extend_names(mydf, my_qnumber, my_qname, survey='students'):
     if (survey == 'students'):    
-        mydf, q_number, q_name = combine_cols(mydf, 'year_MEE', 'year_MEE2', 'year_in_MEE_total', 
-                                    q_number, q_name, 'Year in MEE')
-        mydf, q_number, q_name = combine_cols(mydf, 'attract_name_MEE', 'attract_name_MEE2', 'attract_name_MEE_total', 
-                                    q_number, q_name, 'Attractive in name MEE')
-        mydf, q_number, q_name = combine_cols(mydf, 'miss_name_BSW', 'miss_name_BSW2', 'miss_name_BSW_total', 
-                                    q_number, q_name, 'Missed in name BSW')
-        mydf, q_number, q_name = combine_cols(mydf, 'miss_name_MEE', 'miss_name_MEE2', 'miss_name_MEE_total', 
-                                    q_number, q_name, 'Missed in name MEE')
-    return (mydf, q_number, q_name)
+        mydf, myq_number, myq_name = combine_cols(mydf, 'year_MEE', 'year_MEE2', 'year_in_MEE_total', 
+                                    myq_number, myq_name, 'Year in MEE')
+        mydf, myq_number, myq_name = combine_cols(mydf, 'attract_name_MEE', 'attract_name_MEE2', 'attract_name_MEE_total', 
+                                    myq_number, myq_name, 'Attractive in name MEE')
+        mydf, myq_number, myq_name = combine_cols(mydf, 'miss_name_BSW', 'miss_name_BSW2', 'miss_name_BSW_total', 
+                                    myq_number, myq_name, 'Missed in name BSW')
+        mydf, myq_number, myq_name = combine_cols(mydf, 'miss_name_MEE', 'miss_name_MEE2', 'miss_name_MEE_total', 
+                                    myq_number, myq_name, 'Missed in name MEE')
+    return (mydf, myq_number, myq_name)
-- 
GitLab