lams-github / lams_tool_scratchie / web

pages

Clone Tools

Stats

Commits this week: 0
Total Committers: 12
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 18 Jul 2019
9:13 pm

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -10
    • +13
    ./authoring/authoring.jsp
    • -25
    • +46
    ./authoring/basic.jsp
    • -39
    • +30
    ./authoring/parts/itemlist.jsp
  4. … 4 more files in changeset.
Thursday 04 Jul 2019
8:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Supports multiple response app ex, improved font on TRA chart

Options
    • -1
    • +1
    ./tblmonitoring/tra.jsp
  2. … 11 more files in changeset.
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
    • -34
    • +24
    ./learning/learning.jsp
    • -12
    • +0
    ./learning/results.jsp
    • -9
    • +13
    ./learning/scratchies.jsp
    • -5
    • +14
    ./monitoring/parts/itemSummary.jsp
    • -12
    • +23
    ./monitoring/summary.jsp
    • -32
    • +87
    ./tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./tblmonitoring/tra.jsp
    • -9
    • +40
    ./tblmonitoring/traStudentChoices.jsp
  9. … 47 more files in changeset.
Tuesday 25 Jun 2019
3:41 am

Andrey Balan

LKC-203 Fix location of the first column

Options
    • -9
    • +34
    ./tblmonitoring/traStudentChoices.jsp
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
    • -1
    • +1
    ./authoring/parts/additem.jsp
    • -34
    • +24
    ./learning/learning.jsp
    • -12
    • +0
    ./learning/results.jsp
    • -11
    • +15
    ./learning/scratchies.jsp
    • -3
    • +2
    ./monitoring/monitoring.jsp
    • -5
    • +14
    ./monitoring/parts/itemSummary.jsp
    • -14
    • +24
    ./monitoring/summary.jsp
    • -31
    • +86
    ./tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./tblmonitoring/tra.jsp
    • -0
    • +6
    ./tblmonitoring/traStudentChoices.jsp
  11. … 85 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

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

Options
    • -30
    • +2
    ./authoring/basic.jsp
    • -18
    • +7
    ./authoring/parts/itemlist.jsp
  3. … 11 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
    • +2
    ./monitoring/parts/statisticpart.jsp
  2. … 9 more files in changeset.
8:36 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Scratchie tool monitoring

Options
    • -69
    • +124
    ./monitoring/parts/statisticpart.jsp
  2. … 2 more files in changeset.
Saturday 25 May 2019
4:20 am

Andrey Balan

LDEV-4820 Show user names as tooltips

Options
    • -41
    • +24
    ./learning/learning.jsp
    • -10
    • +8
    ./learning/scratchies.jsp
  3. … 1 more file in changeset.
Saturday 18 May 2019
5:26 am

Andrey Balan

LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

Options
    • -25
    • +25
    ./authoring/parts/additem.jsp
    • -37
    • +0
    ./authoring/parts/answerlist.jsp
    • -0
    • +37
    ./authoring/parts/optionlist.jsp
    • -7
    • +7
    ./learning/learning.jsp
    • -3
    • +3
    ./learning/questionlist.jsp
    • -15
    • +15
    ./learning/scratchies.jsp
    • -7
    • +7
    ./monitoring/parts/itemSummary.jsp
    • -4
    • +4
    ./tblmonitoring/teams.jsp
    • -2
    • +2
    ./tblmonitoring/tra.jsp
    • -9
    • +9
    ./tblmonitoring/traStudentChoices.jsp
  11. … 17 more files in changeset.
Thursday 16 May 2019
2:53 am

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -0
    • +7
    ./learning/learning.jsp
    • -6
    • +12
    ./learning/scratchies.jsp
  3. … 4 more files in changeset.
Wednesday 15 May 2019
4:54 am

Andrey Balan

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

Options
    • -5
    • +6
    ./monitoring/parts/itemSummary.jsp
    • -3
    • +3
    ./tblmonitoring/burningQuestions.jsp
    • -3
    • +3
    ./tblmonitoring/teams.jsp
    • -2
    • +2
    ./tblmonitoring/tra.jsp
    • -7
    • +7
    ./tblmonitoring/traStudentChoices.jsp
  6. … 2 more files in changeset.
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
    ./authoring/parts/additem.jsp
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
    ./learning/results.jsp
    • -3
    • +0
    ./monitoring/summary.jsp
  3. … 6 more files in changeset.
Wednesday 24 Apr 2019
6:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -3
    • +2
    ./monitoring/monitoring.jsp
    • -5
    • +14
    ./monitoring/parts/itemSummary.jsp
    • -11
    • +24
    ./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
    ./tblmonitoring/burningQuestions.jsp
Saturday 30 Mar 2019
2:10 am

Andrey Balan

LDEV-4793 Show horizontal scrollbar on iPads

Options
    • -0
    • +6
    ./tblmonitoring/traStudentChoices.jsp
Tuesday 26 Mar 2019
4:09 am

Andrey Balan

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

Options
    • -2
    • +2
    ./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
    ./tblmonitoring/tra.jsp
  2. … 1 more file in changeset.
Thursday 07 Mar 2019
5:45 pm

Marcin Cieslak

LDEV-4785 Fix a reference to incorrect form when displaying description

Options
    • -1
    • +1
    ./authoring/parts/additem.jsp
Tuesday 26 Feb 2019
7:12 am

Andrey Balan

LDEV-4777 Initial implementation of question bank search feature

Options
    • -2
    • +16
    ./authoring/parts/itemlist.jsp
  2. … 10 more files in changeset.
Sunday 24 Feb 2019
10:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Improved styling for accordians

Options
    • -18
    • +16
    ./monitoring/summary.jsp
  2. … 5 more files in changeset.
Friday 22 Feb 2019
7:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -2
    • +2
    ./learning/results.jsp
  2. … 50 more files in changeset.
Saturday 16 Feb 2019
4:18 am

Andrey Balan

LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

Options
    • -25
    • +68
    ./tblmonitoring/burningQuestions.jsp
4:18 am

Andrey Balan

LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

(cherry picked from commit 7a82139f8dd4ce906c0b733f764055197c694898)

Options
    • -25
    • +68
    ./tblmonitoring/burningQuestions.jsp
Thursday 14 Feb 2019
10:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -1
    • +1
    ./authoring/parts/answerlist.jsp
    • -1
    • +1
    ./authoring/parts/itemlist.jsp
    • -1
    • +1
    ./monitoring/editactivity.jsp
    • -1
    • +1
    ./monitoring/parts/advanceOptions.jsp
    • -1
    • +1
    ./monitoring/parts/statisticpart.jsp
    • -4
    • +4
    ./monitoring/summary.jsp
    • -1
    • +1
    ./tblmonitoring/traStudentChoices.jsp
  8. … 385 more files in changeset.
Tuesday 12 Feb 2019
6:15 pm

Marcin Cieslak

LDEV-4746 Migrate Scratchie to QB

Options
    • -1
    • +1
    ./authoring/parts/additem.jsp
    • -3
    • +3
    ./authoring/parts/answerlist.jsp
    • -1
    • +23
    ./authoring/parts/itemlist.jsp
    • -1
    • +1
    ./learning/learning.jsp
    • -1
    • +1
    ./learning/results.jsp
    • -12
    • +12
    ./learning/scratchies.jsp
    • -1
    • +1
    ./monitoring/parts/itemSummary.jsp
    • -3
    • +3
    ./monitoring/summary.jsp
  9. … 24 more files in changeset.
Wednesday 06 Feb 2019
11:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    ./authoring/advance.jsp
    • -4
    • +4
    ./authoring/parts/additem.jsp
    • -2
    • +2
    ./authoring/parts/itemlist.jsp
    • -1
    • +1
    ./learning/learning.jsp
    • -1
    • +1
    ./learning/notebook.jsp
    • -5
    • +5
    ./learning/results.jsp
    • -1
    • +1
    ./learning/scratchies.jsp
    • -0
    • +1
    ./monitoring/monitoring.jsp
    • -3
    • +3
    ./monitoring/parts/itemSummary.jsp
    • -2
    • +2
    ./monitoring/parts/statisticpart.jsp
    • -16
    • +16
    ./monitoring/summary.jsp
    • -5
    • +5
    ./tblmonitoring/burningQuestions.jsp
    • -4
    • +4
    ./tblmonitoring/teams.jsp
    • -10
    • +10
    ./tblmonitoring/tra.jsp
    • -6
    • +6
    ./tblmonitoring/traStudentChoices.jsp
  16. … 492 more files in changeset.
Friday 01 Feb 2019
10:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Authoring and monitoring tabs working

Options
    • -1
    • +1
    ./monitoring/monitoring.jsp
  2. … 315 more files in changeset.
Friday 21 Dec 2018
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -1
    • +1
    ./learning/results.jsp
    • -1
    • +1
    ./learning/submissionDeadline.jsp
  3. … 141 more files in changeset.