Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

  1. … 11 more files in changeset.
LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

  1. … 13 more files in changeset.
LDEV-4505 Learners identified by Lastname, Surname in Monitoring

  1. … 7 more files in changeset.
LDEV-4520 Change the way TBL activity is detected

TBL activity should contain the following sequence Grouping->(MCQ or

Assessment)->Leader Selection->Scratchie but it might have some other

gates or activities in the middle though.

LKC-89 Move TBL Monitoring interface from lams-private

Add a switch that would display TBL UI monitoring interface. It

should be available only to the TBL template lessons.

Besides, modify the TBL UI monitor as in some cases the iRA (the first

assessment is not only just MCQ, but Assessment). So the change would be

to add as iRA the first assessment activity whether this is MCQ or

assessment.

    • -0
    • +81
    ./org/lamsfoundation/lams/monitoring/dto/PermissionGateDTO.java
    • -0
    • +92
    ./org/lamsfoundation/lams/monitoring/dto/TblGroupDTO.java
    • -0
    • +32
    ./org/lamsfoundation/lams/monitoring/dto/TblUserDTO.java
    • -0
    • +435
    ./org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  1. … 10 more files in changeset.
LKC-89 add auxiliary methods required for TBL monitoring

  1. … 4 more files in changeset.
LDEV-4501 All Audit Log entries are now Log Event entries

  1. … 65 more files in changeset.
LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

  1. … 33 more files in changeset.
LDEV-4501 Tool context files no longer reference audit service.

  1. … 59 more files in changeset.
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

  1. … 56 more files in changeset.
LDEV-4407 Introduce new IMonitorFullService interface

MonitorService interfaces are redefined now:

1. IMonitorService is going to be used by core modules.

2. IMonitorFullService is used inside of lams_monitoring only and

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

classes.

  1. … 17 more files in changeset.
LDEV-4407 Introduce new LearnerService interfaces

LearnerService interfaces are redefined now:

1. ILearnerService is used by core modules. Also tools no longer

use it.

2. ILearnerFullService is used inside of lams_learning only and

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

classes.

3. ICoreLearnerService is removed, its method are split between

ILearnerService and ILearnerFullService.

  1. … 31 more files in changeset.
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.

  1. … 77 more files in changeset.
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

  1. … 42 more files in changeset.
LDEV-4487 Toggle display activity scores option in monitor

  1. … 6 more files in changeset.
LDEV-4477 Disable trigger removed when status changed.

LDEV-4474 Able to change the scheduled open date time for a gate.

Also fixed a number of bugs causing the schedule gate screens to

report strange times, missing fields, etc.

  1. … 13 more files in changeset.
LDEV-4477 Disable lesson on schedule

  1. … 4 more files in changeset.
LDEV-4476: Monitor can change the scheduled start date.

  1. … 3 more files in changeset.
LDEV-4457 Monitor can do group upload, course grouping has upload

Fixed the security so that Monitor role users can use the groups

spreadsheet upload feature. Added upload support for the course

grouping screen.

  1. … 4 more files in changeset.
LDEV-4484 Print Grouping Page

  1. … 10 more files in changeset.
LDEV-4457 Create groupings based on file upload

    • -0
    • +65
    ./org/lamsfoundation/lams/monitoring/web/FileUploadForm.java
  1. … 12 more files in changeset.
LDEV-4459 Export archived email notification

  1. … 2 more files in changeset.
LDEV-4459 Display a paged list of email notification recipients

  1. … 4 more files in changeset.
LDEV-4459 Display archived email notifications

  1. … 1 more file in changeset.
LDEV-4459 Archive immediate or scheduled email notifications

  1. … 6 more files in changeset.
LDEV-4459 Archived notifications front end

  1. … 7 more files in changeset.
LDEV-4453 Add "gradebook on lesson complete" field to Lesson

  1. … 6 more files in changeset.
LDEV-4420 Lesson status changes recorded in audit log.

  1. … 1 more file in changeset.
LDEV-4412: Audit log entries are created when lessons are removed.

  1. … 1 more file in changeset.