-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
diff --git a/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf b/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf
index ee66f6ddae..c5a08ff3b8 100644
--- a/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf
+++ b/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf
@@ -1,36 +1,119 @@
#{assessmentSettingsMessages.extendedTimeHeading} " escape="false"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
diff --git a/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp b/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
index b4f6cb6314..8aa44ba9e3 100644
--- a/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
+++ b/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
@@ -43,7 +43,6 @@
<%= request.getAttribute("html.head") %>
<h:outputText value="#{assessmentSettingsMessages.sakai_assessment_manager} #{assessmentSettingsMessages.dash} #{assessmentSettingsMessages.settings}" />
-
diff --git a/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/ExtendedTime.hbm.xml b/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/ExtendedTime.hbm.xml
new file mode 100644
index 0000000000..6ef7067681
--- /dev/null
+++ b/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/ExtendedTime.hbm.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ SAM_EXTENDEDTIME_S
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/ExtendedTime.java b/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/ExtendedTime.java
new file mode 100644
index 0000000000..658837cdc8
--- /dev/null
+++ b/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/ExtendedTime.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016, The Apereo Foundation
+ *
+ * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/ecl2
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.sakaiproject.tool.assessment.data.dao.assessment;
+
+import lombok.*;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentBaseIfc;
+import org.sakaiproject.tool.assessment.data.ifc.assessment.PublishedAssessmentIfc;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Leonardo Canessa [lcanessa1 (at) udayton (dot) edu]
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ExtendedTime implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
+ private AssessmentBaseIfc assessment;
+ private PublishedAssessmentIfc pubAssessment;
+ private String user;
+ private String group;
+ private Date startDate;
+ private Date dueDate;
+ private Date retractDate;
+ private Integer timeHours;
+ private Integer timeMinutes;
+
+ public ExtendedTime (AssessmentBaseIfc ass) {
+ this.assessment = ass;
+ }
+
+ public ExtendedTime (PublishedAssessmentIfc pub) {
+ this.pubAssessment = pub;
+ }
+
+ public ExtendedTime (ExtendedTime source) {
+ this(source.id, source.assessment, source.pubAssessment, source.user, source.group, source.startDate, source.dueDate, source.retractDate, source.timeHours, source.timeMinutes);
+ }
+
+ public Long getAssessmentId () {
+ if(assessment == null) {
+ return null;
+ }
+ return assessment.getAssessmentBaseId();
+ }
+
+ public Long getPubAssessmentId () {
+ if(pubAssessment == null) {
+ return null;
+ }
+ return pubAssessment.getPublishedAssessmentId();
+ }
+
+ @Override
+ public boolean equals (final Object obj) {
+ if(obj == this) return true; // test for reference equality
+ if(obj == null) return false; // test for null
+ if(obj instanceof ExtendedTime) {
+ final ExtendedTime other = (ExtendedTime) obj;
+ return new EqualsBuilder()
+ .append(assessment.getAssessmentBaseId(), other.assessment.getAssessmentBaseId())
+ .append(pubAssessment.getPublishedAssessmentId(), other.getPubAssessmentId())
+ .append(user, other.user)
+ .append(group, other.group)
+ .append(startDate, other.startDate)
+ .append(dueDate, other.dueDate)
+ .append(retractDate, other.retractDate)
+ .append(timeHours, other.timeHours)
+ .append(timeMinutes, other.timeMinutes)
+ .isEquals();
+ } else{
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode () {
+ return new HashCodeBuilder()
+ .append(assessment.getAssessmentBaseId())
+ .append(pubAssessment.getPublishedAssessmentId())
+ .append(user)
+ .append(group)
+ .append(startDate)
+ .append(dueDate)
+ .append(retractDate)
+ .append(timeHours)
+ .append(timeMinutes)
+ .toHashCode();
+ }
+}
diff --git a/samigo/samigo-impl/pom.xml b/samigo/samigo-impl/pom.xml
index 8f3957274e..dca4de107e 100644
--- a/samigo/samigo-impl/pom.xml
+++ b/samigo/samigo-impl/pom.xml
@@ -37,6 +37,10 @@
${project.groupId}
samigo-services
+
+ ${project.groupId}
+ samigo-hibernate
+
org.sakaiproject.message
sakai-message-api
diff --git a/samigo/samigo-pack/src/webapp/WEB-INF/components.xml b/samigo/samigo-pack/src/webapp/WEB-INF/components.xml
index 43febc4217..f08bd3deba 100644
--- a/samigo/samigo-pack/src/webapp/WEB-INF/components.xml
+++ b/samigo/samigo-pack/src/webapp/WEB-INF/components.xml
@@ -25,6 +25,7 @@
org/sakaiproject/tool/assessment/data/dao/grading/MediaData.hbm.xml
org/sakaiproject/tool/assessment/data/dao/authz/AuthorizationData.hbm.xml
org/sakaiproject/tool/assessment/data/dao/assessment/FavoriteColChoices.hbm.xml
+ org/sakaiproject/tool/assessment/data/dao/assessment/ExtendedTime.hbm.xml
@@ -54,6 +55,7 @@