Commit 6d7074dd authored by Malo Toudic's avatar Malo Toudic
Browse files

Add ehealthsuisse preference

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/simulators/gazelle-webservice-tester/trunk@61930 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
parent 00ced7cb
...@@ -47,16 +47,21 @@ select update_soapui_project_all(); ...@@ -47,16 +47,21 @@ select update_soapui_project_all();
ALTER TABLE gwt_test_component DROP COLUMN project_id ; ALTER TABLE gwt_test_component DROP COLUMN project_id ;
ALTER TABLE gwt_test_component RENAME COLUMN new_project_id TO project_id ; ALTER TABLE gwt_test_component RENAME COLUMN new_project_id TO project_id ;
/* Add new columns in gwt_test_component */
ALTER TABLE gwt_test_component ALTER TABLE gwt_test_component
ADD COLUMN executable BOOLEAN; ADD COLUMN executable BOOLEAN;
UPDATE gwt_test_component UPDATE gwt_test_component
SET executable = TRUE; SET executable = TRUE
WHERE executable IS NULL;
ALTER TABLE gwt_test_component ALTER TABLE gwt_test_component
ADD COLUMN disable BOOLEAN; ADD COLUMN disable BOOLEAN;
UPDATE gwt_test_component UPDATE gwt_test_component
SET disable = FALSE; SET disable = FALSE
WHERE disable IS NULL;
/* Add new preference to activate or desactivate the eHealhSuisse module (execute instance)*/
INSERT INTO app_configuration (id, variable, value) INSERT INTO app_configuration (id, variable, value)
VALUES (nextval('app_configuration_id_seq'), 'ehealthsuisse', 'false'); VALUES (nextval('app_configuration_id_seq'), 'ehealthsuisse', 'false');
......
package net.ihe.gazelle.wstester.bean; package net.ihe.gazelle.wstester.bean;
import net.ihe.gazelle.common.tree.GazelleTreeNodeImpl; import net.ihe.gazelle.common.tree.GazelleTreeNodeImpl;
import net.ihe.gazelle.simulator.common.model.ApplicationConfiguration;
import net.ihe.gazelle.wstester.action.RunInstanceAction; import net.ihe.gazelle.wstester.action.RunInstanceAction;
import net.ihe.gazelle.wstester.dao.SoapuiProjectDao; import net.ihe.gazelle.wstester.dao.SoapuiProjectDao;
import net.ihe.gazelle.wstester.model.Execution; import net.ihe.gazelle.wstester.model.Execution;
...@@ -112,7 +113,11 @@ public class RunInstanceBean implements Serializable { ...@@ -112,7 +113,11 @@ public class RunInstanceBean implements Serializable {
} }
public boolean isEhealthsuisse() { public boolean isEhealthsuisse() {
return true; if (ApplicationConfiguration.getValueOfVariable("ehealthsuisse") != null) {
return ApplicationConfiguration.getBooleanValue("ehealthsuisse");
} else {
return false;
}
} }
public void getAllInfo() { public void getAllInfo() {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</h:selectOneMenu> </h:selectOneMenu>
</s:decorate> </s:decorate>
<s:decorate template="/layout/form/_checkbox.xhtml"> <s:decorate template="/layout/form/_checkbox.xhtml" rendered="#{runSoapui.isEhealthsuisse()}">
<h:selectBooleanCheckbox value="#{runSoapui.runInstance}"> <h:selectBooleanCheckbox value="#{runSoapui.runInstance}">
<a4j:ajax render="ResultPanelInstance, ResultPanelClassic, footerDiv"/> <a4j:ajax render="ResultPanelInstance, ResultPanelClassic, footerDiv"/>
</h:selectBooleanCheckbox> </h:selectBooleanCheckbox>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment