lams-github / lams_tool_lamc / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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
Wednesday 25 Oct 2017
11:50 am

Marcin Cieslak

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

Rewrite Kumalive JSON code to Jackson

Options
    • -18
    • +49
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +22
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 5 more files in changeset.
Monday 16 Oct 2017
5:19 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4437 Propogates Monitor Leader mark changes to group members

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

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
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 28 more files in changeset.
Monday 04 Sep 2017
5:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    ./org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
    • -39
    • +9
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  7. … 20 more files in changeset.
5:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    ./org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
    • -39
    • +9
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  7. … 20 more files in changeset.
Saturday 26 Aug 2017
10:04 am

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +1976
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +767
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +409
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 31 more files in changeset.
Thursday 17 Aug 2017
8:43 pm

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
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +1964
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1965
    • +0
    ./org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
  4. … 74 more files in changeset.
Tuesday 15 Aug 2017
8:13 pm

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
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +86
    ./org/lamsfoundation/lams/tool/mc/util/LearningUtil.java
    • -254
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -44
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
    • -86
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
    • -765
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
    • -759
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -260
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
    • -409
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -176
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
    • -181
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java
    • -121
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
    • -0
    • +44
    ./org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
    • -0
    • +766
    ./org/lamsfoundation/lams/tool/mc/web/action/McAction.java
    • -0
    • +760
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  16. … 7 more files in changeset.
Wednesday 09 Aug 2017
6:28 pm

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
    • -66
    • +78
    ./org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -21
    • +28
    ./org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -39
    • +39
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
  4. … 133 more files in changeset.
Thursday 13 Jul 2017
8:23 am

Marcin Cieslak

LDEV-4379 Do not filter out duplicate questions in MCQ

Code was checking if the question being added does not have the same

text as an existing. This feature was removed as answers can be

different.

Options
    • -28
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -52
    • +40
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
7:55 am

Marcin Cieslak

LDEV-4379 Use correct logger in McAction

Options
    • -8
    • +8
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
Thursday 15 Jun 2017
5:22 pm

Andrey Balan

LDEV-4364 Properly save question after another one was removed

The problem comes from MCQ incorrectly assigning question's orderId

after some question was removed.

Options
    • -15
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -33
    • +27
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
    • -4
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -18
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/form/McLearningForm.java
Friday 09 Jun 2017
5:38 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -3
    • +5
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -23
    • +82
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +82
    ./org/lamsfoundation/lams/tool/mc/dto/LeaderResultsDTO.java
    • -0
    • +38
    ./org/lamsfoundation/lams/tool/mc/dto/SessionDTO.java
    • -2
    • +37
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -2
    • +65
    ./org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -6
    • +8
    ./org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -0
    • +66
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -8
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
  11. … 6 more files in changeset.
Wednesday 07 Jun 2017
3:46 pm

Andrey Balan

LDEV-4356 Avoid modifying Hibernate's FlushMode inside of the tools

Options
    • -5
    • +0
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
    • -4
    • +0
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
    • -2
    • +0
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -4
    • +0
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
  6. … 7 more files in changeset.
Friday 26 May 2017
9:36 pm

Andrey Balan

LDEV-2866 Authoring code refactoring

Options
    • -224
    • +0
    ./org/lamsfoundation/lams/tool/mc/AnswerDTO.java
    • -6
    • +3
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -70
    • +0
    ./org/lamsfoundation/lams/tool/mc/McApplicationException.java
    • -50
    • +0
    ./org/lamsfoundation/lams/tool/mc/McComparator.java
    • -255
    • +0
    ./org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java
    • -581
    • +0
    ./org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
    • -163
    • +0
    ./org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java
    • -110
    • +0
    ./org/lamsfoundation/lams/tool/mc/McOptionDTO.java
    • -158
    • +0
    ./org/lamsfoundation/lams/tool/mc/McQuestionDTO.java
    • -102
    • +0
    ./org/lamsfoundation/lams/tool/mc/McSessionMarkDTO.java
    • -50
    • +0
    ./org/lamsfoundation/lams/tool/mc/McStringComparator.java
    • -208
    • +0
    ./org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java
    • -137
    • +0
    ./org/lamsfoundation/lams/tool/mc/ReflectionDTO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
  16. … 42 more files in changeset.
Tuesday 23 May 2017
9:55 pm

Andrey Balan

LDEV-4344 Handle pass mark option correctly in authoring

Options
    • -18
    • +0
    ./org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java
    • -18
    • +17
    ./org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -92
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
    • -3
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
  5. … 3 more files in changeset.
Saturday 20 May 2017
1:54 am

Andrey Balan

LDEV-2866 Code refactoring

Options
    • -107
    • +0
    ./org/lamsfoundation/lams/tool/mc/McAllGroupsDTO.java
    • -209
    • +1
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -1
    • +0
    ./org/lamsfoundation/lams/tool/mc/McComparator.java
    • -147
    • +0
    ./org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java
    • -389
    • +1
    ./org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java
    • -174
    • +0
    ./org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java
    • -236
    • +0
    ./org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/McQuestionDTO.java
    • -214
    • +0
    ./org/lamsfoundation/lams/tool/mc/McUtils.java
    • -39
    • +0
    ./org/lamsfoundation/lams/tool/mc/Nullable.java
    • -2
    • +0
    ./org/lamsfoundation/lams/tool/mc/dto/ToolOutputDTO.java
    • -2
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -6
    • +0
    ./org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java
    • -111
    • +19
    ./org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -51
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
  16. … 33 more files in changeset.
Thursday 20 Apr 2017
3:10 pm

Andrey Balan

LDEV-4320 By default users should be listed in alphabetical order

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
Tuesday 04 Apr 2017
2:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
  4. … 86 more files in changeset.
Thursday 30 Mar 2017
8:31 pm

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -19
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
    • -18
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
  3. … 29 more files in changeset.
Wednesday 08 Mar 2017
1:05 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
  2. … 4 more files in changeset.
Monday 27 Feb 2017
3: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
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101.sql
  2. … 223 more files in changeset.
Wednesday 11 Jan 2017
9:57 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -10
    • +29
    ./org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
  2. … 37 more files in changeset.
Friday 16 Dec 2016
10:26 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

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
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
  2. … 13 more files in changeset.
Tuesday 13 Dec 2016
11:59 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

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
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -2
    • +6
    ./org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -1
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
  4. … 36 more files in changeset.
Monday 21 Nov 2016
11:54 am

Marcin Cieslak

LDEV-4038: Exclude from import fields that have been removed during work on another JIRA.

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
Friday 30 Sep 2016
3:06 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4001:Fixed The Edit feedback in MCQ

Options
    • -5
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/McAction.java
  2. … 1 more file in changeset.
Thursday 29 Sep 2016
3:26 pm

Andrey Balan

LDEV-2866 * stick to using only one jsp page for displaying results - viewAnswers.jsp and thus get rid of lams_tool_lamc/web/learning/IndividualLearnerResults.jsp * get rid of redundant form fields * fix sessionMap that was lost when displaying viewAnswers.jsp

Options
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -55
    • +3
    ./org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/McUtils.java
    • -14
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
    • -63
    • +18
    ./org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -66
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
  7. … 7 more files in changeset.
1:59 pm

Andrey Balan

LDEV-2866 * stick to using only one jsp page for displaying results - viewAnswers.jsp and thus get rid of lams_tool_lamc/web/learning/IndividualLearnerResults.jsp * get rid of redundant form fields * fix sessionMap that was lost when displaying viewAnswers.jsp

Options
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -55
    • +3
    ./org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/McUtils.java
    • -14
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
    • -63
    • +18
    ./org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -66
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
  7. … 12 more files in changeset.
Tuesday 13 Sep 2016
6:57 am

Andrey Balan

LDEV-3972 Fixed mixed up results on reviewing MCQ

Options
    • -0
    • +224
    ./org/lamsfoundation/lams/tool/mc/AnswerDTO.java
    • -5
    • +1
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -21
    • +4
    ./org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
    • -224
    • +0
    ./org/lamsfoundation/lams/tool/mc/McLearnerAnswersDTO.java
    • -98
    • +0
    ./org/lamsfoundation/lams/tool/mc/McLearnerStarterDTO.java
    • -100
    • +0
    ./org/lamsfoundation/lams/tool/mc/McTempDataHolderDTO.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/McUtils.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -22
    • +21
    ./org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -13
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
    • -155
    • +74
    ./org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -17
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
    • -21
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
  14. … 4 more files in changeset.