lams-github / lams_learning

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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
Friday 16 Jan 2009
1:57 pm

mseaton

LDEV-2074 Improvements handle insert/merge of two designs with floating activities. Only set readOnly to true when value is not set in LearnerService (when moving to Floating Activities).

Options
    • -2
    • +5
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 1 more file in changeset.
7:24 am

mseaton

LDEV-2074 Missing toActivity null check

Options
    • -6
    • +7
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
Thursday 15 Jan 2009
3:54 pm

mseaton

LDEV-2074 Fixes progress related bugs found. No long set nextActivity when moving to a floating Activity (only set as attemped); Flags floating activities as readOnly (true) when they are attempted (LiveEdit).

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -5
    • +9
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -6
    • +19
    ./java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
11:18 am

mseaton

LDEV-2074 Updated export for learners to include floating activities.

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
    • -4
    • +5
    ./java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  4. … 2 more files in changeset.
Tuesday 13 Jan 2009
2:58 pm

mseaton

LDEV-2074 Updated the Progress Engine to handle floating (reference) activities, activation from the progress bar and progress status of the activities. Display floating activities in non-flash progress bar with valid links to launch the activities (to-do: still need to fix window pop-up size).

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -9
    • +18
    ./java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
    • -2
    • +5
    ./java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  9. … 2 more files in changeset.
Monday 03 Nov 2008
11:28 am

Marcin Cieslak

LDEV-1932: Added competences to export portfolio both for teacher and learner.

Options
    • -110
    • +132
    ./java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
    • -92
    • +107
    ./java/org/lamsfoundation/lams/learning/export/Portfolio.java
    • -442
    • +410
    ./java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -278
    • +315
    ./java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
  5. … 4 more files in changeset.
11:10 am

lfoxton

LDEV-1971

From a tip from a Fiona, the context path "rams/" or "lams/' is actually stored in the db, so we can get it from there instead of getting it from the context of the request

Options
    • -14
    • +7
    ./java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
Friday 31 Oct 2008
8:00 am

lfoxton

LDEV-1971 : Main export server only adjusts image urls for lams, not in rams,

this is because "/lams/secure/www" was included in the regex

now the "lams" bit is retrieved from the request context using:

request.getContextPath().substring(0, 5);

Options
    • -12
    • +20
    ./java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
7:48 am

lfoxton

Fixing up format of main export servlet

Options
    • -201
    • +199
    ./java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
Wednesday 29 Oct 2008
1:35 pm

Marcin Cieslak

LDEV-1299: Backend for condition gates.

Options
    • -8
    • +13
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -129
    • +129
    ./java/org/lamsfoundation/lams/learning/web/action/GateAction.java
  3. … 24 more files in changeset.
Thursday 09 Oct 2008
2:17 pm

Marcin Cieslak

LDEV-1950: Learner can no longer choose two groups using browser navigation.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
Wednesday 01 Oct 2008
8:00 am

Marcin Cieslak

LDEV-1534: If a deadlock occurs when trying to join a lesson, the attempt is repeated.

Options
    • -1022
    • +1071
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
Thursday 18 Sep 2008
10:42 am

Marcin Cieslak

LDEV-1581: Addin final version of logic.

Options
    • -22
    • +27
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 9 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
    • -0
    • +57
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/learning/web/bean/GateActivityDTO.java
  4. … 34 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
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -106
    • +96
    ./java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -15
    • +29
    ./java/org/lamsfoundation/lams/learning/web/bean/GateActivityDTO.java
  4. … 13 more files in changeset.
Thursday 11 Sep 2008
10:24 am

Marcin Cieslak

LDEV-1581: Added most of the logic for creating/managing learner's choice grouping.

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -246
    • +263
    ./java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -862
    • +942
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -165
    • +177
    ./java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
  5. … 29 more files in changeset.
Wednesday 16 Jul 2008
2:09 pm

lfoxton

For LDEV-1784. When the max number of optional activities has been reached, the choose button on the optional activity summary page will not appear, instead a message appears telling the user that they have reached the maximum number of optionals.

Also added a tick image to signify which activities were completed

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -0
    • +7
    ./java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
  3. … 3 more files in changeset.
Monday 14 Jul 2008
8:26 am

lfoxton

LDEV-1847 - Fixed export portfolio so custom inmages for gmap are bundled with the export.

Now the class is centralised in learner so this can be used in future for other tools.

Options
    • -0
    • +72
    ./java/org/lamsfoundation/lams/learning/export/web/action/CustomToolImageBundler.java
  2. … 1 more file in changeset.
Wednesday 25 Jun 2008
2:40 pm

fmalikoff

LDEV-1208: Preview's special define later screen to update the Flash progress bar.

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
  2. … 1 more file in changeset.
Friday 06 Jun 2008
11:31 am

fmalikoff

LDEV-1817: Define later branching was breaking Preview. Now the preview hack allows it to be used with Random Grouping and this required regetting the grouping at one point to avoid a CGLIB class cast exception (hack on hack). Bleah.

The chosen grouping now works as I clear the number of groups before creating a group (and then allocating to a branch), otherwise I could run into the max number of branches test. Another hack.

Options
    • -7
    • +26
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
  3. … 1 more file in changeset.
Tuesday 03 Jun 2008
8:42 am

fmalikoff

LDEV-1763: Hiding the "Branching" and "Branch Blah" levels when the learner is in a branch.

Options
    • -7
    • +23
    ./java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
Monday 02 Jun 2008
2:25 pm

Andrey Balan

LDEV-1794 Change cross image for - (dash)

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
  2. … 1 more file in changeset.
Friday 30 May 2008
8:43 am

fmalikoff

LDEV-1774: No longer set up tool sessions for any child activities as may that breaks on any children that are in a sequence.

Options
    • -22
    • +22
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
Tuesday 27 May 2008
10:01 am

asukkar

LDEV-1763

Flattened branching tree when performing a learner export portfolio. Branching activity and sequence activity headings are removed and the activities are placed directly under the main tree.

Options
    • -6
    • +18
    ./java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
Monday 19 May 2008
7:08 pm

fmalikoff

LDEV-1624. Download of file wasn't being triggered in Safari as the browser appears to not be sending in the session cookies. Fixed it by removing the newline at the end of the filename, which is appended to the url for downloading.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
Monday 05 May 2008
3:54 pm

fmalikoff

Branching preview screen wasn't selecting the group properly for a chosen branching. So when you return to the selection screen, it has some odd behaviour about when it displays a default branch.

Options
    • -1
    • +11
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
Wednesday 16 Apr 2008
7:48 am

fmalikoff

LDEV-1624: Added some extra debugging so we can tell what is happening on Shaun.

Options
    • -1
    • +8
    ./java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
Monday 14 Apr 2008
2:59 pm

fmalikoff

Fixed up code that creates the folder so that it only tries to create it when the folder doesn't exist - eitherwise it gives a false error when it tries to create the images folder for a second time.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/export/web/action/Bundler.java
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
    • -4
    • +15
    ./java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -6
    • +54
    ./java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -92
    • +30
    ./java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -0
    • +287
    ./java/org/lamsfoundation/lams/learning/web/bean/GateActivityDTO.java
  5. … 12 more files in changeset.
Tuesday 08 Apr 2008
11:33 am

fmalikoff

LDEV-1607: Adding a few misc images to the export portfolio e.g. tick, cross, error.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java