Skip to content

Commit cd18e02

Browse files
committed
Remove redundant special dates functionality and related database entries; update calendarto use proper break period rendering and added a few breaks.
1 parent 01215d7 commit cd18e02

File tree

9 files changed

+185
-166
lines changed

9 files changed

+185
-166
lines changed

server/server/database/db_config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ module.exports = {
1717
time_logs: "time_log",
1818
users: "users",
1919
project_coaches: "project_coaches",
20-
special_dates: "special_dates",
2120
sponsors: "sponsors",
2221
},
2322
senior_project_proposal_keys: {

server/server/database/table_sql/create_all_tables.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
.read table_sql/time_log.sql
99
.read table_sql/users.sql
1010
.read table_sql/sponsor_notes.sql
11-
.read table_sql/page_html.sql
12-
.read table_sql/special_dates.sql
11+
.read table_sql/page_html.sql

server/server/database/table_sql/special_dates.sql

Lines changed: 0 additions & 6 deletions
This file was deleted.

server/server/database/test_data/actions_dummy.sql

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -922,4 +922,127 @@ VALUES
922922
<p>The term review is coming up soon. The review will start a week from now.</p>
923923
</div>',
924924
''
925+
),
926+
927+
-- breaks
928+
(
929+
2,
930+
"New Years Day",
931+
'',
932+
"New Years Day",
933+
"break_period",
934+
strftime("%Y", DATE("now")) || "-01-01",
935+
strftime("%Y", DATE("now")) || "-01-01",
936+
"",
937+
""
938+
),
939+
(
940+
2,
941+
"Juneteenth",
942+
'',
943+
"Juneteenth",
944+
"break_period",
945+
strftime("%Y", DATE("now")) || "-06-19",
946+
strftime("%Y", DATE("now")) || "-06-19",
947+
"",
948+
""
949+
),
950+
(
951+
2,
952+
"Independence Day",
953+
'',
954+
"Independence Day",
955+
"break_period",
956+
strftime("%Y", DATE("now")) || "-07-04",
957+
strftime("%Y", DATE("now")) || "-07-04",
958+
"",
959+
""
960+
),
961+
(
962+
2,
963+
"Labor Day",
964+
'',
965+
"Labor Day",
966+
"break_period",
967+
strftime("%Y", DATE("now")) || "-09-01",
968+
strftime("%Y", DATE("now")) || "-09-01",
969+
"",
970+
""
971+
),
972+
(
973+
2,
974+
"Thanksgiving Break",
975+
'',
976+
"Thanksgiving Break",
977+
"break_period",
978+
strftime("%Y", DATE("now")) || "-11-27",
979+
strftime("%Y", DATE("now")) || "-11-30",
980+
"",
981+
""
982+
),
983+
(
984+
2,
985+
"Christmas Break",
986+
'',
987+
"Christmas Break",
988+
"break_period",
989+
strftime("%Y", DATE("now")) || "-12-20",
990+
strftime("%Y", DATE("now", "+1 year")) || "-01-04",
991+
"",
992+
""
993+
),
994+
(
995+
2,
996+
"Christmas Eve",
997+
'',
998+
"Christmas Eve",
999+
"break_period",
1000+
strftime("%Y", DATE("now")) || "-12-24",
1001+
strftime("%Y", DATE("now")) || "-12-24",
1002+
"",
1003+
""
1004+
),
1005+
(
1006+
2,
1007+
"Christmas Day",
1008+
'',
1009+
"Christmas Day",
1010+
"break_period",
1011+
strftime("%Y", DATE("now")) || "-12-25",
1012+
strftime("%Y", DATE("now")) || "-12-25",
1013+
"",
1014+
""
1015+
),
1016+
(
1017+
2,
1018+
"St. Stephens Day",
1019+
'',
1020+
"St. Stephens Day",
1021+
"break_period",
1022+
strftime("%Y", DATE("now")) || "-12-26",
1023+
strftime("%Y", DATE("now")) || "-12-26",
1024+
"",
1025+
""
1026+
),
1027+
(
1028+
2,
1029+
"New Years Eve",
1030+
'',
1031+
"New Years Eve",
1032+
"break_period",
1033+
strftime("%Y", DATE("now")) || "-12-31",
1034+
strftime("%Y", DATE("now")) || "-12-31",
1035+
"",
1036+
""
1037+
),
1038+
(
1039+
2,
1040+
"Short break",
1041+
'',
1042+
"Short break",
1043+
"break_period",
1044+
strftime("%Y-%m-%d", date("now", "+7 days")),
1045+
strftime("%Y-%m-%d", date("now", "+12 days")),
1046+
"",
1047+
""
9251048
);

server/server/database/test_data/fill_test_data.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
.read test_data/time_log_dummy.sql
99
.read test_data/user_dummy.sql
1010
.read test_data/sponsor_notes_dummy.sql
11-
.read test_data/page_html_dummy.sql
12-
.read test_data/special_dates_dummy.sql
11+
.read test_data/page_html_dummy.sql

server/server/database/test_data/special_dates_dummy.sql

Lines changed: 0 additions & 10 deletions
This file was deleted.

server/server/routing/db_routes.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4443,21 +4443,5 @@ module.exports = (db) => {
44434443
},
44444444
);
44454445

4446-
db_router.get("/getSpecialDates", async (req, res, next) => {
4447-
const query = `
4448-
SELECT * FROM special_dates;
4449-
`;
4450-
4451-
try {
4452-
const result = await db.query(query);
4453-
res.status(200).send(result);
4454-
} catch (err) {
4455-
const error = new Error("Database query failed");
4456-
error.statusCode = 500;
4457-
error.details = err.message;
4458-
next(error);
4459-
}
4460-
});
4461-
44624446
return db_router;
44634447
};

0 commit comments

Comments
 (0)