lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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
Monday 13 Aug 2018
2:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

English, Spanish and Greek.

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 19 more files in changeset.
Monday 30 Jul 2018
5:09 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4640: change date label

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
Sunday 29 Jul 2018
5:37 pm

Marcin Cieslak

LDEV-4640 Fix chart legend if there are no participants

Options
    • -1
    • +1
    ./web/includes/javascript/kumalive.js
  2. … 1 more file in changeset.
5:01 pm

Marcin Cieslak

LDEV-4640, LDEV-4454 Put back a label removed probably by mistake

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
Thursday 19 Jul 2018
3:17 pm

Marcin Cieslak

Merge to lams31 after a vital commit to master

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 4 more files in changeset.
Wednesday 04 Jul 2018
8:00 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4501 adding missing labels

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_es_ES.properties
Saturday 30 Jun 2018
1:22 pm

Marcin Cieslak

LDEV-4609 Calculate dates and status for archived progress

Methods which calculate LearnerProgress dates and status use ugly

instanceof constructs. There seem to be no good alternatives, though.

LearnerProgressArchive can inherit from LearnerProgress and we use

table-per-subclass Hibernate strategy. But then queries for

LearnerProgress would fetch also LearnerProgressArchive entities unless

in each HQL query we put "WHERE lp.class = LearnerProgress". It is easy

to forget plus generic methods like findAll() will not work well anyway.

LearnerProgress and LearnerProgressArchive can extend a new

AbstractLearnerProgress and we use table-per-concrete-class Hibernate

strategy. Same with CompletedActivityProgress and

CompletedActivityProgressArchive. But then

AbstractLearnerProgress.completedActivities will not let use both of

them due to lack of polymorphism in collections. Neither

Map<Activty, AbstractCompletedActivityProgress>

nor

Map<Activity, ? extends AbstractCompletedActivityProgress>

will not work. And this collection is the main reason why to do

inheritance in the first place.

Looking how the above solutions add complexity and little gain, these

few methods with instanceof seem to be a fine trade off.

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 10 more files in changeset.
Sunday 24 Jun 2018
9:26 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

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

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

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

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

Options
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
  2. … 14 more files in changeset.
Wednesday 30 May 2018
8:18 pm

Marcin Cieslak

LDEV-4587 Display all ordered branches in progress bar

Ordered branching should be displayed similarly to optional sequences.

Options
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
Tuesday 22 May 2018
5:59 pm

Marcin Cieslak

LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 14 more files in changeset.
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -16
    • +16
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 46 more files in changeset.
Monday 21 May 2018
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -2
    • +29
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +78
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +30
    ./conf/language/lams/ApplicationResources_no_NO.properties
  4. … 36 more files in changeset.
7:01 pm

Marcin Cieslak

LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +23
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 5 more files in changeset.
Friday 11 May 2018
10:33 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4454 Adding labels for kumalive polls in i18n

Options
    • -35
    • +32
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +31
    ./conf/language/lams/ApplicationResources_en_AU.properties
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.
Tuesday 01 May 2018
9:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
  2. … 6 more files in changeset.
Friday 13 Apr 2018
3:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4554 Completed optional activities are now links to revisit.

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +3
    ./web/optionsActivity.jsp
  4. … 1 more file in changeset.
Monday 09 Apr 2018
9:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  4. … 33 more files in changeset.
Monday 02 Apr 2018
11:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -6
    • +53
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +51
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 55 more files in changeset.
Thursday 29 Mar 2018
7:35 pm

Marcin Cieslak

LDEV-4538 Display gate open user and time in monitoring

Options
    • -9
    • +11
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 12 more files in changeset.
Saturday 24 Mar 2018
2:12 am

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

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

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.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/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.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/web/action/MonitoringAction.java

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.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/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.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/LearningAction.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
    • -51
    • +397
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -2
    • +94
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  4. … 81 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -7
    • +17
    ./web/error.jsp
  2. … 34 more files in changeset.
Wednesday 28 Feb 2018
2:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -1
    • +1
    ./web/notebook/viewalljournals.jsp
  2. … 8 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
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -6
    • +21
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  5. … 62 more files in changeset.
Tuesday 20 Feb 2018
11:24 am

Marcin Cieslak

LDEV-4513 Check if websocket is open before sending anything

Options
    • -17
    • +30
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
Thursday 15 Feb 2018
11:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Wednesday 07 Feb 2018
6:32 pm

Marcin Cieslak

LDEV-4508 Log when a Kumalive learner raises and lowers a hand

Options
    • -0
    • +18
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveLog.hbm.xml
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +91
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
  7. … 1 more file in changeset.
Tuesday 06 Feb 2018
10:55 pm

Marcin Cieslak

LDEV-4507 Use DTOs instead of entities as page attributes

It seems that using entities as page attributes outside a transaction

causes undesired effect. Portrait tag fetches data from DB and existing

entities, including group participants, get flushed from session. It

overwrites changes made by learners being added to a group.

Options
    • -15
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -7
    • +7
    ./web/grouping/choose.jsp
    • -3
    • +3
    ./web/grouping/show.jsp
  4. … 3 more files in changeset.
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java
    • -19
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
  5. … 59 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
    ./.classpath
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -17
    • +17
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  5. … 53 more files in changeset.