[virtualcommons-svn] SF.net SVN: virtualcommons:[430] mentalmodels/trunk/src/main
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[430] mentalmodels/trunk/src/main
|
From: <kj...@us...> - 2010-01-15 19:27:23
|
Revision: 430
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=430&view=rev
Author: kjonas
Date: 2010-01-15 19:27:15 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
1) Removed the unwanted getlogger().debug messages from QuestionCreatorService.java
Bugs -
1) Due to some reason saveCommunication() in Communication Service is no working. Data base insert is not working properly. Getting Assertion failure.
Modified Paths:
--------------
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Communication.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/PsychometricQuestion.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/AnsweringService.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/CommunicationService.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java
mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Communication.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Communication.java 2010-01-15 19:12:57 UTC (rev 429)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Communication.java 2010-01-15 19:27:15 UTC (rev 430)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.sql.Timestamp;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -27,7 +28,7 @@
@Lob
private String message;
-
+ @Column
private Timestamp timestamp;
@ManyToOne
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/PsychometricQuestion.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/PsychometricQuestion.java 2010-01-15 19:12:57 UTC (rev 429)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/PsychometricQuestion.java 2010-01-15 19:27:15 UTC (rev 430)
@@ -23,7 +23,7 @@
@Column(name="max_slider_value",nullable=false)
private Integer maxSliderValue;
- @CollectionOfElements(fetch = FetchType.EAGER)
+ @CollectionOfElements
private List<String> choices = new ArrayList<String>();
public void setChoices(List<String> choices) {
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/AnsweringService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/AnsweringService.java 2010-01-15 19:12:57 UTC (rev 429)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/AnsweringService.java 2010-01-15 19:27:15 UTC (rev 430)
@@ -49,9 +49,9 @@
for(int i = 0; i < studentResponses.size(); i++ )
{
clientStudentResponse = (StudentResponse) studentResponses.get(i);
- getLogger().debug("Question is: " + clientStudentResponse.getQuestion());
- getLogger().debug("Response is: " + clientStudentResponse.getResponse());
- getLogger().debug("Student is: " + clientStudentResponse.getStudent());
+ //getLogger().debug("Question is: " + clientStudentResponse.getQuestion());
+ //getLogger().debug("Response is: " + clientStudentResponse.getResponse());
+ //getLogger().debug("Student is: " + clientStudentResponse.getStudent());
studentResponse = new StudentResponse();
studentResponse.setQuestion(clientStudentResponse.getQuestion());
studentResponse.setResponse(clientStudentResponse.getResponse());
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/CommunicationService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/CommunicationService.java 2010-01-15 19:12:57 UTC (rev 429)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/CommunicationService.java 2010-01-15 19:27:15 UTC (rev 430)
@@ -1,12 +1,25 @@
package edu.asu.commons.mme.service;
+import org.springframework.transaction.annotation.Transactional;
+
import edu.asu.commons.mme.dao.HibernateCommunicationDao;
+import edu.asu.commons.mme.dao.HibernateRoundConfigDao;
+import edu.asu.commons.mme.dao.HibernateStudentDao;
import edu.asu.commons.mme.entity.Communication;
import edu.asu.commons.mme.utility.MessageHandler;
+@Transactional
public class CommunicationService extends Service.Base<Communication, HibernateCommunicationDao> {
+ private HibernateStudentDao studentDao;
+ public void setStudentDao(HibernateStudentDao studentDao) {
+ this.studentDao = studentDao;
+ }
+ private HibernateRoundConfigDao roundConfigDao;
+ public void setRoundConfigDao(HibernateRoundConfigDao roundConfigDao) {
+ this.roundConfigDao = roundConfigDao;
+ }
MessageHandler msgHandler;
public void saveCommunication(Communication comm)
{
@@ -15,9 +28,12 @@
{
//log the message
communication.setMessage(comm.getMessage());
- communication.setRound(comm.getRound());
- communication.setStudent(comm.getStudent());
+
+ communication.setRound(roundConfigDao.find(comm.getRound().getId()));
+ communication.setStudent(studentDao.find(comm.getStudent().getId()));
communication.setTimestamp(comm.getTimestamp());
+
+ getLogger().debug("timestamp is: '" + comm.getTimestamp() + "' student id is: " + comm.getStudent().getId());
getDao().save(communication);
}catch(Exception e)
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java 2010-01-15 19:12:57 UTC (rev 429)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java 2010-01-15 19:27:15 UTC (rev 430)
@@ -1,5 +1,6 @@
package edu.asu.commons.mme.service;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -12,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import edu.asu.commons.mme.dao.HibernateBlockDao;
+import edu.asu.commons.mme.dao.HibernateCommunicationDao;
import edu.asu.commons.mme.dao.HibernateGameConfigDao;
import edu.asu.commons.mme.dao.HibernateGameDao;
import edu.asu.commons.mme.dao.HibernateGameRoundDao;
@@ -26,6 +28,7 @@
import edu.asu.commons.mme.entity.BlockInformationWindow;
import edu.asu.commons.mme.entity.CategoricalOption;
import edu.asu.commons.mme.entity.CategoricalQuestion;
+import edu.asu.commons.mme.entity.Communication;
import edu.asu.commons.mme.entity.Game;
import edu.asu.commons.mme.entity.GameConfig;
import edu.asu.commons.mme.entity.GameRound;
@@ -55,7 +58,14 @@
private HibernateStudentDao studentDao;
private HibernateLocationDao locationDao;
private HibernateGroupLocationDao groupLocationDao;
+
+ private HibernateCommunicationDao communicationDao;
+ public void setCommunicationDao(HibernateCommunicationDao communicationDao) {
+ this.communicationDao = communicationDao;
+ }
+
+
private int blockSeqNo;
@@ -197,6 +207,22 @@
getLogger().debug("game state is NOT null...");
block = newGameState.getCurrentBlock();
initializeGame(newGameState);
+
+ if(newGameState.getCurrentBlock().getId() == 1)
+ {
+ Communication communication = new Communication();
+ communication.setMessage("hello");
+
+ communication.setRound(newGameState.getCurrentRound());
+ communication.setStudent(studentDao.find(1));
+ Timestamp time = null;
+
+ communication.setTimestamp(time);
+
+
+ communicationDao.save(communication);
+
+ }
msgHandler.sendBlock(newGameState);
}
@@ -1039,7 +1065,6 @@
private Game saveGameState(Block currentBlock, Round currentRound, Game game) {
- //FIXME: Game id 1 is hard coded but needs to make it dynamic
getLogger().info(" Game id to SAVE is: " + game.getId());
Game newGame = null;
newGame = getDao().find(game.getId());
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 2010-01-15 19:12:57 UTC (rev 429)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java 2010-01-15 19:27:15 UTC (rev 430)
@@ -43,6 +43,7 @@
private HibernatePsychometricQuestionDao psychometricQuestionDao;
private HibernateCategoricalQuestionDao categoricalQuestionDao;
private HibernateCategoricalOptionDao categoricalOptionDao;
+ private HibernateQuestionDao questionDao;
Module module;
Block block;
@@ -407,6 +408,7 @@
Hibernate.initialize(infoWindow.get(j));
Hibernate.initialize(infoWindow.get(j).getInfoWindow());
}
+ Hibernate.initialize(block.getQuestionGroups());
Iterator<QuestionGroup> iteratorquestionGrp = block.getQuestionGroups().iterator();
{
while(iteratorquestionGrp.hasNext())
@@ -551,7 +553,7 @@
initializeModule(module);
question.setQuestionGroup(questionGroup);
- save(question);
+ questionDao.save(question);
returnQuestion = question;
@@ -669,7 +671,7 @@
initializeModule(module);
categoricalQ.setQuestionGroup(questionGroup);
- save(categoricalQ);
+ categoricalQuestionDao.save(categoricalQ);
returnQuestion = categoricalQ;
@@ -678,7 +680,7 @@
}
else if(questionInfo.getClass().getName().equalsIgnoreCase("edu.asu.commons.mme.entity.Question"))
{
- question = getDao().find(questionId);
+ /*question = getDao().find(questionId);
Hibernate.initialize(question);
questionGroup = question.getQuestionGroup();
Hibernate.initialize(questionGroup);
@@ -708,6 +710,30 @@
save(question);
+ returnQuestion = question;*/
+
+ question = getQuestionDao().find(questionId);
+
+ Question otherTypeQuestionInfo = (Question)questionInfo;
+ getLogger().debug("Question from client is: " + otherTypeQuestionInfo.getQuestion());
+ question.setQuestion(otherTypeQuestionInfo.getQuestion());
+ question.setSequenceNo(otherTypeQuestionInfo.getSequenceNo());
+ question.setType(otherTypeQuestionInfo.getType().toLowerCase());
+ question.setCommunicationQ(otherTypeQuestionInfo.isCommunicationQ());
+
+ questionGroup = questionGroupDao.findByProperty("id",questionGroupId);
+ question.setQuestionGroup(questionGroup);
+ getQuestionDao().save(question);
+ getLogger().debug("question is saved with id: " + question.getId());
+ Hibernate.initialize(question);
+ questionGroup = question.getQuestionGroup();
+ Hibernate.initialize(questionGroup);
+ block = questionGroup.getBlock();
+ Hibernate.initialize(block);
+ Hibernate.initialize(block.getQuestionGroups());
+ module = block.getModule();
+ Hibernate.initialize(module);
+ initializeModule(module);
returnQuestion = question;
}
@@ -879,4 +905,14 @@
return categoricalOptionDao;
}
+
+ public void setQuestionDao(HibernateQuestionDao questionDao) {
+ this.questionDao = questionDao;
+ }
+
+
+ public HibernateQuestionDao getQuestionDao() {
+ return questionDao;
+ }
+
}
Modified: mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml
===================================================================
--- mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml 2010-01-15 19:12:57 UTC (rev 429)
+++ mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml 2010-01-15 19:27:15 UTC (rev 430)
@@ -142,6 +142,7 @@
<property name='blockDao' ref='blockDao'/>
<property name='studentDao' ref='studentDao'/>
<property name='groupDao' ref='groupDao'/>
+ <property name='communicationDao' ref='communicationDao'/>
</bean>
@@ -174,7 +175,9 @@
<property name='psychometricQuestionDao' ref='psychometricQuestionDao'/>
<property name='categoricalQuestionDao' ref='categoricalQuestionDao'/>
<property name='categoricalOptionDao' ref='categoricalOptionDao'/>
+ <property name='questionDao' ref='questionDao'/>
+
</bean>
<bean id='locationService' class='edu.asu.commons.mme.service.LocationService'>
@@ -195,6 +198,8 @@
<bean id='communicationService' class="edu.asu.commons.mme.service.CommunicationService">
<property name='dao' ref='communicationDao'/>
+ <property name='studentDao' ref='studentDao'/>
+ <property name='roundConfigDao' ref='roundConfigDao'/>
</bean>
<!-- <bean id="testService" class="edu.asu.commons.mme.service.TestService">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
