Sfoglia il codice sorgente

-fix visualizzazione sticker H pratica ospedaliera

feature/advanced-operation
marcoalderighi 2 anni fa
parent
commit
abec029a83
  1. BIN
      liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar
  2. BIN
      liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar
  3. BIN
      liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar
  4. BIN
      liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar
  5. BIN
      liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar
  6. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar
  7. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar
  8. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar
  9. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar
  10. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar
  11. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
  12. 14
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp
  13. BIN
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar
  14. BIN
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar
  15. BIN
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar
  16. 13
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf

BIN
liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar

File binario non mostrato.

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties

@ -1299,6 +1299,7 @@ istruttore = Istruttore
Note_interne = Note Interne Note_interne = Note Interne
testo_del_documento = Testo del documento testo_del_documento = Testo del documento
esito = Esito esito = Esito
assegna = Assegna
registra-esito = Registra Esito registra-esito = Registra Esito
assign-to-me = Prendi in carico assign-to-me = Prendi in carico
change-uo = Cambia U.O. change-uo = Cambia U.O.

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

@ -12,7 +12,7 @@
<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> <%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.Constants"%> <%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%>
<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%>
<%@page import="java.util.ArrayList"%> <%@page import="java.util.ArrayList"%>
<%@page import="javax.portlet.PortletURL"%> <%@page import="javax.portlet.PortletURL"%>
@ -107,7 +107,7 @@ iteratorURL.setParameter("orderByCol", orderByCol);
<liferay-portlet:param name="backURL" value="<%= iteratorURL.toString() %>" /> <liferay-portlet:param name="backURL" value="<%= iteratorURL.toString() %>" />
</liferay-portlet:renderURL> </liferay-portlet:renderURL>
<liferay-ui:search-container-column-text name="#" cssClass="text-center middle-aligned"> <liferay-ui:search-container-column-text name="#" cssClass="text-center middle-aligned">
<div class="flex-center"> <div class="flex-center" style="flex: 0 0 auto;">
<c:if test="<%= intPratica.isSospesa() %>"> <c:if test="<%= intPratica.isSospesa() %>">
<span class="btn status-icon tooltip-info btn-action" title="Sospesa"> <span class="btn status-icon tooltip-info btn-action" title="Sospesa">
<span class="fa fa-circle txt-orange"></span> <span class="fa fa-circle txt-orange"></span>
@ -121,7 +121,7 @@ iteratorURL.setParameter("orderByCol", orderByCol);
<c:if test="<%= intPratica.getStatoPratica().equalsIgnoreCase( <c:if test="<%= intPratica.getStatoPratica().equalsIgnoreCase(
StatoPraticaConstants.SOTTOPOSTA_A_PARERE) %>"> StatoPraticaConstants.SOTTOPOSTA_A_PARERE) %>">
<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" <span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info"
title="Sottoposta a parere" style="padding:5px;margin-right:5px"> title="Sottoposta a parere" style="padding:5px;margin-right:5px;width: 100%">
<%= StatoPraticaConstants.SOTTOPOSTA_A_PARERE %> <%= StatoPraticaConstants.SOTTOPOSTA_A_PARERE %>
</span> </span>
</c:if> </c:if>
@ -132,6 +132,14 @@ iteratorURL.setParameter("orderByCol", orderByCol);
</span> </span>
</c:if> </c:if>
</div> </div>
<div class="flex-center" style="flex: 0 0 auto;">
<c:if test="<%= intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q4H) %>">
<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%;">
H
</span>
</c:if>
</div>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<!-- SORTEGGIATA --> <!-- SORTEGGIATA -->
<liferay-ui:search-container-column-text name="n-progetto" href="<%=viewURL %>" cssClass=""> <liferay-ui:search-container-column-text name="n-progetto" href="<%=viewURL %>" cssClass="">

BIN
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar

File binario non mostrato.

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

@ -26,6 +26,7 @@
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%>
<%@page import="java.util.Arrays"%> <%@page import="java.util.Arrays"%>
<%@page import="java.util.List"%> <%@page import="java.util.List"%>
<c:if test="<%= intPratica.getStatus() != WorkflowConstants.STATUS_ANY || isAltriProgetti %>"> <c:if test="<%= intPratica.getStatus() != WorkflowConstants.STATUS_ANY || isAltriProgetti %>">
@ -66,7 +67,7 @@ if (lastDettPratica == null) {
} }
%> %>
<liferay-ui:search-container-column-text name="#" cssClass="text-center middle-aligned"> <liferay-ui:search-container-column-text name="#" cssClass="text-center middle-aligned">
<div class="flex-center"> <div class="flex-center" style="flex: 0 0 auto;">
<c:if test="<%= intPratica.isSospesa() %>"> <c:if test="<%= intPratica.isSospesa() %>">
<span class="btn status-icon tooltip-info btn-action" title="Sospesa"> <span class="btn status-icon tooltip-info btn-action" title="Sospesa">
<span class="fa fa-circle txt-orange"></span> <span class="fa fa-circle txt-orange"></span>
@ -75,7 +76,7 @@ if (lastDettPratica == null) {
<c:if test="<%= StatoPraticaConstants.SOTTOPOSTA_A_PARERE.equalsIgnoreCase(intPratica.getStatoPratica()) %>"> <c:if test="<%= StatoPraticaConstants.SOTTOPOSTA_A_PARERE.equalsIgnoreCase(intPratica.getStatoPratica()) %>">
<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" <span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info"
title="<%= LanguageUtil.get(pageContext, "stato-pratica-SP") %>" title="<%= LanguageUtil.get(pageContext, "stato-pratica-SP") %>"
style="padding: 5px;margin-right: 5px"> style="padding: 5px;margin-right: 5px;width: 100%">
SP SP
</span> </span>
</c:if> </c:if>
@ -85,6 +86,14 @@ if (lastDettPratica == null) {
</span> </span>
</c:if> </c:if>
</div> </div>
<div class="flex-center" style="flex: 0 0 auto;">
<c:if test="<%= intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q4H) %>">
<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%;">
H
</span>
</c:if>
</div>
</liferay-ui:search-container-column-text> </liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text name="n-progetto" href="<%= rowUrl %>" cssClass="text-nowrap middle-aligned"> <liferay-ui:search-container-column-text name="n-progetto" href="<%= rowUrl %>" cssClass="text-nowrap middle-aligned">
<%= intPratica.getTitle(locale, false) %> <%= intPratica.getTitle(locale, false) %>

Caricamento…
Annulla
Salva