Separate parts by course in points balloon, don't show point for intro if student is in advanced course

Redande · Redande · commit d314e6b767dd · 2019-03-01T12:52:27.000+02:00
diff --git a/src/components/PointsBalloon/CourseProgress.js b/src/components/PointsBalloon/CourseProgress.js
@@ -0,0 +1,55 @@
+import React from "react"
+import PartProgress from "./PartProgress"
+
+const CourseProgress = ({
+  data,
+  appliesForStudyRight,
+  currentCourseVariant,
+}) => {
+  return (
+    data &&
+    (currentCourseVariant === "ohja-dl" ||
+    currentCourseVariant === "ohja-nodl" ? (
+      <div>
+        <h4>Ohjelmoinnin jatkokurssi</h4>
+        {Object.entries(data).map(([name, data]) => {
+          return (
+            <PartProgress
+              appliesForStudyRight={appliesForStudyRight}
+              name={name}
+              data={data}
+            />
+          )
+        })}
+      </div>
+    ) : (
+      <div>
+        <h4>Ohjelmoinnin perusteet</h4>
+        {Object.entries(data).map(([name, data]) => {
+          if (name === "osa08") {
+            return (
+              <div>
+                <h4>Ohjelmoinnin jatkokurssi</h4>
+                <PartProgress
+                  appliesForStudyRight={appliesForStudyRight}
+                  name={name}
+                  data={data}
+                />
+              </div>
+            )
+          } else {
+            return (
+              <PartProgress
+                appliesForStudyRight={appliesForStudyRight}
+                name={name}
+                data={data}
+              />
+            )
+          }
+        })}
+      </div>
+    ))
+  )
+}
+
+export default CourseProgress
diff --git a/src/components/PointsBalloon/PointsBalloonContent.js b/src/components/PointsBalloon/PointsBalloonContent.js
@@ -5,9 +5,9 @@ import styled from "styled-components"
 import Loading from "../Loading"
 import { fetchProgress } from "../../services/progress"
 import PagesContext from "../../contexes/PagesContext"
-import PartProgress from "./PartProgress"
 import { getCachedUserDetails } from "../../services/moocfi"
 import { SMALL_MEDIUM_BREAKPOINT } from "../../util/constants"
+import CourseProgress from "./CourseProgress"
 
 const StyledModal = styled(Modal)`
   z-index: 500 !important;
@@ -54,6 +54,7 @@ class PointsBalloonContent extends React.Component {
     data: null,
     error: null,
     appliesForStudyRight: null,
+    currentCourseVariant: null,
   }
 
   async componentDidMount() {
@@ -63,7 +64,8 @@ class PointsBalloonContent extends React.Component {
       let userDetails = await getCachedUserDetails()
       const appliesForStudyRight =
         userDetails?.extra_fields?.applies_for_study_right === "t"
-      this.setState({ data, appliesForStudyRight })
+      const currentCourseVariant = userDetails?.extra_fields?.course_variant
+      this.setState({ data, appliesForStudyRight, currentCourseVariant })
     } catch (e) {
       this.setState({ error: e.toString() })
     }
@@ -98,16 +100,11 @@ class PointsBalloonContent extends React.Component {
                 </div>
               ) : (
                 <div>
-                  {this.state.data &&
-                    Object.entries(this.state.data).map(([name, data]) => {
-                      return (
-                        <PartProgress
-                          appliesForStudyRight={this.state.appliesForStudyRight}
-                          name={name}
-                          data={data}
-                        />
-                      )
-                    })}
+                  <CourseProgress
+                    data={this.state.data}
+                    appliesForStudyRight={this.state.appliesForStudyRight}
+                    currentCourseVariant={this.state.currentCourseVariant}
+                  />
                 </div>
               )}
             </Fragment>
diff --git a/src/services/progress.js b/src/services/progress.js
@@ -1,15 +1,27 @@
-import { fetchProgrammingProgress } from "./moocfi"
+import { fetchProgrammingProgress, getCachedUserDetails } from "./moocfi"
 import { fetchCrowdsorcererProgress } from "./crowdsorcerer"
 import { zip } from "../util/arrays"
 import { fetchQuiznatorProgress } from "./quiznator"
 
+const introductionCourseGroups = [
+  "osa01",
+  "osa02",
+  "osa03",
+  "osa04",
+  "osa05",
+  "osa06",
+  "osa07",
+]
+
 export async function fetchProgress() {
   const serviceIdentifiers = ["Ohjelmointitehtävät", "Kyselyt", "Crowdsorcerer"]
   const progressesCollection = await Promise.all([
     fetchProgrammingProgress(),
     fetchQuiznatorProgress(),
     fetchCrowdsorcererProgress(),
   ])
+  const userDetails = await getCachedUserDetails()
+  const currentCourseVariant = userDetails?.extra_fields?.course_variant
   const progressByGroup = {}
 
   zip(serviceIdentifiers, progressesCollection).forEach(
@@ -28,6 +40,12 @@ export async function fetchProgress() {
       toBeDeleted.push(group)
     }
   })
+  if (
+    currentCourseVariant === "ohja-dl" ||
+    currentCourseVariant === "ohja-nodl"
+  ) {
+    introductionCourseGroups.forEach(group => toBeDeleted.push(group))
+  }
   toBeDeleted.forEach(o => {
     delete progressByGroup[o]
   })
