Index: /schedule/Module/Scheduling.php
===================================================================
--- /schedule/Module/Scheduling.php	(revision 16893)
+++ /schedule/Module/Scheduling.php	(revision 16894)
@@ -1,5 +1,4 @@
 <?php
 	include '../include/factdb.php';
-
 	include '../function/SplitDelete.php';
 ?>
Index: /schedule/Module/calendar.php
===================================================================
--- /schedule/Module/calendar.php	(revision 16893)
+++ /schedule/Module/calendar.php	(revision 16894)
@@ -14,4 +14,5 @@
 	<script src="js/chart.js"></script>
 	<script src="js/Graph.js"></script>
+
     <script src="Module/src/js/lang/en.js"></script>
    <style type="text/css">
@@ -83,7 +84,8 @@
 							year =this.selection.print("%Y").join("\n");	
                              GetData();
-
+							GetDate();
 						$('#Scheduling').load('Module/Scheduling.php?days='+year+'-'+month+'-'+day);
-							//$.get("function/function.php", {day:year+'-'+month+'-'+day});
+							//$.get("function/function.php", {days:year+'-'+month+'-'+day});
+							//$load("function/function.php?days:year+-'+month+'-'+day);
 						//$.get("function/SplitDelete.php", {days:year+'-'+month+'-'+day});
 						 
Index: /schedule/Transaction/insert.php
===================================================================
--- /schedule/Transaction/insert.php	(revision 16893)
+++ /schedule/Transaction/insert.php	(revision 16894)
@@ -1,52 +1,29 @@
 <?php
+//Build by: khristofer Usman
+//Modified by: Jaypee Tanio
+// June 14,2013
+
 include '../include/factdb.php';
-
-
-
- $Time =$_GET['Time'];
- $SelectedSource = $_GET['Source'];
- $Date = $_GET['Date'];
-  
- $SelectedMeasure = $_GET['measure'];
-$TimeEX = explode("-",$Date);
-
-$TimeEX2 = "day=".$TimeEX[0]."&month=".$TimeEX[1]."&year=".$TimeEX[2];
- $limtex = count(explode(",",$SelectedSource));
-$insertdate = $TimeEX[2]."-".$TimeEX[1]."-".$TimeEx[0];
-$value = $_GET['Data'];
-$date = $_GET['Date'];
-//$date = new DateTime($_GET['Date']);
+ $Time =$_POST['Time'];
+ $SelectedSource = $_POST['Source'];
+ $Date = $_POST['Date'];
+ echo $Date;
+ $SelectedMeasure = $_POST['measure'];
+$value = $_POST['Data'];
+$date = $_POST['Date'];
 $n_value = explode(",",$value);
 echo "<br />";
-//echo $date->format('Y-m-d H:i:s');
-//fdgdfgdf
- $Times = explode(",",$Time);
+$Times = explode(",",$Time);
 $select = explode(",",$SelectedSource);
 $measure = explode(",",$SelectedMeasure);
+$limtex = count(explode(",",$SelectedMeasure));
 echo "<br />";
-$temp = "";
-$insert_count = 0;
-	
-
-
-
-
-						
-				
-	
-					
-
-for($i=0;$i<=$limtex-1;$i++){
+for($i=0;$i<=$limtex-1;$i++)
+{
 $select = explode(",",$SelectedSource);
-						$n1 = $n_value[$i];
-						
-					 $selectf = $select[$i];
-				//////Time////
-				//$Timef = $Time[$i];
-						
-				//////// for measurement /////////
-						
+					$n1 = $n_value[$i];
+					$selectf = $select[$i];
+				//////// for measurement /////////	
 						$measuref = $measure[$i];
-
 				//////// Date parsing into format////////
 						$dateTime=new DateTime($date." ".$Times[$i]);
@@ -55,33 +32,20 @@
 					
 			$select = mysql_query("SELECT * FROM schedule WHERE fLastUpdate = '$parsed_date'");
-			if($select){
-			while($row = mysql_fetch_array($select)){
+			if($select)
+			{
+				while($row = mysql_fetch_array($select))
+				{	
+					$new =   $row['fMeasurementID'] + 1 ;
+				}
+			}
+			else
+			{
+				$new = 0;
+			}
+			$insert = mysql_query("INSERT INTO schedule values('','$parsed_date','$parsed_date','$measuref','','$n1','$selectf','$measuref')") or die(mysql_error());				
+
 		
-				
-				$new =   $row['fMeasurementID'] + 1 ;
-				
-			
-			
-			}
-				}else{
-				
-				$new = 0;
-				
-				}	
-			
-		$insert = mysql_query("INSERT IGNORE INTO schedule values('','$parsed_date','$parsed_date','$new','','$n1','$selectf','$measuref')") or die(mysql_error());
-					
+		
 }
- if($insert){
-	
-				?>
-				<script type="text/javascript">
-				   
-					alert("Sucessfully save");
-					window.location = '../index.php?days=<?php echo $date; ?>';
-				</script>
-				<?php
-	
-	}
 	
 ?>
Index: /schedule/Transaction/update.php
===================================================================
--- /schedule/Transaction/update.php	(revision 16893)
+++ /schedule/Transaction/update.php	(revision 16894)
@@ -1,31 +1,22 @@
+
 <?php
+//Build by: khristofer Usman
+//Modified by: Jaypee Tanio
+// June 22,2013
 include '../include/factdb.php';
-
-
-
- $Time =$_GET['Time'];
- $SelectedSource = $_GET['Source'];
- $Date = $_GET['Date'];
-  
- $SelectedMeasure = $_GET['measure'];
-$TimeEX = explode("-",$Date);
-
-$TimeEX2 = "day=".$TimeEX[0]."&month=".$TimeEX[1]."&year=".$TimeEX[2];
- $limtex = count(explode(",",$SelectedSource));
-$insertdate = $TimeEX[2]."-".$TimeEX[1]."-".$TimeEx[0];
-$value = $_GET['Data'];
-$date = $_GET['Date'];
-//$date = new DateTime($_GET['Date']);
+$Time =$_POST['Time'];
+$SelectedSource = $_POST['Source'];
+$SelectedMeasure = $_POST['measure'];
+$limtex = count(explode(",",$SelectedSource));
+$Upd=$_POST['upd'];
+$Upt=$_POST['upt'];
+$value = $_POST['Data'];
+$date = $_POST['Date'];
 $n_value = explode(",",$value);
-echo "<br />";
-//echo $date->format('Y-m-d H:i:s');
-//fdgdfgdf
- $Times = explode(",",$Time);
+$Times = explode(",",$Time);
 $select = explode(",",$SelectedSource);
 $measure = explode(",",$SelectedMeasure);
-echo "<br />";
-$temp = "";
-$insert_count = 0;
-	
+//date_default_timezone_set('Asia/Manila'); // Setting up the localTimeZone in asia
+$UpdateDate=(date('Y-m-d H:i:s'));
 
 
@@ -34,69 +25,30 @@
 			$fetch = mysql_query("SELECT * FROM schedule") or die(mysql_error());
 					
-					while($rows = mysql_fetch_array($fetch)){
-					$timestamp=strtotime($rows['fLastUpdate']);
+					while($rows = mysql_fetch_array($fetch))
+					{
+					$timestamp=strtotime($rows['fStart']);
 					$timestamp2 = date('Y-m-d',$timestamp);
 					$date_time = date('H:i',$timestamp);
 					//$time_new = $date_time->format('H:i:s')
-					if($days == $timestamp2){
+						if($days == $timestamp2)
+						{
 
-					$delete = mysql_query("DELETE FROM `schedule` WHERE `fLastUpdate`='{$rows['fLastUpdate']}'");
+						$delete = mysql_query("DELETE FROM `schedule` WHERE `fStart`='{$rows['fStart']}'");
 			
-					}
+						}
 					}
 					
-					
-					
-					
-					
-					
 
-for($i=0;$i<=$limtex-1;$i++){
+for($i=0;$i<=$limtex;$i++)
+{
 $select = explode(",",$SelectedSource);
-						$n1 = $n_value[$i];
-						
-					 $selectf = $select[$i];
-				//////Time////
-				//$Timef = $Time[$i];
-						
-				//////// for measurement /////////
-						
-						$measuref = $measure[$i];
-
-				//////// Date parsing into format////////
-						$dateTime=new DateTime($date." ".$Times[$i]);
-						 $parsed_date =  $dateTime->format('Y-m-d H:i:s');
-						$new = 0;
-					
-			$select = mysql_query("SELECT * FROM schedule WHERE fLastUpdate = '$parsed_date'");
-			if($select){
-			while($row = mysql_fetch_array($select)){
-		
-				
-				$new =   $row['fMeasurementID'] + 1 ;
-				
+	$n1 = $n_value[$i];		
+	$selectf = $select[$i];	
+	$measuref = $measure[$i];
+	$dateTime=new DateTime($date." ".$Times[$i]);
+	$parsed_date =  $dateTime->format('Y-m-d H:i:s');
+	
+		mysql_query("INSERT INTO schedule VALUES('null','".$parsed_date."','".$UpdateDate."','".$measuref."','','".$n1."','".$selectf."','".$measuref."')");	
 			
-			
-			}
-				}else{
-				
-				$new = 0;
-				
-				}	
-			
-		$insert = mysql_query("INSERT IGNORE INTO schedule values('','$parsed_date','$parsed_date','$new','','$n1','$selectf','$measuref')") or die(mysql_error());
-					
-}
- if($insert){
-	
-				?>
-				<script type="text/javascript">
-				   
-					alert("Sucessfully save");
-					window.location = '../index.php?days=<?php echo $date; ?>';
-				</script>
-				<?php
-	
-	}
-	
+}	
 ?>
Index: /schedule/authenticate/body.php
===================================================================
--- /schedule/authenticate/body.php	(revision 16893)
+++ /schedule/authenticate/body.php	(revision 16894)
@@ -5,5 +5,5 @@
 include 'function/sourcelist.php';
 
-include 'function/function.php';
+//include 'function/function.php';
  ?>
 
@@ -17,4 +17,5 @@
         <meta name="keywords" content="" />
         <meta name="description" content="" />
+			<script src="js/function.js"></script>
         <link href="css/styles.css" rel="stylesheet" type="text/css" media="screen" />
     </head>
@@ -56,55 +57,42 @@
 					</div>
 					</div>
-					<div style="width:100%;" align="right">
 					
-					
+					<div style="width:100%;" align="right" id='btn'>
 						<?php include 'function/button.php';  ?>
-					
 					</div>
 						<div style="border:2px solid white; width:100%;" id="Scheduling">
 						<?php
-						
 						include 'function/SplitDelete.php';
-				
 						?>
-						
-							<script type="text/javascript">
-								// $(document).ready(function(){
-								
-										
-									// $('#Scheduling').fadeOut('slow').load('Module/Scheduling.php').fadeIn('slow');
-								
-								// });
-							</script>
 							<table width="100%" id="TableHolder" >
 
-	<tr>
-		<td width="184" style="border:1px solid white; color:#37DFB1; font-size:14px;" align="center"  >Time</td>
-		
-		<td width="170" style="border:1px solid white; color:#37DFB1; font-size:14px;" align="center"  >Measurement</td>
-		<td width="145" style="border:1px solid white; color:#37DFB1; font-size:14px;" align="center"  >Source list</td>
-		<td width="316" style="border:1px solid white; color:#37DFB1; font-size:14px;" align="center"  >Value</td>
-		<td width="141" style="border:1px solid white; color:#37DFB1; font-size:14px;" align="center" >Transaction</td>
-	</tr>
-	<tr>
-	
-		
-		<td style="border:0px solid white; color:#37DFB1; font-size:14px;"   colspan="4">&nbsp;</td>
-	</tr>
+								<tr>
+									<td width="229" style="border:1px solid white; color:#37DFB1; font-size:12px;" align="center"  >Time</td>
+									
+									<td width="184" style="border:1px solid white; color:#37DFB1; font-size:12px;" align="center"  >Measurement</td>
+									<td width="210" style="border:1px solid white; color:#37DFB1; font-size:12px;" align="center"  >Source list</td>
+									<td width="280" style="border:1px solid white; color:#37DFB1; font-size:12px;" align="center"  >Value</td>
+									<td width="69" style="border:1px solid white; color:#37DFB1; font-size:12px;" align="center" >Transaction</td>
+								</tr>
+								<tr>
+								
+									
+									<td style="border:0px solid white; color:#37DFB1; font-size:14px;"   colspan="4">&nbsp;</td>
+								</tr>
 
-</table>
-<table width="100%" id="TableH" class="myTable">
-</table>
-<table width="100%" id="TableH1" class="myTable">
-</table>
+							</table>
+							<table width="100%" id="TableH" class="myTable">
+							</table>
+							<table width="100%" id="TableH1" class="myTable">
+							</table>
 
-<table width="100%">
-	<tr>
-	
-	
-		<td style="border:0px solid white; color:#37DFB1; font-size:14px;"  width="80%" align="center">&nbsp;</td>
-	
-	</tr>
-</table>
+							<table width="100%">
+								<tr>
+								
+								
+									<td style="border:0px solid white; color:#37DFB1; font-size:14px;"  width="80%" align="center">&nbsp;</td>
+								
+								</tr>
+							</table>
 						</div>
 						<div style="border:2px solid white; width:100%;" align="center" id="SchedulingAppend">
Index: /schedule/css/styles.css
===================================================================
--- /schedule/css/styles.css	(revision 16893)
+++ /schedule/css/styles.css	(revision 16894)
@@ -11,5 +11,5 @@
 .myTable td.first
 {
-	width:190px;
+	width:200px;
 }
 
Index: /schedule/function/SplitDelete.php
===================================================================
--- /schedule/function/SplitDelete.php	(revision 16893)
+++ /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'),
Index: /schedule/function/button.php
===================================================================
--- /schedule/function/button.php	(revision 16893)
+++ /schedule/function/button.php	(revision 16894)
@@ -1,35 +1,5 @@
-<?php    
-include '../include/factdb.php';
-			$x = 0;
-						 $day = $_GET['days'];
-						$days = Date('Y-m-d',strtotime($day));
-						
-					$fetch = mysql_query("SELECT * FROM schedule") or die(mysql_error());
-					
-					while($rows = mysql_fetch_array($fetch)){
-					$timestamp=strtotime($rows['fLastUpdate']);
-					$timestamp2 = date('Y-m-d',$timestamp);
-					$date_time = date('H:i',$timestamp);
-					//$time_new = $date_time->format('H:i:s')
-					if($days == $timestamp2){
-					$x++;
-					
-					}
-					
-					}
-					
-			
-				if($x==0){
-				
-				?><input type="button" id="save" value="SAVE" class="button" title="Click to save">&nbsp;&nbsp;&nbsp;<input type="button" id="LoadPrev" value="Load Previous Night" class="button" title="Click to load previous night">
-			<?php
-				
-				}else{
-				?><input type="button" id="update" value="UPDATE" class="button" title="Click to save">&nbsp;&nbsp;&nbsp;<input type="button" id="LoadPrev" value="Load Previous Night" class="button" title="Click to load previous night">
-					<?php
-				
-				}
-				
-			?>
+<input type="button" id="save" value="SAVE" class="button" title="Click to save">
+&nbsp;&nbsp;&nbsp;
+<input type="button" id="LoadPrev" value="Load Previous Night" class="button" title="Click to load previous night">
 							
 					
Index: /schedule/function/function.php
===================================================================
--- /schedule/function/function.php	(revision 16893)
+++ /schedule/function/function.php	(revision 16894)
@@ -1,14 +1,6 @@
  <div id="saving">
  
- <script type="text/javascript">
-
- 
- 
- 
-
-
- 
- 
-	$(document).ready(function GetDate(){
+ <script type="text/javascript"> 
+	$(document).ready(function GetDate(day ,month ,year){
 	 // for fupdate
 	<?php
@@ -25,6 +17,8 @@
 		 
 		 if(isset($_GET['days'])){ 
-						echo $_GET['days']; ;
-						 }else{
+						echo $_GET['days'];
+						 }
+						 else
+						 {
 						 
 					echo date("Y-m-d");
@@ -33,4 +27,68 @@
 		 
 		  ?>';
+		
+		var InputValue = [];
+		var selectedSource = [];
+		var selectedTime = [];
+		var selectedMeasurement = [];
+		var Time;
+		var Source;
+		var measure;
+		var value;
+		var checks = 0;
+		for(var i=1;i <= cnt;i++)
+		{
+			if($('#Time'+i).val() != '')
+			{
+				Time=$('#Time'+i).val();
+				Source=$('select[id="source'+i+'"]').val();
+				measure=$('select[id="measurement'+i+'"]').val();
+				value=$('#txtData'+i).val();
+				selectedMeasurement.push(measure);
+				selectedSource.push(Source);
+				selectedTime.push(Time);
+				InputValue.push(value);
+				
+			}
+			else
+			{
+			checks++;
+			
+			}
+		}
+		if(checks == 0)
+		{
+		alert(dtr);
+		$.ajax({
+			type: "POST",
+			cache: false,
+			url: "Transaction/insert.php",
+			data: "Time="+selectedTime+'&Source='+selectedSource+'&measure='+selectedMeasurement+'&Data='+InputValue+'&Date='+dtr,
+			dataType: "json",
+			success: function(data) {
+				alert('Success: The text is now stored in the database.');
+			}
+		});
+		//window.location = 'Transaction/insert.php?Time='+selectedTime+'&Source='+selectedSource+'&measure='+selectedMeasurement+'&Data='+InputValue+'&Date='+dtr;
+		}
+		else
+		{
+	
+		alert("Please fill all the details!");
+		}
+	});
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	$('#update').click(function()
+	{
 			//alert(dtr);
 		var InputValue = [];
@@ -62,67 +120,21 @@
 		}
 		
-		if(checks == 0){
-		window.location = 'Transaction/insert.php?Time='+selectedTime+'&Source='+selectedSource+'&measure='+selectedMeasurement+'&Data='+InputValue+'&Date='+dtr;
-	}else{
-	
-	alert("Please fill all the details!");
-	}
-	});
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	$('#update').click(function(){
-var dtr;
-		 dtr = '<?php 
-		 
-		 if(isset($_GET['days'])){ 
-						echo $_GET['days']; ;
-						 }else{
-						 
-					echo date("Y-m-d");
-						 
-						 }
-		 
-		  ?>';
-			//alert(dtr);
-		var InputValue = [];
-		var selectedSource = [];
-		var selectedTime = [];
-		var selectedMeasurement = [];
-		var Time;
-		var Source;
-		var measure;
-		var value;
-		var checks = 0;
-		for(var i=1;i <= cnt;i++)
+		if(checks == 0)
 		{
-			if($('#Time'+i).val() != '')
-			{
-				Time=$('#Time'+i).val();
-				Source=$('select[id="source'+i+'"]').val();
-				measure=$('select[id="measurement'+i+'"]').val();
-				value=$('#txtData'+i).val();
-				selectedMeasurement.push(measure);
-				selectedSource.push(Source);
-				selectedTime.push(Time);
-				InputValue.push(value);
-				
-			}else{
-			checks++;
-			
+		
+		$.ajax({
+			type: "POST",
+			cache: false,
+			url: "Transaction/update.php",
+			data: "Time="+selectedTime,
+			dataType: "json",
+			success: function(data) {
+				alert('Success: The text is now stored in the database.');
 			}
+		});
+		//window.location = 'Transaction/update.php?Time='+selectedTime+'&Source='+selectedSource+'&measure='+selectedMeasurement+'&Data='+InputValue+'&Date='+dtr;
 		}
-		
-		if(checks == 0){
-		window.location = 'Transaction/update.php?Time='+selectedTime+'&Source='+selectedSource+'&measure='+selectedMeasurement+'&Data='+InputValue+'&Date='+dtr;
-	}else{
+	else
+	{
 	
 	alert("Please fill all the details!");
Index: /schedule/js/chart.js
===================================================================
--- /schedule/js/chart.js	(revision 16893)
+++ /schedule/js/chart.js	(revision 16894)
@@ -3,5 +3,6 @@
 	var source = new Array();
 	//calls the xml request in a loop based on the current sources                
-	$('#box2View option').each(function(){
+	$('#box2View option').each(function()
+	{
 		 source.push($(this).text());