Merge pull request sakaiproject#910 from steveswinsburg/feature/SAK-2…

…9734_set_cat_id SAK-29734 allow setting category when adding/updating assignment
jayrp11 · Jul 22, 2015 · 4d1ddcd · 4d1ddcd
2 parents 3144e06 + 3d1fbf4
commit 4d1ddcd
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java b/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
@@ -610,6 +610,12 @@ public Long addAssignment(String gradebookUid, org.sakaiproject.service.gradeboo
         }
 
 		Gradebook gradebook = getGradebook(gradebookUid);
+
+		//if attaching to category
+		if(assignmentDefinition.getCategoryId() != null) {
+			return createAssignmentForCategory(gradebook.getId(), assignmentDefinition.getCategoryId(), assignmentDefinition.getName(), points, assignmentDefinition.getDueDate(), !assignmentDefinition.isCounted(), assignmentDefinition.isReleased(), assignmentDefinition.isExtraCredit());
+		}
+
 		return createAssignment(gradebook.getId(), assignmentDefinition.getName(), points, assignmentDefinition.getDueDate(), !assignmentDefinition.isCounted(), assignmentDefinition.isReleased(), assignmentDefinition.isExtraCredit());
 	}
 
@@ -643,6 +649,13 @@ public Object doInHibernate(Session session) throws HibernateException {
 				assignment.setPointsPossible(assignmentDefinition.getPoints());
 				assignment.setReleased(assignmentDefinition.isReleased());
 				assignment.setExtraCredit(assignmentDefinition.isExtraCredit());
+
+				//if we have a category, get it and set it
+				if (assignmentDefinition.getCategoryId() != null) {
+					Category cat = (Category) session.load(Category.class, assignmentDefinition.getCategoryId());
+					assignment.setCategory(cat);
+				}
+
 				updateAssignment(assignment, session);
 				return null;
 			}