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
Thursday 20 Dec 2012
11:11 pm

Andrey Balan

LDEV-2984 Removed jxl library from LAMS and thus only POI one is left for excel export

Options
    • -3
    • +2
    ./.classpath
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
  5. … 25 more files in changeset.
Wednesday 19 Dec 2012
11:51 pm

Andrey Balan

LDEV-2849 comply with the latest changes in LAMS libraries

Options
    • -0
    • +5
    ./.classpath
  2. … 3 more files in changeset.
Sunday 16 Dec 2012
5:06 pm

Andrey Balan

LDEV-2979 if user joins a lesson after leader has already finished an activity set his scratchingFinished parameter to true

Options
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
4:51 pm

Andrey Balan

LDEV-2977 added displaying reflections in Monitor

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -5
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -52
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -38
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/ReflectDTOComparator.java
    • -14
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -7
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
    • -53
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
    • -1
    • +26
    ./web/pages/monitoring/summary.jsp
4:46 pm

Andrey Balan

LDEV-2977 added displaying reflections in Monitor

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +0
    ./conf/xdoclet/struts-actions.xml
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -11
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -19
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Saturday 15 Dec 2012
12:00 am

Andrey Balan

LDEV-2978 Added excel export feature to Tool Scratchie

Options
    • -0
    • +1
    ./.classpath
    • -0
    • +57
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./conf/xdoclet/struts-actions.xml
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -79
    • +525
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -19
    • +53
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -12
    • +22
    ./web/pages/monitoring/summary.jsp
  10. … 3 more files in changeset.
Wednesday 12 Dec 2012
11:59 pm

Andrey Balan

LDEV-2977 display reflections in Monitor

Options
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
Tuesday 11 Dec 2012
9:17 pm

Andrey Balan

LDEV-2868 *one instance of thickbox.js file left: lams_central/includes/javascript/thickbox.js * path to loading.gif image is specified in css file now

Options
    • -2
    • +0
    ./web/pages/authoring/basic.jsp
  2. … 5 more files in changeset.
7:29 pm

Andrey Balan

LDEV-2868 *one instance of thickbox.js file left: lams_central/includes/javascript/thickbox.js * path to loading.gif image is specified in css file now

Options
    • -4
    • +1
    ./web/pages/authoring/authoring.jsp
    • -5
    • +1
    ./web/pages/monitoring/monitoring.jsp
  3. … 22 more files in changeset.
Monday 03 Dec 2012
10:27 pm

Andrey Balan

LDEV-2974 all tools should contain identical LAMS tags in order to make calling ANT target copy-tags painless

Options
    • -1
    • +5
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 1 more file in changeset.
10:27 pm

Andrey Balan

LDEV-2887 destroy old CKEditor instances on Ajax refresh to prevent JS exceptions

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 30 more files in changeset.
Tuesday 27 Nov 2012
11:36 pm

Andrey Balan

LDEV-2974 all tools should contain identical LAMS tags in order to make calling ANT target copy-tags painless

Options
    • -4
    • +8
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Passon.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TabName.tag
    • -0
    • +136
    ./web/WEB-INF/tags/TextSearch.tag
  5. … 26 more files in changeset.
Friday 16 Nov 2012
4:08 pm

Andrey Balan

LDEV-2947 sorting sessions by session name

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
3:52 pm

Andrey Balan

LDEV-2946 in order to send json object in utf-8 explicitly set ContentType to "application/x-json;charset=utf-8", as basic "application/x-json" doesn't work

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  2. … 2 more files in changeset.
Friday 09 Nov 2012
12:44 am

Andrey Balan

LDEV-2947 Change to report by Scratchie in monitor: adding summary table

Options
    • -0
    • +34
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Monday 22 Oct 2012
11:03 pm

Andrey Balan

LDEV-2947 learning refresh to work on iPad

Options
    • -1
    • +2
    ./web/pages/learning/learning.jsp
Friday 19 Oct 2012
8:08 pm

Andrey Balan

LDEV-2895 there was no scratchie tool in Lams 1.0 so no need to have this method

Options
    • -85
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 16 Oct 2012
9:56 pm

Andrey Balan

LDEV-2947 Customization of a Scratchie tool - introducing leader role

Options
    • -0
    • +10
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +19
    ./conf/xdoclet/struts-actions.xml
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20121004_wviCustomUpdate.sql
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -4
    • +44
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -15
    • +102
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -59
    • +131
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +46
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -0
    • +118
    ./web/pages/learning/leaderselection.jsp
    • -100
    • +32
    ./web/pages/learning/learning.jsp
    • -0
    • +111
    ./web/pages/learning/questionlist.jsp
    • -0
    • +90
    ./web/pages/monitoring/manageLeaders.jsp
    • -0
    • +13
    ./web/pages/monitoring/summary.jsp
Thursday 04 Oct 2012
9:03 pm

erniegx <ernieg@gmail.com>

fixing labels

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
7:43 pm

Andrey Balan

LDEV-2895 display Choice # label underneath images

Options
    • -6
    • +8
    ./web/pages/learning/learning.jsp
Wednesday 03 Oct 2012
9:07 pm

Andrey Balan

LDEV-2895 * Monitoring: showing the order in which students selected answers. * updating jquery libraries names * fixing a few bugs

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +1
    ./conf/xdoclet/struts-actions.xml
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -5
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +24
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -10
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieBundler.java
    • -2
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -11
    • +16
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -28
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -1
    • +1
    ./web/common/header.jsp
    • -1
    • +1
    ./web/pages/authoring/authoring.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/additem.jsp
    • -1
    • +1
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
  16. … 6 more files in changeset.
Thursday 27 Sep 2012
8:56 pm

Andrey Balan

LDEV-2895 teacher always sees learner page

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Wednesday 26 Sep 2012
10:52 pm

Andrey Balan

LDEV-2895 teacher always sees summary page

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Friday 21 Sep 2012
6:54 pm

Andrey Balan

LDEV-2895 implemented requested changes to monitoring

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -8
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -21
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -11
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -18
    • +43
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -8
    • +25
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -45
    • +20
    ./web/pages/monitoring/parts/itemSummary.jsp
  16. … 3 more files in changeset.
Friday 07 Sep 2012
3:16 am

erniegx <ernieg@gmail.com>

LDEV-2895 Fixing labels

Options
    • -14
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
Monday 03 Sep 2012
9:39 pm

Andrey Balan

LDEV-2895 introduced learner results page

Options
    • -0
    • +1
    ./conf/xdoclet/struts-actions.xml
    • -0
    • +1
    ./db/sql/create_lams_tool_scratchie.sql
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -17
    • +0
    ./web/pages/learning/success.jsp
Friday 31 Aug 2012
11:22 pm

Andrey Balan

LDEV-2895 introduced learner results page

Options
    • -1
    • +0
    ./conf/hibernate/mappings/.cvsignore
    • -0
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    ./conf/xdoclet/struts-actions.xml
    • -2
    • +3
    ./db/sql/create_lams_tool_scratchie.sql
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +29
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -34
    • +88
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -43
    • +40
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
  16. … 4 more files in changeset.
Wednesday 29 Aug 2012
6:34 pm

Andrey Balan

LDEV-2895 provided support for tool outputs

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    ./db/sql/tool_insert.sql
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -19
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -31
    • +25
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 28 Aug 2012
11:22 pm

Andrey Balan

LDEV-2895 minor monitoring fixes; updated marks computation; updated project structure to comply with latest changes introduced by Marcin

Options
    • -1
    • +1
    ./.classpath
    • -24
    • +4
    ./build.properties
    • -573
    • +3
    ./build.xml
    • -3
    • +0
    ./conf/jar/META-INF/MANIFEST.MF
    • -4
    • +0
    ./conf/war/META-INF/MANIFEST.MF
    • -0
    • +2
    ./conf/xdoclet/struts-plugins.xml
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -5
    • +27
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -43
    • +0
    ./web/WEB-INF/tiles-defs.xml
    • -56
    • +0
    ./web/layout/ frame.jsp
    • -20
    • +0
    ./web/layout/default.jsp
    • -0
    • +17
    ./web/pages/monitoring/parts/advanceOptions.jsp
    • -1
    • +4
    ./web/pages/monitoring/statistic.jsp
Monday 27 Aug 2012
9:52 pm

Andrey Balan

LDEV-2895 further changes to Scartchie's authoring and learner

Options
    • -1
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -161
    • +0
    ./conf/language/rams/ApplicationResources.properties
    • -161
    • +0
    ./conf/language/rams/ApplicationResources_en_AU.properties
    • -3
    • +12
    ./db/sql/create_lams_tool_scratchie.sql
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -11
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
    • -2
    • +8
    ./web/pages/authoring/advance.jsp
    • -4
    • +28
    ./web/pages/authoring/parts/additem.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/answerlist.jsp
    • -25
    • +21
    ./web/pages/learning/learning.jsp