lams-github

lams_tool_daco

Clone Tools

Stats

Commits this week: 0
Total Committers: 18
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 14 Jun 2019
7:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Wednesday 15 May 2019
1:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 35 more files in changeset.
Wednesday 27 Mar 2019
12:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  4. … 85 more files in changeset.
Tuesday 12 Mar 2019
3:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 62 more files in changeset.
Thursday 28 Feb 2019
8:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

Options
    • -3
    • +2
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 34 more files in changeset.
3:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Autocomplete restyling, started Assessment updates

Options
    • -1
    • +0
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 43 more files in changeset.
Tuesday 26 Feb 2019
10:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Fixing responsive behaviour on front page and tabs.

Options
    • -5
    • +7
    ./web/WEB-INF/tags/Tabs.tag
  2. … 43 more files in changeset.
Monday 25 Feb 2019
8:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tablesorter, Learner Progress Bar tweaked

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +1
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TSTable.tag
  4. … 120 more files in changeset.
Friday 22 Feb 2019
12:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -6
    • +19
    ./web/WEB-INF/tags/Page.tag
  2. … 50 more files in changeset.
Friday 15 Feb 2019
5:08 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Togglebutton and checkbox css functional

Options
    • -3
    • +4
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +7
    ./web/WEB-INF/tags/headItems.tag
  3. … 81 more files in changeset.
Thursday 14 Feb 2019
3:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -5
    • +5
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -9
    • +9
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +2
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -8
    • +6
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -4
    • +4
    ./web/WEB-INF/tags/TextSearch.tag
    • -0
    • +14
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/pages/authoring/parts/answeroptions.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/questionlist.jsp
    • -3
    • +3
    ./web/pages/learning/listRecords.jsp
    • -4
    • +4
    ./web/pages/learning/listRecordsHorizontalPart.jsp
    • -1
    • +1
    ./web/pages/learning/questionSummaries.jsp
    • -1
    • +1
    ./web/pages/monitoring/editactivity.jsp
    • -1
    • +1
    ./web/pages/monitoring/listRecords.jsp
    • -1
    • +1
    ./web/pages/monitoring/statisticsarea.jsp
    • -3
    • +3
    ./web/pages/monitoring/summary.jsp
  16. … 377 more files in changeset.
Sunday 10 Feb 2019
1:06 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tour and portrait pop ups appear correctly.

Options
    • -9
    • +10
    ./web/WEB-INF/tags/Tab.tag
  2. … 43 more files in changeset.
8:28 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
Thursday 07 Feb 2019
9:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page functional

Options
    • -2
    • +2
    ./web/WEB-INF/tags/SimplePanel.tag
  2. … 35 more files in changeset.
Wednesday 06 Feb 2019
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    ./web/WEB-INF/tags/DefineLater.tag
    • -36
    • +18
    ./web/WEB-INF/tags/Page.tag
    • -4
    • +4
    ./web/WEB-INF/tags/SimplePanel.tag
    • -1
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -0
    • +1
    ./web/common/header.jsp
    • -0
    • +1
    ./web/common/jqueryheader.jsp
    • -0
    • +1
    ./web/common/tabbedheader.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/addcheckbox.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/adddate.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/adddropdown.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/addfile.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/addimage.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/addlonglat.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/addnumber.jsp
  16. … 492 more files in changeset.
Friday 01 Feb 2019
3:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Authoring and monitoring tabs working

Options
    • -2
    • +5
    ./web/WEB-INF/tags/Tab.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TabBody.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TabBodyArea.tag
    • -36
    • +27
    ./web/WEB-INF/tags/Tabs.tag
    • -0
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/common/header.jsp
    • -1
    • +1
    ./web/common/jqueryheader.jsp
    • -1
    • +1
    ./web/common/tabbedheader.jsp
    • -1
    • +1
    ./web/includes/css/daco.scss
  10. … 307 more files in changeset.
Tuesday 29 Jan 2019
9:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4760 Fixed spacing in authoring criteria entry panel

Options
    • -2
    • +4
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 32 more files in changeset.
Sunday 27 Jan 2019
3:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

Options
    • -1
    • +4
    ./web/WEB-INF/tags/Head.tag
    • -38
    • +30
    ./web/WEB-INF/tags/Page.tag
  3. … 262 more files in changeset.
Sunday 20 Jan 2019
2:05 pm

Marcin Cieslak

LDEV-4755 Display upload errors nicer

Options
    • -7
    • +11
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
  3. … 5 more files in changeset.
Monday 07 Jan 2019
11:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +1
    ./build.properties
    • -4
    • +4
    ./db/sql/create_lams_tool_daco.sql
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20140102.sql
    • -13
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20150217.sql
    • -54
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20151217.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20160927.sql
    • -23
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20170101.sql
    • -0
    • +88
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20170101_updateTo30.sql
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20190103.sql
  10. … 121 more files in changeset.
Friday 28 Dec 2018
8:09 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4739 Updating labels for daco

Updating English, Spanish, Greek and Norwegian

Options
    • -7
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
Friday 21 Dec 2018
12:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -15
    • +10
    ./src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
  2. … 20 more files in changeset.
Thursday 20 Dec 2018
9:47 pm

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
    • -10
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/notebook.jsp
  6. … 138 more files in changeset.
Friday 14 Dec 2018
7:48 am

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.
Tuesday 04 Dec 2018
6:37 pm

Marcin Cieslak

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

Options
    • -5
    • +0
    ./web/WEB-INF/web.xml
  2. … 30 more files in changeset.
Monday 26 Nov 2018
4: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
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java
  6. … 166 more files in changeset.
4: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
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java
  6. … 166 more files in changeset.
Monday 19 Nov 2018
11:01 pm

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
7:16 am

Marcin Cieslak

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

Options
    • -0
    • +1
    ./.classpath
  2. … 33 more files in changeset.
Thursday 08 Nov 2018
1:57 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Data Collection uses annotations, no service proxy

Options
    • -181
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml
    • -115
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml
    • -53
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml
    • -142
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml
    • -108
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml
    • -123
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java
    • -116
    • +37
    ./src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java
    • -43
    • +26
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java
    • -16
    • +14
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.java
    • -70
    • +35
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java
    • -48
    • +35
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java
    • -52
    • +41
    ./src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java
    • -71
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceProxy.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
    • -0
    • +1
    ./web/pages/authoring/basic.jsp
    • -7
    • +7
    ./web/pages/learning/questionSummaries.jsp