Commit 37648aa7 authored by Mihiranga G.L.V - IT18500790's avatar Mihiranga G.L.V - IT18500790

Merge branch 'IT18500790' into 'master'

Trp plan and change images

See merge request !12
parents 490741ad 5d6421da
......@@ -22,7 +22,7 @@
// Date count
$date_count = (int) $days + 1;
$full_hours = $date_count * 10;
$full_hours = $date_count * 11;
$line_no = array();
$sql2 = "SELECT * FROM linelist WHERE logUserid = '$logUserid' ORDER BY id ";
......@@ -203,6 +203,7 @@
<th scope="col">Start Location</th>
<th scope="col">Places</th>
<th scope="col">Train Name</th>
<th scope="col">Seat</th>
<th scope="col">Arrival Time</th>
<th scope="col"> End Location </th>
<th scope="col"> Departure Time </th>
......@@ -282,16 +283,20 @@
$row18 = mysqli_fetch_assoc($result18);
$colombo_to_next_station_name = $row18['name']; //Colombo to next station
$seat_plan_open_start = "train_".$colombo_first_train."_".$c;
?>
<tr>
<td> <?php echo $colombo_name ?> </td>
<td></td>
<td align="center"> <?php echo $colombo_train_name ?> <br> <img class="animate__animated animate__slow animate__slideInLeft animate__infinite infinite" src="images/green_arrow.png" style="width:30px;" alt=""> </td>
<td> <?php echo str_replace(' ', '<br>', $colombo_train_arrival_date_time) ?> </td>
<td align="center"></td>
<td align="center"> <?php echo $colombo_train_name ?> <br> <img class="animate__animated animate__slower animate__slideInLeft animate__infinite infinite" src="images/green_train.png" style="width:40px;" alt=""> </td>
<td align="center"><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#seat_plan">
<i style="font-size:20px;" class="material-icons">airline_seat_recline_extra</i>
</button>
</td>
<td align="center"> <?php echo str_replace(' ', '<br>', $colombo_train_arrival_date_time) ?> </td>
<td> <?php echo $colombo_to_next_station_name ?> </td>
<td> <?php echo str_replace(' ', '<br>', $colombo_train_dep_date_time) ?> </td>
<td align="center"> <?php echo str_replace(' ', '<br>', $colombo_train_dep_date_time) ?> </td>
</tr>
<?php
......@@ -311,7 +316,7 @@
<tr>
<td> <?php echo $location_station_name ?> </td>
<td> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#first<?php echo $c ?>"> Locations </button>
<td align="center"> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#first<?php echo $c ?>"> <i class='fas fa-map-marker-alt'></i> </button>
<div class="modal fade" id="first<?php echo $c ?>" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
......@@ -381,8 +386,8 @@
<td> <?php echo $station_near_by_place_name ?> </td>
<td> <?php echo $station_near_by_cat_name ?> </td>
<td> <?php echo $station_near_by_es_time . " Hours" ?></td>
<td>
<button class="btn btn-primary"> Map <i class="fa fa-map-marker" style="font-size:18px; margin-left: 3%;"></i></button
<td align="center">
<button class="btn btn-primary"><i class='fas fa-map'></i></button
></td>
</tr>
......@@ -478,13 +483,17 @@
$row24 = mysqli_fetch_assoc($result24);
$next_railway_location_name = $row24['name']; // next location name
$seat_plan_open = "train_".$selected_train_id."_".$c;
?>
<td align="center"> <?php echo $final_train_name ?> <br> <img class="animate__animated animate__slow animate__slideInLeft animate__infinite infinite" src="images/green_arrow.png" style="width:30px;" alt=""> </td>
<td> <?php echo str_replace(' ', '<br>', $final_train_arrival_date_and_time) ?> </td>
<td align="center"> <?php echo $final_train_name ?> <br> <img class="animate__animated animate__slower animate__slideInLeft animate__infinite infinite" src="images/green_train.png" style="width:40px;" alt=""> </td>
<td align="center"><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#seat_plan">
<i style="font-size:20px;" class="material-icons">airline_seat_recline_extra</i>
</button>
</td>
<td align="center"> <?php echo str_replace(' ', '<br>', $final_train_arrival_date_and_time) ?> </td>
<td> <?php echo $next_railway_location_name ?> </td>
<td> <?php echo str_replace(' ', '<br>', $final_train_dep_date_and_time) ?> </td>
<td align="center"> <?php echo str_replace(' ', '<br>', $final_train_dep_date_and_time) ?> </td>
<?php
......@@ -546,17 +555,33 @@
$end_train_arrival = trim($end_train_arrival);
$end_train_dep = trim($end_train_dep);
if($date_count < 6){
$end_train_arrival_date_and_time = $end_now_date ." ".$end_train_arrival; // Train Arrival
$end_train_dep_date_and_time = $end_now_date ." ".$end_train_dep; // Train Depature
} else {
$sql27 = "SELECT * FROM user_details WHERE logUserid = $logUserid";
$result27 = mysqli_query($con,$sql27) or die(mysqli_error($con));
$row27 = mysqli_fetch_assoc($result27);
$end_next_railway_location_name = "Colombo Fort"; // next location name
$end_date = $row27['end'];
$end_train_arrival_date_and_time = $end_date ." ".$end_train_arrival; // Train Arrival
$end_train_dep_date_and_time = $end_date ." ".$end_train_dep; // Train Depature
}
$end_next_railway_location_name = "Colombo Fort"; // next location name
$seat_plan_open_end = "train_".$end_selected_train_id."_".$c;
?>
<td align="center"> <?php echo $end_train_name ?><br><img class="animate__animated animate__slow animate__slideInRight animate__infinite infinite" src="images/red_arrow.png" style="width:30px;" alt=""> </td>
<td> <?php echo str_replace(' ', '<br>', $end_train_arrival_date_and_time) ?> </td>
<td align="center"> <?php echo $end_train_name ?><br><img class="animate__animated animate__slower animate__slideInRight animate__infinite infinite" src="images/red_train.png" style="width:40px;" alt=""> </td>
<td align="center"><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#seat_plan">
<i style="font-size:20px;" class="material-icons">airline_seat_recline_extra</i>
</button></td>
<td align="center"> <?php echo str_replace(' ', '<br>', $end_train_arrival_date_and_time) ?> </td>
<td> <?php echo $end_next_railway_location_name ?> </td>
<td> <?php echo str_replace(' ', '<br>', $end_train_dep_date_and_time) ?> </td>
<td align="center"> <?php echo str_replace(' ', '<br>', $end_train_dep_date_and_time) ?> </td>
<?php
}
......
......@@ -22,6 +22,10 @@
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<meta name="MobileOptimized" content="320" />
<!--Template style -->
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
/>
<link rel="stylesheet" type="text/css" href="css/xpedia.css" />
<style type="text/css">
#myBtn {
......@@ -177,8 +181,6 @@
<ul>
<li><a href="#">Home</a> <i class="fa fa-angle-right"></i>
</li>
<li><a href="#">Trip Plan</a> <i class="fa fa-angle-right"></i>
</li>
<li>Custom Trip Plan</li>
</ul>
</div>
......@@ -215,14 +217,14 @@
</div>
<h5>Create plan</h5>
</div>
<div class="x_title_num_main_box_wrapper x_title_num_main_box_wrapper3">
<div class="x_icon_num x_icon_num3">
<div class="x_title_num_main_box_wrapper">
<div class="x_icon_num">
<p>4</p>
</div>
<h5>customize Plan</h5>
</div>
<div class="x_title_num_main_box_wrapper x_title_num_main_box_wrapper3 x_title_num_main_box_wrapper_last">
<div class="x_icon_num x_icon_num3">
<div class="x_icon_num">
<p>5</p>
</div>
<h5>done!</h5>
......@@ -305,7 +307,7 @@
<?php
$sql5 = "SELECT * FROM user_details WHERE logUserid = $logUserid";
$result5 = mysqli_query($con,$sql5) or die(mysqli_error($con));
$row5 = mysqli_fetch_assoc($result5)
$row5 = mysqli_fetch_assoc($result5);
?>
<label class="cal-icon">
<input type="text" id="startTime" onchange="changeTime();" value="<?php echo $row5['start'] ?>" placeholder="Start Date" class="form-control datepicker" readonly>
......@@ -442,6 +444,68 @@
</li>
</form> -->
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<div class="accordion" id="accordionExample" style="width: 100%; ">
<div class="card">
<div class="card-header" id="headingOne" style="background-color: #4f5dec;">
<h2 class="mb-0" >
<button style="color: #ffffff;" class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
Best Trip Plan - <b> <span id="lineNameSec"> Main Line </span></b>
</button>
</h2>
</div>
<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionExample">
<!-- Content Add -->
<!-- Content Add -->
<!-- Content Add -->
<!-- Content Add -->
<!-- Content Add -->
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="contect_btn contect_btn_contact">
<ul>
<li><a href="#">Confirm Plan <i class="fa fa-arrow-right"></i></a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- x car book sidebar section Wrapper End -->
<!-- Button trigger modal -->
<div class="modal fade" id="seat_plan" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Seat Plan</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- Start -->
<div class="container-fluid" style="border: 1px solid rgb(223, 222, 222); border-radius: 10px; margin-bottom: 3%;">
<div class="row" style="margin-bottom: 1%; margin-top: 3%;">
<div class="col-sm-12 col-md-12 col-lg-12">
......@@ -616,48 +680,20 @@
</div>
</div>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
/>
<div class="accordion" id="accordionExample" style="width: 100%; ">
<div class="card">
<div class="card-header" id="headingOne" style="background-color: #4f5dec;">
<h2 class="mb-0" >
<button style="color: #ffffff;" class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
Best Trip Plan - <b> <span id="lineNameSec"> Main Line </span></b>
</button>
</h2>
</div>
<!-- End -->
<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionExample">
<!-- Content Add -->
<!-- Content Add -->
<!-- Content Add -->
<!-- Content Add -->
<!-- Content Add -->
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="contect_btn contect_btn_contact">
<ul>
<li><a href="#">Confirm Plan <i class="fa fa-arrow-right"></i></a>
</li>
</ul>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
<!-- x car book sidebar section Wrapper End -->
......@@ -972,6 +1008,7 @@
<!-- <script src="https://cdn.jsdelivr.net/npm/lobibox@1.2.7/lib/jquery.1.11.js"></script> -->
<script src="https://cdn.jsdelivr.net/npm/lobibox@1.2.7/dist/js/lobibox.min.js"></script>
<script src='https://kit.fontawesome.com/a076d05399.js' crossorigin='anonymous'></script>
</body>
<script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment