lams-github / lams_tool_scratchie / web / pages

monitoring

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
Wednesday 25 Dec 2019
5:47 am

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -1
    • +1
    ./summary.jsp
  2. … 63 more files in changeset.
Saturday 14 Dec 2019
10:55 am

Andrey Balan

LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

Options
    • -5
    • +5
    ./parts/itemSummary.jsp
  2. … 9 more files in changeset.
Tuesday 10 Dec 2019
10:19 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie monitoring burning questions

Options
    • -1
    • +3
    ./summary.jsp
  2. … 1 more file in changeset.
Thursday 05 Dec 2019
7:07 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Scratchie

Options
    • -123
    • +123
    ./parts/statisticpart.jsp
    • -3
    • +9
    ./summary.jsp
  3. … 3 more files in changeset.
Thursday 17 Oct 2019
2:28 am

Andrey Balan

LDEV-4875 Take care about answers containing XML escaped characters

Options
    • -1
    • +1
    ./parts/itemSummary.jsp
  2. … 5 more files in changeset.
Thursday 10 Oct 2019
5:32 am

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -12
    • +1
    ./parts/itemSummary.jsp
  2. … 22 more files in changeset.
Wednesday 09 Oct 2019
5:26 am

Andrey Balan

LDEV-4875 Item summary page to display options correctly

Options
    • -20
    • +21
    ./parts/itemSummary.jsp
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
    • -5
    • +14
    ./parts/itemSummary.jsp
    • -12
    • +23
    ./summary.jsp
  3. … 53 more files 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
    • -3
    • +2
    ./monitoring.jsp
    • -5
    • +14
    ./parts/itemSummary.jsp
    • -14
    • +24
    ./summary.jsp
  4. … 92 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
    ./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
    ./parts/statisticpart.jsp
  2. … 2 more files in changeset.
Saturday 18 May 2019
5:26 am

Andrey Balan

LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

Options
    • -7
    • +7
    ./parts/itemSummary.jsp
  2. … 26 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
    ./parts/itemSummary.jsp
  2. … 6 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
    • -3
    • +0
    ./summary.jsp
  2. … 7 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.jsp
    • -5
    • +14
    ./parts/itemSummary.jsp
    • -11
    • +24
    ./summary.jsp
  4. … 25 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
    ./summary.jsp
  2. … 5 more files in changeset.
Thursday 14 Feb 2019
10:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -1
    • +1
    ./editactivity.jsp
    • -1
    • +1
    ./parts/advanceOptions.jsp
    • -1
    • +1
    ./parts/statisticpart.jsp
    • -4
    • +4
    ./summary.jsp
  5. … 388 more files in changeset.
Tuesday 12 Feb 2019
6:15 pm

Marcin Cieslak

LDEV-4746 Migrate Scratchie to QB

Options
    • -1
    • +1
    ./parts/itemSummary.jsp
    • -3
    • +3
    ./summary.jsp
  3. … 30 more files in changeset.
Wednesday 06 Feb 2019
11:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -0
    • +1
    ./monitoring.jsp
    • -3
    • +3
    ./parts/itemSummary.jsp
    • -2
    • +2
    ./parts/statisticpart.jsp
    • -16
    • +16
    ./summary.jsp
  5. … 503 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.jsp
  2. … 315 more files in changeset.
Wednesday 21 Nov 2018
7:22 pm

Marcin Cieslak

LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

Options
    • -1
    • +1
    ./monitoring.jsp
    • -1
    • +1
    ./parts/itemSummary.jsp
  3. … 96 more files in changeset.
Friday 05 Oct 2018
3:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Clean up shared files

Options
    • -1
    • +1
    ./parts/itemSummary.jsp
  2. … 206 more files in changeset.
Tuesday 07 Aug 2018
4:23 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scratchie NoStruts library

Options
    • -1
    • +1
    ./editactivity.jsp
  2. … 27 more files in changeset.
Monday 06 Aug 2018
3:24 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe nostruts library

Options
    • -2
    • +2
    ./editactivity.jsp
    • -4
    • +4
    ./parts/dateRestriction.jsp
  3. … 31 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
    • -7
    • +8
    ./summary.jsp
  2. … 6 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
    ./editactivity.jsp
  2. … 12 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
    ./monitoring.jsp
    • -6
    • +14
    ./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
    ./monitoring.jsp
    • -6
    • +14
    ./summary.jsp
  3. … 34 more files in changeset.
Wednesday 19 Jul 2017
6:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

Options
    • -1
    • +1
    ./monitoring.jsp
  2. … 156 more files in changeset.
Friday 09 Jun 2017
11:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ.

Options
    • -2
    • +23
    ./monitoring.jsp
    • -0
    • +69
    ./parts/statisticpart.jsp
    • -59
    • +4
    ./statistic.jsp
  4. … 8 more files in changeset.