Booking and schedule pages layout fix

assests/controller/ajax.php

@@ -1,8 +1,6 @@
 <?php
 include_once("../model/database.php");
 
-//echo $_GET['date'];
-
     $database = new databases();
 //get date and trainer id from GET
 
@@ -11,8 +9,6 @@
 
     $trainerIdValue = $_GET['trainerId'];
 //read trainer details for the specified day
-////echo $trainerIdValue;
-//echo $dateValue;
     $result = $database->getTrainerDaySchedule($trainerIdValue, $dateValue);
     $count=mysqli_num_rows($result);
 

assests/css/calendarstyle.css

@@ -6,9 +6,9 @@ font-family: Helvetica, Arial, sans-serifs;
 #date
 {
 color: white;
-width: 180px;
-margin-top: 20px;
-margin-left: 10px;
+width: 260px;
+margin: 20px auto 20px;
+
 }
 
 #day_calendar
@@ -65,9 +65,9 @@ text-align: center;
 		}
 
 div.ui-datepicker{
- font-size:10px;
-    width: 180px;
-    margin-left: -20px;
+ font-size: 1em;
+    width: 250px;
+    margin-left: 0px;
 }
 
 /*-------------CalendarWeek--------------*/

assests/css/normal/style.css

@@ -421,7 +421,7 @@ position: absolute;
 			width: calc(100% - 260px);
 		margin-left: 260px;
 			height:auto;
-			margin-top: 100px;
+			margin-top: 150px;
 
 
 }
@@ -824,7 +824,9 @@ img.trainerImg
 /*   for the booking page */
 
 #booking {
-    width:700px;
+  padding: 0px;
+    width: 40%;
+    min-width:300px;
     list-style:none;
     min-height:100%;
     height:auto;
@@ -834,9 +836,8 @@ img.trainerImg
 }
 
 #booking>li {
-    position:static;
+    position:relative;
     float:left;
-    margin-right:30px
 }
 
 #booking>li>table {
@@ -847,7 +848,8 @@ img.trainerImg
 #booking>li:not(:first-child) {
     width:400px;
     height:auto;
-    margin-bottom:30px
+    margin-bottom:30px;
+  margin-left: 25px;
 }
 
 
@@ -952,3 +954,28 @@ display:none;
 
 
 /*End Hide Mobile set up for big screen*/
+
+/*peters tests*/
+
+#setTime{
+  width: 40%;
+  min-width: 180px;
+
+}
+#setTime input, #setTime select {
+  width: 90% ;
+  min-width: 180px;
+  margin-top: 10px;
+  padding: 5px;
+  vertical-align: middle;
+}
+#trainerId{
+  width: calc(90% + 10px) !important;
+   min-width: 190px !important;
+}
+.trainerTable{
+  width: 80% !important;  
+}
+.ui-datepicker table {
+  font-size: 1em !important;
+}

assests/model/database.php

@@ -296,7 +296,7 @@ function cancelBooking(){
     public
     function getSingleTrainers($trainer){
 ///Needs to be fixed
-
+//echo $trainer;
         $results = mysqli_query ( $this->con, "
 
 SELECT *
@@ -307,7 +307,7 @@ function getSingleTrainers($trainer){
 ON m.memberId = schedules.trainerId
 WHERE EXISTS (SELECT *
               FROM trainerschedule as ts
-              WHERE m.status = 2 and ts.trainerId = '$trainer' ) ORDER BY startTimes ;" );
+              WHERE m.status = 2  and trainerschedule.trainerId = '$trainer' ) ORDER BY startTimes ;" );
         return $results;
 
 

assests/model/members.php

@@ -304,6 +304,11 @@ function getTrainers(){
     function getSingleTrainers($trainer){
          $result =    $this->database->getSingleTrainers( $trainer  );
       $count=mysqli_num_rows($result);
+     // echo $count;
+      //echo "<pre>";
+      //print_r($result);
+    //  echo "</pre>";
+
 
 	  echo'<div><img id="trainerBookingImg" src="assests/img/profilePhotos/' . $trainer.  '.png" /></div>';
 
@@ -315,6 +320,7 @@ function getSingleTrainers($trainer){
           //carries over the value of $i into next row of results as a starting value in for loop
           //that allows for continuation of displaying next results.
           $count--;
+          //echo $row['startTime'];
 
           $startTime = $row['startTime'];
           $finishTime = $startTime + $row['noOfHours'];

assests/view/booking/index.php

@@ -62,7 +62,7 @@
         <button id="authorize-button" style="visibility: hidden">Authorize</button>
 
 
-    <ul id="booking">
+    <ul id="booking" class="trainerTable">
 
         <li>
          <div id="date">