diff --git a/db/tubes1-wbd-old.sql b/db/tubes1-wbd-old.sql
new file mode 100644
index 0000000000000000000000000000000000000000..8ad3009792fc1fa2f9506c35ac65da1d92cba8ba
--- /dev/null
+++ b/db/tubes1-wbd-old.sql
@@ -0,0 +1,120 @@
+-- phpMyAdmin SQL Dump
+-- version 4.7.4
+-- https://www.phpmyadmin.net/
+--
+-- Host: localhost
+-- Generation Time: Oct 06, 2017 at 09:07 AM
+-- Server version: 10.1.26-MariaDB
+-- PHP Version: 7.1.9
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET AUTOCOMMIT = 0;
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- Database: `tubes1-wbd`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `orderhistory`
+--
+
+CREATE TABLE `orderhistory` (
+ `order_id` int(5) NOT NULL,
+ `date` date NOT NULL,
+ `u_driver` varchar(20) NOT NULL,
+ `u_customer` varchar(20) NOT NULL,
+ `source` varchar(30) NOT NULL,
+ `destination` varchar(30) NOT NULL,
+ `rating_given` int(5) NOT NULL,
+ `comment_given` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `prefloc`
+--
+
+CREATE TABLE `prefloc` (
+ `id` int(5) NOT NULL,
+ `location` varchar(30) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `userinfo`
+--
+
+CREATE TABLE `userinfo` (
+ `id` int(5) NOT NULL,
+ `username` varchar(32) NOT NULL,
+ `fullname` varchar(30) NOT NULL,
+ `email` varchar(30) NOT NULL,
+ `pass` varchar(128) NOT NULL,
+ `phoneno` varchar(20) NOT NULL,
+ `isdriver` tinyint(1) NOT NULL DEFAULT '0',
+ `avg_vote` float NOT NULL DEFAULT '0',
+ `n_voters` int(11) NOT NULL DEFAULT '0',
+ `img_name` varchar(32) NOT NULL DEFAULT 'default.png'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `userinfo`
+--
+
+INSERT INTO `userinfo` (`id`, `username`, `fullname`, `email`, `pass`, `phoneno`, `isdriver`, `avg_vote`, `n_voters`, `img_name`) VALUES
+(2, 'fajar', 'Fajar N', '13515060@std.stei.itb.ac.id', '$2y$10$kRZzI0XgXLll2HGjH3hwWu3DGyKYGnnrIHVlsg9C3w899qQIYrfNe', '08967900712', 0, 0, 0, 'default.png'),
+(34, 'lulu', 'Babibu', 'nono@gmail.com', '$2y$10$gMT/g0JYkE1IMtAzf9W7hehj0M3Zf3cQM3WT/c/F7OPI1aA0zqO9e', '0837213123', 1, 0, 0, 'default.png'),
+(35, 'lala', 'lala', 'lala@gmail.com', '$2y$10$JFvRFeZY4e7DSTMReoEin.Nw1gXUFe9ZdnC9UiECjLm65Qkc34fhK', '123413', 0, 0, 0, 'default.png'),
+(36, 'azisak', 'Azis Adi Kuncoro', 'azisadikuncoro@gmail.com', '$2y$10$EB67Fjdhpw.EukK/DXLJCuQzSWCXz8QohcFHxxeaTQqkYPwLM5hc6', '08967900712', 1, 0, 0, 'default.png');
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `orderhistory`
+--
+ALTER TABLE `orderhistory`
+ ADD PRIMARY KEY (`order_id`),
+ ADD UNIQUE KEY `order_id` (`order_id`);
+
+--
+-- Indexes for table `userinfo`
+--
+ALTER TABLE `userinfo`
+ ADD PRIMARY KEY (`id`),
+ ADD UNIQUE KEY `username` (`username`),
+ ADD UNIQUE KEY `email` (`email`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `orderhistory`
+--
+ALTER TABLE `orderhistory`
+ MODIFY `order_id` int(5) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT for table `userinfo`
+--
+ALTER TABLE `userinfo`
+ MODIFY `id` int(5) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=37;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/db/tubes1-wbd.sql b/db/tubes1-wbd.sql
index 8ad3009792fc1fa2f9506c35ac65da1d92cba8ba..9aad9fd8acc49b4bb91a525c3de4ce3c7eeaa88e 100644
--- a/db/tubes1-wbd.sql
+++ b/db/tubes1-wbd.sql
@@ -1,11 +1,11 @@
-- phpMyAdmin SQL Dump
--- version 4.7.4
+-- version 4.7.0
-- https://www.phpmyadmin.net/
--
--- Host: localhost
--- Generation Time: Oct 06, 2017 at 09:07 AM
--- Server version: 10.1.26-MariaDB
--- PHP Version: 7.1.9
+-- Host: 127.0.0.1
+-- Generation Time: Oct 07, 2017 at 04:09 PM
+-- Server version: 5.7.19-log
+-- PHP Version: 7.1.7
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
SET AUTOCOMMIT = 0;
@@ -36,9 +36,21 @@ CREATE TABLE `orderhistory` (
`source` varchar(30) NOT NULL,
`destination` varchar(30) NOT NULL,
`rating_given` int(5) NOT NULL,
- `comment_given` text NOT NULL
+ `comment_given` text NOT NULL,
+ `ishide_cust` tinyint(1) NOT NULL DEFAULT '0',
+ `ishide_driver` tinyint(1) NOT NULL DEFAULT '0'
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+--
+-- Dumping data for table `orderhistory`
+--
+
+INSERT INTO `orderhistory` (`order_id`, `date`, `u_driver`, `u_customer`, `source`, `destination`, `rating_given`, `comment_given`, `ishide_cust`, `ishide_driver`) VALUES
+(1, '2017-10-02', 'driver', 'zxc', 'a', 'b', 3, 'bla bla bla', 1, 0),
+(2, '2017-10-04', 'driver2', 'customer2', 'z', 'y', 4, 'jndflakdfmak', 0, 0),
+(3, '2017-10-09', 'driver', 'zxc', 'j', 'k', 4, 'asdfghjkl', 0, 0),
+(4, '2017-10-20', 'zxc', 'asd', 'k', 'l', 1, 'oooooo', 0, 0);
+
-- --------------------------------------------------------
--
@@ -46,9 +58,21 @@ CREATE TABLE `orderhistory` (
--
CREATE TABLE `prefloc` (
+ `id_prefloc` int(5) NOT NULL,
`id` int(5) NOT NULL,
`location` varchar(30) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `prefloc`
+--
+
+INSERT INTO `prefloc` (`id_prefloc`, `id`, `location`) VALUES
+(1, 1, 'asdf'),
+(2, 38, 'a'),
+(3, 38, 'b'),
+(5, 37, 'coba'),
+(6, 37, 'coba lagi lagi');
-- --------------------------------------------------------
@@ -77,7 +101,9 @@ INSERT INTO `userinfo` (`id`, `username`, `fullname`, `email`, `pass`, `phoneno`
(2, 'fajar', 'Fajar N', '13515060@std.stei.itb.ac.id', '$2y$10$kRZzI0XgXLll2HGjH3hwWu3DGyKYGnnrIHVlsg9C3w899qQIYrfNe', '08967900712', 0, 0, 0, 'default.png'),
(34, 'lulu', 'Babibu', 'nono@gmail.com', '$2y$10$gMT/g0JYkE1IMtAzf9W7hehj0M3Zf3cQM3WT/c/F7OPI1aA0zqO9e', '0837213123', 1, 0, 0, 'default.png'),
(35, 'lala', 'lala', 'lala@gmail.com', '$2y$10$JFvRFeZY4e7DSTMReoEin.Nw1gXUFe9ZdnC9UiECjLm65Qkc34fhK', '123413', 0, 0, 0, 'default.png'),
-(36, 'azisak', 'Azis Adi Kuncoro', 'azisadikuncoro@gmail.com', '$2y$10$EB67Fjdhpw.EukK/DXLJCuQzSWCXz8QohcFHxxeaTQqkYPwLM5hc6', '08967900712', 1, 0, 0, 'default.png');
+(36, 'azisak', 'Azis Adi Kuncoro', 'azisadikuncoro@gmail.com', '$2y$10$EB67Fjdhpw.EukK/DXLJCuQzSWCXz8QohcFHxxeaTQqkYPwLM5hc6', '08967900712', 1, 0, 0, 'default.png'),
+(37, 'zxc', 'zxc', 'zxc@zxc.com', '$2y$10$2ElYlXGxJ7Wc2icABrlpUe1Q3Sg6NjG9/oMNvd8LZWlHef8OarAMe', '2334567890123', 1, 0, 0, 'images.png'),
+(38, 'driver', 'driver', 'driver@driver.com', '$2y$10$tst64FyFe0ipjC5QLpjq/.Z0ZDFBkQq5xWkY60/SmgCcX9NZOrelG', '123456789012', 1, 0, 0, 'images.png');
--
-- Indexes for dumped tables
@@ -90,6 +116,12 @@ ALTER TABLE `orderhistory`
ADD PRIMARY KEY (`order_id`),
ADD UNIQUE KEY `order_id` (`order_id`);
+--
+-- Indexes for table `prefloc`
+--
+ALTER TABLE `prefloc`
+ ADD PRIMARY KEY (`id_prefloc`);
+
--
-- Indexes for table `userinfo`
--
@@ -106,14 +138,17 @@ ALTER TABLE `userinfo`
-- AUTO_INCREMENT for table `orderhistory`
--
ALTER TABLE `orderhistory`
- MODIFY `order_id` int(5) NOT NULL AUTO_INCREMENT;
-
+ MODIFY `order_id` int(5) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
+--
+-- AUTO_INCREMENT for table `prefloc`
+--
+ALTER TABLE `prefloc`
+ MODIFY `id_prefloc` int(5) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
--
-- AUTO_INCREMENT for table `userinfo`
--
ALTER TABLE `userinfo`
- MODIFY `id` int(5) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=37;
-COMMIT;
+ MODIFY `id` int(5) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=41;COMMIT;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
diff --git a/src/complete-order.php b/src/complete-order.php
index 68420e1ae01f67702bb065563b66e85ae0f62b52..2d49fcc08a4353032fc1a55817f22812d6ee4ddb 100644
--- a/src/complete-order.php
+++ b/src/complete-order.php
@@ -71,7 +71,7 @@
<div class="mtop10 rowflex">
<div class="flexone box font-navbar selected-navbar"><a href="order-ojek.php?id_active=<?php echo $_GET['id_active'] ?>">ORDER</a></div>
<div class="flexone box font-navbar"><a href="history.php?id_active=<?php echo $_GET['id_active'] ?>">HISTORY</a></div>
- <div class="flexone box font-navbar"><a href="">MY PROFILE</a></div>
+ <div class="flexone box font-navbar"><a href="profile.php?id_active=<?php echo $_GET['id_active'] ?>">MY PROFILE</a></div>
</div>
diff --git a/src/edit-prefered-location.php b/src/edit-prefered-location.php
index 5d6914c928b1bcfc55c96c651b7067fd767d1d0a..cddf1cad920af257c94e47abcf37b7897ad31860 100644
--- a/src/edit-prefered-location.php
+++ b/src/edit-prefered-location.php
@@ -134,7 +134,7 @@ if(mysqli_stmt_execute($stmt)){
<button type="submit" class="btn-css">ADD</button>
</form>
<br>
- <button type="button" class="btn-danger" >BACK</button>
+ <button type="button" class="btn-danger" onclick="location.href = 'profile.php?id_active=<?php echo $id;?>';">BACK</button>
</div>
</body>
</html>
diff --git a/src/edit-profile.php b/src/edit-profile.php
index e4daf658769e4089681be6b3aff13516ee999235..8813c7dacc9b94ae35bb8590c3aa2b4b2a6c4c1d 100644
--- a/src/edit-profile.php
+++ b/src/edit-profile.php
@@ -53,7 +53,7 @@
</div>
<div class="row mt5">
<div class="col-4">Phone</div>
- <div class="col-8"><input type="number" name="phone" class="w100" value="<?php echo $phoneno; ?>"></div>
+ <div class="col-8"><input type="text" name="phone" maxlength="14" class="w100" value="<?php echo $phoneno; ?>"></div>
</div>
<div class="row mt5">
<div class="col-4">Status Driver</div>
diff --git a/src/js/fan.js b/src/js/fan.js
index 61e185cebcb431b0d6f04a4f8ae1c9b0ef625321..f4b4b9b0b2d7d168cbc9d38c0af6401000842cb6 100644
--- a/src/js/fan.js
+++ b/src/js/fan.js
@@ -44,6 +44,7 @@ function hideDriver(idhide, id){
xmlhttp.send();
}
+
//INPUT FILE
// 'use strict';