Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cellio/477/hebcal date #506

Merged
merged 4 commits into from
Jun 6, 2021
Merged

Cellio/477/hebcal date #506

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05d1e97
fixes issue where between UTC midnight and local midnight, dates were…
cellio Jun 2, 2021
220aac8
uh, it helps to delete the code I want to replace...
cellio Jun 2, 2021
6310c60
addressed review comments
cellio Jun 2, 2021
3bd1b9c
removed dead code
cellio Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 41 additions & 25 deletions public/assets/community/judaism.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,54 +528,70 @@ $(() => {
* Calendar script, added 2021-04-01 by @luap42
*/

// Use *local* time for ISO string (Date.toISOString() uses UTC).
// We only need the date here, so punting on time.
function toIsoDate(date) {
var pad = function(num) {
var norm = Math.floor(Math.abs(num));
return (norm < 10 ? '0' : '') + norm;
};

return date.getFullYear() +
'-' + pad(date.getMonth() + 1) +
'-' + pad(date.getDate());
}


window.addEventListener("load", async () => {
const container = document.createElement('div');
container.innerHTML = "<div class='widget--body'><div class='_cal_label'>Today is:</div><div class='_cal_val'>loading date...</div></div>";
container.classList.add('widget', 'has-margin-4');

const disclaimerNotice = document.querySelector('.widget.is-yellow:first-child');
disclaimerNotice.parentNode.insertBefore(container, disclaimerNotice.nextSibling);

const result = await fetch('https://www.hebcal.com/hebcal?v=1&cfg=json&year=now&month=now&d=on&o=on');

let todayDate = new Date();

// Start new day at 8pm local time previous day (if it's 8 or later today is tomorrow).
// Hour is zero-indexed, hence > 19 (not > 20).
if (todayDate.getHours() > 19) {
todayDate.setDate(todayDate.getDate() + 1);
}

// Use actual year and month (rather than now) in URL to dodge caching.
const result = await fetch('https://www.hebcal.com/hebcal?v=1&cfg=json&year=' + todayDate.getFullYear() + '&month=' + (todayDate.getMonth()+1) + '&d=on&o=on');
const response = await result.json()

const parsedData = response.items.reduce((rv, x) => {
(rv[x.date] = rv[x.date] || []).push(x);
return rv;
}, {});

let now = new Date();
if (now.getHours() > 20) {
now.setDate(now.getDate() + 1);
}

now = now.toISOString().substr(0, 10);


// Do not use Date.toISOString(), which uses UTC not local time.
let now = toIsoDate(todayDate);

const fields = parsedData[now];
container.querySelector('._cal_val').innerHTML = "";

fields.forEach(field => {
const fieldContainer = document.createElement('div');
fieldContainer.classList.add('has-font-size-larger', 'h-fw-bold', 'h-m-t-2');
container.querySelector('._cal_val').appendChild(fieldContainer);

fieldContainer.innerText = field.title;
});

const DAY_LIST = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];

let today = new Date();
if (today.getHours() > 20) {
today.setDate(today.getDate() + 1);
}

const todayDay = DAY_LIST[(today.getDay() + 6) % 7];
today.setDate(today.getDate() - 1);
const yesterdayDay = DAY_LIST[(today.getDay() + 6) % 7];


const todayDay = DAY_LIST[(todayDate.getDay() + 6) % 7];
const yesterdayDay = DAY_LIST[(todayDate.getDay() + 5) % 7];


const fieldContainer = document.createElement('div');
fieldContainer.classList.add('h-m-t-2', 'has-font-size-caption');
container.querySelector('._cal_val').appendChild(fieldContainer);

fieldContainer.innerText = yesterdayDay + ' night (' + todayDay + ')';
});