Index: schedule/function/SplitDelete.php
===================================================================
--- schedule/function/SplitDelete.php	(revision 16873)
+++ schedule/function/SplitDelete.php	(revision 16894)
@@ -33,8 +33,16 @@
 					cnt++;
 				
+<<<<<<< .mine
+$('#save').hide();
+	$('#update').show();
+
+	var div= document.createElement("div");
+		div.setAttribute('id','TableHolder');
+=======
 	$('#save').hide();
 	$('#update').show();
 	var div= document.createElement("div");
 		div.setAttribute('id','TableHolder');
+>>>>>>> .r16893
  	var table = document.createElement("table");
 		table.setAttribute('id',"table"+cnt);
@@ -62,5 +70,10 @@
 			
 			
+<<<<<<< .mine
+			
 			if($('#Time').val() != ""){  var splitting = $('#Time').val().split(':'); var add = 01;   
+=======
+			if($('#Time').val() != ""){  var splitting = $('#Time').val().split(':'); var add = 01;   
+>>>>>>> .r16893
 
 			timeValue = pad((Number(splitting[0]) + Number(add)),2)+':'+splitting[1]; 
@@ -96,8 +109,15 @@
 				getTableId =get;
 
+<<<<<<< .mine
+
+			name="name"; value=""; meas = "name"; meas2 = "time";   //getTableId = $(this).attr('name'); 
+			split1();    }else{   alert("please enter value for time to add measurement");   }
+
+=======
 
 			name="name"; value=""; meas = "name"; meas2 = "time";  // getTableId = $(this).attr('name'); 
 			split1();    }else{   alert("please enter value for time to add measurement");   }
 
+>>>>>>> .r16893
 				
 			}
@@ -178,4 +198,6 @@
 		td4.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px; text-align:center;");
 		td4.appendChild(
+<<<<<<< .mine
+=======
 			button = document.createElement('input'),
 			button.setAttribute("type",'button'),
@@ -223,4 +245,5 @@
 		);
 		td4.appendChild(
+>>>>>>> .r16893
 			button=document.createElement('input'),
 			button.setAttribute('type','button'),
@@ -276,4 +299,11 @@
 			button.setAttribute('name','#table2'),
 			button.onclick=function(){
+<<<<<<< .mine
+var aa;
+			$('div#TableHolder #table2 #Time').each(function(){
+					aa = $(this).val();
+					});
+			if(aa != ""){ var splitting =aa.split(':'); var add = 01;   
+=======
 			var aa;
 			$('div#TableHolder #table2 #Time').each(function(){
@@ -281,4 +311,5 @@
 					});
 			if(aa != ""){ var splitting =aa.split(':'); var add = 01;   
+>>>>>>> .r16893
 
 			timeValue = pad((Number(splitting[0]) + Number(add)),2)+':'+splitting[1]; 
@@ -386,5 +417,8 @@
 	var td4=document.createElement('td');
 		td4.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px; text-align:center;");
+		
 		td4.appendChild(
+<<<<<<< .mine
+=======
 			button = document.createElement('input'),
 			button.setAttribute("type",'button'),
@@ -426,4 +460,5 @@
 		);
 		td4.appendChild(
+>>>>>>> .r16893
 			button=document.createElement('input'),
 			button.setAttribute('type','button'),
@@ -443,9 +478,17 @@
 		tr.appendChild(td4);
 		table.appendChild(tr);
+<<<<<<< .mine
 		div.appendChild(table);
 		$('#TableH1').append(div);
-		
+
 	var div= document.createElement("div");
 		div.setAttribute('id','TableHolder');	
+=======
+		div.appendChild(table);
+		$('#TableH1').append(div);
+		
+	var div= document.createElement("div");
+		div.setAttribute('id','TableHolder');	
+>>>>>>> .r16893
 	var table = document.createElement("table");
 		table.setAttribute('id',"table1");
@@ -471,4 +514,11 @@
 			button.setAttribute('name','#table1'),
 			button.onclick=function(){
+<<<<<<< .mine
+			var aa;
+			$('div#TableHolder #table2 #Time').each(function(){
+					aa = $(this).val();
+					});
+			if(aa !='') { var splitting  =aa.split(':'); var add = 01;   
+=======
 			var aa;
 			$('div#TableHolder #table1 #Time').each(function(){
@@ -477,4 +527,5 @@
 			
 			if(aa != ""){ var splitting = aa.split(':'); var add = 01;   
+>>>>>>> .r16893
 
 			timeValue = pad((Number(splitting[0]) + Number(add)),2)+':'+splitting[1]; 
@@ -489,4 +540,27 @@
 						return str;
 
+<<<<<<< .mine
+						}; 
+						
+						
+						var s = 0; var	get;
+						
+$("table").each(function() {
+				if($(this).attr("name")=='#table2'){
+				get = "#"+$(this).attr("id"); 
+				
+						s =1;
+				}else{
+				if(s==0){
+				get = '#table'+cnt;
+				}
+				}
+    });
+getTableId =get;
+name="name"; value="";
+						
+name="name"; value="";  meas = "class"; meas2 = "time";  //getTableId = $(this).attr('name'); 
+split2();    }else{   alert("please enter value for time to add measurement");   }
+=======
 						}; 
 						
@@ -506,4 +580,5 @@
     });
 getTableId =get;
+>>>>>>> .r16893
 
 						
@@ -565,4 +640,11 @@
 			button.setAttribute('name','#table1'),
 			button.onclick=function(){
+<<<<<<< .mine
+			$('div#TableHolder #table1 #Time').each(function(){
+					aa = $(this).val();
+					});
+			
+			if(aa != ""){ timeValue = aa; name="name"; value="#table1"; meas = "hidden"; meas2 = true;  getTableId = $(this).attr('name'); split2();    }else{   alert("please enter value for time to add measurement");   }
+=======
 			var aa;
 			$('div#TableHolder #table1 #Time').each(function(){
@@ -571,4 +653,5 @@
 			
 			if(aa != ""){ timeValue = aa; name="name"; value="#table1"; meas = "hidden"; meas2 = true;  getTableId = $(this).attr('name'); split2();    }else{   alert("please enter value for time to add measurement");   }
+>>>>>>> .r16893
 
 				
@@ -585,5 +668,8 @@
 	var td4=document.createElement('td');
 		td4.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px; text-align:center;");
+		
 		td4.appendChild(
+<<<<<<< .mine
+=======
 			button = document.createElement('input'),
 			button.setAttribute("type",'button'),
@@ -632,4 +718,5 @@
 		);
 		td4.appendChild(
+>>>>>>> .r16893
 			button=document.createElement('input'),
 			button.setAttribute('type','button'),
@@ -655,8 +742,15 @@
 	}
 	var meas;
+<<<<<<< .mine
+	var timeValue;
+	var pad;
+	if(cnt==0){ cnt=2; }	
+	function split2()
+=======
 	var timeValue;
 	var pad;
 	if(cnt==0){  cnt=2; }	
 	function split2()
+>>>>>>> .r16893
 	{
 	
@@ -703,4 +797,5 @@
 			if(aa != ""){var splitting = aa.split(':'); var add = 01;   
 
+			
 			timeValue = pad((Number(splitting[0]) + Number(add)),2)+':'+splitting[1]; 
 
@@ -716,4 +811,5 @@
 						}  
 
+<<<<<<< .mine
 					var s = 0; var	get;
 						var nn;
@@ -733,6 +829,27 @@
 
 name="name"; value=$(this).attr('name');
+meas = "class"; meas2 = "time";  getTableId = get;   split1();    }else{   alert("please enter value for time to add measurement");   }
+
+=======
+					var s = 0; var	get;
+						var nn;
+						nn = $(this).attr('name');
+				$("table").each(function() {
+				if($(this).attr("name")==nn){
+					
+					get = "#"+$(this).attr("id"); 
+					//get = $(this).attr("name");
+						s =1;
+				}else{
+				if(s==0){
+				get = '#table'+cnt;
+				}
+				}
+				});
+
+name="name"; value=$(this).attr('name');
 						meas = "class"; meas2 = "time";  getTableId = get;   split1();    }else{   alert("please enter value for time to add measurement");   }
 
+>>>>>>> .r16893
 				
 			}
@@ -762,4 +879,11 @@
 						
 			);
+<<<<<<< .mine
+var td1=document.createElement('td');
+td1.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px;text-align:center;");
+td1.appendChild(
+measurementcbo= document.createElement('select'),
+measurementcbo.setAttribute('id','measurement'),
+=======
 		var td1=document.createElement('td');
 			td1.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px;text-align:center;");
@@ -767,4 +891,5 @@
 				measurementcbo= document.createElement('select'),
 					measurementcbo.setAttribute('id','measurement'),
+>>>>>>> .r16893
 <?php
 			$measure=mysql_query("SELECT*FROM measurement");
@@ -772,9 +897,9 @@
 			{
 ?>
-				measurementcbo.appendChild(
-					option=document.createElement('option'),
-							option.setAttribute('value','<?php echo $rowmeasure['fMeasurementKey']; ?>'),
-							option.setAttribute('selected',true),
-							option.appendChild(document.createTextNode("<?php echo $rowmeasure['fMeasurement']; ?>"))
+measurementcbo.appendChild(
+option=document.createElement('option'),
+option.setAttribute('value','<?php echo $rowmeasure['fMeasurementKey']; ?>'),
+option.setAttribute('selected',true),
+option.appendChild(document.createTextNode("<?php echo $rowmeasure['fMeasurement']; ?>"))
 				),
 <?php
@@ -823,5 +948,8 @@
 		var td4=document.createElement('td');
 			td4.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px; text-align:center;");
+		
 			td4.appendChild(
+<<<<<<< .mine
+=======
 				button = document.createElement('input'),
 				button.setAttribute("type",'button'),
@@ -866,4 +994,5 @@
 			);
 			td4.appendChild(
+>>>>>>> .r16893
 				button=document.createElement('input'),
 				button.setAttribute('type','button'),
@@ -1017,4 +1146,9 @@
 			button.setAttribute('name','#table'+cnt),
 			button.onclick=function(){
+<<<<<<< .mine
+		
+			if($('#Time').val() != ""){ timeValue = $('#Time').val(); 				
+			name = "name"; value = $(this).attr('name');  meas = "hidden"; meas2 = true; getTableId = $(this).attr('name');   split1();    }else{   alert("please enter value for time to add measurement");   }
+=======
 		var aa;
 			$('div#TableHolder #table'+cnt+' #Time').each(function(){
@@ -1023,4 +1157,5 @@
 			if(aa != ""){ timeValue = aa; 				
 			name = "name"; value = $(this).attr('name');  meas = "hidden"; meas2 = true; getTableId = $(this).attr('name');   split1();    }else{   alert("please enter value for time to add measurement");   }
+>>>>>>> .r16893
 
 				
@@ -1038,5 +1173,8 @@
 		var td4=document.createElement('td');
 			td4.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px; text-align:center;");
+			
 			td4.appendChild(
+<<<<<<< .mine
+=======
 				button = document.createElement('input'),
 				button.setAttribute("type",'button'),
@@ -1077,4 +1215,5 @@
 			);
 			td4.appendChild(
+>>>>>>> .r16893
 				button=document.createElement('input'),
 				button.setAttribute('type','button'),