Wed Mar 21 07:47:19 PDT 2012

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=106116

Author: chmaurer at iupui.edu
Date: 2012-03-21 10:47:19 -0400 (Wed, 21 Mar 2012)
New Revision: 106116

Modified:
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/docs/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/docs/conversion/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages.properties
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemBean.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/HistogramQuestionScoresBean.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/webapp/jsf/evaluation/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-cp/src/java/org/sakaiproject/tool/assessment/contentpackaging/
Log:
svn merge -c 106005 -c 106006 -c 106007 -c 106008 -c 106009 -c 106010 -c 106011 -c 106013 -c 106017 -c 106019 -c 106022 -c 106039 -c 106040 -c 106041 -c 106043 -c 106044 -c 106045 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r106005 into 'samigo-app':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
--- Merging r106006 into 'samigo-app':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java
--- Merging r106007 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java
--- Merging r106008 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
--- Merging r106009 into 'samigo-app':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/ItemContentsBean.java
--- Merging r106010 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java
--- Merging r106011 into 'samigo-app':
U    samigo-app/src/webapp/jsf/print/preview_item/Matching.jsp
--- Merging r106013 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/ItemContentsBean.java
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
G    samigo-app/src/webapp/jsf/print/preview_item/Matching.jsp
--- Merging r106017 into 'samigo-app':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
--- Merging r106019 into 'samigo-app':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java
--- Merging r106022 into 'samigo-app/src/java/org/sakaiproject/tool/assessment/bundle':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages.properties
--- Merging r106022 into 'samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemBean.java
--- Merging r106039 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
--- Merging r106040 into 'samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemBean.java
--- Merging r106041 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
--- Merging r106043 into 'samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemBean.java
--- Merging r106044 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java
--- Merging r106045 into 'samigo-app':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java

svn log -c 106005 -c 106006 -c 106007 -c 106008 -c 106009 -c 106010 -c 106011 -c 106013 -c 106017 -c 106019 -c 106022 -c 106039 -c 106040 -c 106041 -c 106043 -c 106044 -c 106045 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r106005 | dsobiera at indiana.edu | 2012-03-18 12:22:14 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - reverted code back to -r105655
------------------------------------------------------------------------
r106006 | dsobiera at indiana.edu | 2012-03-18 12:23:30 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - Added chaek to see if there isn't a next answer to then use a blank string instead
------------------------------------------------------------------------
r106007 | dsobiera at indiana.edu | 2012-03-18 13:01:27 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - removed size of answer check replacing w/ blank string.  Will fix in DeliveryActionListener.prepareMatching()
------------------------------------------------------------------------
r106008 | dsobiera at indiana.edu | 2012-03-18 13:02:50 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - add blank answers to end of answerList if numAnmswers < numChoices to keep 1-1 choice-answers
------------------------------------------------------------------------
r106009 | dsobiera at indiana.edu | 2012-03-18 15:58:14 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - added getNoDistracterMatchingArray() that builds new ArrayList as well as re-numbers choice text
------------------------------------------------------------------------
r106010 | dsobiera at indiana.edu | 2012-03-18 16:02:37 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - move distracters to end of question list (create dummy MatchingBeans for them)
------------------------------------------------------------------------
r106011 | dsobiera at indiana.edu | 2012-03-18 16:03:47 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - use noDistracterMatchingArray instead of matchingArray
------------------------------------------------------------------------
r106013 | dsobiera at indiana.edu | 2012-03-18 22:42:16 -0400 (Sun, 18 Mar 2012) | 1 line

ONC-4549 - reverting back to -r105871
------------------------------------------------------------------------
r106017 | dsobiera at indiana.edu | 2012-03-19 12:58:26 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - separated matching key generation code (was grouped with mult choice, mult correct and choice survey). Using map now to store/retrieve matching labels
------------------------------------------------------------------------
r106019 | dsobiera at indiana.edu | 2012-03-19 14:15:52 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - handle case where num answers != num choices
------------------------------------------------------------------------
r106022 | dsobiera at indiana.edu | 2012-03-19 14:19:32 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - prevents author from entering a match w/ the same text as an existing match for a given question
------------------------------------------------------------------------
r106039 | dsobiera at indiana.edu | 2012-03-19 15:06:25 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - documented property usage
------------------------------------------------------------------------
r106040 | dsobiera at indiana.edu | 2012-03-19 15:17:00 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - fixed dup matched not be treated as normal matches in existence check
------------------------------------------------------------------------
r106041 | dsobiera at indiana.edu | 2012-03-19 15:58:13 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - replaced test w/ getIsCorrectHierarchy()
------------------------------------------------------------------------
r106043 | dsobiera at indiana.edu | 2012-03-19 16:30:52 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - fixed allowing edit of match to exclude itself in dup match text existence check
------------------------------------------------------------------------
r106044 | dsobiera at indiana.edu | 2012-03-19 17:48:34 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - changed how answers < choices check is done
------------------------------------------------------------------------
r106045 | dsobiera at indiana.edu | 2012-03-19 17:50:54 -0400 (Mon, 19 Mar 2012) | 1 line

ONC-4549 - use Map in populateMatching() to generate consistent label ordering w/ getQuestionBean() (dup matches these were inconsistent between the two methods)
------------------------------------------------------------------------