1203

@@ -25,6 +25,8 @@
 		var m = date.getMonth();
 		var m = date.getMonth();
 		var y = date.getFullYear();
 		var y = date.getFullYear();
 
 
+
+
 		$('#calendar').fullCalendar({
 		$('#calendar').fullCalendar({
 			header: {
 			header: {
 				left: 'prev,next today',
 				left: 'prev,next today',
@@ -34,8 +36,7 @@
 			editable: true,
 			editable: true,
 			events: [
 			events: [
 
 
-				<?php
-
+		<?php
 				//python
 				//python
 				$command = escapeshellcmd('test.py');
 				$command = escapeshellcmd('test.py');
 				$output = shell_exec($command);
 				$output = shell_exec($command);
@@ -52,31 +53,32 @@
 				$result2=mysqli_query($conn,$sql2);
 				$result2=mysqli_query($conn,$sql2);
 				$data2 = array();
 				$data2 = array();
 				$row2=mysqli_fetch_array($result2);
 				$row2=mysqli_fetch_array($result2);
-				echo $row2[0];
+				$rowcnt =  $row2[0];
 
 
-				$sql="select * from gametime";
+				$sql="select * from gametime order by day asc";
 
 
 
 
 				$result=mysqli_query($conn,$sql);
 				$result=mysqli_query($conn,$sql);
 				$data = array();
 				$data = array();
 				$cnt = 0;
 				$cnt = 0;
-				if($result){
-
-				  while($row=mysqli_fetch_array($result)){
-				       array_push($data,  array('day'=>$row[0], 'time'=>$row[1] ));
-				       $row_arr = explode('-', $row[0]);
-							 ?>
-
-
-							 		{
-							 			title: 'Long Event',
-							 			start: new Date(y, <?php echo $row_arr[1];?>, <?php echo $row_arr[2];?>),
-							 			allDay: false
-							 		}
-
-									<?php $cnt++; if ( $cnt != $row[0] ) { echo ","; }?>
-				   <?php} //while
-				} //if ?>
+				?>
+			 <?php if($result){
+					while( $row=mysqli_fetch_array($result) ) {
+						array_push($data,  array('day'=>$row[0], 'time'=>$row[1] ));
+
+						$row_arr = explode('-', $row[0]);
+						$cnt++;
+						?>
+							 {
+								 title: '1h',
+								 start: new Date(<?php $row[0] ?>),
+								 allDay: false
+							 }
+							 <?php if ( $cnt != $rowcnt ) { echo ","; }?>
+
+
+				   <?php }
+				}  ?>