Merged in feature/VBV-444-import-circles (pull request #136)

VBV-444: Bugfix circle in import file

Same changes already approved in previous unmerged pull request

client/src/components/FeedbackForm.vue

@@ -149,7 +149,7 @@ const sendFeedback = () => {
       <p v-if="stepNo === 0" class="mt-10">
         {{
           $t("feedback.intro", {
-            name: `${courseSessionsStore.circleExperts[0].first_name} ${courseSessionsStore.circleExperts[0].last_name}`,
+            name: `${courseSessionsStore.circleExperts[0]?.first_name} ${courseSessionsStore.circleExperts[0]?.last_name}`,
           })
         }}
       </p>

client/src/main.ts

@@ -21,7 +21,9 @@ if (appEnv.startsWith("prod")) {
 } else {
   log.setLevel("trace");
 }
-log.warn(`application started appEnv=${appEnv}`);
+
+const commit = "VBV_VERSION_BUILD_NUMBER_VBV";
+log.warn(`application started appEnv=${appEnv}, build=${commit}`);
 
 const i18n = setupI18n();
 const app = createApp(App);

server/vbv_lernwelt/importer/services.py

@@ -169,6 +169,7 @@ def create_or_update_trainer(course: Course, data: Dict[str, Any]):
 
         # print(circle_name, groups)
         for group in groups:
+            import_id = f"{data['Generation'].strip()} {group}"
             course_session = CourseSession.objects.filter(
                 import_id=import_id, group=group, course=course
             ).first()