Picking a slot page now requests the next week for correct resource f…

…rom the API. Part of #9
DoESLiverpool · Oct 3, 2020 · 1a07607 · 1a07607
1 parent 4a3bd3b
commit 1a07607
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/website/routes/select-a-time.js b/website/routes/select-a-time.js
@@ -1,5 +1,6 @@
 const express = require('express');
 const axios = require('axios');
+const moment = require('moment');
 const utilities = require('../utilities');
 const settings = require('../settings');
 
@@ -15,8 +16,12 @@ router.get('/select-a-time', function (req, res) {
         console.log('No resource id');
     }
 
+    // Default to showing the next week...
+    const fromDate = moment();
+    const toDate = moment().add(6, 'days')
+
     const resourceUrl = `${apiUrl}/resources/${resourceId}`;
-    const calendarUrl = `${apiUrl}/calendar/2020-08-25/2020-09-01/1`;
+    const calendarUrl = `${apiUrl}/calendar/${fromDate.format('YYYY-MM-DD')}/${toDate.format('YYYY-MM-DD')}/${resourceId}`;
     const templateVariables = {};
 
     axios.get(resourceUrl)

diff --git a/website/templates/select-a-time.html b/website/templates/select-a-time.html
@@ -25,7 +25,7 @@ <h2>
         <div class="calendar">
             {% for d in calendar.dates %}
                 {% for r in d.resources %}
-                    <p>Resource name: {{r.resourceName}}</p>
+                    <p>{{ d.date }} Resource name: {{r.resourceName}}</p>
                 {% endfor %}
             {% endfor %}
         </div>
@@ -42,4 +42,4 @@ <h3>UI to display and select available slots for the resource to go here</h3>
 
 </main>
 
-{% endblock %}
+{% endblock %}