Fix points visualization

nygrenh · nygrenh · commit dcfb09ee03f5 · 2020-01-21T22:32:23.000+02:00
diff --git a/src/components/PointsBalloon/PartProgress.js b/src/components/PointsBalloon/PartProgress.js
@@ -99,24 +99,6 @@ const PartProgress = ({ name, data, appliesForStudyRight, t }) => {
             />
           </Bar>
         </StyledBarChart>
-        <LargeP>
-          {t("progressTotal")}{" "}
-          {Math.floor(Math.min(100, totalProgress * 111.112))}
-          /100.
-        </LargeP>
-        {appliesForStudyRight &&
-          (getCourseVariant() === "nodl" ? (
-            <SmallP>{t("noTimelimit")}</SmallP>
-          ) : (
-            <SmallP>
-              {t("canApplyForStudyRight")}{" "}
-              {
-                allChartData.find(o => o.tool === "Ohjelmointitehtävät")
-                  ?.progress
-              }
-              %.
-            </SmallP>
-          ))}
       </div>
     </PartProgressContainer>
   )
diff --git a/src/services/progress.js b/src/services/progress.js
@@ -1,5 +1,4 @@
 import { fetchProgrammingProgress, getCachedUserDetails } from "./moocfi"
-import { fetchCrowdsorcererProgress } from "./crowdsorcerer"
 import { zip } from "../util/arrays"
 import { fetchQuizProgress } from "./quiznator"
 import { fetchQuizzesProgress } from "./quizzes"
@@ -16,11 +15,10 @@ const introductionCourseGroups = [
 
 export async function fetchProgress() {
   // await fetchQuizzesProgress()
-  const serviceIdentifiers = ["Ohjelmointitehtävät", "Kyselyt", "Crowdsorcerer"]
+  const serviceIdentifiers = ["Programming exercises", "Quizzes"]
   const progressesCollection = await Promise.all([
     fetchProgrammingProgress(),
     fetchQuizzesProgress(),
-    fetchCrowdsorcererProgress(),
   ])
   const userDetails = await getCachedUserDetails()
   const currentCourseVariant = userDetails?.extra_fields?.course_variant
@@ -39,7 +37,7 @@ export async function fetchProgress() {
   )
   const toBeDeleted = []
   Object.entries(progressByGroup).forEach(([group, serviceEntries]) => {
-    if (!Object.keys(serviceEntries).find(o => o === "Ohjelmointitehtävät")) {
+    if (!Object.keys(serviceEntries).find(o => o === "Programming exercises")) {
       toBeDeleted.push(group)
     }
   })
