From 927dcbe4f52d660698b1abf3fdb4afc288e66e98 Mon Sep 17 00:00:00 2001
From: Irfan Ariq <irfanariq@home.com>
Date: Wed, 29 Nov 2017 23:48:15 +0000
Subject: [PATCH] edit gitignore
---
PrOjek/.gitignore | 2 +-
.../src/main/webapp/resources/js/order.js | 138 +++++++++---------
2 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/PrOjek/.gitignore b/PrOjek/.gitignore
index f21c7960b..66452a21f 100644
--- a/PrOjek/.gitignore
+++ b/PrOjek/.gitignore
@@ -20,4 +20,4 @@ classes/*
gradlew.bat
gradlew
gradle/
-copy.sh
\ No newline at end of file
+deploy.sh
\ No newline at end of file
diff --git a/PrOjek/webapp/src/main/webapp/resources/js/order.js b/PrOjek/webapp/src/main/webapp/resources/js/order.js
index 1102664a4..af5ad0cc9 100644
--- a/PrOjek/webapp/src/main/webapp/resources/js/order.js
+++ b/PrOjek/webapp/src/main/webapp/resources/js/order.js
@@ -123,76 +123,76 @@ function grabDriver(){
destination = document.getElementById('destination').value;
var preferreddriver = document.getElementById('preferreddriver').value;
var url = "/soapservlet";
- if (preferreddriver != "") {
- postAjax(url, {name: "get-driver", dest: destination, loc: pickingpoint, prefDriver: preferreddriver}, function (data1) {
- console.log(data1);
- var createElement = document.getElementById('prefer-driver');
- var prefdetail = JSON.parse(data1);
- var addRow = "";
- if (prefdetail.hasOwnProperty('answer')) {
- addRow += "<div id='no-pref'>Nothing to display :(</div>";
- } else {
- if (prefdetail.length > 0) {
- for (var i = 0; i < prefdetail.length; i++) {
- addRow += "<div class='row'>";
- addRow += "<div class='col-4'>";
- addRow += "<div class='picture driver-picture'>";
- addRow += "<img src='" + prefdetail[i]['profile_pic_url'] + "'>";
- addRow += "</div>";
- addRow += "</div>";
- addRow += "<div class='col-8 driver-detail'>";
- addRow += "<div class='driver-name'>";
- addRow += prefdetail[i]['name'];
- addRow += "</div>";
- addRow += "<div class='driver-rating'>";
- addRow += "<span style='color:orange'>☆</span><span class='rating'>" + prefdetail[i]['rating'] + "</span>(" + prefdetail[i]['votes'] + " votes)";
- addRow += "</div>";
- addRow += "<div class='row'>";
- addRow += "<a href='#' class='button button-success right' id='" + prefdetail[i]['ID'] + "' onclick='selectDriver(this)'>I CH0OSE YOU!</a>";
- addRow += "</div></div></div>";
- }
- } else {
- addRow += "<div id='no-pref'>Nothing to display :(</div>";
- }
- }
- createElement.innerHTML = addRow;
- nextToSelectDriver()
- });
- } else {
- postAjax(url, {name: "get-driver", dest: destination, loc: pickingpoint}, function (data2) {
- var driversdetail = JSON.parse(data2);
- var createElement = document.getElementById('other-driver');
- var addRow = "";
- if (driversdetail.hasOwnProperty('answer')) {
- addRow += "<div id='no-other-driver'>Nothing to display :(</div>";
- } else {
- if (driversdetail.length > 0) {
- for (var i = 0; i < driversdetail.length; i++) {
- addRow += "<div class='row'>";
- addRow += "<div class='col-4'>";
- addRow += "<div class='picture driver-picture'>";
- addRow += "<img src='" + driversdetail[i]['profile_pic_url'] + "'>";
- addRow += "</div>";
- addRow += "</div>";
- addRow += "<div class='col-8 driver-detail'>";
- addRow += "<div class='driver-name'>";
- addRow += driversdetail[i]['name'];
- addRow += "</div>";
- addRow += "<div class='driver-rating'>";
- addRow += "<span style='color:orange'>☆</span><span class='rating'>" + driversdetail[i]['rating'] + "</span>(" + driversdetail[i]['votes'] + " votes)";
- addRow += "</div>";
- addRow += "<div class='row'>";
- addRow += "<a href='#' class='button button-success right' id='" + driversdetail[i]['id'] + "' onclick='selectDriver(this)'>I CH0OSE YOU!</a>";
- addRow += "</div></div></div>";
- }
- } else {
- addRow += "<div id='no-other-driver'>Nothing to display :(</div>";
- }
- }
- createElement.innerHTML = addRow;
+ // if (preferreddriver != "") {
+ // postAjax(url, {name: "get-driver", dest: destination, loc: pickingpoint, prefDriver: preferreddriver}, function (data1) {
+ // console.log(data1);
+ // var createElement = document.getElementById('prefer-driver');
+ // var prefdetail = JSON.parse(data1);
+ // var addRow = "";
+ // if (prefdetail.hasOwnProperty('answer')) {
+ // addRow += "<div id='no-pref'>Nothing to display :(</div>";
+ // } else {
+ // if (prefdetail.length > 0) {
+ // for (var i = 0; i < prefdetail.length; i++) {
+ // addRow += "<div class='row'>";
+ // addRow += "<div class='col-4'>";
+ // addRow += "<div class='picture driver-picture'>";
+ // addRow += "<img src='" + prefdetail[i]['profile_pic_url'] + "'>";
+ // addRow += "</div>";
+ // addRow += "</div>";
+ // addRow += "<div class='col-8 driver-detail'>";
+ // addRow += "<div class='driver-name'>";
+ // addRow += prefdetail[i]['name'];
+ // addRow += "</div>";
+ // addRow += "<div class='driver-rating'>";
+ // addRow += "<span style='color:orange'>☆</span><span class='rating'>" + prefdetail[i]['rating'] + "</span>(" + prefdetail[i]['votes'] + " votes)";
+ // addRow += "</div>";
+ // addRow += "<div class='row'>";
+ // addRow += "<a href='#' class='button button-success right' id='" + prefdetail[i]['ID'] + "' onclick='selectDriver(this)'>I CH0OSE YOU!</a>";
+ // addRow += "</div></div></div>";
+ // }
+ // } else {
+ // addRow += "<div id='no-pref'>Nothing to display :(</div>";
+ // }
+ // }
+ // createElement.innerHTML = addRow;
+ // nextToSelectDriver()
+ // });
+ // } else {
+ // postAjax(url, {name: "get-driver", dest: destination, loc: pickingpoint}, function (data2) {
+ // var driversdetail = JSON.parse(data2);
+ // var createElement = document.getElementById('other-driver');
+ // var addRow = "";
+ // if (driversdetail.hasOwnProperty('answer')) {
+ // addRow += "<div id='no-other-driver'>Nothing to display :(</div>";
+ // } else {
+ // if (driversdetail.length > 0) {
+ // for (var i = 0; i < driversdetail.length; i++) {
+ // addRow += "<div class='row'>";
+ // addRow += "<div class='col-4'>";
+ // addRow += "<div class='picture driver-picture'>";
+ // addRow += "<img src='" + driversdetail[i]['profile_pic_url'] + "'>";
+ // addRow += "</div>";
+ // addRow += "</div>";
+ // addRow += "<div class='col-8 driver-detail'>";
+ // addRow += "<div class='driver-name'>";
+ // addRow += driversdetail[i]['name'];
+ // addRow += "</div>";
+ // addRow += "<div class='driver-rating'>";
+ // addRow += "<span style='color:orange'>☆</span><span class='rating'>" + driversdetail[i]['rating'] + "</span>(" + driversdetail[i]['votes'] + " votes)";
+ // addRow += "</div>";
+ // addRow += "<div class='row'>";
+ // addRow += "<a href='#' class='button button-success right' id='" + driversdetail[i]['id'] + "' onclick='selectDriver(this)'>I CH0OSE YOU!</a>";
+ // addRow += "</div></div></div>";
+ // }
+ // } else {
+ // addRow += "<div id='no-other-driver'>Nothing to display :(</div>";
+ // }
+ // }
+ // createElement.innerHTML = addRow;
nextToSelectDriver()
- });
- }
+ // });
+ // }
}
document.getElementById('pickingpoint').onkeyup = function(event){
--
GitLab