From b7d9efe7c3ea83fd4de767788a6ecc9da3bc4e55 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Tue, 18 Jan 2022 09:29:56 +0100
Subject: [PATCH] Remove prefix from service HTML elements

---
 application/views/pages/services.php | 38 ++++++++++++++--------------
 assets/js/pages/services.js          | 28 ++++++++++----------
 2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/application/views/pages/services.php b/application/views/pages/services.php
index d4b6f04d..d95feb54 100755
--- a/application/views/pages/services.php
+++ b/application/views/pages/services.php
@@ -53,53 +53,53 @@
 
             <div class="form-message alert" style="display:none;"></div>
 
-            <input type="hidden" id="service-id">
+            <input type="hidden" id="id">
 
             <div class="mb-3">
-                <label class="form-label" for="service-name">
+                <label class="form-label" for="name">
                     <?= lang('name') ?>
                     <span class="text-danger">*</span>
                 </label>
-                <input id="service-name" class="form-control required" maxlength="128">
+                <input id="name" class="form-control required" maxlength="128">
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-duration">
+                <label class="form-label"  for="duration">
                     <?= lang('duration_minutes') ?>
                     <span class="text-danger">*</span>
                 </label>
-                <input id="service-duration" class="form-control required" type="number" min="<?= EVENT_MINIMUM_DURATION ?>">
+                <input id="duration" class="form-control required" type="number" min="<?= EVENT_MINIMUM_DURATION ?>">
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-price">
+                <label class="form-label"  for="price">
                     <?= lang('price') ?>
                     <span class="text-danger">*</span>
                 </label>
-                <input id="service-price" class="form-control required">
+                <input id="price" class="form-control required">
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-currency">
+                <label class="form-label"  for="currency">
                     <?= lang('currency') ?>
 
                 </label>
-                <input id="service-currency" class="form-control" maxlength="32">
+                <input id="currency" class="form-control" maxlength="32">
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-category">
+                <label class="form-label"  for="category">
                     <?= lang('category') ?>
                 </label>
-                <select id="service-category" class="form-control"></select>
+                <select id="category" class="form-control"></select>
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-availabilities-type">
+                <label class="form-label"  for="availabilities-type">
                     <?= lang('availabilities_type') ?>
 
                 </label>
-                <select id="service-availabilities-type" class="form-control">
+                <select id="availabilities-type" class="form-control">
                     <option value="<?= AVAILABILITIES_TYPE_FLEXIBLE ?>">
                         <?= lang('flexible') ?>
                     </option>
@@ -110,26 +110,26 @@
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-attendants-number">
+                <label class="form-label"  for="attendants-number">
                     <?= lang('attendants_number') ?>
                     <span class="text-danger">*</span>
                 </label>
-                <input id="service-attendants-number" class="form-control required" type="number" min="1">
+                <input id="attendants-number" class="form-control required" type="number" min="1">
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-location">
+                <label class="form-label"  for="location">
                     <?= lang('location') ?>
 
                 </label>
-                <input id="service-location" class="form-control">
+                <input id="location" class="form-control">
             </div>
 
             <div class="mb-3">
-                <label class="form-label"  for="service-description">
+                <label class="form-label"  for="description">
                     <?= lang('description') ?>
                 </label>
-                <textarea id="service-description" rows="4" class="form-control"></textarea>
+                <textarea id="description" rows="4" class="form-control"></textarea>
             </div>
         </div>
     </div>
diff --git a/assets/js/pages/services.js b/assets/js/pages/services.js
index b416ccc9..e52f63e2 100644
--- a/assets/js/pages/services.js
+++ b/assets/js/pages/services.js
@@ -16,16 +16,16 @@
  */
 App.Pages.Services = (function () {
     const $services = $('#services');
-    const $id = $('#service-id');
-    const $name = $('#service-name');
-    const $duration = $('#service-duration');
-    const $price = $('#service-price');
-    const $currency = $('#service-currency');
-    const $category = $('#service-category');
-    const $availabilitiesType = $('#service-availabilities-type');
-    const $attendantsNumber = $('#service-attendants-number');
-    const $location = $('#service-location');
-    const $description = $('#service-description');
+    const $id = $('#id');
+    const $name = $('#name');
+    const $duration = $('#duration');
+    const $price = $('#price');
+    const $currency = $('#currency');
+    const $category = $('#category');
+    const $availabilitiesType = $('#availabilities-type');
+    const $attendantsNumber = $('#attendants-number');
+    const $location = $('#location');
+    const $description = $('#description');
     const $filterServices = $('#filter-services');
     let filterResults = {};
     let filterLimit = 20;
@@ -385,15 +385,13 @@ App.Pages.Services = (function () {
      */
     function updateAvailableCategories() {
         App.Http.Categories.search('', 999).then((response) => {
-            var $select = $('#service-category');
-
-            $select.empty();
+            $category.empty();
 
             response.forEach((category) => {
-                $select.append(new Option(category.name, category.id));
+                $category.append(new Option(category.name, category.id));
             });
 
-            $select.append(new Option('- ' + lang('no_category') + ' -', '')).val('');
+            $category.append(new Option('- ' + lang('no_category') + ' -', '')).val('');
         });
     }