SAM-3229 - Some events in SAM-3012 are longer than 32 characters (sak…

…aiproject#4562)
aagrandaz · Jul 6, 2017 · 678b7c6 · 678b7c6
1 parent fa6b425
commit 678b7c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/reference/docs/conversion/sakai_12_mysql_conversion.sql b/reference/docs/conversion/sakai_12_mysql_conversion.sql
@@ -433,7 +433,7 @@ drop table lti_mapping;
 UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit' WHERE EVENT = 'sam.assessmentSubmitted';
 UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.graded.auto' WHERE EVENT = 'sam.assessmentAutoGraded';
 UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.auto"' WHERE EVENT = 'sam.assessmentAutoSubmitted';
-UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.thread' WHERE EVENT = 'sam.assessmentTimedSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.thrd' WHERE EVENT = 'sam.assessmentTimedSubmitted';
 UPDATE SAKAI_EVENT SET EVENT = 'sam.pubassessment.remove' WHERE EVENT = 'sam.pubAssessment.remove';
 
 -- Update name of submission events

diff --git a/reference/docs/conversion/sakai_12_oracle_conversion.sql b/reference/docs/conversion/sakai_12_oracle_conversion.sql
@@ -493,7 +493,7 @@ drop table lti_mapping
 UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit' WHERE EVENT = 'sam.assessmentSubmitted';
 UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.graded.auto' WHERE EVENT = 'sam.assessmentAutoGraded';
 UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.auto"' WHERE EVENT = 'sam.assessmentAutoSubmitted';
-UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.thread' WHERE EVENT = 'sam.assessmentTimedSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.thrd' WHERE EVENT = 'sam.assessmentTimedSubmitted';
 UPDATE SAKAI_EVENT SET EVENT = 'sam.pubassessment.remove' WHERE EVENT = 'sam.pubAssessment.remove';
 
 -- Update name of submission events

diff --git a/samigo/samigo-api/src/java/org/sakaiproject/samigo/util/SamigoConstants.java b/samigo/samigo-api/src/java/org/sakaiproject/samigo/util/SamigoConstants.java
@@ -45,13 +45,13 @@ public final class SamigoConstants {
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_CHECKED                  = "sam.assessment.submit.checked";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_CLICKSUB                 = "sam.assessment.submit.click_sub";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_AUTO                     = "sam.assessment.submit.auto";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_FROM_LASTPAGE            = "sam.assessment.submit.from_last_page";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_FROM_LASTPAGE            = "sam.assessment.submit.from_last";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_FROM_TOC                 = "sam.assessment.submit.from_toc";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_VIA_URL                  = "sam.assessment.submit.via_url";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_THREAD                   = "sam.assessment.submit.thread";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER                    = "sam.assessment.submit.timer";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER_VIA_URL            = "sam.assessment.submit.timer.url";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER_THREAD             = "sam.assessment.submit.timer.thread";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER_THREAD             = "sam.assessment.submit.timer.thrd";
 
     //Assessment scoring events
     public static final     String      EVENT_ASSESSMENT_TOTAL_SCORE_UPDATE                 = "sam.total.score.update";

diff --git a/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml b/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml
@@ -352,12 +352,12 @@
 		<event eventId="sam.assessment.submit.checked" selected="true"/>
 		<event eventId="sam.assessment.submit.click_sub" selected="true"/>
 		<event eventId="sam.assessment.submit.auto" selected="true"/>
-		<event eventId="sam.assessment.submit.from_last_page" selected="true"/>
+		<event eventId="sam.assessment.submit.from_last" selected="true"/>
 		<event eventId="sam.assessment.submit.from_toc" selected="true"/>
 		<event eventId="sam.assessment.submit.thread" selected="true"/>
 		<event eventId="sam.assessment.submit.timer" selected="true"/>
 		<event eventId="sam.assessment.submit.timer.url" selected="true"/>
-		<event eventId="sam.assessment.submit.timer.thread" selected="true"/>
+		<event eventId="sam.assessment.submit.timer.thrd" selected="true"/>
 		<event eventId="sam.assessment.publish" selected="true"/>
 		<event eventId="sam.assessment.take" selected="true"/>
 		<event eventId="sam.assessment.take.via_url" selected="true"/>

diff --git a/sitestats/sitestats-bundle/src/resources/Events.properties b/sitestats/sitestats-bundle/src/resources/Events.properties
@@ -183,12 +183,12 @@ sam.assessment.submit.via_url=T&Q Assessment submit via URL
 sam.assessment.submit.checked=T&Q Assessment submit, not via timeout popup
 sam.assessment.submit.click_sub=T&Q Assessment submit via submit clicked
 sam.assessment.submit.auto=T&Q Assessment submit via auto-submit job
-sam.assessment.submit.from_last_page=T&Q Assessment submit via last page
+sam.assessment.submit.from_last=T&Q Assessment submit via last page
 sam.assessment.submit.from_toc=T&Q Assessment submit via table of contents
 sam.assessment.submit.thread=T&Q Assessment submit via timed assessment thread
 sam.assessment.submit.timer=T&Q Assessment submit via timer
 sam.assessment.submit.timer.url=T&Q Assessment submit via timer via URL
-sam.assessment.submit.timer.thread=T&Q Assessment submit via timed assessment thread
+sam.assessment.submit.timer.thrd=T&Q Assessment submit via timed assessment thread
 sam.assessment.publish=T&Q Assessment publish
 sam.assessment.take=T&Q Assessment take
 sam.assessment.take.via_url=T&Q Assessment take via URL