Merge pull request #118 from ZendyLim/feature/#50_goi_quiz

Feature/#50 goi quiz

app/actions/helper.js

@@ -1,15 +1,14 @@
 import { pointsList } from '../config/quizFormat';
 
-export function countScore(studyRecord,quizItems = 0) {    
+export function countScore(studyRecord,quizItems = 0, byPoint = false) {    
     let score = 0;
     let countQuest = 0;
     var correct = 0;
     for(var i = 0; i < studyRecord.length; ++i) {
         if(studyRecord[i].correct == '1'){      
             if(studyRecord[i].type){
                 correct += pointsList[studyRecord[i].type.toLowerCase()];
-            }else{
-                console.log('run this');
+            }else{                
                 correct += pointsList['initial'];
             }
         }        
@@ -20,9 +19,12 @@ export function countScore(studyRecord,quizItems = 0) {
         }
     }
 
-    if(quizItems){
+    if(quizItems && !byPoint){
         countQuest = 100;
     }
+    else{
+        countQuest = quizItems * 2;
+    }
 
     if(countQuest !== 0 && correct !== 0){
         score = Math.floor(( correct / countQuest) * 100 );

app/actions/summary.js

@@ -17,6 +17,7 @@ async function getJWT(){
 //================================   API FETCH ===================================
 
 export function getAllRecord(){
+
     return (dispatch) => {
         getJWT().then( JWT => {
             fetch('https://e-learning-backend.herokuapp.com/api/v1/activities',{
@@ -27,7 +28,8 @@ export function getAllRecord(){
                 'Content-Type': 'application/json',
               },
             }).then(data => data.json())
-            .then(json => {
+            .then(json => {   
+
                 SummaryHelper.setSummaryCount(json.activities.quiz, dataVal =>{
                     dispatch(summaryCountAllDispatch(dataVal))            
                 }); 

app/component/correct.js

@@ -47,8 +47,8 @@ class CorrectPanel extends Component {
           <View>
             <Text style={ styles.correctText }>{ this.stripSpace(displayToText) }</Text>
             <Text style={ styles.correctText }>{ this.props.question.romaji }</Text>
-            <Text style={ styles.correctHighlight }>English</Text>
-            <Text style={ styles.correctText }>{ this.props.question.english }</Text>
+            {/* <Text style={ styles.correctHighlight }>English</Text> */}
+            {/* <Text style={ styles.correctText }>{ this.props.question.english }</Text> */}
           </View>
 
           {this.props.question.audio != '' && 

app/config/localization.js

@@ -94,6 +94,11 @@ export let strings = new LocalizedStrings({
    PROCEED : "Proceed >",
    QUIZLIST : "Quizlist",
    HIRAGANA_KATAKANA_LIST_VALIDATION : "You need to choose at least 5 data",
+   POINTS: "Points",
+   QUESTIONS: "Questions",
+   PASSOVER: "In order to pass you need points above 80",
+   NEED_PASS:"You need to pass the test 1 time to proceed to next topic. In order to pass you need points above 80",
+   NEED_PASS_INITIALS:"You need to pass the test 3 times to proceed to next topic. In order to pass you need points above 80",
 
   //login part
   SIGN_IN : "Sign In",
@@ -261,6 +266,11 @@ export let strings = new LocalizedStrings({
    PROCEED : "持続する >",
    QUIZLIST : "クイズリスト",
    HIRAGANA_KATAKANA_LIST_VALIDATION : "少なくとも5つのデータを選択する必要があります",
+   POINTS: "点",
+   QUESTIONS: "問",
+   PASSOVER: "80点以上で合格",
+   NEED_PASS:"次のトピックを続けるように、テストを1回合格が必要です。80点以上で合。",
+   NEED_PASS_INITIALS:"次のトピックを続けるように、テストを3回合格が必要です。80点以上で合。",
 
     //login part
   SIGN_IN : "サインイン",

app/config/quiz/topic2.js

@@ -1268,24 +1268,24 @@ export const listening = [
         "english":"vietnam",
         "answerOption":[
             {
-                "id":"tp2_l_4",
+                "id":"tp2_l_3",
                 "type":"listening",
-                "moji":"日本"
+                "moji":"1月 26日"
             },
             {
                 "id":"tp2_l_2",
                 "type":"listening",
-                "moji":"フィリピン"
+                "moji":"2月 1日"
             },
             {
-                "id":"tp2_l_3",
+                "id":"tp2_l_1",
                 "type":"listening",
-                "moji":"ベトナム"
+                "moji":"2月 18日"
             },
             {
-                "id":"tp2_l_1",
+                "id":"tp2_l_4",
                 "type":"listening",
-                "moji":"タイ"
+                "moji":"8月 18日"
             }
         ],
         "audio":"t2_listening_3.mp3"

app/screens/Quiz/quizFlash.js

@@ -118,6 +118,13 @@ import {
         listening: 3
       }
 
+      // this.testItemCount = {
+      //   vocabulary: 1,
+      //   kanji: 1,
+      //   grammar: 1,
+      //   reading: 1,
+      //   listening: 1
+      // }
       this.shortType = {
         'v' : 'vocabulary',
         'g' : 'grammar',
@@ -192,7 +199,7 @@ import {
                       <View style={ !timerRun && styles.blocker }></View>
                       <View style={[ styles.quizInfo ]}>
                         <Text style={ styles.quizInfoText }>
-                          Points: { this.setScore() }/100 Questions: { this.state.counter+1 }/{ this.allQuestion.length }
+                          {strings.POINTS}: { this.setScore() }/100 {strings.QUESTIONS}: { this.state.counter+1 }/{ this.allQuestion.length }
                         </Text>
                       </View>
 
@@ -769,12 +776,6 @@ import {
 
           this.setState(this.initialState);
           this.props.navigation.dispatch(resetAction);
-
-          // this.props.navigation.navigate('ScoreScreen',{
-          //   index : this.state.index,
-          //   typeQuiz : this.initialParams.formatType,
-          //   studyTitle : this.title
-          // });
 
         }
       }
@@ -848,12 +849,17 @@ import {
   };
 
   setScore(){
-    var quizSizes = 0;
-
+    var quizSizes = this.allQuestion.length;
+    
     if(this.initialParams.isTopicTest){
-      quizSizes = this.allQuestion.length;
+
+      return Helper.countScore(this.studyRecord,quizSizes);
     }  
-    return Helper.countScore(this.studyRecord,quizSizes);
+    else{
+      return Helper.countScore(this.studyRecord,quizSizes,true);
+    }
+
+
   }
 
     goNextQuestion() {            

app/screens/Study/score.js

@@ -210,7 +210,7 @@ import {
             <View style={ scoreStyle.absoluteText }>
               <View style={ scoreStyle.containerScore }>
                 <Text style={ scoreStyle.scoreTotal }>{ this.props.scoreTotal}/100 </Text>
-              </View>
+              </View>              
             </View>
             <ProgressCircle
                 style={ { height: 140 } }
@@ -219,6 +219,7 @@ import {
             />
           </View>
           <View style={ scoreStyle.containerMistake }>
+            <Text style={scoreStyle.ruleScore}>{ strings.PASSOVER }</Text>
             <ScrollView  style={ scoreStyle.containerMainMistake }>
               <Text style={ scoreStyle.sumaryTitle }>SUMMARY</Text>
               <Icon name='lock'  color='#fff' size={10}/>
@@ -235,7 +236,7 @@ import {
                 ) :<Text>No study data</Text> }
             </ScrollView >
           </View>
-          { this.props.scoreTotal >= 80 ? ( 
+          { this.props.scoreTotal >= 0 ? ( 
           <View style={ scoreStyle.containerMistake }>
             <View style={ scoreStyle.RecordRowButton }>
               <View style={ scoreStyle.RecordRowButtonContainer }>

app/screens/Study/studyList.js

@@ -64,9 +64,7 @@ class StudyListScreen extends Component {
       this.props.navigation.navigate('QuizFlash',(
          item
       ));
-      // this.props.navigation.navigate('TopicList',(
-      //   item
-      // ));
+
     }
     else{
       this.props.navigation.navigate('TopicList',(

app/screens/Study/topiclist.js

@@ -18,6 +18,9 @@ import  { strings }   from '../../config/localization';
 import { ImageData } from '../../config/image_list';
 import { StudyList } from '../../config/studyList';
 
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import * as Actions from '../../actions/summary'; 
 class TopicListScreen extends Component {
 
   static navigationOptions = ({ navigation }) =>{
@@ -33,18 +36,24 @@ class TopicListScreen extends Component {
       title:"TOPIC10_TITLE",
       img: "",
       index: "",
+      nextTopic: "",
   };
   }
 
   componentDidMount() {
     const { navigation } = this.props;
-    this.setState({
+
+    params = {
       title: navigation.getParam('title', null),
       img: navigation.getParam('img', null),
       type: navigation.getParam('type', null),
-      index: navigation.getParam('index', null),
-    });
-    console.log(navigation.getParam('index', null));
+      index: navigation.getParam('index', null),      
+    }
+
+    params.nextTopic = StudyList[params.index + 1];
+
+    this.setState(params);
+    console.log(params);
     //Console.log(navigation.getParam('userName', null),"NIAMAK");
   }
 
@@ -80,18 +89,50 @@ navigateToLearn=(type, categoryId)=>{
   navigateToNextTopic=()=>{
     var item = StudyList[this.state.index + 1];
     item['index'] = this.state.index + 1;
-
-    const resetAction = NavigationActions.reset({ 
-      index: 1,
-      actions: [
-        NavigationActions.navigate({ routeName: 'StudyList' }),
-        NavigationActions.navigate({ routeName: 'TopicList' , params: item })
-      ]
-    });
+    locks = this.props.lock;
+    console.log(item);
+    if(locks[item.topic_id].lock){
+      if(this.state.type == 'INITIAL'){
+        alert(strings.NEED_PASS_INITIAL);
+      }
+      else{
+        alert(strings.NEED_PASS);
+      }
+
+    }
+    else{
 
-    this.props.navigation.dispatch(resetAction);
+      let resetAction;
 
-
+      if(item.type == 'FUKUSHU'){
+
+        item['formatType'] = 'FUKUSHU';
+        item['idList'] = this.props.lock[item.topic_id].mistakes;
+
+        resetAction = NavigationActions.reset({ 
+          index: 1,
+          actions: [
+            NavigationActions.navigate({ routeName: 'StudyList' }),
+            NavigationActions.navigate({ routeName: 'QuizFlash' , params: item })
+          ]
+        });        
+
+      }
+      else{
+
+        resetAction = NavigationActions.reset({ 
+          index: 1,
+          actions: [
+            NavigationActions.navigate({ routeName: 'StudyList' }),
+            NavigationActions.navigate({ routeName: 'TopicList' , params: item })
+          ]
+        });
+
+      }
+
+      this.props.navigation.dispatch(resetAction);
+    }
+
  }
   render() {
     return (
@@ -119,6 +160,7 @@ navigateToLearn=(type, categoryId)=>{
               <Text style={[study.buttonTopicText]}>{ strings['topic_test'] }</Text>
             </TouchableOpacity>
           </View>
+
           <View style={[study.buttonContainerTopicNext]}>
             <TouchableOpacity style={[study.nextTopic, styles.shadow]} onPress={this.navigateToNextTopic.bind(this)}>
               <Text style={[study.buttonTopicNextText]}>{ strings['next_topic'] }</Text>
@@ -139,4 +181,23 @@ navigateToLearn=(type, categoryId)=>{
 const styles = require('../../styles/style');
 const study = require('../../styles/study');
 
-export default TopicListScreen;
+// The function takes data from the app current state,
+// and insert/links it into the props of our component.
+// This function makes Redux know that this component needs to be passed a piece of the state
+function mapStateToProps(state, props) {
+
+  return {
+      lock : state.summary.lock      
+  }
+}
+
+
+// Doing this merges our actions into the component’s props,
+// while wrapping them in dispatch() so that they immediately dispatch an Action.
+// Just by doing this, we will have access to the actions defined in out actions file (action/home.js)
+function mapDispatchToProps(dispatch) {
+  return bindActionCreators(Actions, dispatch);
+}
+
+//Connect everything
+export default connect(mapStateToProps, mapDispatchToProps)(TopicListScreen);

app/styles/score.js

@@ -212,7 +212,12 @@ module.exports = StyleSheet.create({
     },
     imageHome : {
         width: '100%',
-        height: '100%',
+        height: '100%',        
+    },
+    ruleScore:{
+        fontSize:16,
+        marginBottom:10,
+        textAlign:"center",
         elevation: 4
     }
 

app/styles/study.js

@@ -250,11 +250,9 @@ module.exports = StyleSheet.create({
   nextTopic: {
     height: 60,
     width : '98%',
-    backgroundColor: '#cccccc',
+    backgroundColor: primaryColor,
     justifyContent: 'center',
     alignItems: 'center',
-    borderColor: '#cccccc',
-    borderWidth: 1,
     borderRadius: 5,
   },
   buttonTopicNextText:{