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
Saturday 25 Aug 2018
7:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -1
    • +0
    ./.classpath
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java
  4. … 107 more files in changeset.
Tuesday 21 Aug 2018
5:35 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Gradebook toogleMarks

Options
    • -4
    • +3
    ./web/WEB-INF/tags/Page.tag
  2. … 17 more files in changeset.
Sunday 19 Aug 2018
1:44 am

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -81
    • +119
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -67
    • +84
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  5. … 100 more files in changeset.
Friday 17 Aug 2018
1:19 pm

Marcin Cieslak

Merge from master to include x-editable

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
Thursday 16 Aug 2018
10:49 pm

Marcin Cieslak

LDEV-4644 Add outcomes in authoring in all tools

Options
    • -1
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +2
    ./web/pages/authoring/advance.jsp
  5. … 115 more files in changeset.
Monday 13 Aug 2018
2:54 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4638 Option to turn on confidence levels for iRA tRA

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 8 more files in changeset.
2:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

English, Spanish and Greek.

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 16 more files in changeset.
Thursday 09 Aug 2018
4:41 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 JSON fix

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  2. … 8 more files in changeset.
Wednesday 08 Aug 2018
10:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Daco nostruts library

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -0
    • +1
    ./web/pages/authoring/authoring.jsp
  3. … 17 more files in changeset.
Tuesday 07 Aug 2018
10:43 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scratchie autosave fix

Options
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -5
    • +6
    ./web/WEB-INF/tags/Page.tag
    • -186
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
    • -2
    • +2
    ./web/pages/learning/learning.jsp
  5. … 59 more files in changeset.
7:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scratchie authoring reflections fix

Options
    • -1
    • +1
    ./web/pages/authoring/advance.jsp
  2. … 14 more files in changeset.
4:23 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scratchie NoStruts library

Options
    • -1
    • +1
    ./.classpath
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -343
    • +0
    ./web/WEB-INF/struts-config.xml
    • -5
    • +4
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +0
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -29
    • +28
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -9
    • +8
    ./web/WEB-INF/tags/CommentsAuthor.tag
    • -5
    • +4
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +0
    ./web/WEB-INF/tags/Rating.tag
    • -1
    • +0
    ./web/WEB-INF/tags/StyledRating.tag
    • -1
    • +0
    ./web/WEB-INF/tags/TabBody.tag
    • -1
    • +0
    ./web/WEB-INF/tags/TabBodyArea.tag
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html.tld
  16. … 13 more files in changeset.
Monday 06 Aug 2018
8:41 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe fix

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
    • -2
    • +1
    ./web/pages/authoring/authoring.jsp
  5. … 12 more files in changeset.
7:09 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A autosave fix

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -0
    • +25
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
    • -1
    • +1
    ./web/pages/admin/config.jsp
    • -6
    • +5
    ./web/pages/authoring/advance.jsp
    • -3
    • +3
    ./web/pages/authoring/authoring.jsp
    • -4
    • +3
    ./web/pages/authoring/basic.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/additem.jsp
    • -3
    • +3
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./web/pages/authoring/start.jsp
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/notebook.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  14. … 1 more file in changeset.
5:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe fixes

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +1
    ./web/pages/authoring/authoring.jsp
  3. … 8 more files in changeset.
3:24 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe nostruts library

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
    • -7
    • +6
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
    • -4
    • +4
    ./web/pages/authoring/start.jsp
    • -5
    • +5
    ./web/pages/learning/learning.jsp
    • -8
    • +8
    ./web/pages/learning/notebook.jsp
    • -6
    • +6
    ./web/pages/learning/questionlist.jsp
    • -5
    • +5
    ./web/pages/learning/results.jsp
    • -4
    • +4
    ./web/pages/learning/scratchies.jsp
    • -7
    • +7
    ./web/pages/learning/submissionDeadline.jsp
    • -2
    • +2
    ./web/pages/learning/waitForLeaderTimeLimit.jsp
    • -2
    • +2
    ./web/pages/learning/waitforleader.jsp
    • -2
    • +2
    ./web/pages/monitoring/editactivity.jsp
    • -4
    • +4
    ./web/pages/monitoring/parts/dateRestriction.jsp
  15. … 19 more files in changeset.
Friday 03 Aug 2018
8:10 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe authoring fix

Options
    • -9
    • +8
    ./web/pages/authoring/authoring.jsp
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
  3. … 1 more file in changeset.
6:46 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe & Scratchie work in progress

Options
    • -0
    • +6
    ./.externalToolBuilders/SASS_lams_tool_scratchie.launch
    • -1
    • +1
    ./build.xml
    • -142
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AdminAction.java
    • -996
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -46
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java
    • -813
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -303
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -342
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -275
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java
    • -0
    • +127
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java
    • -0
    • +935
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -0
    • +62
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/ClearSessionController.java
    • -0
    • +764
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -0
    • +303
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -0
    • +296
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  16. … 24 more files in changeset.
Saturday 21 Jul 2018
9:07 pm

Andrey Balan

LDEV-4613 tRA students' choices page to display all scratches

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -13
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -6
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +96
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -11
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java
    • -65
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -50
    • +67
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +49
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java
    • -7
    • +21
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  10. … 1 more file in changeset.
Sunday 08 Jul 2018
7:41 pm

Andrey Balan

LDEV-4608 Burning qs: collapse/expand to work in coordination

Options
    • -1
    • +8
    ./web/pages/learning/results.jsp
Tuesday 19 Jun 2018
5:59 am

Andrey Balan

LDEV-4604 Improvements to burning questions page (learner)

1) Add buttons for expand/collapse all in burning questions. Only

display these buttons if there's burning questions.

2) Display a counter for burning questions next to the question name

3) Save cells on blur event

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +41
    ./web/pages/learning/results.jsp
3:52 am

Andrey Balan

LDEV-4598 Questions must have a link to burning questions

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    ./web/pages/learning/results.jsp
    • -0
    • +9
    ./web/pages/learning/scratchies.jsp
Monday 21 May 2018
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 25 more files in changeset.
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -0
    • +228
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 38 more files in changeset.
Friday 18 May 2018
2:02 am

Andrey Balan

LKC-137 Add Save/Cancel buttons for jqGrid inline editing

Options
    • -2
    • +43
    ./web/pages/learning/results.jsp
Tuesday 15 May 2018
1:10 am

Andrey Balan

LDEV-4569 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

Options
    • -1
    • +1
    ./web/pages/tblmonitoring/burningQuestions.jsp
  2. … 2 more files in changeset.
Thursday 10 May 2018
10:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4578: minor fixes

Increse the rows to 8 and title: false when we don't need it.

Options
    • -3
    • +3
    ./web/pages/learning/results.jsp
12:09 am

Andrey Balan

LDEV-4578 Display editable status for burning questions

Currently, it's hard to know that you can edit a burning question of

your own authoring. Therefore we should add some sort of indication that

you can click on the text and edit it.

Also, remove the link for General burning questions.

Options
    • -1
    • +23
    ./web/pages/learning/results.jsp
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Thursday 03 May 2018
7:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180425.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.