August 2012 - Chorem-commits - mailman.cloud.codelutin.com

r212 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org Aug. 1, 2012

Aug. 1, 2012

Author: bpoussin Date: 2012-08-01 18:08:48 +0200 (Wed, 01 Aug 2012) New Revision: 212 Url: http://chorem.org/repositories/revision/chorem/212 Log: Anomalie #714: Unable to see an invoice Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-01 10:34:21 UTC (rev 211) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-01 16:08:48 UTC (rev 212) @@ -45,7 +45,7 @@ <tbody> <tr> <td><a href="<c:url value="/wikitty/view/${q.target}"/>">${q.getTarget()}</a></td> - <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.reference}</a></td> + <td><a href="<c:url value="/wikitty/Invoice/view/${q.wikittyId}"/>">${q.reference}</a></td> <td>${q.description}</td> <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> <td><a href="<c:url value="/wikitty/Employee/view/${q.supplier}"/>">${q.getSupplier(false)}</a></td>

1 0

r211 - in trunk/chorem-webmotion/src/main: java/org/wikitty/web/jsptag webapp/js
by bpoussin＠users.chorem.org Aug. 1, 2012

Aug. 1, 2012

Author: bpoussin Date: 2012-08-01 12:34:21 +0200 (Wed, 01 Aug 2012) New Revision: 211 Url: http://chorem.org/repositories/revision/chorem/211 Log: essai de support de timepicker (sans date) Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/chorem-webmotion/src/main/webapp/js/chorem.js 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-08-01 10:28:10 UTC (rev 210) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-01 10:34:21 UTC (rev 211) @@ -174,12 +174,12 @@ if (date != null) { value = DateFormatUtils.format(date, "MM/yyyy"); } - /*{<input class="datetimepicker" type="date" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="monthpicker" 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()%>/>}*/ + /*{<input class="timepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else if ("datetime".equals(field.getTagValue("subtype"))) { if (date != null) { value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-08-01 10:28:10 UTC (rev 210) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2012-08-01 10:34:21 UTC (rev 211) @@ -33,7 +33,7 @@ }); // tout ce qui aura la classe datetimepicker servira a editer une date avec heure $(function() { - $( ".datetimepicker" ).datetimepicker($.datepicker.regional['fr']); + $( ".datetimepicker" ).datetimepicker($.datetimepicker.regional['fr']); $( ".datetimepicker" ).datetimepicker({ showWeek: true, firstDay: 1, @@ -42,6 +42,16 @@ }); // "option", "gotoCurrent", true ); }); +$(function() { + $( ".timepicker" ).timepicker($.timepicker.regional['fr']); + $( ".timepicker" ).timepicker({ + showWeek: true, + firstDay: 1, + changeMonth: true, + changeYear: true + }); +// "option", "gotoCurrent", true ); +}); // nouveau composant pour afficher les wikitties lors de l'edition classe par extension $.widget( "custom.autocompleteByExtension", $.ui.autocomplete, {

1 0

r210 - in trunk: chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/wikitty/web/jsptag chorem-webmotion/src/main/webapp/js
by bpoussin＠users.chorem.org Aug. 1, 2012

Aug. 1, 2012

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

1 0