Author: sletellier Date: 2011-11-22 10:46:56 +0100 (Tue, 22 Nov 2011) New Revision: 105 Url: http://forge.codelutin.com/repositories/revision/echobase/105 Log: Fix time edition Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-21 16:12:09 UTC (rev 104) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-22 09:46:56 UTC (rev 105) @@ -1,6 +1,5 @@ echobase.action.applySqlQuery=Appliquer la requête echobase.action.backToUserList=Retour à la liste des utilisateurs -echobase.action.reset=Annuler echobase.action.cloneSqlQuery=Cloner la requête echobase.action.create=Créer echobase.action.createEmbeddedApplication=Créer l'application @@ -15,6 +14,7 @@ echobase.action.login=Connection echobase.action.logout=Déconnexion echobase.action.reloadSqlQuery=Recharger +echobase.action.reset=Annuler echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Enregistrer la requête Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-21 16:12:09 UTC (rev 104) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-22 09:46:56 UTC (rev 105) @@ -146,27 +146,39 @@ function updateDate(value, editor) { // parse date formated like : dd/MM/yyyy HH:mm:ss + var date = parseDate(value); + + // get timePicker instance + var inst = $.datepicker._getInst(editor[0]); + + // set date + $.datepicker._setDate(inst, date); + + // set time + $.datepicker._setTime(inst, date); + } + + function parseDate(value) { + + // parse date formated like : dd/MM/yyyy HH:mm:ss var dateString = value.substring(0, 10); var dateSplited = dateString.split("/"); var hourString = value.substring(11, 19); var hourSplited = hourString.split(":"); - var options_timepicker = {}; - options_timepicker.day = dateSplited[0]; - options_timepicker.month = dateSplited[1]; - options_timepicker.year = dateSplited[2]; - options_timepicker.hour = hourSplited[0]; - options_timepicker.minute = hourSplited[1]; - options_timepicker.second = hourSplited[2]; - options_timepicker.showOn = "both"; - options_timepicker.buttonImage = "/echobase/struts/js/calendar.gif"; - options_timepicker.timepicker = true; - options_timepicker.jqueryaction = "datepicker"; - options_timepicker.id = editor.id; - options_timepicker.name = editor.id; + var day = parseInt(dateSplited[0]); - jQuery.struts2_jquery.bind(editor, options_timepicker); + // FIXME sletellier 20111122 : currently, one month more are displayed.... + var month = parseInt(dateSplited[1]) - 1; + var year = parseInt(dateSplited[2]); + var hour = parseInt(hourSplited[0]); + var minute = parseInt(hourSplited[1]); + var second = parseInt(hourSplited[2]); + + // update date + // TODO sletellier 20111122 : edit milliseconds ? + return new Date(year, month, day, hour, minute, second, 0); } </script> @@ -307,6 +319,8 @@ <sj:datepicker id="%{#meta.name}" name="%{#meta.name}" label="%{getText(#meta.i18nKey)}" + value="%{new java.util.Date()}" + displayFormat="dd/mm/yy" timepicker="true" timepickerShowSecond="true" timepickerFormat="hh:mm:ss"/>