From 6b3fb0a2a90494e836fb3e02b32f32d3b2d1dc69 Mon Sep 17 00:00:00 2001 From: Jade Buckwalter Date: Wed, 27 Jan 2021 14:17:42 -0500 Subject: [PATCH 1/4] Clock updates Hide period name under the clock so it isn't wrong with the new schedule --- public/js/clock.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/clock.js b/public/js/clock.js index ff6f27ad..fe7828c2 100755 --- a/public/js/clock.js +++ b/public/js/clock.js @@ -250,12 +250,12 @@ function redraw_clock() { pos = pos * 2 * Math.PI; drawFace(small_ctx, small_radius); - drawName(period_name); + // drawName(period_name); drawHand(small_ctx, small_radius, pos, small_radius * .94, small_radius * .095); drawNumber(small_ctx, small_radius, pos, number); drawFace(large_ctx, large_radius); - drawName(period_name); + // drawName(period_name); drawHand(large_ctx, large_radius, pos, large_radius * .94, large_radius * .095); drawNumber(large_ctx, large_radius, pos, number); } From 64034f1cfe38ae2659eba66cefbbbdc5538d2f36 Mon Sep 17 00:00:00 2001 From: Jade Buckwalter Date: Wed, 27 Jan 2021 14:27:09 -0500 Subject: [PATCH 2/4] Default to real time Make the clock always run on real time rather than by class lengths. --- public/js/clock.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/clock.js b/public/js/clock.js index fe7828c2..6ae7f946 100755 --- a/public/js/clock.js +++ b/public/js/clock.js @@ -200,7 +200,7 @@ function redraw_clock() { + now.getSeconds() * 1000 + now.getMilliseconds(); let pos; - if (![0, 6].includes(now.getDay())) { + if (false /*![0, 6].includes(now.getDay())*/) { // School day let current_period_i = 0;// Get current period from array while (current_period_i < schedules[current_schedule].length - 1 && From d75c4ff6fe65e5fac2328b413df5c21fab555371 Mon Sep 17 00:00:00 2001 From: psvenk <45520974+psvenk@users.noreply.github.com> Date: Wed, 27 Jan 2021 14:28:31 -0500 Subject: [PATCH 3/4] Revert "Clock updates" This reverts commit 6b3fb0a2a90494e836fb3e02b32f32d3b2d1dc69. --- public/js/clock.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/clock.js b/public/js/clock.js index 6ae7f946..516b4585 100755 --- a/public/js/clock.js +++ b/public/js/clock.js @@ -250,12 +250,12 @@ function redraw_clock() { pos = pos * 2 * Math.PI; drawFace(small_ctx, small_radius); - // drawName(period_name); + drawName(period_name); drawHand(small_ctx, small_radius, pos, small_radius * .94, small_radius * .095); drawNumber(small_ctx, small_radius, pos, number); drawFace(large_ctx, large_radius); - // drawName(period_name); + drawName(period_name); drawHand(large_ctx, large_radius, pos, large_radius * .94, large_radius * .095); drawNumber(large_ctx, large_radius, pos, number); } From 4ad201363641b4fc2feae6a68833cc816da83a82 Mon Sep 17 00:00:00 2001 From: psvenk <45520974+psvenk@users.noreply.github.com> Date: Wed, 27 Jan 2021 14:30:01 -0500 Subject: [PATCH 4/4] Add note --- public/js/clock.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/js/clock.js b/public/js/clock.js index 516b4585..df8d0356 100755 --- a/public/js/clock.js +++ b/public/js/clock.js @@ -200,6 +200,8 @@ function redraw_clock() { + now.getSeconds() * 1000 + now.getMilliseconds(); let pos; + // TODO 2021-01-27: this is a temporary fix until we support the semester 2 + // schedule if (false /*![0, 6].includes(now.getDay())*/) { // School day let current_period_i = 0;// Get current period from array