Add study right info to points balloon content

nygrenh · nygrenh · commit 8aace79e937e · 2019-01-14T17:31:11.000+02:00
diff --git a/src/components/PointsBalloon/PartProgress.js b/src/components/PointsBalloon/PartProgress.js
@@ -6,12 +6,20 @@ const PartProgressContainer = styled.div`
   margin-bottom: 0.5rem;
 `
 
+const SmallP = styled.p`
+  font-size: 0.8rem;
+`
+
+const LargeP = styled.p`
+  font-size: 1rem;
+`
+
 const CustomLabel = ({ x, y, stroke, value }) => {
   return (
     <text
       x={x}
       y={y}
-      dy={25}
+      dy={23}
       dx={12}
       fill={stroke}
       fontSize={10}
@@ -22,7 +30,7 @@ const CustomLabel = ({ x, y, stroke, value }) => {
   )
 }
 
-const PartProgress = ({ name, data }) => {
+const PartProgress = ({ name, data, appliesForStudyRight }) => {
   const allChartData = Object.entries(data).map(([tool, data]) => {
     return { tool, progress: data.progress * 100 }
   })
@@ -58,11 +66,19 @@ const PartProgress = ({ name, data }) => {
             />
           </Bar>
         </BarChart>
-        <div>
+        <LargeP>
           Osasta saadut kurssipisteet:{" "}
           {Math.floor(Math.min(100, totalProgress * 111.112))}
           /100.
-        </div>
+        </LargeP>
+        {appliesForStudyRight && (
+          <SmallP>
+            Opinto-oikeuteen vaaditaan 90% ohjelmointitehtävien pisteistä.
+            Edistymisesi tällä hetkellä:{" "}
+            {allChartData.find(o => o.tool === "Ohjelmointitehtävät")?.progress}
+            %.
+          </SmallP>
+        )}
       </div>
     </PartProgressContainer>
   )
diff --git a/src/components/PointsBalloon/PointsBalloonContent.js b/src/components/PointsBalloon/PointsBalloonContent.js
@@ -6,6 +6,7 @@ import Loading from "../Loading"
 import { fetchProgress } from "../../services/progress"
 import PagesContext from "../../contexes/PagesContext"
 import PartProgress from "./PartProgress"
+import { getCachedUserDetails } from "../../services/moocfi"
 
 const StyledModal = styled(Modal)`
   z-index: 500 !important;
@@ -44,13 +45,17 @@ class PointsBalloonContent extends React.Component {
     render: false,
     data: null,
     error: null,
+    appliesForStudyRight: null,
   }
 
   async componentDidMount() {
     this.setState({ render: true })
     try {
       let data = await fetchProgress(this.context)
-      this.setState({ data })
+      let userDetails = await getCachedUserDetails()
+      const appliesForStudyRight =
+        userDetails?.extra_fields?.applies_for_study_right === "t"
+      this.setState({ data, appliesForStudyRight })
     } catch (e) {
       this.setState({ error: e.toString() })
     }
@@ -87,7 +92,13 @@ class PointsBalloonContent extends React.Component {
                 <div>
                   {this.state.data &&
                     Object.entries(this.state.data).map(([name, data]) => {
-                      return <PartProgress name={name} data={data} />
+                      return (
+                        <PartProgress
+                          appliesForStudyRight={this.state.appliesForStudyRight}
+                          name={name}
+                          data={data}
+                        />
+                      )
                     })}
                 </div>
               )}
diff --git a/src/components/user/CourseOptionsEditor.js b/src/components/user/CourseOptionsEditor.js
@@ -40,9 +40,11 @@ class CourseOptionsEditor extends React.Component {
         first_name: data.user_field?.first_name,
         last_name: data.user_field?.last_name,
         student_number: data.user_field?.organizational_id,
-        applies_for_study_right: data.extra_fields?.applies_for_study_right,
-        digital_education_for_all: data.extra_fields?.digital_education_for_all,
-        marketing: data.extra_fields?.marketing,
+        applies_for_study_right:
+          data.extra_fields?.applies_for_study_right === "t",
+        digital_education_for_all:
+          data.extra_fields?.digital_education_for_all === "t",
+        marketing: data.extra_fields?.marketing === "t",
         research: data.extra_fields?.research,
         loading: false,
       },
diff --git a/src/services/moocfi.js b/src/services/moocfi.js
@@ -152,6 +152,7 @@ export async function updateUserDetails({ extraFields, userField }) {
     },
     { headers: { Authorization: `Bearer ${accessToken()}` } },
   )
+  store.remove("tmc.user.details")
   await userDetails()
   return res
 }

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ export async function updateUserDetails({ extraFields, userField }) {`
`152`	`152`	`},`
`153`	`153`	{ headers: { Authorization: `Bearer ${accessToken()}` } },
`154`	`154`	`)`
	`155`	`+ store.remove("tmc.user.details")`
`155`	`156`	`await userDetails()`
`156`	`157`	`return res`
`157`	`158`	`}`