lams-github / lams_tool_lamc / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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 21 Sep 2020
7:03 am

Marcin Cieslak

LDEV-4745 Use correct Set class for sorting MCQ questions

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/model/McContent.java
Thursday 17 Sep 2020
5:12 pm

Marcin Cieslak

LDEV-4745 Sort QB questions using display order when fetching from DB

Options
    • -3
    • +4
    ./lamsfoundation/lams/tool/mc/model/McContent.java
  2. … 2 more files in changeset.
4:17 pm

Marcin Cieslak

LKC-236 Return questions replaced in tool for further processing

Options
    • -1
    • +6
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
Tuesday 28 Jul 2020
9:09 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
  2. … 5 more files in changeset.
9:04 am

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
  2. … 33 more files in changeset.
Friday 10 Jul 2020
4:45 pm

Marcin Cieslak

LDEV-4847 Fix importing QB question with existing UUID

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 7 more files in changeset.
Thursday 02 Jul 2020
4:58 pm

Marcin Cieslak

LKC-213 Fix a bug when adding questions to MCQ from WA

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
Wednesday 06 May 2020
1:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -0
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml
    • -0
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql
    • -0
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20110416_updateFrom235.sql
    • -35
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20200219_updateTo40.sql
    • -21
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20200218.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20200222.sql
  7. … 25 more files in changeset.
Saturday 22 Feb 2020
2:01 pm

Marcin Cieslak

LDEV-4976 Add DB cascades to reflect Hibernate inheritance

Options
    • -0
    • +16
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20200222.sql
  2. … 3 more files in changeset.
Friday 21 Feb 2020
5:32 pm

Andrey Balan

LDEV-4979 Update SQL scripts for LAMS 4.0 release

1. Update SQL scripts (create_lams_tool_*.sql), to avoid running 3.1 to

4.0 autopatch scripts on every build.

2. Update module version to 20200219 in build.properties.

3. Squash patches that upgrade from 3.1 to 4.0 into a single one.

Options
    • -0
    • +124
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20070101_create_lams_tool_mc.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20190517.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20190809.sql
    • -23
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20191205.sql
    • -0
    • +35
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20200219_updateTo40.sql
  6. … 54 more files in changeset.
Wednesday 19 Feb 2020
6:57 am

Marcin Cieslak

LDEV-4976 Introduce an extra column and an unique index

The column holds the same information as parent table. I allows to add a

two-column index to prevent duplicates.

Options
    • -0
    • +21
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20200218.sql
    • -1
    • +11
    ./lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
Tuesday 18 Feb 2020
3:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -120
    • +0
    ./lamsfoundation/lams/tool/mc/McAppConstants.java
    • -9
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcConfigDAO.java
    • -121
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java
    • -50
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
    • -84
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -84
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java
    • -88
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -142
    • +0
    ./lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -20
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McConfigDAO.java
    • -123
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
    • -65
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -107
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -80
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
    • -277
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -210
    • +0
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
  16. … 178 more files in changeset.
Thursday 06 Feb 2020
9:33 am

Marcin Cieslak

LDEV-4962 Fix portraits with complex UUIDs

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/service/McService.java
  3. … 3 more files in changeset.
Wednesday 05 Feb 2020
7:10 am

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Options
    • -42
    • +34
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
  2. … 25 more files in changeset.
7:10 am

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

Options
    • -42
    • +34
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
  2. … 25 more files in changeset.
Tuesday 04 Feb 2020
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -4
    • +4
    ./lamsfoundation/lams/tool/mc/service/IMcService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java
  4. … 33 more files in changeset.
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/service/IMcService.java
    • -4
    • +3
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java
  5. … 35 more files in changeset.
Monday 20 Jan 2020
7:34 am

Marcin Cieslak

LDEV-4846 Set QB question content folder when creating via TBL template

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
7:31 am

Marcin Cieslak

LDEV-4947 Add questions from imported LD to user private QB collection

Options
    • -7
    • +10
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
Sunday 19 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20110416_updateFrom235.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20170101_updateTo30.sql
  4. … 74 more files in changeset.
8:25 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20110416_updateFrom235.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20190517.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20190809.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20191205.sql
  7. … 96 more files in changeset.
Friday 10 Jan 2020
3:28 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

Options
    • -0
    • +816
    ./lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java
    • -0
    • +885
    ./lamsfoundation/lams/tool/mc/web/controller/LearningController.java
    • -0
    • +559
    ./lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java
    • -0
    • +182
    ./lamsfoundation/lams/tool/mc/web/controller/PedagogicalPlannerController.java
  5. … 11 more files in changeset.
2:44 pm

Andrey Balan

LDEV-2866 Name tools' controller classes uniformly

Options
    • -0
    • +842
    ./lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java
    • -0
    • +899
    ./lamsfoundation/lams/tool/mc/web/controller/LearningController.java
    • -842
    • +0
    ./lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -899
    • +0
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -545
    • +0
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -181
    • +0
    ./lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -0
    • +545
    ./lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java
    • -0
    • +181
    ./lamsfoundation/lams/tool/mc/web/controller/PedagogicalPlannerController.java
  9. … 20 more files in changeset.
2:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

(cherry picked from commit 1dc5f5ec294283f43ce1deaa33066bdf1190ff1d)

Options
    • -16
    • +15
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  3. … 1 more file in changeset.
2:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

Options
    • -16
    • +15
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  3. … 1 more file in changeset.
Thursday 09 Jan 2020
8:59 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -7
    • +20
    ./lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -3
    • +0
    ./lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java
  4. … 92 more files in changeset.
Tuesday 07 Jan 2020
11:34 pm

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -2
    • +1
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  2. … 12 more files in changeset.
8:42 pm

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -3
    • +0
    ./lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java
  2. … 50 more files in changeset.
Friday 03 Jan 2020
11:44 am

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

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

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

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -12
    • +25
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -51
    • +136
    ./lamsfoundation/lams/tool/mc/service/McService.java
  3. … 18 more files in changeset.
7:59 am

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -23
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20171031.sql
    • -17
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20171218.sql
    • -18
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180425.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
    • -23
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20181202.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20190103.sql
    • -0
    • +25
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20190103_updateTo31.sql
  9. … 111 more files in changeset.