Publish part 8

nygrenh · nygrenh · commit ad3a38e6b018 · 2020-03-18T10:44:52.000+02:00
diff --git a/course-settings.js b/course-settings.js
@@ -28,8 +28,6 @@ const courseSettings = {
     { separator: true, title: "Java Programming I" },
   ],
   sidebarFuturePages: [
-    { separator: true, title: "Java Programming II" },
-    { title: "Part 8", tba: "17.3." },
     { title: "Part 9", tba: "24.3." },
     { title: "Part 10", tba: "31.3." },
     { title: "Part 11", tba: "7.4." },
diff --git a/data/part-8/1-recap.md b/data/part-8/1-recap.md
@@ -2,7 +2,7 @@
 path: '/part-8/1-recap'
 #title: 'Lyhyt kertaus'
 title: 'Short recap'
-hidden: true
+hidden: false
 ---
 
 <!-- <text-box variant='learningObjectives' name='Oppimistavoitteet'>
diff --git a/data/part-8/2-hash-map.md b/data/part-8/2-hash-map.md
diff --git a/data/part-8/3-similarity-of-objects.md b/data/part-8/3-similarity-of-objects.md
@@ -1,7 +1,7 @@
 ---
 path: "/part-8/3-similarity-of-objects"
 title: "Similarity of objects"
-hidden: true
+hidden: false
 ---
 
 <!-- <text-box variant='learningObjectives' name='Oppimistavoitteet'>
@@ -391,7 +391,7 @@ Olemme tähän mennessä käyttäneet HashMapin avaimina ainoastaan String- ja I
 
 In addition to `equals`, the `hashCode` method can also be used for **approximate comparison of objects**. The method creates from the object a "hash code", i.e, a number, that tells a bit about the object's content. If two objects have the same hash value, they may be equal. On the other hand, if two objects have different hash values, they are certainly unequal.
 
-Hash codes are used in HashMaps, for instance. HashMap's internal behavior is based on the fact that key-value pairs are stored in an array of lists based on the key's hash value. Each array index points to a list. The hash value identifies the array index, whereby the list located at the array index is traversed. The value associated with the key will be returned if, and only if, the exact same value is found in the list (equality comparison is done using the equals method). This way, the search only needs to consider a fraction of the keys stored in the hash table.
+Hash codes are used in HashMaps, for instance. HashMap's internal behavior is based on the fact that key-value pairs are stored in an array of lists based on the key's hash value. Each array index points to a list. The hash value identifies the array index, whereby the list located at the array index is traversed. The value associated with the key will be returned if, and only if, the exact same value is found in the list (equality comparison is done using the equals method). This way, the search only needs to consider a fraction of the keys stored in the hash map.
 
 So far, we've only used String and Integer-type objects as HashMap keys, which have conveniently had ready-made `hashCode` methods implemented. Let's create an example where this is not the case: we'll continue with the books and keep track of the books that are on loan. We'll implement the book keeping with a HashMap. The key is the book and the value attached to the book is a string that tells the borrower's name:
 
@@ -433,7 +433,7 @@ Jotta HashMap toimisi haluamallamme tavalla, eli palauttaisi lainaajan kun avaim
 
 Olemme aiemmin käyttäneet `String`-olioita menestyksekkäästi HashMapin avaimena, joten voimme päätellä että `String`-luokassa on oma järkevästi toimiva `hashCode`-toteutus. _Delegoidaan_, eli siirretään laskemisvastuu `String`-oliolle. -->
 
-We find the borrower when searching for the same object that was given as a key to the hash table's `put` method. However, when searching by the exact same book but with a different object,a borrwer isn't found, and we get the _null_ reference instead. The reason lies in the default implementation of the `hashCode` method in the `Object` class. The default implementation creates a `hashCode` value based on the object's reference, which means that books having the same content that are nonetheless different objects get different results from the hashCode method. As such, the object is not being searched for in the right place.
+We find the borrower when searching for the same object that was given as a key to the hash map's `put` method. However, when searching by the exact same book but with a different object,a borrwer isn't found, and we get the _null_ reference instead. The reason lies in the default implementation of the `hashCode` method in the `Object` class. The default implementation creates a `hashCode` value based on the object's reference, which means that books having the same content that are nonetheless different objects get different results from the hashCode method. As such, the object is not being searched for in the right place.
 
 For the HashMap to work in thw way we want it to, that is, to return the borrower when given an object with the correct _content_ (not necessarily the same object as the original key), the class that's the key must overwrite the `hashCode` method in addition to the `equals` method. The method must be overwritten so that it gives the same numerical result for all objects with the same content. Also, some objects with different contents may get the same result from the hashCode method. However, with the HashMap's performance in mind, it is essential that objects with different contents get the same hash value as rarely as possible.
 
@@ -499,7 +499,7 @@ public int hashCode() {
 
 <!-- Nyt kirjan käyttö hajautustaulun avaimena on mahdollista. Samalla aiemmin kohtaamamme ongelma ratkeaa ja kirjojen lainaajat löytyvät: -->
 
-It's now possible to use the book as the hash table's key. This way the problem we faced earlier gets solved and the book borrowers are found:
+It's now possible to use the book as the hash map's key. This way the problem we faced earlier gets solved and the book borrowers are found:
 
 <!-- ```java
 HashMap<Kirja, String> lainaajat = new HashMap<>();
diff --git a/data/part-8/4-grouping-data-using-hash-maps.md b/data/part-8/4-grouping-data-using-hash-maps.md
@@ -1,7 +1,7 @@
 ---
 path: '/part-8/4-grouping-data-using-hash-maps'
 title: 'Grouping data using hash maps'
-hidden: true
+hidden: false
 ---
 
 <!-- <text-box variant='learningObjectives' name='Oppimistavoitteet'>
@@ -12,13 +12,13 @@ hidden: true
 </text-box> -->
 <text-box variant='learningObjectives' name='Learning Objectives'>
 
-- You know how to use a list as a hash table's value
-- You know how to categorize data using a hash table
+- You know how to use a list as a hash map's value
+- You know how to categorize data using a hash map
 
 </text-box>
 
 <!-- Hajautustaulu sisältää korkeintaan yhden arvon yhtä avainta kohti. Seuraavassa esimerkissä tallennamme henkilöiden puhelinnumeroita hajautustauluun. -->
-A hash table has at most one value per each key. In the following example, we store the phone numbers of people into the hash table.
+A hash map has at most one value per each key. In the following example, we store the phone numbers of people into the hash map.
 
 
 <!-- ```java
@@ -61,7 +61,7 @@ Pekka's number: 09-111333
 Koska hajautustaulun avaimet ja arvot voivat olla mitä tahansa muuttujia, myös listojen käyttäminen hajautustaulun arvona on mahdollista. Useamman arvon lisääminen yhdelle avaimelle onnistuu liittämällä avaimeen lista. Muutetaan puhelinnumeroiden tallennustapaa seuraavasti: -->
 What if we wanted to assign multiple values ​​to a single key, such as multiple phone numbers for a given person?
 
-Since keys and values ​​in a hash table can be any variable, it is also possible to use lists as values in a hash table. You can add more values ​​to a single key by attaching a list to the key. Let's change the way the numbers are stored in the following way:
+Since keys and values ​​in a hash map can be any variable, it is also possible to use lists as values in a hash map. You can add more values ​​to a single key by attaching a list to the key. Let's change the way the numbers are stored in the following way:
 
 <!-- ```java
 HashMap<String, ArrayList<String>> puhelinnumerot = new HashMap<>();
@@ -71,7 +71,7 @@ HashMap<String, ArrayList<String>> phoneNumbers = new HashMap<>();
 ```
 
 <!-- Nyt hajautustaulussa on jokaiseen avaimeen liitettynä lista. Vaikka new-komento luo hajautustaulun, ei hajautustaulu sisällä alussa yhtäkään listaa. Ne on luotava tarvittaessa erikseen. -->
-Each key of the hash table now has a list attached to it. Although the new command creates a hash table, the hash table initially does not contain a single list. They need to be created separately as needed.
+Each key of the hash map now has a list attached to it. Although the new command creates a hash map, the hash map initially does not contain a single list. They need to be created separately as needed.
 
 <!-- ```java
 HashMap<String, ArrayList<String>> puhelinnumerot = new HashMap<>();
@@ -112,7 +112,7 @@ Pekka's number: [040-12348765, 09-111333]
 </sample-output>
 
 <!-- Määrittelimme muuttujan puhelinnumero tyypiksi `HashMap<String, ArrayList<String>>`. Tämä tarkoittaa hajautustaulua, joka käyttää avaimena merkkijonoa ja arvona merkkijonoja sisältävää listaa. Hajautustauluun lisättävät arvot ovat siis konkreettisia listoja. -->
-We define the type of the phone number as  `HashMap<String, ArrayList<String>>`. This refers to a hash table that uses a string as a key and a list containing strings as its value. As such, the values added to the hash table are concrete lists.
+We define the type of the phone number as  `HashMap<String, ArrayList<String>>`. This refers to a hash map that uses a string as a key and a list containing strings as its value. As such, the values added to the hash map are concrete lists.
 
 <!-- ```java
 // liitetään Pekka-nimeen ensin tyhjä ArrayList
diff --git a/data/part-8/5-tiedon-nopea-hakeminen-ja-tiedon-ryhmittely.md b/data/part-8/5-tiedon-nopea-hakeminen-ja-tiedon-ryhmittely.md
@@ -1,7 +1,7 @@
 ---
 path: '/part-8/5-fast-data-fetching-and-grouping-information'
 title: 'Fast data fetching and grouping information'
-hidden: true
+hidden: false
 ---
 
 <!--
@@ -22,6 +22,4 @@ Vastaa vielä lopuksi seuraavaan kahdeksannen osan osaamistavoitteita tarkastele
 
 The eighth part also started the second part of this course. If you just jumped in, welcome aboard! Finally, please take a moment to answer a self-reflective survey on the learning goals of the eighth part.
 
-
-
-<quiz id='3d7f8b1d-8221-559d-91ab-ffbee0220842'></quiz>
+<quiz id='ce5dd5bb-4a47-5e73-96b2-6c93fb65134f'></quiz>
diff --git a/data/part-8/index.md b/data/part-8/index.md
@@ -2,7 +2,7 @@
 path: '/part-8'
 title: 'Part 8'
 overview: true
-hidden: true
+hidden: false
 ---
 
 <please-login></please-login>
diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
@@ -135,13 +135,12 @@ class Sidebar extends React.Component {
     )
     let content = content2.concat(edges)
     content = content.concat(futurePages)
-    if (CourseSettings.default.splitCourses) {
-      let middlepoint = content.findIndex(o => o.title === "Osa 7")
-      content.splice(middlepoint + 1, 0, {
-        separator: true,
-        title: "Ohjelmoinnin jatkokurssi",
-      })
-    }
+
+    let middlepoint = content.findIndex(o => o.title === "Part 7")
+    content.splice(middlepoint + 1, 0, {
+      separator: true,
+      title: "Java Programming II",
+    })
 
     return (
       <MobileWrapperOrFragment mobileMenuOpen={this.props.mobileMenuOpen}>
diff --git a/src/services/moocfi.js b/src/services/moocfi.js
@@ -231,20 +231,8 @@ async function getCourse() {
     return CourseSettings.default.tmcCourse
   }
   const variant = await getCourseVariant()
-  if (variant === "nodl") {
-    return "2019-ohjelmointi-nodl"
-  }
-  if (variant === "ohja-dl") {
-    return "2019-mooc-vain-jatkokurssi"
-  }
-  if (variant === "ohja-nodl") {
-    return "2019-mooc-vain-jatkokurssi-nodl"
-  }
-  if (variant === "kesa-dl") {
-    return "2019-ohjelmointi-kesa"
-  }
-  if (variant === "kesa-ohja-dl") {
-    return "2019-mooc-vain-jatkokurssi-kesa"
+  if (variant === "ii") {
+    return "java-programming-ii"
   }
   return CourseSettings.default.tmcCourse
 }
diff --git a/src/services/quizzes.js b/src/services/quizzes.js
@@ -1,13 +1,19 @@
 import axios from "axios"
-import { accessToken } from "./moocfi"
+import { accessToken, getCourseVariant } from "./moocfi"
 import CourseSettings from "../../course-settings"
 
-const id = CourseSettings.default.quizzesId
+// const id = CourseSettings.quizzesId
 const language = CourseSettings.default.language
 
 const quizzesLanguage = language === "en" ? "en_US" : "fi_FI"
 
 export async function fetchQuizzesProgress() {
+  let id = CourseSettings.default.quizzesId
+  const courseVariant = await getCourseVariant()
+
+  if (courseVariant === "ii") {
+    id = "7d32559c-5b3d-4c30-bd8e-11e8408359fd"
+  }
   const response = await axios.get(
     `https://quizzes.mooc.fi/api/v1/courses/${id}/users/current/progress`,
     { headers: { Authorization: `Bearer ${accessToken()}` } },
@@ -16,6 +22,13 @@ export async function fetchQuizzesProgress() {
 }
 
 export async function fetchQuizNames() {
+  let id = CourseSettings.default.quizzesId
+  const courseVariant = await getCourseVariant()
+
+  if (courseVariant === "ii") {
+    id = "7d32559c-5b3d-4c30-bd8e-11e8408359fd"
+  }
+
   const response = await axios.get(
     `https://quizzes.mooc.fi/api/v1/quizzes/${id}/titles/${quizzesLanguage}`,
   )
