From b30e35cb994ef35345c9cba3883f0329be3b651b Mon Sep 17 00:00:00 2001
From: c22063583 <WHITEf6@cardiff.ac.uk>
Date: Wed, 19 Apr 2023 15:13:40 +0100
Subject: [PATCH] Session shenanigans
---
createdb.sql | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/createdb.sql b/createdb.sql
index 255f46b..31d4ad6 100644
--- a/createdb.sql
+++ b/createdb.sql
@@ -147,7 +147,7 @@ CREATE PROCEDURE addVolunteer(
IN lname varchar(35),
IN email varchar(320),
IN passwerd varchar(70),
- IN phonenum int(10))
+ IN phonenum varchar(20))
BEGIN
DECLARE EXIT HANDLER FOR 1062
@@ -260,9 +260,9 @@ CREATE PROCEDURE viewVolunteer(
BEGIN
If LENGTH(volunteervID) = 0
then
- SELECT s0.VolunteerID , s0.volunteerCode, s0.fname ,s0.lname,s0.DBSdue,s0.SGdue,s0.emergencycontact,s0.email,(select sum(duration) from Sessions where sessionID in(select sessionID from VolunteerAttendance where volunteerID=s0.volunteerID)) from volunteers as s0;
+ SELECT s0.VolunteerID , s0.volunteerCode, s0.fname ,s0.lname,s0.DBSdue,s0.SGdue,s0.emergencycontact,s0.email,(select sum(duration) from Sessions where sessionID in(select sessionID from VolunteerAttendance where volunteerID=s0.volunteerID)) as "time "from volunteers as s0;
else
- SELECT s0.VolunteerID , s0.volunteerCode, s0.fname ,s0.lname,s0.DBSdue,s0.SGdue,s0.emergencycontact,s0.email,(select sum(duration) from Sessions where sessionID in(select sessionID from VolunteerAttendance where volunteerID=s0.volunteerID)) from volunteers as s0 where volunteerID=volunteervID;
+ SELECT s0.VolunteerID , s0.volunteerCode, s0.fname ,s0.lname,s0.DBSdue,s0.SGdue,s0.emergencycontact,s0.email,(select sum(duration) from Sessions where sessionID in(select sessionID from VolunteerAttendance where volunteerID=s0.volunteerID)) as "time" from volunteers as s0 where volunteerID=volunteervID;
end if;
END$$
DELIMITER ;
@@ -310,11 +310,11 @@ BEGIN
SELECT 'User already exists' as ERROR ;
END;
INSERT INTO Sessions(SessionID,location,duration,OccuredOn,groupID,leaderID) values
- (md5(concat(duration,groupID)),location,OccuredOn,groupID,leaderID);
+ (md5(concat(occuredOn,groupID)),location,duration, OccuredOn,groupID,learderID);
+ call volunteerattends(learderID,md5(concat(occuredOn,groupID)));
END$$
DELIMITER ;
-
drop procedure if exists ReviewSession;
delimiter $$
CREATE PROCEDURE ReviewSession(
@@ -379,8 +379,7 @@ CREATE PROCEDURE StudentBadgeApply(
BEGIN
- INSERT INTO StudentAttendance(StudentID,sessionID) values
- (studentID,sessionID);
+ INSERT INTO BadgeAwarded(awardedto,BadgeAwarded,evidence,isAwarded) values (studentID,BadgeID,badgeEvidence,0);
END$$
DELIMITER ;
@@ -396,7 +395,14 @@ call addVolunteer("timothy","jones",'bob@bbc.co.uk','8e301d6e513165a9c0b6b9a2b10
call updateSG('419fd9859978a9bf79df4ff16c99c5f9',"2020-04-09");
call updateDBS('419fd9859978a9bf79df4ff16c99c5f9',"2021-09-09");
-
-call viewCheckExpiries();
+call addSession("computer lab",3,'419fd9859978a9bf79df4ff16c99c5f9','2023-02-03','');
+call ReviewSession(md5('2023-02-03'),"it was ok","idk");
+call addSession("computer lab",3,'419fd9859978a9bf79df4ff16c99c5f9','2023-01-03','');
+call ReviewSession(md5('2023-01-03'),"it was ok","idk");
+call addSession("computer lab",3,'419fd9859978a9bf79df4ff16c99c5f9','2022-11-03','');
+call addSession("computer lab",3,'419fd9859978a9bf79df4ff16c99c5f9','2022-12-03','');
+call viewVolunteer('');
+select * from Sessions;
+-- call viewCheckExpiries();
-- select * from volunteers;
--
GitLab