Merge pull request #366 from BIDMCDigitalPsychiatry/issue-802

Total levels changes
BIDMCDigitalPsychiatry · Mar 1, 2024 · fa51beb · fa51beb
2 parents add7fe1 + b8c4131
commit fa51beb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/BoxGame/src/components/box/Board.tsx b/BoxGame/src/components/box/Board.tsx
@@ -546,9 +546,10 @@ class Board extends React.Component<BoardProps, BoardState> {
           <span>{i18n.t("PLEASE_REMEMBER_THE_SEQUENCE")}</span>
         ) : null;
       // Game state
+      const total_level = 6;
       level =
         this.state.gameState > 0 ? (
-          <span>{i18n.t("LEVEL")} {this.state.gameState}</span>
+          <span>{i18n.t("LEVEL")} {this.state.gameState}/{total_level}</span>
         ) : null;
       // Show the alert on bottom of game board
       alertText = this.state.gameSequence ? (

diff --git a/JewelsPro/src/components/jewels/Board.tsx b/JewelsPro/src/components/jewels/Board.tsx
@@ -27,7 +27,8 @@ export interface BoardProps {
   level: number;
   language: string;
   updateLevel: any;
-  updateRoutes: any
+  updateRoutes: any;
+  settings: any;
 }
 
 interface DiamondState {
@@ -46,7 +47,7 @@ interface DiamondState {
   tapCount: number;
   timeout: boolean;  
   showConfirmModal: boolean;
-
+  totalLevels: number; 
 }
 
 class Board extends React.Component<BoardProps, DiamondState> {
@@ -68,8 +69,8 @@ class Board extends React.Component<BoardProps, DiamondState> {
       stepNumber: 0,
       tapCount: 0,
       timeout: false,
-      showConfirmModal: false
-
+      showConfirmModal: false,
+      totalLevels: this.getTotalLevels()
     };
     i18n.changeLanguage(props.language);
   }
@@ -298,6 +299,17 @@ class Board extends React.Component<BoardProps, DiamondState> {
     }
     this.setState({showConfirmModal: false})
   }
+
+  getTotalLevels = () => {
+    const maxBonusPoints = 1000; 
+    const bonusPointsPerLevel = this.props.settings?.bonus_point_count ?? 40; // Default value 
+    if (!bonusPointsPerLevel || bonusPointsPerLevel <= 0) {
+      console.error("Invalid or missing bonus_point_count in settings");
+      return 0; 
+    }
+    const totalLevels = Math.ceil(maxBonusPoints / bonusPointsPerLevel);
+    return totalLevels;
+  };
   // Render the game board
   render() {
     let board;
@@ -362,6 +374,7 @@ class Board extends React.Component<BoardProps, DiamondState> {
           {timer}
           {negSection}
           {confirmModal}
+          {this.props.level}/{this.state.totalLevels.toString()}
           <br/>
         </div>
         {board}

diff --git a/JewelsPro/src/components/jewels/Jewels.tsx b/JewelsPro/src/components/jewels/Jewels.tsx
@@ -447,6 +447,7 @@ class Jewels extends React.Component<any, AppState> {
                 updateLevel={this.updateLevel}
                 handleClose={this.handleClose}
                 sendDataToDashboard={this.sendDataToDashboard}
+                settings={this.state.settings}
               />
             </div>
           </div>

diff --git a/Maze_Game/src/containers/Layout.tsx b/Maze_Game/src/containers/Layout.tsx
@@ -24,7 +24,7 @@ const Layout = ({...props} : any) =>{
       useEffect(() => {  
         const configuration = props?.data?.configuration;
         i18n.changeLanguage(!!configuration ? configuration.language : "en-US");   
-        setFooterMsg(i18n.t("LEVEL")+" "+gameLevel)
+        setFooterMsg(i18n.t("LEVEL")+" "+gameLevel+"/"+(props.data.activity?.settings?.level ?? 12))
         if(gameLevel === 1) {
           if (
             /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
@@ -113,8 +113,8 @@ const Layout = ({...props} : any) =>{
             handleConfirm={(e: any) => {
               hideModal()
 
-            if(gameLevel < 12) { 
-              setFooterMsg(i18n.t("LEVEL")+" "+(gameLevel+1).toString())
+            if(props.data.activity?.settings?.level ?? 12) { 
+              setFooterMsg(i18n.t("LEVEL")+" "+(gameLevel+1).toString()+"/"+(props.data.activity?.settings?.level ?? 12).toString())
               setGameLevel(gameLevel+1)
               if(gameLevel=== 6){
                 setCircles(2)