lams-github

lams_tool_scratchie

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 10 May 2018
10:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4578: minor fixes

Increse the rows to 8 and title: false when we don't need it.

Options
    • -3
    • +3
    ./web/pages/learning/results.jsp
12:09 am

Andrey Balan

LDEV-4578 Display editable status for burning questions

Currently, it's hard to know that you can edit a burning question of

your own authoring. Therefore we should add some sort of indication that

you can click on the text and edit it.

Also, remove the link for General burning questions.

Options
    • -1
    • +23
    ./web/pages/learning/results.jsp
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Thursday 03 May 2018
7:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180425.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
12:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
10:47 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4566: add reference to questions in burning questions

Adding underline to burning question titles

Options
    • -1
    • +5
    ./web/includes/css/scratchie.scss
    • -1
    • +1
    ./web/pages/learning/results.jsp
Saturday 28 Apr 2018
6:18 am

Andrey Balan

LDEV-4568 Change burning question's "+" icon to "-" on expanding

Options
    • -0
    • +6
    ./web/pages/learning/learning.jsp
    • -2
    • +4
    ./web/pages/learning/questionlist.jsp
    • -2
    • +4
    ./web/pages/learning/scratchies.jsp
Friday 27 Apr 2018
11:27 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4566: add reference to questions in burning questions

Adding an anchor reference so when seeing burning question there's a link to the question.

Options
    • -8
    • +9
    ./web/pages/learning/results.jsp
    • -2
    • +2
    ./web/pages/learning/scratchies.jsp
Saturday 21 Apr 2018
6:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -7
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 20 more files in changeset.
Monday 16 Apr 2018
2:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 Template TBL Assessment offers multiple choice

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 15 more files in changeset.
Monday 09 Apr 2018
9:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
Friday 06 Apr 2018
10:15 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating Greek

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 5 more files in changeset.
Tuesday 03 Apr 2018
8:21 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 8 more files in changeset.
Monday 02 Apr 2018
11:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -6
    • +20
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +18
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 53 more files in changeset.
Saturday 24 Mar 2018
2:12 am

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -1
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -23
    • +42
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -65
    • +81
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +275
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java
    • -0
    • +15
    ./web/WEB-INF/web.xml
  6. … 79 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -8
    • +17
    ./web/error.jsp
  2. … 34 more files in changeset.
8:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Opening collapsable panels no longer makes screen jump

Options
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
    • -1
    • +2
    ./web/pages/learning/scratchies.jsp
  3. … 14 more files in changeset.
Monday 19 Mar 2018
10:47 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Burning Questions accessible on iPad

Redid change obscured by merge.

Options
    • -1
    • +1
    ./web/pages/learning/scratchies.jsp
Friday 16 Mar 2018
4:14 pm

Marcin Cieslak

Merge branch 'LDEV-4530' with scratchies shown in learner results page

Conflicts with LDEV-4532

lams_tool_scratchie/web/pages/learning/questionlist.jsp

Options
    • -97
    • +1
    ./web/pages/learning/questionlist.jsp
4:07 pm

Marcin Cieslak

LDEV-4530 Control in authoring whether scratchies are shown in results

Options
    • -6
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql
    • -20
    • +30
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +7
    ./web/pages/authoring/advance.jsp
    • -3
    • +1
    ./web/pages/learning/questionlist.jsp
    • -2
    • +4
    ./web/pages/learning/results.jsp
3:33 pm

Marcin Cieslak

LDEV-4530 Display scratchie results in learner interface

Till now only monitor could view it.

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -67
    • +82
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -97
    • +3
    ./web/pages/learning/questionlist.jsp
    • -1
    • +3
    ./web/pages/learning/results.jsp
    • -0
    • +97
    ./web/pages/learning/scratchies.jsp
12:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Burning Questions accessible on iPad

Also did the same fix to similar entries in authoring to ensure

they would work on an iPad

Options
    • -2
    • +2
    ./web/pages/learning/questionlist.jsp
  2. … 14 more files in changeset.
Monday 05 Mar 2018
6:40 pm

Marcin Cieslak

LDEV-4523 Tools remove mark rather than clear it on user content delete

Options
    • -25
    • +28
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 4 more files in changeset.
Sunday 04 Mar 2018
9:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 13 more files in changeset.
Tuesday 27 Feb 2018
10:59 am

Andrey Balan

LKC-89 add labels

To be able to use them even before they will be added to i18n server

Options
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 3 more files in changeset.
10:56 am

Andrey Balan

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

Options
    • -10
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java
    • -2
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180223.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +274
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java
    • -1
    • +10
    ./web/WEB-INF/struts-config.xml
    • -0
    • +15
    ./web/WEB-INF/web.xml
    • -0
    • +3
    ./web/common/taglibs.jsp
    • -0
    • +72
    ./web/pages/tblmonitoring/burningQuestions.jsp
    • -0
    • +46
    ./web/pages/tblmonitoring/teams.jsp
    • -0
    • +123
    ./web/pages/tblmonitoring/tra.jsp
    • -0
    • +174
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  16. … 37 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 65 more files in changeset.
Thursday 15 Feb 2018
11:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 62 more files in changeset.
Saturday 03 Feb 2018
5:16 am

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -1
    • +0
    ./.classpath
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -10
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 54 more files in changeset.