Merge branch 'master' of http://gitlab.informatika.org/IF3110-2017-K01-JAFV/TugasBesar1_2017

00ebb2d1 · reiva5 · 1cf761d3 · 298dbdaf · 00ebb2d1 · 00ebb2d1
Commit 00ebb2d1 authored 7 years ago by reiva5
--- a/database/PR-Ojek.sql
+++ b/database/PR-Ojek.sql
 -- phpMyAdmin SQL Dump
-- version 4.7.0
+-- version 4.7.4
 -- https://www.phpmyadmin.net/
 --
 -- Host: 127.0.0.1
-- Generation Time: 05 Okt 2017 pada 18.50
-- Versi Server: 10.1.25-MariaDB
-- PHP Version: 7.1.7
+-- Generation Time: 06 Okt 2017 pada 00.48
+-- Versi Server: 10.1.26-MariaDB
+-- PHP Version: 7.1.9

 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET AUTOCOMMIT = 0;
@@ -58,7 +58,9 @@ CREATE TABLE `transaction` (
  `id_driver` int(11) NOT NULL,
  `rating` int(11) NOT NULL,
  `comment` varchar(1024) NOT NULL,
-  `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
+  `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `picking_point` varchar(50) NOT NULL,
+  `destination` varchar(50) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;

 -- --------------------------------------------------------
@@ -117,6 +119,7 @@ ALTER TABLE `users`
 --
 ALTER TABLE `users`
  MODIFY `ID` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=13;
+
 --
 -- Ketidakleluasaan untuk tabel pelimpahan (Dumped Tables)
 --

--- a/orderojek.html
+++ b/orderojek.html
+<?php
+		require('includes/config.php');
+		if(isset($_POST["submit"]))) {
+			  
+		}
+?> 
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -36,21 +43,22 @@
 				<span class="number">3</span>
 				<div class="step">Complete your order</div>
 			</div>
-			<form id="menuAwal" action="#" method="post" class="form">
+			<form id="menuAwal" action="orderojek.php" method="POST" class="form">
 				<div class="formBox">
 					<label for="pick" class="labelBox">Picking Point</label>
-					<input id="pick" class="inputBox" type="text" name="selectDestination" id="pickingPoint" required>
+					<input id="pick" class="inputBox" type="text" name="pickingPoint" id="pickingPoint" required>
 				</div>
 				<div class="formBox">
 					<label for="destiny" class="labelBox">Destination</label>
-					<input id="destiny" class="inputBox" type="text" name="selectDestination" id="destination" required>
+					<input id="destiny" class="inputBox" type="text" name="destination" id="destination" required>
 				</div>
 				<div class="formBox">
 					<label for="preferred" class="labelBox">Preferred Driver</label>
-					<input id="preferred" class="inputBox" type="text" name="selectDestination" placeholder="(optional)">
+					<input id="preferred" class="inputBox" type="text" name="preferredDriver" placeholder="(optional)">
 				</div>
 				<input type="submit" name="submit" value="NEXT" onclick="next1()">
 			</form>
+			
 		</div>
 	</div>	
 </body>