Bug/7682/fix management page

core/src/main/java/greencity/webcontroller/ManagementPlacesController.java

@@ -98,10 +98,10 @@ public ResponseEntity<PlaceUpdateDto> getPlaceById(@RequestParam("id") Long id)
     @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
     @ResponseBody
     public GenericResponseDto savePlace(
-        @RequestPart("addPlaceDto") AddPlaceDto addPlaceDto,
+        @RequestPart("addPlaceDto") @Valid AddPlaceDto addPlaceDto,
+        BindingResult bindingResult,
         @Parameter(hidden = true) Principal principal,
-        @RequestPart(required = false) @Nullable MultipartFile[] images,
-        BindingResult bindingResult) {
+        @RequestPart(required = false) @Nullable MultipartFile[] images) {
         if (!bindingResult.hasErrors()) {
             placeService.addPlaceFromUi(addPlaceDto, principal.getName(), images);
         }
@@ -114,13 +114,17 @@ public GenericResponseDto savePlace(
      * @param placeUpdateDto of {@link PlaceUpdateDto}
      * @return {@link GenericResponseDto}
      */
+    @PutMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @ResponseBody
-    @PutMapping
-    public GenericResponseDto updatePlace(@Valid @RequestBody PlaceUpdateDto placeUpdateDto,
-        BindingResult bindingResult) {
+    public GenericResponseDto updatePlace(
+        @RequestPart("placeUpdateDto") @Valid PlaceUpdateDto placeUpdateDto,
+        BindingResult bindingResult,
+        @Parameter(hidden = true) Principal principal,
+        @RequestPart(required = false) @Nullable MultipartFile[] images) {
         if (!bindingResult.hasErrors()) {
-            placeService.update(placeUpdateDto);
+            placeService.updateFromUI(placeUpdateDto, images, principal.getName());
         }
+
         return buildGenericResponseDto(bindingResult);
     }
 

core/src/main/resources/messages.properties

@@ -274,7 +274,13 @@ greenCity.places.page.add.place=Add Place
 greenCity.places.page.add.break.hours=Add break hours
 greenCity.places.page.add.discount=Add Discount
 greenCity.places.page.delete=Delete Place
-
+greenCity.places.page.add.address=Address is required
+greenCity.places.page.add.place.name=Place name is required
+greenCity.places.page.add.category=Category is required
+greenCity.places.page.add.working.hours=Opening and closing hours are required for selected days
+greenCity.places.page.add.day.hours=At least one day with opening hours must be selected
+greenCity.places.page.hours.is.incorrect=The difference between opening and closing time must be at least 30 minutes
+greenCity.pages.delete.all.selected=Delete all selected
 /*tagspage*/
 greenCity.tags.page.h=Manage Tags
 greenCity.places.page.add.tag=Add Tag

core/src/main/resources/messages_ua.properties

@@ -246,6 +246,12 @@ greenCity.places.page.add.place=\u0414\u043E\u0434\u0430\u0442\u0438\u0020\u043C
 greenCity.places.page.add.break.hours=\u0414\u043E\u0434\u0430\u0439\u0442\u0435\u0020\u0433\u043E\u0434\u0438\u043D\u0438\u0020\u043F\u0435\u0440\u0435\u0440\u0432\u0438
 greenCity.places.page.add.discount=\u0414\u043E\u0434\u0430\u0442\u0438\u0020\u0437\u043D\u0438\u0436\u043A\u0443
 greenCity.places.page.delete=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438\u0020\u041C\u0456\u0441\u0446\u0435
+greenCity.places.page.add.address=\u041f\u043e\u0442\u0440\u0456\u0431\u043d\u043e\u0020\u0432\u043a\u0430\u0437\u0430\u0442\u0438\u0020\u0430\u0434\u0440\u0435\u0441\u0443
+greenCity.places.page.add.place.name=\u041f\u043e\u0442\u0440\u0456\u0431\u043d\u043e\u0020\u0432\u043a\u0430\u0437\u0430\u0442\u0438\u0020\u043d\u0430\u0437\u0432\u0443\u0020\u043c\u0456\u0441\u0446\u044f
+greenCity.places.page.add.category=\u041f\u043e\u0442\u0440\u0456\u0431\u043d\u043e\u0020\u0432\u0438\u0431\u0440\u0430\u0442\u0438\u0020\u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0456\u044e
+greenCity.places.page.add.working.hours=\u041f\u043e\u0442\u0440\u0456\u0431\u043d\u043e\u0020\u0432\u043a\u0430\u0437\u0430\u0442\u0438\u0020\u0447\u0430\u0441\u0020\u0432\u0456\u0434\u043a\u0440\u0438\u0442\u0442\u044f\u0020\u0442\u0430\u0020\u0437\u0430\u043a\u0440\u0438\u0442\u0442\u044f\u0020\u0434\u043b\u044f\u0020\u0432\u0438\u0431\u0440\u0430\u043d\u0438\u0445\u0020\u0434\u043d\u0456\u0432
+greenCity.places.page.add.day.hours=\u041d\u0435\u043e\u0431\u0445\u0456\u0434\u043d\u043e\u0020\u0432\u0438\u0431\u0440\u0430\u0442\u0438\u0020\u0445\u043e\u0447\u0430\u0020\u0431\u0020\u043e\u0434\u0438\u043d\u0020\u0434\u0435\u043d\u044c\u0020\u0456\u0437\u0020\u0433\u043e\u0434\u0438\u043d\u0430\u043c\u0438\u0020\u0440\u043e\u0431\u043e\u0442\u0438
+greenCity.places.page.hours.is.incorrect=\u0420\u0456\u0437\u043d\u0438\u0446\u044f\u0020\u043c\u0456\u0436\u0020\u0447\u0430\u0441\u043e\u043c\u0020\u0432\u0456\u0434\u043a\u0440\u0438\u0442\u0442\u044f\u0020\u0442\u0430\u0020\u0437\u0430\u043a\u0440\u0438\u0442\u0442\u044f\u0020\u043f\u043e\u0432\u0438\u043d\u043d\u0430\u0020\u0431\u0443\u0442\u0438\u0020\u043d\u0435\u0020\u043c\u0435\u043d\u0448\u0435\u0020\u0033\u0030\u0020\u0445\u0432\u0438\u043b\u0438\u043d
 
 /*tagspage*/
 greenCity.tags.page.h=\u041A\u0435\u0440\u0443\u0432\u0430\u043D\u043D\u044F\u0020\u0442\u0435\u0433\u0430\u043C\u0438

core/src/main/resources/static/management/places/buttonsAJAX.js

@@ -1,6 +1,12 @@
-
 function clearAllErrorsSpan() {
-    $('.errorSpan').text('');
+    $('.errorSpan').text('').hide();
+}
+
+function getErrorSpanId(fieldName) {
+    if (fieldName.includes('openingHoursList[].')) {
+        fieldName = 'openingHoursList';
+    }
+    return 'errorModalSave' + fieldName;
 }
 
 let map;
@@ -59,25 +65,33 @@ $(document).ready(function () {
     // Activate tooltip
     $('[data-toggle="tooltip"]').tooltip();
 
-    // Select/Deselect checkboxes
     let checkbox = $('table tbody input[type="checkbox"]');
-    $("#selectAll").on('click', function () {
-        if (this.checked) {
-            checkbox.each(function () {
-                if (!this.disabled) {
-                    this.checked = true;
-                }
-            });
+    let actionButtons = $('#btnDelete');
+
+    function toggleActionButtons() {
+        let anyChecked = checkbox.filter(':checked').length > 0;
+        if (anyChecked) {
+            actionButtons.removeClass('disabled').attr('href', '#deleteAllSelectedModal');
         } else {
-            checkbox.each(function () {
-                this.checked = false;
-            });
+            actionButtons.addClass('disabled').removeAttr('href');
         }
+    }
+
+    $("#selectAll").on('click', function () {
+        let isChecked = this.checked;
+        checkbox.each(function () {
+            if (!this.disabled) {
+                this.checked = isChecked;
+            }
+        });
+        toggleActionButtons();
     });
+
     checkbox.on('click', function () {
         if (!this.checked) {
             $("#selectAll").prop("checked", false);
         }
+        toggleActionButtons();
     });
 
     // Add place button (popup)
@@ -125,62 +139,161 @@ $(document).ready(function () {
         event.preventDefault();
         clearAllErrorsSpan();
 
-        let formData = new FormData(document.getElementById('addPlaceForm'));
+        let isValid = validateForm();
+        if (!isValid) {
+            return;
+        }
 
-        let place;
+        let formData = new FormData(document.getElementById('addPlaceForm'));
         let type = $('#id').val() ? 'PUT' : 'POST';
 
         if (type === 'POST') {
-            place = {
-                "placeName": formData.get('name'),
-                "locationName": formData.get('address'),
-                "status": formData.get('status'),
-                "categoryName": formData.get('category')
-            };
+            handlePostRequest(formData);
         } else {
-            place = {
-                "id": formData.get('id'),
-                "placeName": formData.get('name'),
-                "locationName": formData.get('address'),
-                "status": formData.get('status'),
-                "categoryName": formData.get('category')
-            };
+            handlePutRequest(formData);
         }
+    });
 
-        place.discountValues = getDiscountValues();
-        place.openingHoursList = getOpeningHours();
+    function handlePostRequest(formData) {
+        const place = {
+            "placeName": formData.get('name'),
+            "locationName": formData.get('address'),
+            "status": formData.get('status'),
+            "categoryName": formData.get('category'),
+            "discountValues": getDiscountValues(),
+            "openingHoursList": getOpeningHours()
+        };
+
+        submitPostFormData('/management/places', 'POST', formData, place);
+    }
 
+    function handlePutRequest(formData) {
+        const place = {
+            id: formData.get('id'),
+            name: formData.get('name'),
+            location: {
+                address: formData.get('address'),
+                lat: formData.get('lat'),
+                lng: formData.get('lng'),
+                addressUa: formData.get('addressUa'),
+            },
+            category: {
+                name: formData.get('category'),
+            },
+            discountValues: getDiscountValues(),
+            openingHoursList: getOpeningHours(),
+        };
+
+        submitPutFormData('/management/places', 'PUT', formData, place);
+    }
+
+    function submitPostFormData(url, method, formData, place) {
         formData.append('addPlaceDto', JSON.stringify(place));
-        var file = document.getElementById("creationFile").files[0];
-        console.log(file);
-        formData.append("images", file);
+        const file = document.getElementById("creationFile").files[0];
+        if (file) {
+            formData.append("images", file);
+        }
+
+        sendAjaxRequest(url, method, formData);
+    }
+
+    function submitPutFormData(url, method, formData, place) {
+        formData.append('placeUpdateDto', JSON.stringify(place));
+        const fileInput = document.getElementById('creationFile');
+
+        Array.from(fileInput?.files || []).forEach((file) => {
+            formData.append('images', file);
+        });
+
+        sendAjaxRequest(url, method, formData);
+    }
+
+    function sendAjaxRequest(url, method, formData) {
         $.ajax({
-            url: '/management/places',
-            type: type,
+            url: url,
+            type: method,
             data: formData,
             processData: false,
             contentType: false,
             success: function (data) {
                 if (Array.isArray(data.errors) && data.errors.length) {
                     data.errors.forEach(function (el) {
-                        $(document.getElementById(getErrorSpanId(el.fieldName))).text(el.fieldError);
+                        $(document.getElementById(getErrorSpanId(el.fieldName))).text(el.fieldError).show();
                     });
                 } else {
                     location.reload();
                 }
             },
             error: function (xhr, status, error) {
-                console.error(error);
-                alert('Error');
+                console.error('XHR Status: ' + xhr.status);
+                console.error('Error: ' + error);
+                console.error('Response Text: ' + xhr.responseText);
+
+                let errorMessage = `Error status: ${xhr.status} - ${error}`;
+                if (xhr.responseText) {
+                    try {
+                        const response = JSON.parse(xhr.responseText);
+                        errorMessage += `\nMessage: ${response.message || 'Unknown error'}`;
+                    } catch (e) {
+                        errorMessage += `\nMessage: ${xhr.responseText}`;
+                    }
+                }
+
+                alert(errorMessage);
             }
         });
-    });
+    }
+
+    function validateForm() {
+        let isValid = true;
 
-    function getErrorSpanId(fieldName) {
-        if (fieldName.includes('openingHoursList[].')) {
-            fieldName = 'openingHoursList';
+        const requiredFields = [
+            { id: 'address', errorId: 'errorModalSavelocation', message: messages["greenCity.places.page.add.address"] },
+            { id: 'placeName', errorId: 'errorModalSavename', message: messages["greenCity.places.page.add.place.name"] },
+            { id: 'category', errorId: 'errorModalSavecategory', message: messages["greenCity.places.page.add.category"] },
+        ];
+
+        requiredFields.forEach(field => {
+            let value = $(`#${field.id}`).val();
+            if (!value) {
+                $(`#${field.errorId}`).text(field.message).show();
+                isValid = false;
+            }
+        });
+
+
+        let openingHoursChecked = false;
+        $('input[name="day"]:checked').each(function () {
+            let row = $(this).closest('.form-row');
+            let openTime = row.find('input[name="openTime"]').val();
+            let closeTime = row.find('input[name="closeTime"]').val();
+
+            if (!openTime || !closeTime) {
+                $('#errorModalSaveopeningHoursList').text(messages["greenCity.places.page.add.working.hovers"]).show();
+                isValid = false;
+            } else {
+                let openTimeMinutes = timeToMinutes(openTime);
+                let closeTimeMinutes = timeToMinutes(closeTime);
+
+                if (closeTimeMinutes - openTimeMinutes < 30) {
+                    $('#errorModalSaveopeningHoursList').text(messages["greenCity.places.page.hovers.is.incorrect"]).show();
+                    isValid = false;
+                }
+            }
+            openingHoursChecked = true;
+        });
+
+        if (!openingHoursChecked) {
+            $('#errorModalSaveopeningHoursList').text(messages["greenCity.places.page.add.day.hovers"]).show();
+            isValid = false;
         }
-        return 'errorModalSave' + fieldName;
+
+        return isValid;
+    }
+
+    function timeToMinutes(time) {
+        let [hours, minutes] = time.split(':').map(Number);
+        return hours * 60 + minutes;
     }
 
     function getDiscountValues() {
@@ -285,14 +398,10 @@ $(document).ready(function () {
         $.get(href, function (place) {
             $('#id').val(place.id)
             $('#placeName').val(place.name);
+            $('#lng').val(place.location.lng);
+            $('#lat').val(place.location.lat);
+            $('#addressUa').val(place.location.addressUa);
             $('#address').val(place.location.address);
-            $('input[name=latitude]').val(place.location.lat);
-            $('input[name=longitude]').val(place.location.lng);
-            deleteMarkers();
-            let location = {
-                lat: place.location.lat,
-                lng: place.location.lng
-            };
             addMarker(location);
             place.openingHoursList.forEach(function (day) {
                 let dayElement = $(`#${day.weekDay}`);
@@ -310,7 +419,6 @@ $(document).ready(function () {
             place.discountValues.forEach(value => {
                 addDiscountValueForUpdate(value);
             });
-
         });
     });