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
Tuesday 02 Feb 2021
10:07 am

Ernie Ghiglione

LDEV-5143 labels

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 19 more files in changeset.
Monday 01 Feb 2021
9:11 pm

Marcin Cieslak

Merge branch 'LDEV-5143' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java

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

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
  2. … 11 more files in changeset.
12:44 pm

Ernie Ghiglione

LDEV-5143 and LDEV-5140 labels updates

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 19 more files in changeset.
Saturday 30 Jan 2021
4:23 am

Marcin Cieslak

LDEV-5143 Fix marking all learners with star when there is no leader

Options
    • -1
    • +1
    ./web/pages/monitoring/studentChoices.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
4:13 am

Marcin Cieslak

LDEV-5143 Refresh Scratchie monitoring after leader change

Tables in summary tab need to reflect the change.

Options
    • -0
    • +1
    ./web/pages/monitoring/summary.jsp
4:11 am

Marcin Cieslak

LDEV-5143 Allow promoting to leader a learner who did not reach activity

Options
    • -3
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -2
    • +2
    ./web/pages/monitoring/summary.jsp
  4. … 19 more files in changeset.
Monday 25 Jan 2021
6:28 pm

Marcin Cieslak

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 33 more files in changeset.
4:44 am

Marcin Cieslak

LDEV-5143 Allow changing leader in Scratchie monitoring

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +36
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -0
    • +11
    ./web/pages/learning/learning.jsp
    • -0
    • +39
    ./web/pages/monitoring/summary.jsp
Sunday 24 Jan 2021
10:59 pm

Marcin Cieslak

LDEV-5143 Improve layout of wait for leader and change leader screens.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -7
    • +7
    ./web/pages/learning/waitforleader.jsp
  3. … 14 more files in changeset.
Sunday 17 Jan 2021
11:37 pm

Marcin Cieslak

LDEV-5019 Fix a typo when displaying students' choices in Scratchie

Options
    • -1
    • +1
    ./web/pages/monitoring/studentChoices.jsp
Wednesday 13 Jan 2021
2:43 pm

Marcin Cieslak

LDEV-5101 Fix stats link.

Options
    • -2
    • +2
    ./web/pages/authoring/parts/itemlist.jsp
  2. … 1 more file in changeset.
Thursday 07 Jan 2021
4:16 pm

Ernie Ghiglione

LDEV-4769 Update Greek

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 3 more files in changeset.
Monday 04 Jan 2021
2:18 pm

Ernie Ghiglione

LDEV-4769 Fixing quotes for Greek

Options
    • -2
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
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.