lams-github / lams_tool_lamc / src / java

org

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 28 Feb 2018
7:49 am

Andrey Balan

LDEV-4520 Stop showing n/a column in iRA's student's choices

Instead show percentages as floats with 2 decimal places.

Options
    • -0
    • +13
    ./lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -7
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  3. … 1 more file in changeset.
Tuesday 27 Feb 2018
10:56 am

Andrey Balan

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +9
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +10
    ./lamsfoundation/lams/tool/mc/service/IMcService.java
    • -7
    • +12
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +135
    ./lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  6. … 47 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -11
    • +15
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 65 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
  2. … 62 more files in changeset.
Saturday 03 Feb 2018
5:16 am

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -1
    • +0
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -11
    • +3
    ./lamsfoundation/lams/tool/mc/service/McService.java
  3. … 55 more files in changeset.
Friday 02 Feb 2018
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -2
    • +1
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -12
    • +2
    ./lamsfoundation/lams/tool/mc/service/McService.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -3
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  2. … 78 more files in changeset.
7:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  2. … 77 more files in changeset.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

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

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

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

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

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.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/service/ChatService.java

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_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

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

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

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

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

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -83
    • +80
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -5
    • +10
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 43 more files in changeset.
8:03 am

Andrey Balan

LDEV-4490 Fix exceptions caused by NULL ConfidenceLevel columns

Options
    • -0
    • +17
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20171218.sql
  2. … 1 more file 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
    ./lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
  2. … 10 more files in changeset.
Wednesday 08 Nov 2017
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
    ./lamsfoundation/lams/tool/mc/service/McService.java
Friday 03 Nov 2017
5:32 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +16
    ./lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +22
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -11
    • +8
    ./lamsfoundation/lams/tool/mc/service/IMcService.java
    • -77
    • +65
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  6. … 3 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
    • -9
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +16
    ./lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +30
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +22
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +23
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20171031.sql
    • -0
    • +10
    ./lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -7
    • +23
    ./lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -3
    • +19
    ./lamsfoundation/lams/tool/mc/pojos/McQueContent.java
    • -1
    • +12
    ./lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java
    • -11
    • +8
    ./lamsfoundation/lams/tool/mc/service/IMcService.java
    • -77
    • +65
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +3
    ./lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McAction.java
  16. … 17 more files in changeset.
Thursday 02 Nov 2017
8:18 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +6
    ./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
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 28 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
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +22
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 5 more files in changeset.
Monday 16 Oct 2017
11:19 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4437 Propogates Monitor Leader mark changes to group members

Options
    • -0
    • +5
    ./lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +13
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +2
    ./lamsfoundation/lams/tool/mc/service/IMcService.java
    • -20
    • +49
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +22
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
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
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 28 more files in changeset.
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
    • +2
    ./lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    ./lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    ./lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
    • -39
    • +9
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  7. … 20 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
    • +2
    ./lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    ./lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    ./lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
    • -39
    • +9
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  7. … 20 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
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +767
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +409
    ./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
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +1964
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -1965
    • +0
    ./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
    ./lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +86
    ./lamsfoundation/lams/tool/mc/util/LearningUtil.java
    • -254
    • +0
    ./lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -44
    • +0
    ./lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
    • -86
    • +0
    ./lamsfoundation/lams/tool/mc/web/LearningUtil.java
    • -765
    • +0
    ./lamsfoundation/lams/tool/mc/web/McAction.java
    • -759
    • +0
    ./lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -260
    • +0
    ./lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
    • -409
    • +0
    ./lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -176
    • +0
    ./lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
    • -181
    • +0
    ./lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java
    • -121
    • +0
    ./lamsfoundation/lams/tool/mc/web/McStarterAction.java
    • -0
    • +44
    ./lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
    • -0
    • +766
    ./lamsfoundation/lams/tool/mc/web/action/McAction.java
    • -0
    • +760
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  16. … 7 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
    • -66
    • +78
    ./lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -21
    • +28
    ./lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -39
    • +39
    ./lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
  4. … 133 more files in changeset.
Thursday 13 Jul 2017
2:23 pm

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
    ./lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -52
    • +40
    ./lamsfoundation/lams/tool/mc/web/McAction.java
1:55 pm

Marcin Cieslak

LDEV-4379 Use correct logger in McAction

Options
    • -8
    • +8
    ./lamsfoundation/lams/tool/mc/web/McAction.java
Thursday 15 Jun 2017
11: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
    ./lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -33
    • +27
    ./lamsfoundation/lams/tool/mc/web/McAction.java
    • -4
    • +3
    ./lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -18
    • +0
    ./lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/mc/web/form/McLearningForm.java
Friday 09 Jun 2017
11: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
    ./lamsfoundation/lams/tool/mc/McAppConstants.java
    • -3
    • +5
    ./lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -23
    • +82
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +82
    ./lamsfoundation/lams/tool/mc/dto/LeaderResultsDTO.java
    • -0
    • +38
    ./lamsfoundation/lams/tool/mc/dto/SessionDTO.java
    • -2
    • +37
    ./lamsfoundation/lams/tool/mc/service/IMcService.java
    • -2
    • +65
    ./lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -6
    • +8
    ./lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -0
    • +66
    ./lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -8
    • +0
    ./lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
  11. … 6 more files in changeset.
Wednesday 07 Jun 2017
9:46 pm

Andrey Balan

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

Options
    • -5
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
    • -4
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -3
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
    • -2
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -4
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
  6. … 7 more files in changeset.