Skip to content

Commit 492e0e8

Browse files
SOLVE-NITKSOLVE-NITK
authored
Merge pull request #9 from virtual-labs/testing
Testing
2 parents 00f7145 + e89b6f2 commit 492e0e8

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

‎experiment/simulation/index.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<h4 class="incanvas">Objective:</h4>
5555
<p class="incanvas" style="font-size:14px;">To determine the pH value of given solutions using pH meter.</p><br/>
5656
<h4 class="incanvas">Apparatus used:</h4>
57-
<p class="incanvas" style="font-size:14px;">pH meter, Electrodes</p></br>
57+
<p class="incanvas" style="font-size:14px;">pH meter, Electrode, Temperature probe.</p></br>
5858

5959
&nbsp;<span class="tooltip" style="border-bottom:1px dotted ; color:red; position:absolute; top:140px; text-align:justify;"><strong>Description</strong>
6060
<span class="tooltiptext" style="font-size:14px;"><strong style="color:red;">pH</strong> is a term used to express the intensity of the acid or alkaline condition of a solution. It is a measure of the hydrogen ion activity in the solution.</span></span>
@@ -145,11 +145,11 @@ <h1 id="2-1" style="position:absolute; left:155px; top:250px; color:grey; displa
145145
<div class="simsubscreen" id="canvas3" style="visibility:hidden;">
146146
<strong class="incanvas">STEP</strong>
147147
<span class="circlebg">&nbsp;1&nbsp;</span>
148-
<p class="steptext">&nbsp;Clean the electrode with the distilled water and dry it using tissue paper.</p>
148+
<p class="steptext">&nbsp;Clean the electrode and temperature probe with the distilled water and dry it using tissue paper.</p>
149149
<!-- tissue -->
150150
<img id="3-7b" style="position:absolute; left:400.5px; top:174px; visibility:hidden;" src="images/t2.png" />
151151
<!-- Electrode -->
152-
<img id="3-1b" style="position:absolute; left:135px; top:155px; transform:rotate(-15deg);" title="Electrode" src="images/electrode.png" />
152+
<img id="3-1b" style="position:absolute; left:135px; top:155px; transform:rotate(-15deg);" title="Temperature probe" src="images/electrode.png" />
153153
<img id="3-1a" style="position:absolute; left:130px; top:160px; transform:rotate(-15deg);" title="Electrode" src="images/electrode.png" />
154154
<!-- tissue -->
155155
<img id="3-7a" style="position:absolute; left:400px; top:181px; visibility:hidden;" src="images/t1.png" />
@@ -163,7 +163,7 @@ <h1 id="2-1" style="position:absolute; left:155px; top:250px; color:grey; displa
163163
<div style="position:absolute; left:170px; top:350px; border:1px solid black; padding:3px; background-color:#ffffff; font-size:14px;">Waste</div>
164164

165165
<span id="note3-1" style="position:absolute; left:300px; top:250px; text-align:center; padding:10px; visibility:hidden; border:1px solid black; background-color:black; border-radius:5px;">
166-
<p style="color:white; font-size:15px;" >Dry the electrodes using tissue paper.</p>
166+
<p style="color:white; font-size:15px;" >Dry the electrode and temperature probe using tissue paper.</p>
167167
<input id="b3-1" type="button" style="float:right;" value="OK" />
168168
</span>
169169
</div>
@@ -172,10 +172,10 @@ <h1 id="2-1" style="position:absolute; left:155px; top:250px; color:grey; displa
172172
<div class="simsubscreen" id="canvas4" style="visibility:hidden;">
173173
<strong class="incanvas">STEP</strong>
174174
<span class="circlebg">&nbsp;2&nbsp;</span>
175-
<p class="steptext">&nbsp;Dip the combined electrode in the buffer solution of pH value 4.</p>
175+
<p class="steptext">&nbsp;Dip the electrode and temperature probe in the buffer solution of pH value 7.</p>
176176
<img style="position:absolute; left:106px; top:75px;" title="pHmeter" src="images/pHmeter.png" />
177177

178-
<img id="4-6b" style="position:absolute; left:160px; top:130px;" title="Electrode" src="images/electrode2.png" />
178+
<img id="4-6b" style="position:absolute; left:160px; top:130px;" title="Temperature probe " src="images/electrode2.png" />
179179
<img style="position:absolute; left:310px; top:322px;" title="pHmeter" src="images/p2.png" />
180180
<img id="4-6a" style="position:absolute; left:130px; top:130px;" title="Electrode" src="images/electrode2.png" />
181181
<img style="position:absolute; left:310px; top:335.5px;" title="pHmeter" src="images/p3.png" />
@@ -187,19 +187,19 @@ <h1 id="2-1" style="position:absolute; left:155px; top:250px; color:grey; displa
187187
<!-- beaker and buffer solution -->
188188
<div id="4-1" style="position:absolute; left:470px; top:390px; border-top:2px solid gray; background-color:transparent; width:63px; height:25px;"></div>
189189
<img id="4-2" style="position:absolute; left:466px; top:380px; cursor:pointer;" title="beaker" src="images/beaker.png" />
190-
<div id="4-3" style="position:absolute; left:475.49px; top:405px; border:1px solid black; text-align:center; background-color:#ffffff; font-size:8.5px; cursor:pointer;">Buffer </br>solution of </br>pH 4</div>
190+
<div id="4-3" style="position:absolute; left:475.49px; top:405px; border:1px solid black; text-align:center; background-color:#ffffff; font-size:8.5px; cursor:pointer;">Buffer </br>solution of </br>pH 7</div>
191191
<img id="4-4" style="position:absolute; left:506px; top:385px; visibility:hidden;" src="images/hand.png" />
192192
</div>
193193

194194
<!-- canvas 5 -->
195195
<div class="simsubscreen" id="canvas5" style="visibility:hidden;">
196196
<strong class="incanvas">STEP</strong>
197197
<span class="circlebg">&nbsp;3&nbsp;</span>
198-
<p class="steptext">&nbsp;Clean the electrode with the distilled water and dry it using tissue paper.</p>
198+
<p class="steptext">&nbsp;Clean the electrode and temperature probe with the distilled water and dry it using tissue paper.</p>
199199
<!-- tissue -->
200200
<img id="5-7b" style="position:absolute; left:400.5px; top:174px; visibility:hidden;" src="images/t2.png" />
201201
<!-- Electrode -->
202-
<img id="5-1b" style="position:absolute; left:135px; top:155px; transform:rotate(-15deg);" title="Electrode" src="images/electrode.png" />
202+
<img id="5-1b" style="position:absolute; left:135px; top:155px; transform:rotate(-15deg);" title="Tmperature probe " src="images/electrode.png" />
203203
<img id="5-1a" style="position:absolute; left:130px; top:160px; transform:rotate(-15deg);" title="Electrode" src="images/electrode.png" />
204204
<!-- tissue -->
205205
<img id="5-7a" style="position:absolute; left:400px; top:181px; visibility:hidden;" src="images/t1.png" />
@@ -213,7 +213,7 @@ <h1 id="2-1" style="position:absolute; left:155px; top:250px; color:grey; displa
213213
<div style="position:absolute; left:170px; top:350px; border:1px solid black; padding:3px; background-color:#ffffff; font-size:14px;">Waste</div>
214214

215215
<span id="note5-1" style="position:absolute; left:300px; top:250px; text-align:center; padding:10px; visibility:hidden; border:1px solid black; background-color:black; border-radius:5px;">
216-
<p style="color:white; font-size:15px;" >Dry the electrodes using tissue paper.</p>
216+
<p style="color:white; font-size:15px;" >Dry the electrode and temperature probe using tissue paper.</p>
217217
<input id="b5-1" type="button" style="float:right;" value="OK" />
218218
</span>
219219
</div>
@@ -222,10 +222,10 @@ <h1 id="2-1" style="position:absolute; left:155px; top:250px; color:grey; displa
222222
<div class="simsubscreen" id="canvas6" style="visibility:hidden;">
223223
<strong class="incanvas">STEP</strong>
224224
<span class="circlebg">&nbsp;4&nbsp;</span>
225-
<p class="steptext">&nbsp;Dip the combined electrode in the buffer solution of pH value 9.2.</p>
225+
<p class="steptext">&nbsp;Dip the electrode and temperature probe in the buffer solution of pH value 4.</p>
226226
<img style="position:absolute; left:106px; top:75px;" title="pHmeter" src="images/pHmeter.png" />
227227

228-
<img id="6-6b" style="position:absolute; left:160px; top:130px;" title="Electrode" src="images/electrode2.png" />
228+
<img id="6-6b" style="position:absolute; left:160px; top:130px;" title="Temperature probe" src="images/electrode2.png" />
229229
<img style="position:absolute; left:310px; top:322px;" title="pHmeter" src="images/p2.png" />
230230
<img id="6-6a" style="position:absolute; left:130px; top:130px;" title="Electrode" src="images/electrode2.png" />
231231
<img style="position:absolute; left:310px; top:335.5px;" title="pHmeter" src="images/p3.png" />
@@ -237,7 +237,7 @@ <h1 id="2-1" style="position:absolute; left:155px; top:250px; color:grey; displa
237237
<!-- beaker and buffer solution -->
238238
<div id="6-1" style="position:absolute; left:470px; top:390px; border-top:2px solid gray; background-color:transparent; width:63px; height:25px;"></div>
239239
<img id="6-2" style="position:absolute; left:466px; top:380px; cursor:pointer;" title="beaker" src="images/beaker.png" />
240-
<div id="6-3" style="position:absolute; left:475.49px; top:405px; border:1px solid black; text-align:center; background-color:#ffffff; font-size:8.5px; cursor:pointer;">Buffer </br>solution of </br>pH 9.2</div>
240+
<div id="6-3" style="position:absolute; left:475.49px; top:405px; border:1px solid black; text-align:center; background-color:#ffffff; font-size:8.5px; cursor:pointer;">Buffer </br>solution of </br>pH 4</div>
241241
<img id="6-4" style="position:absolute; left:506px; top:385px; visibility:hidden;" src="images/hand.png" />
242242
</div>
243243

@@ -249,11 +249,11 @@ <h1 id="7-1" style="position:absolute; left:100px; top:250px; color:grey; displa
249249
<div class="simsubscreen" id="canvas8" style="visibility:hidden;">
250250
<strong class="incanvas">STEP</strong>
251251
<span class="circlebg">&nbsp;5&nbsp;</span>
252-
<p class="steptext">&nbsp;Clean the electrode with the distilled water and dry it using tissue paper.</p>
252+
<p class="steptext">&nbsp;Clean the electrode and temperature probe with the distilled water and dry it using tissue paper.</p>
253253
<!-- tissue -->
254254
<img id="7-7b" style="position:absolute; left:400.5px; top:174px; visibility:hidden;" src="images/t2.png" />
255255
<!-- Electrode -->
256-
<img id="7-1b" style="position:absolute; left:135px; top:155px; transform:rotate(-15deg);" title="Electrode" src="images/electrode.png" />
256+
<img id="7-1b" style="position:absolute; left:135px; top:155px; transform:rotate(-15deg);" title="Temperature probe" src="images/electrode.png" />
257257
<img id="7-1a" style="position:absolute; left:130px; top:160px; transform:rotate(-15deg);" title="Electrode" src="images/electrode.png" />
258258
<!-- tissue -->
259259
<img id="7-7a" style="position:absolute; left:400px; top:181px; visibility:hidden;" src="images/t1.png" />
@@ -267,7 +267,7 @@ <h1 id="7-1" style="position:absolute; left:100px; top:250px; color:grey; displa
267267
<div style="position:absolute; left:170px; top:350px; border:1px solid black; padding:3px; background-color:#ffffff; font-size:14px;">Waste</div>
268268

269269
<span id="note7-1" style="position:absolute; left:300px; top:250px; text-align:center; padding:10px; visibility:hidden; border:1px solid black; background-color:black; border-radius:5px;">
270-
<p style="color:white; font-size:15px;" >Dry the electrodes using tissue paper.</p>
270+
<p style="color:white; font-size:15px;" >Dry the electrode and temperature probe using tissue paper.</p>
271271
<input id="b7-1" type="button" style="float:right;" value="OK" />
272272
</span>
273273
</div>
@@ -276,10 +276,10 @@ <h1 id="7-1" style="position:absolute; left:100px; top:250px; color:grey; displa
276276
<div class="simsubscreen" id="canvas9" style="visibility:hidden;">
277277
<strong class="incanvas">STEP</strong>
278278
<span class="circlebg">&nbsp;6&nbsp;</span>
279-
<p class="steptext">&nbsp;Dip the combined electrode in the solution to determine its pH value.</p>
279+
<p class="steptext">&nbsp;Dip the electrode and temperature probe in the solution to determine its pH value.</p>
280280
<img style="position:absolute; left:106px; top:75px;" title="pHmeter" src="images/pHmeter.png" />
281281

282-
<img id="8-6b" style="position:absolute; left:160px; top:130px;" title="Electrode" src="images/electrode2.png" />
282+
<img id="8-6b" style="position:absolute; left:160px; top:130px;" title="Temperature probe" src="images/electrode2.png" />
283283
<img style="position:absolute; left:310px; top:322px;" title="pHmeter" src="images/p2.png" />
284284
<img id="8-6a" style="position:absolute; left:130px; top:130px;" title="Electrode" src="images/electrode2.png" />
285285
<img style="position:absolute; left:310px; top:335.5px;" title="pHmeter" src="images/p3.png" />

‎experiment/simulation/js/ph.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ function calibrate()
475475
$("#"+can+"-6b").animate({"position":"absolute","top":"243px"},700,
476476
function()
477477
{
478-
document.getElementById("p"+can+"-7").innerHTML="4.00";
478+
document.getElementById("p"+can+"-7").innerHTML="7.00";
479479
//document.getElementById("nextButton").style.visibility="visible";
480480
validateAnswer(0,0,"440px","200px");
481481
});
@@ -558,7 +558,7 @@ function calibrate2()
558558
{
559559
if(can==6)
560560
{
561-
document.getElementById("p"+can+"-7").innerHTML="9.2";
561+
document.getElementById("p"+can+"-7").innerHTML="4.00";
562562
document.getElementById("nextButton").style.visibility="visible";
563563
}
564564
if(can==8)
@@ -572,18 +572,19 @@ function calibrate2()
572572
}
573573
if(can==8)
574574
{
575-
if(val==1)
576-
{
577-
validateAnswer(4,3,"450px","300px");
578-
}
579-
if(val==3)
580-
{
581-
validateAnswer(6,3,"450px","300px");
582-
}
583-
if(val==2 || val==4)
584-
{
585-
document.getElementById("nextButton").style.visibility="visible";
586-
}
575+
document.getElementById("nextButton").style.visibility="visible";
576+
// if(val==1)
577+
// {
578+
// validateAnswer(4,3,"450px","300px");
579+
// }
580+
// if(val==3)
581+
// {
582+
// validateAnswer(6,3,"450px","300px");
583+
// }
584+
// if(val==2 || val==4)
585+
// {
586+
// document.getElementById("nextButton").style.visibility="visible";
587+
// }
587588
}
588589
}
589590
});

0 commit comments

Comments
 (0)