Author: bpoussin Date: 2012-08-01 12:28:10 +0200 (Wed, 01 Aug 2012) New Revision: 210 Url: http://chorem.org/repositories/revision/chorem/210 Log: Anomalie #713: Unable to enter any date - change subtime (bad) with subtype (ggod as describe in wikitty tag/value api) - change date input type to text - try to enhance calendar with week number Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-01 10:28:10 UTC (rev 210) @@ -38,11 +38,11 @@ org.chorem.entities.Person.class.tagvalue.version=5.0 org.chorem.entities.Person.class.tagvalue.toString=%Person.lastName$s %Person.firstName|noname$s org.chorem.entities.Person.class.tagvalue.sortOrder=Person.lastName,Person.firstName -org.chorem.entities.Interval.class.tagvalue.version=6.0 +org.chorem.entities.Interval.class.tagvalue.version=7.0 org.chorem.entities.Interval.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF org.chorem.entities.Interval.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate -org.chorem.entities.Interval.attribute.beginDate.tagvalue.subtime=datetime -org.chorem.entities.Interval.attribute.endDate.tagvalue.subtime=datetime +org.chorem.entities.Interval.attribute.beginDate.tagvalue.subtype=datetime +org.chorem.entities.Interval.attribute.endDate.tagvalue.subtype=datetime org.chorem.entities.Company.class.tagvalue.version=5.0 org.chorem.entities.Company.class.tagvalue.toString=%Company.name|noname$s org.chorem.entities.Company.class.tagvalue.sortOrder=Company.name Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-08-01 10:28:10 UTC (rev 210) @@ -145,7 +145,11 @@ String pattern = field.getPattern(); value = DateFormatUtils.format(date, pattern); } else if (date != null) { - if ("datetime".equals(field.getTagValue("subtime"))) { + if ("month".equals(field.getTagValue("subtype"))) { + value = DateFormatUtils.format(date, "MM/yyyy"); + } else if ("time".equals(field.getTagValue("subtype"))) { + value = DateFormatUtils.format(date, "hh:mm"); + } else if ("datetime".equals(field.getTagValue("subtype"))) { value = DateFormatUtils.format(date, "dd/MM/yyyy hh:mm"); } else { value = DateFormatUtils.format(date, "dd/MM/yyyy"); Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-01 10:28:10 UTC (rev 210) @@ -170,13 +170,26 @@ throws JspException, IOException { Date date = wikitty.getFieldAsDate(extName, fieldName); String value = ""; - if (date != null) { - value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); - } - if ("datetime".equals(field.getTagValue("subtime"))) { + if ("month".equals(field.getTagValue("subtype"))) { + if (date != null) { + value = DateFormatUtils.format(date, "MM/yyyy"); + } /*{<input class="datetimepicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + } else if ("time".equals(field.getTagValue("subtype"))) { + if (date != null) { + value = DateFormatUtils.format(date, "HH:mm"); + } + /*{<input class="datetimepicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + } else if ("datetime".equals(field.getTagValue("subtype"))) { + if (date != null) { + value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); + } + /*{<input class="datetimepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else { - /*{<input class="datepicker" type="date" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + if (date != null) { + value = DateFormatUtils.format(date, "dd/MM/yyyy"); + } + /*{<input class="datepicker" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ } } Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-07-12 17:32:01 UTC (rev 209) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-08-01 10:28:10 UTC (rev 210) @@ -23,12 +23,24 @@ // tout ce qui aura la classe datepicker servira a editer une date $(function() { $( ".datepicker" ).datepicker($.datepicker.regional['fr']); - $( ".datepicker" ).datepicker( "option", "gotoCurrent", true ); + $( ".datepicker" ).datepicker({ + showWeek: true, + firstDay: 1, + changeMonth: true, + changeYear: true + }); +// "option", "gotoCurrent", true ); }); // tout ce qui aura la classe datetimepicker servira a editer une date avec heure $(function() { - $( ".datetimepicker" ).datetimepicker($.timepicker.regional['fr']); - $( ".datetimepicker" ).datetimepicker( "option", "gotoCurrent", true ); + $( ".datetimepicker" ).datetimepicker($.datepicker.regional['fr']); + $( ".datetimepicker" ).datetimepicker({ + showWeek: true, + firstDay: 1, + changeMonth: true, + changeYear: true + }); +// "option", "gotoCurrent", true ); }); // nouveau composant pour afficher les wikitties lors de l'edition classe par extension