[virtualcommons-svn] SF.net SVN: virtualcommons:[134] mentalmodels/trunk/src/main/java/edu/asu/ commons/mme

[<al...@us...>]

Revision: 134
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=134&view=rev
Author:   alllee
Date:     2009-04-29 18:23:06 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
consecutive mvn jetty:run's will no longer add duplicate entries to the question group table.

Modified Paths:
--------------
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Block.java
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/ModuleService.java
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/StudentService.java

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Block.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Block.java	2009-04-29 03:20:48 UTC (rev 133)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Block.java	2009-04-29 18:23:06 UTC (rev 134)
@@ -86,7 +86,7 @@
 		this.questionGroup = questionGroup;
 	}
 
-	public List<QuestionGroup> getQuestionGroup() {
+	public List<QuestionGroup> getQuestionGroups() {
 		return questionGroup;
 	}
 

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/ModuleService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/ModuleService.java	2009-04-29 03:20:48 UTC (rev 133)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/ModuleService.java	2009-04-29 18:23:06 UTC (rev 134)
@@ -28,7 +28,7 @@
 		{
 			Block block = iterateBlock.next();
 			Hibernate.initialize(block);
-			List<QuestionGroup> questionGroup = block.getQuestionGroup();
+			List<QuestionGroup> questionGroup = block.getQuestionGroups();
 			Iterator<QuestionGroup> iteratorquestion = questionGroup.iterator();
 			{
 				while(iteratorquestion.hasNext())

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java	2009-04-29 03:20:48 UTC (rev 133)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java	2009-04-29 18:23:06 UTC (rev 134)
@@ -8,6 +8,7 @@
 
 import edu.asu.commons.mme.dao.HibernateBlockDao;
 import edu.asu.commons.mme.dao.HibernateQuestionDao;
+import edu.asu.commons.mme.entity.Block;
 import edu.asu.commons.mme.entity.Categorical;
 import edu.asu.commons.mme.entity.CategoricalOption;
 import edu.asu.commons.mme.entity.Question;
@@ -29,10 +30,18 @@
 	private HibernateBlockDao blockDao;
 	
 	public void createQuestions() {
+		// check if we need to recreate these questions.
+		Block block = blockDao.find(3L);
+		for (QuestionGroup questionGroup: block.getQuestionGroups()) {
+			if (questionGroup.getSequenceNo().equals(3)) {
+				// no need to recreate subject goal question groups.
+				return;
+			}
+		}
 		createSubjectGoalQuestionGroup();
 	}
-
-	public void createSubjectGoalQuestionGroup() {
+	
+	private void createSubjectGoalQuestionGroup() {
 		QuestionGroup subjectGoalQuestionGroup = new QuestionGroup();
 		subjectGoalQuestionGroup.setHeader("<b>What goals did you follow when designing your strategy?</b>");
 		subjectGoalQuestionGroup.setDescription("<p>Please specify three goals that most influenced the design of your strategy. You can select from 18 different goals grouped in three categories (foci). </p>" +

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/StudentService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/StudentService.java	2009-04-29 03:20:48 UTC (rev 133)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/StudentService.java	2009-04-29 18:23:06 UTC (rev 134)
@@ -7,7 +7,6 @@
 
 import edu.asu.commons.mme.dao.HibernateStudentDao;
 import edu.asu.commons.mme.entity.Gender;
-import edu.asu.commons.mme.entity.Group;
 import edu.asu.commons.mme.entity.Student;
 
 /**
@@ -23,39 +22,22 @@
 public class StudentService extends Service.Base<Student, HibernateStudentDao> {
 
 	private List<Student> students = new ArrayList<Student>();
-	Group newgroup;
-
-	private static Integer groupNo;
-	private static Integer studentNo;
-
-	public Long createStudent(Integer birthYear, String semester,String gender,String major)
-	{
 	
-
-		System.out.println("Birthyear " + birthYear);
-		System.out.println("Ethnicity " + semester);
-		System.out.println("Gender " + gender);
-		System.out.println("Major " + major);
-		
+	public Long createStudent(Integer birthYear, String semester,String gender,String major) {
+//		System.out.println("Birthyear " + birthYear);
+//		System.out.println("Ethnicity " + semester);
+//		System.out.println("Gender " + gender);
+//		System.out.println("Major " + major);
 		Student student = new Student();
 		
 		student.setBirthYear(birthYear);
 		student.setSemester(semester);
 		student.setGender(Gender.valueOf(gender));
 		student.setMajor(major);
-		
 		save(student);
-		
 		System.err.println("Student id is: " + student.getId());
-		
 		students.add(student);
-		
 		return student.getId();
-
 	}
 	
-
-	
-	
-
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.