Sfoglia il codice sorgente

- fix bottone CAMBIA STATO in BO

- fixes AOP
feature/fix_soggetti
marcoalderighi 2 anni fa
parent
commit
2384d6aa22
  1. 4
      liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java
  2. 3
      liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp
  3. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp
  4. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp
  5. 2
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf

4
liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java

@ -225,7 +225,9 @@ public class AdvancedOperationUtil {
WorkflowTask task = WorkflowUtil.getLastTask( WorkflowTask task = WorkflowUtil.getLastTask(
controlloPratica.getCompanyId(), controlloPratica.getCompanyId(),
controlloPratica.getGroupId(), null, controlloPratica); controlloPratica.getGroupId(), null, controlloPratica);
return task.isCompleted(); if(Validator.isNotNull(task)){
return task.isCompleted();
}
} catch (PortalException | SystemException e) { } catch (PortalException | SystemException e) {
_log.error(e, e); _log.error(e, e);
} }

3
liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp

@ -673,7 +673,7 @@
<liferay-ui:search-container emptyResultsMessage="no-entries"> <liferay-ui:search-container emptyResultsMessage="no-entries">
<liferay-ui:search-container-results <liferay-ui:search-container-results
results="<%= ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId) %>" results="<%= ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId) %>"
total="<%= ControlloPraticaLocalServiceUtil.countByIntPratica(intPraticaId) %>" total="<%= ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId).size() %>"
/> />
<liferay-ui:search-container-row <liferay-ui:search-container-row
className="it.tref.liferay.portos.bo.model.ControlloPratica" className="it.tref.liferay.portos.bo.model.ControlloPratica"
@ -716,6 +716,7 @@
<div id ='<%= renderResponse.getNamespace()+"confirmationModalDiv" %>' class="hide" style="display:block;"> <div id ='<%= renderResponse.getNamespace()+"confirmationModalDiv" %>' class="hide" style="display:block;">
</div> </div>
<aui:script use="event-valuechange,aui-modal,aui-io-request"> <aui:script use="event-valuechange,aui-modal,aui-io-request">
<% if(Validator.isNotNull(intPratica)){ %> <% if(Validator.isNotNull(intPratica)){ %>

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp

@ -85,7 +85,7 @@ long territorioGroupId = territorio.getGroupId();
</liferay-util:include> </liferay-util:include>
</c:if> </c:if>
<c:if test="<%= !intPratica.isSospesa() %>"> <c:if test="<%= !intPratica.isSospesa() %>">
<c:if test="<%= statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO) %>"> <c:if test="<%= !statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO) %>">
<liferay-util:include page="/html/fascicolo/actions/action_cambia_stato_pratica.jsp" servletContext="<%= application %>" > <liferay-util:include page="/html/fascicolo/actions/action_cambia_stato_pratica.jsp" servletContext="<%= application %>" >
<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param> <liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
<liferay-util:param name="buttonIdCambiaStato" value="<%=buttonIdCambiaStato %>"></liferay-util:param> <liferay-util:param name="buttonIdCambiaStato" value="<%=buttonIdCambiaStato %>"></liferay-util:param>

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

@ -231,7 +231,7 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
</div> </div>
<div class="flex-center" style="flex: 0 0 auto;"> <div class="flex-center" style="flex: 0 0 auto;">
<c:if test="<%= intPratica.isPraticaOspedaliera() %>"> <c:if test="<%= intPratica.isPraticaOspedaliera() %>">
<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 100%;"> <span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 35px;">
H H
</span> </span>
</c:if> </c:if>

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

@ -94,7 +94,7 @@
</div> </div>
<div class="flex-center" style="flex: 0 0 auto;"> <div class="flex-center" style="flex: 0 0 auto;">
<c:if test="<%= intPratica.isPraticaOspedaliera() %>"> <c:if test="<%= intPratica.isPraticaOspedaliera() %>">
<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 100%;"> <span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 35px;">
H H
</span> </span>
</c:if> </c:if>

Caricamento…
Annulla
Salva