Changeset 53765dd for src/main/resources

Timestamp:

01/04/24 09:07:47 (6 months ago)

Author:

gjoko kostadinov <gjokokostadinov@…>

Branches:

master

Children:

e8999eb

Parents:

1413ee2

Message:

Fix bugs.

Location:

src/main/resources

Files:

• data.sql (modified) (1 diff)
• static/js/business_admin.js (modified) (6 diffs)
• static/js/customer_admin.js (modified) (3 diffs)
• static/js/homepage.js (modified) (2 diffs)
• static/js/register_business.js (modified) (3 diffs)

src/main/resources/data.sql

@@ -13 +13 @@
        (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'waxing', 6),
        (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'nail extensions', 2),
-       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'dress shortening', 1),
-       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'holes fixing', 1);
+       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'dress sewing', 1),
+       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'pants shortening', 1);
 
 insert into stakeholder (id, created, phone_number, email, first_name, last_name, modified, password, stakeholder_type, username)

src/main/resources/static/js/business_admin.js

@@ -1 +1 @@
 $(document).ready(function() {
     var business = {};
-
-    getBusinessInfo().then(function (data) {
-        business = data;
-    });
+    var serviceTypeList = {};
+
+    getServiceTypes().then(function (serviceTypes) {
+        serviceTypeList = serviceTypes;
+        getBusinessInfo(serviceTypes).then(function (data) {
+            business = data;
+        });
+    });
+
+
 
     getAppointments();
@@ -71 +77 @@
 
         updateServices(servicesObj).then(function (response) {
-            getBusinessInfo().then(function (data) {
+            getBusinessInfo(serviceTypeList).then(function (data) {
                 business = data;
             });
@@ -78 +84 @@
         if (servicesForDelete.length > 0) {
             deleteServices(servicesForDelete).then(function (response) {
-                getBusinessInfo().then(function (data) {
+                getBusinessInfo(serviceTypeList).then(function (data) {
                     business = data;
                 });
@@ -101 +107 @@
 
         updateBusinessInfo(businesses).then(function() {
-            getBusinessInfo().then(function (found) {
+            getBusinessInfo(serviceTypeList).then(function (found) {
                 business = found;
             });
@@ -205 +211 @@
 }
 
-function getBusinessInfo() {
+function getServiceTypes() {
+    return $.ajax({
+        url: "http://localhost:8080/api/nomenclature/serviceTypes/me"
+    }).then(function (serviceTypes) {
+        return serviceTypes;
+    });
+}
+
+function getBusinessInfo(serviceTypeList) {
     return $.ajax({
         url: "http://localhost:8080/api/business/me"
@@ -231 +245 @@
         var $el = $("#predefined_services_admin_panel");
         $el.empty();
+        const existingServiceTypeIds = business['services'].map(service => service['serviceType']['id']);
+        const missingAddedServiceTypes = serviceTypeList.filter(serviceType => existingServiceTypeIds.indexOf(serviceType['id']) === -1);
+        //console.log(missingAddedServiceTypes);
 
         $.each(business['services'], function (index, obj) {

src/main/resources/static/js/customer_admin.js

@@ -1 +1 @@
 $(document).ready(function() {
-
-    getCustomerInfo();
+    var customer = {};
+
+    getCustomerInfo().then(function (customerData) {
+        customer = customerData;
+    });
 
     getFutureAppointments();
@@ -70 +73 @@
 
 function getCustomerInfo() {
-    $.ajax({
+    return $.ajax({
         url: "http://localhost:8080/api/customer/me"
     }).success(function (customer) {
@@ -82 +85 @@
         $('#email').val(customer['email']);
         $('#username').val(customer['username']);
+        return customer;
     }).error(function (error) {
         console.log(JSON.stringify(error));

src/main/resources/static/js/homepage.js

@@ -59 +59 @@
 
     $.ajax({
-        url: "http://localhost:8080/api/nomenclatures/businessTypes"
+        url: "http://localhost:8080/api/nomenclature/businessTypes"
     }).then(function (data) {
         businessTypes = data;
@@ -338 +338 @@
     }).then(function (data) {
         var $el = $("#reviewsModalBody");
-        $('#reviews-ul').append($('<td class="form-outline mb-4"><button type="button" id="reviews-li" class="btn btn-primary btn-block" data-bs-toggle="modal" data-bs-target="#showReviewsModal">Checkout reviews</button></td>'));
+        $('#reviews-ul').append($('<button type="button" id="reviews-li" class="btn btn-primary btn-block" data-bs-toggle="modal" data-bs-target="#showReviewsModal">Checkout reviews</button>'));
         $el.empty();
 

src/main/resources/static/js/register_business.js

@@ -2 +2 @@
     var enumerations = {};
     $.ajax({
-        url: "http://localhost:8080/api/nomenclatures/businessTypes"
+        url: "http://localhost:8080/api/nomenclature/businessTypes"
     }).then(function (data) {
         enumerations = data;
         var $el = $("#companyType");
-        //$el.empty(); // remove old options
 
         $.each(data, function (index, obj) {
@@ -103 +102 @@
         });
         businessObj['services'] = servicesObj;
-        console.log(businessObj);
         $.ajax({
             url: "http://localhost:8080/api/business",
@@ -113 +111 @@
                 alert( "Well done! You have finished the registration process. " +
                     "Please check periodically to see if the company has been approved." );
-                window.location.href = "/homepage";
+                window.location.href = "/login";
             },
             error: function(err) {