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
Friday 16 Mar 2018
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.
Friday 02 Feb 2018
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -1
    • +0
    ./.classpath
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  3. … 77 more files in changeset.
7:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -1
    • +0
    ./.classpath
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java
  4. … 75 more files in changeset.
Thursday 18 Jan 2018
8:02 am

Andrey Balan

LDEV-4496 People from the same group get the "same shuffle"

Options
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
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/WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.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/LearningAction.java

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.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/service/ResourceServiceImpl.java

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

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

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

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

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -3
    • +41
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -32
    • +98
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -134
    • +73
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
  6. … 41 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/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/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
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +4
    ./web/WEB-INF/struts-config.xml
    • -26
    • +50
    ./web/pages/learning/results.jsp
    • -7
    • +8
    ./web/pages/monitoring/summary.jsp
Friday 10 Nov 2017
5:34 am

Andrey Balan

LDEV-4467 skip showing empty burning questions' jqGrids

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -8
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
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
    ./web/pages/learning/questionlist.jsp
12:57 am

Marcin Cieslak

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

Options
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
  2. … 10 more files in changeset.
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
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -8
    • +11
    ./web/pages/learning/waitforleader.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
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Wednesday 08 Nov 2017
10:31 pm

Andrey Balan

Merge branch 'LDEV-4455'

Options
    • -17
    • +15
    ./web/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
    ./web/pages/authoring/advance.jsp
    • -106
    • +0
    ./web/pages/learning/burningQuestions.jsp
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -4
    • +8
    ./web/pages/learning/questionlist.jsp
    • -9
    • +0
    ./web/pages/learning/results.jsp
1:24 am

Andrey Balan

LDEV-4462 Calculate max mark properly

Options
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -11
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Tuesday 07 Nov 2017
8:23 am

Andrey Balan

LDEV-4458 Add option to overwrite default scoring system

Options
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -7
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -1
    • +40
    ./web/pages/authoring/advance.jsp
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
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -10
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -133
    • +45
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -11
    • +2
    ./web/WEB-INF/struts-config.xml
    • -2
    • +1
    ./web/includes/css/scratchie-learning.scss
    • -31
    • +74
    ./web/pages/learning/learning.jsp
    • -4
    • +0
    ./web/pages/learning/notebook.jsp
    • -9
    • +33
    ./web/pages/learning/questionlist.jsp
    • -6
    • +6
    ./web/pages/learning/results.jsp
    • -6
    • +4
    ./web/pages/learning/submissionDeadline.jsp
Friday 03 Nov 2017
5:29 am

Andrey Balan

LDEV-4451 Improve question comparison tactics

As long as MCQ doesn't have question titles, exclude title when

calculating question hash.

Another peculiarity of MCQ is that it stores questions and answers with

trailing '/r/n' instead of usual '/n' (as in Assessment and Scratchie),

so remove all '/r' and '/n' before comparing questions and answers.

Options
    • -13
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 5 more files in changeset.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml
  4. … 95 more files in changeset.