--- tool/src/java/org/sakaiproject/evaluation/tool/locators/DateResolver.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/locators/DateResolver.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -16,6 +16,8 @@ import java.text.DateFormat; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; + import uk.org.ponder.beanutil.BeanLocator; import uk.org.ponder.beanutil.BeanResolver; import uk.org.ponder.localeutil.LocaleGetter; @@ -32,16 +34,20 @@ public void setLocaleGetter(LocaleGetter localeGetter) { this.localeGetter = localeGetter; } - + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + public Object locateBean(final String name) { return new BeanResolver () { public String resolveBean(Object date) { DateFormat df = null; if (name.equals("time")) { - df = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT, localeGetter.get()); + df = DateFormat.getDateTimeInstance(dateFormatUtilBean.getDateStyle(DateFormat.LONG), dateFormatUtilBean.getTimeStyle(DateFormat.SHORT), localeGetter.get()); } else { - df = DateFormat.getDateInstance(DateFormat.LONG, localeGetter.get()); + df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.LONG), localeGetter.get()); } return df.format(date); } --- tool/src/java/org/sakaiproject/evaluation/tool/DateFormatUtilBean.java (.../vendor/contrib/evaluation/current) (revision 0) +++ tool/src/java/org/sakaiproject/evaluation/tool/DateFormatUtilBean.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -0,0 +1,66 @@ +package org.sakaiproject.evaluation.tool; + +import java.text.DateFormat; + +import org.sakaiproject.component.api.ServerConfigurationService; + +/** + * Utility class that fetches desired date and time style from sakai.properties. + * @author Erik Andersson + * + */ +public final class DateFormatUtilBean { + + private ServerConfigurationService serverConf; + public void setServerConf(ServerConfigurationService serverConf) { + this.serverConf = serverConf; + } + + /** + * Get the date style. + * @param defaultStyle style to use if style not found in properties + * @return style from properties if found, else defaultStyle + */ + public int getDateStyle(int defaultStyle){ + if(serverConf == null){ + return defaultStyle; + } + String strFormat = serverConf.getString("evaluation.dateStyle"); + if("short".equalsIgnoreCase(strFormat)){ + return DateFormat.SHORT; + }else if("medium".equalsIgnoreCase(strFormat)){ + return DateFormat.MEDIUM; + }else if("long".equalsIgnoreCase(strFormat)){ + return DateFormat.LONG; + }else if("full".equalsIgnoreCase(strFormat)){ + return DateFormat.FULL; + }else{ + return defaultStyle; + } + } + + /** + * Get the time style. + * @param defaultStyle style to use if style not found in properties + * @return style from properties if found, else defaultStyle + */ + + public int getTimeStyle(int defaultStyle){ + if(serverConf == null){ + return defaultStyle; + } + String strFormat = serverConf.getString("evaluation.timeStyle"); + if("short".equalsIgnoreCase(strFormat)){ + return DateFormat.SHORT; + }else if("medium".equalsIgnoreCase(strFormat)){ + return DateFormat.MEDIUM; + }else if("long".equalsIgnoreCase(strFormat)){ + return DateFormat.LONG; + }else if("full".equalsIgnoreCase(strFormat)){ + return DateFormat.FULL; + }else{ + return defaultStyle; + } + } +} + --- tool/src/java/org/sakaiproject/evaluation/tool/producers/ControlEvaluationsProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/ControlEvaluationsProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -30,6 +30,7 @@ import org.sakaiproject.evaluation.logic.entity.EvalCategoryEntityProvider; import org.sakaiproject.evaluation.model.EvalAssignGroup; import org.sakaiproject.evaluation.model.EvalEvaluation; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; import org.sakaiproject.evaluation.tool.viewparams.ReportParameters; @@ -105,8 +106,12 @@ public void setNavBarRenderer(NavBarRenderer navBarRenderer) { this.navBarRenderer = navBarRenderer; } + + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } - /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) */ @@ -117,7 +122,7 @@ boolean reopeningAllowed = (Boolean) settings.get(EvalSettings.ENABLE_EVAL_REOPEN); // use a date which is related to the current users locale - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); // page title UIMessage.make(tofill, "page-title", "controlevaluations.page.title"); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/TakeEvalProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/TakeEvalProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -45,6 +45,7 @@ import org.sakaiproject.evaluation.model.EvalEvaluation; import org.sakaiproject.evaluation.model.EvalResponse; import org.sakaiproject.evaluation.model.EvalTemplateItem; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.LocalResponsesLogic; import org.sakaiproject.evaluation.tool.locators.ResponseAnswersBeanLocator; import org.sakaiproject.evaluation.tool.renderers.ItemRenderer; @@ -163,6 +164,11 @@ this.httpServletResponse = httpServletResponse; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + Long responseId; int displayNumber=1; @@ -193,7 +199,7 @@ String currentUserId = commonLogic.getCurrentUserId(); // use a date which is related to the current users locale - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); UIMessage.make(tofill, "page-title", "takeeval.page.title"); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/ControlTemplatesProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/ControlTemplatesProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -22,6 +22,7 @@ import org.sakaiproject.evaluation.logic.EvalCommonLogic; import org.sakaiproject.evaluation.logic.model.EvalUser; import org.sakaiproject.evaluation.model.EvalTemplate; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; import org.sakaiproject.evaluation.tool.viewparams.TemplateViewParameters; @@ -76,13 +77,19 @@ public void setNavBarRenderer(NavBarRenderer navBarRenderer) { this.navBarRenderer = navBarRenderer; } + + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) */ public void fillComponents(UIContainer tofill, ViewParameters viewparams, ComponentChecker checker) { // use a date which is related to the current users locale - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); // local variables used in the render logic String currentUserId = commonLogic.getCurrentUserId(); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationNotificationsProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationNotificationsProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -21,6 +21,7 @@ import org.sakaiproject.evaluation.logic.EvalEvaluationService; import org.sakaiproject.evaluation.logic.model.EvalGroup; import org.sakaiproject.evaluation.model.EvalEvaluation; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.EvalToolConstants; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; @@ -74,13 +75,18 @@ this.navBarRenderer = navBarRenderer; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) */ public void fillComponents(UIContainer tofill, ViewParameters viewparams, ComponentChecker checker) { // local variables used in the render logic - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat dateFormat = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); // top links here navBarRenderer.makeNavBar(tofill, NavBarRenderer.NAV_ELEMENT, this.getViewID()); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/RemoveEvalProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/RemoveEvalProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -23,6 +23,7 @@ import org.sakaiproject.evaluation.logic.EvalEvaluationService; import org.sakaiproject.evaluation.logic.model.EvalGroup; import org.sakaiproject.evaluation.model.EvalEvaluation; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; import uk.org.ponder.rsf.components.UICommand; @@ -63,6 +64,11 @@ this.locale = locale; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) */ @@ -104,7 +110,7 @@ UIMessage.make(tofill, "evalAssigned", "removeeval.assigned.none"); } - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); UIOutput.make(tofill, "evalStartDate", df.format(eval.getStartDate())); UIOutput.make(tofill, "evalDueDate", df.format(eval.getDueDate())); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/AdministrateSearchProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/AdministrateSearchProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -35,6 +35,7 @@ import org.sakaiproject.evaluation.logic.EvalSettings; import org.sakaiproject.evaluation.model.EvalAssignGroup; import org.sakaiproject.evaluation.model.EvalEvaluation; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.AdminSearchViewParameters; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; @@ -103,6 +104,11 @@ this.locale = locale; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + private NavBarRenderer navBarRenderer; public void setNavBarRenderer(NavBarRenderer navBarRenderer) { this.navBarRenderer = navBarRenderer; @@ -125,7 +131,7 @@ String currentUserId = commonLogic.getCurrentUserId(); boolean userAdmin = commonLogic.isUserAdmin(currentUserId); //DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM)); //NumberFormat nf = NumberFormat.getInstance(locale); NumberFormat nf = NumberFormat.getInstance(); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationRespondersProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationRespondersProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -32,6 +32,7 @@ import org.sakaiproject.evaluation.model.EvalAssignUser; import org.sakaiproject.evaluation.model.EvalEvaluation; import org.sakaiproject.evaluation.model.EvalResponse; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; @@ -85,13 +86,18 @@ this.navBarRenderer = navBarRenderer; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) */ public void fillComponents(UIContainer tofill, ViewParameters viewparams, ComponentChecker checker) { // local variables used in the render logic - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat dateFormat = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); // top links here navBarRenderer.makeNavBar(tofill, NavBarRenderer.NAV_ELEMENT, this.getViewID()); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationSettingsProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationSettingsProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -30,6 +30,7 @@ import org.sakaiproject.evaluation.logic.model.EvalUser; import org.sakaiproject.evaluation.model.EvalEvaluation; import org.sakaiproject.evaluation.model.EvalTemplate; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.EvalToolConstants; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.utils.RSFUtils; @@ -127,6 +128,11 @@ this.navBarRenderer = navBarRenderer; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) */ @@ -150,7 +156,7 @@ String currentUserId = commonLogic.getCurrentUserId(); boolean userAdmin = commonLogic.isUserAdmin(currentUserId); - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG, locale); + DateFormat dateFormat = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); DateFormat timeFormat = DateFormat.getTimeInstance(DateFormat.SHORT, locale); /* --- tool/src/java/org/sakaiproject/evaluation/tool/producers/SummaryProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/SummaryProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -34,6 +34,7 @@ import org.sakaiproject.evaluation.model.EvalAssignGroup; import org.sakaiproject.evaluation.model.EvalEvaluation; import org.sakaiproject.evaluation.model.EvalResponse; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; import org.sakaiproject.evaluation.tool.viewparams.ReportParameters; @@ -121,6 +122,11 @@ this.navBarRenderer = navBarRenderer; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + /* * (non-Javadoc) * @@ -138,7 +144,7 @@ boolean createTemplate = authoringService.canCreateTemplate(currentUserId); boolean beginEvaluation = evaluationService.canBeginEvaluation(currentUserId); - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); navBarRenderer.makeNavBar(tofill, NavBarRenderer.NAV_ELEMENT, this.getViewID()); @@ -477,7 +483,7 @@ EvalEvaluation eval, String evalState, String evalDateLabel, String evalDateItem, String evalStatusItem) { // use a date which is related to the current users locale - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); if (EvalConstants.EVALUATION_STATE_INQUEUE.equals(evalState)) { // If we are in the queue we are yet to start, // so say when we will --- tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationAssignProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationAssignProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -39,6 +39,7 @@ import org.sakaiproject.evaluation.model.EvalAssignGroup; import org.sakaiproject.evaluation.model.EvalAssignUser; import org.sakaiproject.evaluation.model.EvalEvaluation; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.renderers.HierarchyTreeNodeSelectRenderer; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.AdhocGroupParams; @@ -137,12 +138,18 @@ public void setNavBarRenderer(NavBarRenderer navBarRenderer) { this.navBarRenderer = navBarRenderer; } + + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } + public void fillComponents(UIContainer tofill, ViewParameters viewparams, ComponentChecker checker) { // local variables used in the render logic String currentUserId = commonLogic.getCurrentUserId(); - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); - DateFormat dtf = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); + DateFormat dtf = DateFormat.getDateTimeInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), dateFormatUtilBean.getTimeStyle(DateFormat.SHORT), locale); navBarRenderer.makeNavBar(tofill, NavBarRenderer.NAV_ELEMENT, this.getViewID()); --- tool/src/java/org/sakaiproject/evaluation/tool/producers/ShowEvalCategoryProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/ShowEvalCategoryProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -24,6 +24,7 @@ import org.sakaiproject.evaluation.logic.EvalEvaluationSetupService; import org.sakaiproject.evaluation.logic.model.EvalGroup; import org.sakaiproject.evaluation.model.EvalEvaluation; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.viewparams.EvalCategoryViewParameters; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; @@ -68,6 +69,10 @@ this.locale = locale; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) @@ -75,7 +80,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, ComponentChecker checker) { // use a date which is related to the current users locale - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); EvalCategoryViewParameters ecvp = (EvalCategoryViewParameters) viewparams; String evalCategory = ecvp.evalCategory; --- tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationAssignConfirmProducer.java (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/java/org/sakaiproject/evaluation/tool/producers/EvaluationAssignConfirmProducer.java (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -31,6 +31,7 @@ import org.sakaiproject.evaluation.model.EvalAssignGroup; import org.sakaiproject.evaluation.model.EvalAssignUser; import org.sakaiproject.evaluation.model.EvalEvaluation; +import org.sakaiproject.evaluation.tool.DateFormatUtilBean; import org.sakaiproject.evaluation.tool.renderers.NavBarRenderer; import org.sakaiproject.evaluation.tool.viewparams.EvalViewParameters; import org.sakaiproject.evaluation.utils.EvalUtils; @@ -94,6 +95,10 @@ this.navBarRenderer = navBarRenderer; } + private DateFormatUtilBean dateFormatUtilBean; + public void setDateFormatUtilBean(DateFormatUtilBean dateFormatUtilBean){ + this.dateFormatUtilBean = dateFormatUtilBean; + } /* (non-Javadoc) * @see uk.org.ponder.rsf.view.ComponentProducer#fillComponents(uk.org.ponder.rsf.components.UIContainer, uk.org.ponder.rsf.viewstate.ViewParameters, uk.org.ponder.rsf.view.ComponentChecker) @@ -116,8 +121,8 @@ } Long evaluationId = evalViewParams.evaluationId; - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); - DateFormat dtf = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, locale); + DateFormat df = DateFormat.getDateInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), locale); + DateFormat dtf = DateFormat.getDateTimeInstance(dateFormatUtilBean.getDateStyle(DateFormat.MEDIUM), dateFormatUtilBean.getTimeStyle(DateFormat.SHORT), locale); /* * top links here --- tool/src/webapp/WEB-INF/applicationContext.xml (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/webapp/WEB-INF/applicationContext.xml (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -321,9 +321,14 @@ --> + + + + + --- tool/src/webapp/WEB-INF/requestContext.xml (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/src/webapp/WEB-INF/requestContext.xml (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -51,6 +51,10 @@ ref="org.sakaiproject.evaluation.logic.EvalSettings" /> + + + + - + + + @@ -352,7 +360,9 @@ - + + @@ -512,7 +522,9 @@ - + + @@ -535,7 +547,9 @@ - + + @@ -551,7 +565,9 @@ - + + @@ -581,7 +597,9 @@ - + + + @@ -608,7 +628,9 @@ - + + @@ -619,7 +641,9 @@ - + + @@ -664,6 +688,8 @@ + @@ -680,7 +706,7 @@ - + @@ -689,6 +715,8 @@ + --- tool/pom.xml (.../vendor/contrib/evaluation/current) (revision 2115) +++ tool/pom.xml (.../branches/release_2.8/src/contrib/evaluation) (revision 2115) @@ -142,6 +142,11 @@ entitybroker-utils + + org.sakaiproject.kernel + sakai-component-manager + + javax.servlet @@ -240,6 +245,7 @@ 4.5 test +