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
Friday 05 Aug 2016
9:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Tweaking Page tag to find toolSessionId in more tools and to make it easier to use on an iPad

Options
    • -9
    • +14
    ./web/WEB-INF/tags/Page.tag
  2. … 25 more files in changeset.
Monday 01 Aug 2016
9:15 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Stopping the exception thrown when the logic to get the tool session id tries a form that does not contain toolSessionId.

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

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Adding support activities

Options
    • -16
    • +18
    ./web/WEB-INF/tags/Page.tag
  2. … 29 more files in changeset.
7:51 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Stopping Notebook call triggering a refresh of the learner screen.

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Page.tag
  2. … 21 more files in changeset.
Thursday 28 Jul 2016
12:12 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Replacing learner control frames with a div based sliding bar.

Options
    • -29
    • +271
    ./web/WEB-INF/tags/Page.tag
  2. … 25 more files in changeset.
Wednesday 20 Jul 2016
11:44 pm

Andrey Balan

LDEV-3741 Add a time limit to scratchie

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160720.sql
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +50
    ./web/includes/css/scratchie-learning.css
    • -0
    • +7
    ./web/pages/authoring/advance.jsp
    • -24
    • +101
    ./web/pages/learning/learning.jsp
    • -3
    • +6
    ./web/pages/learning/questionlist.jsp
    • -0
    • +10
    ./web/pages/monitoring/parts/advanceOptions.jsp
11:38 pm

Andrey Balan

LDEV-3740: Use websockets to inform Scratche non-leaders of leader actions.

Options
    • -44
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
10:33 pm

Andrey Balan

LDEV-3741 Add a time limit to scratchie

Options
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160720.sql
    • -3
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +50
    ./web/includes/css/scratchie-learning.css
    • -7
    • +14
    ./web/pages/authoring/advance.jsp
    • -31
    • +93
    ./web/pages/learning/learning.jsp
    • -4
    • +6
    ./web/pages/learning/questionlist.jsp
    • -1
    • +11
    ./web/pages/monitoring/parts/advanceOptions.jsp
Friday 01 Jul 2016
12:25 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3862: Grouping options in the advanced tag, updating tags from core.

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +22
    ./web/WEB-INF/tags/Arrow.tag
    • -0
    • +8
    ./web/WEB-INF/tags/CommentsAuthor.tag
    • -0
    • +9
    ./web/WEB-INF/tags/Date.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
    • -0
    • +32
    ./web/WEB-INF/tags/SimplePanel.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -21
    • +26
    ./web/pages/authoring/advance.jsp
Wednesday 15 Jun 2016
4:07 pm

Andrey Balan

LDEV-3750 Improve performance of pushing marks to gradebook

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 36 more files in changeset.
Tuesday 14 Jun 2016
11:33 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3826: Bootstrapping Admin

Options
    • -3
    • +4
    ./web/pages/admin/config.jsp
Monday 13 Jun 2016
10:53 pm

Andrey Balan

LDEV-3750 Added ability to request all available tool outputs per toolContentId instead of querying them one by one

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 36 more files in changeset.
Friday 03 Jun 2016
3:37 pm

Marcin Cieslak

LDEV-3740: Check if a websocket is open before requesting close from the browser side.

Options
    • -5
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
9:33 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3822: Tweaking JQgrid look and behaviour

Options
    • -21
    • +22
    ./web/pages/monitoring/summary.jsp
Wednesday 01 Jun 2016
12:21 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3822: Bootstrapping Admin, Author, Monitor. Tweaked learner to match the colours of the jqgrids

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +53
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -0
    • +35
    ./web/WEB-INF/tags/Arrow.tag
    • -6
    • +6
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +349
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -4
    • +12
    ./web/WEB-INF/tags/CKEditor.tag
    • -0
    • +47
    ./web/WEB-INF/tags/Comments.tag
    • -0
    • +51
    ./web/WEB-INF/tags/CommentsAuthor.tag
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -7
    • +20
    ./web/WEB-INF/tags/Page.tag
    • -0
    • +194
    ./web/WEB-INF/tags/Rating.tag
    • -0
    • +54
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  16. … 25 more files in changeset.
Wednesday 11 May 2016
4:10 pm

Marcin Cieslak

LDEV-3776: Remove $Id CVS keyword.

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_pt_BR.properties
    • -1
    • +1
    ./db/sql/db_version_insert.sql
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieConfigItemDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java
  16. … 990 more files in changeset.
3:38 pm

Marcin Cieslak

LDEV-3776: Remove $Id CVS keyword.

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_pt_BR.properties
    • -1
    • +1
    ./db/sql/db_version_insert.sql
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieConfigItemDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java
  16. … 1265 more files in changeset.
Thursday 05 May 2016
4:11 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -47
    • +47
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/BurningQuestionLikeDAO.java
    • -15
    • +20
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -26
    • +26
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
    • -20
    • +20
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieConfigItemDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieDAO.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java
    • -10
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java
    • -10
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BurningQuestionLikeDAOHibernate.java
    • -17
    • +22
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -52
    • +51
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -20
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java
  16. … 2106 more files in changeset.
4:11 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -47
    • +47
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/BurningQuestionLikeDAO.java
    • -15
    • +20
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -26
    • +26
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
    • -20
    • +20
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieConfigItemDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieDAO.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java
    • -10
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BurningQuestionLikeDAOHibernate.java
    • -46
    • +47
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -58
    • +53
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -23
    • +24
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java
  16. … 1846 more files in changeset.
Wednesday 04 May 2016
7:01 pm

Marcin Cieslak

LDEV-3768: Commit ignored files.

Options
    • -4
    • +0
    ./web/WEB-INF/.cvsignore
    • -0
    • +324
    ./web/WEB-INF/struts-config.xml
    • -0
    • +42
    ./web/WEB-INF/validation.xml
5:26 pm

Marcin Cieslak

LDEV-3273: Remove obsolete reference to a JS file.

Options
    • -1
    • +0
    ./web/common/tabbedheader.jsp
3:44 pm

Marcin Cieslak

LDEV-3768: Remove references to "assembly" dir in Ant build files. Clean up lams-www.

Options
    • -1
    • +1
    ./build.xml
  2. … 9 more files in changeset.
Saturday 30 Apr 2016
8:08 am

erniegx <ernieg@gmail.com>

LDEV-3764 including loginId in scratchie .xlsx exports

Options
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 29 Apr 2016
12:11 pm

erniegx <ernieg@gmail.com>

LDEV-3764 including loginId in scratchie .xlsx exports

Options
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Thursday 28 Apr 2016
5:07 pm

Marcin Cieslak

LDEV-3401: Convert XDoclet annotations to empty comments.

Options
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java
    • -16
    • +16
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.java
    • -10
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -15
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/AdminForm.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ReflectionForm.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java
  15. … 460 more files in changeset.
Wednesday 27 Apr 2016
9:23 pm

Marcin Cieslak

LDEV-3768: Remove XDoclet library and corresponding Ant tasks. Generate and use static configuration files instead.

Options
    • -0
    • +55
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.hbm.xml
    • -0
    • +146
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -0
    • +71
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.hbm.xml
    • -0
    • +63
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.hbm.xml
    • -0
    • +79
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.hbm.xml
    • -0
    • +58
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.hbm.xml
    • -0
    • +97
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml
    • -0
    • +137
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml
    • -0
    • +100
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml
    • -8
    • +0
    ./conf/xdoclet/global-exceptions.xml
    • -6
    • +0
    ./conf/xdoclet/global-forwards.xml
    • -279
    • +0
    ./conf/xdoclet/struts-actions.xml
    • -1
    • +0
    ./conf/xdoclet/struts-forms.xml
    • -1
    • +0
    ./conf/xdoclet/struts-message-resources.xml
    • -1
    • +0
    ./conf/xdoclet/struts-plugins.xml
  16. … 389 more files in changeset.
Saturday 23 Apr 2016
1:57 pm

Andrey Balan

LDEV-3742 Add Like feature for Scratchie * Implementation is a bit different for WF branch, as GET_BURNING_QUESTIONS_WITH_LIKES SQL query in ScratchieBurningQuestionDAOHibernate.java should be rewritten to comply with SQL92 standard introduced in MySQL 5.7.5

Options
    • -2
    • +2
    ./web/pages/learning/results.jsp
2:31 am

Marcin Cieslak

LDEV-3740: Prevent thread race on activity finish when leader's websocket was the only one and it was already cleared by Send Worker.

Options
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
Thursday 14 Apr 2016
8:19 pm

Marcin Cieslak

LDEV-3740: Use websockets to inform Scratche non-leaders of leader actions.

Options
    • -0
    • +1
    ./.classpath
    • -1
    • +19
    ./build.xml
    • -13
    • +0
    ./conf/xdoclet/struts-actions.xml
    • -52
    • +23
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +234
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -31
    • +17
    ./web/pages/learning/learning.jsp
    • -40
    • +36
    ./web/pages/learning/questionlist.jsp
Saturday 09 Apr 2016
12:38 am

Andrey Balan

LDEV-3747 Redirect to the next method after submitting burning questions/notebook in order to prevent exception on refreshing the frame

Options
    • -3
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -5
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java