commit 14ef4dfdb8aab0b997068046bccf0587a7b4fae0
parent 5a9ff847699a8acea543a53bebcaabf0d59fa8fa
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Thu, 19 Mar 2020 09:43:39 -0700
Implement professions vocab.
Diffstat:
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Try it [here](https://ashermorgan.github.io/Spanish-Quizzer/).
- Easily type tildes (``` n` ``` and ``` n~ ``` are converted into ```ñ```)
## Vocabulary Sets
-Currently, Spanish Quizzer only supports the following vocabulary sets:
+Spanish Quizzer currently supports the following vocabulary sets:
- Common Verbs (with conjugations)
- Common Adjectives
- Common Prepositions
@@ -23,3 +23,4 @@ Currently, Spanish Quizzer only supports the following vocabulary sets:
- House (La Casa)
- Vacations (Las Vacaciones)
- Childhood (La Niñez)
+- Professions (Las Profesiones)
+\ No newline at end of file
diff --git a/Spanish Quizzer.js b/Spanish Quizzer.js
@@ -27,7 +27,7 @@ function Load() {
document.getElementById("settingsError").textContent = "";
// Load CSVs
- Sets = [null, null, null, null, null, null, null, null, null, null, null];
+ Sets = [null, null, null, null, null, null, null, null, null, null, null, null];
Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Verbs.csv", {
download: true,
complete: function(results) {
@@ -105,6 +105,13 @@ function Load() {
Sets[10] = results.data;
}
});
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Professions.csv", {
+ download: true,
+ complete: function(results) {
+ // Set verbs
+ Sets[11] = results.data;
+ }
+ });
}
@@ -143,6 +150,7 @@ function Start() {
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode8").value).Apply(Sets[8]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode9").value).Apply(Sets[9]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode10").value).Apply(Sets[10]));
+ Terms.push(...Filter.GetFilter(document.getElementById("settingsMode11").value).Apply(Sets[11]));
// Shuffle terms
ShuffleTerms();
diff --git a/index.html b/index.html
@@ -172,6 +172,19 @@
</select>
</td>
</tr>
+ <tr>
+ <td>
+ <label class="text" for="settingsMode11">Professions: </label>
+ </td>
+ <td>
+ <select id="settingsMode11" class="settingsFilter">
+ <option value="None">None</option>
+ <option value="2FieldsAll">All</option>
+ <option value="2FieldsNouns">Nouns</option>
+ <option value="2FieldsVerbs">Verbs</option>
+ </select>
+ </td>
+ </tr>
</table>
<br/>
<button id="settingsStart" onclick="Start()">Start</button>