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

Feature/#50 goi quiz

app/actions/study.js

@@ -35,6 +35,7 @@ export function endLearn(postValue){
         body: JSON.stringify(postValue)
       }).then(data => data.json())
       .then(json => {
+        console.log(json);
         dispatch(endLearnDispatch(postValue, json))
       })
       .catch(err => dispatch(endLearnFailedDispatch(err)))
@@ -47,33 +48,6 @@ export function takeQuiz(studyData){
   };        
 }
 
-// export function getMistakes(topicId){
-//   return (dispatch) => {
-//       getJWT().then( JWT => {
-//           fetch('https://e-learning-backend.herokuapp.com/api/v1/mistakes?' + topicId
-//           ,{
-//             method: 'GET',
-//             headers: {
-//               'Authorization' : JWT,
-//               'Accept': 'application/json',
-//               'Content-Type': 'application/json',
-//             },
-//           }).then(data => data.json())
-//           .then(json => {
-//               if(type == 'QUIZ'){
-//                   dispatch(summaryRecordQuizDispatch(json, type))
-//               }else{
-//                   dispatch(summaryRecordTestDispatch(json, type))            
-//               }
-//           })
-//           .catch(err => dispatch(failedSummary(err)))
-//       })
-//   };    
-
-
-// }
-
-
 // ===================================== ACTION SENDING DATA TO REDUCER =================================================
 export function startLearnDispatch(studyType, startLearn, studyID, quizSize) {
   return {

app/component/correct.js

@@ -29,12 +29,12 @@ class CorrectPanel extends Component {
   }
   componentWillMount() {
 
-      this.loadAudio();        
+      //this.loadAudio();        
   }
 
   componentDidUpdate(){
 
-      this.loadAudio();
+      //this.loadAudio();
   }
 
 
@@ -51,9 +51,11 @@ class CorrectPanel extends Component {
             <Text style={ styles.correctText }>{ this.props.question.english }</Text>
           </View>
 
-          <TouchableHighlight onPress={() => this.playAudio(true) } style={ styles.correctAudio }>
-              <Icon name="volume-up" style={ styles.correctVolume }></Icon>
-          </TouchableHighlight>
+          {this.props.question.audio != '' && 
+            (<TouchableHighlight onPress={() => this.loadAudio() } style={ styles.correctAudio }>
+                <Icon name="volume-up" style={ styles.correctVolume }></Icon>
+            </TouchableHighlight>)
+          }
         </View>
       );
 
@@ -74,13 +76,13 @@ class CorrectPanel extends Component {
       );
     }
 
-    loadAudio(){
+    loadAudio(){      
       this.quizAudio = new Sound(this.props.question.audio, Sound.MAIN_BUNDLE, (error) => {
         if (error) {
           console.log('failed to load the sound', error);
           return;
         }
-
+        this.playAudio(true);
       });
     }
 
@@ -89,16 +91,17 @@ class CorrectPanel extends Component {
       playDifferentAudio = this.currentAudio != this.props.question.id && this.props.format == 'audio';
 
       if(playDifferentAudio || forcePlay){    
-
-        this.currentAudio = this.props.question.id;
-
-        this.quizAudio.play((success) => {
-          if (!success) {
-            this.quizAudio.reset();
-          } 
+
+        this.currentAudio = this.props.question.id;        
+        this.quizAudio.stop(() => {
+          this.quizAudio.play((success) => {
+            if (!success) {              
+              //this.quizAudio.reset();
+            } 
+          });
         });
+
       }
-
     }
 
     stripSpace(val){        

app/component/question.js

@@ -175,9 +175,8 @@ class QuestionPanel extends Component {
         if (error) {          
           return;
         }        
-        this.playAudio()
+        this.playAudio();
 
-
       });
     }
 
@@ -195,11 +194,8 @@ class QuestionPanel extends Component {
             } 
           });
         });
-
-
+
       }
-
-
     }
 
 }