lams

lams_tool_scratchie

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 6
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 26,657
Net change in LoC this week: 0

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 01 Mar 2017
8:33 pm

fionam

file FileUpload.tag was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 14 more files in changeset.
Tuesday 28 Feb 2017
4:53 pm

Andrey Balan

LDEV-3147 Get rid of 'supports_run_offline_flag' and 'define_later_url' columns from lams_tool table

Options
    • -4
    • +0
    ./db/sql/tool_insert.sql
  2. … 31 more files in changeset.
1:15 pm

Marcin Cieslak

LDEV-4180: Remove help_text from lams_learning_activity as it is take from i18n files anyway.

Options
    • -2
    • +0
    ./db/sql/activity_insert.sql
  2. … 28 more files in changeset.
12:37 pm

Marcin Cieslak

LDEV-4180: Remove patches for dropping DB tables as we never use them.

Options
    • -10
    • +0
    ./db/sql/drop_lams_tool_scratchie.sql
  2. … 35 more files in changeset.
Monday 27 Feb 2017
10:00 pm

Marcin Cieslak

LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches.

Get rid of unnecessary tables and keys.

Modify boolean columns to tinyint(1)

Simplify patches where possible.

Options
    • -2
    • +2
    ./build.properties
    • -51
    • +3
    ./db/sql/activity_insert.sql
    • -81
    • +122
    ./db/sql/create_lams_tool_scratchie.sql
    • -9
    • +5
    ./db/sql/drop_lams_tool_scratchie.sql
    • -5
    • +1
    ./db/sql/library_insert.sql
    • -0
    • +0
    ./db/sql/table-schema.sql
    • -9
    • +3
    ./db/sql/tool_insert.sql
    • -0
    • +31
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101.sql
  9. … 216 more files in changeset.
10:00 pm

Marcin Cieslak

file patch20170101.sql was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101.sql
  2. … 24 more files in changeset.
Friday 24 Feb 2017
7:04 am

Ernie Ghiglione

LDEV-4054 Updating Greek

Options
    • -2
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
6:55 am

Ernie Ghiglione

LDEV-4244: adding label

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
Thursday 23 Feb 2017
6:19 pm

Andrey Balan

LDEV-4244 Add new advanced option - randomise scratchie Items

Options
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170221.sql
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -6
    • +23
    ./web/pages/authoring/advance.jsp
    • -0
    • +17
    ./web/pages/monitoring/parts/advanceOptions.jsp
6:19 pm

Andrey Balan

file patch20170221.sql was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170221.sql
Monday 30 Jan 2017
12:13 pm

Marcin Cieslak

LDEV-4187: Make sure that even after an exception is thrown, the Hibernate session is closed. Add extra logging to verify completeActivity() failures.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 7 more files in changeset.
Wednesday 11 Jan 2017
4:44 pm

fionam

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

Options
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 24 more files in changeset.
Sunday 08 Jan 2017
11:48 pm

Marcin Cieslak

LDEV-4187: Delegate non-HTTP-request tasks to own threads. Open and close Hibernate session for each of such thread. Bind created session to context and thread. Close session at the end of thread execution.

Options
    • -9
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 5 more files in changeset.
Thursday 29 Dec 2016
3:20 pm

Marcin Cieslak

LDEV-3640: Add missing cascade in Scratchie tool.

Options
    • binary
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20151217.sql
Tuesday 27 Dec 2016
3:17 pm

fionam

LDEV-4161: Enhancements to Peer Review - tweaking the wording of the rating display.

Options
    • -7
    • +11
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 26 more files in changeset.
Saturday 24 Dec 2016
10:51 am

fionam

LDEV-4109: Updating tags across projects.

Options
    • -15
    • +44
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 22 more files in changeset.
10:48 am

fionam

LDEV-4160: Convert any underscores to spaces so that long lesson names that only use underscores and not spaces will still wrap the lesson name.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
  2. … 23 more files in changeset.
Friday 23 Dec 2016
3:29 pm

sanjana

LDEV-4119:Replace stepper

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
  2. … 17 more files in changeset.
Friday 16 Dec 2016
5:26 pm

fionam

LDEV-4092: Date passed back by server was reconverting time for Daylight Saving, making it an hour out, as the convertToStringForJSON takes the timezone into account. Therefore convert the already timezone converted time (which gets converted back again) rather than the original time.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
  2. … 13 more files in changeset.
Thursday 15 Dec 2016
2:51 am

Marcin Cieslak

LDEV-4107: Use websockets in Scratchie testing.

Options
    • -3
    • +6
    ./web/pages/learning/questionlist.jsp
  2. … 2 more files in changeset.
Wednesday 14 Dec 2016
6:51 am

fionam

LDEV-4092: Support the server supplying a localised date string for the submission deadline (datetimepicker does not have localisation of the format, just the language).

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -0
    • +1
    ./web/pages/monitoring/summary.jsp
  4. … 34 more files in changeset.
Tuesday 13 Dec 2016
12:34 pm

sanjana

LDEV-3322:Add tag ids to facilitate selenium functional testing

Options
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 8 more files in changeset.
8:26 am

Ernie Ghiglione

LDEV-3801: adding labels

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
12:54 am

Andrey Balan

LDEV-3801 store time limit's launched date in DB

Options
    • -0
    • +5
    ./.classpath
    • -1
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    ./conf/xdoclet/struts-actions.xml
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20161205.sql
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +63
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +53
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -49
    • +124
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -14
    • +30
    ./web/pages/learning/learning.jsp
    • -4
    • +15
    ./web/pages/learning/questionlist.jsp
    • -0
    • +42
    ./web/pages/learning/waitForLeaderTimeLimit.jsp
Sunday 11 Dec 2016
10:46 am

fionam

LDEV-4110: Trigger the window sizing function on load, so that the jqgrid calculates it's widths to make best use of the screen width.

Options
    • -0
    • +3
    ./web/pages/learning/results.jsp
Thursday 08 Dec 2016
12:27 am

Marcin Cieslak

LDEV-3914: Renamve a tag's JS variable as it overlaps with tools' own code.

Options
    • -6
    • +6
    ./web/WEB-INF/tags/Page.tag
  2. … 31 more files in changeset.
Wednesday 07 Dec 2016
12:52 am

Andrey Balan

LDEV-3801 Time limit feature is updated to reflect the fact non-leaders should wait for required notebook/burning questions submitted by the leader

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -27
    • +29
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +25
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -2
    • +9
    ./web/pages/learning/questionlist.jsp
Tuesday 06 Dec 2016
11:32 pm

Andrey Balan

LDEV-4032 Non-leaders should be forced to wait for leaders to submit notebook and burning questions. Therefore they should not be allowed to press Finish button before these events.

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -5
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
10:41 pm

Andrey Balan

LDEV-2817 Removed reference to nonexistent JS file

Options
    • -1
    • +0
    ./web/common/tabbedheader.jsp
10:13 pm

Andrey Balan

LDEV-4033 Fixed the issue, when Using start.jsp pages which open another jsps leads to inability to correctly refresh the page

Options
    • -1
    • +1
    ./conf/xdoclet/struts-actions.xml
    • -12
    • +0
    ./web/pages/learning/start.jsp