From d55b35f7931b7779808ec4440f9c0f043a82a518 Mon Sep 17 00:00:00 2001 From: marcoalderighi Date: Wed, 8 Mar 2023 15:46:10 +0100 Subject: [PATCH] fix vari --- .../docroot/WEB-INF/lib/portos-bo-shared.jar | Bin 45581 -> 45581 bytes .../report/builder/bean/ReportAvvisoBean.java | 9 +++++++++ .../builder/ReportAvvisoBeanBuilder.java | 3 +++ .../html/fascicolo/navigator/header.jsp | 3 ++- .../html/fascicolo/navigator/page_fl_dati.jsp | 2 +- .../portos/fe/portlet/FascicoloFePortlet.java | 2 +- .../edit_first-step-fine-lavori.jsp | 9 +++++++-- .../verify_fine-lavori_calcolo.jsp | 2 +- 8 files changed, 24 insertions(+), 6 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index c24f328af0090198f251eb1ce3891d848c8cf0e5..17a80458f30c52a145dd162c58696d0e7abf705e 100644 GIT binary patch delta 963 zcmY+?TS${(7zgn0wA@llIuJ^Q9n8Y1p=M@f>aw(|_w8G=TWEF*ewk`f zTF!BDjvLXo`t1;gwXM7FY#Gt&j&uKAqUXM(DsoA)dy6olWePqF#PSh9$L|6LJ|2AJ zw}M4p3BrYFP$=l~Tc+l;K^B zW_fxUd&kQqx#v|}O|o&(Q*db&Q)HZfwIA}6z>N|d-;k$((V zDF2FiC9c5F5uAD8&lefT&H1yJb)l}AxCI&d-3iImw>`;5PN?qDypqE_<+8L%9(^h5 zx0F|BxT!v$rKOy$sit$@=kBD;pPZ4S|9epyPjf##Xi#VSa@?EstiDajUO0kWO}ac^ z^vqsR(O#wAK#pFSrCCFDV>ILDb(=tEJR6;^s`WhkZGZMVA(SmTm$67^fUCB#QAYLr zl~IZ{o^QO#hZSg)Y@lVW>*(EWbcViVfxOiAm!7ZU{w*KRY&QRRkLSO_Vho8$mkp7i z$3UNW%CHwH(3k*njVZuvJOX|gW58z9K9FxxfiBY_@YAFLD)R|oHs=GOy#N$@dEK6l zw65bADDB7r!yTtUh=mqwEVMXbX~1G`Co$crN6P6U#=7c}G~Kmetosaz?;$KbrAPr* z8e3^Sjr75)1Btd0V7HZnpx(2fq4z2f?dL(Iy%0>=D?n-=ZFlt1VF3=BP~#{=ZPr2C kv-+tv)PD|(!2^_T4A8!BUecX(*mEb14IiZKj|MOP19$L%kpKVy delta 963 zcmY+?Ye-XJ7zglkTW+Z(T?nPZGP7`MsF_)rx-@NQ8gr;cUecARNoh^73`^~Xf}SF% zcF}p+oYUD1`cx4Fg+-_ztkB$tp#??Zml6a!|7TzFeEFUK`#kUaoU^kw57*}5{Ib=& zu$p1y4CB^z`0eIqv>p5IhPbslE%V>SOZVlqQ7f7~A)H$)D%fxk$3_AjyB8SP1n`;N z0hU=Mh~Q#C2^R+*aYulgQ&Wx42G{u_pGC)0 z{uTS0UxS|`IQ#IQuQG;N@E2b-hPmeAmt^SoB&JZ`u4EfIsk%?|%8#;?D>J58^rfob zQ(m9tq55J@0p(mx9i8(re-CB$)SMjs-%B%Cn)~HpvpUz8Vcu;Pn>v-^OGl8aRafYX zp81O^+N;zX$g!*QG;6eRoMzm*VdLnG=VP>-fE$bcVitiM-tTm!7Zs!EGODwz&9Yzw}=bV+~12R}4|0 z-$0*u+He3V(3lAFjj6zFJO+LkW5IUQK~Q8;fnHM@_-WDrmH8wvn~MO~RSe3!yzR8-LN6PCZ#(SHPG<^+VyzeYX=qD`w6-WVA z8e3yMgY?O&14*`WV7FC)pn-FsdEgr0?H53ey#!3zt3mo8ZFdaPVF3=BQ17TjZQeoK kbB3rkI&>b3!NZhp4%5DGUNW6@*b66(jToWrk4G;311tNAEdT%j diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java index 5c2150aa..6e27c6e3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java @@ -49,6 +49,15 @@ public class ReportAvvisoBean implements Serializable { private Boolean parziale; private String parzialeNumero; private boolean richiestaAttestazione; + private String dataPraticaString; + + public String getDataPraticaString() { + return dataPraticaString; + } + + public void setDataPraticaString(String dataPraticaString) { + this.dataPraticaString = dataPraticaString; + } public boolean isRichiestaAttestazione() { return richiestaAttestazione; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index 123b8665..f763e89d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -179,11 +179,14 @@ public class ReportAvvisoBeanBuilder { if (FineLavori.class.getName().equalsIgnoreCase(avviso.getClassName())) { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(avviso.getClassPk()); bean.setDataPratica(fineLavori.getDtProtocollo()); + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(fineLavori.getDtProtocollo())); } else if (Collaudo.class.getName().equalsIgnoreCase(avviso.getClassName())) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(avviso.getClassPk()); bean.setDataPratica(collaudo.getDtProtocollo()); + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(collaudo.getDtProtocollo())); } else { bean.setDataPratica(intPratica.getDtPratica()); + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(intPratica.getDtPratica())); } bean.setDataAvviso(avviso.getModifiedDate()); bean.setTipoPratica(intPratica.getTipoPratica()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp index 29dc9460..2fafee6c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp @@ -80,7 +80,8 @@
Data Inizio Lavori:
- <%= dateFormatDate.format(dettPratica.getDataInizioLavoriOpera()) %> + <%= Validator.isNotNull(dettPratica.getDataInizioLavoriOpera()) ? + dateFormatDate.format(dettPratica.getDataInizioLavoriOpera()) : StringPool.DASH %>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp index bad1d829..4f03caa5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_dati.jsp @@ -27,7 +27,7 @@ > - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index 6f80e534..d45abb1a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -784,7 +784,7 @@ public class FascicoloFePortlet extends MVCPortlet { try { FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(fineLavoriId); - if (!fineLavori.isCompletata()) { + if (!fineLavori.isCompletata() && Validator.isNotNull(dataFineLavori)) { fineLavori.setParziale(parziale); fineLavori.setDataFineLavori(dataFineLavori); FineLavoriServiceUtil.updateFineLavori(fineLavori); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp index 727a3218..01ad6ad2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_first-step-fine-lavori.jsp @@ -18,10 +18,14 @@ if (dettPratica == null) { } String fmName = "fmFirstStepFineLavori"; %> + + + + - +
- + @@ -91,6 +95,7 @@ String fmName = "fmFirstStepFineLavori"; +
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp index 39bffa01..aea103e0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp @@ -282,7 +282,7 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
- <%= LanguageUtil.get(pageContext, "label-disclaimer-bollo-16-euro"); %> + <%= LanguageUtil.get(pageContext, "label-disclaimer-bollo-16-euro") %>