Merge branch 'master' of http://gitlab.informatika.org/IF3110-2018-K03-Petjah/tugasbesar1_2018

web/css/basic.css

@@ -153,6 +153,11 @@ a {
 }
 
 
+.c-border {
+    border: 2px solid black!important;
+}
+
+
 .alert-box:before,
 .alert-box:after {
     content: "";

web/history/controller.php

@@ -20,7 +20,22 @@ class historyController {
         $conn = connect_to_mysql();
         $arrResult = array();
         if ($conn != null) {
-            $sql_query = "SELECT * FROM book_order JOIN books ON book_id=books.ID where user_Id=$userId ORDER BY tanggal DESC";
+//            $sql_query = "SELECT * FROM book_order JOIN books ON book_id=books.ID where user_Id=$userId ORDER BY tanggal DESC";
+            $sql_query = "
+                        SELECT 
+                            *,
+                            (CASE
+                                WHEN EXISTS (SELECT * FROM review where Nomor_Order=order_id) THEN TRUE
+                                ELSE FALSE
+                            END) as reviewed
+                        FROM 
+                            book_order 
+                        JOIN 
+                            books
+                        ON 
+                            book_id=books.ID 
+                        where user_Id=$userId ORDER BY tanggal DESC, Nomor_Order DESC
+            ";
             $result = $conn->query($sql_query);
             if ($result != NULL){
                 while ($row = $result->fetch_assoc()) {

web/history/view.php

@@ -40,7 +40,7 @@ class historyView {
         $resultHTML = '
             <div class="flex-history-item align-items-flex-start">
                 <div class="flex-1">
-                    <img class="history-image-item" src="'.$data['imgSource'].'">
+                    <img class="c-border history-image-item" src="'.$data['imgSource'].'">
                 </div>
                 <div class="flex-2" >
                     <div class="orange-text text-size-40 title-item-history" >'.$data['itemName'].'</div>
@@ -67,7 +67,7 @@ class historyView {
         $resultHTML = '
             <div class="flex-history-item align-items-flex-start">
                 <div class="flex-1">
-                    <img class="history-image-item" src="'.$data['imgSource'].'">
+                    <img class="c-border history-image-item" src="'.$data['imgSource'].'">
                 </div>
                 <div class="flex-2" >
                     <div class="orange-text text-size-40 title-item-history" >'.$data['itemName'].'</div>
@@ -76,8 +76,8 @@ class historyView {
                 </div>
                 <div id="right-most-column-history-item">
                     <div class="flex-container align-items-flex-end  add-flex-direction-column ">
-                        <div class="font-weight-bold gray-text">'.$data['date'].'</div>
-                        <div class="font-weight-bold gray-text">Nomor Order #'.$data['orderNumber'].'</div>                    
+                        <div class="font-weight-bold text-size-20 gray-text">'.$data['date'].'</div>
+                        <div class="font-weight-bold text-size-20 gray-text">Nomor Order #'.$data['orderNumber'].'</div>                    
                     </div>
                 </div>
             </div>

web/profile/view.php

@@ -20,7 +20,7 @@ function viewProfile (array $params) {
             <label id="label-text-my-profile" >My Profile</label>
         </div>
 
-        <div class="text-size-40" id="profile-data-table">
+        <div class="text-size-30" id="profile-data-table">
             <div class="flex-container align-items-flex-center">
                 <object class="icon-profile" type="image/svg+xml" data="../svgIcon/user.svg">
                     Your browser does not support SVG