diff --git a/liferay-plugins-sdk-6.2/build.portos.properties b/liferay-plugins-sdk-6.2/build.portos.properties index c7ef7abd..f0db2994 100644 --- a/liferay-plugins-sdk-6.2/build.portos.properties +++ b/liferay-plugins-sdk-6.2/build.portos.properties @@ -1,9 +1,7 @@ -# Managed by Liferay IDE (remove this comment to prevent future updates) - -app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext -app.server.tomcat.deploy.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps -app.server.parent.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6 -app.server.tomcat.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62 +app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/lib/ext +app.server.tomcat.deploy.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/webapps +app.server.parent.dir = /home/portos/bin/liferay-paesaggistica +app.server.tomcat.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62 app.server.type = tomcat -app.server.tomcat.portal.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT +app.server.tomcat.portal.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/webapps/ROOT javac.encoding = UTF-8 diff --git a/liferay-plugins-sdk-6.2/build.portos.properties.save b/liferay-plugins-sdk-6.2/build.portos.properties.save new file mode 100644 index 00000000..f0db2994 --- /dev/null +++ b/liferay-plugins-sdk-6.2/build.portos.properties.save @@ -0,0 +1,7 @@ +app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/lib/ext +app.server.tomcat.deploy.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/webapps +app.server.parent.dir = /home/portos/bin/liferay-paesaggistica +app.server.tomcat.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62 +app.server.type = tomcat +app.server.tomcat.portal.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/webapps/ROOT +javac.encoding = UTF-8 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java index 7e47a5b0..77b9bd15 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java @@ -40,6 +40,7 @@ import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.PropsUtil; +import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.Organization; import com.liferay.portal.model.Role; @@ -52,8 +53,8 @@ public class ControlloPraticaAdvancedSearch { private static final Log _log = LogFactoryUtil.getLog(ControlloPraticaAdvancedSearch.class); public static final String[] OVERRIDE_KEYWORDS = { "controlloPraticaId", "numeroProgetto", "tipoPratica", - "statoPratica", "dataRichiesta", "committente", "soggettiInteressati", "status", - "entryClassName", "userId", "descIntervento" }; + "statoPratica", "dataRichiesta", "committente", "soggettiInteressati", "status", "entryClassName", + "userId", "descIntervento" }; public static final Format DATE_FORMAT_LUCENE = FastDateFormatFactoryUtil.getSimpleDateFormat("yyyyMMdd"); @@ -73,13 +74,11 @@ public class ControlloPraticaAdvancedSearch { searchContext.setStart(start); searchContext.setEnd(end); } - // Gestione Ordinamento searchContext.setSorts(getOrderedQuery(request)); Hits hits = null; try { - // Condizioni necessarie per questa ricerca : - // entryClassName=ControlloPratica & userId=taskAssigneeUserId + // Condizioni necessarie per questa ricerca : entryClassName=ControlloPratica & userId=taskAssigneeUserId TermQuery entryClassNameTermQuery = TermQueryFactoryUtil.create(searchContext, "entryClassName", ControlloPratica.class.getName()); TermQuery userIdTermQuery = TermQueryFactoryUtil.create(searchContext, "taskAssigneeUserId", @@ -91,9 +90,7 @@ public class ControlloPraticaAdvancedSearch { booleanQuery.add(entryClassNameTermQuery, BooleanClauseOccur.MUST); booleanQuery.add(userIdTermQuery, BooleanClauseOccur.MUST); booleanQuery.add(statusTermQuery, BooleanClauseOccur.MUST); - - // Ricavo i groupId relativi all utente che effettua la ricerca per - // filtrare + // Ricavo i groupId relativi all utente che effettua la ricerca per filtrare long ufficio = ParamUtil.getLong(request, "ufficio"); if (ufficio != 0 && ufficio != -1) { TermQuery singleGroupIdQuery = TermQueryFactoryUtil.create(searchContext, "groupId", ufficio); @@ -114,7 +111,6 @@ public class ControlloPraticaAdvancedSearch { booleanQuery.add(singleGroupIdQuery, BooleanClauseOccur.MUST); } } - // Condizioni aggiuntive retrieveQuery(request, user, booleanQuery, searchContext); if (_log.isDebugEnabled()) { @@ -127,7 +123,6 @@ public class ControlloPraticaAdvancedSearch { } catch (ParseException | SearchException | SystemException e) { _log.error(e, e); } - return hits; } @@ -144,14 +139,11 @@ public class ControlloPraticaAdvancedSearch { searchContext.setStart(start); searchContext.setEnd(end); } - // Gestione Ordinamento searchContext.setSorts(getOrderedQuery(request)); - Hits hits = null; try { - // Condizioni necessarie per questa ricerca : - // entryClassName=ControlloPratica & roleIds tra i taskAssigneeIds + // Condizioni necessarie per questa ricerca: entryClassName=ControlloPratica & roleIds tra i taskAssigneeIds TermQuery entryClassNameTermQuery = TermQueryFactoryUtil.create(searchContext, "entryClassName", ControlloPratica.class.getName()); TermQuery statusTermQuery = TermQueryFactoryUtil.create(searchContext, "status", @@ -161,32 +153,26 @@ public class ControlloPraticaAdvancedSearch { .getUserId()); List organizationRoleList = null; for (Organization org : organizationUserList) { - organizationRoleList = RoleLocalServiceUtil.getUserGroupRoles(user.getUserId(), - org.getGroupId()); + organizationRoleList = RoleLocalServiceUtil.getUserGroupRoles(user.getUserId(), org.getGroupId()); for (Role role : organizationRoleList) { - TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds", - ("R" + role.getRoleId() + "G" + org.getGroupId())); + TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds", ("R" + + role.getRoleId() + "G" + org.getGroupId())); booleanQueryRoleIds.add(roleIdTerm, BooleanClauseOccur.SHOULD); } } - BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext); booleanQuery.add(entryClassNameTermQuery, BooleanClauseOccur.MUST); - if (organizationUserList != null && !organizationUserList.isEmpty() - && organizationRoleList != null && !organizationRoleList.isEmpty()) { + if (organizationUserList != null && !organizationUserList.isEmpty() && organizationRoleList != null + && !organizationRoleList.isEmpty()) { booleanQuery.add(booleanQueryRoleIds, BooleanClauseOccur.MUST); } else { - TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds", ("R" - + 0 + "G" + 0)); + TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds", "R0G0"); booleanQueryRoleIds.add(roleIdTerm, BooleanClauseOccur.SHOULD); booleanQuery.add(booleanQueryRoleIds, BooleanClauseOccur.MUST); } - booleanQuery.add(statusTermQuery, BooleanClauseOccur.MUST); - - // Ricavo i groupId relativi all utente che effettua la ricerca per - // filtrare + // Ricavo i groupId relativi all utente che effettua la ricerca per filtrare long ufficio = ParamUtil.getLong(request, "ufficio"); if (ufficio != 0 && ufficio != -1) { TermQuery singleGroupIdQuery = TermQueryFactoryUtil.create(searchContext, "groupId", ufficio); @@ -207,33 +193,24 @@ public class ControlloPraticaAdvancedSearch { booleanQuery.add(singleGroupIdQuery, BooleanClauseOccur.MUST); } } - List uos = UnitaOperativeUtil.getUnitaOperative(user); if ((uos.size() > 0) && !uos.contains(0)) { BooleanQuery uoQuery = BooleanQueryFactoryUtil.create(searchContext); for (int uo : uos) { - TermQuery tq = TermQueryFactoryUtil.create(searchContext, - PortosIndexField.UNITA_OPERATIVA, uo); + TermQuery tq = TermQueryFactoryUtil.create(searchContext, PortosIndexField.UNITA_OPERATIVA, uo); uoQuery.add(tq, BooleanClauseOccur.SHOULD); } booleanQuery.add(uoQuery, BooleanClauseOccur.MUST); } - // Condizioni aggiuntive retrieveQuery(request, user, booleanQuery, searchContext); - - - if (_log.isDebugEnabled()) { _log.debug("User " + user.getScreenName() + " Request query : " + booleanQuery.toString()); } - hits = SearchEngineUtil.search(searchContext, booleanQuery); - if (_log.isDebugEnabled()) { _log.debug("Number of hint find : " + hits.getLength()); } - } catch (ParseException | SearchException | SystemException e) { _log.error(e, e); } @@ -254,51 +231,39 @@ public class ControlloPraticaAdvancedSearch { searchContext.setStart(start); searchContext.setEnd(end); } - // Gestione Ordinamento searchContext.setSorts(getOrderedQuery(request)); Hits hits = null; try { - // Condizioni necessarie per questa ricerca : - // entryClassName=ControlloPratica & - // roleIds non e tra i taskAssigneeIds - // userId non e tra taskAssigneeId + // Condizioni necessarie per questa ricerca: entryClassName=ControlloPratica & roleIds non e tra i + // taskAssigneeIds userId non e tra taskAssigneeId TermQuery entryClassNameTermQuery = TermQueryFactoryUtil.create(searchContext, "entryClassName", ControlloPratica.class.getName()); TermQuery userIdTermQuery = TermQueryFactoryUtil.create(searchContext, "taskAssigneeUserId", user.getUserId()); - BooleanQuery booleanQueryRoleIds = BooleanQueryFactoryUtil.create(searchContext); List organizationUserList = OrganizationLocalServiceUtil.getUserOrganizations(user .getUserId()); List organizationRoleList = null; for (Organization org : organizationUserList) { - organizationRoleList = RoleLocalServiceUtil.getUserGroupRoles(user.getUserId(), - org.getGroupId()); + organizationRoleList = RoleLocalServiceUtil.getUserGroupRoles(user.getUserId(), org.getGroupId()); for (Role role : organizationRoleList) { TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds", - (role.getRoleId() + "-" + org.getGroupId())); + (role.getRoleId() + StringPool.DASH + org.getGroupId())); booleanQueryRoleIds.add(roleIdTerm, BooleanClauseOccur.SHOULD); } - } - TermQuery statusTermQuery = TermQueryFactoryUtil.create(searchContext, "status", WorkflowConstants.STATUS_PENDING); - BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext); booleanQuery.add(entryClassNameTermQuery, BooleanClauseOccur.MUST); - - if (organizationUserList != null && !organizationUserList.isEmpty() - && organizationRoleList != null && !organizationRoleList.isEmpty()) { + if (organizationUserList != null && !organizationUserList.isEmpty() && organizationRoleList != null + && !organizationRoleList.isEmpty()) { booleanQuery.add(booleanQueryRoleIds, BooleanClauseOccur.MUST_NOT); } - booleanQuery.add(userIdTermQuery, BooleanClauseOccur.MUST_NOT); booleanQuery.add(statusTermQuery, BooleanClauseOccur.MUST); - - // Ricavo i groupId relativi all utente che effettua la ricerca per - // filtrare + // Ricavo i groupId relativi all utente che effettua la ricerca per filtrare long ufficio = ParamUtil.getLong(request, "ufficio"); if (ufficio != 0 && ufficio != -1) { TermQuery singleGroupIdQuery = TermQueryFactoryUtil.create(searchContext, "groupId", ufficio); @@ -321,7 +286,6 @@ public class ControlloPraticaAdvancedSearch { } // Condizioni aggiuntive retrieveQuery(request, user, booleanQuery, searchContext); - if (_log.isDebugEnabled()) { _log.debug("User " + user.getScreenName() + " Request query : " + booleanQuery.toString()); } @@ -335,8 +299,8 @@ public class ControlloPraticaAdvancedSearch { return hits; } - public static List searchTaskPerEsportazioneDirigente(HttpServletRequest request, - User user, int start, int end) { + public static List searchTaskPerEsportazioneDirigente(HttpServletRequest request, User user, + int start, int end) { List lista = new ArrayList(); SearchContext searchContext = SearchContextFactory.getInstance(request); @@ -345,7 +309,6 @@ public class ControlloPraticaAdvancedSearch { searchContext.setStart(0); searchContext.setEnd(maxEnd); searchContext.setAttribute("paginationType", "none"); - // Gestione Ordinamento searchContext.setSorts(getOrderedQuery(request)); Hits hits = null; @@ -357,7 +320,6 @@ public class ControlloPraticaAdvancedSearch { BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext); booleanQuery.add(entryClassNameTermQuery, BooleanClauseOccur.MUST); booleanQuery.add(statusTermQuery, BooleanClauseOccur.MUST); - String dataDa = ParamUtil.getString(request, "dataRichiestaInizio"); String dataAl = ParamUtil.getString(request, "dataRichiestaFine"); if (Validator.isNotNull(dataDa) || Validator.isNotNull(dataAl)) { @@ -382,7 +344,6 @@ public class ControlloPraticaAdvancedSearch { if (_log.isDebugEnabled()) { _log.debug("Number of hints found : " + hits.getLength()); } - for (Document doc : hits.toList()) { String controlloPraticaId = doc.get("controlloPraticaId"); if (Validator.isNotNull(controlloPraticaId)) { @@ -393,16 +354,15 @@ public class ControlloPraticaAdvancedSearch { } } } - } catch (ParseException | SearchException | SystemException | java.text.ParseException e) { _log.error(e, e); } - return lista; } - public static List searchTaskPerEsportazionePO(HttpServletRequest request, User user, - int start, int end) { + public static List searchTaskPerEsportazionePO(HttpServletRequest request, User user, int start, + int end) { + List lista = new ArrayList(); SearchContext searchContext = SearchContextFactory.getInstance(request); searchContext.setKeywords(OVERRIDE_KEYWORDS.toString()); @@ -414,7 +374,6 @@ public class ControlloPraticaAdvancedSearch { searchContext.setSorts(getOrderedQuery(request)); Hits hits = null; try { - TermQuery entryClassNameTermQuery = TermQueryFactoryUtil.create(searchContext, "entryClassName", ControlloPratica.class.getName()); TermQuery userIdTermQuery = TermQueryFactoryUtil.create(searchContext, "taskAssigneeUserId", @@ -425,7 +384,6 @@ public class ControlloPraticaAdvancedSearch { booleanQuery.add(entryClassNameTermQuery, BooleanClauseOccur.MUST); booleanQuery.add(userIdTermQuery, BooleanClauseOccur.MUST); booleanQuery.add(statusTermQuery, BooleanClauseOccur.MUST); - String dataDa = ParamUtil.getString(request, "dataRichiestaInizio"); String dataAl = ParamUtil.getString(request, "dataRichiestaFine"); if (Validator.isNotNull(dataDa) || Validator.isNotNull(dataAl)) { @@ -467,6 +425,7 @@ public class ControlloPraticaAdvancedSearch { } public static Hits searchTaskConclusi(HttpServletRequest request, User user, int start, int end) { + SearchContext searchContext = SearchContextFactory.getInstance(request); searchContext.setKeywords(OVERRIDE_KEYWORDS.toString()); if (ParamUtil.getBoolean(request, "searchForExport", false)) { @@ -479,29 +438,23 @@ public class ControlloPraticaAdvancedSearch { searchContext.setStart(start); searchContext.setEnd(end); } - // Gestione Ordinamento searchContext.setSorts(getOrderedQuery(request)); Hits hits = null; try { - - // Condizioni necessarie per questa ricerca : - // entryClassName=ControlloPratica & - // roleIds non e tra i taskAssigneeIds - // userId non e tra taskAssigneeId + // Condizioni necessarie per questa ricerca: entryClassName=ControlloPratica & roleIds non e tra i + // taskAssigneeIds userId non e tra taskAssigneeId TermQuery entryClassNameTermQuery = TermQueryFactoryUtil.create(searchContext, "entryClassName", ControlloPratica.class.getName()); - BooleanQuery booleanQueryRoleIds = BooleanQueryFactoryUtil.create(searchContext); List organizationUserList = OrganizationLocalServiceUtil.getUserOrganizations(user .getUserId()); List organizationRoleList = null; for (Organization org : organizationUserList) { - organizationRoleList = RoleLocalServiceUtil.getUserGroupRoles(user.getUserId(), - org.getGroupId()); + organizationRoleList = RoleLocalServiceUtil.getUserGroupRoles(user.getUserId(), org.getGroupId()); for (Role role : organizationRoleList) { TermQuery roleIdTerm = TermQueryFactoryUtil.create(searchContext, "taskAssigneeRoleIds", - (role.getRoleId() + "-" + org.getGroupId())); + (role.getRoleId() + StringPool.DASH + org.getGroupId())); booleanQueryRoleIds.add(roleIdTerm, BooleanClauseOccur.SHOULD); } } @@ -517,17 +470,13 @@ public class ControlloPraticaAdvancedSearch { booleanQueryStatus.add(statusIncomplete, BooleanClauseOccur.SHOULD); BooleanQuery booleanQuery = BooleanQueryFactoryUtil.create(searchContext); booleanQuery.add(entryClassNameTermQuery, BooleanClauseOccur.MUST); - if (organizationUserList != null && !organizationUserList.isEmpty() - && organizationRoleList != null && !organizationRoleList.isEmpty()) { + if (organizationUserList != null && !organizationUserList.isEmpty() && organizationRoleList != null + && !organizationRoleList.isEmpty()) { booleanQuery.add(booleanQueryRoleIds, BooleanClauseOccur.MUST_NOT); } - booleanQuery.add(booleanQueryStatus, BooleanClauseOccur.MUST); - - // Ricavo i groupId relativi all utente che effettua la ricerca per - // filtrare - List organizationList = OrganizationLocalServiceUtil.getUserOrganizations(user - .getUserId()); + // Ricavo i groupId relativi all utente che effettua la ricerca per filtrare + List organizationList = OrganizationLocalServiceUtil.getUserOrganizations(user.getUserId()); BooleanQuery groupIdsQuery = BooleanQueryFactoryUtil.create(searchContext); if (Validator.isNotNull(organizationList) && !organizationList.isEmpty()) { for (Organization org : organizationList) { @@ -540,10 +489,8 @@ public class ControlloPraticaAdvancedSearch { TermQuery singleGroupIdQuery = TermQueryFactoryUtil.create(searchContext, "groupId", 0L); booleanQuery.add(singleGroupIdQuery, BooleanClauseOccur.MUST); } - // Condizioni aggiuntive retrieveQuery(request, user, booleanQuery, searchContext); - if (_log.isDebugEnabled()) { _log.debug("User " + user.getScreenName() + " Request query : " + booleanQuery.toString()); } @@ -554,7 +501,6 @@ public class ControlloPraticaAdvancedSearch { } catch (ParseException | SearchException | SystemException e) { _log.error(e, e); } - return hits; } @@ -568,119 +514,108 @@ public class ControlloPraticaAdvancedSearch { String statoPraticaSearch = ParamUtil.getString(request, "statoPratica"); String committenteSearch = ParamUtil.getString(request, "committente"); String soggettiInterconnessiSearch = ParamUtil.getString(request, "soggettiInterconnessi"); - // ADT ADT BUG BO ID = 8 String istruttoreId = ParamUtil.getString(request, "istruttore"); - String dataDa = ParamUtil.getString(request, "dataRichiestaInizio"); String dataAl = ParamUtil.getString(request, "dataRichiestaFine"); String comune = ParamUtil.getString(request, "comune"); String tipoProcedura = ParamUtil.getString(request, "tipoProcedura"); String tipoAttivita = ParamUtil.getString(request, "tipoAttivita"); - // ADT - BUG-11 Aggiunta filtro ricerca String controlloObbligatorioSearch = ParamUtil.getString(request, "controlloObbligatorio"); try { - if (tipoAttivita != null && !tipoAttivita.equals("") && !tipoAttivita.equals("-1")) { + if (Validator.isNotNull(tipoAttivita) && !tipoAttivita.equals("-1")) { TermQuery tipoAttivitaTermQuery = TermQueryFactoryUtil.create(searchContext, "workflowState", tipoAttivita); booleanQuery.add(tipoAttivitaTermQuery, BooleanClauseOccur.MUST); } - if (numeroProgettoSearch != null && !numeroProgettoSearch.equals("")) { - TermQuery numeroProgettoTermQuery = TermQueryFactoryUtil.create(searchContext, - "numeroProgetto", numeroProgettoSearch); + if (Validator.isNotNull(numeroProgettoSearch)) { + TermQuery numeroProgettoTermQuery = TermQueryFactoryUtil.create(searchContext, "numeroProgetto", + numeroProgettoSearch); booleanQuery.add(numeroProgettoTermQuery, BooleanClauseOccur.MUST); } - if (protocolloSearch != null && !protocolloSearch.equals("")) { - TermQuery protocolloSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "protocollo", protocolloSearch); + if (Validator.isNotNull(protocolloSearch)) { + TermQuery protocolloSearchTermQuery = TermQueryFactoryUtil.create(searchContext, "protocollo", + protocolloSearch); booleanQuery.add(protocolloSearchTermQuery, BooleanClauseOccur.MUST); } - if (tipoPraticaSearch != null && !tipoPraticaSearch.equals("") && !tipoPraticaSearch.equals("-1")) { - TermQuery tipoPraticaSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "tipoPratica", tipoPraticaSearch); + if (Validator.isNotNull(tipoPraticaSearch) && !tipoPraticaSearch.equals("-1")) { + TermQuery tipoPraticaSearchTermQuery = TermQueryFactoryUtil.create(searchContext, "tipoPratica", + tipoPraticaSearch); booleanQuery.add(tipoPraticaSearchTermQuery, BooleanClauseOccur.MUST); } - // Gestione StatoPratica - if (statoPraticaSearch != null && !statoPraticaSearch.equals("") - && !statoPraticaSearch.equals("-1")) { + if (Validator.isNotNull(statoPraticaSearch) && !statoPraticaSearch.equals("-1")) { if (statoPraticaSearch.equals(StatoPraticaConstants.COLLAUDO_PARZIALE)) { TermQuery collaudoParzialeSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "collaudoParziale", "true"); + "collaudoParziale", StringPool.TRUE); booleanQuery.add(collaudoParzialeSearchTermQuery, BooleanClauseOccur.MUST); } else if (statoPraticaSearch.equals(StatoPraticaConstants.COLLAUDO)) { TermQuery collaudoSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "collaudoCompletato", "true"); + "collaudoCompletato", StringPool.TRUE); booleanQuery.add(collaudoSearchTermQuery, BooleanClauseOccur.MUST); } else if (statoPraticaSearch.equals(StatoPraticaConstants.FINE_LAVORI)) { TermQuery fineLavoriSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "fineLavoriCompletati", "true"); + "fineLavoriCompletati", StringPool.TRUE); booleanQuery.add(fineLavoriSearchTermQuery, BooleanClauseOccur.MUST); } else if (statoPraticaSearch.equals(StatoPraticaConstants.FINE_LAVORI_PARZIALE)) { TermQuery fineLavoriParzialiSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "fineLavoriParziali", "true"); + "fineLavoriParziali", StringPool.TRUE); booleanQuery.add(fineLavoriParzialiSearchTermQuery, BooleanClauseOccur.MUST); } else if (statoPraticaSearch.equals(StatoPraticaConstants.SOTTOPOSTA_A_PARERE)) { TermQuery sottopostaParereSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "sottopostoAParere", "true"); + "sottopostoAParere", StringPool.TRUE); booleanQuery.add(sottopostaParereSearchTermQuery, BooleanClauseOccur.MUST); } else if (statoPraticaSearch.equals(StatoPraticaConstants.VARIATA)) { - TermQuery sottopostaParereSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "variata", "true"); + TermQuery sottopostaParereSearchTermQuery = TermQueryFactoryUtil.create(searchContext, "variata", + StringPool.TRUE); booleanQuery.add(sottopostaParereSearchTermQuery, BooleanClauseOccur.MUST); } else { - TermQuery statoPraticaSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "statoPratica", statoPraticaSearch); + TermQuery statoPraticaSearchTermQuery = TermQueryFactoryUtil.create(searchContext, "statoPratica", + statoPraticaSearch); booleanQuery.add(statoPraticaSearchTermQuery, BooleanClauseOccur.MUST); } } - if (committenteSearch != null && !committenteSearch.equals("")) { - TermQuery committenteSearchTermQuery = TermQueryFactoryUtil.create(searchContext, - "committenti", committenteSearch.toUpperCase()); + if (Validator.isNotNull(committenteSearch)) { + TermQuery committenteSearchTermQuery = TermQueryFactoryUtil.create(searchContext, "committenti", + committenteSearch.toUpperCase()); booleanQuery.add(committenteSearchTermQuery, BooleanClauseOccur.MUST); } - if (soggettiInterconnessiSearch != null && !soggettiInterconnessiSearch.equals("")) { + if (Validator.isNotNull(soggettiInterconnessiSearch)) { TermQuery soggettiInterconnessiSearchTermQuery = TermQueryFactoryUtil.create(searchContext, "soggettiInterconnessi", soggettiInterconnessiSearch.toUpperCase()); booleanQuery.add(soggettiInterconnessiSearchTermQuery, BooleanClauseOccur.MUST); } - if (istruttoreId != null && !istruttoreId.equals("") && !istruttoreId.equals("-1")) { + if (Validator.isNotNull(istruttoreId) && !istruttoreId.equals("-1")) { TermQuery singleGroupIdQuery = TermQueryFactoryUtil.create(searchContext, "istruttoreUserId", istruttoreId); booleanQuery.add(singleGroupIdQuery, BooleanClauseOccur.MUST); } - if ((dataDa != null && !dataDa.equals("")) && (dataAl != null && !dataAl.equals(""))) { - + if (Validator.isNotNull(dataDa) && Validator.isNotNull(dataAl)) { Date dataDaApp = DATE_FORMAT_STRING.parse(dataDa); Date dataAlApp = DATE_FORMAT_STRING.parse(dataAl); - TermRangeQuery dateSearchTermRangeQuery = TermRangeQueryFactoryUtil.create(searchContext, "dataInizioProcedimento", DATE_FORMAT_LUCENE.format(dataDaApp), DATE_FORMAT_LUCENE.format(dataAlApp), true, true); booleanQuery.add(dateSearchTermRangeQuery, BooleanClauseOccur.MUST); - } - if ((dataDa == null || dataDa.equals("")) && (dataAl != null && !dataDa.equals(""))) { + } else if (Validator.isNull(dataDa) && Validator.isNotNull(dataAl)) { Date dataAlApp = DATE_FORMAT_STRING.parse(dataAl); TermRangeQuery dateSearchTermRangeQuery = TermRangeQueryFactoryUtil.create(searchContext, - "dataInizioProcedimento", "00000000", DATE_FORMAT_LUCENE.format(dataAlApp), true, - true); + "dataInizioProcedimento", "00000000", DATE_FORMAT_LUCENE.format(dataAlApp), true, true); booleanQuery.add(dateSearchTermRangeQuery, BooleanClauseOccur.MUST); - } - if ((dataDa != null && !dataDa.equals("")) && (dataAl == null || dataAl.equals(""))) { + } else if (Validator.isNotNull(dataDa) && Validator.isNull(dataAl)) { Date dataDaApp = DATE_FORMAT_STRING.parse(dataDa); TermRangeQuery dateSearchTermRangeQuery = TermRangeQueryFactoryUtil.create(searchContext, "dataInizioProcedimento", DATE_FORMAT_LUCENE.format(dataDaApp), DATE_FORMAT_LUCENE.format(new Date()), true, true); booleanQuery.add(dateSearchTermRangeQuery, BooleanClauseOccur.MUST); } - if (comune != null && !comune.equals("") && !comune.equals("-1")) { + if (Validator.isNotNull(comune) && !comune.equals("-1")) { TermQuery comuneTermQuery = TermQueryFactoryUtil.create(searchContext, "comuneId", comune); booleanQuery.add(comuneTermQuery, BooleanClauseOccur.MUST); } if (Validator.isNotNull(tipoProcedura)) { - TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, "tipoProcedura", - tipoProcedura); + TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, "tipoProcedura", tipoProcedura); booleanQuery.add(termQuery, BooleanClauseOccur.MUST); } // ADT - BUG-11 Aggiunta filtro ricerca @@ -700,7 +635,7 @@ public class ControlloPraticaAdvancedSearch { String orderType = ParamUtil.getString(request, "ordinaTipo", "desc"); List sortes = new ArrayList(); Sort sort = new Sort(); - if (orderField != null && !orderField.equals("") && !orderField.equals("-1")) { + if (Validator.isNotNull(orderField) && !orderField.equals("-1")) { if (properties.size() > 0) { sort.setFieldName(orderField + "_sortable"); } else { @@ -714,7 +649,7 @@ public class ControlloPraticaAdvancedSearch { sort.setType(Sort.LONG_TYPE); } } - if (orderType != null && !orderType.equals("") && !orderType.equals("-1")) { + if (Validator.isNotNull(orderType) && !orderType.equals("-1")) { if (orderType.equals("asc")) { sort.setReverse(false); } else { @@ -724,4 +659,4 @@ public class ControlloPraticaAdvancedSearch { sortes.add(sort); return sortes.toArray(new Sort[0]); } -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java index 1038d522..c01cedf5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java @@ -556,17 +556,11 @@ public interface IntPraticaLocalService extends BaseLocalService, long territorioId) throws com.liferay.portal.kernel.exception.SystemException; - /** - * ADT: report tempistiche istruttorie - */ public java.util.List reportTempisticheIstruttorieAvvisiAutorizzazioni( java.util.Date dtMin, java.util.Date dtMax, long groupId, java.lang.String type) throws com.liferay.portal.kernel.exception.SystemException; - /** - * ADT: report pratiche vidimate - */ public java.util.List reportPraticheVidimate( java.util.Date dtMin, java.util.Date dtMax, long groupId, java.lang.String type) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java index 1b6b431b..70648288 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java @@ -699,9 +699,6 @@ public class IntPraticaLocalServiceUtil { return getService().findByTerritorioId(territorioId); } - /** - * ADT: report tempistiche istruttorie - */ public static java.util.List reportTempisticheIstruttorieAvvisiAutorizzazioni( java.util.Date dtMin, java.util.Date dtMax, long groupId, java.lang.String type) @@ -711,9 +708,6 @@ public class IntPraticaLocalServiceUtil { dtMax, groupId, type); } - /** - * ADT: report pratiche vidimate - */ public static java.util.List reportPraticheVidimate( java.util.Date dtMin, java.util.Date dtMax, long groupId, java.lang.String type) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java index 1cf672ba..6085b1f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java @@ -768,9 +768,6 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, return _intPraticaLocalService.findByTerritorioId(territorioId); } - /** - * ADT: report tempistiche istruttorie - */ @Override public java.util.List reportTempisticheIstruttorieAvvisiAutorizzazioni( java.util.Date dtMin, java.util.Date dtMax, long groupId, @@ -780,9 +777,6 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, dtMax, groupId, type); } - /** - * ADT: report pratiche vidimate - */ @Override public java.util.List reportPraticheVidimate( java.util.Date dtMin, java.util.Date dtMax, long groupId, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java index 0343235e..1e739a14 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java @@ -1,6 +1,8 @@ package it.tref.liferay.portos.bo.util; import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import java.util.ArrayList; @@ -12,6 +14,8 @@ import org.apache.commons.lang.StringUtils; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; @@ -122,7 +126,8 @@ public class PraticaUtil { add("pagNuovaCostruzione"); add("pagVarianti"); add("pagAltro"); - }}; + } + }; public static List getDettPraticaHiddenFields() { @@ -132,21 +137,42 @@ public class PraticaUtil { public static String getStatoPraticaLabel(String statoPratica, long intPraticaId) throws PortalException, SystemException { + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + return getStatoPraticaLabel(statoPratica, intPratica.getTipoProcedura()); + } + + public static String getStatoPratica(String statoPratica, long intPraticaId) throws PortalException, + SystemException { + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + return getStatoPratica(statoPratica, intPratica.getTipoProcedura()); + } + + public static String getStatoPratica(String statoPratica, String tipoProcedura) throws PortalException, + SystemException { + + return LanguageUtil.get(LocaleUtil.getDefault(), getStatoPraticaLabel(statoPratica, tipoProcedura)); + } + + public static String getStatoPraticaLabel(String statoPratica, String tipoProcedura) throws PortalException, + SystemException { + + if (Constants.PROCEDURA_P3.equalsIgnoreCase(tipoProcedura)) { + switch (statoPratica) { + case StatoPraticaConstants.AUTORIZZATA: + case StatoPraticaConstants.CONFORME: + return StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.VIARCH_APERTO); + case StatoPraticaConstants.NON_AUTORIZZATA: + case StatoPraticaConstants.NON_CONFORME: + return StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.VIARCH_CHIUSO); + } + } String statoPraticaLabel = StringPool.BLANK; switch (statoPratica) { case StatoPraticaConstants.CONFORME: - if (AzioniPraticheUtil.isDeposito(intPraticaId)) { - statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.CONFORME); - } else if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { - statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.AUTORIZZATA); - } + statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.AUTORIZZATA); break; case StatoPraticaConstants.NON_CONFORME: - if (AzioniPraticheUtil.isDeposito(intPraticaId)) { - statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.NON_CONFORME); - } else if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { - statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.NON_AUTORIZZATA); - } + statoPraticaLabel = StatoPraticaConstants.getStatusLabel(StatoPraticaConstants.NON_AUTORIZZATA); break; default: statoPraticaLabel = StatoPraticaConstants.getStatusLabel(statoPratica); @@ -158,9 +184,25 @@ public class PraticaUtil { return statoPraticaLabel; } + public static String getStatoPraticaCode(String statoPratica, long intPraticaId) throws PortalException, + SystemException { + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + return getStatoPraticaCode(statoPratica, intPratica); + } + public static String getStatoPraticaCode(String statoPratica, IntPratica intPratica) throws PortalException, SystemException { + if (Constants.PROCEDURA_P3.equals(intPratica.getTipoProcedura())) { + switch (intPratica.getStatoPratica()) { + case StatoPraticaConstants.AUTORIZZATA: + case StatoPraticaConstants.CONFORME: + return StatoPraticaConstants.VIARCH_APERTO; + case StatoPraticaConstants.NON_AUTORIZZATA: + case StatoPraticaConstants.NON_CONFORME: + return StatoPraticaConstants.VIARCH_CHIUSO; + } + } String statoPraticaCode = StringPool.BLANK; switch (statoPratica) { case StatoPraticaConstants.CONFORME: diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java index 8807cf71..3d1585c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java @@ -217,7 +217,7 @@ public class WorkflowUtil { public static boolean isWorkflowAttivabileByTipoIntegrazione(DettPratica dettPratica) throws PortalException, SystemException { - if (dettPratica.getTipoIntegrazione() == null || dettPratica.getTipoIntegrazione().equals("")) { + if (Validator.isNull(dettPratica.getTipoIntegrazione())) { return true; } else { return !TipoIntegrazioneUtil.isOutOfWorkflow(dettPratica.getTipoIntegrazione()); @@ -257,7 +257,7 @@ public class WorkflowUtil { WorkflowTask workflowTask = getLastTask(companyId, groupId, null, controlloPratica); Map workflowContext = getWorkflowContext(controlloPratica); WorkflowTaskManagerUtil.assignWorkflowTaskToUser(companyId, assegnatoreUserId, - workflowTask.getWorkflowTaskId(), istruttoreId, "", null, workflowContext); + workflowTask.getWorkflowTaskId(), istruttoreId, StringPool.BLANK, null, workflowContext); } public static Map getWorkflowContext(ControlloPratica controlloPratica) @@ -291,12 +291,10 @@ public class WorkflowUtil { switch (value) { case StatoPraticaConstants.AUTORIZZATA: case StatoPraticaConstants.CONFORME: - value = StatoPraticaConstants.VIARCH_APERTO; - break; + return "stato-pratica-" + StatoPraticaConstants.VIARCH_APERTO; case StatoPraticaConstants.NON_AUTORIZZATA: case StatoPraticaConstants.NON_CONFORME: - value = StatoPraticaConstants.VIARCH_CHIUSO; - break; + return "stato-pratica-" + StatoPraticaConstants.VIARCH_CHIUSO; } } else if (intPratica.getTipoPratica().equals(Constants.TIPO_PRATICA_AUTORIZZAZIONE)) { if (value.equals(StatoPraticaConstants.CONFORME)) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 79b2a159..dc57c763 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -1076,6 +1076,8 @@ label.admingeniocivile.statopratica.assegnata = Assegnata label.admingeniocivile.statopratica.attesafirma = Attesa di Firma label.admingeniocivile.statopratica.approvazione = Approvazione label.admingeniocivile.statopratica.variante = Variante +label.admingeniocivile.statopratica.viarch1 = VIArch aperto +label.admingeniocivile.statopratica.viarch2 = VIArch chiuso label.firma-doc = Dichiaro di aver preso visione del documento, e di sottoscriverne il contenuto ai sensi del D.Lgs. 82/2005 label.cambio-soggetti-ok = Cambio Soggetti #{0} completato con successo diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java index ee01460b..99f519b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java @@ -46,8 +46,9 @@ public class SchedulerWorkflow implements MessageListener { } } catch (Exception e) { e.printStackTrace(); + } finally { + lock.unlock(); } - lock.unlock(); } } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java index 8398ba88..d491f034 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java @@ -253,10 +253,12 @@ public class ManutenzioneDatabase { } catch (PortalException e) { } if ((0 != destinazione) && (destinazione != pratica.getUnitaOperativa())) { - esitoLog(esito, - "Pratica " + pratica.getNumeroProgetto() + "/" + pratica.getIntPraticaId() - + ", " + pratica.getUnitaOperativa() + " -> " + destinazione + " (" - + userId + ")"); + esitoLog( + esito, + "Pratica " + pratica.getNumeroProgetto() + StringPool.SLASH + + pratica.getIntPraticaId() + StringPool.COMMA_AND_SPACE + + pratica.getUnitaOperativa() + " -> " + destinazione + " (" + + userId + StringPool.CLOSE_PARENTHESIS); pratica.setUnitaOperativa(destinazione); IntPraticaLocalServiceUtil.updateIntPratica(pratica); } @@ -435,7 +437,8 @@ public class ManutenzioneDatabase { } break; default: - _log.info("Tipo sconosciuto " + tipo + " (" + fileEntry.getTitle() + ")"); + _log.info("Tipo sconosciuto " + tipo + " (" + fileEntry.getTitle() + + StringPool.CLOSE_PARENTHESIS); break; } } else { @@ -1157,7 +1160,7 @@ public class ManutenzioneDatabase { WorkflowInstanceManagerUtil.getWorkflowInstance(companyId, classPK); } } else { - if (className.contains(".")) { + if (className.contains(StringPool.PERIOD)) { switch (className) { case "com.liferay.portlet.blogs": case "com.liferay.portlet.documentlibrary": diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index c51c6b5c..55d379a2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -618,10 +618,11 @@ public class SismicaUtil { esito.add(intPratica.getNumeroProgetto() + " aggiunto ControlloPratica " + controllo.getControlloPraticaId()); } - AvvisoLocalServiceUtil.addAvviso(intPraticaId, "", avviso.getDtAvviso(), - AvvisoUtil.TIPO_AVVISO_DIRETTO, avviso.getTipoDocumento(), templateId, - controllo.getDettPraticaId(), DettPratica.class.getName(), - controllo.getControlloPraticaId(), serviceContext); + AvvisoLocalServiceUtil.addAvviso(intPraticaId, StringPool.BLANK, + avviso.getDtAvviso(), AvvisoUtil.TIPO_AVVISO_DIRETTO, + avviso.getTipoDocumento(), templateId, controllo.getDettPraticaId(), + DettPratica.class.getName(), controllo.getControlloPraticaId(), + serviceContext); } catch (Exception e) { esito.add("Errore durante l'invio: " + e.getMessage()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java index f96da6c0..72241c66 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java @@ -105,11 +105,12 @@ public class IntPraticaIndexer extends BaseIndexer { if (_log.isDebugEnabled()) { _log.debug("Indicizzo la pratica " + (Validator.isNull(intPratica.getNumeroProgetto()) ? StringPool.BLANK : intPratica - .getNumeroProgetto() + ", ") + "id " + intPratica.getIntPraticaId()); + .getNumeroProgetto() + StringPool.COMMA_AND_SPACE) + "id " + + intPratica.getIntPraticaId()); } document = getBaseModelDocument(PORTLET_ID, intPratica); document.addKeyword("entryClassName", IntPratica.class.getName()); - // Prendo l ultimo DettPratica legato a IntPratica + // Prendo l'ultimo DettPratica legato a IntPratica DettPratica lastDettPratica = DettPraticaLocalServiceUtil .getLastCompletedByIntPraticaAndProtocolloNotEmpty(intPraticaFromDB.getIntPraticaId()); if (Validator.isNull(lastDettPratica)) { @@ -252,9 +253,9 @@ public class IntPraticaIndexer extends BaseIndexer { List listaParereGeologo = ParereGeologoLocalServiceUtil.findByIntPraticaId( intPratica.getIntPraticaId(), 0, 1); if (Validator.isNotNull(listaParereGeologo) && !listaParereGeologo.isEmpty()) { - document.addKeyword(PortosIndexField.PARERE_GEOLOGO, "true"); + document.addKeyword(PortosIndexField.PARERE_GEOLOGO, StringPool.TRUE); } else { - document.addKeyword(PortosIndexField.PARERE_GEOLOGO, "false"); + document.addKeyword(PortosIndexField.PARERE_GEOLOGO, StringPool.FALSE); } // Gestione pratica sospesa document.addKeyword(PortosIndexField.STATUS_SOSPESA, intPraticaFromDB.isSospesa()); @@ -262,7 +263,7 @@ public class IntPraticaIndexer extends BaseIndexer { document.addKeyword(Field.USER_ID, intPraticaFromDB.getUserId()); // ALTRI PROGETTI if (Validator.isNotNull(committenti) && committenti.size() > 0) { - // Creao una stringa contenente tutti i codFisc legati alla IntPratica separati da , + // Creo una stringa contenente tutti i codFisc legati alla IntPratica separati da , List listaSoggetti = new ArrayList(); for (Soggetto soggetto : committenti) { if (Validator.isNotNull(soggetto.getCognome())) { @@ -467,4 +468,4 @@ public class IntPraticaIndexer extends BaseIndexer { return WorkflowUtil.isWorkflowDisattivabile(intPraticaId); } -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/DocPraticaModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/DocPraticaModelListener.java index f2d58a47..91c2af65 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/DocPraticaModelListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/DocPraticaModelListener.java @@ -22,7 +22,7 @@ public class DocPraticaModelListener extends BaseModelListener { Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class); indexer.reindex(IntPratica.class.getName(), model.getIntPraticaId()); if (_log.isDebugEnabled()) { - _log.debug("DettPraticaModelListener - Chiamato Reindex IntPraticaId : " + model.getIntPraticaId()); + _log.debug("DocPraticaModelListener - Chiamato Reindex IntPraticaId : " + model.getIntPraticaId()); } } catch (SearchException e) { _log.error(e, e); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/SoggettoModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/SoggettoModelListener.java index 058f3357..691fc41e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/SoggettoModelListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/SoggettoModelListener.java @@ -22,7 +22,7 @@ public class SoggettoModelListener extends BaseModelListener { Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class); indexer.reindex(IntPratica.class.getName(), model.getIntPraticaId()); if (_log.isDebugEnabled()) { - _log.debug("DettPraticaModelListener - Chiamato Reindex IntPraticaId : " + model.getIntPraticaId()); + _log.debug("SoggettoModelListener - Chiamato Reindex IntPraticaId : " + model.getIntPraticaId()); } } catch (SearchException e) { _log.error(e, e); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java index d68cc9c9..0ad04faf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java @@ -529,7 +529,7 @@ public class FascicoloPortlet extends MVCPortlet { .append(LanguageUtil.get( locale, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), - intPratica.getIntPraticaId()))).append(StringPool.SEMICOLON); + intPratica.getTipoProcedura()))).append(StringPool.SEMICOLON); if (Validator.isNotNull(provincia)) { sb.append(provincia.getProvincia()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java index 75374f96..9fe711e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java @@ -121,7 +121,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet { actionResponse.setRenderParameter("dataRichiestaInizioYear", dataRichiestaInizioSplitted[2]); } if (Validator.isNotNull(dataRichiestaFine)) { - String[] dataRichiestaFineSplitted = dataRichiestaFine.split("/"); + String[] dataRichiestaFineSplitted = dataRichiestaFine.split(StringPool.FORWARD_SLASH); actionResponse.setRenderParameter("dataRichiestaFineDay", dataRichiestaFineSplitted[0]); int month = Integer.valueOf(dataRichiestaFineSplitted[1]) - 1; actionResponse.setRenderParameter("dataRichiestaFineMonth", String.valueOf(month)); @@ -257,7 +257,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet { ThemeDisplay themeDisplay = (ThemeDisplay) resourceRequest.getAttribute(WebKeys.THEME_DISPLAY); Locale locale = themeDisplay.getLocale(); User user = themeDisplay.getUser(); - String cmd = ParamUtil.getString(resourceRequest, "cmd"); + String cmd = ParamUtil.getString(resourceRequest, Constants.CMD); String id = resourceRequest.getResourceID(); String csv = StringPool.BLANK; HttpServletRequest request = PortalUtil.getHttpServletRequest(resourceRequest); @@ -393,7 +393,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet { User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId()); taskName = LanguageUtil.get(getPortletConfig(), locale, task.getName()); if (userTask != null) { - taskName += " (" + userTask.getFullName() + ")"; + taskName += " (" + userTask.getFullName() + StringPool.CLOSE_PARENTHESIS; } } else { taskName = LanguageUtil.get(getPortletConfig(), locale, workflowInstance.getState()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java index 71e637ef..f7fc9a6b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java @@ -1,10 +1,9 @@ package it.tref.liferay.portos.bo.portlet; -import it.tref.liferay.portos.bo.shared.util.ParamUtil; - import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; +import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.util.bridges.mvc.MVCPortlet; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/TempistichePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/TempistichePortlet.java index 49593fa6..1bb04c7a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/TempistichePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/TempistichePortlet.java @@ -149,7 +149,7 @@ public class TempistichePortlet extends MVCPortlet { Long dettPraticaId = 0L; DynamicQuery query = DynamicQueryFactoryUtil.forClass(Tempistica.class); query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - query.add(RestrictionsFactoryUtil.eq("tipo", "P")); + query.add(RestrictionsFactoryUtil.eq("tipo", TempisticaConstants.TIPO_PRATICA)); Order defaultOrderDettPrtatica = OrderFactoryUtil.desc("createDate"); query.addOrder(defaultOrderDettPrtatica); List lista = TempisticaLocalServiceUtil.dynamicQuery(query); @@ -280,7 +280,7 @@ public class TempistichePortlet extends MVCPortlet { if (avvisi.size() > 0 && avvisi.get(0).getDtAvviso() != null) { sb.append(CSVUtil.encode(dateFormat.format(avvisi.get(0).getDtInvio()))); } else { - sb.append("-"); + sb.append(StringPool.DASH); } sb.append(StringPool.SEMICOLON) .append(CSVUtil.encode(String.valueOf(TimeUnit.MILLISECONDS.toDays(calcoloTempo)))) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index 57169d31..4679e65a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -30,6 +30,7 @@ import it.tref.liferay.portos.bo.shared.util.UnitaOperativeUtil; import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; import it.tref.liferay.portos.bo.util.GestioneFirmeUtil; +import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.TempisticaConstants; import it.tref.liferay.portos.bo.util.WorkflowConstants; import it.tref.liferay.portos.bo.util.WorkflowUtil; @@ -606,11 +607,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi FormLog formLog = listaKaleoLog.get(0); JSONObject json = JSONFactoryUtil.createJSONObject(formLog.getFormParameters()); if (json.has("esito")) { - if (AzioniPraticheUtil.isDeposito(controlloPratica.getIntPraticaId())) { - tipoEsito = StatoPraticaConstants.getEsitoDeposito(json.getString("esito")); - } else if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) { - tipoEsito = StatoPraticaConstants.getEsitoAutorizzazione(json.getString("esito")); - } + tipoEsito = PraticaUtil.getStatoPratica(json.getString("esito"), + controlloPratica.getIntPraticaId()); } } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java index d92fe734..e69b1a06 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java @@ -16,6 +16,7 @@ import com.liferay.portal.kernel.dao.orm.Type; 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.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.persistence.impl.BasePersistenceImpl; import com.liferay.util.dao.orm.CustomSQLUtil; @@ -90,7 +91,7 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl implem qPos.add(dtMin); qPos.add(dtMax); qPos.add(groupId); - qPos.add(Validator.isNotNull(type) ? type : "%"); + qPos.add(Validator.isNotNull(type) ? type : StringPool.PERCENT); qPos.add(isControlloObbligatorio); List list = query.list(); countIntPraticaIds = (int) (list == null || list.isEmpty() ? 0 : list.get(0)); @@ -118,7 +119,7 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl implem query.setCacheable(false); query.addEntity("intp", IntPraticaImpl.class); QueryPos qPos = QueryPos.getInstance(query); - qPos.add(Validator.isNotNull(type) ? type : "%"); + qPos.add(Validator.isNotNull(type) ? type : StringPool.PERCENT); qPos.add(isControlloObbligatorio); qPos.add(groupId); qPos.add(dtMin); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderImpl.java index ff6c4c64..7d17faa4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaFinderImpl.java @@ -16,6 +16,7 @@ import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.SQLQuery; import com.liferay.portal.kernel.dao.orm.Session; import com.liferay.portal.kernel.dao.orm.Type; +import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.persistence.impl.BasePersistenceImpl; @@ -374,6 +375,7 @@ public class TempisticaFinderImpl extends BasePersistenceImpl implem // ADT - BUG-14 - Scadenziario // ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca + @SuppressWarnings("unchecked") @Override public List scadenzePratiche(long companyId, long groupId, int start, int end, Integer statoPratica, String tipoPratica, String istruttore) { @@ -395,9 +397,9 @@ public class TempisticaFinderImpl extends BasePersistenceImpl implem : "1 OR 1=1")); // ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca sql = StringUtil.replace(sql, "[$DT_TIPOPRATICA$]", - Validator.isNull(tipoPratica) ? "%" : tipoPratica.toUpperCase()); + Validator.isNull(tipoPratica) ? StringPool.PERCENT : tipoPratica.toUpperCase()); sql = StringUtil.replace(sql, "[$DT_ISTRUTTORE$]", - Validator.isNull(istruttore) ? "%" : istruttore.toUpperCase()); + Validator.isNull(istruttore) ? StringPool.PERCENT : istruttore.toUpperCase()); sql = StringUtil.replace(sql, "[$DT_STATO$]", Validator.isNull(statoPratica) ? "1 OR 1=1" : String.valueOf(statoPratica)); SQLQuery query = session.createSQLQuery(sql); @@ -421,6 +423,7 @@ public class TempisticaFinderImpl extends BasePersistenceImpl implem } // ADT - BUG-14 - Scadenziario + @SuppressWarnings("unchecked") @Override public List scadenzeIntegrazioni(long companyId, long groupId, int start, int end, Integer statoPratica) { @@ -479,9 +482,9 @@ public class TempisticaFinderImpl extends BasePersistenceImpl implem : "1 OR 1=1")); // ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca sql = StringUtil.replace(sql, "[$DT_TIPOPRATICA$]", - Validator.isNull(tipoPratica) ? "%" : tipoPratica.toUpperCase()); + Validator.isNull(tipoPratica) ? StringPool.PERCENT : tipoPratica.toUpperCase()); sql = StringUtil.replace(sql, "[$DT_ISTRUTTORE$]", - Validator.isNull(istruttore) ? "%" : istruttore.toUpperCase()); + Validator.isNull(istruttore) ? StringPool.PERCENT : istruttore.toUpperCase()); sql = StringUtil.replace(sql, "[$DT_STATO$]", Validator.isNull(statoPratica) ? "1 OR 1=1" : String.valueOf(statoPratica)); SQLQuery query = session.createSQLQuery(sql); @@ -531,6 +534,7 @@ public class TempisticaFinderImpl extends BasePersistenceImpl implem return count; } + @SuppressWarnings("unchecked") @Override public List scadenzePraticheForBackwardCompatibility(long companyId, long groupId, int start, int end) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java index 35c2d287..4b12b672 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/CompanyExpandoStartupAction.java @@ -1,9 +1,9 @@ package it.tref.liferay.portos.bo.startup; -import java.util.Date; - import it.tref.liferay.portos.bo.shared.util.Constants; +import java.util.Date; + import com.liferay.portal.kernel.events.ActionException; import com.liferay.portal.kernel.events.SimpleAction; import com.liferay.portal.kernel.exception.PortalException; @@ -35,16 +35,11 @@ public class CompanyExpandoStartupAction extends SimpleAction { String[] defaultActions = { ActionKeys.VIEW, ActionKeys.UPDATE }; String[] guestActions = { ActionKeys.VIEW }; - try { - for (String companyIdStr : companyIds) { - long companyId = Long.valueOf(companyIdStr); initExpandoColumnCompany(companyId, defaultActions, guestActions); - } - } catch (Exception e) { _log.error("Errore nella procedura automatizzata di configurazione", e); } @@ -54,65 +49,45 @@ public class CompanyExpandoStartupAction extends SimpleAction { throws NumberFormatException, SystemException { String className = Company.class.getName(); - addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES, - ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES_URL, + ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES_URL, defaultActions, + guestActions); + addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS, + ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_URL, defaultActions, + guestActions); + addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT, + ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT_URL, defaultActions, guestActions); - - addExpandoColumnIfNotExists(companyId, className, - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS, ExpandoColumnConstants.STRING, - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_URL, defaultActions, guestActions); - - addExpandoColumnIfNotExists(companyId, className, - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT, ExpandoColumnConstants.STRING, - Constants.COMPANY_CUSTOM_FIELD_VERSIONING_SNAPSHOTS_COUNT_URL, defaultActions, guestActions); - addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT, - ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT_URL, - defaultActions, guestActions); - + ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT_URL, defaultActions, + guestActions); addExpandoColumnIfNotExists(companyId, className, - Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, - ExpandoColumnConstants.STRING, + Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_VALUE, defaultActions, guestActions); - addExpandoColumnIfNotExists(companyId, className, - Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, - ExpandoColumnConstants.STRING, + Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, ExpandoColumnConstants.STRING, Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_VALUE, defaultActions, guestActions); - - addExpandoColumnIfNotExists(companyId, className, Constants.ORG_CUSTOM_FIELD_PO, - ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions); - + addExpandoColumnIfNotExists(companyId, className, Constants.ORG_CUSTOM_FIELD_PO, ExpandoColumnConstants.STRING, + StringPool.BLANK, defaultActions, guestActions); addExpandoColumnIfNotExists(companyId, className, Constants.GESTIONE_PRATICA_URL_FE, ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions); - addExpandoColumnIfNotExists(companyId, className, Constants.GESTIONE_PRATICA_URL_BO, ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions); - addExpandoColumnIfNotExists(companyId, className, Constants.CF_ORGANIZATION_MEMBERSHIP, ExpandoColumnConstants.STRING, StringPool.BLANK, defaultActions, guestActions); - - // Manifattura Web Group, mofidica per rendere la dimensione massima - // degli allegati configurabile da pannello di controllo. In origine era - // hardcoded a 20971520 byte. + // Manifattura Web Group, mofidica per rendere la dimensione massima degli allegati configurabile da pannello di + // controllo. In origine era hardcoded a 20971520 byte. addExpandoColumnIfNotExists(companyId, className, - Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_IN_MIB, - ExpandoColumnConstants.SHORT, - Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_DEFAULT, defaultActions, - guestActions); - + Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_IN_MIB, ExpandoColumnConstants.SHORT, + Constants.COMPANY_CUSTOM_FIELD_DIMENSIONE_MASSIMA_ALLEGATI_DEFAULT, defaultActions, guestActions); addExpandoColumnIfNotExists(companyId, className, Constants.COMPANY_CUSTOM_FIELD_LINK_SEED, - ExpandoColumnConstants.STRING, String.valueOf(new Date().getTime()), defaultActions, - guestActions); + ExpandoColumnConstants.STRING, String.valueOf(new Date().getTime()), defaultActions, guestActions); } - private ExpandoColumn addExpandoColumnIfNotExists(long companyId, String className, String name, - int type, String defaultData, String[] defaultActions, String[] guestActions) - throws SystemException { + private ExpandoColumn addExpandoColumnIfNotExists(long companyId, String className, String name, int type, + String defaultData, String[] defaultActions, String[] guestActions) throws SystemException { long classNameId = PortalUtil.getClassNameId(className); - ExpandoTable expandoTable = null; try { expandoTable = ExpandoTableLocalServiceUtil.getTable(companyId, classNameId, @@ -124,56 +99,47 @@ public class CompanyExpandoStartupAction extends SimpleAction { } catch (PortalException e1) { } } - - ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil - .getColumn(expandoTable.getTableId(), name); - + ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil.getColumn(expandoTable.getTableId(), name); if (expandoColumn == null) { - try { - // Manifattura Web Group, modifica per rendere possibile la - // creazione di campi personalizzati di tipo intero + // Manifattura Web Group, modifica per rendere possibile la creazione di campi personalizzati di tipo + // intero switch (type) { case ExpandoColumnConstants.INTEGER: - expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, - type, Integer.valueOf(defaultData)); + expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type, + Integer.valueOf(defaultData)); break; case ExpandoColumnConstants.LONG: - expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, - type, Long.valueOf(defaultData)); + expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type, + Long.valueOf(defaultData)); break; case ExpandoColumnConstants.SHORT: - expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, - type, Short.valueOf(defaultData)); + expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type, + Short.valueOf(defaultData)); break; default: - expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, - type, defaultData); + expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type, + defaultData); } - } catch (PortalException e) { } } - try { - Role roleGuest = RoleLocalServiceUtil.getRole(companyId, RoleConstants.GUEST); Role rolePowerUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.POWER_USER); Role roleUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.USER); - ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, - ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL, - String.valueOf(expandoColumn.getColumnId()), roleGuest.getRoleId(), guestActions); - ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, - ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL, - String.valueOf(expandoColumn.getColumnId()), rolePowerUser.getRoleId(), defaultActions); - ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, - ExpandoColumn.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL, - String.valueOf(expandoColumn.getColumnId()), roleUser.getRoleId(), defaultActions); + ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(), + ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()), + roleGuest.getRoleId(), guestActions); + ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(), + ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()), + rolePowerUser.getRoleId(), defaultActions); + ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(), + ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()), + roleUser.getRoleId(), defaultActions); } catch (PortalException e) { } - return expandoColumn; } - -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java index a52d0bf9..aaca3c86 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java @@ -28,4 +28,4 @@ public class KaleoListenereStartupAction extends ModelListenerStartupAction { KaleoLogModelListener.class.getName()) }; } -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/Constants.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/Constants.java index 6765421b..51c9eae5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/Constants.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/Constants.java @@ -16,4 +16,4 @@ public class Constants extends it.tref.liferay.portos.bo.shared.util.Constants { "Codice NUTS3 2010", "Codice NUTS1 2006", "Codice NUTS2 2006 (3)", "Codice NUTS3 2006" }; public static final String[] AMMINISTRAZIONE_CSV_HEADERS_PROVINCE = { "codice_provincia", "provincia", "regione", "sigla" }; -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GenioCivileBaseUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GenioCivileBaseUtil.java index 75a8cfff..c9079d79 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GenioCivileBaseUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/GenioCivileBaseUtil.java @@ -22,6 +22,7 @@ public class GenioCivileBaseUtil { public static String getDettPraticaURL(long plid, long resourcePrimKey, int status, String portalURL, boolean maximized) { + return getDettPraticaURL(plid, resourcePrimKey, status, portalURL, maximized, null); } @@ -29,24 +30,15 @@ public class GenioCivileBaseUtil { boolean maximized, String redirect) { StringBundler sb = new StringBundler(11); - sb.append(portalURL); - sb.append(PortalUtil.getPathMain()); - sb.append("/portal/dettaglio_pratica/find_entry"); - sb.append(StringPool.QUESTION); - sb.append("p_l_id"); - sb.append(StringPool.EQUAL); - sb.append(String.valueOf(plid)); - sb.append(StringPool.AMPERSAND); + sb.append(portalURL).append(PortalUtil.getPathMain()).append("/portal/dettaglio_pratica/find_entry") + .append(StringPool.QUESTION).append("p_l_id").append(StringPool.EQUAL).append(String.valueOf(plid)) + .append(StringPool.AMPERSAND); // control panel if (Validator.isNotNull(redirect)) { - sb.append("doAsGroupId"); - sb.append(StringPool.EQUAL); - sb.append(HttpUtil.getParameter(redirect, "doAsGroupId", false)); - sb.append(StringPool.AMPERSAND); + sb.append("doAsGroupId").append(StringPool.EQUAL) + .append(HttpUtil.getParameter(redirect, "doAsGroupId", false)).append(StringPool.AMPERSAND); } - sb.append("resourcePrimKey"); - sb.append(StringPool.EQUAL); - sb.append(String.valueOf(resourcePrimKey)); + sb.append("resourcePrimKey").append(StringPool.EQUAL).append(String.valueOf(resourcePrimKey)); String url = sb.toString(); if (status != WorkflowConstants.STATUS_APPROVED) { url = HttpUtil.addParameter(url, "status", String.valueOf(status)); @@ -62,6 +54,7 @@ public class GenioCivileBaseUtil { public static String getDettPraticaURL(HttpServletRequest request, long plid, long resourcePrimKey, int status) throws PortletModeException, WindowStateException { + return getDettPraticaURL(request, plid, resourcePrimKey, status, null); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java index 9cc6d01c..3eef5713 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java @@ -8,4 +8,4 @@ public class TempisticaConstants { public static final int STATO_ATTIVA = 1; public static final int STATO_IN_SCADENZA = 0; public static final int STATO_SCADUTA = -1; -} +} \ No newline at end of file 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 c3f2b06b..8ae7668e 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=3026 - build.date=1617377570209 + build.number=3033 + build.date=1617889763598 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/edit_allegato_manuale.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/edit_allegato_manuale.jsp index 8dbfa740..b9ca9332 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/edit_allegato_manuale.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/edit_allegato_manuale.jsp @@ -1,41 +1,37 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> <%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> -<%@ include file="/html/doc_aggiuntiva/init.jsp" %> - +<%@include file="/html/doc_aggiuntiva/init.jsp"%> <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); - String formName = "fmAllegatoManuale"; - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - long territorioGroupId = territorio.getGroupId(); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); +String formName = "fmAllegatoManuale"; +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +long territorioGroupId = territorio.getGroupId(); %> - - - + - - - + + + -
-
+
- +
-
- +
+ - +
@@ -46,21 +42,17 @@
- - window.parent.Liferay.fire('allegati_manuali-open'); + window.parent.Liferay.fire('allegati_manuali-open'); - - - - +
- +
- \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/init.jsp index 505d90c5..340337b8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/init.jsp @@ -1,2 +1,2 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/init.jsp" %> \ No newline at end of file +<%@include file="/html/init.jsp"%> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/view.jsp index 5355476c..1a4e1022 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/allegati_manuali/view.jsp @@ -1,16 +1,14 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> -<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> -<%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> +<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%> <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> +<%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> <%@include file="/html/allegati_manuali/init.jsp"%> <% long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); long territorioGroupId = territorio.getGroupId(); @@ -20,26 +18,29 @@ long territorioGroupId = territorio.getGroupId();
- + - +
- + icon="fa fa-plus" href="<%= addAllegatoManuale %>" + cssClass="btn btn-primary btn-action" /> + icon="fa fa-download" href="<%= downloadAllURL %>" + cssClass="btn btn-primary btn-action" /> @@ -47,13 +48,15 @@ long territorioGroupId = territorio.getGroupId();
- + + total="<%= AllegatoManualeLocalServiceUtil.countByIntPratica(intPraticaId) %>"> - + <% String title = StringPool.BLANK; if (Validator.isNotNull(allegatoManuale.getFileEntryId())) { @@ -64,63 +67,74 @@ long territorioGroupId = territorio.getGroupId(); - + <% if (Validator.isNotNull(allegatoManuale.getFileEntryId())) { FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(allegatoManuale.getFileEntryId()); %> - - - - - -
  • - -
    • - <% - String downloadUrl = DLUtil.getPreviewURL(fileEntry, fileEntry.getLatestFileVersion(), themeDisplay, "&download=true"); - %> -
  • - -
    • - <% - Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(allegatoManuale.getAvvisoId()); - %> - -
  • - - - - + + + + + +
  • + +
    • + <% + String downloadUrl = DLUtil.getPreviewURL(fileEntry, fileEntry.getLatestFileVersion(), + themeDisplay, "&download=true"); + %> +
  • + +
    • + <% + Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(allegatoManuale.getAvvisoId()); + %> + +
  • + + + + - A.one('<%="#"+renderResponse.getNamespace()+"delete_"+allegatoManuale.getAllegatoManualeId() %>').on( - 'click', - function(event) { - event.preventDefault(); - A.io.request( - '<%=deleteUrl%>', - { - on: { - failure: function() { - alert('impossibile rimuovere il documento!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati_manuali-open'); - Liferay.Portlet.refresh("#p_p_id"); - } - } + A.one('<%= "#" + renderResponse.getNamespace() + "delete_" + + allegatoManuale.getAllegatoManualeId() %>').on( + 'click', + function(event) { + event.preventDefault(); + A.io.request('<%= deleteUrl %>', { + on: { + failure: function() { + alert('impossibile rimuovere il documento!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati_manuali-open'); + Liferay.Portlet.refresh("#p_p_id"); } - ); - } - ); + } + }); + } + );
    • <% - } + } %>     @@ -133,29 +147,24 @@ long territorioGroupId = territorio.getGroupId(); Liferay.fire('allegati_manuali-ready'); - - - +
    - +
    -     \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/init.jsp index 02059103..5d4e76c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/init.jsp @@ -71,8 +71,5 @@ Format dateFormatDate = FastDateFormatFactoryUtil.getDate(locale, timeZone); Format dateFormatDateTime = FastDateFormatFactoryUtil.getDateTime(locale, timeZone); WindowState windowState = renderRequest.getWindowState(); PortletMode portletMode = renderRequest.getPortletMode(); - String currentURL = PortalUtil.getCurrentURL(liferayPortletRequest); - - %> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp index d6427582..cd09fa9d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp @@ -1,13 +1,11 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/amministrazione/init.jsp" %> - <% long comuneId = ParamUtil.getLong(renderRequest, "comuneId"); -Comune comune = (Comune)request.getAttribute(it.tref.liferay.portos.bo.util.WebKeys.PORTOS_AMM_COMUNE); - +Comune comune = (Comune) request.getAttribute(it.tref.liferay.portos.bo.shared.util.WebKeys.PORTOS_AMM_COMUNE); String title = null; -if(comune == null) { - if(comuneId > 0) { +if (comune == null) { + if (comuneId > 0) { comune = ComuneLocalServiceUtil.getComune(comuneId); title = comune.getDenominazione(); } else { @@ -17,14 +15,12 @@ if(comune == null) { } else { title = comune.getDenominazione(); } - String codiceProvinciaValue = StringPool.BLANK; -if(Validator.isNotNull(comune.getCodiceProvincia())) { +if (Validator.isNotNull(comune.getCodiceProvincia())) { Provincia item = ProvinciaLocalServiceUtil.findByC_C(company.getCompanyId(), comune.getCodiceProvincia()); codiceProvinciaValue = HtmlUtil.escape(item.getProvincia()); } %> - @@ -33,40 +29,27 @@ if(Validator.isNotNull(comune.getCodiceProvincia())) { - - - - + - - + + - - <%=comune.getCodiceComune() %> + <%= comune.getCodiceComune() %> - - + - + - + @@ -75,9 +58,8 @@ if(Validator.isNotNull(comune.getCodiceProvincia())) { - - - + + @@ -90,7 +72,7 @@ A.one('#selectProvinciaLink').on('click', function(event) { }, id: 'selectProvincia', title: '', - uri: '<%=selectProvinciaURL %>' + uri: '<%= selectProvinciaURL %>' }, function(event) { A.one('#codiceProvincia').val(event.codiceprovincia); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/import.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/import.jsp index 7ba553e0..fe865a00 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/import.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/import.jsp @@ -1,38 +1,30 @@ <%-- LIFERAY_CRUD_GENERATOR_DO_NOT_GENERATE --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - <%@ include file="/html/amministrazione/init.jsp" %> - - -
    + arguments="<%= new String[] { StringUtil.merge(Constants.AMMINISTRAZIONE_CSV_HEADERS_COMUNI, + StringPool.COMMA_AND_SPACE) } %>" + key="csv-file-headers-format-must-be-x" translateArguments="false" />
    - - - - + + 'csv' - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/search.jsp index 5b03c171..ee1da622 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/search.jsp @@ -1,13 +1,8 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - <%@ include file="/html/amministrazione/init.jsp" %> - <% SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer"); DisplayTerms displayTerms = (DisplayTerms) searchContainer.getDisplayTerms(); %> - - \ No newline at end of file + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/select_comune.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/select_comune.jsp index 2a33157a..5fc75b03 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/select_comune.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/select_comune.jsp @@ -1,20 +1,16 @@ <%-- LIFERAY_CRUD_GENERATOR_DO_NOT_GENERATE --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - <%@ include file="/html/amministrazione/init.jsp" %> - <% String eventName = ParamUtil.getString(request, "eventName", liferayPortletResponse.getNamespace() + "selectComune"); %> - - + results="<%= ComuneLocalServiceUtil.findByCompanyId(company.getCompanyId(), QueryUtil.ALL_POS, + QueryUtil.ALL_POS) %>" /> @@ -32,22 +28,18 @@ String eventName = ParamUtil.getString(request, "eventName", liferayPortletRespo - - var Util = Liferay.Util; - A.one('#selectEntryFm').delegate( 'click', function(event) { var result = Util.getAttributes(event.currentTarget, 'data-'); Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().hide(); }, - '.selector-button' + '.selector-button', ); \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view.jsp index 2dba5845..398bab60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view.jsp @@ -1,17 +1,13 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/amministrazione/init.jsp" %> - - <% String orderByCol = ParamUtil.getString(renderRequest, SearchContainer.DEFAULT_ORDER_BY_COL_PARAM, "denominazione"); String orderByType = ParamUtil.getString(renderRequest, SearchContainer.DEFAULT_ORDER_BY_TYPE_PARAM, "asc"); -OrderByComparator orderByComparator = OrderByComparatorFactoryUtil.create(ComuneImpl.TABLE_NAME, orderByCol, "asc".equals(orderByType)); - +OrderByComparator orderByComparator = OrderByComparatorFactoryUtil.create(ComuneImpl.TABLE_NAME, orderByCol, + "asc".equals(orderByType)); DisplayTerms displayTerms = new DisplayTerms(renderRequest); %> - - @@ -25,68 +21,75 @@ DisplayTerms displayTerms = new DisplayTerms(renderRequest); - - - + - - <% String taglibOnClick = renderResponse.getNamespace() + "deleteComunes()"; %> - + <% + String taglibOnClick = renderResponse.getNamespace() + "deleteComunes()"; + %> + - <% - if(Validator.isNull(displayTerms.getKeywords())) { - results = ComuneLocalServiceUtil.findByCompanyId(company.getCompanyId(), searchContainer.getStart(), searchContainer.getEnd(), orderByComparator); + if (Validator.isNull(displayTerms.getKeywords())) { + results = ComuneLocalServiceUtil.findByCompanyId(company.getCompanyId(), searchContainer.getStart(), + searchContainer.getEnd(), orderByComparator); total = ComuneLocalServiceUtil.countByCompanyId(company.getCompanyId()); } else { - results = ComuneLocalServiceUtil.findByKeywords(company.getCompanyId(), displayTerms.getKeywords(), searchContainer.getStart(), searchContainer.getEnd(), orderByComparator); + results = ComuneLocalServiceUtil.findByKeywords(company.getCompanyId(), displayTerms.getKeywords(), + searchContainer.getStart(), searchContainer.getEnd(), orderByComparator); total = (int) ComuneLocalServiceUtil.countByKeywords(company.getCompanyId(), displayTerms.getKeywords()); } pageContext.setAttribute("results", results); pageContext.setAttribute("total", total); %> - - + - + - - - - - - - - - + + + + + + + + -     - -Liferay.Util.toggleSearchContainerButton('#deleteAll', '#<%= searchContainerReference.getId("searchContainer") %>SearchContainer', document.fm, 'allRowIds'); - +Liferay.Util.toggleSearchContainerButton('#deleteAll', + '#<%= searchContainerReference.getId("searchContainer") %>SearchContainer', + document.fm, 'allRowIds'); Liferay.provide( window, 'deleteComunes', function(cmd) { - if (confirm('<%= UnicodeLanguageUtil.get(pageContext, "are-you-sure-you-want-to-permanently-delete-the-selected-comunes") %>')) { + if (confirm('<%= UnicodeLanguageUtil.get(pageContext, + "are-you-sure-you-want-to-permanently-delete-the-selected-comunes") %>')) { document.fm.method = "post"; - document.fm.deleteComuneIds.value = Liferay.Util.listCheckedExcept(document.fm, 'allRowIds'); - + document.fm.deleteComuneIds.value = + Liferay.Util.listCheckedExcept(document.fm, 'allRowIds'); submitForm(document.fm, ""); } }, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view_buttons.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view_buttons.jsp index 0d19ed7a..fcba0000 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view_buttons.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/view_buttons.jsp @@ -1,29 +1,23 @@ <%-- LIFERAY_CRUD_GENERATOR_DO_NOT_GENERATE --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - <%@ include file="/html/amministrazione/init.jsp" %> - <% -ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); -Comune comune = (Comune)row.getObject(); +ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); +Comune comune = (Comune) row.getObject(); %> - - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp index d2c3daf8..1b78c34f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp @@ -195,8 +195,8 @@ long templateFolderId = ConfigurazioneServiceUtil.findByC_ChiaveLong(companyId, } %> - <%= parentFolderName.equals(StringPool.BLANK) ? fd.getName() - : parentFolderName + StringPool.MINUS + fd.getName()%> + <%= parentFolderName.equals(StringPool.BLANK) ? fd.getName() + : parentFolderName + StringPool.MINUS + fd.getName() %> <% } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/view.jsp index 753f5b93..5dc987a6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/view.jsp @@ -1,17 +1,9 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/amministrazione/init.jsp" %> - <% String currentTab = ParamUtil.getString(request, "tabs1", "territori"); %> - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_import_window.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_import_window.jsp index f4a915d6..a1731172 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_import_window.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_import_window.jsp @@ -1,61 +1,45 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/init.jsp" %> - +<%@include file="/html/init.jsp"%> <% - String titolo = ParamUtil.getString(request, "titolo","Dettaglio"); - String buttonId = ParamUtil.getString(request, "buttonId","sumbit-button"); - - String width = ParamUtil.getString(request, "width","700"); - String height = ParamUtil.getString(request, "height"); - - String contentDiv = ParamUtil.getString(request, "contentDiv"); - - String function = ParamUtil.getString(request, "function"); - - String randomId = StringUtil.randomId(); +String titolo = ParamUtil.getString(request, "titolo", "Dettaglio"); +String buttonId = ParamUtil.getString(request, "buttonId", "sumbit-button"); +String width = ParamUtil.getString(request, "width", "700"); +String height = ParamUtil.getString(request, "height"); +String contentDiv = ParamUtil.getString(request, "contentDiv"); +String function = ParamUtil.getString(request, "function"); +String randomId = StringUtil.randomId(); %> -
    - - - AUI().ready( - 'aui-modal', - function(A) { - - var modal = new A.Modal( - { - bodyContent: A.one('#<%=contentDiv%>'), - width:<%=width%>, - <% - if(!height.equalsIgnoreCase(StringPool.BLANK)){ - %> - height:<%=height%>, - <% - } - %> - centered: true, - destroyOnHide: false, - headerContent: '

    <%=titolo%>

    ', - modal: true, - render: '#confirmModal_<%=randomId%>', - visible: false, - toolbars: { - header: [] - }, - resizable: { - handles: '' - } - }).render(); - - +
    + +AUI().ready('aui-modal', function(A) { + var modal = new A.Modal({ + bodyContent: A.one('#<%= contentDiv %>'), + width:<%= width %>, + <% + if (!height.equals(StringPool.BLANK)) { + %> + height:<%=height%>, + <% + } + %> + centered: true, + destroyOnHide: false, + headerContent: '

    <%= titolo %>

    ', + modal: true, + render: '#confirmModal_<%= randomId %>', + visible: false, + toolbars: { + header: [] + }, + resizable: { + handles: '' + } + }).render(); - A.one('#<%= buttonId %>').on( - 'click', - function() { - <%= function %> - A.one('#<%=contentDiv%>').show(); - modal.show(); - } - ); - } - ); -     + A.one('#<%= buttonId %>').on('click', function() { + <%= function %> + A.one('#<%= contentDiv %>').show(); + modal.show(); + }); +}); +     \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_window.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_window.jsp index 4c7e8a6c..851517e0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_window.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/confirm_window.jsp @@ -1,66 +1,50 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/init.jsp" %> - +<%@include file="/html/init.jsp"%> <% - String titolo = ParamUtil.getString(request, "titolo","Dettaglio"); - String buttonId = ParamUtil.getString(request, "buttonId","sumbit-button"); - - String width = ParamUtil.getString(request, "width","700"); - String height = ParamUtil.getString(request, "height"); - - String contentDiv = ParamUtil.getString(request, "contentDiv",""); - String randomId = StringUtil.randomId(); +String titolo = ParamUtil.getString(request, "titolo", "Dettaglio"); +String buttonId = ParamUtil.getString(request, "buttonId", "sumbit-button"); +String width = ParamUtil.getString(request, "width", "700"); +String height = ParamUtil.getString(request, "height"); +String contentDiv = ParamUtil.getString(request, "contentDiv", StringPool.BLANK); +String randomId = StringUtil.randomId(); %> -
    +
    + +AUI().ready('aui-modal', function(A) { + var modal = new A.Modal({ + bodyContent: A.one('#<%= contentDiv %>'), + width:<%= width %>, + <% + if (!height.equals(StringPool.BLANK)) { + %> + height: <%= height %>, + <% + } + %> + centered: true, + destroyOnHide: false, + headerContent: '

    <%= titolo %>

    ', + modal: true, + render: '#confirmModal_<%= randomId %>', + visible: false, + close: true, + resizable: { + handles: '' + } + }).render(); - - AUI().ready( - 'aui-modal', - function(A) { - - var modal = new A.Modal( - { - bodyContent: A.one('#<%=contentDiv%>'), - width:<%=width%>, - <% - if(!height.equalsIgnoreCase(StringPool.BLANK)){ - %> - height:<%=height%>, - <% - } - %> - centered: true, - destroyOnHide: false, - headerContent: '

    <%=titolo%>

    ', - modal: true, - render: '#confirmModal_<%=randomId%>', - visible: false, - close: true, - resizable: { - handles: '' - } - }).render(); - - modal.addToolbar( - [ - { - label: 'Chiudi', - on: { - click: function() { - modal.hide(); - } - } - } - ] - ); + modal.addToolbar([{ + label: 'Chiudi', + on: { + click: function() { + modal.hide(); + } + } + }]); - A.one('#<%= buttonId %>').on( - 'click', - function() { - A.one('#<%=contentDiv%>').show(); - modal.show(); - } - ); - } - ); -     + A.one('#<%= buttonId %>').on('click', function() { + A.one('#<%= contentDiv %>').show(); + modal.show(); + }); +}); +     \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_window.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_window.jsp index bb2d07ab..d8e0c647 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_window.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_window.jsp @@ -1,149 +1,133 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/init.jsp" %> - +<%@include file="/html/init.jsp"%> <% - String formName = ParamUtil.getString(request, "formName","fm"); - String titolo = ParamUtil.getString(request, "titolo","Invio"); - String buttonId = ParamUtil.getString(request, "buttonId","sumbit-button"); - String buttonConferma = ParamUtil.getString(request, "buttonConferma","Crea"); - String buttonAnnulla = ParamUtil.getString(request, "buttonAnnulla","Annulla"); - String width = ParamUtil.getString(request, "width","700"); - String height = ParamUtil.getString(request, "height"); - String contentDiv = ParamUtil.getString(request, "contentDiv","saveAndCloseDiv"); - boolean buttonBar = ParamUtil.getBoolean(request, "buttonBar",true); - String randomId = StringUtil.randomId(); - - String onClick = ParamUtil.getString(request, "onClick"); - boolean externalForm = ParamUtil.getBoolean(request, "externalForm",false); - boolean okVisible = ParamUtil.getBoolean(request, "okVisible", true); +String formName = ParamUtil.getString(request, "formName", "fm"); +String titolo = ParamUtil.getString(request, "titolo", "Invio"); +String buttonId = ParamUtil.getString(request, "buttonId", "sumbit-button"); +String buttonConferma = ParamUtil.getString(request, "buttonConferma", "Crea"); +String buttonAnnulla = ParamUtil.getString(request, "buttonAnnulla", "Annulla"); +String width = ParamUtil.getString(request, "width", "700"); +String height = ParamUtil.getString(request, "height"); +String contentDiv = ParamUtil.getString(request, "contentDiv", "saveAndCloseDiv"); +boolean buttonBar = ParamUtil.getBoolean(request, "buttonBar", true); +String randomId = StringUtil.randomId(); +String onClick = ParamUtil.getString(request, "onClick"); +boolean externalForm = ParamUtil.getBoolean(request, "externalForm", false); +boolean okVisible = ParamUtil.getBoolean(request, "okVisible", true); %> - - -
    - -
    - + +
    -

    +

    + + +AUI().ready('aui-modal', 'aui-io-request', 'aui-form-validator', function(A) { + var modal = new A.Modal({ + bodyContent: A.one('#<%=contentDiv%>'), + width: <%= width %>, + <% + if (!height.equals(StringPool.BLANK)) { + %> + height: <%= height %>, + <% + } + %> + centered: true, + destroyOnHide: false, + headerContent: '

    <%= titolo %>

    ', + modal: true, + render: '#saveAndCloseModal_<%= randomId %>', + visible: false, + close: false, + }).render(); + <% + if (buttonBar) { + %> + modal.addToolbar( + [ + { + label: '<%= buttonAnnulla %>', + on: { + click: function() { + modal.hide(); + } + } + }, + <% + if (okVisible) { + %> + { + label: '<%= buttonConferma %>', + on: { + click: function() { + <% + if (Validator.isNotNull(onClick)) { + out.print(onClick); + } else { + %> + submitForm(document.<%= formName %>); + var formValidator = Liferay.Form.get('<%= formName %>') + .formValidator; + <% + if (externalForm) { + %> + if (!formValidator.hasErrors()) { + A.one('#confirmClose_<%= randomId %>') + .set('value', 'true'); + } else { + alert("Attenzione!\nCampi richiesti non compilati correttamente"); + } + modal.hide(); + <% + } else { + %> + if (!formValidator.hasErrors()) { + modal.hide(); + A.one('#confirmClose_<%= randomId %>') + .set('value', 'true'); + } + <% + } + %> + <% + } + %> + } + } + } + <% + } + %> + ] + ); + <% + } + %> + A.one('#<%= buttonId %>').on('click', function() { + A.one('#<%=contentDiv%>').show(); + modal.show(); + }); - - - - - AUI().ready( - 'aui-modal','aui-io-request','aui-form-validator', - function(A) { - - var modal = new A.Modal( - { - bodyContent: A.one('#<%=contentDiv%>'), - width:<%=width%>, - <% - if(!height.equalsIgnoreCase(StringPool.BLANK)){ - %> - height:<%=height%>, - <% - } - %> - centered: true, - destroyOnHide: false, - headerContent: '

    <%=titolo%>

    ', - modal: true, - render: '#saveAndCloseModal_<%=randomId%>', - visible: false, - close: false - } - ).render(); - - <% - if(buttonBar){ - %> - modal.addToolbar( - [ - { - label: '<%= buttonAnnulla %>', - on: { - click: function() { - modal.hide(); - - } - } - } - <% if(okVisible){ %> - , - { - label: '<%=buttonConferma%>', - on: { - click: function() { - - <% if(Validator.isNotNull(onClick)){ - out.print(onClick); - } else { - %> - submitForm(document.<%= formName %>); - var formValidator = Liferay.Form.get('<%= formName %>').formValidator; - <% - if(externalForm){ - %> - if (!formValidator.hasErrors()) { - A.one('#confirmClose_<%=randomId%>').set('value','true'); - }else{ - alert("Attenzione!\nCampi richiesti non compilati correttamente"); - } - modal.hide(); - <% - } else { - %> - if (!formValidator.hasErrors()) { - modal.hide(); - A.one('#confirmClose_<%=randomId%>').set('value','true'); - } - <% - } - } - %> - } - } - } - <% } %> - ] - ); - <% - } - %> + window.alert = function(msg) { + $('.message').text(msg); + $('.customAlert').css('animation', 'fadeIn 0.3s linear'); + $('.customAlert').css('display', 'inline'); + setTimeout(function() { + $('.customAlert').css('animation', 'none'); + }, 100); + }; - A.one('#<%= buttonId %>').on( - 'click', - function() { - <%-- console.log('<%=contentDiv%>') --%> - A.one('#<%=contentDiv%>').show(); - modal.show(); - } - ); - - - window.alert = function(msg){ - $('.message').text(msg); - $('.customAlert').css('animation', 'fadeIn 0.3s linear'); - $('.customAlert').css('display', 'inline'); - setTimeout(function(){ - $('.customAlert').css('animation', 'none'); - }, 100); - }; - - $(function(){ - $('.confirmButton').click(function(){ - $('.customAlert').css('animation', 'fadeOut 0.3s linear'); - setTimeout(function(){ - $('.customAlert').css('animation', 'none'); - $('.customAlert').css('display', 'none'); - }, 100); - }); - }); - - }); - -     + $(function(){ + $('.confirmButton').click(function(){ + $('.customAlert').css('animation', 'fadeOut 0.3s linear'); + setTimeout(function(){ + $('.customAlert').css('animation', 'none'); + $('.customAlert').css('display', 'none'); + }, 100); + }); + }); +}); +     \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/init.jsp index 7f058349..87f4525a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/init.jsp @@ -1,2 +1,2 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/init.jsp" %> +<%@include file="/html/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp index 001094ba..97d88c9a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp @@ -440,7 +440,7 @@ List historyWorkflowActions = HistoryWorkflowActionLocalS
    - + Liferay.provide(window, 'reSort', function(id) { var fragment = location.hash, returnURL = "<%= currentURL %>" + fragment; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp index bd65fbfa..c7bfaa8c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp @@ -199,7 +199,7 @@ String provinciaJS = ParamUtil.getString(request, "provinciaJS");
    - + var getComuni = function(provinciaId, comuneId, comuneValue) { var comuneSelect = A.one("#"+comuneId); if (provinciaId == "" || provinciaId == "000") { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp index a0b894d6..732f7140 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp @@ -79,7 +79,7 @@
    Stato:
    <%=LanguageUtil.get(pageContext, - PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getIntPraticaId()))%> + PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getTipoProcedura()))%>
    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp index d76a0a62..1543bc9d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp @@ -1,4 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="it.tref.liferay.portos.bo.util.Constants"%> <%@page import="com.liferay.portal.kernel.log.LogFactoryUtil"%> <%@page import="com.liferay.portal.kernel.log.Log"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> @@ -143,7 +144,7 @@ String keywords = StringPool.BLANK; - + @@ -282,7 +283,7 @@ String keywords = StringPool.BLANK; - <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPraticaId)) %> + <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getTipoProcedura())) %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp index 40c25e93..65e4d4de 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp @@ -1,239 +1,191 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.util.WorkflowConstants"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> -<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> -<%@page import="com.liferay.portal.model.Role"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowTaskAssignee"%> +<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowTask"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowTaskAssignee"%> <%@page import="com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil"%> -<%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%> -<%@page import="com.liferay.portal.model.WorkflowInstanceLink"%> -<%@page import="com.liferay.portal.service.persistence.WorkflowInstanceLinkUtil"%> -<%@page import="com.liferay.portal.kernel.workflow.WorkflowDefinitionManagerUtil"%> -<%@page import="javax.portlet.PortletRequest"%> -<%@page import="com.liferay.portal.service.LayoutLocalServiceUtil"%> <%@page import="com.liferay.portal.model.GroupConstants"%> +<%@page import="com.liferay.portal.model.WorkflowInstanceLink"%> <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> +<%@page import="com.liferay.portal.service.LayoutLocalServiceUtil"%> +<%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%> <%@page import="com.liferay.portlet.PortletURLFactoryUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.GenioCivileBaseUtil"%> -<%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> +<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> +<%@page import="it.tref.liferay.portos.bo.util.WorkflowConstants"%> <%@page import="it.tref.liferay.portos.bo.util.WorkflowUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> -<%@page import="com.liferay.portal.kernel.util.ListUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%> +<%@page import="javax.portlet.PortletRequest"%> <%@page import="java.util.ArrayList"%> -<%@page import="com.liferay.portal.kernel.util.WebKeys"%> -<%@page import="com.liferay.portal.kernel.dao.search.SearchContainer"%> -<%@page import="java.util.Map"%> -<%@page import="java.util.HashMap"%> -<%@page import="com.liferay.portal.kernel.util.StringUtil"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%> -<%@ include file="/html/gestioneattivita/init.jsp" %> - +<%@include file="/html/gestioneattivita/init.jsp"%> <% - - SearchContainer searchContainer = (SearchContainer) request - .getAttribute("liferay-ui:search:searchContainer"); - String redirect = ParamUtil.getString(request, "backUrl"); - ControlloPratica controlloPratica = null; - - redirect = searchContainer.getIteratorURL().toString(); - - ResultRow row = (ResultRow) request - .getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); - - controlloPratica = (ControlloPratica) row.getObject(); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId()); - Group controlPanelGroup = GroupLocalServiceUtil.getGroup(company.getCompanyId(), GroupConstants.CONTROL_PANEL); - long controlPanelPlid = LayoutLocalServiceUtil.getDefaultPlid(controlPanelGroup.getGroupId(),true); - - WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink( - controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(),controlloPratica.getPrimaryKey()); - - List listaTask = null; - if (workflowInstanceLink == null) { - listaTask = new ArrayList(); - } else { - listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, - workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - } - - //long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId(); - String randomId = StringUtil.randomId(); - - long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()).getDettPraticaId(); - - String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_"+randomId; - String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_"+randomId; - String buttonIdAnnullaRicGeologo = "buttonIdAnnullaRicGeologo_"+randomId; - String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_"+randomId; - - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - long territorioGroupId = territorio.getGroupId(); +SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer"); +String redirect = searchContainer.getIteratorURL().toString(); +ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); +ControlloPratica controlloPratica = (ControlloPratica) row.getObject(); +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId()); +Group controlPanelGroup = GroupLocalServiceUtil.getGroup(company.getCompanyId(), GroupConstants.CONTROL_PANEL); +long controlPanelPlid = LayoutLocalServiceUtil.getDefaultPlid(controlPanelGroup.getGroupId(), true); +WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink( + controlloPratica.getCompanyId(), controlloPratica.getGroupId(), ControlloPratica.class.getName(), + controlloPratica.getPrimaryKey()); +List listaTask = null; +if (workflowInstanceLink == null) { + listaTask = new ArrayList(); +} else { + listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, + workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); +} +long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica( + intPratica.getIntPraticaId()).getDettPraticaId(); +String randomId = StringUtil.randomId(); +String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_" + randomId; +String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_" + randomId; +String buttonIdAnnullaRicGeologo = "buttonIdAnnullaRicGeologo_" + randomId; +String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_" + randomId; +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +long territorioGroupId = territorio.getGroupId(); %> - -
    - +
    +
    <% - listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, - workflowInstanceLink.getWorkflowInstanceId(), true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, + workflowInstanceLink.getWorkflowInstanceId(), true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); %> <% - PortletURL workflowTaskURL = PortletURLFactoryUtil.create(request, PortletKeys.MY_WORKFLOW_TASKS,controlPanelPlid, PortletRequest.RENDER_PHASE); - workflowTaskURL.setParameter("struts_action", - "/my_workflow_tasks/edit_workflow_task"); - workflowTaskURL.setParameter("workflowTaskId",String.valueOf(listaTask.get(0).getWorkflowTaskId())); - workflowTaskURL.setPortletMode(PortletMode.VIEW); - workflowTaskURL.setWindowState(LiferayWindowState.POP_UP); + PortletURL workflowTaskURL = PortletURLFactoryUtil.create(request, PortletKeys.MY_WORKFLOW_TASKS, + controlPanelPlid, PortletRequest.RENDER_PHASE); + workflowTaskURL.setParameter("struts_action", "/my_workflow_tasks/edit_workflow_task"); + workflowTaskURL.setParameter("workflowTaskId", String.valueOf(listaTask.get(0).getWorkflowTaskId())); + workflowTaskURL.setPortletMode(PortletMode.VIEW); + workflowTaskURL.setWindowState(LiferayWindowState.POP_UP); %> - -
    - +
    +
    - - + + - + - - - - + + + + -
    - +
    +
    - + <% - boolean assegnazionePossibile = false; - for(WorkflowTaskAssignee workflowTaskAssignee: listaTask.get(0).getWorkflowTaskAssignees()){ - if(workflowTaskAssignee.getAssigneeClassName().equalsIgnoreCase(Role.class.getName()) - && UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), controlloPratica.getGroupId(), workflowTaskAssignee.getAssigneeClassPK(), true)){ - assegnazionePossibile = true; - } + boolean assegnazionePossibile = false; + for (WorkflowTaskAssignee workflowTaskAssignee : listaTask.get(0).getWorkflowTaskAssignees()) { + if (workflowTaskAssignee.getAssigneeClassName().equalsIgnoreCase(Role.class.getName()) + && UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), controlloPratica.getGroupId(), + workflowTaskAssignee.getAssigneeClassPK(), true)) { + assegnazionePossibile = true; } + } %> - <%-- - - - - - - - - -
    - -
    -     -     --%> - - - - - - - + + + + + + -
    - +
    +
    - - - - - - - - + + + + + + + - -
    - +
    +
    - - - - - - + + + + + + - -
    - +
    +
    - - - - - - - - + + + + + - -
    - +
    +
    - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_aggiungi_al_controllo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_aggiungi_al_controllo.jsp index 03d3fb1a..100c2c0a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_aggiungi_al_controllo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_aggiungi_al_controllo.jsp @@ -1,77 +1,63 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="com.liferay.portal.model.UserGroupRole"%> -<%@page import="com.liferay.portal.model.UserGroup"%> -<%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.Constants"%> -<%@page import="com.liferay.portal.service.RoleLocalServiceUtil"%> -<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> -<%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.model.User"%> -<%@page import="com.liferay.portal.model.Role"%> -<%@page import="javax.portlet.PortletURL"%> +<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.Constants"%> <%@include file="/html/gestioneattivita/init.jsp"%> - - <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId"); - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); - - String buttonIdAggiungiDettPraticheAlControllo = ParamUtil.getString(request, "buttonIdAggiungiDettPraticheAlControllo"); - PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); - String orderByType = ParamUtil.getString(request, "orderByType", "asc"); - String orderByCol = ParamUtil.getString(request, "orderByCol", "nome"); - - String randomId = StringUtil.randomId(); - String formNameAggiungiDettPraticheAlControllo = "formNameAggiungiDettPraticheAlControllo_"+randomId; - String divIdAggiungiDettPraticheAlControllo = "divIdAggiungiDettPraticheAlControllo_"+randomId; - - User istruttore = UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()); - Role role = RoleLocalServiceUtil.getRole(company.getCompanyId(),Constants.ROLE_NAME_ISTRUTTORE); - List userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(controlloPratica.getGroupId(),role.getRoleId()); - DettPratica dettPraticaAttuale = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); - DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(controlloPratica.getIntPraticaId()); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId"); +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); +String buttonIdAggiungiDettPraticheAlControllo = ParamUtil.getString(request, "buttonIdAggiungiDettPraticheAlControllo"); +PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); +String orderByType = ParamUtil.getString(request, "orderByType", "asc"); +String orderByCol = ParamUtil.getString(request, "orderByCol", "nome"); +String randomId = StringUtil.randomId(); +String formNameAggiungiDettPraticheAlControllo = "formNameAggiungiDettPraticheAlControllo_" + randomId; +String divIdAggiungiDettPraticheAlControllo = "divIdAggiungiDettPraticheAlControllo_" + randomId; +User istruttore = UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()); +Role role = RoleLocalServiceUtil.getRole(company.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE); +DettPratica dettPraticaAttuale = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); +DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(controlloPratica.getIntPraticaId()); %> - - - - - + + + + - - - -
    - + +
    - <%=dettPraticaAttuale.getTitle(locale) %> + <%= dettPraticaAttuale.getTitle(locale) %>
    - +
      <% - List elencoPratiche = DettPraticaLocalServiceUtil.findCompletedByIntPraticaAndSuccessivoDettPratica(intPraticaId, controlloPratica.getDettPraticaId()); - for(DettPratica dettPratica: elencoPratiche){ - out.print("
    • "+dettPratica.getFullDescription()+"
      • "); + List elencoPratiche = DettPraticaLocalServiceUtil + .findCompletedByIntPraticaAndSuccessivoDettPratica(intPraticaId, + controlloPratica.getDettPraticaId()); + for (DettPratica dettPratica: elencoPratiche) { + out.print("
    • "); + out.print(dettPratica.getFullDescription()); + out.print("
      • "); } %> -
    - +
    - - - - - - - - + + + + + + + +     \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_cambio_istruttore.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_cambio_istruttore.jsp index 7f3678fd..b0ecb2d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_cambio_istruttore.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_cambio_istruttore.jsp @@ -10,61 +10,56 @@ <%@page import="com.liferay.portal.model.Role"%> <%@page import="javax.portlet.PortletURL"%> <%@include file="/html/gestioneattivita/init.jsp"%> - <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId"); - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); - - String buttonIdCambioIstruttore = ParamUtil.getString(request, "buttonIdCambioIstruttore"); - PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); - String orderByType = ParamUtil.getString(request, "orderByType", "asc"); - String orderByCol = ParamUtil.getString(request, "orderByCol", "nome"); - - String randomId = StringUtil.randomId(); - String formNameSelezionaCambioIstruttore = "formNameSelezionaCambioIstruttore_"+randomId; - String divIdSelezionaCambioIstruttore = "divIdSelezionaCambioIstruttore_"+randomId; - - User istruttore = UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()); - Role role = RoleLocalServiceUtil.getRole(company.getCompanyId(),Constants.ROLE_NAME_ISTRUTTORE); - List userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(controlloPratica.getGroupId(),role.getRoleId()); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId"); +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); +String buttonIdCambioIstruttore = ParamUtil.getString(request, "buttonIdCambioIstruttore"); +PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); +String orderByType = ParamUtil.getString(request, "orderByType", "asc"); +String orderByCol = ParamUtil.getString(request, "orderByCol", "nome"); +String randomId = StringUtil.randomId(); +String formNameSelezionaCambioIstruttore = "formNameSelezionaCambioIstruttore_" + randomId; +String divIdSelezionaCambioIstruttore = "divIdSelezionaCambioIstruttore_" + randomId; +User istruttore = UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()); +Role role = RoleLocalServiceUtil.getRole(company.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE); +List userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole( + controlloPratica.getGroupId(), role.getRoleId()); %> - - - - + + + - - - -
    + +
    - <%=istruttore.getFullName() %> + <%= istruttore.getFullName() %>
    - - - <% - for (UserGroupRole userGroupRole: userGroupRoles) { - if(userGroupRole.getUserId()!=istruttore.getUserId()){ - User istruttoreTmp = UserLocalServiceUtil.getUser(userGroupRole.getUserId()); - String nominativo = istruttoreTmp.getFullName()+StringPool.SPACE+StringPool.DASH+StringPool.SPACE+istruttoreTmp.getScreenName();%> - - <% - } + + + <% + for (UserGroupRole userGroupRole: userGroupRoles) { + if (userGroupRole.getUserId() != istruttore.getUserId()) { + User istruttoreTmp = UserLocalServiceUtil.getUser(userGroupRole.getUserId()); + String nominativo = istruttoreTmp.getFullName() + StringPool.SPACE + StringPool.DASH + + StringPool.SPACE + istruttoreTmp.getScreenName(); + %> + + <% } - %> + } + %>
    - - - - - - - - + + + + + + + +     \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp index 1d157a68..e2c9a075 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp @@ -1,74 +1,60 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.ListUtil"%> +<%@page import="com.liferay.portal.model.User"%> <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> -<%@page import="com.liferay.portal.model.Organization"%> -<%@page import="it.tref.liferay.portos.bo.util.Constants"%> -<%@page import="com.liferay.portal.service.RoleLocalServiceUtil"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> -<%@page import="java.util.ArrayList"%> -<%@page import="com.liferay.portal.model.User"%> -<%@page import="com.liferay.portal.model.Role"%> -<%@page import="javax.portlet.PortletURL"%> +<%@page import="it.tref.liferay.portos.bo.util.Constants"%> <%@include file="/html/gestioneattivita/init.jsp"%> - <% - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); - - String buttonIdSelezionaGeologo = ParamUtil.getString(request, "buttonIdSelezionaGeologo"); - PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); - String orderByType = ParamUtil.getString(request, "orderByType", "asc"); - String orderByCol = ParamUtil.getString(request, "orderByCol", "nome"); - - String randomId = StringUtil.randomId(); - String formNameSelezionaGeologo = "formNameSelezionaGeologo_"+randomId; - String divIdSelezionaGeologo = "divIdSelezionaGeologo_"+randomId; - Role role = RoleLocalServiceUtil.getRole(company.getCompanyId(),Constants.ROLE_NAME_GEOLOGO); - List geologi = UserLocalServiceUtil.getRoleUsers(role.getRoleId()); - List pareriGeologo = ParereGeologoLocalServiceUtil.findByIntPraticaId(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS); - for(ParereGeologo parereGeologo : pareriGeologo){ - if(Validator.isNull(parereGeologo.getDtCompilazione())){ +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); +String buttonIdSelezionaGeologo = ParamUtil.getString(request, "buttonIdSelezionaGeologo"); +PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); +String orderByType = ParamUtil.getString(request, "orderByType", "asc"); +String orderByCol = ParamUtil.getString(request, "orderByCol", "nome"); +String randomId = StringUtil.randomId(); +String formNameSelezionaGeologo = "formNameSelezionaGeologo_" + randomId; +String divIdSelezionaGeologo = "divIdSelezionaGeologo_" + randomId; +Role role = RoleLocalServiceUtil.getRole(company.getCompanyId(),Constants.ROLE_NAME_GEOLOGO); +List geologi = UserLocalServiceUtil.getRoleUsers(role.getRoleId()); +List pareriGeologo = ParereGeologoLocalServiceUtil.findByIntPraticaId(intPraticaId, QueryUtil.ALL_POS, + QueryUtil.ALL_POS); +for (ParereGeologo parereGeologo : pareriGeologo) { + if (Validator.isNull(parereGeologo.getDtCompilazione())) { geologi.remove(UserLocalServiceUtil.getUser(parereGeologo.getGeologoUserId())); - } } - +} %> - - - - + + + - - -