Wed Apr 7 08:03:05 PDT 2010

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

Author: jonrcook at indiana.edu
Date: 2010-04-07 11:03:05 -0400 (Wed, 07 Apr 2010)
New Revision: 75773

Added:
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/webapp/js/popup.js
Modified:
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/.classpath
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/SubmitToGradingActionListener.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreUpdateListener.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/TotalScoreUpdateListener.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/queue/delivery/SubmitTimedAssessmentThread.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/webapp/css/tool_sam.css
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/webapp/jsf/author/authorSettings.jsp
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc/GradebookServiceHelper.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/GradebookServiceHelperImpl.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone/GradebookServiceHelperImpl.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/sam/samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading/GradingServiceImpl.java
Log:
svn merge -c r74275 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
Conflict discovered in 'samigo-app/.classpath'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r74275 into '.':
C    samigo-app/.classpath
U    samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/queue/delivery/SubmitTimedAssessmentThread.java
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/SubmitToGradingActionListener.java
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/TotalScoreUpdateListener.java
U    samigo-app/src/webapp/jsf/author/authorSettings.jsp
U    samigo-app/src/webapp/jsf/author/publishedSettings.jsp
U    samigo-app/src/webapp/css/tool_sam.css
A    samigo-app/src/webapp/js/popup.js
Summary of conflicts:
  Text conflicts: 1
svn log -c r74275 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r74275 | wang58 at iupui.edu | 2010-03-05 12:36:11 -0500 (Fri, 05 Mar 2010) | 2 lines

ONC-2501 integration % based gradebooks with samigo
-samigo app code change
------------------------------------------------------------------------
svn merge -c r74276 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r74276 into '.':
U    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc/GradebookServiceHelper.java
U    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/GradebookServiceHelperImpl.java
U    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone/GradebookServiceHelperImpl.java
U    samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java
U    samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading/GradingServiceImpl.java
svn log -c r74276 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r74276 | wang58 at iupui.edu | 2010-03-05 12:37:21 -0500 (Fri, 05 Mar 2010) | 2 lines

ONC-2501 integration % based gradebooks with samigo
-samigo services code change
------------------------------------------------------------------------
svn merge -c r74578 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r74578 into '.':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc/GradebookServiceHelper.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/GradebookServiceHelperImpl.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone/GradebookServiceHelperImpl.java
svn log -c r74578 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r74578 | wang58 at iupui.edu | 2010-03-12 12:09:17 -0500 (Fri, 12 Mar 2010) | 2 lines

ONC-2387 Tests & Surveys Beta / Updated Due Date is not being pushed to the Gradeboook
--samigo part changes.
------------------------------------------------------------------------
svn merge -c r75523 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r75523 into '.':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
svn log -c r75523 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r75523 | wang58 at iupui.edu | 2010-03-31 15:33:39 -0400 (Wed, 31 Mar 2010) | 2 lines

ONC-2501 integration % based gradebooks with samigo
-support grade convert when change grade option from none to linked gb in setting page. 
------------------------------------------------------------------------
svn merge -c r75524 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r75524 into '.':
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc/GradebookServiceHelper.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/GradebookServiceHelperImpl.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone/GradebookServiceHelperImpl.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java
svn log -c r75524 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r75524 | wang58 at iupui.edu | 2010-03-31 15:35:13 -0400 (Wed, 31 Mar 2010) | 2 lines

ONC-2501 integration % based gradebooks with samigo
-change samigo grade service a little.  
------------------------------------------------------------------------
svn merge -c r75588 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r75588 into '.':
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/GradebookServiceHelperImpl.java
svn log -c r75588 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r75588 | wang58 at iupui.edu | 2010-04-01 16:18:49 -0400 (Thu, 01 Apr 2010) | 2 lines

ONC-2387 Tests & Surveys Beta / Updated Due Date is not being pushed to the Gradeboook
--samigo part minor change.
------------------------------------------------------------------------
svn merge -c r75589 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r75589 into '.':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreUpdateListener.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java
svn log -c r75589 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r75589 | wang58 at iupui.edu | 2010-04-01 16:21:42 -0400 (Thu, 01 Apr 2010) | 2 lines

ONC-2501 integration % based gradebooks with samigo
-student score update page grades convert.  
------------------------------------------------------------------------
svn merge -c r75747 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
--- Merging r75747 into '.':
G    samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
G    samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/GradebookServiceHelperImpl.java
svn log -c r75747 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam
------------------------------------------------------------------------
r75747 | wang58 at iupui.edu | 2010-04-06 16:06:11 -0400 (Tue, 06 Apr 2010) | 4 lines

ONC-2501 Development Jira for coding of integration of % gradebook with Samigo.
-minor changes:
1)change Double to BigDecimal for converting the grades.
2)move one line code from outside the block to inside the block.
------------------------------------------------------------------------