Skip to content

Commit

Permalink
Creata funzione amministra sui progetti
Browse files Browse the repository at this point in the history
  • Loading branch information
@mspasiano
mspasiano committed Mar 11, 2019
1 parent 32189d9 commit a1489e3
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 37 deletions.
40 changes: 40 additions & 0 deletions sigla-backend/src/main/resources/liquibase/db.changelog-5.0.0.xml
View file
Expand Up @@ -1797,4 +1797,44 @@ TRASPORTO_AEREO"/>
<modifyDataType tableName="var_stanz_res" columnName="id_matricola" newDataType="numeric"/>
<modifyDataType tableName="pdg_variazione" columnName="id_matricola" newDataType="numeric"/>
</changeSet>
<changeSet author="marco.spasiano" id="accessi_amminstra_progetti">
<insert tableName="accesso">
<column name="cd_accesso" type="VARCHAR(20)" value="CFGPROGERCOREPROGAMM"/>
<column name="ti_accesso" type="CHAR(1)" value="" />
<column name="ds_accesso" type="VARCHAR(200)" value="Amministra Progetti Area Progettuale"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
<insert tableName="ass_bp_accesso">
<column name="cd_accesso" type="VARCHAR(20)" value="CFGPROGERCOREPROGAMM"/>
<column name="business_process" type="VARCHAR(200)" value="AmministraTestataProgettiRicercaBP"/>
<column name="ti_funzione" type="CHAR(1)" value="M"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
<insert tableName="albero_main">
<column name="cd_nodo" type="VARCHAR(100)" value="0.CFG.PROGETTI.LIV2.A"/>
<column name="ds_nodo" type="VARCHAR(200)" value="Amministra"/>
<column name="cd_accesso" type="VARCHAR(20)" value="CFGPROGERCOREPROGAMM"/>
<column name="business_process" type="VARCHAR(200)" value="AmministraTestataProgettiRicercaBP"/>
<column name="pg_ordinamento" type="BIGINT" value="3"/>
<column name="fl_terminale" type="CHAR(1)" value="Y"/>
<column name="livello" type="SMALLINT" value="4"/>
<column name="cd_proprio_nodo" type="VARCHAR(100)" value="A"/>
<column name="cd_nodo_padre" type="VARCHAR(100)" value="0.CFG.PROGETTI.LIV2"/>
<column name="url_icona" type="VARCHAR(200)" value=""/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
</changeSet>

</databaseChangeLog>
8 changes: 0 additions & 8 deletions sigla-ejb/src/main/java/it/cnr/contab/doccont00/consultazioni/bp/ConsFileCassiereBP.java
View file
Expand Up @@ -66,43 +66,35 @@ public java.util.Vector addButtonsToToolbar(java.util.Vector listButton) {
listButton.addElement(button1);
} else if (getPathConsultazione().compareTo(ConsFileCassiereBP.BASE) == 0) {
Button button1 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott1");
button1.setSeparator(true);
listButton.addElement(button1);

Button button2 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott2");
button2.setSeparator(true);
listButton.addElement(button2);

Button button3 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott3");
button3.setSeparator(true);
listButton.addElement(button3);

Button button4 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott4");
button4.setSeparator(true);
listButton.addElement(button4);

Button button5 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott5");
button5.setSeparator(true);
listButton.addElement(button5);

Button button6 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott6");
button6.setSeparator(true);
listButton.addElement(button6);

Button button7 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott7");
button7.setSeparator(true);
listButton.addElement(button7);

Button button8 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott8");
button8.setSeparator(true);
listButton.addElement(button8);

Button button9 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott9");
button9.setSeparator(true);
listButton.addElement(button9);

Button button10 = new Button(Config.getHandler().getProperties(getClass()), "Toolbar.bott10");
button10.setSeparator(true);
listButton.addElement(button10);
}
return listButton;
Expand Down
26 changes: 26 additions & 0 deletions ...-ejb/src/main/java/it/cnr/contab/progettiric00/bp/AmministraTestataProgettiRicercaBP.java
View file
@@ -0,0 +1,26 @@
package it.cnr.contab.progettiric00.bp;

import it.cnr.contab.progettiric00.core.bulk.ProgettoBulk;
import it.cnr.jada.action.ActionContext;
import it.cnr.jada.action.BusinessProcessException;
import it.cnr.jada.bulk.OggettoBulk;

public class AmministraTestataProgettiRicercaBP extends TestataProgettiRicercaBP {
public AmministraTestataProgettiRicercaBP() {
}

public AmministraTestataProgettiRicercaBP(String function) {
super(function);
}

@Override
protected boolean isROProgettoPianoEconomico(ProgettoBulk progettoBulk) {
return Boolean.FALSE;
}

@Override
public void basicEdit(ActionContext actioncontext, OggettoBulk oggettobulk, boolean flag) throws BusinessProcessException {
super.basicEdit(actioncontext, oggettobulk, flag);
this.setStatus(EDIT);
}
}
19 changes: 16 additions & 3 deletions sigla-ejb/src/main/java/it/cnr/contab/progettiric00/bp/TestataProgettiRicercaBP.java
View file
@@ -1,12 +1,14 @@
package it.cnr.contab.progettiric00.bp;

import java.io.IOException;
import java.math.BigDecimal;
import java.rmi.RemoteException;
import java.util.List;
import java.util.Optional;
import java.util.TreeMap;

import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspWriter;

import it.cnr.contab.config00.bulk.Configurazione_cnrBulk;
import it.cnr.contab.config00.bulk.Parametri_cnrBulk;
Expand Down Expand Up @@ -81,7 +83,7 @@ public boolean isGrowable() {
Optional.ofNullable(getParentModel())
.filter(ProgettoBulk.class::isInstance)
.map(ProgettoBulk.class::cast)
.map(el->!el.isROProgettoPianoEconomico())
.map(el->!isROProgettoPianoEconomico(el))
.orElse(Boolean.FALSE);
}

Expand All @@ -91,9 +93,14 @@ public boolean isShrinkable() {
Optional.ofNullable(getParentModel())
.filter(ProgettoBulk.class::isInstance)
.map(ProgettoBulk.class::cast)
.map(el->!el.isROProgettoPianoEconomico())
.map(el->!isROProgettoPianoEconomico(el))
.orElse(Boolean.FALSE);
}
}

@Override
public void writeFormInput(JspWriter jspwriter, String s, String s1, boolean flag, String s2, String s3) throws IOException {
super.writeFormInput(jspwriter, s, s1, flag, s2, s3);
}
};

private SimpleDetailCRUDController crudPianoEconomicoAltriAnni = new ProgettoPianoEconomicoCRUDController( "PianoEconomicoAltriAnni", Progetto_piano_economicoBulk.class, "dettagliPianoEconomicoAltriAnni", this) {
Expand Down Expand Up @@ -793,4 +800,10 @@ private Integer getAnnoFromPianoEconomico() {
public void setAnnoFromPianoEconomico(Integer annoFromPianoEconomico) {
this.annoFromPianoEconomico = annoFromPianoEconomico;
}

protected boolean isROProgettoPianoEconomico(ProgettoBulk progettoBulk) {
return Optional.ofNullable(progettoBulk)
.map(ProgettoBulk::isROProgettoPianoEconomico)
.orElse(Boolean.TRUE);
}
}
6 changes: 6 additions & 0 deletions sigla-ejb/src/main/resources/it/cnr/contab/doccont00/bp/ConsSospesiBP.properties
View file
Expand Up @@ -5,6 +5,8 @@ Toolbar.dettagli_sos.href=javascript:submitForm('doDettaglioSospesi')
Toolbar.dettagli_sos.style=width:80px;
Toolbar.dettagli_sos.title=Consultazione
Toolbar.dettagli_sos.accessKey=S
Toolbar.dettagli_sos.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.dettagli_sos.buttonClass=btn-outline-primary btn-title

Toolbar.dettagli_ManColl.img=img/bringback24.gif
Toolbar.dettagli_ManColl.disabledImg=img/bringback24.gif
Expand All @@ -13,6 +15,8 @@ Toolbar.dettagli_ManColl.href=javascript:submitForm('doConsultaMandati')
Toolbar.dettagli_ManColl.style=width:80px;
Toolbar.dettagli_ManColl.title=Consultazione Sospesi di Spesa
Toolbar.dettagli_ManColl.accessKey=C
Toolbar.dettagli_ManColl.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.dettagli_ManColl.buttonClass=btn-outline-primary btn-title

Toolbar.dettagli_RevColl.img=img/bringback24.gif
Toolbar.dettagli_RevColl.disabledImg=img/bringback24.gif
Expand All @@ -21,3 +25,5 @@ Toolbar.dettagli_RevColl.href=javascript:submitForm('doConsultaReversali')
Toolbar.dettagli_RevColl.style=width:80px;
Toolbar.dettagli_RevColl.title=Consultazione Sospesi di Entrata
Toolbar.dettagli_RevColl.accessKey=C
Toolbar.dettagli_RevColl.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.dettagli_RevColl.buttonClass=btn-outline-primary btn-title
20 changes: 10 additions & 10 deletions ...src/main/resources/it/cnr/contab/doccont00/consultazioni/bp/ConsFileCassiereBP.properties
View file
Expand Up @@ -15,7 +15,7 @@ Toolbar.bott1.href=submitForm('doConsultaBott1')
Toolbar.bott1.style=width:75px;
Toolbar.bott1.title=Dettaglio Accrediti Sospesi Registrati
Toolbar.bott1.accessKey=A
Toolbar.boot1.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott1.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott1.buttonClass=btn-outline-primary btn-title

Toolbar.bott2.img=img/bringback24.gif
Expand All @@ -25,7 +25,7 @@ Toolbar.bott2.href=submitForm('doConsultaBott2')
Toolbar.bott2.style=width:75px;
Toolbar.bott2.title=Dettaglio Accrediti Sospesi Stornati
Toolbar.bott2.accessKey=c
Toolbar.boot2.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott2.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott2.buttonClass=btn-outline-primary btn-title

Toolbar.bott3.img=img/bringback24.gif
Expand All @@ -36,7 +36,7 @@ Toolbar.bott3.style=width:75px;
Toolbar.bott3.title=Dettaglio Accrediti Sospesi Regolati
Toolbar.bott3.accessKey=r
Toolbar.boot3.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott3.buttonClass=btn-outline-primary btn-title
Toolbar.boot3.buttonClass=btn-outline-primary btn-title

Toolbar.bott4.img=img/bringback24.gif
Toolbar.bott4.disabledImg=img/bringback24.gif
Expand All @@ -45,7 +45,7 @@ Toolbar.bott4.href=submitForm('doConsultaBott4')
Toolbar.bott4.style=width:75px;
Toolbar.bott4.title=Dettaglio Reversali Regolate
Toolbar.bott4.accessKey=v
Toolbar.boot4.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott4.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott4.buttonClass=btn-outline-primary btn-title

Toolbar.bott5.img=img/bringback24.gif
Expand All @@ -55,7 +55,7 @@ Toolbar.bott5.href=submitForm('doConsultaBott5')
Toolbar.bott5.style=width:75px;
Toolbar.bott5.title=Dettaglio Reversali Stornate
Toolbar.bott5.accessKey=e
Toolbar.boot5.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott5.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott5.buttonClass=btn-outline-primary btn-title

Toolbar.bott6.img=img/bringback24.gif
Expand All @@ -65,7 +65,7 @@ Toolbar.bott6.href=submitForm('doConsultaBott6')
Toolbar.bott6.style=width:75px;
Toolbar.bott6.title=Dettaglio Addebiti Sospesi Registrati
Toolbar.bott6.accessKey=d
Toolbar.boot6.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott6.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott6.buttonClass=btn-outline-primary btn-title

Toolbar.bott7.img=img/bringback24.gif
Expand All @@ -75,7 +75,7 @@ Toolbar.bott7.href=submitForm('doConsultaBott7')
Toolbar.bott7.style=width:75px;
Toolbar.bott7.title=Dettaglio Addebiti Sospesi Stornati
Toolbar.bott7.accessKey=b
Toolbar.boot7.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott7.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott7.buttonClass=btn-outline-primary btn-title

Toolbar.bott8.img=img/bringback24.gif
Expand All @@ -85,7 +85,7 @@ Toolbar.bott8.href=submitForm('doConsultaBott8')
Toolbar.bott8.style=width:75px;
Toolbar.bott8.title=Dettaglio Addebiti Sospesi Regolati
Toolbar.bott8.accessKey=S
Toolbar.boot8.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott8.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott8.buttonClass=btn-outline-primary btn-title

Toolbar.bott9.img=img/bringback24.gif
Expand All @@ -95,7 +95,7 @@ Toolbar.bott9.href=submitForm('doConsultaBott9')
Toolbar.bott9.style=width:75px;
Toolbar.bott9.title=Dettaglio Mandati Regolati
Toolbar.bott9.accessKey=M
Toolbar.boot9.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott9.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott9.buttonClass=btn-outline-primary btn-title

Toolbar.bott10.img=img/bringback24.gif
Expand All @@ -105,5 +105,5 @@ Toolbar.bott10.href=submitForm('doConsultaBott10')
Toolbar.bott10.style=width:75px;
Toolbar.bott10.title=Dettaglio Mandati Stornati
Toolbar.bott10.accessKey=t
Toolbar.boot10.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott10.iconClass=fa fa-fw fa-2x fa-folder-open-o
Toolbar.bott10.buttonClass=btn-outline-primary btn-title
28 changes: 25 additions & 3 deletions ...main/resources/it/cnr/contab/progettiric00/core/bulk/Progetto_piano_economicoBulkInfo.xml
View file
Expand Up @@ -53,6 +53,14 @@
readonlyPropertyOnEdit="ROProgettoPianoEconomico"
formatName="it.cnr.contab.util.EuroFormat"
label="Quota Finanziata" />
<fieldProperty
name="im_spesa_finanziato_amm"
property="im_spesa_finanziato"
inputSize="20"
maxLength="18"
inputType="TEXT"
formatName="it.cnr.contab.util.EuroFormat"
label="Quota Finanziata" />
<fieldProperty
name="im_spesa_cofinanziato"
property="im_spesa_cofinanziato"
Expand All @@ -62,6 +70,15 @@
readonlyPropertyOnEdit="ROProgettoPianoEconomico"
formatName="it.cnr.contab.util.EuroFormat"
label="Quota Cofinanziata" />
<fieldProperty
name="im_spesa_cofinanziato_amm"
property="im_spesa_cofinanziato"
inputSize="20"
maxLength="18"
inputType="TEXT"
formatName="it.cnr.contab.util.EuroFormat"
label="Quota Cofinanziata" />

<fieldProperty
name="imTotaleSpesa"
property="imTotaleSpesa"
Expand Down Expand Up @@ -156,9 +173,14 @@
<formFieldProperty name="ds_voce_piano" />
<formFieldProperty name="esercizio_piano" />
<formFieldProperty name="im_entrata"/>
<formFieldProperty name="im_spesa_finanziato" label="Quota Finanziata"/>
<formFieldProperty name="im_spesa_cofinanziato" label="Quota Cofinanziata"/>
<formFieldProperty name="imTotaleSpesa" label="Quota Totale"/>

<formFieldProperty name="im_spesa_finanziato" label="Quota Finanziata"/>
<formFieldProperty name="im_spesa_finanziato_amm"/>

<formFieldProperty name="im_spesa_cofinanziato" label="Quota Cofinanziata"/>
<formFieldProperty name="im_spesa_cofinanziato_amm"/>

<formFieldProperty name="imTotaleSpesa" label="Quota Totale"/>

<formFieldProperty name="fl_ctrl_disp" />
<formFieldProperty name="im_assestato_entrata" />
Expand Down
12 changes: 11 additions & 1 deletion sigla-web/src/main/webapp/actions/progettiric00.xml
View file
Expand Up @@ -30,7 +30,17 @@
<init-param name="searchResultColumnSet" value="filtro_ricerca_prog2"/>
<init-param name="defaultAction" value="CRUDProgettiRicercaAction"/>
</businessProcess>


<businessProcess
name="AmministraTestataProgettiRicercaBP" className="it.cnr.contab.progettiric00.bp.AmministraTestataProgettiRicercaBP">
<forward name="default" path="/progettiric00/progetto_ricerca_commesse.jsp"/>
<init-param name="bulkClassName" value="it.cnr.contab.progettiric00.core.bulk.ProgettoBulk"/>
<init-param name="componentSessionName" value="CNRPROGETTIRIC00_EJB_ProgettoRicercaComponentSession"/>
<init-param name="freeSearchSet" value="filtro_ricerca_prog2"/>
<init-param name="searchResultColumnSet" value="filtro_ricerca_prog2"/>
<init-param name="defaultAction" value="CRUDProgettiRicercaAction"/>
</businessProcess>

<businessProcess
name="TestataProgettiRicercaNuovoBP" className="it.cnr.contab.progettiric00.bp.TestataProgettiRicercaNuovoBP">
<forward name="default" path="/progettiric00/progetto_ricerca.jsp"/>
Expand Down
28 changes: 16 additions & 12 deletions sigla-web/src/main/webapp/progettiric00/progetto_piano_economico_anno_corrente.jsp
View file
@@ -1,5 +1,6 @@
<%@ page pageEncoding="UTF-8"
import="it.cnr.jada.action.*,
java.util.Optional,
it.cnr.jada.bulk.*,
it.cnr.jada.util.action.*,
it.cnr.jada.util.jsp.*,
Expand All @@ -9,27 +10,30 @@

<%
TestataProgettiRicercaBP bp = (TestataProgettiRicercaBP)BusinessProcess.getBusinessProcess(request);
SimpleDetailCRUDController controller = ( (TestataProgettiRicercaBP)bp ).getCrudPianoEconomicoAnnoCorrente();
SimpleDetailCRUDController controllerVoci = ( (TestataProgettiRicercaBP)bp ).getCrudPianoEconomicoVoceBilancioAnnoCorrente();
SimpleDetailCRUDController controller = bp.getCrudPianoEconomicoAnnoCorrente();
SimpleDetailCRUDController controllerVoci = bp.getCrudPianoEconomicoVoceBilancioAnnoCorrente();
String fieldAmm = Optional.ofNullable(bp)
.filter(AmministraTestataProgettiRicercaBP.class::isInstance)
.map(amm -> "_amm")
.orElse("");
boolean isKeyEditable = controller.getModel()!=null && controller.getModel().isNotNew();
%>

<% controller.writeHTMLTable(pageContext,"piano_economico1",true,false,true,"100%","100px"); %>
<table class="Panel card p-2 mt-1">
<TR>
<TD><% controller.writeFormLabel(out,"voce_piano");%></TD>
<TD colspan="3"><% controller.writeFormInput(out,null,"voce_piano",isKeyEditable,null,null);%></TD>
</TR>
<TR>
<% controller.writeFormField(out,"im_spesa_finanziato");%>
<% controller.writeFormField(out,"im_spesa_cofinanziato");%>
<tr>
<td><% controller.writeFormLabel(out,"voce_piano");%></td>
<td colspan="3"><% controller.writeFormInput(out,null,"voce_piano",isKeyEditable,null,null);%></td>
</tr>
<tr>
<% controller.writeFormField(out,"im_spesa_finanziato" + fieldAmm);%>
<% controller.writeFormField(out,"im_spesa_cofinanziato" + fieldAmm);%>
<% controller.writeFormField(out,"imTotaleSpesa");%>
</TR>
</tr>
</table>
</br>
<fieldset class="fieldset">
<legend class="GroupLabel">Voci Bilancio Associate</legend>
<legend class="GroupLabel text-primary">Voci Bilancio Associate</legend>
<% controllerVoci.writeHTMLTable(pageContext,"voce_bilancio",true,false,true,"100%","100px"); %>
</br>
<table class="Panel">
Expand Down

0 comments on commit a1489e3

Please sign in to comment.