Index: schedule/function/SplitDelete.php
===================================================================
--- schedule/function/SplitDelete.php	(revision 16894)
+++ schedule/function/SplitDelete.php	(revision 16895)
@@ -27,5 +27,5 @@
 					$timestamp2 = date('Y-m-d',$timestamp);
 					$date_time = date('H:i',$timestamp);
-					//$time_new = $date_time->format('H:i:s')
+					
 					if($days == $timestamp2)
 					{
@@ -33,5 +33,4 @@
 					cnt++;
 				
-<<<<<<< .mine
 $('#save').hide();
 	$('#update').show();
@@ -39,10 +38,4 @@
 	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);
@@ -70,10 +63,6 @@
 			
 			
-<<<<<<< .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]; 
@@ -109,15 +98,8 @@
 				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
 				
 			}
@@ -198,52 +180,4 @@
 		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'),
-			button.setAttribute('id','btnSplit'),
-			button.setAttribute('value','Split'),
-			button.setAttribute('name','#table'+cnt),
-			button.onclick= function()
-			{
-
-			if($('#Time').val() != ""){  var splitting = $('#Time').val().split(':'); var add = 30;   
-
-						
-		var limit = 60;
-				var adds =0;
-				adds =  (Number(splitting[1]) + Number(add));
-				 if(adds >= limit){
-				 adds = Number(adds) - Number(limit);
-				 timeValue =pad(Number(splitting[0])+1,2)+':'+ pad(adds,2);
-				 
-				 }else{
-				 
-			timeValue =pad(splitting[0],2)+':'+ pad((Number(splitting[1]) + Number(add)),2); 
-					}
-						function pad(number, length) {
-				   
-							var str = '' + number;
-							while (str.length < length) {
-								str = '0' + str;
-							}
-				   
-						return str;
-
-						};
-						
-						
-			 name="name"; value=""; 
-			 meas = "name"; meas2 = "time";  
-			 getTableId = $(this).attr('name'); 
-			 split1(); 
-			 }else{ alert("please enter value for time to add measurement"); }
-
-				 
-				
-			}
-		);
-		td4.appendChild(
->>>>>>> .r16893
 			button=document.createElement('input'),
 			button.setAttribute('type','button'),
@@ -299,5 +233,4 @@
 			button.setAttribute('name','#table2'),
 			button.onclick=function(){
-<<<<<<< .mine
 var aa;
 			$('div#TableHolder #table2 #Time').each(function(){
@@ -305,11 +238,4 @@
 					});
 			if(aa != ""){ var splitting =aa.split(':'); var add = 01;   
-=======
-			var aa;
-			$('div#TableHolder #table2 #Time').each(function(){
-					aa = $(this).val();
-					});
-			if(aa != ""){ var splitting =aa.split(':'); var add = 01;   
->>>>>>> .r16893
 
 			timeValue = pad((Number(splitting[0]) + Number(add)),2)+':'+splitting[1]; 
@@ -419,46 +345,4 @@
 		
 		td4.appendChild(
-<<<<<<< .mine
-=======
-			button = document.createElement('input'),
-			button.setAttribute("type",'button'),
-			button.setAttribute('id','btnSplit'),
-			button.setAttribute('value','Split'),
-			button.setAttribute('name','#table2'),
-			button.onclick= function()
-			{
-			var aa;
-			$('div#TableHolder #table2 #Time').each(function(){
-					aa = $(this).val();
-					});
-				 if(aa != ""){  var splitting = aa.split(':'); var add = 30; var limit = 60;
-				var adds =0;
-				adds =  (Number(splitting[1]) + Number(add));
-				 if(adds >= limit){
-				 adds = Number(adds) - Number(limit);
-				 timeValue =pad(Number(splitting[0])+1,2)+':'+ pad(adds,2);
-				 
-				 }else{
-				 
-			timeValue =pad(splitting[0],2)+':'+ pad((Number(splitting[1]) + Number(add)),2); 
-					}
-						function pad(number, length) {
-				   
-							var str = '' + number;
-							while (str.length < length) {
-								str = '0' + str;
-							}
-				   
-						return str;
-
-						}
-			
-			 meas = "name"; meas2 = "time"; getTableId = $(this).attr('name');  
-			 split2();    }else{   alert("please enter value for time to add measurement");   }
-				 
-			}
-		);
-		td4.appendChild(
->>>>>>> .r16893
 			button=document.createElement('input'),
 			button.setAttribute('type','button'),
@@ -478,5 +362,4 @@
 		tr.appendChild(td4);
 		table.appendChild(tr);
-<<<<<<< .mine
 		div.appendChild(table);
 		$('#TableH1').append(div);
@@ -484,11 +367,4 @@
 	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");
@@ -514,5 +390,4 @@
 			button.setAttribute('name','#table1'),
 			button.onclick=function(){
-<<<<<<< .mine
 			var aa;
 			$('div#TableHolder #table2 #Time').each(function(){
@@ -520,12 +395,4 @@
 					});
 			if(aa !='') { var splitting  =aa.split(':'); var add = 01;   
-=======
-			var aa;
-			$('div#TableHolder #table1 #Time').each(function(){
-					aa = $(this).val();
-					});
-			
-			if(aa != ""){ var splitting = aa.split(':'); var add = 01;   
->>>>>>> .r16893
 
 			timeValue = pad((Number(splitting[0]) + Number(add)),2)+':'+splitting[1]; 
@@ -540,5 +407,4 @@
 						return str;
 
-<<<<<<< .mine
 						}; 
 						
@@ -562,27 +428,4 @@
 name="name"; value="";  meas = "class"; meas2 = "time";  //getTableId = $(this).attr('name'); 
 split2();    }else{   alert("please enter value for time to add measurement");   }
-=======
-						}; 
-						
-						
-						var s = 0; var	get;
-						
-$("table").each(function() {
-				if($(this).attr("name")=='#table1'){
-				get = "#"+$(this).attr("id"); 
-				
-						s =1;
-				}else{
-				if(s==0){
-				get =  '#table'+cnt;
-				}
-				}
-    });
-getTableId =get;
->>>>>>> .r16893
-
-						
-						name="name"; value="";  meas = "class"; meas2 = "time";  //getTableId = $(this).attr('name'); 
-						split2();    }else{   alert("please enter value for time to add measurement");   }
 
 				
@@ -640,5 +483,4 @@
 			button.setAttribute('name','#table1'),
 			button.onclick=function(){
-<<<<<<< .mine
 			$('div#TableHolder #table1 #Time').each(function(){
 					aa = $(this).val();
@@ -646,12 +488,4 @@
 			
 			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(){
-					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");   }
->>>>>>> .r16893
 
 				
@@ -670,53 +504,4 @@
 		
 		td4.appendChild(
-<<<<<<< .mine
-=======
-			button = document.createElement('input'),
-			button.setAttribute("type",'button'),
-			button.setAttribute('id','btnSplit'),
-			button.setAttribute('value','Split'),
-			button.setAttribute('name','#table1'),
-			button.onclick= function()
-			{
-			var aa;
-			$('div#TableHolder #table1 #Time').each(function(){
-					aa = $(this).val();
-					});
-				 if(aa != ""){  var splitting = aa.split(':'); var add = 30;   
-
-			var limit = 60;
-				var adds =0;
-				adds =  (Number(splitting[1]) + Number(add));
-				 if(adds >= limit){
-				 adds = Number(adds) - Number(limit);
-				 timeValue =pad(Number(splitting[0])+1,2)+':'+ pad(adds,2);
-				 
-				 }else{
-				 
-			timeValue =pad(splitting[0],2)+':'+ pad((Number(splitting[1]) + Number(add)),2); 
-					}
-						function pad(number, length) {
-				   
-							var str = '' + number;
-							while (str.length < length) {
-								str = '0' + str;
-							}
-				   
-						return str;
-
-						}
-
-
-						name="name"; value="";	
-						
-meas = "class"; meas2 = "time";
-
-		getTableId = $(this).attr('name');  
-		split2();    }else{   alert("please enter value for time to add measurement");   }
-				 
-			}
-		);
-		td4.appendChild(
->>>>>>> .r16893
 			button=document.createElement('input'),
 			button.setAttribute('type','button'),
@@ -742,15 +527,8 @@
 	}
 	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
 	{
 	
@@ -811,5 +589,4 @@
 						}  
 
-<<<<<<< .mine
 					var s = 0; var	get;
 						var nn;
@@ -831,25 +608,4 @@
 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
 				
 			}
@@ -879,5 +635,4 @@
 						
 			);
-<<<<<<< .mine
 var td1=document.createElement('td');
 td1.setAttribute("style","border:1px solid white; color:#37DFB1; font-size:14px;text-align:center;");
@@ -885,11 +640,4 @@
 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;");
-			td1.appendChild(
-				measurementcbo= document.createElement('select'),
-					measurementcbo.setAttribute('id','measurement'),
->>>>>>> .r16893
 <?php
 			$measure=mysql_query("SELECT*FROM measurement");
@@ -950,49 +698,4 @@
 		
 			td4.appendChild(
-<<<<<<< .mine
-=======
-				button = document.createElement('input'),
-				button.setAttribute("type",'button'),
-				button.setAttribute('id','btnSplit'),
-				button.setAttribute('value','Split'),
-				button.setAttribute('name','#table'+cnt),
-				button.onclick=function(){
-				var aa;
-			$('div#TableHolder #table'+cnt+' #Time').each(function(){
-					aa = $(this).val();
-					});
-				 if(aa != ""){  var splitting = aa.split(':'); var add = 30;   
-
-			var limit = 60;
-				var adds =0;
-				adds =  (Number(splitting[1]) + Number(add));
-				 if(adds >= limit){
-				 adds = Number(adds) - Number(limit);
-				 timeValue =pad(Number(splitting[0])+1,2)+':'+ pad(adds,2);
-				 
-				 }else{
-				 
-			timeValue =pad(splitting[0],2)+':'+ pad((Number(splitting[1]) + Number(add)),2); 
-					}
-						function pad(number, length) {
-				   
-							var str = '' + number;
-							while (str.length < length) {
-								str = '0' + str;
-							}
-				   
-						return str;
-
-						}
-
-						meas = "class"; meas2 = "time"; 
-						
-
-			 getTableId = $(this).attr('name'); 
-			 split2();    }else{   alert("please enter value for time to add measurement");   }
-				}
-			);
-			td4.appendChild(
->>>>>>> .r16893
 				button=document.createElement('input'),
 				button.setAttribute('type','button'),
@@ -1146,16 +849,7 @@
 			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(){
-					aa = $(this).val();
-					});
-			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
 
 				
@@ -1175,45 +869,4 @@
 			
 			td4.appendChild(
-<<<<<<< .mine
-=======
-				button = document.createElement('input'),
-				button.setAttribute("type",'button'),
-				button.setAttribute('id','btnSplit'),
-				button.setAttribute('value','Split'),
-				button.setAttribute('name','#table'+cnt),
-				button.onclick=function(){
-				var aa;
-			$('div#TableHolder #table'+cnt+' #Time').each(function(){
-					aa = $(this).val();
-					});
-				 if(aa != ""){  var splitting = aa.split(':'); var add = 30;   
-
-		var limit = 60;
-				var adds =0;
-				adds =  (Number(splitting[1]) + Number(add));
-				 if(adds >= limit){
-				 adds = Number(adds) - Number(limit);
-				 timeValue =pad(Number(splitting[0])+1,2)+':'+ pad(adds,2);
-				 
-				 }else{
-				 
-			timeValue =pad(splitting[0],2)+':'+ pad((Number(splitting[1]) + Number(add)),2); 
-					}
-						function pad(number, length) {
-				   
-							var str = '' + number;
-							while (str.length < length) {
-								str = '0' + str;
-							}
-				   
-						return str;
-
-						}
-				
-			 meas = "name"; meas2 = "time"; getTableId = $(this).attr('name');    split2();    }else{   alert("please enter value for time to add measurement");   }
-				}
-			);
-			td4.appendChild(
->>>>>>> .r16893
 				button=document.createElement('input'),
 				button.setAttribute('type','button'),