Skip to content

Commit

Permalink
Gestione nuova interfaccia fondo economale
Browse files Browse the repository at this point in the history
  • Loading branch information
@mspasiano
mspasiano committed Mar 19, 2018
1 parent 9e37237 commit 40f0b7c
Show file tree
Hide file tree
Showing 10 changed files with 1,389 additions and 1,360 deletions.
2,174 changes: 1,102 additions & 1,072 deletions sigla-ejb/src/main/java/it/cnr/contab/fondecon00/action/FondoEconomaleAction.java
View file

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions ...src/main/resources/it/cnr/contab/doccont00/core/bulk/Obbligazione_scadenzarioBulkInfo.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<bulkInfo
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://contab.cnr.it/schema/SIGLA"
<bulkInfo
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://contab.cnr.it/schema/SIGLA"
xsi:schemaLocation="https://contab.cnr.it/schema/SIGLA https://contab.cnr.it/schema/SIGLA/BulkInfo_1_5.xsd">

<fieldProperty
Expand Down Expand Up @@ -114,57 +114,57 @@
label="im_associato_doc_contabile"
inputType="TEXT"
/>
<fieldProperty
name="cd_cig"
property="cd_cig"
label="cig"
inputType="TEXT"
<fieldProperty
name="cd_cig"
property="cd_cig"
label="cig"
inputType="TEXT"
/>
<form name="searchtool">
<formFieldProperty
name="esercizio_originale"
enabledOnSearch="true"
inputSize="5"/>
<formFieldProperty
name="pg_obbligazione"
enabledOnSearch="true"
inputSize="10"/>
<formFieldProperty
name="pg_obbligazione_scadenzario"
enabledOnSearch="true"
inputSize="4"/>
<formFieldProperty
name="im_scadenza"
inputSize="15"/>
<formFieldProperty
name="dt_scadenza"
inputSize="10"/>
<formFieldProperty
name="ds_scadenza"
inputSize="80"/>
</form>
<form name="searchtool_ridotto">
<formFieldProperty
name="esercizio_originale"
enabledOnSearch="true"
inputSize="5"
inputCssClass="w-15"/>
<formFieldProperty
name="pg_obbligazione"
enabledOnSearch="true"
inputSize="10"
inputCssClass="w-15"/>
<formFieldProperty
name="pg_obbligazione_scadenzario"
enabledOnSearch="true"
inputSize="3"
inputCssClass="w-15"/>
<formFieldProperty
name="ds_scadenza"
inputSize="20"
inputCssClass="w-55"/>
</form>

<form name="searchtool">
<formFieldProperty
name="esercizio_originale"
enabledOnSearch="true"
inputSize="5"/>
<formFieldProperty
name="pg_obbligazione"
enabledOnSearch="true"
inputSize="10"/>
<formFieldProperty
name="pg_obbligazione_scadenzario"
enabledOnSearch="true"
inputSize="4"/>
<formFieldProperty
name="im_scadenza"
inputSize="15"/>
<formFieldProperty
name="dt_scadenza"
inputSize="10"/>
<formFieldProperty
name="ds_scadenza"
inputSize="80"/>
</form>
<form name="searchtool_ridotto">
<formFieldProperty
name="esercizio_originale"
enabledOnSearch="true"
inputSize="5"
inputCssClass="w-10"/>
<formFieldProperty
name="pg_obbligazione"
enabledOnSearch="true"
inputSize="10"
inputCssClass="w-20"/>
<formFieldProperty
name="pg_obbligazione_scadenzario"
enabledOnSearch="true"
inputSize="3"
inputCssClass="w-10"/>
<formFieldProperty
name="ds_scadenza"
inputSize="20"
inputCssClass="w-100"/>
</form>

<columnFieldProperty
name="esercizio"
/>
Expand Down Expand Up @@ -195,21 +195,21 @@
name="cd_terzo"
label="Beneficiario"
property="obbligazione.cd_terzo"
/>
/>

<columnFieldProperty
name="cd_cig"
label="Cig"
property="obbligazione.contratto.cig.cdCig"
/>
<columnFieldProperty
name="cd_cig"
label="Cig"
property="obbligazione.contratto.cig.cdCig"
/>

<columnSet
name="obbligazione">
<columnFieldProperty
name="dt_scadenza"
/>
<columnFieldProperty
name="pg_obbligazione_scadenzario"
/>
<columnFieldProperty
name="pg_obbligazione_scadenzario"
/>
<columnFieldProperty
name="ds_scadenza"
Expand Down
21 changes: 14 additions & 7 deletions sigla-ejb/src/main/resources/it/cnr/contab/fondecon00/core/bulk/Fondo_economaleBulkInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@
readonlyPropertyOnInsert="chiuso"
readonlyPropertyOnEdit="chiuso"
label="Fondo" />
<fieldProperty
name="unita_organizzativa"
property="unita_organizzativa"
formName="searchtool"
inputType="SEARCHTOOL"
enabledOnInsert="false"
enabledOnEdit="false"
enabledOnFreeSearch="false"
label="Unità Organizzativa" />
<fieldProperty
name="cd_unita_organizzativa"
property="unita_organizzativa.cd_unita_organizzativa"
Expand Down Expand Up @@ -182,19 +191,14 @@
formatName="it.cnr.contab.util.EuroPositivoFormat"
nullable="false"
label="Limite minimo reintegro" />
<fieldProperty
name="unita_organizzativa"
property="unita_organizzativa"
inputType="ROTEXT"
formName="searchtool"
label="Unità Organizzativa" />


<!-- Economo -->
<fieldProperty
name="economo"
property="economo"
inputType="SEARCHTOOL"
formName="searchtool"
CRUDBusinessProcessName="CRUDAnagraficaPersonaBP"
readonlyPropertyOnInsert="ROEconomoSearchTool"
readonlyPropertyOnEdit="ROEconomoSearchTool"
enabledOnSearch="true"
Expand Down Expand Up @@ -276,6 +280,7 @@
property="mandato"
inputSize="10"
inputType="SEARCHTOOL"
formName="searchtool"
readonlyPropertyOnInsert="ROMandatoSearchTool"
readonlyPropertyOnEdit="ROMandatoSearchTool"
enabledOnSearch="false"
Expand Down Expand Up @@ -436,6 +441,7 @@
property="scadenza_ricerca"
inputSize="10"
inputType="SEARCHTOOL"
formName="searchtool_ridotto"
enabledOnSearch="false"
enabledOnFreeSearch="false"
enabledOnInsert="false"
Expand Down Expand Up @@ -506,6 +512,7 @@
property="scadenza_ricerca.obbligazione.creditore"
inputType="SEARCHTOOL"
readonlyProperty="ROcreditore_scadenzaSearchTool"
formName="searchtool"
enabledOnSearch="true"
enabledOnFreeSearch="false"
completeOnSave="false"
Expand Down
2 changes: 2 additions & 0 deletions ...torage/sigla-storage-commons/src/main/java/it/cnr/contab/spring/storage/StoreService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -173,6 +174,7 @@ public Boolean delete(StorageObject storageObject){
}

public Boolean delete(String key){
Assert.notNull(key);
return siglaStorageService.delete(key);
}

Expand Down
7 changes: 4 additions & 3 deletions sigla-web/src/main/webapp/fondecon00/fondo_spesa.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
bp.openFormWindow(pageContext);
%>

<TABLE class="Panel">
<div class="card p-2 w-100">
<table class="Panel">
<TR>
<% bp.getController().writeFormField(out,"pg_fondo_spesa"); %>
</TR>
Expand Down Expand Up @@ -206,7 +206,8 @@
</TD>
</TR>
<% } %>
</TABLE>
</table>
</div>
<%
bp.closeFormWindow(pageContext);
%>
Expand Down
15 changes: 6 additions & 9 deletions sigla-web/src/main/webapp/fondecon00/stampa_vpg_fondo_economale.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,35 @@

<% BulkBP bp = (BulkBP)BusinessProcess.getBusinessProcess(request);
bp.openFormWindow(pageContext); %>

<div class="card p-2 w-100">
<table class="Panel">
<tr>
<td><% bp.getController().writeFormLabel(out,"cdCDSForPrint"); %></td>
<td><% bp.getController().writeFormInput(out,"cdCDSForPrint"); %></td>
<td colspan="3"><% bp.getController().writeFormInput(out,"cdCDSForPrint"); %></td>
</tr>
<tr>
<td><% bp.getController().writeFormLabel(out,"cdUOForPrint"); %></td>
<td>
<td colspan="3">
<% bp.getController().writeFormInput(out,"cdUOForPrint"); %>
<% bp.getController().writeFormInput(out,"dsUOForPrint"); %>
</td>
</tr>
</table>
<br>
<table class="Panel">
<tr>
<td><% bp.getController().writeFormLabel(out,"fondoForPrint"); %></td>
<td><% bp.getController().writeFormInput(out,"cd_fondoForPrint"); %></td>
<td><% bp.getController().writeFormInput(out,"ds_fondoForPrint"); %></td>
<td><% bp.getController().writeFormInput(out,"fondoForPrint"); %></td>
</tr>
</table>
<table class="Panel">
<tr>
<td><% bp.getController().writeFormLabel(out,"dataInizio"); %></td>
<td><% bp.getController().writeFormInput(out,"dataInizio"); %></td>
</tr>
<tr>
<td><% bp.getController().writeFormLabel(out,"dataFine"); %></td>
<td><% bp.getController().writeFormInput(out,"dataFine"); %></td>
</tr>
</table>

</div>
<% bp.closeFormWindow(pageContext); %>

</body>
Expand Down
Loading

0 comments on commit 40f0b7c

Please sign in to comment.