Author: tchemit Date: 2012-01-26 19:22:55 +0100 (Thu, 26 Jan 2012) New Revision: 298 Url: http://forge.codelutin.com/repositories/revision/echobase/298 Log: fix validation for import data configuration screens Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp trunk/echobase-ui/src/main/webapp/js/gridHelper.js 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 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-26 18:22:55 UTC (rev 298) @@ -66,6 +66,7 @@ echobase.error.import.areaOfOperation.required=La sélection d'une zone d'opération est obligatoire echobase.error.import.associationFile.required=La sélection d'un fichier Association est obligatoire echobase.error.import.datum.required=Datum de la campagne non rengeigné +echobase.error.import.digitThreshold.required=digitThreshold non renseigné echobase.error.import.echosounderSoundSpeed.required=echosounderSoundSpeed non renseigné echobase.error.import.echotypeFile.required=La sélection d'un fichier Echotype est obligatoire echobase.error.import.importMode.required=Le mode d'import est obligatoire Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-01-26 18:22:55 UTC (rev 298) @@ -37,28 +37,60 @@ jQuery(document).ready(function () { + var voyageSelectBox = $('[name="model.voyageId"]'); var transitSelectBox = $('[name="model.transitId"]'); var vesselSelectBox = $('[name="model.vesselId"]'); - $('[name="model.voyageId"]').change({transitSelectBox:transitSelectBox, - vesselSelectBox:vesselSelectBox}, function (event) { + voyageSelectBox.change({transitSelectBox:transitSelectBox, + vesselSelectBox:vesselSelectBox}, function (event) { $.updateSelectBoxContent('${getTransitsUrl}', {voyageId:this.value}, 'transits', event.data.transitSelectBox - ); + ); event.data.vesselSelectBox.html(""); }); + transitSelectBox.change({vesselSelectBox:vesselSelectBox}, function (event) { - $('[name="model.transitId"]').change({vesselSelectBox:vesselSelectBox}, function (event) { - $.updateSelectBoxContent('${getVesselsUrl}', {transitId:this.value}, 'vessels', event.data.vesselSelectBox); }); + + var voyageId = "${model.voyageId}"; + + if (voyageId) { + + console.info("reload voyageId " + voyageId); + voyageSelectBox.change(voyageId); + $.updateSelectBoxContent('${getTransitsUrl}', + {voyageId:voyageId}, + 'transits', + transitSelectBox, + function() { + + var transitId = "${model.transitId}"; + if (transitId) { + + transitSelectBox.val(transitId); + $.updateSelectBoxContent('${getVesselsUrl}', + {transitId:transitId}, + 'vessels', + vesselSelectBox, function() { + + var vesselId = "${model.vesselId}"; + if (vesselId) { + vesselSelectBox.val(vesselId); + } + }); + } + } + ); + } + }); </script> @@ -69,7 +101,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:select key="model.voyageId" value="''" required="true" + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp 2012-01-26 18:22:55 UTC (rev 298) @@ -41,11 +41,11 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:select key="model.voyageId" value="''" required="true" + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:select key="model.vesselId" value="''" required="true" + <s:select key="model.vesselId" required="true" label='%{getText("echobase.common.vessel")}' list="vessels" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-01-26 18:22:55 UTC (rev 298) @@ -41,7 +41,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:select key="model.voyageId" value="''" required="true" + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp 2012-01-26 18:22:55 UTC (rev 298) @@ -42,7 +42,7 @@ name="echobase.legend.importData.configure"/> </legend> - <s:select key="model.voyageId" value="''" required="true" + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp 2012-01-26 18:22:55 UTC (rev 298) @@ -59,7 +59,7 @@ required="true"/> <div id='USE_EXISTING_MISSION' class='importMode'> - <s:select key="model.missionId" value="''" required="true" + <s:select key="model.missionId" required="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> </div> @@ -119,11 +119,11 @@ </div> </fieldset> <br/> - <s:select key="model.areaOfOperationId" value="''" required="true" + <s:select key="model.areaOfOperationId" required="true" label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:select key="model.vesselId" value="''" required="true" + <s:select key="model.vesselId" required="true" label='%{getText("echobase.common.vessel")}' list="vessels" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp 2012-01-26 18:22:55 UTC (rev 298) @@ -42,11 +42,11 @@ name="echobase.legend.importData.configure"/> </legend> - <s:select key="model.voyageId" value="''" required="true" + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:select key="model.vesselId" value="''" required="true" + <s:select key="model.vesselId" required="true" label='%{getText("echobase.common.vessel")}' list="vessels" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2012-01-26 16:33:38 UTC (rev 297) +++ trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2012-01-26 18:22:55 UTC (rev 298) @@ -134,7 +134,7 @@ return result; }, - updateSelectBoxContent:function (url, params, jsonTarget, target) { + updateSelectBoxContent:function (url, params, jsonTarget, target, callback) { // call url to obtain datas to injetc in target select box jQuery.getJSON(url, params, function (result) { @@ -149,6 +149,11 @@ // change the target html code target.html(html); + + // calback + if (callback) { + callback(); + } }); } }); @@ -179,8 +184,8 @@ prepareUrl:function (url, params) { return $(document).prepareUrl(url, params); }, - updateSelectBoxContent:function (url, params, jsonTarget, target) { - return $(document).updateSelectBoxContent(url, params, jsonTarget, target); + updateSelectBoxContent:function (url, params, jsonTarget, target, callback) { + return $(document).updateSelectBoxContent(url, params, jsonTarget, target, callback); } }); })(jQuery);