diff --git a/application/views/newnissaninprocessreport.php b/application/views/newnissaninprocessreport.php
index 3178d768..f16c033e 100755
--- a/application/views/newnissaninprocessreport.php
+++ b/application/views/newnissaninprocessreport.php
@@ -205,7 +205,7 @@ th{
 							</tr>
 							</thead>
 							<tbody id="afsAppend">
-							<tr id="1"> <td>1</td> <td id="1factor">5</td> <td id="1ss">10</td> <td id="1spec"  rowspan="6" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
+							<tr id="1"> <td>1</td> <td id="1factor">5</td> <td id="1ss">10</td> <td id="1spec"  rowspan="6" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0-20</td>
 							<!-- raw test sand -->
 							<td id="1rst1" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="1rst2" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -305,7 +305,7 @@ th{
 							<td style="background-color:#f5e0a5" id="cst1total1">0.00</td><td style="background-color:#f5e0a5" id="cst2total1">0.00</td><td style="background-color:#f5e0a5" id="cst3total1">0.00</td><td style="background-color:#f5e0a5" id="cst4total1">0.00</td>
 							<td style="background-color:#f5e0a5" id="cst5total1">0.00</td><td style="background-color:#f5e0a5" id="cst6total1">0.00</td><td style="background-color:#f5e0a5" id="cst7total1">0.00</td><td style="background-color:#f5e0a5" id="cst8total1">0.00</td>
 							</tr>
-							<tr id="7"> <td>7</td> <td id="7factor">70</td> <td id="7ss"  >100</td> <td style="text-align:center;"id="2spec"  rowspan="2" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
+							<tr id="7"> <td>7</td> <td id="7factor">70</td> <td id="7ss"  >100</td> <td style="text-align:center;"id="2spec"  rowspan="2" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0-75</td>
 							<!-- raw test sand -->
 							<td id="7rst1" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="7rst2" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -343,7 +343,7 @@ th{
 							<td style="background-color:#f5e0a5" id="cst5total2">0.00</td><td style="background-color:#f5e0a5" id="cst6total2">0.00</td><td style="background-color:#f5e0a5" id="cst7total2">0.00</td><td style="background-color:#f5e0a5" id="cst8total2">0.00</td>
 							</tr>
 							
-							<tr id="9"> <td>9</td> <td id="9factor">140</td> <td id="9ss" >200</td> <td id="3spec" rowspan="2" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
+							<tr id="9"> <td>9</td> <td id="9factor">140</td> <td id="9ss" >200</td> <td id="3spec" rowspan="2" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0-20</td>
 							<!-- raw test sand -->
 							<td id="9rst1" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="9rst2" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -380,7 +380,7 @@ th{
 							<td style="background-color:#f5e0a5" id="cst5total3">0.00</td><td style="background-color:#f5e0a5" id="cst6total3">0.00</td><td style="background-color:#f5e0a5" id="cst7total3">0.00</td><td style="background-color:#f5e0a5" id="cst8total3">0.00</td>
 							</tr>
 							
-							<tr id="11"> <td>11</td> <td id="11factor">300</td> <td id="11ss" >pan</td> <td id="4spec" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
+							<tr id="11"> <td>11</td> <td id="11factor">300</td> <td id="11ss" >pan</td> <td id="4spec" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0-2.5</td>
 							<!-- raw test sand -->
 							<td id="11rst1" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="11rst2" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype7(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -411,7 +411,7 @@ th{
 							</tr>
 							</thead>
 							<tbody id="afsAppendtype5">
-							<tr id="1"> <td>1</td> <td id="1factor">5</td> <td id="1ss">10</td> <td id="spec1"  rowspan="3" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
+							<tr id="1"> <td>1</td> <td id="1factor">5</td> <td id="1ss">10</td> <td id="spec1"  rowspan="3" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0-15</td>
 							<!-- raw test sand -->
 							<td id="1rst51" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="1rst52" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -462,7 +462,7 @@ th{
 							<td style="background-color:#f5e0a5" id="cst51total1">0.00</td><td style="background-color:#f5e0a5" id="cst52total1">0.00</td><td style="background-color:#f5e0a5" id="cst53total1">0.00</td><td style="background-color:#f5e0a5" id="cst54total1">0.00</td>
 							<td style="background-color:#f5e0a5" id="cst55total1">0.00</td><td style="background-color:#f5e0a5" id="cst56total1">0.00</td><td style="background-color:#f5e0a5" id="cst57total1">0.00</td><td style="background-color:#f5e0a5" id="cst58total1">0.00</td>
 							</tr>
-							<tr id="4"> <td>4</td> <td id="4factor">30</td> <td id="4ss" >40</td><td id="spec2"  rowspan="5" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td> 
+							<tr id="4"> <td>4</td> <td id="4factor">30</td> <td id="4ss" >40</td><td id="spec2"  rowspan="5" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0-70</td> 
 							<!-- raw test sand -->
 							<td id="4rst51" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="4rst52" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -549,7 +549,7 @@ th{
 							<td style="background-color:#f5e0a5" id="cst55total2">0.00</td><td style="background-color:#f5e0a5" id="cst56total2">0.00</td><td style="background-color:#f5e0a5" id="cst57total2">0.00</td><td style="background-color:#f5e0a5" id="cst58total2">0.00</td>
 							</tr>
 							
-							<tr id="9"> <td>9</td> <td id="9factor">140</td> <td id="9ss" >200</td> <td id="spec3" rowspan="2" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
+							<tr id="9"> <td>9</td> <td id="9factor">140</td> <td id="9ss" >200</td> <td id="spec3" rowspan="2" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0-2.0</td>
 							<!-- raw test sand -->
 							<td id="9rst51" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="9rst52" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -586,7 +586,7 @@ th{
 							<td style="background-color:#f5e0a5" id="cst55total3">0.00</td><td style="background-color:#f5e0a5" id="cst56total3">0.00</td><td style="background-color:#f5e0a5" id="cst57total3">0.00</td><td style="background-color:#f5e0a5" id="cst58total3">0.00</td>
 							</tr>
 							
-							<tr id="11"> <td>11</td> <td id="11factor">300</td> <td id="11ss" >pan</td> <td id="spec4" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
+							<tr id="11"> <td>11</td> <td id="11factor">300</td> <td id="11ss" >pan</td> <td id="spec4" class="edit" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0-0.5</td>
 							<!-- raw test sand -->
 							<td id="11rst51" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
 							<td id="11rst52" class="editrst" contenteditable="true" onkeypress="return keyValidate(event)" onkeyup="calculateAFStype5(this.parentNode.id,this.id,this.textContent)">0.00</td>
@@ -1841,7 +1841,12 @@ function calculateMaster1(id,pid)
 				//console.log(finalafsvalue);
 				
 				var findafs = tempcid.split('5');
+				
 				var afsid = 'afs'+findafs[0]+findafs[1];
+			    if(findafs[1] == '')
+				{
+					afsid = 'afs'+findafs[0]+'5';
+				}
 				
 				if(document.getElementById(afsid))
 				{