Merge pull request #95 from CAHLR/allison-versionupdate

Version Update to 1.7 with default global language fix and mastery/completion toggle defined

Author: allyqwert

README.md

@@ -596,3 +596,4 @@ mastery. Ties (of equal mastery) in the heuristic selection algorithm are broken
 - **giveStuBottomHint:** controls whether the suer should receive a bottom-out hint (last hint in the hint pathway that contains the answer)
 - **giveHintOnIncorrect:** controls whether an incorrect response should automatically force the user into the hint pathway
 - **keepMCOrder:** controls whether to preserve the order of MCQ choices in the spreadsheet
+- **enableCompletionMode:** controls whether the student finishes the lesson once mastery threshold is reached or once all problems exhausted

src/components/problem-layout/LessonSelection.js

@@ -17,22 +17,26 @@ import withTranslation from "../../util/withTranslation.js";
 import Popup from '../Popup/Popup.js';
 import About from '../../pages/Posts/About.js';
 import MenuBookIcon from '@material-ui/icons/MenuBook';
+import { LocalizationConsumer } from '../../util/LocalizationContext';
 
 class LessonSelection extends React.Component {
     static contextType = ThemeContext;
 
     constructor(props, context) {
         super(props);
-        const { courseNum, setLanguage } = this.props;
+        // const { courseNum, setLanguage } = this.props;
 
-        if (courseNum == 6) {
-            setLanguage('se')
-        } 
+        // if (courseNum != null) {
+        //     const course = _coursePlansNoEditor[parseInt(courseNum)];
+        //     if (course && course.language) {
+        //         setLanguage(course.language);
+        //     }
+        // }
 
-        if (props.history.location.pathname == '/') {
-            const defaultLocale = localStorage.getItem('defaultLocale');
-            setLanguage(defaultLocale)
-        }
+        // if (props.history.location.pathname == '/') {
+        //     const defaultLocale = localStorage.getItem('platformLanguage');
+        //     setLanguage(defaultLocale)
+        // }
 
         this.user = context.user || {}
         this.isPrivileged = !!this.user.privileged
@@ -63,6 +67,13 @@ class LessonSelection extends React.Component {
         this.setState({ preparedRemoveProgress: true });
     }
 
+    handleCourseSelect = (course, courseIndex) => {
+        const { history } = this.props;
+        // localStorage.setItem("defaultLocale", course.language); 
+
+        history.push(`/courses/${courseIndex}`);
+    };
+
     render() {
         const { translate } = this.props;
         const { classes, courseNum } = this.props;
@@ -116,9 +127,11 @@ class LessonSelection extends React.Component {
                                                         <IconButton aria-label={`View Course ${i}`}
                                                             aria-roledescription={`Navigate to course ${i}'s page to view available lessons`}
                                                             role={"link"}
-                                                            onClick={() => {
-                                                                this.props.history.push(`/courses/${i}`)
-                                                            }}>
+                                                            // onClick={() => {
+                                                            //     this.props.history.push(`/courses/${i}`)
+                                                            // }}
+                                                            onClick={() => this.handleCourseSelect(course, i)}
+                                                            >
                                                             <img
                                                                 src={`${process.env.PUBLIC_URL}/static/images/icons/folder.png`}
                                                                 width="64px"
@@ -206,4 +219,16 @@ class LessonSelection extends React.Component {
     }
 }
 
-export default withStyles(styles)(withTranslation(LessonSelection));
+// export default withStyles(styles)(withTranslation(LessonSelection));
+
+export default withStyles(styles)(withTranslation((props) => (
+    <LocalizationConsumer>
+        {({ language, platformLanguage }) => (
+            <LessonSelection
+                {...props}
+                language={language}
+                platformLanguage={platformLanguage}
+            />
+        )}
+    </LocalizationConsumer>
+)));

src/components/problem-layout/Problem.js

@@ -44,11 +44,11 @@ class Problem extends React.Component {
     constructor(props, context) {
         super(props);
 
-        const { setLanguage } = props;
-        if (props.lesson.courseName == "Matematik 4") {
-            setLanguage('se')
-        }
-
+        // const { setLanguage } = props;
+        // if (props.lesson.courseName == "Matematik 4") {
+        //     setLanguage('se')
+        // }
+        
         this.bktParams = context.bktParams;
         this.heuristic = context.heuristic;
 
@@ -86,7 +86,9 @@ class Problem extends React.Component {
     }
 
     componentDidMount() {
-        const { lesson } = this.props;
+        const { lesson, setLanguage } = this.props;
+        setLanguage(lesson.language);
+
         document["oats-meta-courseName"] = lesson?.courseName || "";
         document["oats-meta-textbookName"] =
             lesson?.courseName
@@ -770,4 +772,4 @@ class Problem extends React.Component {
     }
 }
 
-export default withStyles(styles)(withTranslation(Problem));
+export default withTranslation(withStyles(styles)(Problem));

src/config/config.js

@@ -10,6 +10,18 @@ const SITE_VERSION = "1.6";
 
 const CURRENT_SEMESTER = calculateSemester(Date.now());
 
+/**
+ * Default language for the platform
+ * @type {string}
+ */
+const DEFAULT_LANGUAGE = "en"; // Supported Options: 'en', 'es', 'se'
+
+/**
+ * Available languages for the platform
+ * @type {string[]}
+ */
+const AVAILABLE_LANGUAGES = ["en", "es", "se"];
+
 /**
  * If user does not access the website through Canvas, show a warning (for the first time).
  * @type {boolean}
@@ -156,4 +168,6 @@ export {
     DO_FOCUS_TRACKING,
     findLessonById,
     SHOW_NOT_CANVAS_WARNING,
+    DEFAULT_LANGUAGE, 
+    AVAILABLE_LANGUAGES
 };

src/content-sources/oatutor

@@ -3,8 +3,14 @@ import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
+import { LocalizationProvider } from './util/LocalizationContext';
 
-ReactDOM.render(<App/>, document.getElementById('root'));
+ReactDOM.render(
+  <LocalizationProvider>
+    <App />
+  </LocalizationProvider>,
+  document.getElementById('root')
+);
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.