Update to SQL objects and CSS adjustment

This commit is contained in:
ivan-pelly
2026-03-03 11:48:10 -08:00
parent 3453096f89
commit 5b7bd8cfb4
11 changed files with 51 additions and 87 deletions
+6 -8
View File
@@ -2,16 +2,14 @@ DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `sp_Goal_GetAll`()
BEGIN
SELECT
id_goal,
id_goal_parent,
id_student,
id_user_created,
goalId,
goalParentId,
studentId,
title,
description,
category,
created_at,
updated_at
FROM goal
ORDER BY id_goal;
progressEventCount
FROM v_goal_card
ORDER BY goalId;
END;;
DELIMITER ;
+6 -8
View File
@@ -2,17 +2,15 @@ DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `sp_Goal_GetById`(IN p_id_goal CHAR(36))
BEGIN
SELECT
id_goal,
id_goal_parent,
id_student,
id_user_created,
goalId,
goalParentId,
studentId,
title,
description,
category,
created_at,
updated_at
FROM goal
WHERE id_goal = p_id_goal
progressEventCount
FROM v_goal_card
WHERE goalId = p_id_goal
LIMIT 1;
END;;
DELIMITER ;
@@ -1,7 +1,6 @@
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `sp_ProgressEvent_Insert`(
IN p_id_progress_event CHAR(36),
IN p_id_student CHAR(36),
IN p_id_goal CHAR(36),
IN p_id_user_created CHAR(36),
IN p_content TEXT,
@@ -11,7 +10,6 @@ BEGIN
INSERT INTO progress_event
(
id_progress_event,
id_student,
id_goal,
id_user_created,
content,
@@ -22,7 +20,6 @@ BEGIN
VALUES
(
p_id_progress_event,
p_id_student,
p_id_goal,
p_id_user_created,
p_content,
@@ -32,7 +29,6 @@ BEGIN
);
SELECT
id_progress_event,
id_student,
id_goal,
id_user_created,
content,
+7 -8
View File
@@ -2,14 +2,13 @@ DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `sp_Student_GetAll`()
BEGIN
SELECT
id_student,
id_program,
studentId,
identifier,
program_year,
enrollment_date,
expected_grad,
created_at
FROM student
ORDER BY id_student;
expectedGradDate,
lastEntryDate,
goalCount,
progressEventCount
FROM v_student_card
ORDER BY studentId;
END;;
DELIMITER ;
+7 -8
View File
@@ -2,15 +2,14 @@ DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `sp_Student_GetById`(IN p_id_student CHAR(36))
BEGIN
SELECT
id_student,
id_program,
studentId,
identifier,
program_year,
enrollment_date,
expected_grad,
created_at
FROM student
WHERE id_student = p_id_student
expectedGradDate,
lastEntryDate,
goalCount,
progressEventCount
FROM v_student_card
WHERE studentId = p_id_student
LIMIT 1;
END;;
DELIMITER ;
@@ -4,18 +4,18 @@ CREATE DEFINER=`root`@`%` PROCEDURE `sp_Student_GetWithAssignments`(
IN p_id_user CHAR(36)
)
BEGIN
-- Result set 1: All students in the program
-- Result set 1: All students in the program (card shape)
SELECT
s.id_student,
s.id_program,
s.identifier,
s.program_year,
s.enrollment_date,
s.expected_grad,
s.created_at
FROM student s
vc.studentId,
vc.identifier,
vc.expectedGradDate,
vc.lastEntryDate,
vc.goalCount,
vc.progressEventCount
FROM v_student_card vc
INNER JOIN student s ON s.id_student = vc.studentId
WHERE s.id_program = p_id_program
ORDER BY s.id_student;
ORDER BY vc.studentId;
-- Result set 2: user_student assignments for the requesting user in this program
SELECT
us.id_user_student,
-3
View File
@@ -1,6 +1,5 @@
CREATE TABLE `progress_event` (
`id_progress_event` char(36) NOT NULL,
`id_student` char(36) DEFAULT NULL,
`id_goal` char(36) DEFAULT NULL,
`id_user_created` char(36) DEFAULT NULL,
`content` text,
@@ -8,10 +7,8 @@ CREATE TABLE `progress_event` (
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
PRIMARY KEY (`id_progress_event`),
KEY `progress_event_ibfk_1` (`id_student`),
KEY `progress_event_ibfk_2` (`id_goal`),
KEY `progress_event_ibfk_3` (`id_user_created`),
CONSTRAINT `progress_event_ibfk_1` FOREIGN KEY (`id_student`) REFERENCES `student` (`id_student`),
CONSTRAINT `progress_event_ibfk_2` FOREIGN KEY (`id_goal`) REFERENCES `goal` (`id_goal`),
CONSTRAINT `progress_event_ibfk_3` FOREIGN KEY (`id_user_created`) REFERENCES `user` (`id_user`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+5 -18
View File
@@ -1,18 +1,5 @@
CREATE OR REPLACE VIEW `v_goal_card` AS
SELECT
goal.`id_goal` AS `goalId`,
goal.`id_goal_parent` AS `goalParentId`,
goal.`id_student` AS `studentId`,
goal.`title` AS `title`,
goal.`description` AS `description`,
goal.`category` AS `category`,
COUNT(pe.`id_progress_event`) AS `progressEventCount`
FROM `goal`
LEFT JOIN `progress_event` pe ON pe.`id_goal` = goal.`id_goal`
GROUP BY
goal.`id_goal`,
goal.`id_goal_parent`,
goal.`id_student`,
goal.`title`,
goal.`description`,
goal.`category`;
CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `winstudentgoaltracker`.`v_goal_card` AS
select `winstudentgoaltracker`.`goal`.`id_goal` AS `goalId`,`winstudentgoaltracker`.`goal`.`id_goal_parent` AS `goalParentId`,`winstudentgoaltracker`.`goal`.`id_student` AS `studentId`,`winstudentgoaltracker`.`goal`.`title` AS `title`,`winstudentgoaltracker`.`goal`.`description` AS `description`,`winstudentgoaltracker`.`goal`.`category` AS `category`,count(`pe`.`id_progress_event`) AS `progressEventCount`
from (`winstudentgoaltracker`.`goal`
left
join `winstudentgoaltracker`.`progress_event` `pe` on((`pe`.`id_goal` = `winstudentgoaltracker`.`goal`.`id_goal`))) group by `winstudentgoaltracker`.`goal`.`id_goal`,`winstudentgoaltracker`.`goal`.`id_goal_parent`,`winstudentgoaltracker`.`goal`.`id_student`,`winstudentgoaltracker`.`goal`.`title`,`winstudentgoaltracker`.`goal`.`description`,`winstudentgoaltracker`.`goal`.`category`;
+7 -17
View File
@@ -1,17 +1,7 @@
CREATE OR REPLACE VIEW `v_student_card` AS
SELECT
s.`id_student` AS `studentId`,
s.`identifier` AS `identifier`,
s.`expected_grad` AS `expectedGradDate`,
MAX(pe.`created_at`) AS `lastEntryDate`,
COUNT(DISTINCT g.`id_goal`) AS `goalCount`,
COUNT(DISTINCT pe.`id_progress_event`) AS `progressEventCount`
FROM `student` s
LEFT JOIN `goal` g
ON g.`id_student` = s.`id_student`
LEFT JOIN `progress_event` pe
ON pe.`id_goal` = g.`id_goal`
GROUP BY
s.`id_student`,
s.`identifier`,
s.`expected_grad`;
CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `winstudentgoaltracker`.`v_student_card` AS
select `s`.`id_student` AS `studentId`,`s`.`identifier` AS `identifier`,`s`.`expected_grad` AS `expectedGradDate`,max(`pe`.`created_at`) AS `lastEntryDate`,count(distinct `g`.`id_goal`) AS `goalCount`,count(distinct `pe`.`id_progress_event`) AS `progressEventCount`
from ((`winstudentgoaltracker`.`student` `s`
left
join `winstudentgoaltracker`.`goal` `g` on((`g`.`id_student` = `s`.`id_student`)))
left
join `winstudentgoaltracker`.`progress_event` `pe` on((`pe`.`id_goal` = `g`.`id_goal`))) group by `s`.`id_student`,`s`.`identifier`,`s`.`expected_grad`;