From 6c97543af0a1af6dcc1db2c4c254fbaab16a4a2c Mon Sep 17 00:00:00 2001 From: Pathum chinthaka Date: Thu, 16 Nov 2023 22:59:36 +0530 Subject: [PATCH] update booking details content --- config/serverUrl.js | 4 +- controller/BookingDetails.js | 76 +++++++++++- controller/VehicleDetailsController.js | 11 +- custompackage.html | 159 ++----------------------- index.html | 6 +- 5 files changed, 93 insertions(+), 163 deletions(-) diff --git a/config/serverUrl.js b/config/serverUrl.js index 1d1d78f..bc527dd 100644 --- a/config/serverUrl.js +++ b/config/serverUrl.js @@ -1,6 +1,8 @@ //server URL // const baseURL = "http://localhost:8085/NextTravel/api/"; - const baseURL = "http://localhost:8075/NextTravel/api/v1/package/"; + const baseURL = "http://localhost:8075/NextTravel/api/v1/"; + + const vehicleBaseURL = "http://localhost:8065/NextTravel/api/v1/vehicle"; const baseWebURL="http://localhost:8080/NextTravel/api/"; diff --git a/controller/BookingDetails.js b/controller/BookingDetails.js index f4f93cd..51aad73 100644 --- a/controller/BookingDetails.js +++ b/controller/BookingDetails.js @@ -1,10 +1,11 @@ $(document).ready(function () { getAllPackageDetails(); + getAllVehicleDetails(); }); function getAllPackageDetails() { $.ajax({ - url: baseURL + "getAll", + url: baseURL + "package/getAll", method: "GET", success: function (response) { $("#package-table tbody").empty(); @@ -57,4 +58,77 @@ function getAllPackageDetails() { alert("An error occurred: " + error); } }); +} + +function getAllVehicleDetails(){ + $.ajax({ + url: vehicleBaseURL + "/getAll", + method: "GET", + success: function (response) { + $("#package-table tbody").empty(); + response.forEach(element => { + const cardData = + `
+
+
${element.data.vehicleCategory}
+
+
+
+ Vehicle Name : + ${element.data.vehicleName} +
+
+ Fuel type : + ${element.data.fuelType} +
+
+ Fuel usage : + ${element.data.fuelUsage} +
+
+ Is Hybrid : + ${element.data.isHybrid} +
+
+ Seat Count : + ${element.data.seatCount} +
+
+
+
+ Auto/Menual type : + ${element.data.transmissionType} +
+
+ Fuel Usage Cost : + ${element.data.fuelUsageCost} +
+
+ Per Day Charge : + ${element.data.perDayCharge} +
+
+ Per 1 km charge : + ${element.data.vehicle1kmCharge} +
+
+ Policy Types : + ${element.data.policyType} +
+
+
+
+ Vehicle Remarks +

${element.data.remarks}

+
+ +
+
`; + $("#Vehicle-Details").append(cardData); + }); + }, + error: function (xhr, status, error) { + alert("An error occurred: " + error); + } + }); } \ No newline at end of file diff --git a/controller/VehicleDetailsController.js b/controller/VehicleDetailsController.js index 9ce0ecf..b3ba615 100644 --- a/controller/VehicleDetailsController.js +++ b/controller/VehicleDetailsController.js @@ -131,7 +131,7 @@ $("#vehicle-save-btn").click(function (e) { // Create Post Request $.ajax({ - url: baseURL + "vehicle/save", + url: vehicleBaseURL + "/save", method: "post", data: JSON.stringify(vehicleDetailsObj), contentType: "application/json", @@ -141,7 +141,6 @@ $("#vehicle-save-btn").click(function (e) { alert(response.message); getAllVehicleDetails(); clearVehicleInputs(); - } }, error: function (xhr, status, error) { @@ -154,7 +153,7 @@ $("#vehicle-save-btn").click(function (e) { //get All vehicle details function getAllVehicleDetails() { $.ajax({ - url: baseURL + "vehicle/getAll", + url: vehicleBaseURL + "/getAll", method: "GET", success: function (response) { //load 1 st table data @@ -198,7 +197,7 @@ getAllVehicleDetails(); $("#vehicle-tbody-one,#vehicle-tbody-two").on('click', 'tr', (event) => { const vehicleId=$(event.target).closest('tr').find('td').eq(0).text(); $.ajax({ - url: baseURL + "vehicle/" + vehicleId, + url: vehicleBaseURL + "/" + vehicleId, method: "GET", success: function (response) { console.log(response.data); @@ -230,7 +229,7 @@ $("#vehicle-update-btn").click(function (e) { //create put mapping ajax $.ajax({ - url: baseURL + "vehicle/update", + url: vehicleBaseURL + "vehicle/update", method: "put", data: JSON.stringify(vehicleDetailsObj), contentType: "application/json", @@ -256,7 +255,7 @@ $("#vehicle-delete-btn").click(function (e) { if (choice == true) { const vehicleId = $('#vehicle_id').val(); $.ajax({ - url: baseURL + "vehicle/" + vehicleId, + url: vehicleBaseURL + "vehicle/" + vehicleId, method: "delete", dataType: "json", success: function (response) { diff --git a/custompackage.html b/custompackage.html index 757f541..eaadeab 100644 --- a/custompackage.html +++ b/custompackage.html @@ -24,175 +24,32 @@

Travel packages 🗳

-
-
- +
- +
-

Travel-Area

+

Hotel Details

-
-
- ... -
-
Regular
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
- ... -
-
Mid-level
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
- ... -
-
Luxury
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
- ... -
-
Super Luxury
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
-
- +
+
-

Hotels

+

Vehicle Details

-
-
- ... -
-
Regular
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
- ... -
-
Mid-level
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
- ... -
-
Luxury
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
- ... -
-
Super Luxury
-

Some quick example text to build on the card title and make up the bulk of the - card's content.

-
-
-
-
- - - +
+
diff --git a/index.html b/index.html index 2fb9b45..a6d2d3d 100644 --- a/index.html +++ b/index.html @@ -358,18 +358,16 @@
Follow us
- + \ No newline at end of file