Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5219 Change gate check flow in Peer Review

Criteria like mark hedging need to be validated before going to next

step, which can be finishing the activity. Current "check gate" JS code

does not allow it. Once the finish button is clicked, a check is made

and learner gets pushed to the next activity and whether his/her results

were saved or not.

Now we display results screen even if "show own ratings" or "show

ratings given to other learners" options are off. This allows to do

validation and store last criterion in DB. It also allows to show redo

questions button if this feature is on.

If there is no summary nor redo button, the results page automatically

attempts to go to next activity. If it succeeds, learner does not even

notice the blank results screen. If after Peer Activity there is a

closed gate, the learner will see single button and a message.

  1. … 1 more file in changeset.
LDEV-5219 Display Peer Review results when it is required

It was skipped even though "showRatingsLeftByUser" was checked.

LDEV-5219 Use versioned JS import for gate check JS file

  1. … 55 more files in changeset.
LDEV-5219 Check gate after Peer Review activity

  1. … 2 more files in changeset.
LDEV-5155 Introduce rubrics learning UI

  1. … 7 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 122 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 506 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 315 more files in changeset.
LDEV-4233 Ability to hide users

  1. … 20 more files in changeset.
LDEV-4109: Adding explicit comment style rating support to Peer Review. Also fixed problem with working out whether it was the first, second, last, etc rating which was causing the wrong combination of next/prev/continue buttons to be displayed.

LDEV-4048: Adding Rate All to Star Ratings

  1. … 7 more files in changeset.
LDEV-4046: Escaping quotes and other entries in title so that it does not break the javascript.

  1. … 3 more files in changeset.
LDEV-3767: Adding two new methods for Peer Review. Monitoring first cut completed.

  1. … 15 more files in changeset.
LDEV-3767: Adding two new methods for Peer Review. Authoring and learning changes completed.

  1. … 26 more files in changeset.
LDEV-3794: Bootstrapping authoring. Switched jquery-ui theme to smoothness as it looks more like bootstrap, and deleted unneeded gifs.

  1. … 7 more files in changeset.
LDEV-3706 Updating tag and its dynamically created equivalent

  1. … 2 more files in changeset.
LDEV-3706: Fixing flow of screen and ensuring the lock message refers to the correct button name.

  1. … 5 more files in changeset.
LDEV-3706: Tablesorter converted to Bootstrap.

  1. … 5 more files in changeset.
LDEV-3706: Updating to use Bootstrap. Learner done overall but still needs the tablesorter converted.

  1. … 11 more files in changeset.
LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

  1. … 340 more files in changeset.
This commit was manufactured by cvs2svn to create branch 'lams2_head_wildfly'.

Cherrypick from master 2015-10-21 12:46:03 UTC ernieg 'LDEV-3594: Prevent XSS injection':

lams_tool_preview/.classpath

lams_tool_preview/.cvsignore

lams_tool_preview/.project

lams_tool_preview/build.properties

lams_tool_preview/build.xml

lams_tool_preview/conf/hibernate/mappings/hibernate.cfg.xml

lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml

lams_tool_preview/conf/language/lams/ApplicationResources.properties

lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_preview/conf/xdoclet/global-exceptions.xml

lams_tool_preview/conf/xdoclet/global-forwards.xml

lams_tool_preview/conf/xdoclet/struts-actions.xml

lams_tool_preview/conf/xdoclet/struts-forms.xml

lams_tool_preview/conf/xdoclet/struts-message-resources.xml

lams_tool_preview/conf/xdoclet/struts-plugins.xml

lams_tool_preview/conf/xdoclet/validation-forms.xml

lams_tool_preview/conf/xdoclet/validation-global.xml

lams_tool_preview/db/model/peerreview.clay

lams_tool_preview/db/sql/activity_insert.sql

lams_tool_preview/db/sql/create_lams_tool_peerreview.sql

lams_tool_preview/db/sql/db_version_insert.sql

lams_tool_preview/db/sql/drop_lams_tool_peerreview.sql

lams_tool_preview/db/sql/library_insert.sql

lams_tool_preview/db/sql/table-schema.sql

lams_tool_preview/db/sql/tool_insert.sql

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/DAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewSessionDAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/BaseDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/autopatchContext.xml

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20150825.sql

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20150930.sql

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/GroupSummary.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/ReflectDTO.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/IContentPackageConverter.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/IMSManifestException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/ImscpApplicationException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/OrganizationXMLDef.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/SimpleContentPackageConverter.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewApplicationException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewImportContentVersionFilter.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceProxy.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/UploadPeerreviewFileException.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/PeerreviewToolContentHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/ReflectDTOComparator.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/ReflectionForm.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/servlet/ExportServlet.java

lams_tool_preview/web/403.jsp

lams_tool_preview/web/404.jsp

lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag

lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag

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

lams_tool_preview/web/WEB-INF/tags/Date.tag

lams_tool_preview/web/WEB-INF/tags/DefineLater.tag

lams_tool_preview/web/WEB-INF/tags/Head.tag

lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag

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

lams_tool_preview/web/WEB-INF/tags/Tab.tag

lams_tool_preview/web/WEB-INF/tags/TabBody.tag

lams_tool_preview/web/WEB-INF/tags/TabName.tag

lams_tool_preview/web/WEB-INF/tags/Tabs.tag

lams_tool_preview/web/WEB-INF/tags/TextSearch.tag

lams_tool_preview/web/WEB-INF/tags/headItems.tag

lams_tool_preview/web/WEB-INF/tlds/jstl/c.tld

lams_tool_preview/web/WEB-INF/tlds/jstl/fmt.tld

lams_tool_preview/web/WEB-INF/tlds/jstl/fn.tld

lams_tool_preview/web/WEB-INF/tlds/jstl/x.tld

lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-bean-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-bean.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-html-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-html.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-logic-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-logic.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-nested.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-tiles-el.tld

lams_tool_preview/web/WEB-INF/tlds/struts/struts-tiles.tld

lams_tool_preview/web/WEB-INF/web.xml

lams_tool_preview/web/common/footer.jsp

lams_tool_preview/web/common/header.jsp

lams_tool_preview/web/common/messages.jsp

lams_tool_preview/web/common/tabbedheader.jsp

lams_tool_preview/web/common/taglibs.jsp

lams_tool_preview/web/error.jsp

lams_tool_preview/web/images/icon_peerreview.png

lams_tool_preview/web/images/icon_peerreview.svg

lams_tool_preview/web/images/icon_peerreview.swf

lams_tool_preview/web/images/icon_peerreview_16.svg

lams_tool_preview/web/images/icon_sharedpeerreview.svg

lams_tool_preview/web/includes/css/learning.css

lams_tool_preview/web/includes/css/peerreview.css

lams_tool_preview/web/includes/images/.cvsignore

lams_tool_preview/web/includes/images/cross.gif

lams_tool_preview/web/includes/images/downarrow.gif

lams_tool_preview/web/includes/images/downarrow_disabled.gif

lams_tool_preview/web/includes/images/edit.gif

lams_tool_preview/web/includes/images/indicator.gif

lams_tool_preview/web/includes/images/spacer.gif

lams_tool_preview/web/includes/images/tick.gif

lams_tool_preview/web/includes/images/uparrow.gif

lams_tool_preview/web/includes/images/uparrow_disabled.gif

lams_tool_preview/web/login.jsp

lams_tool_preview/web/pages/authoring/advance.jsp

lams_tool_preview/web/pages/authoring/authoring.jsp

lams_tool_preview/web/pages/authoring/basic.jsp

lams_tool_preview/web/pages/authoring/definelater.jsp

lams_tool_preview/web/pages/authoring/definelaterforbid.jsp

lams_tool_preview/web/pages/authoring/start.jsp

lams_tool_preview/web/pages/export/exportportfolio.jsp

lams_tool_preview/web/pages/learning/definelater.jsp

lams_tool_preview/web/pages/learning/finish.jsp

lams_tool_preview/web/pages/learning/learning.jsp

lams_tool_preview/web/pages/learning/notebook.jsp

lams_tool_preview/web/pages/learning/results.jsp

lams_tool_preview/web/pages/monitoring/advanceoptions.jsp

lams_tool_preview/web/pages/monitoring/editactivity.jsp

lams_tool_preview/web/pages/monitoring/monitoring.jsp

lams_tool_preview/web/pages/monitoring/reflections.jsp

lams_tool_preview/web/pages/monitoring/statistic.jsp

lams_tool_preview/web/pages/monitoring/summary.jsp

  1. … 135 more files in changeset.
LDEV-3593: Leftover debugging removed - was causing odd chars to be displayed in the Criteria field.

LDEV-3592: When disabling fields as we are at the max number of rated items, don't disable the fields that are part of a set already being rated.

  1. … 6 more files in changeset.
LDEV-3553: Refuses to add rating/comment if max number reached and triggers a page refresh.

  1. … 4 more files in changeset.
LDEV-3542: First draft of performance improvements for mass creation. Now checks just the user ids, in the current list of users rather than building all the user objects and only does the check if the number of potential users is different to the number of current users. Also add index to stop users being duplicated in the session.

  1. … 6 more files in changeset.
LDEV-3517 Implemented Peer Review tool

  1. … 17 more files in changeset.
LDEV-3517 Introduced new Peer Review tool

  1. … 130 more files in changeset.