Salvatore La Manna 4 anni fa
parent
commit
88caa473b2
  1. 7
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java
  2. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
  3. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  4. 2
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
  5. 2
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp

7
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java

@ -36,6 +36,7 @@ import com.liferay.portal.kernel.util.Validator;
* *
* @author Davide Barbagallo, 3F Consulting * @author Davide Barbagallo, 3F Consulting
*/ */
@SuppressWarnings("serial")
public class IntPraticaImpl extends IntPraticaBaseImpl { public class IntPraticaImpl extends IntPraticaBaseImpl {
/* /*
* NOTE FOR DEVELOPERS: Never reference this class directly. All methods * NOTE FOR DEVELOPERS: Never reference this class directly. All methods
@ -49,12 +50,6 @@ public class IntPraticaImpl extends IntPraticaBaseImpl {
} }
@Override
public void setStatoPratica(String statoPratica) {
_log.info("Progetto " + getNumeroProgetto() + " - setStatoPratica(\"" + statoPratica + "\")");
super.setStatoPratica(statoPratica);
}
public String getTitle(Locale locale, boolean completed) { public String getTitle(Locale locale, boolean completed) {
DettPratica dettPratica = null; DettPratica dettPratica = null;

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java

@ -1005,12 +1005,14 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
intPratica.setStatoPratica(StatoPraticaConstants.VIDIMATA); intPratica.setStatoPratica(StatoPraticaConstants.VIDIMATA);
} else if (status == WorkflowConstants.STATUS_DENIED) { } else if (status == WorkflowConstants.STATUS_DENIED) {
intPratica.setStatus(status); intPratica.setStatus(status);
if (!intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.NO_PARERE)) {
if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) {
intPratica.setStatoPratica(StatoPraticaConstants.NON_AUTORIZZATA); intPratica.setStatoPratica(StatoPraticaConstants.NON_AUTORIZZATA);
} else { } else {
// SANATORIA (da capire) // SANATORIA (da capire)
intPratica.setStatoPratica(StatoPraticaConstants.NON_CONFORME); intPratica.setStatoPratica(StatoPraticaConstants.NON_CONFORME);
} }
}
} else if (status == WorkflowConstants.STATUS_PENDING) { } else if (status == WorkflowConstants.STATUS_PENDING) {
intPratica.setStatus(WorkflowConstants.STATUS_PENDING); intPratica.setStatus(WorkflowConstants.STATUS_PENDING);
intPratica.setStatoPratica(StatoPraticaConstants.SOTTOPOSTA_A_PARERE); intPratica.setStatoPratica(StatoPraticaConstants.SOTTOPOSTA_A_PARERE);

4
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@ -13,8 +13,8 @@
## ##
build.namespace=portos_bo build.namespace=portos_bo
build.number=2800 build.number=2804
build.date=1607692123061 build.date=1607702639855
build.auto.upgrade=true build.auto.upgrade=true
## ##

2
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf

@ -112,7 +112,7 @@
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="Stato Pratica" cssClass="text-nowrap text-center middle-aligned"> <liferay-ui:search-container-column-text name="Stato Pratica" cssClass="text-nowrap text-center middle-aligned">
<strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica)) %></strong> <strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getIntPraticaId())) %></strong>
<span class="text-center display-block" style="margin-top:5px"> <span class="text-center display-block" style="margin-top:5px">
<c:if test="<%= !lastDettPratica.isApproved() && !TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(lastDettPratica.getTipoIntegrazione())%>"> <c:if test="<%= !lastDettPratica.isApproved() && !TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(lastDettPratica.getTipoIntegrazione())%>">

2
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp

@ -112,7 +112,7 @@
Stato: Stato:
</div> </div>
<div class="col-sm-4 col-md-4"> <div class="col-sm-4 col-md-4">
<strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica)) %></strong> <strong><%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPraticaId)) %></strong>
</div> </div>
</div> </div>
</div> </div>

Caricamento…
Annulla
Salva