Merge pull request #262 from wanderlust-group-project-1/guide_availab…

…ility Guide Dashboard edits
wanderlust-group-project-1 · Apr 29, 2024 · 1279afb · 1279afb
2 parents a5cd12a + 2eee6c0
commit 1279afb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/views/customer/profile.view.php b/app/views/customer/profile.view.php
@@ -303,7 +303,7 @@
 
 
             <form id="customer" action="<?= ROOT_DIR ?>/customer/update" method="post">
-                <h2>Update Customer Details</h2>
+                <h2 class="row">Update Customer Details</h2>
                 <?php if (isset($errors)) : ?>
                     <div> <?= implode('<br>', $errors) ?> </div>
                 <?php endif; ?>
@@ -322,7 +322,9 @@
                 <label for="nic">NIC Number</label>
                 <input type="text" name="nic" id="nic" value="<?= $user->nic ?>" required>
                 <br />
-                <input type="submit" name="submit" value="Update" class="btn-edit-profile-pic">
+                <div class="row">
+                    <input type="submit" name="submit" value="Update" class="btn-edit-profile-pic">
+                </div>
             </form>
             <!-- </div> -->
         </div>

diff --git a/app/views/guide/GuideDashboard.view.php b/app/views/guide/GuideDashboard.view.php
@@ -123,7 +123,7 @@
         },
         xaxis: {
             type: 'category', // Change type to 'category' for non-datetime values
-            categories: ["Sep", "Oct", "Nov", "Dec", "Jan", "Feb", "Mar"] // Use month names instead of date strings
+            // categories: ["Sep", "Oct", "Nov", "Dec", "Jan", "Feb", "Mar"] // Use month names instead of date strings
         },
         tooltip: {
             x: {
@@ -134,7 +134,6 @@
     };
 
     var chart = new ApexCharts(document.querySelector("#chart"), options);
-    chart.render();
 </script>
 
 <script>
@@ -188,8 +187,10 @@
                 options.series[1].name = 'Completed bookings';
                 options.series[1].data = completedBookingData;
 
-                xaxisCategories = data.data.map(entry => entry.month);
+                const xaxisCategories = data.data.map(entry => entry.month_year);
 
+                // Update the x-axis categories
+                options.xaxis.categories = xaxisCategories;