Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java =================================================================== --- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java (revision 308434) +++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java (working copy) @@ -191,7 +191,6 @@ private static final String NEW_ASSIGNMENT_PEERPERIODYEAR = "new_assignment_peerperiodyear"; private static final String NEW_ASSIGNMENT_PEERPERIODHOUR = "new_assignment_peerperiodhour"; private static final String NEW_ASSIGNMENT_PEERPERIODMIN = "new_assignment_peerperiodmin"; - private static final String NEW_ASSIGNMENT_PEERPERIODAMPM = "new_assignment_peerperiodampm"; private static final String NEW_ASSIGNMENT_PEER_ASSESSMENT_ANON_EVAL= "new_assignment_peer_assessment_anon_eval"; private static final String NEW_ASSIGNMENT_PEER_ASSESSMENT_STUDENT_VIEW_REVIEWS= "new_assignment_peer_assessment_student_view_review"; private static final String NEW_ASSIGNMENT_PEER_ASSESSMENT_NUM_REVIEWS= "new_assignment_peer_assessment_num_reviews"; @@ -485,8 +484,6 @@ private static final String NEW_ASSIGNMENT_OPENMIN = "new_assignment_openmin"; - private static final String NEW_ASSIGNMENT_OPENAMPM = "new_assignment_openampm"; - // visible date private static final String NEW_ASSIGNMENT_VISIBLEMONTH = "new_assignment_visiblemonth"; @@ -498,8 +495,6 @@ private static final String NEW_ASSIGNMENT_VISIBLEMIN = "new_assignment_visiblemin"; - private static final String NEW_ASSIGNMENT_VISIBLEAMPM = "new_assignment_visibleampm"; - private static final String NEW_ASSIGNMENT_VISIBLETOGGLE = "new_assignment_visibletoggle"; // due date @@ -513,8 +508,6 @@ private static final String NEW_ASSIGNMENT_DUEMIN = "new_assignment_duemin"; - private static final String NEW_ASSIGNMENT_DUEAMPM = "new_assignment_dueampm"; - private static final String NEW_ASSIGNMENT_PAST_DUE_DATE = "new_assignment_past_due_date"; // close date @@ -530,8 +523,6 @@ private static final String NEW_ASSIGNMENT_CLOSEMIN = "new_assignment_closemin"; - private static final String NEW_ASSIGNMENT_CLOSEAMPM = "new_assignment_closeampm"; - private static final String NEW_ASSIGNMENT_ATTACHMENT = "new_assignment_attachment"; @@ -586,7 +577,6 @@ private static final String ALLOW_RESUBMIT_CLOSEYEAR = "allow_resubmit_closeYear"; private static final String ALLOW_RESUBMIT_CLOSEHOUR = "allow_resubmit_closeHour"; private static final String ALLOW_RESUBMIT_CLOSEMIN = "allow_resubmit_closeMin"; - private static final String ALLOW_RESUBMIT_CLOSEAMPM = "allow_resubmit_closeAMPM"; private static final String ATTACHMENTS_MODIFIED = "attachments_modified"; @@ -847,13 +837,11 @@ private static final String ALLPURPOSE_RELEASE_DAY = "allPurpose_releaseDay"; private static final String ALLPURPOSE_RELEASE_HOUR = "allPurpose_releaseHour"; private static final String ALLPURPOSE_RELEASE_MIN = "allPurpose_releaseMin"; - private static final String ALLPURPOSE_RELEASE_AMPM = "allPurpose_releaseAMPM"; private static final String ALLPURPOSE_RETRACT_YEAR = "allPurpose_retractYear"; private static final String ALLPURPOSE_RETRACT_MONTH = "allPurpose_retractMonth"; private static final String ALLPURPOSE_RETRACT_DAY = "allPurpose_retractDay"; private static final String ALLPURPOSE_RETRACT_HOUR = "allPurpose_retractHour"; private static final String ALLPURPOSE_RETRACT_MIN = "allPurpose_retractMin"; - private static final String ALLPURPOSE_RETRACT_AMPM = "allPurpose_retractAMPM"; private static final String ALLPURPOSE_TO_DELETE = "allPurpose.toDelete"; private static final String SHOW_ALLOW_RESUBMISSION = "show_allow_resubmission"; @@ -2246,19 +2234,19 @@ context.put("name_order", NEW_ASSIGNMENT_ORDER); // set open time context variables - putTimePropertiesInContext(context, state, "Open", NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN, NEW_ASSIGNMENT_OPENAMPM); + putTimePropertiesInContext(context, state, "Open", NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN); // set visible time context variables if (Boolean.valueOf(ServerConfigurationService.getBoolean("assignment.visible.date.enabled", false))) { - putTimePropertiesInContext(context, state, "Visible", NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN, NEW_ASSIGNMENT_VISIBLEAMPM); + putTimePropertiesInContext(context, state, "Visible", NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN); } // set due time context variables - putTimePropertiesInContext(context, state, "Due", NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN, NEW_ASSIGNMENT_DUEAMPM); + putTimePropertiesInContext(context, state, "Due", NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN); context.put("name_EnableCloseDate", NEW_ASSIGNMENT_ENABLECLOSEDATE); // set close time context variables - putTimePropertiesInContext(context, state, "Close", NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN, NEW_ASSIGNMENT_CLOSEAMPM); + putTimePropertiesInContext(context, state, "Close", NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN); context.put("name_Section", NEW_ASSIGNMENT_SECTION); context.put("name_SubmissionType", NEW_ASSIGNMENT_SUBMISSION_TYPE); @@ -2290,7 +2278,7 @@ context.put("value_CheckIsGroupSubmission", gs); // put the re-submission info into context - putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); context.put("value_year_from", state.getAttribute(NEW_ASSIGNMENT_YEAR_RANGE_FROM)); context.put("value_year_to", state.getAttribute(NEW_ASSIGNMENT_YEAR_RANGE_TO)); @@ -2318,7 +2306,7 @@ context.put("value_PeerAssessmentStudentViewReviews", state.getAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_STUDENT_VIEW_REVIEWS)); context.put("value_PeerAssessmentNumReviews", state.getAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_NUM_REVIEWS)); context.put("value_PeerAssessmentInstructions", state.getAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_INSTRUCTIONS)); - putTimePropertiesInContext(context, state, "PeerPeriod", NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN, NEW_ASSIGNMENT_PEERPERIODAMPM); + putTimePropertiesInContext(context, state, "PeerPeriod", NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN); // Keep the use review service setting context.put("value_UseReviewService", state.getAttribute(NEW_ASSIGNMENT_USE_REVIEW_SERVICE)); @@ -2556,8 +2544,8 @@ context.put("value_allPurposeShowFrom", state.getAttribute(ALLPURPOSE_SHOW_FROM) != null?state.getAttribute(ALLPURPOSE_SHOW_FROM):Boolean.FALSE); context.put("value_allPurposeShowTo", state.getAttribute(ALLPURPOSE_SHOW_TO) != null?state.getAttribute(ALLPURPOSE_SHOW_TO):Boolean.FALSE); context.put("value_allPurposeAccessList", state.getAttribute(ALLPURPOSE_ACCESS)); - putTimePropertiesInContext(context, state, "allPurposeRelease", ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN, ALLPURPOSE_RELEASE_AMPM); - putTimePropertiesInContext(context, state, "allPurposeRetract", ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN, ALLPURPOSE_RETRACT_AMPM); + putTimePropertiesInContext(context, state, "allPurposeRelease", ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN); + putTimePropertiesInContext(context, state, "allPurposeRetract", ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN); // get attachment for all purpose object putSupplementItemAttachmentStateIntoContext(state, context, ALLPURPOSE_ATTACHMENTS); @@ -2774,16 +2762,16 @@ context.put("name_order", NEW_ASSIGNMENT_ORDER); context.put("value_position_order", (String) state.getAttribute(NEW_ASSIGNMENT_ORDER)); - Time openTime = getTimeFromState(state, NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN, NEW_ASSIGNMENT_OPENAMPM); + Time openTime = getTimeFromState(state, NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN); context.put("value_OpenDate", openTime); if (Boolean.valueOf(ServerConfigurationService.getBoolean("assignment.visible.date.enabled", false))) { - Time visibleTime = getTimeFromState(state, NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN, NEW_ASSIGNMENT_VISIBLEAMPM); + Time visibleTime = getTimeFromState(state, NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN); context.put("value_VisibleDate", visibleTime); } // due time - Time dueTime = getTimeFromState(state, NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN, NEW_ASSIGNMENT_DUEAMPM); + Time dueTime = getTimeFromState(state, NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN); context.put("value_DueDate", dueTime); // close time @@ -2792,7 +2780,7 @@ context.put("value_EnableCloseDate", enableCloseDate); if ((enableCloseDate).booleanValue()) { - closeTime = getTimeFromState(state, NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN, NEW_ASSIGNMENT_CLOSEAMPM); + closeTime = getTimeFromState(state, NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN); context.put("value_CloseDate", closeTime); } @@ -2980,7 +2968,7 @@ // put the re-submission info into context - putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); assignment_resubmission_option_into_context(context, state); } @@ -3232,26 +3220,16 @@ * @param year * @param hour * @param min - * @param ampm */ private void putTimePropertiesInState(SessionState state, Time timeValue, - String month, String day, String year, String hour, String min, String ampm) { + String month, String day, String year, String hour, String min) { try { TimeBreakdown bTime = timeValue.breakdownLocal(); state.setAttribute(month, Integer.valueOf(bTime.getMonth())); state.setAttribute(day, Integer.valueOf(bTime.getDay())); state.setAttribute(year, Integer.valueOf(bTime.getYear())); - int bHour = bTime.getHour(); - if (bHour >= 12) - { - state.setAttribute(ampm, "PM"); - } - else - { - state.setAttribute(ampm, "AM"); - } - state.setAttribute(hour, Integer.valueOf(bHour)); + state.setAttribute(hour, Integer.valueOf(bTime.getHour())); state.setAttribute(min, Integer.valueOf(bTime.getMin())); } catch (NullPointerException _npe) { /* TODO empty exception block */ } } @@ -3266,21 +3244,18 @@ * @param year * @param hour * @param min - * @param ampm */ private void putTimePropertiesInContext(Context context, SessionState state, String timeName, - String month, String day, String year, String hour, String min, String ampm) { + String month, String day, String year, String hour, String min) { // get the submission level of close date setting context.put("name_" + timeName + "Month", month); context.put("name_" + timeName + "Day", day); context.put("name_" + timeName + "Year", year); context.put("name_" + timeName + "Hour", hour); context.put("name_" + timeName + "Min", min); - context.put("name_" + timeName + "AMPM", ampm); context.put("value_" + timeName + "Month", (Integer) state.getAttribute(month)); context.put("value_" + timeName + "Day", (Integer) state.getAttribute(day)); context.put("value_" + timeName + "Year", (Integer) state.getAttribute(year)); - context.put("value_" + timeName + "AMPM", (String) state.getAttribute(ampm)); context.put("value_" + timeName + "Hour", (Integer) state.getAttribute(hour)); context.put("value_" + timeName + "Min", (Integer) state.getAttribute(min)); } @@ -3513,7 +3488,7 @@ context.put("showAllowResubmission", Boolean.TRUE); } // put the re-submission info into context - putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); assignment_resubmission_option_into_context(context, state); } @@ -5240,7 +5215,7 @@ if (state.getAttribute(ALLOW_RESUBMIT_CLOSEYEAR) != null) { // get resubmit time - Time closeTime = getTimeFromState(state, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + Time closeTime = getTimeFromState(state, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); pEdit.addProperty(AssignmentSubmission.ALLOW_RESUBMIT_CLOSETIME, String.valueOf(closeTime.getTime())); } else @@ -5922,20 +5897,20 @@ } // open time - Time openTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN, NEW_ASSIGNMENT_OPENAMPM, "newassig.opedat"); + Time openTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN, "newassig.opedat"); // visible time if (Boolean.valueOf(ServerConfigurationService.getBoolean("assignment.visible.date.enabled", false))) { if (params.get("allowVisibleDateToggle") == null) { state.setAttribute(NEW_ASSIGNMENT_VISIBLETOGGLE, true); } else { - Time visibleTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN, NEW_ASSIGNMENT_VISIBLEAMPM, "newassig.visdat"); + Time visibleTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN, "newassig.visdat"); } } // due time - Time dueTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN, NEW_ASSIGNMENT_DUEAMPM, "gen.duedat"); + Time dueTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN, "gen.duedat"); // show alert message when due date is in past. Remove it after user confirms the choice. if (dueTime != null && dueTime.before(TimeService.newTime()) && state.getAttribute(NEW_ASSIGNMENT_PAST_DUE_DATE) == null) { @@ -5959,7 +5934,7 @@ state.setAttribute(NEW_ASSIGNMENT_ENABLECLOSEDATE, Boolean.valueOf(true)); // close time - Time closeTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN, NEW_ASSIGNMENT_CLOSEAMPM, "date.closedate"); + Time closeTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN, "date.closedate"); if (openTime != null && closeTime != null && !closeTime.after(openTime)) { addAlert(state, rb.getString("acesubdea3")); @@ -6017,7 +5992,7 @@ addAlert(state, rb.getString("peerassessment.invliadGradeTypeAssignment")); } - Time peerPeriodTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN, NEW_ASSIGNMENT_PEERPERIODAMPM, "newassig.opedat"); + Time peerPeriodTime = putTimeInputInState(params, state, NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN, "newassig.opedat"); GregorianCalendar peerPeriodMinTimeCal = new GregorianCalendar(); peerPeriodMinTimeCal.setTimeInMillis(closeTime.getTime()); peerPeriodMinTimeCal.add(GregorianCalendar.MINUTE, 10); @@ -6525,7 +6500,7 @@ { state.setAttribute(ALLPURPOSE_SHOW_FROM, Boolean.valueOf(params.getString("allPurposeShowFrom"))); // allpurpose release time - putTimeInputInState(params, state, ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN, ALLPURPOSE_RELEASE_AMPM, "date.allpurpose.releasedate"); + putTimeInputInState(params, state, ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN, "date.allpurpose.releasedate"); } else { @@ -6535,7 +6510,7 @@ { state.setAttribute(ALLPURPOSE_SHOW_TO, Boolean.valueOf(params.getString("allPurposeShowTo"))); // allpurpose retract time - putTimeInputInState(params, state, ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN, ALLPURPOSE_RETRACT_AMPM, "date.allpurpose.retractdate"); + putTimeInputInState(params, state, ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN, "date.allpurpose.retractdate"); } else { @@ -6616,11 +6591,10 @@ * @param yearString * @param hourString * @param minString - * @param ampmString * @param invalidBundleMessage * @return */ - Time putTimeInputInState(ParameterParser params, SessionState state, String monthString, String dayString, String yearString, String hourString, String minString, String ampmString, String invalidBundleMessage) + Time putTimeInputInState(ParameterParser params, SessionState state, String monthString, String dayString, String yearString, String hourString, String minString, String invalidBundleMessage) { int month = (Integer.valueOf(params.getString(monthString))).intValue(); state.setAttribute(monthString, Integer.valueOf(month)); @@ -6632,16 +6606,6 @@ state.setAttribute(hourString, Integer.valueOf(hour)); int min = (Integer.valueOf(params.getString(minString))).intValue(); state.setAttribute(minString, Integer.valueOf(min)); - String ampm = params.getString(ampmString); - state.setAttribute(ampmString, ampm); - if (("PM".equals(ampm)) && (hour != 12)) - { - hour = hour + 12; - } - if ((hour == 12) && ("AM".equals(ampm))) - { - hour = 0; - } // validate date if (!Validator.checkDate(day, month, year)) { @@ -6945,24 +6909,24 @@ String order = (String) state.getAttribute(NEW_ASSIGNMENT_ORDER); // open time - Time openTime = getTimeFromState(state, NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN, NEW_ASSIGNMENT_OPENAMPM); + Time openTime = getTimeFromState(state, NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN); // visible time Time visibleTime = null; if (Boolean.valueOf(ServerConfigurationService.getBoolean("assignment.visible.date.enabled", false))) { if (state.getAttribute(NEW_ASSIGNMENT_VISIBLETOGGLE) == null) - visibleTime = getTimeFromState(state, NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN, NEW_ASSIGNMENT_VISIBLEAMPM); + visibleTime = getTimeFromState(state, NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN); } // due time - Time dueTime = getTimeFromState(state, NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN, NEW_ASSIGNMENT_DUEAMPM); + Time dueTime = getTimeFromState(state, NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN); // close time Time closeTime = dueTime; boolean enableCloseDate = ((Boolean) state.getAttribute(NEW_ASSIGNMENT_ENABLECLOSEDATE)).booleanValue(); if (enableCloseDate) { - closeTime = getTimeFromState(state, NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN, NEW_ASSIGNMENT_CLOSEAMPM); + closeTime = getTimeFromState(state, NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN); } // sections @@ -6999,7 +6963,7 @@ } //Peer Assessment boolean usePeerAssessment = "true".equalsIgnoreCase((String) state.getAttribute(NEW_ASSIGNMENT_USE_PEER_ASSESSMENT)); - Time peerPeriodTime = getTimeFromState(state, NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN, NEW_ASSIGNMENT_PEERPERIODAMPM); + Time peerPeriodTime = getTimeFromState(state, NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN); boolean peerAssessmentAnonEval = "true".equalsIgnoreCase((String) state.getAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_ANON_EVAL)); boolean peerAssessmentStudentViewReviews = "true".equalsIgnoreCase((String) state.getAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_STUDENT_VIEW_REVIEWS)); int peerAssessmentNumReviews = 0; @@ -7104,7 +7068,7 @@ // set the Assignment Properties object ResourcePropertiesEdit aPropertiesEdit = a.getPropertiesEdit(); oAssociateGradebookAssignment = aPropertiesEdit.getProperty(AssignmentService.PROP_ASSIGNMENT_ASSOCIATE_GRADEBOOK_ASSIGNMENT); - Time resubmitCloseTime = getTimeFromState(state, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + Time resubmitCloseTime = getTimeFromState(state, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); editAssignmentProperties(a, checkAddDueTime, checkAutoAnnounce, addtoGradebook, associateGradebookAssignment, allowResubmitNumber, aPropertiesEdit, post, resubmitCloseTime); //TODO: ADD_DUE_DATE // the notification option @@ -7353,7 +7317,7 @@ if (allPurposeShowFrom && !allPurposeHide) { // save release date - Time releaseTime = getTimeFromState(state, ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN, ALLPURPOSE_RELEASE_AMPM); + Time releaseTime = getTimeFromState(state, ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN); GregorianCalendar cal = new GregorianCalendar(); cal.setTimeInMillis(releaseTime.getTime()); nAllPurpose.setReleaseDate(cal.getTime()); @@ -7365,7 +7329,7 @@ if (allPurposeShowTo && !allPurposeHide) { // save retract date - Time retractTime = getTimeFromState(state, ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN, ALLPURPOSE_RETRACT_AMPM); + Time retractTime = getTimeFromState(state, ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN); GregorianCalendar cal = new GregorianCalendar(); cal.setTimeInMillis(retractTime.getTime()); nAllPurpose.setRetractDate(cal.getTime()); @@ -8397,32 +8361,21 @@ * @param yearString * @param hourString * @param minString - * @param ampmString * @return */ - private Time getTimeFromState(SessionState state, String monthString, String dayString, String yearString, String hourString, String minString, String ampmString) + private Time getTimeFromState(SessionState state, String monthString, String dayString, String yearString, String hourString, String minString) { if (state.getAttribute(monthString) != null || state.getAttribute(dayString) != null || state.getAttribute(yearString) != null || state.getAttribute(hourString) != null || - state.getAttribute(minString) != null || - state.getAttribute(ampmString) != null) + state.getAttribute(minString) != null) { int month = ((Integer) state.getAttribute(monthString)).intValue(); int day = ((Integer) state.getAttribute(dayString)).intValue(); int year = ((Integer) state.getAttribute(yearString)).intValue(); int hour = ((Integer) state.getAttribute(hourString)).intValue(); int min = ((Integer) state.getAttribute(minString)).intValue(); - String ampm = (String) state.getAttribute(ampmString); - if (("PM".equals(ampm)) && (hour != 12)) - { - hour = hour + 12; - } - if ((hour == 12) && ("AM".equals(ampm))) - { - hour = 0; - } return TimeService.newTimeLocal(year, month, day, hour, min, 0, 0); } else @@ -8661,18 +8614,18 @@ state.setAttribute(NEW_ASSIGNMENT_ORDER, a.getPosition_order()); if (Boolean.valueOf(ServerConfigurationService.getBoolean("assignment.visible.date.enabled", false))) { - putTimePropertiesInState(state, a.getVisibleTime(), NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN, NEW_ASSIGNMENT_VISIBLEAMPM); + putTimePropertiesInState(state, a.getVisibleTime(), NEW_ASSIGNMENT_VISIBLEMONTH, NEW_ASSIGNMENT_VISIBLEDAY, NEW_ASSIGNMENT_VISIBLEYEAR, NEW_ASSIGNMENT_VISIBLEHOUR, NEW_ASSIGNMENT_VISIBLEMIN); } - putTimePropertiesInState(state, a.getOpenTime(), NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN, NEW_ASSIGNMENT_OPENAMPM); + putTimePropertiesInState(state, a.getOpenTime(), NEW_ASSIGNMENT_OPENMONTH, NEW_ASSIGNMENT_OPENDAY, NEW_ASSIGNMENT_OPENYEAR, NEW_ASSIGNMENT_OPENHOUR, NEW_ASSIGNMENT_OPENMIN); // generate alert when editing an assignment past open date if (a.getOpenTime().before(TimeService.newTime())) { addAlert(state, rb.getString("youarenot20")); } - putTimePropertiesInState(state, a.getDueTime(), NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN, NEW_ASSIGNMENT_DUEAMPM); + putTimePropertiesInState(state, a.getDueTime(), NEW_ASSIGNMENT_DUEMONTH, NEW_ASSIGNMENT_DUEDAY, NEW_ASSIGNMENT_DUEYEAR, NEW_ASSIGNMENT_DUEHOUR, NEW_ASSIGNMENT_DUEMIN); // generate alert when editing an assignment past due date if (a.getDueTime().before(TimeService.newTime())) { @@ -8682,7 +8635,7 @@ if (a.getCloseTime() != null) { state.setAttribute(NEW_ASSIGNMENT_ENABLECLOSEDATE, Boolean.valueOf(true)); - putTimePropertiesInState(state, a.getCloseTime(), NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN, NEW_ASSIGNMENT_CLOSEAMPM); + putTimePropertiesInState(state, a.getCloseTime(), NEW_ASSIGNMENT_CLOSEMONTH, NEW_ASSIGNMENT_CLOSEDAY, NEW_ASSIGNMENT_CLOSEYEAR, NEW_ASSIGNMENT_CLOSEHOUR, NEW_ASSIGNMENT_CLOSEMIN); } else { @@ -8692,7 +8645,6 @@ state.setAttribute(NEW_ASSIGNMENT_CLOSEYEAR, state.getAttribute(NEW_ASSIGNMENT_DUEYEAR)); state.setAttribute(NEW_ASSIGNMENT_CLOSEHOUR, state.getAttribute(NEW_ASSIGNMENT_DUEHOUR)); state.setAttribute(NEW_ASSIGNMENT_CLOSEMIN, state.getAttribute(NEW_ASSIGNMENT_DUEMIN)); - state.setAttribute(NEW_ASSIGNMENT_CLOSEAMPM, state.getAttribute(NEW_ASSIGNMENT_DUEAMPM)); } state.setAttribute(NEW_ASSIGNMENT_SECTION, a.getSection()); @@ -8744,7 +8696,7 @@ // set whether we use peer assessment or not state.setAttribute(NEW_ASSIGNMENT_USE_PEER_ASSESSMENT, Boolean.valueOf(a.getAllowPeerAssessment()).toString()); - putTimePropertiesInState(state, a.getPeerAssessmentPeriod(), NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN, NEW_ASSIGNMENT_PEERPERIODAMPM); + putTimePropertiesInState(state, a.getPeerAssessmentPeriod(), NEW_ASSIGNMENT_PEERPERIODMONTH, NEW_ASSIGNMENT_PEERPERIODDAY, NEW_ASSIGNMENT_PEERPERIODYEAR, NEW_ASSIGNMENT_PEERPERIODHOUR, NEW_ASSIGNMENT_PEERPERIODMIN); state.setAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_ANON_EVAL, Boolean.valueOf(a.getPeerAssessmentAnonEval()).toString()); state.setAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_STUDENT_VIEW_REVIEWS, Boolean.valueOf(a.getPeerAssessmentStudentViewReviews()).toString()); state.setAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_NUM_REVIEWS, a.getPeerAssessmentNumReviews()); @@ -8948,9 +8900,9 @@ retractTime = TimeService.newTime(retractDate.getTime()); } } - putTimePropertiesInState(state, releaseTime, ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN, ALLPURPOSE_RELEASE_AMPM); + putTimePropertiesInState(state, releaseTime, ALLPURPOSE_RELEASE_MONTH, ALLPURPOSE_RELEASE_DAY, ALLPURPOSE_RELEASE_YEAR, ALLPURPOSE_RELEASE_HOUR, ALLPURPOSE_RELEASE_MIN); - putTimePropertiesInState(state, retractTime, ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN, ALLPURPOSE_RETRACT_AMPM); + putTimePropertiesInState(state, retractTime, ALLPURPOSE_RETRACT_MONTH, ALLPURPOSE_RETRACT_DAY, ALLPURPOSE_RETRACT_YEAR, ALLPURPOSE_RETRACT_HOUR, ALLPURPOSE_RETRACT_MIN); } /** @@ -10557,16 +10509,6 @@ state.setAttribute(ALLOW_RESUBMIT_CLOSEHOUR, Integer.valueOf(closeHour)); int closeMin = (Integer.valueOf(params.getString(ALLOW_RESUBMIT_CLOSEMIN))).intValue(); state.setAttribute(ALLOW_RESUBMIT_CLOSEMIN, Integer.valueOf(closeMin)); - String closeAMPM = params.getString(ALLOW_RESUBMIT_CLOSEAMPM); - state.setAttribute(ALLOW_RESUBMIT_CLOSEAMPM, closeAMPM); - if (("PM".equals(closeAMPM)) && (closeHour != 12)) - { - closeHour = closeHour + 12; - } - if ((closeHour == 12) && ("AM".equals(closeAMPM))) - { - closeHour = 0; - } resubmitCloseTime = TimeService.newTimeLocal(closeYear, closeMonth, closeDay, closeHour, closeMin, 0, 0); state.setAttribute(AssignmentSubmission.ALLOW_RESUBMIT_CLOSETIME, String.valueOf(resubmitCloseTime.getTime())); // no need to show alert if the resubmission setting has not changed @@ -10607,7 +10549,6 @@ state.setAttribute(ALLOW_RESUBMIT_CLOSEYEAR,state.getAttribute(NEW_ASSIGNMENT_DUEYEAR)); state.setAttribute(ALLOW_RESUBMIT_CLOSEHOUR,state.getAttribute(NEW_ASSIGNMENT_DUEHOUR)); state.setAttribute(ALLOW_RESUBMIT_CLOSEMIN,state.getAttribute(NEW_ASSIGNMENT_DUEMIN)); - state.setAttribute(ALLOW_RESUBMIT_CLOSEAMPM,state.getAttribute(NEW_ASSIGNMENT_DUEAMPM)); state.removeAttribute(AssignmentSubmission.ALLOW_RESUBMIT_CLOSETIME); state.removeAttribute(AssignmentSubmission.ALLOW_RESUBMIT_NUMBER); } @@ -10985,7 +10926,6 @@ state.setAttribute(NEW_ASSIGNMENT_VISIBLEYEAR, Integer.valueOf(year)); state.setAttribute(NEW_ASSIGNMENT_VISIBLEHOUR, Integer.valueOf(12)); state.setAttribute(NEW_ASSIGNMENT_VISIBLEMIN, Integer.valueOf(0)); - state.setAttribute(NEW_ASSIGNMENT_VISIBLEAMPM, "PM"); } // set the open time to be 12:00 PM @@ -10994,7 +10934,6 @@ state.setAttribute(NEW_ASSIGNMENT_OPENYEAR, Integer.valueOf(year)); state.setAttribute(NEW_ASSIGNMENT_OPENHOUR, Integer.valueOf(12)); state.setAttribute(NEW_ASSIGNMENT_OPENMIN, Integer.valueOf(0)); - state.setAttribute(NEW_ASSIGNMENT_OPENAMPM, "PM"); // set the all purpose item release time state.setAttribute(ALLPURPOSE_RELEASE_MONTH, Integer.valueOf(month)); @@ -11002,7 +10941,6 @@ state.setAttribute(ALLPURPOSE_RELEASE_YEAR, Integer.valueOf(year)); state.setAttribute(ALLPURPOSE_RELEASE_HOUR, Integer.valueOf(12)); state.setAttribute(ALLPURPOSE_RELEASE_MIN, Integer.valueOf(0)); - state.setAttribute(ALLPURPOSE_RELEASE_AMPM, "PM"); // due date is shifted forward by 7 days t.setTime(t.getTime() + 7 * 24 * 60 * 60 * 1000); @@ -11017,7 +10955,6 @@ state.setAttribute(NEW_ASSIGNMENT_DUEYEAR, Integer.valueOf(year)); state.setAttribute(NEW_ASSIGNMENT_DUEHOUR, Integer.valueOf(17)); state.setAttribute(NEW_ASSIGNMENT_DUEMIN, Integer.valueOf(0)); - state.setAttribute(NEW_ASSIGNMENT_DUEAMPM, "PM"); // set the resubmit time to be the same as due time state.setAttribute(ALLOW_RESUBMIT_CLOSEMONTH, Integer.valueOf(month)); @@ -11025,7 +10962,6 @@ state.setAttribute(ALLOW_RESUBMIT_CLOSEYEAR, Integer.valueOf(year)); state.setAttribute(ALLOW_RESUBMIT_CLOSEHOUR, Integer.valueOf(17)); state.setAttribute(ALLOW_RESUBMIT_CLOSEMIN, Integer.valueOf(0)); - state.setAttribute(ALLOW_RESUBMIT_CLOSEAMPM, "PM"); state.setAttribute(AssignmentSubmission.ALLOW_RESUBMIT_NUMBER, Integer.valueOf(1)); // enable the close date by default @@ -11036,7 +10972,6 @@ state.setAttribute(NEW_ASSIGNMENT_CLOSEYEAR, Integer.valueOf(year)); state.setAttribute(NEW_ASSIGNMENT_CLOSEHOUR, Integer.valueOf(17)); state.setAttribute(NEW_ASSIGNMENT_CLOSEMIN, Integer.valueOf(0)); - state.setAttribute(NEW_ASSIGNMENT_CLOSEAMPM, "PM"); // set the all purpose retract time state.setAttribute(ALLPURPOSE_RETRACT_MONTH, Integer.valueOf(month)); @@ -11044,7 +10979,6 @@ state.setAttribute(ALLPURPOSE_RETRACT_YEAR, Integer.valueOf(year)); state.setAttribute(ALLPURPOSE_RETRACT_HOUR, Integer.valueOf(17)); state.setAttribute(ALLPURPOSE_RETRACT_MIN, Integer.valueOf(0)); - state.setAttribute(ALLPURPOSE_RETRACT_AMPM, "PM"); // set the peer period time to be 10 mins after accept until date state.setAttribute(NEW_ASSIGNMENT_PEERPERIODMONTH, Integer.valueOf(month)); @@ -11052,7 +10986,6 @@ state.setAttribute(NEW_ASSIGNMENT_PEERPERIODYEAR, Integer.valueOf(year)); state.setAttribute(NEW_ASSIGNMENT_PEERPERIODHOUR, Integer.valueOf(17)); state.setAttribute(NEW_ASSIGNMENT_PEERPERIODMIN, Integer.valueOf(10)); - state.setAttribute(NEW_ASSIGNMENT_PEERPERIODAMPM, "PM"); state.setAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_ANON_EVAL, Boolean.TRUE.toString()); state.setAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_STUDENT_VIEW_REVIEWS, Boolean.TRUE.toString()); @@ -11123,28 +11056,24 @@ state.removeAttribute(NEW_ASSIGNMENT_OPENYEAR); state.removeAttribute(NEW_ASSIGNMENT_OPENHOUR); state.removeAttribute(NEW_ASSIGNMENT_OPENMIN); - state.removeAttribute(NEW_ASSIGNMENT_OPENAMPM); state.removeAttribute(ALLPURPOSE_RELEASE_MONTH); state.removeAttribute(ALLPURPOSE_RELEASE_DAY); state.removeAttribute(ALLPURPOSE_RELEASE_YEAR); state.removeAttribute(ALLPURPOSE_RELEASE_HOUR); state.removeAttribute(ALLPURPOSE_RELEASE_MIN); - state.removeAttribute(ALLPURPOSE_RELEASE_AMPM); state.removeAttribute(NEW_ASSIGNMENT_DUEMONTH); state.removeAttribute(NEW_ASSIGNMENT_DUEDAY); state.removeAttribute(NEW_ASSIGNMENT_DUEYEAR); state.removeAttribute(NEW_ASSIGNMENT_DUEHOUR); state.removeAttribute(NEW_ASSIGNMENT_DUEMIN); - state.removeAttribute(NEW_ASSIGNMENT_DUEAMPM); state.removeAttribute(NEW_ASSIGNMENT_VISIBLEMONTH); state.removeAttribute(NEW_ASSIGNMENT_VISIBLEDAY); state.removeAttribute(NEW_ASSIGNMENT_VISIBLEYEAR); state.removeAttribute(NEW_ASSIGNMENT_VISIBLEHOUR); state.removeAttribute(NEW_ASSIGNMENT_VISIBLEMIN); - state.removeAttribute(NEW_ASSIGNMENT_VISIBLEAMPM); state.removeAttribute(NEW_ASSIGNMENT_VISIBLETOGGLE); state.removeAttribute(NEW_ASSIGNMENT_ENABLECLOSEDATE); @@ -11153,7 +11082,6 @@ state.removeAttribute(NEW_ASSIGNMENT_CLOSEYEAR); state.removeAttribute(NEW_ASSIGNMENT_CLOSEHOUR); state.removeAttribute(NEW_ASSIGNMENT_CLOSEMIN); - state.removeAttribute(NEW_ASSIGNMENT_CLOSEAMPM); // set the all purpose retract time state.removeAttribute(ALLPURPOSE_RETRACT_MONTH); @@ -11161,7 +11089,6 @@ state.removeAttribute(ALLPURPOSE_RETRACT_YEAR); state.removeAttribute(ALLPURPOSE_RETRACT_HOUR); state.removeAttribute(ALLPURPOSE_RETRACT_MIN); - state.removeAttribute(ALLPURPOSE_RETRACT_AMPM); state.removeAttribute(NEW_ASSIGNMENT_SECTION); state.removeAttribute(NEW_ASSIGNMENT_SUBMISSION_TYPE); @@ -11219,7 +11146,6 @@ state.removeAttribute(NEW_ASSIGNMENT_PEERPERIODYEAR); state.removeAttribute(NEW_ASSIGNMENT_PEERPERIODHOUR); state.removeAttribute(NEW_ASSIGNMENT_PEERPERIODMIN); - state.removeAttribute(NEW_ASSIGNMENT_PEERPERIODAMPM); state.removeAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_ANON_EVAL); state.removeAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_STUDENT_VIEW_REVIEWS); state.removeAttribute(NEW_ASSIGNMENT_PEER_ASSESSMENT_NUM_REVIEWS); @@ -15146,7 +15072,7 @@ context.put("resubmitNumber", "-1".equals(allowResubmitNumber) ? rb.getString("allow.resubmit.number.unlimited"): allowResubmitNumber); // put allow resubmit time information into context - putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + putTimePropertiesInContext(context, state, "Resubmit", ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); // resubmit close time Time resubmitCloseTime = null; if (allowResubmitTimeString != null) @@ -15216,7 +15142,7 @@ if (allowResubmitTime != null) { // set up related state variables - putTimePropertiesInState(state, allowResubmitTime, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + putTimePropertiesInState(state, allowResubmitTime, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); } } @@ -15278,7 +15204,7 @@ if (state.getAttribute(ALLOW_RESUBMIT_CLOSEYEAR) != null) { // get resubmit time - Time closeTime = getTimeFromState(state, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN, ALLOW_RESUBMIT_CLOSEAMPM); + Time closeTime = getTimeFromState(state, ALLOW_RESUBMIT_CLOSEMONTH, ALLOW_RESUBMIT_CLOSEDAY, ALLOW_RESUBMIT_CLOSEYEAR, ALLOW_RESUBMIT_CLOSEHOUR, ALLOW_RESUBMIT_CLOSEMIN); pEdit.addProperty(AssignmentSubmission.ALLOW_RESUBMIT_CLOSETIME, String.valueOf(closeTime.getTime())); } else