Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r4b181ebda12a35a61d945b5bb2d286c124b76e62 -r117b4f3d433dec684bdde042c051f7b2831ad54a
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 4b181ebda12a35a61d945b5bb2d286c124b76e62)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 117b4f3d433dec684bdde042c051f7b2831ad54a)
@@ -132,6 +132,7 @@
PROPAGATION_REQUIRED
+ PROPAGATION_REQUIRED
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r117b4f3d433dec684bdde042c051f7b2831ad54a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java (.../ILearningLibraryDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java (.../ILearningLibraryDAO.java) (revision 117b4f3d433dec684bdde042c051f7b2831ad54a)
@@ -34,7 +34,14 @@
public interface ILearningLibraryDAO extends IBaseDAO {
public LearningLibrary getLearningLibraryById(Long learningLibraryId);
- /** Get all valid learning libraries */
+ /**
+ * Get all valid learning libraries, it eaquals getAllLearningLibraries(true);
+ */
public List getAllLearningLibraries();
+ /**
+ * Get all learning libraries whatever the library is valid or invalid.
+ * @return
+ */
+ public List getAllLearningLibraries(boolean valid);
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r117b4f3d433dec684bdde042c051f7b2831ad54a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 117b4f3d433dec684bdde042c051f7b2831ad54a)
@@ -26,7 +26,6 @@
import java.util.List;
import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
-import org.lamsfoundation.lams.learningdesign.Grouping;
import org.lamsfoundation.lams.learningdesign.LearningLibrary;
import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO;
@@ -37,6 +36,8 @@
private static final String FIND_VALID_LIB ="from "+LearningLibrary.class.getName()
+" l where l.validLibrary=true";
+ private static final String FIND_ALL_LIB ="from "+LearningLibrary.class.getName()
+ +" l";
/**
* (non-Javadoc)
@@ -53,4 +54,12 @@
public List getAllLearningLibraries() {
return getSession().createQuery(FIND_VALID_LIB).list();
}
+
+ public List getAllLearningLibraries(boolean valid){
+ if(valid)
+ return getAllLearningLibraries();
+ else
+ return getHibernateTemplate().find(FIND_ALL_LIB);
+
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r117b4f3d433dec684bdde042c051f7b2831ad54a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java (.../LearningLibraryDTO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java (.../LearningLibraryDTO.java) (revision 117b4f3d433dec684bdde042c051f7b2831ad54a)
@@ -23,15 +23,14 @@
/* $$Id$$ */
package org.lamsfoundation.lams.learningdesign.dto;
-import java.util.ArrayList;
+import java.util.Date;
import java.util.Iterator;
-import java.util.Vector;
import java.util.List;
+import java.util.Vector;
import org.lamsfoundation.lams.learningdesign.Activity;
import org.lamsfoundation.lams.learningdesign.ComplexActivity;
import org.lamsfoundation.lams.learningdesign.LearningLibrary;
-import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
/**
* @author Manpreet Minhas
@@ -47,19 +46,21 @@
private String description;
private String title;
private Boolean validFlag;
+ private Date createDateTime;
private Vector templateActivities;
public LearningLibraryDTO(){
}
public LearningLibraryDTO(Long learningLibraryID, String description,
- String title, Boolean validFlag,
+ String title, Boolean validFlag,Date createDateTime,
Vector templateActivities) {
this.learningLibraryID = learningLibraryID;
this.description = description;
this.title = title;
this.validFlag = validFlag;
+ this.createDateTime = createDateTime;
this.templateActivities = templateActivities;
}
@@ -68,7 +69,8 @@
this.learningLibraryID = learningLibrary.getLearningLibraryId();
this.description = learningLibrary.getDescription();
this.title = learningLibrary.getTitle();
- this.validFlag = learningLibrary.getValidLibrary();
+ this.validFlag = learningLibrary.getValidLibrary();
+ this.createDateTime = learningLibrary.getCreateDateTime();
this.templateActivities = populateActivities(learningLibrary.getActivities().iterator());
}
@@ -78,6 +80,7 @@
this.description = learningLibrary.getDescription();
this.title = learningLibrary.getTitle();
this.validFlag = learningLibrary.getValidLibrary();
+ this.createDateTime = learningLibrary.getCreateDateTime();
this.templateActivities = populateActivities(templateActivity.iterator());
}
@@ -147,6 +150,12 @@
}
return activities;
}
+ public Date getCreateDateTime() {
+ return createDateTime;
+ }
+ public void setCreateDateTime(Date createDateTime) {
+ this.createDateTime = createDateTime;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
===================================================================
diff -u -rcb333c89e9d244ab2204e9bc8cb14d6dd613603e -r117b4f3d433dec684bdde042c051f7b2831ad54a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java (.../ILearningDesignService.java) (revision cb333c89e9d244ab2204e9bc8cb14d6dd613603e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java (.../ILearningDesignService.java) (revision 117b4f3d433dec684bdde042c051f7b2831ad54a)
@@ -55,9 +55,24 @@
public Vector validateLearningDesign(LearningDesign learningDesign);
/**
- * Get the DTO list of all learning libraries.
+ * Get the DTO list of all valid learning libraries, which equals getAllLearningLibraryDetails(true) method.
* @return list of LearningLibraryDTO
* @throws IOException
*/
public ArrayList getAllLearningLibraryDetails() throws IOException;
+ /**
+ * Get the DTO list of all learning libraries whatever it is valid or not.
+ * @param valid
+ * @return
+ * @throws IOException
+ */
+ public ArrayList getAllLearningLibraryDetails(boolean valid) throws IOException;
+
+ /**
+ * Set valid flag to learning library.
+ * @param learningLibraryId
+ * @param valid
+ */
+ public void setValid(Long learningLibraryId, boolean valid);
+
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
diff -u -rad09c4163bcae7ea249a94278c9d9b9fa93e2fc6 -r117b4f3d433dec684bdde042c051f7b2831ad54a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision ad09c4163bcae7ea249a94278c9d9b9fa93e2fc6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 117b4f3d433dec684bdde042c051f7b2831ad54a)
@@ -148,6 +148,11 @@
}
+ public void setValid(Long learningLibraryId, boolean valid) {
+ LearningLibrary library = learningLibraryDAO.getLearningLibraryById(learningLibraryId);
+ library.setValidLibrary(valid);
+ learningLibraryDAO.update(library);
+ }
/**
* Cleans up multiple and redundant error messages in the list.
* @param errors List of errors to cleanup.
@@ -462,7 +467,11 @@
public ArrayList getAllLearningLibraryDetails()throws IOException{
- Iterator iterator= learningLibraryDAO.getAllLearningLibraries().iterator();
+ //only return valid learning library
+ return getAllLearningLibraryDetails(true);
+ }
+ public ArrayList getAllLearningLibraryDetails(boolean valid)throws IOException{
+ Iterator iterator= learningLibraryDAO.getAllLearningLibraries(valid).iterator();
ArrayList libraries = new ArrayList();
while(iterator.hasNext()){
LearningLibrary learningLibrary = (LearningLibrary)iterator.next();
@@ -523,4 +532,6 @@
}
}
}
+
+
}
\ No newline at end of file
Fisheye: Tag c8cabf72723eae7374f0f197d472729786253ea7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/resources/lamsauthentication.dtd'.
Fisheye: No comparison available. Pass `N' to diff?