diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 7619aa3a..8466b772 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 2938d787..0b133e3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2883 - build.date=1680797787060 + build.number=2886 + build.date=1680858882324 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 2764a19b..8466b772 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared-service.jar new file mode 100644 index 00000000..1e39d223 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 591ee83a..1b5a26a1 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index 13cc320f..20883a9c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index 12e6b2c0..df50eac9 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp index 08630528..1dda21df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp @@ -418,7 +418,7 @@ List tipologiaSoggetti = Arrays.asList(TipoSoggettoUtil.COMMITTENTE, Tip } } } else if (DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05.equals(codiceDoc) || DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15.equals(codiceDoc)) { - if (TipoSoggettoUtil.GEOLOGO.equals(tipoSoggetto) || (TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto) && dettPratica.isLavoriPubblici()) ) { + if (TipoSoggettoUtil.GEOLOGO.equals(tipoSoggetto) || (TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto) && !dettPratica.isLavoriPubblici()) ) { boolean isValid = false; if (dettPratica.getNormArt3com3()) { isValid = true; @@ -435,7 +435,7 @@ List tipologiaSoggetti = Arrays.asList(TipoSoggettoUtil.COMMITTENTE, Tip } } } else if (DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06.equals(codiceDoc)) { - if (TipoSoggettoUtil.PROGETTISTA.equals(tipoSoggetto) || (TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto) && dettPratica.isLavoriPubblici()) || TipoSoggettoUtil.GEOLOGO.equals(tipoSoggetto)) { + if (TipoSoggettoUtil.PROGETTISTA.equals(tipoSoggetto) || (TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto) && !dettPratica.isLavoriPubblici()) || TipoSoggettoUtil.GEOLOGO.equals(tipoSoggetto)) { boolean isValid = false; if (dettPratica.getNormArt3com3()) { isValid = true; @@ -471,7 +471,7 @@ List tipologiaSoggetti = Arrays.asList(TipoSoggettoUtil.COMMITTENTE, Tip } else { isValid = true; } - if (!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)) { + if (!isValid && (dettPratica.isLavoriPubblici() || TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto))) { isValid = true; } clazz += " icon-asseverazioni fa "; @@ -487,7 +487,7 @@ List tipologiaSoggetti = Arrays.asList(TipoSoggettoUtil.COMMITTENTE, Tip if (dettPratica.getNormArt3com4() || !signaturesPerSubject.isEmpty()) { isValid = true; } - if (!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)) { + if (!isValid && (dettPratica.isLavoriPubblici() || TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto))) { isValid = true; } clazz += " icon-asseverazioni fa ";