Activity lams/lams_tool

9:26 pm

Andrey Balan

More
MAIN:andreyb:20140506132633
changed 21 files
MAIN

LDEV-3227 Added ability to change, add, remove scratchie items even after student have reached it

- -3
- +3
./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./java/org/.../ScratchieConstants.java
- -1
- +1
./java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./java/org/.../scratchieApplicationContext.xml
- -2
- +4
./java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
- History
- Source
- Diff
./java/org/.../dao/ScratchieItemDAO.java
- -3
- +9
./java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
- History
- Source
- Diff
./java/org/.../ScratchieItemDAOHibernate.java
- -0
- +16
./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140505.sql
- History
- Source
./java/org/.../dbupdates/patch20140505.sql
- -15
- +1
./java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
- History
- Source
- Diff
./java/org/.../model/Scratchie.java
- -1
- +13
./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./java/org/.../service/IScratchieService.java
- -1
- +8
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
- History
- Source
- Diff
./java/.../ScratchieImportContentVersionFilter.java
- -21
- +92
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -63
- +76
./java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../action/AuthoringAction.java
- -14
- +3
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java
- -2
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
- History
- Source
- Diff
./java/org/.../action/MonitoringAction.java
- -2
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
- History
- Source
- Diff
./java/org/.../servlet/ExportServlet.java
… 8 more files in changeset.

8:05 pm

Marcin Cieslak

More
MAIN:marcin:20140428120522
changed 42 files
MAIN

LDEV-3225: Add better contribution management in Monitoring.

- -1
- +5
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
… 41 more files in changeset.

7:02 am

Andrey Balan

More
MAIN:andreyb:20140415230246
changed 1 file
MAIN

LKC-47 Same table in learner as it is in monitor

- -2
- +4
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

9:46 pm

Andrey Balan

More
MAIN:andreyb:20140415134601
changed 5 files
MAIN

LKC-47 Same table in learner as it is in monitor

- -3
- +2
./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./java/org/.../service/IScratchieService.java
- -5
- +3
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -2
- +2
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java
- -2
- +2
./java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
- History
- Source
- Diff
./java/org/.../action/MonitoringAction.java
… 1 more file in changeset.

8:36 pm

Marcin Cieslak

More
MAIN:marcin:20140327123626
changed 6 files
MAIN

LDEV-3194: Support for several question types in Assessment tool.

- -2
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../action/AuthoringAction.java
… 5 more files in changeset.

4:01 pm

Marcin Cieslak

More
MAIN:marcin:20140327080152
changed 2 files
MAIN

LKC-40: Remove extra logs.

- -319
- +8
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -192
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

3:46 pm

Marcin Cieslak

More
MAIN:marcin:20140327074603
changed 5 files
MAIN

LDEV-3194: Support for Scratchie tool.

- -1
- +48
./java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../action/AuthoringAction.java
… 4 more files in changeset.

9:59 pm

Marcin Cieslak

More
MAIN:marcin:20140211135931
changed 35 files
MAIN

LDEV-3171: Remove users from activities. Fix several bugs.

- -5
- +23
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
… 34 more files in changeset.

1:18 am

Marcin Cieslak

More
MAIN:marcin:20140202171836
changed 60 files
MAIN

LDEV-3171: Give a Monitor an option to remove learner's content from activities when moving him backwards in a sequence.

Implementation of content-removing method for most of tools.

- -2
- +8
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
… 59 more files in changeset.

6:04 am

Andrey Balan

More
MAIN:andreyb:20140117220438
changed 340 files
MAIN

LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

- -13
- +1
./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./java/org/.../ScratchieConstants.java
- -14
- +0
./java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./java/org/.../scratchieApplicationContext.xml
- -28
- +0
./java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAttachmentDAO.java
- History
- Source
- Diff
./java/org/.../dao/ScratchieAttachmentDAO.java
- -30
- +0
./java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAttachmentDAOHibernate.java
- History
- Source
- Diff
./java/.../ScratchieAttachmentDAOHibernate.java
- -0
- +19
./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140102.sql
- History
- Source
./java/org/.../dbupdates/patch20140102.sql
- -143
- +4
./java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
- History
- Source
- Diff
./java/org/.../model/Scratchie.java
- -159
- +0
./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAttachment.java
- History
- Source
- Diff
./java/org/.../model/ScratchieAttachment.java
- -28
- +1
./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./java/org/.../service/IScratchieService.java
- -2
- +11
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
- History
- Source
- Diff
./java/.../ScratchieImportContentVersionFilter.java
- -151
- +5
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -216
- +2
./java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../action/AuthoringAction.java
- -13
- +3
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java
- -2
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
- History
- Source
- Diff
./java/org/.../action/MonitoringAction.java
- -21
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
- History
- Source
- Diff
./java/org/.../form/ScratchieForm.java
- -28
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
- History
- Source
- Diff
./java/org/.../servlet/ExportServlet.java
… 325 more files in changeset.

10:01 pm

Andrey Balan

More
MAIN:andreyb:20140113140144
changed 3 files
MAIN

LDEV-3166 fixed initiatation of GroupLeader object before passing to jsp

- -1
- +3
./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./java/org/.../ScratchieConstants.java
- -2
- +3
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java
… 1 more file in changeset.

1:52 am

Andrey Balan

More
MAIN:andreyb:20140108175250
changed 3 files
MAIN

LDEV-3155 Start using common method (from lams_common) to acquire leader userId from the nearest leader selection tool

- -5
- +1
./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./java/org/.../ScratchieConstants.java
- -7
- +1
./java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./java/org/.../scratchieApplicationContext.xml
- -118
- +21
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java

6:26 am

Andrey Balan

More
MAIN:andreyb:20140106222642
changed 1 file
MAIN

LKC-1 allow non-leaders to see notebook submitted by leader

- -1
- +6
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

5:59 pm

Andrey Balan

More
MAIN:andreyb:20140106095901
changed 1 file
MAIN

LKC-40 fixed displaying group leader

- -7
- +2
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

4:42 pm

Marcin Cieslak

More
MAIN:marcin:20140106084208
changed 41 files
MAIN

LDEV-3163: Make LAMS use ServerURL when providing URLs.

- -2
- +3
./java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
- History
- Source
- Diff
./java/org/.../servlet/ExportServlet.java
… 40 more files in changeset.

12:10 am

Andrey Balan

More
MAIN:andreyb:20140105161007
changed 1 file
MAIN

LKC-41 calculate totalMarksPossible properly for Scratchie tool output

- -4
- +23
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
- History
- Source
- Diff
./java/org/.../ScratchieOutputFactory.java

6:20 pm

Andrey Balan

More
MAIN:andreyb:20131224102005
changed 1 file
MAIN

LKC-40 fix autopatch script

- -3
- +4
./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql
- History
- Source
- Diff
./java/org/.../dbupdates/patch20131212.sql

4:50 pm

Andrey Balan

More
MAIN:andreyb:20131219085010
changed 4 files
MAIN

LDEV-3157 add extra call to check if the leader has submitted notebook

- -1
- +3
./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./java/org/.../ScratchieConstants.java
- -13
- +67
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java
… 2 more files in changeset.

6:26 am

Andrey Balan

More
MAIN:andreyb:20131217222624
changed 11 files
MAIN

LDEV-3157

* Import/export from previous versions

* stop refreshing for non-leaders once leader moves to notebook page

- -0
- +7
./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql
- History
- Source
- Diff
./java/org/.../dbupdates/patch20131212.sql
- -31
- +3
./java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
- History
- Source
- Diff
./java/org/.../model/Scratchie.java
- -2
- +9
./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
- History
- Source
- Diff
./java/org/.../model/ScratchieSession.java
- -11
- +1
./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
- History
- Source
- Diff
./java/org/.../model/ScratchieUser.java
- -9
- +1
./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./java/org/.../service/IScratchieService.java
- -0
- +54
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
- History
- Source
./java/.../ScratchieImportContentVersionFilter.java
- -18
- +4
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -14
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../action/AuthoringAction.java
- -40
- +67
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java
… 2 more files in changeset.

2:49 am

Andrey Balan

More
MAIN:andreyb:20131213184929
changed 1 file
MAIN

LKC-40 fix learning design export after adding constraints in previous commit

- -1
- +12
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java

12:56 am

Andrey Balan

More
MAIN:andreyb:20131213165648
changed 1 file
MAIN

LKC-40 added couple of indexes

- -1
- +4
./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql
- History
- Source
- Diff
./java/org/.../dbupdates/patch20131212.sql

12:22 am

Marcin Cieslak

More
MAIN:marcin:20131213162223
changed 2 files
MAIN

LKC-40: Move extra logs to DEBUG level.

- -192
- +358
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -96
- +185
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

1:10 am

Andrey Balan

More
MAIN:andreyb:20131212171024
changed 16 files
MAIN

LKC-40 all the data shared by users in a group (scratching logs, marks, scratching flag) belong to the session and not every single user

- -6
- +6
./java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
- History
- Source
- Diff
./java/org/.../ScratchieAnswerVisitDAO.java
- -21
- +21
./java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
- History
- Source
- Diff
./java/.../ScratchieAnswerVisitDAOHibernate.java
- -0
- +39
./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql
- History
- Source
./java/org/.../dbupdates/patch20131212.sql
- -4
- +27
./java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
- History
- Source
- Diff
./java/org/.../dto/GroupSummary.java
- -14
- +1
./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
- History
- Source
- Diff
./java/org/.../ScratchieAnswerVisitLog.java
- -1
- +31
./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
- History
- Source
- Diff
./java/org/.../model/ScratchieSession.java
- -40
- +1
./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
- History
- Source
- Diff
./java/org/.../model/ScratchieUser.java
- -14
- +5
./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./java/org/.../service/IScratchieService.java
- -3
- +3
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
- History
- Source
- Diff
./java/org/.../ScratchieOutputFactory.java
- -142
- +94
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -49
- +16
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java
- -2
- +2
./java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
- History
- Source
- Diff
./java/org/.../servlet/ExportServlet.java
- -2
- +2
./java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java
- History
- Source
- Diff
./java/org/.../PopulateMarksServlet.java
… 3 more files in changeset.

6:22 pm

Marcin Cieslak

More
MAIN:marcin:20131212102205
changed 2 files
MAIN

LKC-40: Add logs to track resource usage.

- -144
- +354
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -92
- +203
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

6:30 am

Andrey Balan

More
MAIN:andreyb:20131211223051
changed 1 file
MAIN

LKC-40 re-issue a transaction if it fails due to deadlock

- -3
- +3
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

6:07 am

Andrey Balan

More
MAIN:andreyb:20131211220700
changed 1 file
MAIN

LKC-40 re-issue a transaction if it fails due to deadlock

- -35
- +96
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

3:46 am

Andrey Balan

More
MAIN:andreyb:20131211194643
changed 1 file
MAIN

LKC-40 re-issue a transaction if it fails due to deadlock

- -2
- +22
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

1:56 am

Andrey Balan

More
MAIN:andreyb:20131211175640
changed 4 files
MAIN

LKC-40 do not save ScratchieUser into SessionMap

- -3
- +1
./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./java/org/.../ScratchieConstants.java
- -3
- +3
./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
- History
- Source
- Diff
./java/org/.../model/ScratchieSession.java
- -3
- +3
./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./java/org/.../ScratchieServiceImpl.java
- -12
- +30
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

12:23 am

Andrey Balan

More
MAIN:andreyb:20131211162324
changed 1 file
MAIN

LKC-40 Removed resundant line

- -2
- +1
./java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./java/org/.../action/LearningAction.java

5:07 am

Andrey Balan

More
MAIN:andreyb:20131210210733
changed 1 file
MAIN

LKC-40 Removed readonly Hibernate transactions for readonly methods and now it's all handled by creation of transactions by DB itself

- -4
- +0
./java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./java/org/.../scratchieApplicationContext.xml

src

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Andrey Balan

Marcin Cieslak

Andrey Balan

Andrey Balan

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Marcin Cieslak

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Marcin Cieslak

Andrey Balan

Marcin Cieslak

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan