Skip to content

Commit

Permalink
Eliminati bottoni superflui dalla mappa Firma Variazioni
Browse files Browse the repository at this point in the history
  • Loading branch information
rosangela.pucciarelli committed Dec 14, 2016
1 parent 78c4a9a commit 8a1c619
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 79 deletions.
5 changes: 4 additions & 1 deletion sigla-ejb/src/main/java/it/cnr/contab/docamm00/bp/CRUDFatturaPassivaElettronicaBP.java
View file
Expand Up @@ -470,7 +470,10 @@ public OggettoBulk completaFatturaPassiva(ActionContext context, Fattura_passiva
dettaglioController.setDirty(true);
dettaglioController.setModelIndex(context, i);
rigaFattura.setBene_servizio(documentoEleLinea.getBeneServizio());
rigaFattura.setDs_riga_fattura(documentoEleLinea.getLineaDescrizione());
if(documentoEleLinea.getLineaDescrizione().length()>199)
rigaFattura.setDs_riga_fattura(documentoEleLinea.getLineaDescrizione().substring(0, 199));
else
rigaFattura.setDs_riga_fattura(documentoEleLinea.getLineaDescrizione());
rigaFattura.setVoce_iva(recuperaCodiceIVA(documentoEleTestata, documentoEleLinea));
rigaFattura.setQuantita(documentoEleLinea.getLineaQuantita());
action.doOnQuantitaChange(context);
Expand Down
69 changes: 35 additions & 34 deletions sigla-ejb/src/main/java/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.java
View file
Expand Up @@ -145,24 +145,24 @@ public void openForm(javax.servlet.jsp.PageContext context,String action,String
}

public it.cnr.jada.util.jsp.Button[] createToolbar() {
Button[] toolbar = new Button[8];
Button[] toolbar = new Button[3];
int i = 0;
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.refresh");
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.print");
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.download");
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.sign");
// toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
// .getHandler().getProperties(getClass()), "Toolbar.print");
// toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
// .getHandler().getProperties(getClass()), "Toolbar.download");
// toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
// .getHandler().getProperties(getClass()), "Toolbar.sign");
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.signOTP");
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.upload");
// toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
// .getHandler().getProperties(getClass()), "Toolbar.upload");
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.printSigned");
toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
.getHandler().getProperties(getClass()), "Toolbar.installa");
// toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
// .getHandler().getProperties(getClass()), "Toolbar.installa");
toolbar[i-1].setSeparator(true);
return toolbar;
}
Expand All @@ -178,26 +178,26 @@ public void writeToolbar(javax.servlet.jsp.PageContext pageContext)
else
nomeFileAllegato = nomeFileTest;

toolbar[1]
.setHref("doPrint('"
+ JSPUtils
.buildAbsoluteUrl(
pageContext,
null,
"genericdownload/"
+ nomeFileAllegato
+ "?methodName=scaricaFile&it.cnr.jada.action.BusinessProcess="
+ getPath()) + "')");
toolbar[2]
.setHref("doPrint('"
+ JSPUtils
.buildAbsoluteUrl(
pageContext,
null,
"genericdownload/"
+ nomeFileAllegato
+ "?methodName=scaricaFileGenerico&it.cnr.jada.action.BusinessProcess="
+ getPath()) + "')");
// toolbar[1]
// .setHref("doPrint('"
// + JSPUtils
// .buildAbsoluteUrl(
// pageContext,
// null,
// "genericdownload/"
// + nomeFileAllegato
// + "?methodName=scaricaFile&it.cnr.jada.action.BusinessProcess="
// + getPath()) + "')");
// toolbar[2]
// .setHref("doPrint('"
// + JSPUtils
// .buildAbsoluteUrl(
// pageContext,
// null,
// "genericdownload/"
// + nomeFileAllegato
// + "?methodName=scaricaFileGenerico&it.cnr.jada.action.BusinessProcess="
// + getPath()) + "')");
Document nodeSignedFile = null;
try {
nodeSignedFile = getNodeFileFirmato(bulk
Expand All @@ -215,7 +215,8 @@ public void writeToolbar(javax.servlet.jsp.PageContext pageContext)
signedFileName= signedFileName.replace("\\", "/");
}
if (signedFileName!=null)
toolbar[6]
//toolbar[6]
toolbar[2]
.setHref("doPrint('"
+ JSPUtils
.buildAbsoluteUrl(
Expand All @@ -230,9 +231,9 @@ public void writeToolbar(javax.servlet.jsp.PageContext pageContext)
}
}
else {
toolbar[1].setHref(null);
// toolbar[1].setHref(null);
toolbar[2].setHref(null);
toolbar[6].setHref(null);
// toolbar[6].setHref(null);
}
writeToolbar(pageContext.getOut(), toolbar);
}
Expand Down
44 changes: 0 additions & 44 deletions sigla-ejb/src/main/resources/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.properties
View file
Expand Up @@ -6,15 +6,6 @@ Toolbar.refresh.style=width:60px;
Toolbar.refresh.title=Aggiorna
Toolbar.refresh.accessKey=A

Toolbar.print.img=img/print24.gif
Toolbar.print.disabledImg=img/print24.gif
Toolbar.print.label=<u>S</u>tampa
Toolbar.print.href=javascript:doPrint()
Toolbar.print.style=width:60px;
Toolbar.print.enabledProperty=printButtonEnabled
Toolbar.print.title=Stampa
Toolbar.print.accessKey=S

Toolbar.printSigned.img=img/print24.gif
Toolbar.printSigned.disabledImg=img/print24.gif
Toolbar.printSigned.label=S<u>t</u>ampa <br>Firmato
Expand All @@ -24,15 +15,6 @@ Toolbar.printSigned.enabledProperty=printSignedButtonEnabled
Toolbar.printSigned.title=Stampa Firmato
Toolbar.printSigned.accessKey=T

Toolbar.sign.img=img/sign24.gif
Toolbar.sign.disabledImg=img/sign24.gif
Toolbar.sign.label=<u>F</u>irma
Toolbar.sign.href=javascript:submitForm('doSign')
Toolbar.sign.style=width:60px;
Toolbar.sign.enabledProperty=signButtonEnabled
Toolbar.sign.title=Firma
Toolbar.sign.accessKey=F

Toolbar.signOTP.img=img/sign24.gif
Toolbar.signOTP.disabledImg=img/sign24.gif
Toolbar.signOTP.label=Firma tramite <u>O</u>TP
Expand All @@ -42,29 +24,3 @@ Toolbar.signOTP.enabledProperty=signButtonEnabled
Toolbar.signOTP.title=Firma tramite OTP
Toolbar.signOTP.accessKey=O

Toolbar.upload.img=img/import24.gif
Toolbar.upload.disabledImg=img/import24.gif
Toolbar.upload.label=<u>U</u>pload <br>Firmato
Toolbar.upload.href=javascript:submitForm('doUpload')
Toolbar.upload.style=width:60px;
Toolbar.upload.enabledProperty=uploadButtonEnabled
Toolbar.upload.title=Upload e invio al protocollo informatico
Toolbar.upload.accessKey=U

Toolbar.download.img=img/export24.gif
Toolbar.download.disabledImg=img/export24.gif
Toolbar.download.label=<u>D</u>ownload<br>Variazione
Toolbar.download.href=javascript:submitForm('doDownloadVar')
Toolbar.download.style=width:60px;
Toolbar.download.enabledProperty=printButtonEnabled
Toolbar.download.title=Download variazione
Toolbar.download.accessKey=D

Toolbar.installa.img=img/pagesetup24.gif
Toolbar.installa.disabledImg=img/pagesetup24.gif
Toolbar.installa.label=<u>I</u>nstalla <br>software
Toolbar.installa.href=javascript:submitForm('doInstalla')
Toolbar.installa.style=width:60px;
Toolbar.installa.enabledProperty=instButtonEnabled
Toolbar.installa.title=Installa
Toolbar.installa.accessKey=I

0 comments on commit 8a1c619

Please sign in to comment.