lams-github

lams_tool_scratchie

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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 30 Dec 2020
5:05 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

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

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

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

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

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -0
    • +1
    ./db/sql/create_lams_tool_scratchie.sql
    • -1
    • +40
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -2
    • +45
    ./web/pages/authoring/basic.jsp
    • -16
    • +91
    ./web/pages/authoring/parts/itemlist.jsp
  5. … 26 more files in changeset.
1:53 pm

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -8
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 2 more files in changeset.
Sunday 27 Dec 2020
9:34 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 2 more files in changeset.
Friday 25 Dec 2020
10:41 am

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -1
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 9 more files in changeset.
Sunday 20 Dec 2020
1:39 pm

Ernie Ghiglione

LDEV-5120 Updating labels Spanish, English

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 5 more files in changeset.
1:57 am

Marcin Cieslak

LDEV-5138 Set leader only on his activity entry, not on any user entry

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 24 more files in changeset.
Saturday 19 Dec 2020
11:55 am

Ernie Ghiglione

LDEV-5120 updating labels and Español

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 3 more files in changeset.
Friday 18 Dec 2020
8:27 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 5 more files in changeset.
8:22 am

Ernie Ghiglione

LDEV-5136 labels and tooltips

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./web/pages/authoring/advance.jsp
    • -3
    • +3
    ./web/pages/learning/learning.jsp
Wednesday 16 Dec 2020
1:41 am

Marcin Cieslak

LDEV-5128 Match VS answers more loosely

Remove all characters other than letters and numbers when matching

answers.

Options
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -26
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 3 more files in changeset.
Monday 14 Dec 2020
4:58 pm

Marcin Cieslak

LDEV-5136 Enable double click revealing in Scratchie

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20201214.sql
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +7
    ./web/pages/authoring/advance.jsp
    • -0
    • +10
    ./web/pages/learning/learning.jsp
    • -1
    • +13
    ./web/pages/learning/scratchies.jsp
4:52 am

Marcin Cieslak

LDEV-5132 Improve indication of good/bad VSA answers in monitoring

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -11
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -16
    • +39
    ./web/pages/monitoring/studentChoices.jsp
    • -11
    • +24
    ./web/pages/tblmonitoring/tra.jsp
    • -236
    • +0
    ./web/pages/tblmonitoring/traStudentChoices.jsp
Monday 07 Dec 2020
7:07 pm

Marcin Cieslak

LDEV-5120 Allow hiding criteria titles in Rating.tag

Options
    • -3
    • +9
    ./web/WEB-INF/tags/Rating.tag
  2. … 31 more files in changeset.
Thursday 03 Dec 2020
6:21 pm

Marcin Cieslak

LDEV-5127 Adjust reported pad height when toolbar is not displayed

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Wednesday 02 Dec 2020
5:21 am

Marcin Cieslak

LDEV-5127 Fix pad resizing

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Tuesday 01 Dec 2020
8:58 pm

Marcin Cieslak

LDEV-4944 Recalculate Scratchie marks only for given VSA answer

Options
    • -5
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -17
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 5 more files in changeset.
Thursday 26 Nov 2020
10:04 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian, Greek

Options
    • -0
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 8 more files in changeset.
Wednesday 25 Nov 2020
11:35 pm

Marcin Cieslak

LDEV-4604 Scroll to burning questions after refreshing them

Options
    • -9
    • +7
    ./web/pages/learning/results.jsp
Sunday 22 Nov 2020
7:25 am

Ernie Ghiglione

LDEV-5101 Adding labels from lokalise (English and Español)

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 6 more files in changeset.
5:02 am

Marcin Cieslak

LDEV-5121 Add TBL template imported questions to chosen QB collection

Options
    • -10
    • +23
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 7 more files in changeset.
Saturday 21 Nov 2020
6:16 pm

Marcin Cieslak

Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +29
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -0
    • +31
    ./web/pages/authoring/basic.jsp
    • -11
    • +82
    ./web/pages/authoring/parts/itemlist.jsp
  6. … 5 more files in changeset.
Friday 20 Nov 2020
4:51 am

Marcin Cieslak

LDEV-5122 Modify DB structure to produce 3.1 version

Till now DB structure was compliant with 3.0 version and patches

upgraded it to 3.1. Now we produce DB compliant with 3.1 and patches in

branch 4.0 upgrade it to version 4.0.

Options
    • -0
    • +1
    ./db/sql/create_lams_tool_scratchie.sql
    • -2
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103_updateTo31.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200413.sql
  5. … 37 more files in changeset.
Thursday 19 Nov 2020
3:16 pm

Ernie Ghiglione

LDEV-5108 Oopps.. forgot to remove old IMS QTI link

Options
    • -5
    • +0
    ./web/pages/authoring/parts/itemlist.jsp
8:47 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian, Greek

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 16 more files in changeset.
1:33 am

Marcin Cieslak

LDEV-5114 Add "Save as new version" button to Scratchie

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -3
    • +27
    ./web/pages/authoring/parts/addItemFooter.jsp
Friday 13 Nov 2020
8:16 am

Ernie Ghiglione

LDEV-5101 Enhacing tooltips

Options
    • -3
    • +3
    ./web/pages/authoring/parts/itemlist.jsp
Thursday 12 Nov 2020
7:18 pm

Marcin Cieslak

LDEV-5101 Add stats button to each question in Scratchie

Also align icons better.

Options
    • -4
    • +3
    ./web/pages/authoring/authoring.jsp
    • -7
    • +14
    ./web/pages/authoring/parts/itemlist.jsp
6:54 pm

Marcin Cieslak

LDEV-5101 Avoid name clash between bootstrap and jQuery UI

Options
    • -3
    • +3
    ./web/pages/authoring/authoring.jsp
    • -0
    • +4
    ./web/pages/authoring/parts/itemlist.jsp
5:06 am

Ernie Ghiglione

LDEV-5101 Ui changes

Options
    • -0
    • +5
    ./web/pages/authoring/authoring.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/itemlist.jsp
2:19 am

Marcin Cieslak

LDEV-5101 Add labels

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    ./web/pages/authoring/parts/itemlist.jsp