Merge pull request #55 from virtual-labs/dev

Dev
virtual-labs · Nov 14, 2024 · a455d1f · a455d1f
2 parents dc11243 + 7ae2eb0
commit a455d1f
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 97 deletions.
diff --git a/experiment/posttest.json b/experiment/posttest.json
@@ -19,7 +19,7 @@
         "a": "Increase weight capacity",
         "b": "Convert analog to digital signal",
         "c": "Generate heat",
-        "d": "Change colore"
+        "d": "Change color"
       },
 
       "correctAnswer": "b",

diff --git a/experiment/procedure.md b/experiment/procedure.md
@@ -2,32 +2,32 @@
 ### Basic Knowledge :
 - Select the type of load cell from the options at the top
 - Answer all the questions and click on "Submit Test" button
-- Click on "Next Level".
+- Click on "Next Level"
 
 ### Configuration :
 - Select the configuration parameters
 - If column type load cell selected then, calculate area and enter its value if the value is correct, click on Configure. If the entered value is incorrect then formula followed by correct answer will be displayed after 3 attempts 
 - Click on "Next Level"
 
-### Construction of Wheatstone bridge:-
+### Construction of Wheatstone bridge :
 - Click on a component from the left panel to select it. The selected component will appear on the right, where you can drag and drop the component to adjust its position
 - You can select any component or connection and click the delete button to modify it, if needed
 - Use drag-and-drop to connect the ports and construct the Wheatstone bridge
 - After completing the connections, click the "Validate Connection" button to check them. If the connections are incorrect three times, a popup will notify you, and on the fourth attempt, a hint will be displayed. Once the connections are correct, you'll be redirected to the next page 
 
 ### Calculations : 
 - Enter a load between 1000 and 10000 N for the column-type load cell, and for the cantilever-type load cell, the load range is between 10 and 100 N
-- Calculate Axial Strain and enter it's value if the value is correct further calculations will be enabled and if the value is Incorrect then formula followed by correct answer will be displayed after 3 attempts
-- Calculate Transverse Strain and enter it's value, if the value is correct further calculations will be enabled and if the value is Incorrect then formula followed by correct answer will be displayed after 3 attempts
+- Calculate Axial Strain and enter it's value if the value is correct further calculations will be enabled and if the value is incorrect then formula followed by correct answer will be displayed after 3 attempts
+- Calculate transverse strain and enter it's value, if the value is correct further calculations will be enabled and if the value is incorrect then formula followed by correct answer will be displayed after 3 attempts
 - Repeat the same process for different loads and calculate axial and tranverse strain. Calculate the load for 5 readings and click on next level
 - Select one of the load to calculate output voltage and click on submit
-- Select the supply voltage Eb and click "Submit." Note that this selection cannot be changed a second time
-- Calculate the output voltage and enter it's value if the value is correct further calculations will be enabled and if the value is Incorrect then formula followed by correct answer will be displayed after 3 attempts
+- Select the supply voltage Eb and click "Submit." Note that this selection cannot be changed for next readings
+- Calculate the output voltage and enter it's value if the value is correct further calculations will be enabled and if the value is incorrect then formula followed by correct answer will be displayed after 3 attempts
 - Now, calculate the same for the other applied loads
 - Click on "Next Level" button
 
 ### Characterization :
 - Select any load for which you want to calculate the error and sensitivity
 - Calculate the error for the selected load (error = standard reading - actual reading)
 - Calculate the sensitivity (sensitivity = actual output / Input)
-- After submitting the correct value for sensitivity click on Result button for analysis 
+- After submitting the correct value for sensitivity, click on "Result" button for analysis 
diff --git a/experiment/simulation/index.html b/experiment/simulation/index.html
@@ -432,11 +432,11 @@ <h4 class="modal-title" style="font-weight: 600;"></h4>
 +'<strong>CALCULATIONS:</strong>'
 +'<ol>'
 +'<li>Enter a load between 1000 and 10000 N for the column-type load cell, and for the cantilever-type load cell, the load range is between 10 and 100 N</li>'
-+' <li>Calculate Axial Strain and enter its value. If the value is correct, further calculations will be enabled. If the value is incorrect, a formula followed by the correct answer will be displayed after 3 attempts</li>'
-+' <li>Calculate Transverse Strain and enter its value. If the value is correct, further calculations will be enabled. If the value is incorrect, a formula followed by the correct answer will be displayed after 3 attempts</li>'
++' <li>Calculate axial strain and enter its value. If the value is correct, further calculations will be enabled. If the value is incorrect, a formula followed by the correct answer will be displayed after 3 attempts</li>'
++' <li>Calculate transverse strain and enter its value. If the value is correct, further calculations will be enabled. If the value is incorrect, a formula followed by the correct answer will be displayed after 3 attempts</li>'
 +'   <li>Repeat the same process for different loads to calculate axial and transverse strain. Calculate the load for 5 readings and click on "Next Level"</li>'
 +'  <li>Select one of the loads to calculate output voltage and click on "Submit"</li>'
-+' <li>Select the supply voltage Eb and click "Submit." Note that this selection cannot be changed a second time</li>'
++' <li>Select the supply voltage Eb and click "Submit." Note that this selection cannot be changed for next readings</li>'
 +'    <li>Calculate the output voltage and enter its value. If the value is correct, further calculations will be enabled. If the value is incorrect, a formula followed by the correct answer will be displayed after 3 attempts</li>'
 +'   <li>Now, calculate the same for the other applied loads</li>'
 +'  <li>Click on "Next Level" button</li>'

diff --git a/experiment/simulation/src/calculation.js b/experiment/simulation/src/calculation.js
@@ -143,7 +143,7 @@ function columnType(){
 						$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Avoid Duplicates");
+			$("#MsgModal").html("Avoid duplicates");
 //					   alert("Avoid Duplicates");
 					  arrWeight.splice(index,1);
 					  $("#submit_load1").prop('disabled',false);
@@ -162,7 +162,7 @@ function columnType(){
 						$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Enter Integer Value");
+			$("#MsgModal").html("Enter integer value");
 			wrongLoadCnt++;
 //							alert("Enter Integer Value");
 						}
@@ -221,7 +221,7 @@ function columnType(){
 					 $(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Entered value is Incorrect.<br>Try again");
+			$("#MsgModal").html("Entered value is incorrect.<br>Try again");
 			wrongAxialCnt++;
 
 //				alert("Entered value is incorrect.Try it again.");
@@ -237,7 +237,7 @@ function columnType(){
 			$(".modal-header").html("Formula");
 			$(".modal-header").css("background","#23435c");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("<b> Axial Strain = P / A &times; E where,<br> P = Applied load, A = area and E = Young's Modulus");
+			$("#MsgModal").html("<b> Axial Strain = P / A &times; E where,<br> P = Applied load, A = Area and E = Young's Modulus");
 			wrongAxialCnt++;
 //				alert("formula :Axial Strain = P / AE");
 
@@ -264,7 +264,7 @@ function columnType(){
 					$("#btnModal").removeClass("btn-danger").addClass("btn-success");
 	        $(".modal-header").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Correct Answer is " + ax);
+			$("#MsgModal").html("Correct answer is " + ax);
 			wrongAxialCnt++;
 //					alert("correct answer is " + ax );
 
@@ -346,7 +346,7 @@ function columnType(){
 			$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Entered value is Incorrect.<br>Try again");	
+			$("#MsgModal").html("Entered value is incorrect.<br>Try again");	
 				wrongTransCnt++;	
 //				alert("Entered value is incorrect.Try it again.");
 //				 $("#modelMsg").html("<b class='boldTextRed'>Entered value is incorrect.Try again . </b>");
@@ -405,7 +405,7 @@ function columnType(){
 					$("#btnModal").removeClass("btn-danger").addClass("btn-success");
 	        $(".modal-header").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Correct Answer is " + transCal);
+			$("#MsgModal").html("Correct answer is " + transCal);
 			wrongTransCnt++;
 //					alert("correct answer is " + transCal );
 //					 $("#modelMsg").html("<b class='boldTextRed'>Correct answer is " + axialCal+"</b>");
@@ -597,7 +597,7 @@ function cantilever(){
 						$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Avoid Duplicates");
+			$("#MsgModal").html("Avoid duplicates");
 //					   alert("Avoid Duplicates");
 					  arrWeight.splice(index,1);
 					  $("#submit_load1").prop('disabled',false);
@@ -617,7 +617,7 @@ function cantilever(){
 						$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Enter Integer Value");
+			$("#MsgModal").html("Enter integer value");
 			wrongLoadCnt++;
 //							alert("Enter Integer Value");
 						}
@@ -646,7 +646,7 @@ $("#submit_load2").click(function(){
 		$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Enter the Value");
+			$("#MsgModal").html("Enter the value");
 	}else{
 	var numMul = 6*tx1*lengthVal;
 	var denoMul = 207000*widthVal*heightVal*heightVal;
@@ -665,7 +665,7 @@ $("#submit_load2").click(function(){
 		    $(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Entered value is Incorrect.<br>Try again");
+			$("#MsgModal").html("Entered value is incorrect.<br>Try again");
 			wrongAxialCnt++;
 	}
 	 }else if (id1 == 4){
@@ -687,7 +687,7 @@ $("#submit_load2").click(function(){
 			$("#btnModal").removeClass("btn-danger").addClass("btn-success");
 	        $(".modal-header").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Correct Answer is " + finalAns);
+			$("#MsgModal").html("Correct answer is " + finalAns);
 			wrongAxialCnt++;
 //			alert("Correct Answer is "+finalAns);
 		}
@@ -711,7 +711,7 @@ $("#submit_load3").click(function(){
 		$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Enter the Value");
+			$("#MsgModal").html("Enter the value");
 
 //		alert("Enter the Value");
 	}else{
@@ -740,7 +740,7 @@ $("#submit_load3").click(function(){
 		$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Entered value is Incorrect.<br>Try again");
+			$("#MsgModal").html("Entered value is incorrect.<br>Try again");
 			wrongTransCnt++;
 	}
 	 }else if (id2 == 4){
@@ -774,7 +774,7 @@ $("#submit_load3").click(function(){
 			$("#btnModal").removeClass("btn-danger").addClass("btn-success");
 	        $(".modal-header").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Correct Answer is " + compresVal);
+			$("#MsgModal").html("Correct answer is " + compresVal);
 			wrongTransCnt++;
 //			alert("Correct Answer is "+compresVal);
 		}

diff --git a/experiment/simulation/src/columnTypeConfig.js b/experiment/simulation/src/columnTypeConfig.js
@@ -78,7 +78,7 @@ var width = $(window).width();
 
 
 
-               var areaTxt = paper.text((x+150+(diameter/1.5)+100),(y+150)," Cross sectional Area  ")
+               var areaTxt = paper.text((x+150+(diameter/1.5)+100),(y+150)," Cross-sectional area")
                .attr({'font-weight': 'bold','font-size':'16px','stroke':'#f20515'});  
 
 

diff --git a/experiment/simulation/src/configLoadCell.js b/experiment/simulation/src/configLoadCell.js
@@ -86,7 +86,7 @@ function columnTypeConfig(){
 
        +'<div class="row">'
 	   +'<div class="col-sm-6">'
-	   +'<label class="labelstyle">Calculate cross Sectional area (sq mm): </label>'
+	   +'<label class="labelstyle">Calculate cross-sectional area (sq mm): </label>'
 	   +'</div>'
 		+'<div class="col-sm-3">'
 	+'<input type="text" id="areaSel" style= 10px;width:100%;"  class=" form-control" />'
@@ -236,13 +236,13 @@ function columnTypeConfig(){
 	     $("#btnModal").removeClass("btn-danger").addClass("btn-success");
 	        $(".modal-header").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Configured Successfully");
+			$("#MsgModal").html("Configured successfully");
 				} else if (areaSelect != areaVal) {
 					wrongAreaCnt++;
 					$(".modal-header").html("Error Message");
 			$(".modal-header").css("background","#9c1203b0");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("Entered value is Incorrect.<br>Try again");
+			$("#MsgModal").html("Entered value is incorrect.<br>Try again");
 //				alert("Entered value is incorrect.Try it again.");
 //				 $("#modelMsg").html("<b class='boldTextRed'>Entered value is incorrect.Try again . </b>");
 //				 $("body").css("padding","0px 0px 0px 0px");
@@ -257,7 +257,7 @@ function columnTypeConfig(){
 				 $(".modal-header").html("Formula");
 			$(".modal-header").css("background","#23435c");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
-			$("#MsgModal").html("<b>Formula : Area = &prod;&times; r <sup>2</sup> </b>");
+			$("#MsgModal").html("<b>Formula :<br/> Area = &prod;&times; r <sup>2</sup> </b>");
 			wrongAreaCnt++;
 //				 $("#modelMsg").html("<b class='boldTextBlue'>formula : Area = (radius &times; 10<sup>-3</sup>)<sup>2</sup> &times; &prod;</b> ");
 //				 $("body").css("padding","0px 0px 0px 0px");
@@ -285,7 +285,7 @@ function columnTypeConfig(){
 			$("#btnModal").removeClass("btn-danger").addClass("btn-success");
 	        $(".modal-header").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Configured Successfully");		
+			$("#MsgModal").html("Configured successfully");		
 ////					correct_cnt++;
 //		$("#errorPanel").prop("hidden",true);
 ////		$("#nextLevelForConfig").prop('hidden',false);
@@ -304,7 +304,7 @@ function columnTypeConfig(){
 					$("#btnModal").removeClass("btn-danger").addClass("btn-success");
 	        $(".modal-header").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Correct Answer is " + areaVal);
+			$("#MsgModal").html("Correct answer is " + areaVal);
 
 //					 $("#modelMsg").html("<b class='boldTextGreen'>Correct answer is " + areaVal+"</b>");
 //					 $("body").css("padding","0px 0px 0px 0px");
@@ -569,12 +569,12 @@ function cantileverConfig(){
 		if(lengthVal==0 || widthVal==0 || heightVal==0 || modSelcantiVal==0){
 	        $(".modal-title").html("Error Message");
 			$(".modal-header").css("background","#d9534f");
-			$("#MsgModal").html("Select Appropriate Values");
+			$("#MsgModal").html("Select appropriate values");
 			$("#btnModal").removeClass("btn-success").addClass("btn-danger");
         }else{
 	        $(".modal-title").html("Success Message");
             $(".modal-header").css("background","#5cb85c");
-			$("#MsgModal").html("Configured Successfully");
+			$("#MsgModal").html("Configured successfully");
 			$("#btnModal").removeClass("btn-danger").addClass("btn-success");
 
             $("#lengthSel").prop("disabled",true);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,7 +78,7 @@ var width = $(window).width();



		var areaTxt = paper.text((x+150+(diameter/1.5)+100),(y+150)," Cross sectional Area ")
		var areaTxt = paper.text((x+150+(diameter/1.5)+100),(y+150)," Cross-sectional area")
		.attr({'font-weight': 'bold','font-size':'16px','stroke':'#f20515'});


Expand Down