Sfoglia il codice sorgente

- aggiunta descrizione nel SC avvisi

- modifiche ai template avvisi
feature/pannello-pratiche
marcoalderighi 2 anni fa
parent
commit
c2d2bc4612
  1. 6
      jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml
  2. 4
      jasper/reports-2023/FL2_avviso_fine_lavori.jrxml
  3. 8
      jasper/reports-2023/FL3-4_vidimazione-attestazione.jrxml
  4. 11
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java
  5. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp

6
jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml

@ -231,6 +231,7 @@
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="91" y="176" width="458" height="15" uuid="eebebb00-ee6a-490c-ba75-5fafadc9043d">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[!"".equalsIgnoreCase( $F{numeroProtocollo} ) && $F{numeroProtocollo}!=null]]></printWhenExpression>
</reportElement>
<textElement>
<font fontName="DejaVu Sans"/>
@ -240,6 +241,7 @@
<staticText>
<reportElement positionType="Float" x="9" y="176" width="82" height="15" uuid="75c195a3-8c3e-4aef-ada3-41361d35dffa">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[!"".equalsIgnoreCase( $F{numeroProtocollo} ) && $F{numeroProtocollo}!=null]]></printWhenExpression>
</reportElement>
<textElement>
<font fontName="DejaVu Sans Bold" isBold="false"/>
@ -345,7 +347,7 @@
<textField>
<reportElement positionType="Float" x="277" y="423" width="269" height="20" uuid="18642a9d-131c-452d-af39-2b04fe676cf6">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[$V{PAGE}.equals($V{PAGE_NUMBER}) ]]></printWhenExpression>
<printWhenExpression><![CDATA[$V{PAGE}.equals($V{PAGE_NUMBER})]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="DejaVu Sans Bold" size="9" isBold="false" isStrikeThrough="false"/>
@ -355,7 +357,7 @@
<textField>
<reportElement positionType="Float" x="277" y="442" width="269" height="20" uuid="75e0a0cc-48e5-4df7-83f0-94be0b2cfa85">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[$V{PAGE}.equals($V{PAGE_NUMBER}) ]]></printWhenExpression>
<printWhenExpression><![CDATA[$V{PAGE}.equals($V{PAGE_NUMBER})]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="DejaVu Sans Bold" size="9" isBold="false" isStrikeThrough="false"/>

4
jasper/reports-2023/FL2_avviso_fine_lavori.jrxml

@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="vidimazione" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="afafe5d8-778e-4527-a33a-8c04000abd71">
<property name="ireport.zoom" value="1.9487171000000059"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="624"/>
<property name="ireport.y" value="288"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<subDataset name="dataset1" whenResourceMissingType="Empty" uuid="c69a9629-80ab-47f7-a2f9-7db3f777d9a7">
<field name="codiceAllegato" class="java.lang.String"/>
@ -246,6 +246,7 @@
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="91" y="176" width="458" height="15" uuid="eebebb00-ee6a-490c-ba75-5fafadc9043d">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[!"".equalsIgnoreCase( $F{numeroProtocollo} ) && $F{numeroProtocollo}!=null]]></printWhenExpression>
</reportElement>
<textElement>
<font fontName="DejaVu Sans"/>
@ -255,6 +256,7 @@
<staticText>
<reportElement positionType="Float" x="9" y="176" width="82" height="15" uuid="75c195a3-8c3e-4aef-ada3-41361d35dffa">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[!"".equalsIgnoreCase( $F{numeroProtocollo} ) && $F{numeroProtocollo}!=null]]></printWhenExpression>
</reportElement>
<textElement>
<font fontName="DejaVu Sans Bold" isBold="false"/>

8
jasper/reports-2023/FL3-4_vidimazione-attestazione.jrxml

@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="vidimazione" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="afafe5d8-778e-4527-a33a-8c04000abd71">
<property name="ireport.zoom" value="1.9487171000000059"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="624"/>
<property name="ireport.y" value="240"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<subDataset name="dataset1" whenResourceMissingType="Empty" uuid="c69a9629-80ab-47f7-a2f9-7db3f777d9a7">
<field name="codiceAllegato" class="java.lang.String"/>
@ -246,6 +246,7 @@
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="91" y="172" width="458" height="15" uuid="eebebb00-ee6a-490c-ba75-5fafadc9043d">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[!"".equalsIgnoreCase( $F{numeroProtocollo} ) && $F{numeroProtocollo}!=null]]></printWhenExpression>
</reportElement>
<textElement>
<font fontName="DejaVu Sans"/>
@ -255,6 +256,7 @@
<staticText>
<reportElement positionType="Float" x="9" y="172" width="82" height="15" uuid="75c195a3-8c3e-4aef-ada3-41361d35dffa">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[!"".equalsIgnoreCase( $F{numeroProtocollo} ) && $F{numeroProtocollo}!=null]]></printWhenExpression>
</reportElement>
<textElement>
<font fontName="DejaVu Sans Bold" isBold="false"/>
@ -378,7 +380,7 @@
<text><![CDATA[ATTESTAZIONE DI DEPOSITO FINE LAVORI]]></text>
</staticText>
<componentElement>
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="451" width="539" height="30" isRemoveLineWhenBlank="true" uuid="1433a1bd-a6fa-450e-9f93-c9eac4a9abb0">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="1" y="452" width="539" height="30" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="1433a1bd-a6fa-450e-9f93-c9eac4a9abb0">
<property name="com.jaspersoft.studio.unit.CONTENTS.height" value="px"/>
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<printWhenExpression><![CDATA[$F{richiestaAttestazione}]]></printWhenExpression>
@ -405,7 +407,7 @@
</reportElement>
</ellipse>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="20" y="10" width="519" height="14" uuid="7fef2560-fa53-4b28-8150-81256faa1884">
<reportElement x="20" y="12" width="519" height="14" uuid="7fef2560-fa53-4b28-8150-81256faa1884">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement>
<textElement textAlignment="Left" verticalAlignment="Middle">

11
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java

@ -1,5 +1,6 @@
package it.tref.liferay.portos.bo.util;
import it.tref.liferay.portos.bo.model.Avviso;
import it.tref.liferay.portos.bo.model.DettPratica;
import it.tref.liferay.portos.bo.model.IntPratica;
import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
@ -14,6 +15,7 @@ import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.exception.SystemException;
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.StringPool;
import com.liferay.portal.kernel.util.Validator;
public class AvvisoUtil {
@ -147,6 +149,15 @@ public class AvvisoUtil {
return allTipoDocumentoFileTemplateProps;
}
public static String getAvvisoDescription(Avviso avviso){
if(!"MA".equals(avviso.getTipoDocumento())){
if(Validator.isNotNull(avviso.getDescLong())){
return "<br/>" + avviso.getDescLong();
}
}
return StringPool.BLANK;
}
public static String getTipoReport(DettPratica dettPratica, String tipoDocumento) {

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp

@ -31,7 +31,7 @@
<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Data" value="<%= Validator.isNotNull(avviso.getDtAvviso()) ?dateFormatDate.format(avviso.getDtAvviso()):StringPool.BLANK %>" />
<liferay-ui:search-container-column-text name="Tipo Documento">
<%= avviso.getFullDescription() %>
<%= avviso.getFullDescription() + AvvisoUtil.getAvvisoDescription(avviso) %>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Firma In Corso" cssClass="text-nowrap">
<%= avviso.getFirmaInCorso() ? "Si" : "No" %>

Caricamento…
Annulla
Salva