fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GAP079 / GAP074 / GAP080 /GAP081 / GAP075 / GAP073 (issue 9183) 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71459 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2017-07-17 21:20:59 +00:00
parent 1a265d3558
commit 624e97f0e4
2 changed files with 0 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarUsuarioController.java
View File

@ -123,10 +123,6 @@ public class EditarUsuarioController extends MyGenericForwardComposer {
private Label lblDescMac; private Label lblDescMac;
private Radio radioSim; private Radio radioSim;
private Textbox txtDescMac; private Textbox txtDescMac;
private Textbox txtComissao;
private Radio radioItemComissao1;
private Radio radioItemComissao2;
private Radio radioItemComissao3;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -191,20 +187,6 @@ public class EditarUsuarioController extends MyGenericForwardComposer {
txtConfirmSenha.setText(CONTRASENA_VACIA); txtConfirmSenha.setText(CONTRASENA_VACIA);
} }
if (usuario.getItensComissao() == null || usuario.getItensComissao().intValue() == 1) {
radioItemComissao1.setSelected(true);
radioItemComissao2.setSelected(false);
radioItemComissao3.setSelected(false);
} else if (usuario.getItensComissao().intValue() == 2) {
radioItemComissao1.setSelected(false);
radioItemComissao2.setSelected(true);
radioItemComissao3.setSelected(false);
} else if (usuario.getItensComissao().intValue() == 3) {
radioItemComissao1.setSelected(false);
radioItemComissao2.setSelected(false);
radioItemComissao3.setSelected(true);
}
if(ApplicationProperties.getInstance().exibirEstacaoCadastroUsuario()){ if(ApplicationProperties.getInstance().exibirEstacaoCadastroUsuario()){
txtDescMac.setVisible(true); txtDescMac.setVisible(true);
lblDescMac.setVisible(true); lblDescMac.setVisible(true);
@ -466,7 +448,6 @@ public class EditarUsuarioController extends MyGenericForwardComposer {
txtNombMaterno.getText(); txtNombMaterno.getText();
txtSenha.getText(); txtSenha.getText();
txtConfirmSenha.getText(); txtConfirmSenha.getText();
txtComissao.getText();
cmbPerfil.getValue(); cmbPerfil.getValue();
cmbEmpresa.getValue(); cmbEmpresa.getValue();
@ -501,14 +482,6 @@ public class EditarUsuarioController extends MyGenericForwardComposer {
return; return;
} }
if (radioItemComissao1.isSelected()) {
usuario.setItensComissao(1);
} else if (radioItemComissao2.isSelected()) {
usuario.setItensComissao(2);
} else if (radioItemComissao3.isSelected()) {
usuario.setItensComissao(3);
}
Perfil perfil = (Perfil) cmbPerfil.getSelectedItem().getValue(); Perfil perfil = (Perfil) cmbPerfil.getSelectedItem().getValue();
usuario.setUsuarioEmpresaList(lsUsuarioEmpresa); usuario.setUsuarioEmpresaList(lsUsuarioEmpresa);
usuario.setUsuarioUbicacionList(lsUsuarioUbicacion); usuario.setUsuarioUbicacionList(lsUsuarioUbicacion);
@ -839,37 +812,4 @@ public class EditarUsuarioController extends MyGenericForwardComposer {
public void setPerfilSeleccionada(Perfil perfilSeleccionada) { public void setPerfilSeleccionada(Perfil perfilSeleccionada) {
this.perfilSeleccionada = perfilSeleccionada; this.perfilSeleccionada = perfilSeleccionada;
} }
public Radio getRadioItemComissao1() {
return radioItemComissao1;
}
public void setRadioItemComissao1(Radio radioItemComissao1) {
this.radioItemComissao1 = radioItemComissao1;
}
public Radio getRadioItemComissao2() {
return radioItemComissao2;
}
public void setRadioItemComissao2(Radio radioItemComissao2) {
this.radioItemComissao2 = radioItemComissao2;
}
public Radio getRadioItemComissao3() {
return radioItemComissao3;
}
public void setRadioItemComissao3(Radio radioItemComissao3) {
this.radioItemComissao3 = radioItemComissao3;
}
public Textbox getTxtComissao() {
return txtComissao;
}
public void setTxtComissao(Textbox txtComissao) {
this.txtComissao = txtComissao;
}
} }

16
web/gui/seguridad/editarUsuario.zul
View File

@ -119,22 +119,6 @@
value="@{winEditarUsuario$composer.usuario.tempoDevolucaoPassagem}" value="@{winEditarUsuario$composer.usuario.tempoDevolucaoPassagem}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" /> use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
</row> </row>
<row>
<label
value="${c:l('editarUsuarioController.txtComissao.label')}" />
<textbox id="txtComissao" width="50px"
precision="7" scale="2"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
value="@{winEditarUsuario$composer.usuario.perComissao,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
</row>
<row>
<label id="lbItensComissao" value="${c:l('editarUsuarioController.txtItensComissao.label')}"/>
<radiogroup>
<radio id="radioItemComissao1" label="Todos os componentes" />
<radio id="radioItemComissao2" label="Tarifa" />
<radio id="radioItemComissao3" label="Tarifa + Seguro" />
</radiogroup>
</row>
<row> <row>
<label <label
value="${c:l('busquedaEstacionController.lhDescMac.label')}" visible="false" id="lblDescMac" /> value="${c:l('busquedaEstacionController.lhDescMac.label')}" visible="false" id="lblDescMac" />