Skip to content

Commit b5faac1

Browse files
committed
updates for 2021 events
1 parent 2da42a0 commit b5faac1

3 files changed

Lines changed: 23 additions & 21 deletions

File tree

core/static/js/bundle.fishfryform.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/static/js/bundle.fishfryform.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/fishfryform.js

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ require("./lib/typeahead.js/dist/typeahead.bundle")
1919
// Easter dates
2020
// TODO: don't hardcode this
2121
window.easterDates = {
22-
easterSunday: ['2020-04-12'],
23-
goodFriday: ['2020-04-10'],
24-
ashWednesday: ['2020-02-26'],
22+
easterSunday: ['2020-04-04'],
23+
goodFriday: ['2021-04-02'],
24+
ashWednesday: ['2021-02-17'],
2525
lentenFridays: [
26-
'2020-04-03',
27-
'2020-03-27',
28-
'2020-03-20',
29-
'2020-03-13',
30-
'2020-03-06',
31-
'2020-02-28'
26+
'2021-02-19',
27+
'2021-02-26',
28+
'2021-03-05',
29+
'2021-03-12',
30+
'2021-03-19',
31+
'2021-03-26'
3232
]
3333
}
3434

@@ -147,7 +147,7 @@ $(function () {
147147
},
148148
queryTokenizer: Bloodhound.tokenizers.whitespace,
149149
remote: {
150-
url: "https://api.mapbox.com/geocoding/v5/mapbox.places/%QUERY.json?&access_token=pk.eyJ1IjoiY2l2aWNtYXBwZXIiLCJhIjoiY2pkOXV4cnk4MTVpMDJ3bzlneTFydDZlbCJ9.wrwB1uO53s_FhpVJv-Zf-Q&country=us&proximity=-79.9976593%2C40.4396267&autocomplete=true&limit=5",
150+
url: "https://api.mapbox.com/geocoding/v5/mapbox.places/%QUERY.json?access_token=pk.eyJ1IjoiY2l2aWNtYXBwZXIiLCJhIjoiY2pkOXV4cnk4MTVpMDJ3bzlneTFydDZlbCJ9.wrwB1uO53s_FhpVJv-Zf-Q&country=us&proximity=-79.9976593%2C40.4396267&autocomplete=true&limit=5",
151151
filter: function (data) {
152152
return $.map(data.features, function (feature) {
153153
return {
@@ -166,6 +166,7 @@ $(function () {
166166
.addClass("fa-refresh fa-spin");
167167
},
168168
complete: function (jqXHR, status) {
169+
console.log(jqXHR)
169170
console.log("afterSend", status);
170171
$("#searchicon")
171172
.removeClass("fa-refresh fa-spin")
@@ -226,8 +227,9 @@ $(function () {
226227
$("#event-picker-template").html()
227228
);
228229

229-
230+
var event_tally = 0;
230231
var dtp = "DateTimePicker";
232+
231233
var attach_datepicker = function (ele_dt_start, ele_dt_end, dtStart, dtEnd) {
232234

233235

@@ -308,7 +310,7 @@ $(function () {
308310

309311
// ----------------------------------------------------
310312
// INDIVIDUAL EVENT PICKER FORM(S)
311-
var event_tally = 0;
313+
312314
var eventPickers = $('li[id^="events-"]');
313315
$.each(eventPickers, function (i, e) {
314316
var ele_dt_start = "#events-" + i + "-dt_start";
@@ -322,24 +324,24 @@ $(function () {
322324
// ----------------------------------------------------
323325
// BULK EVENT PICKER FORM
324326

325-
$('#events-bulk-t_start')
327+
$('#bulk-t_start')
326328
.datetimepicker({
327329
format: 'LT',
328330
stepping: 15
329331
})
330332
// .on("dp.change", function (e) {
331-
// $('#events-bulk-t_end')
333+
// $('#bulk-t_end')
332334
// .data(dtp)
333335
// .minDate(e.date);
334336
// });
335-
$('#events-bulk-t_end')
337+
$('#bulk-t_end')
336338
.datetimepicker({
337339
format: 'LT',
338340
stepping: 15
339341
})
340342
// .on("dp.change", function (e) {
341343
// console.log("end", e.date);
342-
// $('#events-bulk-t_start')
344+
// $('#bulk-t_start')
343345
// .data(dtp)
344346
// .maxDate(e.date);
345347
// });
@@ -389,8 +391,8 @@ $(function () {
389391
$("ul#events.list-group").empty()
390392
}
391393

392-
var eStart = $('#events-bulk-t_start').val()
393-
var eEnd = $('#events-bulk-t_end').val()
394+
var eStart = $('#bulk-t_start').val()
395+
var eEnd = $('#bulk-t_end').val()
394396

395397
if (eStart && eEnd) {
396398
// calculate a list of event start and end dts
@@ -417,7 +419,7 @@ $(function () {
417419
dtStart = dtEnd
418420
}
419421

420-
event_tally = event_tally + i + 1;
422+
event_tally = event_tally + 1;
421423
var attr_dt_start = "events-" + event_tally + "-dt_start";
422424
var attr_dt_end = "events-" + event_tally + "-dt_end";
423425

0 commit comments

Comments
 (0)