Tue Apr 21 09:08:06 PDT 2009

Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=60480

Author: cwen at iupui.edu
Date: 2009-04-21 12:08:04 -0400 (Tue, 21 Apr 2009)
New Revision: 60480

Modified:
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/business/src/java/org/sakaiproject/tool/gradebook/business/GradebookManager.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/standalone-app/src/test/org/sakaiproject/tool/gradebook/test/CalculationsTest.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/AssignmentPointsConverter.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/ClassAvgConverter.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/ScoreConverter.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/AssignmentBean.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/AssignmentDetailsBean.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/BulkAssignmentDecoratedBean.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookSetupBean.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/ViewByStudentBean.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/webapp/addBulkGradebookItem.jsp
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/webapp/assignmentDetails.jsp
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/webapp/inc/bulkNewItems.jspf
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/webapp/inc/categoryEdit.jspf
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/webapp/js/gradebook.js
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/app/ui/src/webapp/studentView.jsp
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/service/hibernate/src/java/org/sakaiproject/tool/gradebook/CourseGradeRecord.java
   msub/iu.edu/oncourse/branches/gradebook_2-6-x/service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
Log:
svn merge -c 60234 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .
--- Merging r60234 into  . :
U    app/standalone-app/src/test/org/sakaiproject/tool/gradebook/test/CalculationsTest.java
U    app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
U    app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
U    app/business/src/java/org/sakaiproject/tool/gradebook/business/GradebookManager.java
U    app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/ScoreConverter.java
U    app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/ClassAvgConverter.java
U    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/ViewByStudentBean.java
U    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
Conflict discovered in  app/ui/src/webapp/studentView.jsp .
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    app/ui/src/webapp/studentView.jsp
U    app/ui/src/webapp/assignmentDetails.jsp
U    service/hibernate/src/java/org/sakaiproject/tool/gradebook/CourseGradeRecord.java
U    service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java
U    service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java
U    service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
Summary of conflicts:
  Text conflicts: 1

svn log -r 60234 https://source.sakaiproject.org/svn/gradebook/branches/non-cal
------------------------------------------------------------------------
r60234 | gjthomas at iupui.edu | 2009-04-17 13:28:03 -0400 (Fri, 17 Apr 2009) | 1 line

ONC-580
------------------------------------------------------------------------

svn merge -c 60260 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .          
--- Merging r60260 into  . :
U    app/ui/src/java/org/sakU    app/ui/src/java/org/sakU    app/ui/src/jav
U    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/BulkAssignmentDecoratedBean.java
G    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
U    app/ui/src/webapp/addBulkGradebookItem.jsp
U    app/ui/src/webapp/inc/bulkNewItems.jspf

in-10-26:gradebook cwen$ svn log -r 60260 https://source.sakaiproject.org/svn/gradebook/branches/non-cal
------------------------------------------------------------------------
r60260 | tnguyen at iupui.edu | 2009-04-17 17:06:18 -0400 (Fri, 17 Apr 2009) | 1 line

ONC-582 - Gradebook: Bulk creation of GB items
------------------------------------------------------------------------

svn merge svn merge svn merge svn merge svn merge svn merge svn merge svn merge svn merge s  
----Merging r60261 into  . :
G    app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
G    app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
U    app/ui/src/java/org/sakaiproject/toolU    app/ui/src/java/org/sakaiproject/toolU    app/ui/src/java/org/sakaiproject/toolU ol/gradebook/ui/AssignmentDetailsBean.java
U    app/ui/src/java/org/sakaiproject/toolU    app/ui/src/java/org/sakaiproject/toolUapp/uU    app/ui/src/java/org/sakaiproject/ti/src/wU    app/ui/src/java/org/sakaiproject/toolU    app/ui/src/java/org/sakaiproject/toolUapp/uU    app/y.java
in-10-26:gradebook cwen$ svn log -r 60261 https://source.sakaiproject.org/svn/gradebook/branches/non-cal
------------------------------------------------------------------------
r60261 | jonrcook at indiana.edu | 2009-04-17 17:10:02 -0400 (Fri, 17 Apr 2009) | 1 line

ONC-579
------------------------------------------------------------------------

svn merge -c 60297 httpssvn merge -c 60297 httporg/svn/gradebook/branches/non-cal .           
--- Merging r60297 into  . :
G    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/AssignmentBean.java
G    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
G    app/ui/src/webapp/addBulkGradebookItem.jsp
in-10-26:gradebook cwen$ svn log -r 60297 https://source.sakaiproject.org/svn/gradebook/branches/non-cal
------------------------------------------------------------------------
r60297 | gjthomas at iupui.edu | 2009-04-20 11:23:02 -0400 (Mon, 20 Apr 2009) | 1 line

ONC-580
------------------------------------------------------------------------

svn merge -c 60305 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .           
--- Merging r60305 into  . :
G    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/AssignmentBean.java
G    app/ui/src/webapp/addBulkGradebookItem.jsp
in-10-26:gradebook cwen$ svn log -r 60305 https://source.sakaiproject.org/svn/gradebook/branches/non-cal
------------------------------------------------------------------------
r60305 | gjthomas at iupui.edu | 2009-04-20 11:51:47 -0400 (Mon, 20 Apr 2009) | 1 line

ONC-580 / ONC-582 - fixed bug with rendering issues going into the new bulk page
------------------------------------------------------------------------

svn merge -c 60308 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .          
--- Merging r60308 into  . :
G    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/AssignmentBean.java
G    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
in-10-26:gradebook cwen$ svn log -r 60308 https://source.sakaiproject.org/svn/gradebook/branches/non-cal
------------------------------------------------------------------------
r60308 | tnguyen at iupui.r60308 | tnguyen at iupui.r60308 | tnguyen at iupui.r60308 | tnguyen at C-582 - Gradebook: Bulk creation of GB items
------------------------------------------------------------------------

svn merge -c 60310 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .          
--- Merging r60310 into  . :
G    app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
in-10-26:gradebook cwen$ svn log -r 60310 https://source.sakaiproject.org/svn/gradebook/branches/non-cal
------------------------------------------------------------------------
r60310 | jonrcook at indiana.edu | 2009-04-20 13:21:40 -0400 (Mon, 20 Apr 2009) | 1 line

ONC-579
------------------------------------------------------------------------