Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 8b5f3826 by Tony CHEMIT at 2018-03-10T18:44:25Z Update struts (namespace io) (still some pb on output, but who cares? - - - - - 13 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl - t3-web/src/main/resources/struts.xml - t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp - t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java @@ -75,10 +75,10 @@ public class AnalyzeInputSourceConfiguration implements InputSourceConfiguration result.setInputProvider(inputProvider); result.setUseWells(useWells); result.setTripType(TripType.getTripType(useSamplesOnly, canCreateVirtualActivity)); - result.setCanCreateVessel(canCreateVessel); - result.setCreateVirtualVessel(createVirtualVessel); result.setCanCreateVirtualActivity(canCreateVirtualActivity); result.setUseSamplesOnly(useSamplesOnly); + result.setCanCreateVessel(canCreateVessel); + result.setCreateVirtualVessel(createVirtualVessel); return result; } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java @@ -73,6 +73,9 @@ public class ImportInputSourceConfiguration implements InputSourceConfiguration result.setTripType(analyzeConfiguration.getTripType()); result.setCanCreateVessel(analyzeConfiguration.isCanCreateVessel()); result.setCreateVirtualVessel(analyzeConfiguration.isCanCreateVessel()); + result.setTripType(analyzeConfiguration.getTripType()); + result.setCanCreateVirtualActivity(analyzeConfiguration.isCanCreateVirtualActivity()); + result.setUseSamplesOnly(analyzeConfiguration.isUseSamplesOnly()); return result; } ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl @@ -23,7 +23,11 @@ Pilote d'acquisition de données : ${configuration.inputProvider.label} Source de données : ${configuration.inputFile.name} Utilisation des plans de cuves : ${configuration.useWells?string} -Type de marées : ${configuration.tripType.label} +<#if configuration.useSamplesOnly> +Base échantillon seulement +<#else> +Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string} +</#if> Autoriser à créer des bateaux : ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Créer des bateaux virtuels : ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl @@ -23,7 +23,11 @@ Input Pilot: ${configuration.inputProvider.label} Input file: ${configuration.inputFile.name} Use wells: ${configuration.useWells?string} -Trip type: ${configuration.tripType.label} +<#if configuration.useSamplesOnly> +Database 'Samples only' +<#else> +Authorize to create virtual activities: ${configuration.canCreateVirtualActivity?string} +</#if> Authorise to create vessels: ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Create virtual vessels: ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl @@ -23,7 +23,12 @@ Pilote d'acquisition de données : ${configuration.inputProvider.label} Source de données : ${configuration.inputFile.name} Utilisation des plans de cuves : ${configuration.useWells?string} -Type de marées : ${configuration.tripType.label} +<#--Type de marées : ${configuration.tripType.label}--> +<#if configuration.useSamplesOnly> +Base échantillon seulement +<#else> +Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string} +</#if> Autoriser à créer des bateaux : ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Créer des bateaux virtuels : ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl @@ -23,7 +23,12 @@ Input Pilot: ${configuration.inputProvider.label} Input file: ${configuration.inputFile.name} Use wells: ${configuration.useWells?string} -Trip type: ${configuration.tripType.label} +<#if configuration.useSamplesOnly> +Database 'Samples only' +<#else> +Authorize to create virtual activities: ${configuration.canCreateVirtualActivity?string} +</#if> + Authorise to create vessels: ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Create virtual vessels: ${configuration.createVirtualVessel?string} ===================================== t3-web/src/main/resources/struts.xml ===================================== --- a/t3-web/src/main/resources/struts.xml +++ b/t3-web/src/main/resources/struts.xml @@ -32,10 +32,11 @@ <constant name="struts.xworkTextProvider" value="i18nTextProvider"/> <constant name="struts.ognl.allowStaticMethodAccess" value="true"/> + <constant name="struts.enable.DynamicMethodInvocation" value="true"/> <constant name="struts.action.extension" value=",,"/> <constant name="struts.locale" value="fr_FR"/> <constant name="struts.i18n.reload" value="false"/> - <constant name="struts.configuration.xml.reload" value="false"/> + <constant name="struts.configuration.xml.reload" value="true"/> <!--suppress Struts2ModelInspection --> <constant name="struts.ui.theme" value="css_xhtml"/> <constant name="struts.multipart.maxSize" value="314572800"/> @@ -64,7 +65,7 @@ <!-- to check if user is loggued --> <interceptor name="checkUserLoggued" class="fr.ird.t3.web.interceptors.CheckLogguedInterceptor"> - <param name="loginAction">user/loginEnter</param> + <param name="loginAction">user/login!input</param> <param name="redirectAction">/home</param> </interceptor> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp @@ -38,7 +38,7 @@ </s:text> </p> - <s:form method="post" validate="true" namespace="/io"> + <s:form method="post" validate="true" namespace="/io" action="prepareImportData"> <s:if test="needReplace"> <strong> <s:text name="t3.label.message.trips.to.replace"> @@ -49,7 +49,7 @@ </strong> <s:checkbox name="replaceTrip" key="t3.question.confirm.to.replace.trip" value="%{false}"/> </s:if> - <s:submit action="prepareImportData" key="t3.action.importData.doImport" align="right"/> + <s:submit key="t3.action.importData.doImport" align="right"/> </s:form> </s:if> <s:else> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp @@ -59,14 +59,14 @@ <title><s:text name="t3.label.data.configureImportData"/></title> <h2><s:text name="t3.label.data.configureImportData"/></h2> -<s:form method="post" validate="true" enctype="multipart/form-data" namespace="/io"> +<s:form method="post" validate="true" enctype="multipart/form-data" namespace="/io" action="configureImportData"> <s:hidden key="treatmentDirectoryPath" label=''/> <s:select key="inputProviderId" list="inputProviders" label='%{getText("t3.common.inputProvider")}' listKey="id" listValue="label" requiredLabel="true"/> <s:if test="loadedSource==null"> <s:hidden name="useWells" value="%{useWells}"/> <s:file name="sourceToLoad" requiredLabel="true" label='%{getText("t3.common.sourceToUpload")} (*)'/> - <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/> + <s:submit method="doAddSource" key="t3.action.importData.addSource" align="right"/> <br/> <div class="cleanBoth"> @@ -84,8 +84,8 @@ <s:checkbox key="canCreateVirtualActivity" label='%{getText("t3.common.canCreateVirtualActivity")}'/> <s:checkbox key="canCreateVessel" label='%{getText("t3.common.canCreateVessel")}'/> <s:checkbox key="createVirtualVessel" label='%{getText("t3.common.createVirtualVessel")}'/> - <s:submit action="configureImportData!doDeleteSource" key="t3.action.importData.deleteSource" align="right"/> - <s:submit action="configureImportData!doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/> + <s:submit method="doDeleteSource" key="t3.action.importData.deleteSource" align="right"/> + <s:submit method="doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/> </s:else> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp @@ -23,10 +23,7 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <title><s:text name="t3.label.data.importData"/></title> - -<h2><s:text name="t3.label.data.importData"/> - <s:text - name="t3.label.result"/></h2> - +<h2><s:text name="t3.label.data.importData"/> - <s:text name="t3.label.result"/></h2> <jsp:include page="importDataConfigResume.jsp"/> <s:if test="nbImportedTrips == 0"> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp @@ -28,8 +28,7 @@ <s:url id="loadUrl" action='getUserOuputDatabase' namespace='/json'/> -<script type="text/javascript" charset="UTF-8" - src="<s:url value='/js/monthpicker.js' />"></script> +<script type="text/javascript" charset="UTF-8" src="<s:url value='/js/monthpicker.js' />"></script> <style type="text/css"> .ui-datepicker-calendar { display: none; @@ -40,40 +39,41 @@ } </style> <script type="text/javascript"> - jQuery(document).ready(function () { - jQuery.struts2_jquery.myBindingOptions = { - datatype : "json", - type : 'checkbox', - name : "operationIds", - list : "operations", - buttonset : false, - jqueryaction : "buttonset", - reloadtopics : "reloadList", - id:$('input[name$="operationIds"]')[0].parentNode.id - }; - $('[name="configuration.outputProviderId"]').change(function(event) { - var myOptions = jQuery.struts2_jquery.myBindingOptions; - myOptions.href = "<s:url action='getOutputProviderOperations' namespace='/json'><s:param name='outputProviderId'/></s:url>" + this.value; - var myDiv = $(jQuery.struts2_jquery.escId(myOptions.id)); - $.unsubscribe('reloadList', myDiv); - jQuery.struts2_jquery_ui.bind(myDiv, myOptions); - }); - - $('[name="databaseId"]').change(function(event) { - var url = "${loadUrl}?" + $.param({ databaseId:this.value}); - $.getJSON(url, - function(data) { - var database = data.database; - $('[name="configuration.url"]').attr('value', database.url ? database.url : ''); - $('[name="configuration.login"]').attr('value', database.login ? database.login : ''); - $('[name="configuration.password"]').attr('value', ""); + jQuery(document).ready(function () { + jQuery.struts2_jquery.myBindingOptions = { + datatype: "json", + type: 'checkbox', + name: "operationIds", + list: "operations", + buttonset: false, + jqueryaction: "buttonset", + reloadtopics: "reloadList", + id: $('input[name$="operationIds"]')[0].parentNode.id + }; + console.info("IDID: " + jQuery.struts2_jquery.myBindingOptions.id); + $('[name="configuration.outputProviderId"]').change(function (event) { + var myOptions = jQuery.struts2_jquery.myBindingOptions; + myOptions.href = "<s:url action='getOutputProviderOperations' namespace='/json'><s:param name='outputProviderId'/></s:url>" + this.value; + var myDiv = $(jQuery.struts2_jquery.escId(myOptions.id)); + $.unsubscribe('reloadList', myDiv); + jQuery.struts2_jquery_ui.bind(myDiv, myOptions); + }); + + $('[name="databaseId"]').change(function (event) { + var url = "${loadUrl}?" + $.param({databaseId: this.value}); + $.getJSON(url, + function (data) { + var database = data.database; + $('[name="configuration.url"]').attr('value', database.url ? database.url : ''); + $('[name="configuration.login"]').attr('value', database.login ? database.login : ''); + $('[name="configuration.password"]').attr('value', ""); } - ); + ); + }); }); - }); </script> -<s:form method="post" validate="true" namespace="/io"> +<s:form method="post" validate="true" namespace="/io" action="configureExport"> <fieldset> <legend><s:text name="t3.label.export.config.pilot"/></legend> @@ -85,17 +85,17 @@ listValue="libelle" headerKey="" headerValue="" requiredLabel="true"/> - - <sj:checkboxlist key="operationIds" buttonset="false" + <br/> + <sj:checkboxlist key="operationIds" buttonset="false" template="mycheckboxlist" label='%{getText("t3.output.operations")}' list="operations" requiredLabel="true"/> + </fieldset> <fieldset> <legend><s:text name="t3.label.export.config.jdbc"/></legend> - <s:select key="databaseId" list="databases" - label='%{getText("t3.common.userOutputDatabase")}' + <s:select key="databaseId" list="databases" label='%{getText("t3.common.userOutputDatabase")}' headerKey="" headerValue=""/> <s:textfield name="configuration.url" requiredLabel="true" size="40" @@ -118,9 +118,8 @@ label='%{getText("t3.common.ocean")}' requiredLabel="true"/> <%-- selected fleet country --%> - <s:select key="configuration.fleetId" list="fleets" - label='%{getText("t3.common.fleetCountry")}' requiredLabel="true"/> - + <s:select key="configuration.fleetId" list="fleets" label='%{getText("t3.common.fleetCountry")}' + requiredLabel="true"/> <%-- begin date --%> <sj:datepicker key="configuration.beginDate" requiredLabel="true" label='%{getText("t3.common.beginDate")}' @@ -132,23 +131,21 @@ appendText=" (mm-yyyy)"/> </fieldset> - <s:submit action="configureExport!execute" - key="t3.action.configuration.validateConfiguration" - align="right"/> + <s:submit method="execute" key="t3.action.configuration.validateConfiguration" align="right"/> </s:form> <script type="text/javascript"> - jQuery(document).ready(function () { + jQuery(document).ready(function () { - $.prepareMonthPickers( - { - minDateAsMonth:'<s:property value="configuration.minDate"/>', - maxDateAsMonth:'<s:property value="configuration.maxDate"/>' - }); + $.prepareMonthPickers( + { + minDateAsMonth: '<s:property value="configuration.minDate"/>', + maxDateAsMonth: '<s:property value="configuration.maxDate"/>' + }); - }); + }); </script> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp @@ -33,7 +33,7 @@ <ul> <li> - <s:a action="selectUserInputDatabase!input" namespace="/user"> + <s:a action="selectUserInputDatabase" method="input" namespace="/user"> <s:text name="t3.menu.select.t3Database"/> </s:a> </li> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp @@ -26,46 +26,36 @@ <script type="text/javascript"> - jQuery(document).ready(function () { - - $('[name="databaseId"]').change(function(event) { - var url = "${loadUrl}?" + $.param({ databaseId:this.value}); - $.getJSON(url, - function(data) { - var database = data.database; - $('[name="database.url"]').attr('value', database.url ? database.url : ''); - $('[name="database.login"]').attr('value', database.login ? database.login : ''); - $('[name="database.password"]').attr('value', ""); + jQuery(document).ready(function () { + + $('[name="databaseId"]').change(function (event) { + var url = "${loadUrl}?" + $.param({databaseId: this.value}); + $.getJSON(url, + function (data) { + var database = data.database; + $('[name="database.url"]').attr('value', database.url ? database.url : ''); + $('[name="database.login"]').attr('value', database.login ? database.login : ''); + $('[name="database.password"]').attr('value', ""); } - ); + ); + }); }); - }); </script> <title><s:text name="t3.label.user.selectT3Database"/></title> <h2><s:text name="t3.label.user.selectT3Database"/></h2> -<s:form method="post" validate="true" namespace="/user"> - +<s:form method="post" validate="true" namespace="/user" action="selectUserInputDatabase"> <fieldset> <legend><s:text name="t3.label.t3.config.jdbc"/></legend> - - <s:select key="databaseId" list="databases" - label='%{getText("t3.common.userT3Database")}' - headerKey="" headerValue=""/> - - <s:textfield name="database.url" requiredLabel="true" size="40" - label='%{getText("t3.common.url")}'/> - - <s:textfield name="database.login" requiredLabel="true" size="40" - label='%{getText("t3.common.login")}'/> - - <s:password name="database.password" requiredLabel="true" size="40" - label='%{getText("t3.common.password")}' + <s:select key="databaseId" list="databases" label='%{getText("t3.common.userT3Database")}' headerKey="" + headerValue=""/> + <s:textfield name="database.url" requiredLabel="true" size="40" label='%{getText("t3.common.url")}'/> + <s:textfield name="database.login" requiredLabel="true" size="40" label='%{getText("t3.common.login")}'/> + <s:password name="database.password" requiredLabel="true" size="40" label='%{getText("t3.common.password")}' autocomplete='off'/> </fieldset> <br/> - <s:submit action="selectUserInputDatabase" method="execute" - key="t3.action.connectToDatabase" align="right"/> + <s:submit key="t3.action.connectToDatabase" align="right"/> </s:form> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8b5f382631e64ed4e5956388c3bb977d0... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8b5f382631e64ed4e5956388c3bb977d0... You're receiving this email because of your account on gitlab.com.