inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Date Component issue identified in AWC-395

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-01-05 09:36:34 +00:00
parent 3f86a5ad94
commit 0ac5e88d9a
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java
View File

@@ -141,14 +141,18 @@ public class DatePickerRenderer extends BaseRenderer
} }
// get the attributes from the component we need for rendering // get the attributes from the component we need for rendering
int nStartYear = 1990; int nStartYear;
Integer startYear = (Integer)component.getAttributes().get("startYear"); Integer startYear = (Integer)component.getAttributes().get("startYear");
if (startYear != null) if (startYear != null)
{ {
nStartYear = startYear.intValue(); nStartYear = startYear.intValue();
} }
else
{
nStartYear = new Date().getYear() + 1900;
}
int nYearCount = 10; int nYearCount = 25;
Integer yearCount = (Integer)component.getAttributes().get("yearCount"); Integer yearCount = (Integer)component.getAttributes().get("yearCount");
if (yearCount != null) if (yearCount != null)
{ {
@@ -278,7 +282,7 @@ public class DatePickerRenderer extends BaseRenderer
private List getYears(int startYear, int yearCount) private List getYears(int startYear, int yearCount)
{ {
List<SelectItem> years = new ArrayList<SelectItem>(); List<SelectItem> years = new ArrayList<SelectItem>();
for (int i=startYear; i<startYear + yearCount; i++) for (int i=startYear; i>startYear - yearCount; i--)
{ {
Integer year = Integer.valueOf(i); Integer year = Integer.valueOf(i);
years.add(new SelectItem(year, year.toString())); years.add(new SelectItem(year, year.toString()));

8
source/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java
View File

@@ -55,8 +55,8 @@ public class InputDatePickerTag extends HtmlComponentTag
public void release() public void release()
{ {
super.release(); super.release();
this.startYear = "1990"; this.startYear = null;
this.yearCount = "10"; this.yearCount = null;
this.value = null; this.value = null;
this.showTime = null; this.showTime = null;
this.disabled = null; this.disabled = null;
@@ -127,8 +127,8 @@ public class InputDatePickerTag extends HtmlComponentTag
this.disabled = disabled; this.disabled = disabled;
} }
private String startYear = "1990"; private String startYear = null;
private String yearCount = "10"; private String yearCount = null;
private String value = null; private String value = null;
private String showTime = null; private String showTime = null;
private String disabled = null; private String disabled = null;

6
source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
View File

@@ -291,8 +291,7 @@ public class UISearchCustomProperties extends SelfRenderingComponent implements
UIInput inputFromDate = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_INPUT); UIInput inputFromDate = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_INPUT);
inputFromDate.setId(context.getViewRoot().createUniqueId()); inputFromDate.setId(context.getViewRoot().createUniqueId());
inputFromDate.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER); inputFromDate.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER);
inputFromDate.getAttributes().put("startYear", new Integer(1970)); inputFromDate.getAttributes().put("yearCount", new Integer(30));
inputFromDate.getAttributes().put("yearCount", new Integer(50));
inputFromDate.getAttributes().put("showTime", showTime); inputFromDate.getAttributes().put("showTime", showTime);
ValueBinding vbFromDate = facesApp.createValueBinding( ValueBinding vbFromDate = facesApp.createValueBinding(
"#{" + beanBinding + "[\"" + PREFIX_DATE_FROM + propDef.getName().toString() + "\"]}"); "#{" + beanBinding + "[\"" + PREFIX_DATE_FROM + propDef.getName().toString() + "\"]}");
@@ -310,8 +309,7 @@ public class UISearchCustomProperties extends SelfRenderingComponent implements
UIInput inputToDate = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_INPUT); UIInput inputToDate = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_INPUT);
inputToDate.setId(context.getViewRoot().createUniqueId()); inputToDate.setId(context.getViewRoot().createUniqueId());
inputToDate.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER); inputToDate.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER);
inputToDate.getAttributes().put("startYear", new Integer(1970)); inputToDate.getAttributes().put("yearCount", new Integer(30));
inputToDate.getAttributes().put("yearCount", new Integer(50));
inputToDate.getAttributes().put("showTime", showTime); inputToDate.getAttributes().put("showTime", showTime);
ValueBinding vbToDate = facesApp.createValueBinding( ValueBinding vbToDate = facesApp.createValueBinding(
"#{" + beanBinding + "[\"" + PREFIX_DATE_TO + propDef.getName().toString() + "\"]}"); "#{" + beanBinding + "[\"" + PREFIX_DATE_TO + propDef.getName().toString() + "\"]}");

8
source/web/jsp/dialog/advanced-search.jsp
View File

@@ -243,20 +243,20 @@
<td colspan=2><h:selectBooleanCheckbox value="#{AdvancedSearchBean.modifiedDateChecked}" id="chkModDate" /><span style="vertical-align:20%"><h:outputText value="#{msg.modified_date}" id="modDate" />:</span></td> <td colspan=2><h:selectBooleanCheckbox value="#{AdvancedSearchBean.modifiedDateChecked}" id="chkModDate" /><span style="vertical-align:20%"><h:outputText value="#{msg.modified_date}" id="modDate" />:</span></td>
</tr> </tr>
<tr> <tr>
<td style="padding-left:8px"><h:outputText value="#{msg.from}" id="modDateFrom" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.modifiedDateFrom}" startYear="1985" yearCount="21" id="dateModFrom" /></td> <td style="padding-left:8px"><h:outputText value="#{msg.from}" id="modDateFrom" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.modifiedDateFrom}" yearCount="30" id="dateModFrom" /></td>
</tr> </tr>
<tr> <tr>
<td style="padding-left:8px"><h:outputText value="#{msg.to}" id="modDateTo" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.modifiedDateTo}" startYear="1985" yearCount="21" id="dateModTo" /><td> <td style="padding-left:8px"><h:outputText value="#{msg.to}" id="modDateTo" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.modifiedDateTo}" yearCount="30" id="dateModTo" /><td>
</tr> </tr>
<tr> <tr>
<td colspan=2><h:selectBooleanCheckbox value="#{AdvancedSearchBean.createdDateChecked}" id="chkCreateDate" /><span style="vertical-align:20%"><h:outputText value="#{msg.created_date}" id="createDate" />:</span></td> <td colspan=2><h:selectBooleanCheckbox value="#{AdvancedSearchBean.createdDateChecked}" id="chkCreateDate" /><span style="vertical-align:20%"><h:outputText value="#{msg.created_date}" id="createDate" />:</span></td>
</tr> </tr>
<tr> <tr>
<td style="padding-left:8px"><h:outputText value="#{msg.from}" id="createDateFrom" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.createdDateFrom}" startYear="1985" yearCount="21" id="dateCreatedFrom" /></td> <td style="padding-left:8px"><h:outputText value="#{msg.from}" id="createDateFrom" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.createdDateFrom}" yearCount="30" id="dateCreatedFrom" /></td>
</tr> </tr>
<tr> <tr>
<td style="padding-left:8px"><h:outputText value="#{msg.to}" id="createDateTo" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.createdDateTo}" startYear="1985" yearCount="21" id="dateCreatedTo" /><td> <td style="padding-left:8px"><h:outputText value="#{msg.to}" id="createDateTo" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.createdDateTo}" yearCount="30" id="dateCreatedTo" /><td>
</tr> </tr>
</table> </table>
<div style="padding:4px"></div> <div style="padding:4px"></div>