Sfoglia il codice sorgente

Aggiunta campi a servlet mappe

master
Salvatore La Manna 3 anni fa
parent
commit
56fc1812d6
  1. 9
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml
  2. 32
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml
  3. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java
  4. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties
  5. 22
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/bean/MappeBean.java
  6. 30
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/MappeConfigurazionePortlet.java
  7. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/IntPraticaAdvancedSearch.java
  8. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/servlet/MappeServlet.java
  9. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/asset/ControlloPraticaAssetRenderer.java
  10. 53
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/PaesaggisticaAdministrationPortlet.java
  11. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java
  12. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivitaistruttore/action_button.jsp
  13. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_actions.jsp
  14. 32
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/mappe/configurazione/view.jsp
  15. 20
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/paesaggistica_administration/view.jsp
  16. 8
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp
  17. 199
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
  18. 5
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp
  19. 857
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp
  20. 182
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp
  21. 2
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions.jsp
  22. 1
      liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath
  23. 17
      liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaBean.java
  24. 1
      liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/IstruttoreBean.java
  25. 9
      liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Fascicolo.java
  26. 2
      liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Protocollo.java
  27. 6
      liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java

9
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml

@ -160,6 +160,15 @@
<footer-portlet-javascript>/js/main.js?v=2</footer-portlet-javascript>
<css-class-wrapper>portos-administration-portlet</css-class-wrapper>
</portlet>
<portlet>
<portlet-name>mappe-configurazione</portlet-name>
<icon>/icon.png</icon>
<control-panel-entry-category>configuration</control-panel-entry-category>
<control-panel-entry-weight>1.1</control-panel-entry-weight>
<header-portlet-css>/css/main.css?v=1</header-portlet-css>
<footer-portlet-javascript>/js/main.js?v=1</footer-portlet-javascript>
<css-class-wrapper>mappe-configurazione-portlet</css-class-wrapper>
</portlet>
<portlet>
<portlet-name>ricerca-posizione</portlet-name>
<icon>/icon.png</icon>

32
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml

@ -387,6 +387,38 @@
<role-name>user</role-name>
</security-role-ref>
</portlet>
<portlet>
<portlet-name>mappe-configurazione</portlet-name>
<display-name>Configurazione plugin mappe</display-name>
<portlet-class>it.mwg.sismica.bo.portlet.MappeConfigurazionePortlet</portlet-class>
<init-param>
<name>view-template</name>
<value>/html/mappe/configurazione/view.jsp</value>
</init-param>
<expiration-cache>0</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
</supports>
<resource-bundle>content.Language</resource-bundle>
<portlet-info>
<title>Configurazione plugin mappe</title>
<short-title>Configurazione mappe</short-title>
<keywords></keywords>
</portlet-info>
<security-role-ref>
<role-name>administrator</role-name>
</security-role-ref>
<security-role-ref>
<role-name>guest</role-name>
</security-role-ref>
<security-role-ref>
<role-name>power-user</role-name>
</security-role-ref>
<security-role-ref>
<role-name>user</role-name>
</security-role-ref>
</portlet>
<portlet>
<portlet-name>ricerca-posizione</portlet-name>
<display-name>Ricerca per posizione</display-name>

5
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java

@ -74,7 +74,7 @@ public class MappeUtil {
.append(request.getServerName());
if ((request.isSecure() && (request.getServerPort() != Http.HTTPS_PORT))
|| (!request.isSecure() && (request.getServerPort() != Http.HTTP_PORT))) {
cb.append(StringPool.COLON).append(request.getServerPort());
cb.append(':').append(request.getServerPort());
}
cb.append(request.getContextPath()).append(request.getServletPath()).append("/mappe/list?");
if (0 == comuneId) {
@ -82,12 +82,11 @@ public class MappeUtil {
} else {
cb.append("c=").append(comuneId);
}
_log.info("cb = " + cb);
url = ConfigurazioneLocalServiceUtil
.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)
.replace("{{PROVINCIA}}", siglaProvincia).replace("{{COD_BELFIORE}}", codiceBelfiore)
.replace("{{URL}}", urlEncode(cb.toString()))
+ StringPool.AMPERSAND + getAuth(companyId, request.getServerName());
+ '&' + getAuth(companyId, request.getServerName());
}
return url;
}

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

@ -331,3 +331,8 @@ label-integrazione-13 = Variante
ricerca-posizione = Ricerca per posizione
ricerca-indirizzo = Ricerca per indirizzo
ricerca-progetto = Ricerca per progetto
conf.sismica.mappe.secret = Segreto condiviso
conf.sismica.mappe.iframe.url.fe = Url iframe Front End
conf.sismica.mappe.iframe.url.bo = Url iframe Back Office
conf.sismica.mappe.iframe.url.ricerca = Url iframe Ricerca

22
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/bean/MappeBean.java

@ -3,6 +3,8 @@ package it.mwg.sismica.bo.bean;
public class MappeBean {
private String comune;
private String nomeComune;
private String provincia;
private String numeroProgetto;
private String descrizione;
private String estremiCatastali;
@ -35,11 +37,21 @@ public class MappeBean {
return lng;
}
public String getNomeComune() {
return nomeComune;
}
public String getNumeroProgetto() {
return numeroProgetto;
}
public String getProvincia() {
return provincia;
}
public String getUrl() {
return url;
@ -70,11 +82,21 @@ public class MappeBean {
this.lng = lng;
}
public void setNomeComune(String nomeComune) {
this.nomeComune = nomeComune;
}
public void setNumeroProgetto(String numeroProgetto) {
this.numeroProgetto = numeroProgetto;
}
public void setProvincia(String provincia) {
this.provincia = provincia;
}
public void setUrl(String url) {
this.url = url;

30
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/MappeConfigurazionePortlet.java

@ -0,0 +1,30 @@
package it.mwg.sismica.bo.portlet;
import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
import java.util.Arrays;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.exception.SystemException;
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.service.ServiceContext;
import com.liferay.portal.service.ServiceContextFactory;
import com.liferay.util.bridges.mvc.MVCPortlet;
public class MappeConfigurazionePortlet extends MVCPortlet {
public void salvaImpostazioni(ActionRequest request, ActionResponse response) throws PortalException,
SystemException {
ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
for (String campo : Arrays.asList(ConfigurazioneConstants.MAPPE_SHARED_SECRET,
ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO,
ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)) {
ConfigurazioneLocalServiceUtil.storeConfig(campo, ParamUtil.getString(request, campo), serviceContext);
}
}
}

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/IntPraticaAdvancedSearch.java

@ -84,7 +84,6 @@ public class IntPraticaAdvancedSearch {
booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
// Condizioni aggiuntive
query(request, user, booleanQuery, searchContext);
hits = SearchEngineUtil.search(searchContext, booleanQuery);
logResults(user, booleanQuery, hits);
} catch (SearchException | ParseException e) {

5
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/servlet/MappeServlet.java

@ -4,10 +4,12 @@ import it.mwg.sismica.bo.bean.MappeBean;
import it.tref.liferay.portos.bo.model.Comune;
import it.tref.liferay.portos.bo.model.DettPratica;
import it.tref.liferay.portos.bo.model.IntPratica;
import it.tref.liferay.portos.bo.model.Provincia;
import it.tref.liferay.portos.bo.model.Territorio;
import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil;
import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
import it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil;
@ -109,7 +111,10 @@ public class MappeServlet extends HttpServlet {
try {
Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(pratica.getTerritorioId());
Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(companyId, comune.getCodiceProvincia());
bean.setComune(comune.getCodiceBelfiore());
bean.setNomeComune(comune.getDenominazione());
bean.setProvincia(provincia.getSigla());
bean.setNumeroProgetto(pratica.getNumeroProgetto());
bean.setDescrizione(dett.getDescLongIntervento());
bean.setEstremiCatastali(dett.getEstremiCatastali());

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/asset/ControlloPraticaAssetRenderer.java

@ -76,7 +76,7 @@ public class ControlloPraticaAssetRenderer extends BaseAssetRenderer {
public String getURLViewInContext(LiferayPortletRequest liferayPortletRequest,
LiferayPortletResponse liferayPortletResponse, String noSuchEntryRedirect) throws Exception {
return FascicoloURLUtil.getFascicoloViewURL(_entry.getCompanyId(), _entry.getIntPraticaId());
return FascicoloURLUtil.getFascicoloBOViewURL(_entry.getCompanyId(), _entry.getIntPraticaId());
}
@Override

53
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/PaesaggisticaAdministrationPortlet.java

@ -2,9 +2,7 @@ package it.tref.liferay.portos.bo.portlet;
import it.mwg.sismica.bo.util.ManutenzioneDatabase;
import it.mwg.sismica.bo.util.SismicaUtil;
import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
import java.sql.SQLException;
import java.util.ArrayList;
@ -16,8 +14,6 @@ import javax.portlet.ActionResponse;
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.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
@ -28,27 +24,7 @@ import com.liferay.util.bridges.mvc.MVCPortlet;
public class PaesaggisticaAdministrationPortlet extends MVCPortlet {
private static final Log _log = LogFactoryUtil.getLog(PaesaggisticaAdministrationPortlet.class);
public void impostazioniMappe(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException,
SystemException {
String urlIframeFE = ParamUtil.getString(actionRequest, "urlIframeFE");
String urlIframeBO = ParamUtil.getString(actionRequest, "urlIframeBO");
String urlIframeRicerca = ParamUtil.getString(actionRequest, "urlIframeRicerca");
String sharedSecret = ParamUtil.getString(actionRequest, "sharedSecret");
ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, urlIframeFE,
serviceContext);
ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_URL_IFRAME_BO, urlIframeBO,
serviceContext);
ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA, urlIframeRicerca,
serviceContext);
ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_SHARED_SECRET, sharedSecret,
serviceContext);
}
public void mostraConfigurazione(ActionRequest actionRequest, ActionResponse actionResponse) throws SystemException {
public void mostraConfigurazione(ActionRequest request, ActionResponse response) throws SystemException {
List<String> esito = new ArrayList<String>();
esito.add("<h3>Env:</h3>");
@ -59,38 +35,37 @@ public class PaesaggisticaAdministrationPortlet extends MVCPortlet {
for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
esito.add(entry.getKey() + "=" + entry.getValue());
}
actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
response.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
}
public void reIndexFasciolo(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException,
SystemException {
public void reIndexFasciolo(ActionRequest request, ActionResponse response) throws PortalException, SystemException {
ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
ThemeDisplay themeDisplay = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
if (Validator.isNotNull(intPraticaId)) {
IntPraticaLocalServiceUtil.reIndexFasciolo(intPraticaId, themeDisplay.getCompanyId());
}
String numeroProgetto = ParamUtil.getString(actionRequest, "numeroProgetto");
String numeroProgetto = ParamUtil.getString(request, "numeroProgetto");
if (Validator.isNotNull(numeroProgetto)) {
IntPraticaLocalServiceUtil.reIndexFasciolo(numeroProgetto, themeDisplay.getCompanyId());
}
}
public void reIndexFascicoli(ActionRequest actionRequest, ActionResponse actionResponse) {
public void reIndexFascicoli(ActionRequest request, ActionResponse response) {
ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
ThemeDisplay themeDisplay = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
List<String> esito = null;
esito = SismicaUtil.reIndexFascicoli(themeDisplay.getCompanyId());
if (esito != null)
actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
response.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
}
public void manutenzioneDatabase(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortalException, SystemException, SQLException {
public void manutenzioneDatabase(ActionRequest request, ActionResponse response) throws PortalException,
SystemException, SQLException {
String mode = ParamUtil.getString(actionRequest, "mode");
ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
String mode = ParamUtil.getString(request, "mode");
ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
List<String> esito = ManutenzioneDatabase.pulisci(serviceContext, mode);
actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
response.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
}
}

3
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java

@ -25,7 +25,6 @@ public class KaleoListenereStartupAction extends ModelListenerStartupAction {
new ModelListenerWrapper("portos-kaleo-web", KaleoInstanceToken.class.getName(),
KaleoInstanceTokenModelListener.class.getName()),
new ModelListenerWrapper("portos-kaleo-web", KaleoLog.class.getName(),
KaleoLogModelListener.class.getName())
};
KaleoLogModelListener.class.getName()) };
}
}

3
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivitaistruttore/action_button.jsp

@ -38,7 +38,8 @@ if (workflowInstanceLink == null) {
<liferay-ui:icon-menu icon="" showWhenSingleIcon="false" showExpanded="true" cssClass="menu_button_activity">
<div title='<%= LanguageUtil.get(pageContext,"workflow-action-open-pratica") %>' class="tooltip-info">
<liferay-ui:icon iconCssClass="fa fa-folder-open" linkCssClass="btn btn-action" target="_blank" message=""
url="<%= FascicoloURLUtil.getFascicoloViewURL(intPratica.getCompanyId(), intPratica.getIntPraticaId()) %>" />
url="<%= FascicoloURLUtil.getFascicoloBOViewURL(intPratica.getCompanyId(),
intPratica.getIntPraticaId()) %>" />
</div>
<c:if test="<%= !listaTask.isEmpty() %>">
<%

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_actions.jsp

@ -47,7 +47,7 @@ boolean inUnitaOperativa = unitaOperativeUtente.contains(intPratica.getUnitaOper
</span>
</c:if>
<%
String urlDettaglioPratica = FascicoloURLUtil.getFascicoloViewURL(avviso.getCompanyId(), avviso.getIntPraticaId());
String urlDettaglioPratica = FascicoloURLUtil.getFascicoloBOViewURL(avviso.getCompanyId(), avviso.getIntPraticaId());
%>
<span class="tooltip-info" title="Apri Pratica">
<%

32
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/mappe/configurazione/view.jsp

@ -0,0 +1,32 @@
<%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%>
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/html/init.jsp"%>
<%
long companyId = company.getCompanyId();
String urlIframeFE = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.MAPPE_URL_IFRAME_FE);
String urlIframeBO = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.MAPPE_URL_IFRAME_BO);
String urlIframeRicerca = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA);
String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
ConfigurazioneConstants.MAPPE_SHARED_SECRET);
%>
<liferay-portlet:actionURL name="salvaImpostazioni" var="salvaImpostazioniUrl" />
<h2>Configurazione plugin mappe</h2>
<aui:form method="post" action="<%= salvaImpostazioniUrl %>" inlineLabels="false" name="edit" id="edit">
<%
for (String campo : Arrays.asList(ConfigurazioneConstants.MAPPE_SHARED_SECRET,
ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO,
ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)) {
%>
<aui:row>
<aui:input type="text" cssClass="span12" name="<%= campo %>"
value="<%= ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, campo) %>" />
</aui:row>
<%
}
%>
<aui:button type="submit" value="save" />
</aui:form>

20
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/paesaggistica_administration/view.jsp

@ -7,32 +7,12 @@
<%@include file="/html/paesaggistica_administration/init.jsp"%>
<%
SimpleDateFormat simpleDateTimeFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
long companyId = company.getCompanyId();
String urlIframeFE = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_FE);
String urlIframeBO = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO);
String urlIframeRicerca = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA);
String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_SHARED_SECRET);
%>
<hr style="margin: 0" />
<liferay-portlet:actionURL name="impostazioniMappe" var="impostazioniMappeURL" />
<liferay-portlet:actionURL name="reIndexFasciolo" var="reIndexFascicoloURL" />
<liferay-portlet:actionURL name="reIndexFascicoli" var="reIndexFascicoliURL" />
<liferay-portlet:actionURL name="mostraConfigurazione" var="mostraConfigurazioneURL" />
<liferay-portlet:actionURL name="manutenzioneDatabase" var="manutenzioneDatabaseURL" />
<div class="row-fluid" style="margin-top: 10px">
<div class="span6">
<div style="font-weight: bold; font-size: 18px; margin-bottom: 10px;">Impostazioni sistema mappe</div>
<aui:form action="<%= impostazioniMappeURL %>" method="post" name="fmImpostazioniMappe">
<div>
<aui:input type="text" cssClass="span12" name="sharedSecret" label="Segreto condiviso" value="<%= sharedSecret %>"/>
<aui:input type="text" cssClass="span12" name="urlIframeFE" label="Url iframe Front End" value="<%= urlIframeFE %>"/>
<aui:input type="text" cssClass="span12" name="urlIframeBO" label="Url iframe Back Office" value="<%= urlIframeBO %>"/>
<aui:input type="text" cssClass="span12" name="urlIframeRicerca" label="Url iframe Ricerca" value="<%= urlIframeRicerca %>"/>
<aui:button type="submit" value="save" />
</div>
</aui:form>
</div>
</div>
<div class="row-fluid" style="margin-top: 10px">
<div class="span6">
<div style="font-weight: bold; font-size: 18px; margin-bottom: 10px;">Form per reindicizzare un

8
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp

@ -6,16 +6,16 @@ String formName = ParamUtil.getString(request, "formName", "fm");
%>
<div class="container-fluid add-new-project">
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="col-sm-12">
<div class="module-group">
<div class="container-fluid">
<div class="row add-new-project__row">
<div class="col-xs-6 col-sm-6 col-md-6 add-new-project__provincia">
<div class="col-xs-6 add-new-project__provincia">
<aui:select name="provincia" label="Provincia" showEmptyOption="false"
showRequiredLabel="true">
</aui:select>
</div>
<div class="col-xs-6 col-sm-6 col-md-6 add-new-project__comune" >
<div class="col-xs-6 add-new-project__comune" >
<aui:select name="comune" label="Comune" showEmptyOption="false" showRequiredLabel="true"
helpMessage="Nel caso di interventi estesi nel territorio e comprendenti più comuni, verrà evidenziato il comune in cui l'intervento è territorialmente prevalente"
disabled="true">
@ -82,7 +82,7 @@ A.mix(
);
new A.FormValidator({
boundingBox: document.<portlet:namespace /><%=formName%>,
boundingBox: document.<portlet:namespace /><%= formName %>,
rules: {
<portlet:namespace />provincia:{
requiredSelect:'provincia',

199
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp

@ -320,7 +320,7 @@ function duplicati(input) {
<aui:row>
<div class="col-xs-12 col-md-6">
<div class="container-fluid">
<div class="row <%= hide10 --%>">
<div class="row <%= hide10 %>">
<div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" name="descLongIntervento"
label="desc-long-intervento"/>
@ -654,86 +654,10 @@ function duplicati(input) {
box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%), 0 0 8px rgb(102 175 233 / 60%);
}
</style>
<script type="text/javascript" >
Liferay.on('mapIt-ready',function(event) {
Liferay.Portal.Tabs.show('<portlet:namespace/>tabs1', ['mappe-bbcc', 'mappe-openstreetmap'], 'mappe-bbcc');
if (('' == $('#<portlet:namespace/>lat').val().trim())
|| ('' == $('#<portlet:namespace/>long').val().trim())) {
localize(false);
}
var isActivable = <%= !disabledInput && !isGeoEditable %>;
if (isActivable) {
AUI().one('#<portlet:namespace/>localizzaBtn').set('disabled', false).removeClass('disabled');
AUI().one('#_<%= PortletKeys.MAPIT %>_container_btn .bloccamap').set('disabled', false).removeClass('disabled');
}
});
function localize(showAlert) {
AUI().use('aui-io-request', function(A) {
var district = AUI().one("#<portlet:namespace/>provincia");
city = AUI().one("#<portlet:namespace/>comune");
address = AUI().one("#<portlet:namespace/>via");
var localization = [address.val().toLowerCase().split(" ").join("+"),
city.val().toLowerCase().split(" ").join("+"),
district.val().toLowerCase().split(" ").join("+")];
var url = "https://nominatim.openstreetmap.org/search?format=json&addressdetails=0&q="+
localization.join("+");
A.io.request(url, {
dataType: 'json',
on: {
success: function() {
var response = this.get('responseData');
if (response.length == 0) {
if (showAlert) {
alert('Spiacenti... Nessun risultato per i dati immessi');
}
} else if (response && response[0]) {
Liferay.fire(
'geolocation-ready',
{
latitude: response[0].lat,
longitude : response[0].lon,
fullAddress : address.val() != ""
}
);
}
},
}
});
});
}
<script>
AUI().ready(function(A){
//checkIfDisableSistemiCostruttivi();
checkIfDisableInfrastrutture();
//checkCollaudoStatico();
});
function checkIfDisableSistemiCostruttivi(){
var interventoLocale = AUI().one("#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox"),
miglioramentoSismico = AUI().one("#<portlet:namespace/>tcMiglioramentoSismicoCheckbox"),
adeguamentoSismico = AUI().one("#<portlet:namespace/>tcAdeguamentoSismicoCheckbox"),
nuovaCostruzione = AUI().one("#<portlet:namespace/>tc-nuova-costruzioneCheckbox");
if(interventoLocale.attr("checked") && !nuovaCostruzione.attr("checked") && !miglioramentoSismico.attr("checked") && !adeguamentoSismico.attr("checked")){
disableInput('#descrizione_componenti_costruttive');
} else {
enableInput('#descrizione_componenti_costruttive');
}
}
$('#<portlet:namespace/>long, #<portlet:namespace/>lat').on('change', function() {
if ($('#<portlet:namespace/>long').val() != '' && $('#<portlet:namespace/>lat').val() != '') {
var latitude = parseFloat($('#<portlet:namespace/>lat').val());
var longitude = parseFloat($('#<portlet:namespace/>long').val());
$('#<portlet:namespace/>lat_hidden').val(latitude);
$('#<portlet:namespace/>long_hidden').val(longitude);
var zoom = mapItMap.getCurrentZoom();
updateCoords(latitude, longitude, zoom, true, true);
}
});
$('#sistemi_costruttivi input').on('change', function() {
@ -745,7 +669,6 @@ $('#sistemi_costruttivi input').on('change', function() {
enableDisableChk('.costruzioni_esistenti ul input[type="checkbox"]', 'not_enable', false);
}
}
//ADT BUG FE ID = 23
if($('#<portlet:namespace/>tc-nuova-costruzioneCheckbox').prop('checked')||
$('#<portlet:namespace/>tcAdeguamentoSismicoCheckbox').prop('checked')||
$('#<portlet:namespace/>tcMiglioramentoSismicoCheckbox').prop('checked')){
@ -754,7 +677,6 @@ $('#sistemi_costruttivi input').on('change', function() {
} else if ($('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').prop('checked')) {
enableDisableChk('#<portlet:namespace/>collaudoStaticoCheckbox', 'not_enable', false);
}
//checkIfDisableSistemiCostruttivi();
});
function checkIfDisableInfrastrutture(){
@ -782,58 +704,35 @@ $('#destinazioneinazione input[type="radio"]').on('click', function() {
}, 100);
});
</script>
Liferay.provide(window, 'enableInput', function (elem) {
AUI().all(elem + " input").each(function (item) {
if (!<%= disabledInput %>) {
item.set('disabled', false);
item.removeClass('disabled');
}
});
});
<script type="text/javascript" >
Liferay.provide(
window,
'enableInput',
function(elem) {
AUI().all(elem+" input").each(
function(item){
if(!<%=disabledInput%>){
item.set('disabled', false);
item.removeClass('disabled');
}
});
}
);
Liferay.provide(
window,
'disableInput',
function(elem) {
AUI().all(elem+" input").each(
function(item){
item.addClass('disabled');
item.set('disabled', true);
});
}
);
</script>
<!-- ADT BUG FE ID = 23 -->
<script type="text/javascript" >
Liferay.provide(window, 'disableInput', function (elem) {
AUI().all(elem + " input").each(function (item) {
item.addClass('disabled');
item.set('disabled', true);
});
});
$('#<portlet:namespace/>lavoriPubbliciCheckbox, #<portlet:namespace/>intervFinPubCheckbox').change(function () {
var _this = $(this);
var toDisable = [
'tc-nuova-costruzione',
'tc-nuova-costruzione-pertinenza',
'tc-costruzioni-esistenti',
'tc-manut-ord-straord',
'tc-intervento-opere-escavazione',
'tcAltriInterventi'
];
if (_this.is(":checked")){
/*$.each(toDisable, function(index, val) {
enableDisableChk('#<portlet:namespace/>'+val+'Checkbox', 'not_enable', true);
});*/
'tc-nuova-costruzione',
'tc-nuova-costruzione-pertinenza',
'tc-costruzioni-esistenti',
'tc-manut-ord-straord',
'tc-intervento-opere-escavazione',
'tcAltriInterventi'
];
if (_this.is(":checked")) {
enableDisableChk('.excludeOther[data-cont="viarch"] input[type="checkbox"]', 'not_enable', false);
} else {
/*$.each(toDisable, function(index, val) {
enableDisableChk('#<portlet:namespace/>'+val+'Checkbox', 'not_enable', false);
});*/
enableDisableChk('.excludeOther[data-cont="viarch"] input[type="checkbox"]', 'not_enable', true);
}
});
@ -856,13 +755,13 @@ $('#<portlet:namespace/>intervFinPubCheckbox').change(function () {
});
$('#<portlet:namespace/>tc-no-opere-escavazioneCheckbox').change(function () {
if ($(this).is(":checked")){
if ($(this).is(":checked")) {
enableDisableChk('#<portlet:namespace/>tc-intervento-opere-escavazioneCheckbox', 'not_enable', false);
}
});
$('#<portlet:namespace/>tc-intervento-opere-escavazioneCheckbox').change(function () {
if ($(this).is(":checked")){
if ($(this).is(":checked")) {
enableDisableChk('#<portlet:namespace/>tc-no-opere-escavazioneCheckbox', 'not_enable', false);
}
});
@ -871,7 +770,7 @@ $('#<portlet:namespace/>tc-manut-ord-straordCheckbox, #<portlet:namespace/>tc-nu
var _this = $(this);
if (_this.is(":checked")) {
enableDisableChk('#<portlet:namespace/>tc-no-opere-escavazioneCheckbox', 'enable', true);
}else{
} else {
enableDisableChk('#<portlet:namespace/>tc-no-opere-escavazioneCheckbox', 'not_enable', false);
}
});
@ -880,14 +779,14 @@ $('#<portlet:namespace/>normEsenteBolloCheckbox').change(function () {
var _this = $(this);
if (_this.is(":checked")){
enableDisableChk('#<portlet:namespace/>lavoriPubbliciCheckbox', 'enable', false);
}else{
} else {
enableDisableChk('#<portlet:namespace/>lavoriPubbliciCheckbox', 'not_enable', false);
}
});
$('#<portlet:namespace/>collaudoStaticoCheckbox').change(function () {
var _this = $(this);
if (_this.is(":checked")){
if (_this.is(":checked")) {
enableDisableChk('#<portlet:namespace/>noCollaudoCheckbox', 'enable', true);
enableDisableChk('#<portlet:namespace/>tcInterventiCheckbox', 'enable', true);
enableDisableChk('#<portlet:namespace/>tc-nuova-costruzioneCheckbox', 'not_enable', true);
@ -896,7 +795,7 @@ $('#<portlet:namespace/>collaudoStaticoCheckbox').change(function () {
$('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').removeAttr("disabled");
$('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').removeClass('disabled');
}else {
} else {
enableDisableChk('#<portlet:namespace/>noCollaudoCheckbox', 'not_enable', false);
enableDisableChk('#<portlet:namespace/>tcInterventiCheckbox', 'not_enable', false);
@ -907,57 +806,31 @@ $('#<portlet:namespace/>collaudoStaticoCheckbox').change(function () {
$('#<portlet:namespace/>tc-nuova-costruzioneCheckbox').removeAttr("disabled");
}
});
function checkCollaudoStatico(){
var interventoLocale = AUI().one("#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox"),
miglioramentoSismico = AUI().one("#<portlet:namespace/>tcMiglioramentoSismicoCheckbox"),
adeguamentoSismico = AUI().one("#<portlet:namespace/>tcAdeguamentoSismicoCheckbox"),
nuovaCostruzione = AUI().one("#<portlet:namespace/>tc-nuova-costruzioneCheckbox"),
collaudostatico = AUI().one("#<portlet:namespace/>collaudoStaticoCheckbox");
if(collaudostatico.attr("checked") ){
enableDisableChk('#<portlet:namespace/>tc-nuova-costruzioneCheckbox', 'not_enable', true);
enableDisableChk('#<portlet:namespace/>tcInterventiCheckbox', 'enable', true);
enableDisableChk('#<portlet:namespace/>tcAdeguamentoSismicoCheckbox', 'not_enable', true);
enableDisableChk('#<portlet:namespace/>tcMiglioramentoSismicoCheckbox', 'not_enable', true);
$('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').removeAttr("disabled");
$('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').removeClass('disabled');
}
if(nuovaCostruzione.attr("checked")||
adeguamentoSismico.attr("checked")||
miglioramentoSismico.attr("checked")){
enableDisableChk('#<portlet:namespace/>collaudoStaticoCheckbox', 'not_enable', true);
} else if (interventoLocale.attr("checked")) {
$('#<portlet:namespace/>collaudoStaticoCheckbox').removeAttr('disabled');
}
}
$("#<portlet:namespace/>interventoVoceP7").on("keypress keyup blur",function (event) {
if (event.which == 43){
if (event.which == 43) {
return true;
}else if(event.which < 48 || event.which > 57){
} else if (event.which < 48 || event.which > 57) {
event.preventDefault();
}
});
function enableDisableChk(obj, action, disable){
if(action == 'enable'){
if (action == 'enable') {
$(obj).prop("checked", true);
$(obj).attr('checked', true);
$(obj).prev('input[type="hidden"]').val("on");
}else{
} else {
$(obj).prop("checked", false);
$(obj).attr('checked', false);
$(obj).prev('input[type="hidden"]').val(false);
}
if(disable){
if (disable) {
$(obj).attr("disabled", true);
$(obj).prop("disabled", true);
}else{
} else {
$(obj).attr("disabled", false);
$(obj).prop("disabled", false);
}
}
</script>

5
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp

@ -24,16 +24,15 @@ String keywords = StringPool.BLANK;
<liferay-util:param name="title" value="INFORMAZIONI" />
<liferay-util:param name="message" value="<%= helpMessage %>" />
</liferay-util:include>
<br>
<br />
</c:if>
<div class="navbar-container">
<c:if test="<%= isProgetti %>">
<liferay-util:include page="/html/fascicolofe/toolbar.jsp" servletContext="<%= application %>" />
</c:if>
<c:if test="<%= isProgetti || isArchivioProgetti || isAltriProgetti %>">
<aui:form action="<%= searchURL.toString() %>" method="post" name="fm">
<liferay-ui:search-form page="/html/fascicolofe/advanced_search.jsp" servletContext="<%=application%>" />
<liferay-ui:search-form page="/html/fascicolofe/advanced_search.jsp" servletContext="<%= application %>" />
</aui:form>
</c:if>
</div>

857
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp

File diff soppresso perché troppo grande Load Diff

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

@ -56,7 +56,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
%>
<div class="container-fluid fascicolo-header">
<div class="row">
<div class="col-sm-2 col-md-2">
<div class="col-sm-2">
<span class="bg-success img-thumbnail"
style="width: 80px;height: 80px; font-size: 70px; line-height: 70px; vertical-align: middle; text-align: center;">
<c:if test="<%= Constants.TIPO_PRATICA_AUTORIZZAZIONE.equals(intPratica.getTipoPratica()) %>">
@ -73,10 +73,10 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
title="fascicolo_title_dettagli">
<div class="container-fluid">
<div class="row">
<div class="col-sm-2 col-md-2">
<div class="col-sm-2">
Validità
</div>
<div class="col-sm-4 col-md-4">
<div class="col-sm-4">
<strong>
<%
if (intPratica.getValidata()) {
@ -91,26 +91,26 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
%>
</strong>
</div>
<div class="col-sm-2 col-md-2">
<div class="col-sm-2">
Istruttore:
</div>
<div class="col-sm-4 col-md-4">
<div class="col-sm-4">
<strong><%= name %></strong>
</div>
</div>
<div class="row">
<div class="col-sm-2 col-md-2">
<div class="col-sm-2">
Tipologia:
</div>
<div class="col-sm-4 col-md-4">
<div class="col-sm-4">
<strong>
<%= LanguageUtil.get(pageContext, "tipo-pratica-" + intPratica.getTipoPratica()) %>
</strong>
</div>
<div class="col-sm-2 col-md-2">
<div class="col-sm-2">
Stato:
</div>
<div class="col-sm-4 col-md-4">
<div class="col-sm-4">
<strong>
<%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(
intPratica.getStatoPratica(), intPratica.getTipoProcedura())) %>
@ -128,82 +128,68 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
title="fascicolo_title_progetti">
<div class="col-sm-6 col-md-3">
<%
if (nVarianti == 0) {
%>
Varianti
<strong><span class="fa fa-circle-o" style="color:orange"></span> non presentate</strong>
<%
} else if (nVarianti == 1) { %>
Variante
<strong><span class="fa fa-check" style="color:green"></span> presentata 1 volta</strong>
<%
} else {
%>
Varianti
<strong>
<span class="fa fa-check" style="color:green"></span> presentate <%= nVarianti %> volte
</strong>
<% } %>
<c:choose>
<c:when test="<%= nVarianti == 0 %>">
Varianti<strong><span class="fa fa-circle-o" style="color:orange"></span>
non presentate</strong>
</c:when>
<c:when test="<%= nVarianti == 1 %>">
Variante<strong><span class="fa fa-check" style="color:green"></span>
presentata 1 volta</strong>
</c:when>
<c:otherwise>
Varianti
<strong><span class="fa fa-check" style="color:green"></span>
presentate <%= nVarianti %> volte</strong>
</c:otherwise>
</c:choose>
</div>
<div class="col-sm-6 col-md-3">
Cambio soggetti
<%
if (nCambioSoggetti == 0) {
%>
<strong><span class="fa fa-circle-o" style="color:orange"></span> non presentato</strong>
<%
} else if (nCambioSoggetti == 1) {
%>
<strong><span class="fa fa-check" style="color:green"></span> presentato 1 volta</strong>
<%
} else {
%>
<strong>
<span class="fa fa-check" style="color:green"></span>
presentato <%= nCambioSoggetti %> volte
</strong>
<%
}
%>
Cambio soggetti<strong>
<c:choose>
<c:when test="<%= nCambioSoggetti == 0 %>">
<span class="fa fa-circle-o" style="color:orange"></span> non presentato
</c:when>
<c:when test="<%= nCambioSoggetti == 1 %>">
<span class="fa fa-check" style="color:green"></span> presentato 1 volta
</c:when>
<c:otherwise>
<span class="fa fa-check" style="color:green"></span>
presentato <%= nCambioSoggetti %> volte
</c:otherwise>
</c:choose>
</strong>
</div>
<div class="col-sm-6 col-md-3">
Fine Lavori
<%
if (nFineLavori == 0) {
%>
<strong><span class="fa fa-close txt-red"></span> non presentata</strong>
<%
} else if (nFineLavori == 1 ) {
%>
<strong><span class="fa fa-check txt-green"></span> presentata 1 volta</strong>
<%
} else {
%>
<strong>
<span class="fa fa-check txt-green"></span> presentata <%= nFineLavori %> volte
</strong>
<% } %>
Fine Lavori<strong>
<c:choose>
<c:when test="<%= nFineLavori == 0 %>">
<span class="fa fa-close txt-red"></span> non presentata
</c:when>
<c:when test="<%= nFineLavori == 1 %>">
<span class="fa fa-check txt-green"></span> presentata 1 volta
</c:when>
<c:otherwise>
<span class="fa fa-check txt-green"></span> presentata <%= nFineLavori %> volte
</c:otherwise>
</c:choose>
</strong>
</div>
<div class="col-sm-6 col-md-3">
Collaudo
<%
if (nCollaudo == 0 ) {
%>
<strong><span class="fa fa-close" style="color:red"></span> non presentato</strong>
<%
} else if (nCollaudo == 1 ) {
%>
<strong><span class="fa fa-check" style="color:green"></span> presentato 1 volta</strong>
<%
} else {
%>
<strong>
<span class="fa fa-check" style="color:green"></span> Presentato <%= nCollaudo %> volte
</strong>
<%
}
%>
Collaudo<strong>
<c:choose>
<c:when test="<%= nCollaudo == 0 %>">
<span class="fa fa-close" style="color:red"></span> non presentato
</c:when>
<c:when test="<%= nCollaudo == 1 %>">
<span class="fa fa-check" style="color:green"></span> presentato 1 volta
</c:when>
<c:otherwise>
<span class="fa fa-check" style="color:green"></span>
presentato <%= nCollaudo %> volte
</c:otherwise>
</c:choose>
</strong>
</div>
</liferay-ui:panel>
</div>
@ -291,7 +277,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
%>
<c:if test="<%= !committenti.isEmpty() %>">
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="col-sm-12">
<div class="fascicolo_header_row">
<%= LanguageUtil.get(pageContext, "gc-soggetto-02") %>:
</div>
@ -337,7 +323,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
%>
<c:if test="<%= !progettisti.isEmpty() %>">
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="col-sm-12">
<div class="fascicolo_header_row">
<%= LanguageUtil.get(pageContext, "gc-soggetto-06") %>:
</div>
@ -369,7 +355,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI);
%>
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="col-sm-12">
<div class="fascicolo_header_row">
<%= LanguageUtil.get(pageContext, "gc-soggetto-03") %>:
</div>
@ -415,59 +401,59 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
title="fascicolo_title_ubicazione">
<div class="container-fluid">
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "livello-di-tutela") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela") %>
</div>
</div>
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "paesaggio-locale") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= BeanPropertiesUtil.getString(dettPratica, "paesaggioLocale") %>
</div>
</div>
<div class="row <%= hide1 %>">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "vincoli") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= BeanPropertiesUtil.getString(dettPratica, "vincoli") %>
</div>
</div>
<hr>
<div class="row">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "dp-dc-prov") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<strong><%= BeanPropertiesUtil.getString(provincia, "provincia")%></strong>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "dp-dc-comune") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<strong><%= BeanPropertiesUtil.getString(comune, "denominazione")%></strong>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "dp-dc-loc") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<strong><%= BeanPropertiesUtil.getString(dettPratica, "localita") %></strong>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "dp-dc-via") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<strong><%= BeanPropertiesUtil.getString(dettPratica, "via") %></strong>
</div>
</div>
@ -487,10 +473,10 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<%= LanguageUtil.get(pageContext, "estremi-prat-com") %>
</div>
<div class="col-sm-6 col-md-6">
<div class="col-sm-6">
<strong><%= BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %></strong>
</div>
</div>

2
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions.jsp

@ -25,7 +25,7 @@ if (searchContainer != null) {
<liferay-ui:icon-menu icon="" showWhenSingleIcon="true" showExpanded="true" cssClass="menu_button_activity">
<div title='<%= LanguageUtil.get(pageContext,"fascicolo-action-open-pratica") %>' class="tooltip-info">
<liferay-ui:icon iconCssClass="fa fa-eye" linkCssClass="btn btn-action" target="_blank" message="" label="true"
url="<%= FascicoloURLUtil.getFascicoloViewURL(parere.getCompanyId(), parere.getIntPraticaId()) %>" />
url="<%= FascicoloURLUtil.getFascicoloBOViewURL(parere.getCompanyId(), parere.getIntPraticaId()) %>" />
</div>
<c:if test="<%= tabs1 == 1 %>">
<%

1
liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath

@ -6,5 +6,6 @@
<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext/portlet.jar"/>
<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/jsp-api.jar"/>
<classpathentry kind="lib" path="/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>

17
liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaBean.java

@ -20,6 +20,7 @@ public class CronostoriaBean implements Serializable {
public CronostoriaBean(Date dataEvento, String tipoEvento, String testoEvento, String tipoLink,
CronostoriaLink... links) {
super();
this.dataEvento = dataEvento;
this.tipoEvento = tipoEvento;
@ -30,6 +31,7 @@ public class CronostoriaBean implements Serializable {
public CronostoriaBean(Date dataEvento, String tipoEvento, String testoEvento, String tipoLink, String classPK,
String className, CronostoriaLink... links) {
super();
this.dataEvento = dataEvento;
this.tipoEvento = tipoEvento;
@ -41,59 +43,72 @@ public class CronostoriaBean implements Serializable {
}
public Date getDataEvento() {
return dataEvento;
}
public void setDataEvento(Date dataEvento) {
this.dataEvento = dataEvento;
}
public String getTipoEvento() {
return tipoEvento;
}
public void setTipoEvento(String tipoEvento) {
this.tipoEvento = tipoEvento;
}
public String getTestoEvento() {
return testoEvento;
}
public void setTestoEvento(String testoEvento) {
this.testoEvento = testoEvento;
}
public List<CronostoriaLink> getLinks() {
return links;
}
public void setLinks(List<CronostoriaLink> links) {
this.links = links;
}
public String getTipoLink() {
return tipoLink;
}
public void setTipoLink(String tipoLink) {
this.tipoLink = tipoLink;
}
public String getClassPK() {
return classPK;
}
public void setClassPK(String classPK) {
this.classPK = classPK;
}
public String getClassName() {
return className;
}
public void setClassName(String className) {
this.className = className;
}
}

1
liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/IstruttoreBean.java

@ -1,6 +1,7 @@
package it.tref.liferay.portos.bo.shared.bean;
public class IstruttoreBean implements Comparable<IstruttoreBean> {
private long idIstruttore;
private String denominazione;

9
liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Fascicolo.java

@ -3,30 +3,33 @@ package it.tref.liferay.portos.bo.shared.protocollo.model;
public class Fascicolo {
private int anno;
private int numero;
public Fascicolo() {
}
public Fascicolo() {}
public Fascicolo(int anno, int numero) {
this.anno = anno;
this.numero = numero;
}
public int getAnno() {
return anno;
}
public void setAnno(int anno) {
this.anno = anno;
}
public int getNumero() {
return numero;
}
public void setNumero(int numero) {
this.numero = numero;
}

2
liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Protocollo.java

@ -4,7 +4,9 @@ import java.util.Date;
import java.util.List;
public class Protocollo {
public enum TipoProtocollo {
INGRESSO, USCITA
}

6
liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java

@ -10,12 +10,6 @@ import com.liferay.portal.service.CompanyLocalServiceUtil;
public class FascicoloURLUtil {
@Deprecated
public static String getFascicoloViewURL(long companyId, long intPraticaId) throws PortalException, SystemException {
return getFascicoloBOViewURL(companyId, intPraticaId);
}
public static String getFascicoloFEViewURL(long companyId, long intPraticaId, String mvcPath, String queryString)
throws PortalException, SystemException {

Caricamento…
Annulla
Salva