RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr31S14CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballoItEr19S09: Substitute Accept and Cancel buttons in Advances Order Element for Back button

Browse source
This commit is contained in:
Diego Pino Garcia 2009-10-29 17:27:32 +01:00 • committed by Javier Moran Rua
parent 14c9fb796e
commit 5e6137cd29
3 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
View file

@ -38,6 +38,7 @@ import org.navalplanner.business.advance.entities.DirectAdvanceAssignment;
import org.navalplanner.business.advance.entities.IndirectAdvanceAssignment;
import org.navalplanner.business.advance.exceptions.DuplicateAdvanceAssignmentForOrderElementException;
import org.navalplanner.business.advance.exceptions.DuplicateValueTrueReportGlobalAdvanceException;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.web.common.IMessagesForUser;
import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
@ -103,35 +104,33 @@ public class ManageOrderElementAdvancesController extends
return manageOrderElementAdvancesModel.getAdvanceAssignments();
}
public void cancel() {
window.setVisible(false);
Util.reloadBindings(window.getParent());
public void close() {
validate();
}
public void accept() throws org.navalplanner.business.common.exceptions.InstanceNotFoundException, DuplicateValueTrueReportGlobalAdvanceException {
if(!validateDataForm()){
public void validate() {
if (!validateDataForm()){
messagesForUser.showMessage(
Level.INFO, _("Values are not valid, the values must not be null"));
Level.ERROR, _("Values are not valid, the values must not be null"));
return;
}
if(!validateReportGlobalAdvance()){
if (!validateReportGlobalAdvance()){
messagesForUser.showMessage(
Level.INFO, _("The Spread values are not valid, must be exist at least one value of spread to true"));
Level.ERROR, _("The Spread values are not valid, must be exist at least one value of spread to true"));
return;
}
try{
this.manageOrderElementAdvancesModel.accept();
window.setVisible(false);
Util.reloadBindings(window.getParent());
}catch(DuplicateAdvanceAssignmentForOrderElementException e){
messagesForUser.showMessage( Level.INFO, _("It not must be include Advance with the same advance type."));
return;
}catch(DuplicateValueTrueReportGlobalAdvanceException e){
try {
manageOrderElementAdvancesModel.accept();
} catch (DuplicateAdvanceAssignmentForOrderElementException e) {
messagesForUser.showMessage(Level.ERROR, _("It not must be include Advance with the same advance type."));
} catch(DuplicateValueTrueReportGlobalAdvanceException e) {
messagesForUser.showMessage(
Level.INFO, _("The Spread values are not valid, There are several spread values to true"));
return;
Level.ERROR, _("The Spread values are not valid, There are several spread values to true"));
} catch (InstanceNotFoundException e) {
messagesForUser.showMessage(
Level.ERROR, e.getMessage());
e.printStackTrace();
}
}
public void openWindow(IOrderElementModel orderElementModel) {

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -144,6 +144,7 @@ public class OrderElementController extends GenericForwardComposer {
private void closeAll() {
detailsController.close();
manageOrderElementAdvancesController.close();
close();
}

4
navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
View file

@ -78,8 +78,4 @@
</hbox>
</panelchildren>
</panel>
<hbox>
<button id="aceptAdvance" onClick="manageOrderElementAdvancesController.accept();" label="${i18n:_('Accept')}"/>
<button id="cancelAdvance" onClick="manageOrderElementAdvancesController.cancel();" label="${i18n:_('Cancel')}"/>
</hbox>
</vbox>