Index: C:/sakai-contrib/sakai_signup_trunk/.classpath
===================================================================
--- C:/sakai-contrib/sakai_signup_trunk/.classpath (revision 53944)
+++ C:/sakai-contrib/sakai_signup_trunk/.classpath (working copy)
@@ -1,41 +1,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: C:/sakai-contrib/sakai_signup_trunk/api/src/java/org/sakaiproject/signup/model/SignupMeeting.java
===================================================================
--- C:/sakai-contrib/sakai_signup_trunk/api/src/java/org/sakaiproject/signup/model/SignupMeeting.java (revision 53944)
+++ C:/sakai-contrib/sakai_signup_trunk/api/src/java/org/sakaiproject/signup/model/SignupMeeting.java (working copy)
@@ -147,8 +147,9 @@
* the end time of the event/meeting
*/
public void setEndTime(Date endTime) {
- this.endTime = endTime;
+ this.endTime = truncateSeconds(endTime);
}
+
/**
* get the unique meeting/event Id, which is generated by DB
@@ -232,7 +233,7 @@
* a time when the signup process starts
*/
public void setSignupBegins(Date signupBegins) {
- this.signupBegins = signupBegins;
+ this.signupBegins = truncateSeconds(signupBegins);
}
/**
@@ -251,7 +252,7 @@
* the time when signup process stops
*/
public void setSignupDeadline(Date signupDeadLine) {
- this.signupDeadline = signupDeadLine;
+ this.signupDeadline = truncateSeconds(signupDeadLine);
}
/**
@@ -270,7 +271,7 @@
* the time when the event/meeting starts
*/
public void setStartTime(Date startTime) {
- this.startTime = startTime;
+ this.startTime = truncateSeconds(startTime);
}
/**
@@ -510,4 +511,22 @@
public boolean isStartToSignUp(){
return signupBegins.before(new Date());
}
+
+ /**
+ * Set the second value to zero. it only need to accurate to minutes level.
+ * Otherwise it may cause one minute shorter display confusion
+ * @param time
+ * @return Date object
+ */
+ private Date truncateSeconds(Date time){
+ /* set second to zero */
+ if (time == null)
+ return null;
+
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(time);
+ cal.set(Calendar.SECOND,0);
+ cal.set(Calendar.MILLISECOND, 0);
+ return cal.getTime();
+ }
}
Index: C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/signup/organizer/orgSignupMeeting.jsp
===================================================================
--- C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/signup/organizer/orgSignupMeeting.jsp (revision 53944)
+++ C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/signup/organizer/orgSignupMeeting.jsp (working copy)
@@ -204,10 +204,10 @@
+ alt="edit" style="cursor:pointer; border:none" rendered="#{!OrganizerSignupMBean.meetingWrapper.meeting.meetingExpired}"/>
-
+
@@ -271,9 +271,11 @@
<%-- TODO add spacer only if the attendees exist in atleast one timeslot --%>
-
-
-
+
+
+
+
+
@@ -311,7 +313,7 @@
-
+
@@ -321,9 +323,14 @@
-
-
-
+
+
+
+
+
+
+
+
@@ -376,7 +383,7 @@
-
+
Index: C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/signup/newMeeting/assignStudents.jsp
===================================================================
--- C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/signup/newMeeting/assignStudents.jsp (revision 53944)
+++ C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/signup/newMeeting/assignStudents.jsp (working copy)
@@ -1,22 +1,22 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -58,15 +58,18 @@
-
+
+
-
-
+
+
+
+
@@ -98,14 +101,14 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
Index: C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/css/signupStyle.css
===================================================================
--- C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/css/signupStyle.css (revision 53944)
+++ C:/sakai-contrib/sakai_signup_trunk/tool/src/webapp/css/signupStyle.css (working copy)
@@ -217,3 +217,16 @@
.organizerToplevelTable{
width: 100%;
}
+
+.addAttendee{
+ cursor:pointer;
+ color: #35b;
+ text-decoration: none !important;
+}
+.disabledAddAttendee{}
+.addWaiter{
+ margin-left: 2px;
+ cursor:pointer;
+ color: #35b;
+ text-decoration: none !important;
+}