lams-github / lams_tool_scratchie

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 13
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
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Monday 30 Apr 2018
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
    ./includes/css/scratchie.scss
    • -1
    • +1
    ./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
    ./pages/learning/learning.jsp
    • -2
    • +4
    ./pages/learning/questionlist.jsp
    • -2
    • +4
    ./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
    ./pages/learning/results.jsp
    • -2
    • +2
    ./pages/learning/scratchies.jsp
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-INF/tags/Page.tag
  2. … 35 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
    • -0
    • +15
    ./WEB-INF/web.xml
  2. … 83 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
    ./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
    ./pages/learning/questionlist.jsp
    • -1
    • +2
    ./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
    ./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
    ./pages/learning/questionlist.jsp
4:07 pm

Marcin Cieslak

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

Options
    • -0
    • +7
    ./pages/authoring/advance.jsp
    • -3
    • +1
    ./pages/learning/questionlist.jsp
    • -2
    • +4
    ./pages/learning/results.jsp
  4. … 5 more files in changeset.
3:33 pm

Marcin Cieslak

LDEV-4530 Display scratchie results in learner interface

Till now only monitor could view it.

Options
    • -97
    • +3
    ./pages/learning/questionlist.jsp
    • -1
    • +3
    ./pages/learning/results.jsp
    • -0
    • +97
    ./pages/learning/scratchies.jsp
  4. … 2 more files in changeset.
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
    ./pages/learning/questionlist.jsp
  2. … 14 more files in changeset.
Tuesday 27 Feb 2018
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
    • -1
    • +10
    ./WEB-INF/struts-config.xml
    • -0
    • +15
    ./WEB-INF/web.xml
    • -0
    • +3
    ./common/taglibs.jsp
    • -0
    • +72
    ./pages/tblmonitoring/burningQuestions.jsp
    • -0
    • +46
    ./pages/tblmonitoring/teams.jsp
    • -0
    • +123
    ./pages/tblmonitoring/tra.jsp
    • -0
    • +174
    ./pages/tblmonitoring/traStudentChoices.jsp
  8. … 45 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-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
Saturday 11 Nov 2017
8:39 am

Andrey Balan

LDEV-4467 Ability to edit burning questions

As the main prerequisite for this task we needed to upgrade jqGrid to

the latest jqGrid free, as conditional cellediting became available only

there

Options
    • -0
    • +4
    ./WEB-INF/struts-config.xml
    • -26
    • +50
    ./pages/learning/results.jsp
    • -7
    • +8
    ./pages/monitoring/summary.jsp
  4. … 4 more files in changeset.
Friday 10 Nov 2017
2:59 am

Andrey Balan

LDEV-4466 No need to show notebook to a teacher

When teacher opens user's learning, there is no need to show a notebook

left by the user

Options
    • -26
    • +0
    ./pages/learning/questionlist.jsp
12:27 am

Andrey Balan

LDEV-4466 Prevent exception on opening learning by a teacher

Exception was thrown on opening learning by a teacher when there

is no leader available yet

Options
    • -8
    • +11
    ./pages/learning/waitforleader.jsp
  2. … 1 more file in changeset.
Wednesday 08 Nov 2017
10:31 pm

Andrey Balan

Merge branch 'LDEV-4455'

Options
    • -17
    • +15
    ./pages/authoring/advance.jsp
10:30 pm

Andrey Balan

LDEV-4455 Remove edit burning questions functionality

Besides, increase autosave interval to 60 seconds.

Options
    • -17
    • +15
    ./pages/authoring/advance.jsp
    • -106
    • +0
    ./pages/learning/burningQuestions.jsp
    • -1
    • +1
    ./pages/learning/learning.jsp
    • -4
    • +8
    ./pages/learning/questionlist.jsp
    • -9
    • +0
    ./pages/learning/results.jsp
Tuesday 07 Nov 2017
8:23 am

Andrey Balan

LDEV-4458 Add option to overwrite default scoring system

Options
    • -1
    • +40
    ./pages/authoring/advance.jsp
  2. … 9 more files in changeset.
Saturday 04 Nov 2017
6:24 am

Andrey Balan

LDEV-4455 Move burning question to the learning.jsp

We need a change in the flow for Burning questions in learner, so the

burning question text for each question is entered as the students

answer select the answers.

So each question would have a "burning question?" label that would

expand/collapse on request for students to enter the text as they answer

each question.

Options
    • -11
    • +2
    ./WEB-INF/struts-config.xml
    • -2
    • +1
    ./includes/css/scratchie-learning.scss
    • -31
    • +74
    ./pages/learning/learning.jsp
    • -4
    • +0
    ./pages/learning/notebook.jsp
    • -9
    • +33
    ./pages/learning/questionlist.jsp
    • -6
    • +6
    ./pages/learning/results.jsp
    • -6
    • +4
    ./pages/learning/submissionDeadline.jsp
  8. … 5 more files in changeset.
Thursday 02 Nov 2017
8:01 am

Andrey Balan

LDEV-4451 Display confidence levels in Scratchie

Add ability to Scratchie to display what options the individual students

have had in the individual assessment.

Add advanced option to Scratchie - 'Show confidences' and then list

activites from the sequence to choose from (skip branching or use only

the current branch if inside of it).

Options
    • -1
    • +41
    ./pages/authoring/advance.jsp
    • -11
    • +19
    ./pages/authoring/authoring.jsp
    • -18
    • +18
    ./pages/learning/burningQuestions.jsp
    • -0
    • +19
    ./pages/learning/learning.jsp
    • -6
    • +43
    ./pages/learning/questionlist.jsp
  6. … 18 more files in changeset.
Monday 16 Oct 2017
5:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

Options
    • -0
    • +4
    ./pages/monitoring/editactivity.jsp
  2. … 12 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./WEB-INF/tags/StyledRating.tag
  2. … 44 more files in changeset.
Thursday 14 Sep 2017
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -1
    • +3
    ./pages/monitoring/monitoring.jsp
    • -6
    • +14
    ./pages/monitoring/summary.jsp
  3. … 34 more files in changeset.
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -1
    • +3
    ./pages/monitoring/monitoring.jsp
    • -6
    • +14
    ./pages/monitoring/summary.jsp
  3. … 34 more files in changeset.