lams-github

lams_tool_lamc

Clone Tools

Stats

Commits this week: 0
Total Committers: 27
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 23 Jan 2019
10:07 pm

Marcin Cieslak

LDEV-4746 Use QB option directly instead of MCQ option

Keeping a reference from MCQ option to QB option proved unnecessary and

problematic. It is sufficient for QB question to keep this reference.

Options
    • -13
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
    • -29
    • +8
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -24
    • +11
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -22
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -114
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -49
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -33
    • +23
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -21
    • +19
    ./src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
    • -54
    • +61
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -20
    • +27
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  16. … 11 more files in changeset.
5:59 pm

Marcin Cieslak

LDEV-4746 Introduce a super class for tool questions

Options
    • -32
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
  2. … 2 more files in changeset.
4:03 pm

Marcin Cieslak

LDEV-4746 Move display order from MCQ option to QB option

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -22
    • +10
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -3
    • +13
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
  6. … 2 more files in changeset.
12:26 am

Marcin Cieslak

LDEV-4746 Allow adding new QB questions to MCQ

Add some comments.

Options
    • -9
    • +20
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 1 more file in changeset.
12:08 am

Marcin Cieslak

LDEV-4746 Redesign flow for saving MCQ questions

Detached QB entities act as their own DTOs.

Question options modification is detected and processed.

Options
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -22
    • +55
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -1
    • +1
    ./web/authoring/candidateAnswersList.jsp
  8. … 2 more files in changeset.
Sunday 13 Jan 2019
11:18 pm

Marcin Cieslak

LDEV-4746 Add Question Bank option and process it in MCQ tool

Options
    • -3
    • +13
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -16
    • +24
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -4
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -0
    • +1
    ./web/authoring/candidateAnswersList.jsp
  6. … 3 more files in changeset.
Thursday 10 Jan 2019
8:08 pm

Marcin Cieslak

LDEV-4746 Fix Hibernate management of QB question to prevent duplicates

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 2 more files in changeset.
8:07 pm

Marcin Cieslak

LDEV-4746 Initial Question Bank question implementation

The question is tested on Multiple Choice tool.

Options
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -4
    • +10
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McQuestionDTO.java
    • -26
    • +30
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -40
    • +65
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -11
    • +11
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +1
    ./web/authoring/editQuestionBox.jsp
  9. … 2 more files in changeset.
Tuesday 08 Jan 2019
6:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4743 Squash/Update SQL scripts ready for LAMS 3.1 release

Options
    • -1
    • +1
    ./build.properties
    • -5
    • +9
    ./db/sql/create_lams_tool_mc.sql
    • -6
    • +6
    ./db/sql/tool_insert.sql
    • -12
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130325.sql
    • -13
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130527.sql
    • -13
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130726.sql
    • -26
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130812.sql
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20131021.sql
    • -29
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140101.sql
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140102.sql
    • -20
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140512.sql
    • -49
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20151217.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101.sql
    • -0
    • +131
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101_updateTo30.sql
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20190103.sql
  16. … 115 more files in changeset.
Friday 28 Dec 2018
12:46 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4739 updating lablels for MCQ

Updating English, Greek, Norwegian and English

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
Friday 21 Dec 2018
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -16
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -8
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -1
    • +1
    ./web/learning/ViewAnswers.jsp
    • -1
    • +1
    ./web/learning/submissionDeadline.jsp
  6. … 138 more files in changeset.
Friday 14 Dec 2018
2:48 pm

Marcin Cieslak

LDEV-4735 Fix an URL in learning outcomes in authoring

Options
    • -1
    • +1
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 31 more files in changeset.
Thursday 06 Dec 2018
2:50 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/tblmonitoring/mcq.jsp
    • -1
    • +1
    ./web/tblmonitoring/mcqStudentChoices.jsp
  3. … 13 more files in changeset.
2:19 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: simple TBL UI adjustments

Options
    • -1
    • +1
    ./web/tblmonitoring/mcq.jsp
    • -1
    • +1
    ./web/tblmonitoring/mcqStudentChoices.jsp
  3. … 6 more files in changeset.
Wednesday 05 Dec 2018
1:37 am

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from web.xml

Options
    • -6
    • +0
    ./web/WEB-INF/web.xml
  2. … 30 more files in changeset.
Tuesday 04 Dec 2018
2:46 am

Marcin Cieslak

LDEV-4721 Revert initial tool version

Tool version should be bumped only when previous patches have been

merged into build scripts. This was not such situation. We should keep

old tool version and allow patches to execute.

Options
    • -1
    • +1
    ./build.properties
  2. … 4 more files in changeset.
Monday 03 Dec 2018
9:39 am

Marcin Cieslak

LDEV-4721 Add class renaming filter for tool content import

Options
    • -1
    • +1
    ./build.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20181202.sql
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
  4. … 15 more files in changeset.
Monday 26 Nov 2018
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -7
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueUsr.java
    • -8
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
  6. … 166 more files in changeset.
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -7
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueUsr.java
    • -8
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
  6. … 166 more files in changeset.
Wednesday 21 Nov 2018
7:22 pm

Marcin Cieslak

LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

Options
    • -1
    • +1
    ./web/monitoring/SummaryContent.jsp
  2. … 97 more files in changeset.
Tuesday 20 Nov 2018
6:01 am

Andrey Balan

LDEV-4669 Switch to using placeholder attribute

Also stop copying tags to lams_tool_bbb

Options
    • -6
    • +7
    ./web/WEB-INF/tags/Rating.tag
  2. … 33 more files in changeset.
Friday 09 Nov 2018
2:16 pm

Marcin Cieslak

LDEV-4696 Use container provided Hibernate libraries instead of own copy

Options
    • -0
    • +1
    ./.classpath
  2. … 33 more files in changeset.
Tuesday 06 Nov 2018
6:50 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Comments, Ratings, Peer Review use Annotations, removed proxy

Options
    • -76
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java
  2. … 34 more files in changeset.
Monday 05 Nov 2018
2:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Converted Hibernate to Annotations

Options
    • -234
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -77
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml
    • -110
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
    • -93
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml
    • -106
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml
    • -125
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
  16. … 32 more files in changeset.
Sunday 04 Nov 2018
5:48 pm

Marcin Cieslak

LDEV-4696 Remove obsolete DTO

Options
    • -17
    • +20
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  3. … 13 more files in changeset.
Thursday 01 Nov 2018
3:34 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Removing legacy parameters and deprecated methods

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
  2. … 2 more files in changeset.
11:23 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Removing legacy parameters and deprecated methods

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -14
    • +15
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
    • -24
    • +24
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
  12. … 29 more files in changeset.
Thursday 25 Oct 2018
10:52 pm

Marcin Cieslak

LDEV-4696 Link persistence API source to in classpaths

Options
    • -1
    • +1
    ./.classpath
  2. … 23 more files in changeset.
Friday 19 Oct 2018
3:30 pm

Marcin Cieslak

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

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_build/build_base.xml

# lams_build/lib/lams/lams.jar

# lams_central/web/WEB-INF/struts-config.xml

# lams_common/build.xml

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

Options
    • -9
    • +62
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 9 more files in changeset.
Wednesday 17 Oct 2018
3:58 pm

Marcin Cieslak

LDEV-4691 Make Hibernate a part of LAMS libraries

WildFly 14 provides Hibernate 5.3. Migrating LAMS from 5.0.10 will

require some effort. For now we provide our own version of Hibernate to

keep compatible.

Options
    • -5
    • +0
    ./.classpath
  2. … 44 more files in changeset.