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 04 Jul 2019
3:25 am

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.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/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -34
    • +24
    ./web/pages/learning/learning.jsp
    • -12
    • +0
    ./web/pages/learning/results.jsp
    • -9
    • +13
    ./web/pages/learning/scratchies.jsp
    • -5
    • +14
    ./web/pages/monitoring/parts/itemSummary.jsp
    • -12
    • +23
    ./web/pages/monitoring/summary.jsp
    • -32
    • +87
    ./web/pages/tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/tra.jsp
    • -9
    • +40
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  13. … 43 more files in changeset.
Tuesday 02 Jul 2019
9:23 pm

Marcin Cieslak

LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 14 more files in changeset.
Tuesday 25 Jun 2019
3:41 am

Andrey Balan

LKC-203 Fix location of the first column

Options
    • -9
    • +34
    ./web/pages/tblmonitoring/traStudentChoices.jsp
Wednesday 19 Jun 2019
6:33 am

Andrey Balan

LDEV-4832 Add ability to create/edit questions from the central QB pages

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -10
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  4. … 26 more files in changeset.
Monday 17 Jun 2019
9:26 pm

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4826

Options
    • -10
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Friday 14 Jun 2019
1:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +52
    ./web/includes/css/scratchie-learning.scss
    • -1
    • +1
    ./web/pages/authoring/parts/additem.jsp
    • -34
    • +24
    ./web/pages/learning/learning.jsp
    • -12
    • +0
    ./web/pages/learning/results.jsp
    • -11
    • +15
    ./web/pages/learning/scratchies.jsp
    • -3
    • +2
    ./web/pages/monitoring/monitoring.jsp
    • -5
    • +14
    ./web/pages/monitoring/parts/itemSummary.jsp
    • -14
    • +24
    ./web/pages/monitoring/summary.jsp
    • -31
    • +86
    ./web/pages/tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/tra.jsp
    • -0
    • +6
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  13. … 83 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -2
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -122
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -30
    • +2
    ./web/pages/authoring/basic.jsp
    • -18
    • +7
    ./web/pages/authoring/parts/itemlist.jsp
  5. … 9 more files in changeset.
Wednesday 29 May 2019
10:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -3
    • +2
    ./web/pages/monitoring/parts/statisticpart.jsp
  3. … 8 more files in changeset.
8:36 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Scratchie tool monitoring

Options
    • -237
    • +241
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -69
    • +124
    ./web/pages/monitoring/parts/statisticpart.jsp
7:27 am

Andrey Balan

LDEV-4823 Fix exception on adding and removing questions simultaneously

Options
    • -10
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Saturday 25 May 2019
4:20 am

Andrey Balan

LDEV-4820 Show user names as tooltips

Options
    • -0
    • +52
    ./web/includes/css/scratchie-learning.scss
    • -41
    • +24
    ./web/pages/learning/learning.jsp
    • -10
    • +8
    ./web/pages/learning/scratchies.jsp
Saturday 18 May 2019
7:16 am

Andrey Balan

LDEV-4821 Switch to using qbQuestionUid for competence levels

Options
    • -8
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
5:26 am

Andrey Balan

LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

Options
    • -11
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -6
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +93
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/QbOptionDTO.java
    • -17
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -93
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -10
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -150
    • +143
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -100
    • +100
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -19
    • +19
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  16. … 12 more files in changeset.
Thursday 16 May 2019
2:53 am

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +7
    ./web/pages/learning/learning.jsp
    • -6
    • +12
    ./web/pages/learning/scratchies.jsp
  4. … 3 more files in changeset.
Wednesday 15 May 2019
7:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 35 more files in changeset.
4:54 am

Andrey Balan

LDEV-4746 Fix issues that arose after migration to QB questions

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -5
    • +6
    ./web/pages/monitoring/parts/itemSummary.jsp
    • -3
    • +3
    ./web/pages/tblmonitoring/burningQuestions.jsp
    • -3
    • +3
    ./web/pages/tblmonitoring/teams.jsp
    • -2
    • +2
    ./web/pages/tblmonitoring/tra.jsp
    • -7
    • +7
    ./web/pages/tblmonitoring/traStudentChoices.jsp
Monday 13 May 2019
6:57 pm

Marcin Cieslak

LDEV-4746 Ignore CKEditor during validation

There is no rule for Scratchie description anyway. And validate plugin

tries to validate a CKEditor div with contenteditable="true" but with no

id or name. There is no point in doing it as contents get moved to a

named textarea before submit.

Options
    • -1
    • +2
    ./web/pages/authoring/parts/additem.jsp
Friday 10 May 2019
10:29 pm

Marcin Cieslak

LDEV-4817 Do not create blank burning questions, delete existing ones

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
10:29 pm

Marcin Cieslak

LDEV-4817 Do not create blank burning questions, delete existing ones

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -5
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
6:08 pm

Andrey Balan

LDEV-4746 Fix adding of several items at once and import QTI questions

Options
    • -8
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
Wednesday 08 May 2019
5:11 am

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 79 more files in changeset.
Thursday 25 Apr 2019
5:04 am

Andrey Balan

LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

Options
    • -12
    • +0
    ./web/pages/learning/results.jsp
    • -3
    • +0
    ./web/pages/monitoring/summary.jsp
  3. … 6 more files in changeset.
Wednesday 24 Apr 2019
7:58 pm

Marcin Cieslak

LDEV-4746 Set tool content ID to Scratchie items on activity copy

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
6:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -3
    • +2
    ./web/pages/monitoring/monitoring.jsp
    • -5
    • +14
    ./web/pages/monitoring/parts/itemSummary.jsp
    • -11
    • +24
    ./web/pages/monitoring/summary.jsp
  4. … 25 more files in changeset.
Friday 19 Apr 2019
1:45 am

Andrey Balan

LDEV-4809 Don't display number prior to general burning question

Options
    • -6
    • +18
    ./web/pages/tblmonitoring/burningQuestions.jsp
Friday 05 Apr 2019
3:36 pm

Marcin Cieslak

LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

Options
    • -9
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  2. … 7 more files in changeset.
Saturday 30 Mar 2019
2:10 am

Andrey Balan

LDEV-4793 Show horizontal scrollbar on iPads

Options
    • -0
    • +6
    ./web/pages/tblmonitoring/traStudentChoices.jsp
Wednesday 27 Mar 2019
7:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  4. … 85 more files in changeset.
Tuesday 26 Mar 2019
4:09 am

Andrey Balan

LDEV-4796 Fix refresh button issue after clicking "Expand all" one

Options
    • -2
    • +2
    ./web/pages/tblmonitoring/burningQuestions.jsp
  2. … 1 more file in changeset.
3:31 am

Andrey Balan

LDEV-4793 Fixing TBLmonitor's issues with iPad

Options
    • -1
    • +7
    ./web/pages/tblmonitoring/tra.jsp
  2. … 1 more file in changeset.