diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index 87e2c8bc1853d6b7d8549ef46edef780cc08c2ac..2719793922327d3fb0b91b5467faf81a3e2b9083 100644 --- a/db/StoredProcedures.sql +++ b/db/StoredProcedures.sql @@ -2850,20 +2850,16 @@ END // -DROP FUNCTION IF EXISTS OverSession// -CREATE FUNCTION `OverSession` ( `TeacherID` INT, - `DisciplineID` INT - ) RETURNS int(11) +DROP FUNCTION IF EXISTS RestrictAfterMilestone// +CREATE FUNCTION `RestrictAfterMilestone` ( `TeacherID` INT, + `DisciplineID` INT + ) RETURNS int(11) NO SQL BEGIN - IF NOT InternalIsTeacherAuthor(TeacherID,DisciplineID) - THEN - RETURN -1; - END IF; UPDATE `disciplines` - SET disciplines.OverDate = CURDATE(), - disciplines.isOver = 1 + SET disciplines.MilestoneDate = CURDATE(), + disciplines.isMilestone = 1 WHERE disciplines.ID = DisciplineID LIMIT 1; @@ -2872,8 +2868,9 @@ END // -DROP FUNCTION IF EXISTS OverSessionAllCredit// -CREATE FUNCTION `OverSessionAllCredit` ( ) RETURNS int(11) +DROP FUNCTION IF EXISTS SetMilestoneForCredits// +CREATE FUNCTION `RestrictAfterMilestoneForCredits` ( `TeacherID` INT + ) RETURNS int(11) NO SQL BEGIN DECLARE semID INT; @@ -2881,8 +2878,8 @@ BEGIN SET semID = GetCurSemesterID(); UPDATE `disciplines` - SET disciplines.OverDate = CURDATE(), - disciplines.isOver = 1 + SET disciplines.MilestoneDate = CURDATE(), + disciplines.isMilestone = 1 WHERE disciplines.SemesterID = semID AND disciplines.ExamType = 'credit'; @@ -3624,7 +3621,7 @@ BEGIN SET mtype = -1; SELECT modules.DisciplineID, disciplines.isLocked, - disciplines.isOver, + disciplines.isMilestone, rating_table.StudentID, submodules.isUsed, submodules.MaxRate, diff --git a/db/fix.sql b/db/fix.sql index d1383adc41d2aa80c8c6a862b5d8d8517de53030..af042e239690b9e3398119b00e8fc6899333ab8a 100644 --- a/db/fix.sql +++ b/db/fix.sql @@ -1,4 +1,4 @@ ALTER TABLE `disciplines` -ADD `isOver` tinyint(1) NOT NULL DEFAULT '0', -ADD `OverDate` DATE NULL DEFAULT NULL; +ADD `isMilestone` int(11) NOT NULL DEFAULT '0', +ADD `MilestoneDate` DATE NULL DEFAULT NULL;