Merge branch 'video_player' into 'master'

video player bug fix

See merge request !23

web-app/frontend/src/components/activities/ActivityContainer.jsx

@@ -11,11 +11,12 @@ const ActivityContainer = () => {
 
   const nextActivityHandler = () => {
     setCurrentActivityNo(currentActivityNo + 1);
+    setIsGuideVideoClicked(true);
   };
 
-  const changeActivityScreen = () => {
+  const changeActivityScreen = (state) => {
     setTimeout(() => {
-      setIsGuideVideoClicked(false);
+      setIsGuideVideoClicked(state);
     }, 2000);
   }
 
@@ -33,6 +34,7 @@ const ActivityContainer = () => {
             className="activity-container-navigator-item"
             onClick={() => {
               setCurrentActivityNo(1);
+              setIsGuideVideoClicked(true);
               changeColor();
             }}
           >
@@ -43,6 +45,7 @@ const ActivityContainer = () => {
             className="activity-container-navigator-item"
             onClick={() => {
               setCurrentActivityNo(2);
+              setIsGuideVideoClicked(true);
               changeColor();
             }}
           >
@@ -53,6 +56,7 @@ const ActivityContainer = () => {
             className="activity-container-navigator-item"
             onClick={() => {
               setCurrentActivityNo(3);
+              setIsGuideVideoClicked(true);
               changeColor();
             }}
           >
@@ -63,6 +67,7 @@ const ActivityContainer = () => {
             className="activity-container-navigator-item"
             onClick={() => {
               setCurrentActivityNo(4);
+              setIsGuideVideoClicked(true);
               changeColor();
             }}
           >
@@ -73,6 +78,7 @@ const ActivityContainer = () => {
             className="activity-container-navigator-item"
             onClick={() => {
               setCurrentActivityNo(5);
+              setIsGuideVideoClicked(true);
               changeColor();
             }}
           >
@@ -83,6 +89,7 @@ const ActivityContainer = () => {
             className="activity-container-navigator-item"
             onClick={() => {
               setCurrentActivityNo(6);
+              setIsGuideVideoClicked(true);
               changeColor();
             }}
           >
@@ -93,6 +100,7 @@ const ActivityContainer = () => {
             className="activity-container-navigator-item"
             onClick={() => {
               setCurrentActivityNo(7);
+              setIsGuideVideoClicked(true);
               changeColor();
             }}
           >

web-app/frontend/src/components/activities/reasoningIqEval/pictureConcept/PictureConcept.jsx

@@ -141,7 +141,7 @@ const PictureConcept = ({ nextActivity }) => {
         </div>
       )}
 
-      {/* {allCompleted && (
+      {allCompleted && (
         <button
           className="float-right bg-transparent hover:bg-red-500 text-red-700 font-semibold hover:text-white py-2 px-4 border border-red-500 hover:border-transparent rounded"
           onClick={() => {
@@ -150,7 +150,7 @@ const PictureConcept = ({ nextActivity }) => {
         >
           Next Activity
         </button>
-      )} */}
+      )}
       {!allCompleted && <Timer switchActivity={switchActivityHandler} />}
       {!allCompleted && <div></div>}
     </div>

web-app/frontend/src/utility/videos.jsx

@@ -42,8 +42,7 @@ const Video = ({ currentActivtyIndex, changeScreen }) => {
   }, []);
 
   const myCallback = () => {
-    console.log("Test 123");
-    changeScreen();
+    changeScreen(false);
   }
 
   return (