lams-github / lams_monitoring

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
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
Thursday 06 Nov 2008
8:49 am

paulg

LDEV-1995 Branching and Grouping modules completed Flex projects added to a new folder in the flash project The servlets used now send back a string of XML which is parsed in Flex instead of a custom string The Grouper and Brancher were separated into two separate modules even if they are very similar. I'm sure that there is a better way of doing it but given that 2.2 is coming up I set things up this way.

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +5
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -1
    • +12
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +36
    ./java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java
    • -27
    • +99
    ./java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -26
    • +180
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  7. … 22 more files in changeset.
Wednesday 05 Nov 2008
2:04 pm

jliew

LDEV-1968 log error message

Options
    • -4
    • +6
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
2:02 pm

jliew

LDEV-1968 fix bug when using lessonIds for new lesson classes

Options
    • -5
    • +9
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
1:56 pm

jliew

use Sun 120 formatting standard

Options
    • -590
    • +752
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -2050
    • +2228
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
12:05 pm

jliew

LDEV-1968 add servlet to start multiple lessons in an organisation based on x number of learners per lesson

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +146
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +118
    ./java/org/lamsfoundation/lams/monitoring/web/StartLessonsServlet.java
Friday 31 Oct 2008
1:51 pm

Marcin Cieslak

LDEV-1299: Modified monitoring for condition gates.

Options
    • -6
    • +6
    ./java/org/lamsfoundation/lams/monitoring/web/GateAction.java
  2. … 3 more files in changeset.
Thursday 30 Oct 2008
11:14 am

Marcin Cieslak

LDEV-1299: Fixed a Struts bug in monitoring for condition gates. Added some labels.

Options
    • -215
    • +221
    ./java/org/lamsfoundation/lams/monitoring/web/GateAction.java
  2. … 2 more files in changeset.
Thursday 16 Oct 2008
2:08 pm

paulg

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -10
    • +14
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 31 more files in changeset.
Tuesday 16 Sep 2008
11:18 am

Marcin Cieslak

LDEV-1299: Added some logic for the new "condition gate" that allows learners to pass depending on condition satisfaction.

Options
    • -2
    • +5
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +6
    ./java/org/lamsfoundation/lams/monitoring/web/GateAction.java
  3. … 35 more files in changeset.
Saturday 13 Sep 2008
10:11 am

Marcin Cieslak

LDEV-1896: Extended permission gate. Teacher can now allow a single learner to pass the gate.

Options
    • -463
    • +477
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -2098
    • +2155
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -186
    • +201
    ./java/org/lamsfoundation/lams/monitoring/web/GateAction.java
  4. … 13 more files in changeset.
Friday 22 Aug 2008
10:25 am

lfoxton

Fixing up a comment in monitoring service for customCSV

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
Friday 15 Aug 2008
12:53 pm

lfoxton

LDEV-1861 Adding customCSV

Adding the customCSV in to the initializeLesson method, so that when the call for preview is made, the customCSV is passed through and the tools can perform the copy required for tool adapters on external servers

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -9
    • +15
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
Tuesday 10 Jun 2008
9:24 am

fmalikoff

LDEV-1819: Initialise branching activities properly after a live edit

Options
    • -0
    • +8
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -25
    • +37
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 2 more files in changeset.
Wednesday 04 Jun 2008
12:29 pm

fmalikoff

LDEV-1804: Tool urls on the Optional Activity page were missing the tool part - all there was was the lams part.

Options
    • -2
    • +7
    ./java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
Wednesday 28 May 2008
10:07 am

fmalikoff

LDEV-1766: Some of the methods weren't transactioned properly in the context file. Once the transactions were correct, had to tweak some calls to hibernate

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Tuesday 27 May 2008
10:33 am

fmalikoff

LDEV-1766: Removing groups from branches on the define later screen in monitoring wasn't working as I was trying to remove them from the group end and that is only cascade all. Changed to remove from the branch end as that has all-delete-orphan. Also noticed that some of the methods weren't transactioned properly in the context file.

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -2
    • +2
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Friday 23 May 2008
9:43 am

fmalikoff

LDEV-1733: Allow teachers to add any number of groups to a chosen grouping, irrespective of the max number set in authoring. If they do add more than the max number, then the max number column is set to null (and not 0) as this matches what authoring expects.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -12
    • +27
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +15
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  4. … 2 more files in changeset.
Wednesday 14 May 2008
10:10 am

fmalikoff

LDEV-1717: scheduling beans are no longer singletons, so the server is trying to set up quartz schedule entries for two gates or two lessons at the same time then they won't interfere with each other.

Options
    • -4
    • +4
    ./java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
Monday 14 Apr 2008
2:40 pm

fmalikoff

LDEV-1571: Sync gates to open for group based and teacher chosen branching. The "potential list of learners" is restricted to the group of learners associated with the group assigned to the branch.

Options
    • -29
    • +5
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -63
    • +20
    ./java/org/lamsfoundation/lams/monitoring/web/GateAction.java
  3. … 14 more files in changeset.
Friday 07 Mar 2008
8:34 am

fmalikoff

LDEV-1005: Added lesson name to headings, added help button, improved layout, improved browser compatibility on the page sizing, added scrolling to the iframe, hide the branches that the user isn't doing, adding support for the jump ahead in preview.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
  2. … 23 more files in changeset.
Friday 15 Feb 2008
3:13 pm

fmalikoff

LDEV-1473: Fixing up the complex activity pages. Now have three statuses: Not Started, Started and Completed. The sequence activities show up as their own pages. The branching, optional sequence and sequence pages all have links to contained activities if the activities are started or completed. The activities in the sequences are now ordered by transition, rather than order id, as that is what the progress engine uses to determine order.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -3
    • +6
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -52
    • +113
    ./java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
  4. … 1 more file in changeset.
Thursday 14 Feb 2008
2:43 pm

fmalikoff

LDEV-1473: Removing the class cast exception that an occur on the learner progress screen for branching - the old CGLIB problem.

Options
    • -5
    • +12
    ./java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
1:47 pm

fmalikoff

LDEV-1473: Removing the class cast exception that an occur on the learner progress screen for branching - the old CGLIB problem.

Options
    • -2
    • +7
    ./java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
Tuesday 12 Feb 2008
12:09 pm

fmalikoff

LDEV-1400: When a force complete is done, any branching, optional sequences or optional activities have the parent activity marked as complete, but no children are marked as complete.

Options
    • -1
    • +7
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Tuesday 15 Jan 2008
7:33 am

jliew

LDEV-1473 Add learner progress screens for complex activities. Parallel activities display simultaneously just like in learner; optional/branch activities state whether they have been started or not; optional/branch sequences display whether the sequences have been started, and link to each tool's learner progress url if the activity has been attempted. Branch screen yet to be tested due to flash error when making callback to LAMS.

Options
    • -4
    • +14
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +148
    ./java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 6 more files in changeset.
Thursday 10 Jan 2008
7:42 am

fmalikoff

LDEV-1480: Set the Group UIID and Entry UIID fields so that Live Edit is able to handle the designs properly.

Options
    • -4
    • +20
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +0
    ./java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
Friday 04 Jan 2008
7:18 am

fmalikoff

LDEV-1480: Live Edit is wiping out any existing groups for teacher chosen branching. I've added uiids to the grouping and this fixes part of the problem - the groups are now kept but the mapping entries are lost.

Options
    • -13
    • +34
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Sunday 09 Dec 2007
5:59 pm

fmalikoff

LDEV-750: Adding insert sequence into sequence functionality. Basic functionality done - still yet to do the Flash side and some security checking.

Options
    • -41
    • +2
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 35 more files in changeset.
Monday 19 Nov 2007
11:37 am

fmalikoff

LDEV-1410: When a description wasn't supplied for a lesson, a default description was always set. The default has been removed. I've also improved the handling for a missing lesson title, but it will probably never be used as Flash ensures there is a lesson title.

Options
    • -7
    • +5
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Friday 09 Nov 2007
4:16 pm

fmalikoff

LDEV-1278: Adding calls that allow the sending of learner progress records in batches.

Options
    • -0
    • +73
    ./java/org/lamsfoundation/lams/monitoring/LearnerProgressBatchDTO.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +26
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -8
    • +84
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +39
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java