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 22 Mar 2018
8:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Opening collapsable panels no longer makes screen jump

Options
    • -1
    • +1
    ./learning/questionlist.jsp
    • -1
    • +2
    ./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
    ./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
    ./learning/questionlist.jsp
4:07 pm

Marcin Cieslak

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

Options
    • -0
    • +7
    ./authoring/advance.jsp
    • -3
    • +1
    ./learning/questionlist.jsp
    • -2
    • +4
    ./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
    ./learning/questionlist.jsp
    • -1
    • +3
    ./learning/results.jsp
    • -0
    • +97
    ./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
    ./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
    • -0
    • +72
    ./tblmonitoring/burningQuestions.jsp
    • -0
    • +46
    ./tblmonitoring/teams.jsp
    • -0
    • +123
    ./tblmonitoring/tra.jsp
    • -0
    • +174
    ./tblmonitoring/traStudentChoices.jsp
  5. … 48 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
    • -26
    • +50
    ./learning/results.jsp
    • -7
    • +8
    ./monitoring/summary.jsp
  3. … 5 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
    ./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
    ./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
    ./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
    ./authoring/advance.jsp
    • -106
    • +0
    ./learning/burningQuestions.jsp
    • -1
    • +1
    ./learning/learning.jsp
    • -4
    • +8
    ./learning/questionlist.jsp
    • -9
    • +0
    ./learning/results.jsp
Tuesday 07 Nov 2017
8:23 am

Andrey Balan

LDEV-4458 Add option to overwrite default scoring system

Options
    • -1
    • +40
    ./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
    • -31
    • +74
    ./learning/learning.jsp
    • -4
    • +0
    ./learning/notebook.jsp
    • -9
    • +33
    ./learning/questionlist.jsp
    • -6
    • +6
    ./learning/results.jsp
    • -6
    • +4
    ./learning/submissionDeadline.jsp
  6. … 7 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
    ./authoring/advance.jsp
    • -11
    • +19
    ./authoring/authoring.jsp
    • -18
    • +18
    ./learning/burningQuestions.jsp
    • -0
    • +19
    ./learning/learning.jsp
    • -6
    • +43
    ./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
    ./monitoring/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/monitoring.jsp
    • -6
    • +14
    ./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
    ./monitoring/monitoring.jsp
    • -6
    • +14
    ./monitoring/summary.jsp
  3. … 34 more files in changeset.
Saturday 05 Aug 2017
1:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

Options
    • -7
    • +1
    ./learning/learning.jsp
  2. … 88 more files in changeset.
Saturday 29 Jul 2017
12:55 pm

Marcin Cieslak

LDEV-4394 Rewrite Scratchie time limit

Now it is controlled by websocket server.

Options
    • -1
    • +7
    ./learning/questionlist.jsp
  2. … 3 more files in changeset.
5:30 am

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions.

Options
    • -1
    • +1
    ./learning/questionlist.jsp
5:29 am

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions

Options
    • -1
    • +1
    ./learning/questionlist.jsp
Friday 28 Jul 2017
6:21 pm

Marcin Cieslak

LDEV-4394 Do not show Finish button until Scratchie Leader finished the tool completely

This includes answering to burning questions.

Options
    • -7
    • +0
    ./learning/questionlist.jsp
  2. … 1 more file in changeset.
3:53 pm

Marcin Cieslak

LDEV-4394 Make page reload and websocket close requests cross-node

Some requests have been sent only to websockets on current node. Now

they are detected in DB and run on all nodes.

Options
    • -0
    • +1
    ./learning/questionlist.jsp
  2. … 11 more files in changeset.
Thursday 27 Jul 2017
6:04 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -12
    • +11
    ./learning/questionlist.jsp
  2. … 37 more files in changeset.
Tuesday 25 Jul 2017
8:05 pm

Marcin Cieslak

LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

Options
    • -2
    • +7
    ./learning/questionlist.jsp
  2. … 37 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/monitoring.jsp
  2. … 156 more files in changeset.
Saturday 01 Jul 2017
11:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

Options
    • -3
    • +0
    ./authoring/parts/additem.jsp
  2. … 158 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/monitoring.jsp
    • -0
    • +69
    ./monitoring/parts/statisticpart.jsp
    • -59
    • +4
    ./monitoring/statistic.jsp
  4. … 8 more files in changeset.
Wednesday 24 May 2017
1:42 pm

Marcin Cieslak

LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

Options
    • -7
    • +30
    ./learning/questionlist.jsp
  2. … 39 more files in changeset.