Change minimum score for dispatch, fixes #144

DBCDK · Sep 19, 2018 · b9e060d · b9e060d
1 parent 1adfb43
commit b9e060d
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/src/components/EditScreen.js b/src/components/EditScreen.js
@@ -1,5 +1,6 @@
 import {connect} from 'react-redux';
 import React, {Component} from 'react';
+import Immutable from 'immutable';
 
 import ArrowBackIcon from '@material-ui/icons/ArrowBack';
 import DeleteIcon from '@material-ui/icons/Delete';
@@ -15,7 +16,8 @@ import {adminCurrentScreen, getScreen} from '../redux/selectors';
 import {
   editScreen,
   updateScreenElement,
-  addQuestionAnswer
+  addQuestionAnswer,
+  updateDispatch
 } from '../redux/actions';
 import quizElements from './quizElements';
 import style from './style';
@@ -43,15 +45,24 @@ function editUI({
     </Grid>
   ));
 }
-function editCondition(condition, {classes, doEditScreen}) {
+function editCondition(condition, {classes, doEditScreen, doUpdateDispatch}) {
   const minScore = condition.getIn(['condition', 'atLeast', 'score']);
   return (
     <Grid item xs={12} key={condition.getIn(['action', 'screen'])}>
       <Paper>
         <TextField
           label="Mindste antal point"
           value={minScore}
-          onChange={e => console.log('TODO: change minScore')}
+          onChange={e =>
+            doUpdateDispatch(o =>
+              o.set(
+                'condition',
+                Immutable.fromJS({
+                  atLeast: {score: Math.max(0, e.target.value)}
+                })
+              )
+            )
+          }
           type="number"
           className={classes.margin}
         />
@@ -82,13 +93,24 @@ function editCondition(condition, {classes, doEditScreen}) {
     </Grid>
   );
 }
-function editDispatch({currentScreen, classes, doEditScreen}) {
+function editDispatch({
+  currentScreen,
+  classes,
+  doEditScreen,
+  doUpdateDispatch
+}) {
   return (
     <Grid container spacing={16}>
       {currentScreen
         .get('dispatch')
         .butLast()
-        .map(o => editCondition(o, {classes, doEditScreen}))}
+        .map((o, pos) =>
+          editCondition(o, {
+            classes,
+            doEditScreen,
+            doUpdateDispatch: doUpdateDispatch(currentScreen.get('_id'), pos)
+          })
+        )}
       <Grid item xs={12}>
         <Button aria-label="Add" mini onClick={addQuestionAnswer}>
           <AddIcon /> Mulig slutning
@@ -146,6 +168,8 @@ export function mapDispatchToProps(dispatch) {
     doEditScreen: screen => dispatch(editScreen({screen})),
     doUpdateScreenElement: (screen, pos) => updateFn =>
       dispatch(updateScreenElement({screen, pos, updateFn})),
+    doUpdateDispatch: (screen, pos) => updateFn =>
+      dispatch(updateDispatch({screen, pos, updateFn})),
     doAddQuestionAnswer: (screen, pos) =>
       dispatch(addQuestionAnswer([screen, pos]))
   };

diff --git a/src/redux/actions.js b/src/redux/actions.js
@@ -1,5 +1,11 @@
 import {getUser, storage, findOrCreateType} from './openplatform';
 
+export const updateDispatch = o => {
+  return {
+    type: 'UPDATE_DISPATCH',
+    ...o
+  };
+};
 export const addQuestionAnswer = path => {
   return {
     type: 'ADD_QUESTION_ANSWER',

diff --git a/src/redux/reducers.js b/src/redux/reducers.js
@@ -48,11 +48,26 @@ function pageAction(state, action) {
     return state;
   }
 }
+function sortDispatchesByAtLeastScore(state, screen) {
+  return state.updateIn(['quiz', 'screens', screen, 'dispatch'], o =>
+    o.sort(
+      (a, b) =>
+        b.getIn(['condition', 'atLeast', 'score'], -1) -
+        a.getIn(['condition', 'atLeast', 'score'], -1)
+    )
+  );
+}
 
 export function root(state = initialState, action) {
   switch (action.type) {
     case '@@INIT':
       return state;
+    case 'UPDATE_DISPATCH':
+      state = state.updateIn(
+        ['quiz', 'screens', action.screen, 'dispatch', action.pos],
+        action.updateFn
+      );
+      return sortDispatchesByAtLeastScore(state, action.screen);
     case 'UPDATE_SCREEN_ELEMENT':
       state = state.updateIn(
         ['quiz', 'screens', action.screen, 'ui', action.pos],