lams-github

lams_tool_lamc

Clone Tools

Stats

Commits this week: 0
Total Committers: 27
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
Tuesday 19 Dec 2017
8:03 am

Andrey Balan

LDEV-4490 Fix exceptions caused by NULL ConfidenceLevel columns

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20171218.sql
  2. … 1 more file in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
1:11 am

Andrey Balan

LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

Options
    • -0
    • +5
    ./web/learning/AnswersContent.jsp
    • -1
    • +1
    ./web/learning/CombinedAnswersContent.jsp
    • -1
    • +1
    ./web/learning/SingleQuestionAnswersContent.jsp
    • -1
    • +6
    ./web/learning/ViewAnswers.jsp
  5. … 4 more files in changeset.
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
Friday 10 Nov 2017
12:57 am

Marcin Cieslak

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
  2. … 10 more files in changeset.
Wednesday 08 Nov 2017
11:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -3
    • +4
    ./web/monitoring/SummaryContent.jsp
  2. … 9 more files in changeset.
4:53 am

Andrey Balan

LDEV-4444 Update properly the score when question/answer is changed

THe problem happens, if you change the question/answer, then the score

for the activity for the user didn't change accordingly.

Options
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
Friday 03 Nov 2017
5:32 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -11
    • +8
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -77
    • +65
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  7. … 2 more files in changeset.
5:30 am

Andrey Balan

LDEV-4451 Ability to save confidence levels in MCQ

And also return them to Scratchie on request.

Options
    • -1
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -0
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +30
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20171031.sql
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -7
    • +23
    ./src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -3
    • +19
    ./src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java
  16. … 17 more files in changeset.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +4
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml
  4. … 95 more files in changeset.
8:18 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
8:14 am

Andrey Balan

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 28 more files in changeset.
Sunday 29 Oct 2017
1:19 am

Marcin Cieslak

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml
  7. … 232 more files in changeset.
Wednesday 25 Oct 2017
5:50 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Rewrite Kumalive JSON code to Jackson

Options
    • -18
    • +49
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 5 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
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./web/monitoring/Edit.jsp
  4. … 10 more files in changeset.
11:19 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4437 Propogates Monitor Leader mark changes to group members

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -20
    • +49
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
Wednesday 11 Oct 2017
12:23 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Greek

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
Monday 09 Oct 2017
5:08 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

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

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -39
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 28 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 44 more files in changeset.
Friday 15 Sep 2017
8:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek and Norwegian

Updating Greek and Norwegian

Options
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_no_NO.properties
Monday 04 Sep 2017
11:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
    • -39
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +1
    ./web/monitoring/MonitoringMaincontent.jsp
    • -2
    • +3
    ./web/monitoring/Reflections.jsp
    • -7
    • +20
    ./web/monitoring/SummaryContent.jsp
  11. … 16 more files in changeset.
11:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
    • -39
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +1
    ./web/monitoring/MonitoringMaincontent.jsp
    • -2
    • +3
    ./web/monitoring/Reflections.jsp
    • -7
    • +20
    ./web/monitoring/SummaryContent.jsp
  11. … 16 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 73 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 74 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +1976
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +767
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +409
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 31 more files in changeset.
Friday 18 Aug 2017
2:43 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to admin.web.action package; forms to

admin.web.form; DTOs to admin.web.dto.

(To access files' earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +1964
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1965
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
  4. … 74 more files in changeset.
Wednesday 16 Aug 2017
2:13 am

Andrey Balan

LDEV-4407 Move Java classes to the appropriate packages

Util classes were moved to .util package. Struts actions - to

.web.action package

Options
    • -0
    • +253
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +86
    ./src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java
    • -254
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -44
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
    • -86
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
    • -765
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
    • -759
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -260
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
    • -409
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -176
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
    • -181
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java
    • -121
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
    • -0
    • +44
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
    • -0
    • +766
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java
    • -0
    • +760
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  16. … 7 more files in changeset.
Sunday 13 Aug 2017
9:10 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4405 War deployment minifies Javascript files

Options
    • -0
    • +5
    ./build.xml
  2. … 5 more files in changeset.
Thursday 10 Aug 2017
12:28 am

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -0
    • +2
    ./.classpath
    • -66
    • +78
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -21
    • +28
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -39
    • +39
    ./src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
  5. … 132 more files in changeset.
Monday 07 Aug 2017
3:03 pm

Marcin Cieslak

LDEV-4402 Get rid of LAMS customised session filter

This filter was implemented in 2005 and seems more like a workaround

than a feature we need. Especially that many of LAMS tools already use

the standard filter and they work OK.

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 23 more files in changeset.