diff --git a/.gitignore b/.gitignore index ffe65d4c..d0374d43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ *.class *.war !kaleo-web-6.2.0.3.war -portos-*.jar -!portos-kaleo-portlet-service.jar **/classes/ **/.sass-cache/ **/.ivy/cache/ @@ -10,3 +8,5 @@ portos-*.jar **/build/ .DS_Store ._* +liferay-plugins-sdk-6.2/sonar-scanner-4.8.0.2856-windows/ +.settings diff --git a/liferay-plugins-sdk-6.2/.idea/.gitignore b/liferay-plugins-sdk-6.2/.idea/.gitignore new file mode 100644 index 00000000..0a8642fa --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin ignored files +/ZeppelinRemoteNotebooks/ diff --git a/liferay-plugins-sdk-6.2/.idea/ant.xml b/liferay-plugins-sdk-6.2/.idea/ant.xml new file mode 100644 index 00000000..a2a47698 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/ant.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/.idea/jpa-buddy.xml b/liferay-plugins-sdk-6.2/.idea/jpa-buddy.xml new file mode 100644 index 00000000..966d5f56 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/.idea/misc.xml b/liferay-plugins-sdk-6.2/.idea/misc.xml new file mode 100644 index 00000000..d33591e1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/.idea/vcs.xml b/liferay-plugins-sdk-6.2/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/.scannerwork/.sonar_lock b/liferay-plugins-sdk-6.2/.scannerwork/.sonar_lock new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/.scannerwork/report-task.txt b/liferay-plugins-sdk-6.2/.scannerwork/report-task.txt new file mode 100644 index 00000000..44e8ad9f --- /dev/null +++ b/liferay-plugins-sdk-6.2/.scannerwork/report-task.txt @@ -0,0 +1,6 @@ +projectKey=Sicilia-Paesaggistica +serverUrl=http://sonar.nextmind.it +serverVersion=9.4.0.54424 +dashboardUrl=http://sonar.nextmind.it/dashboard?id=Sicilia-Paesaggistica +ceTaskId=AYZej0Tqqvn_43R2i7P6 +ceTaskUrl=http://sonar.nextmind.it/api/ce/task?id=AYZej0Tqqvn_43R2i7P6 diff --git a/liferay-plugins-sdk-6.2/build.ebusu.properties b/liferay-plugins-sdk-6.2/build.ebusu.properties new file mode 100644 index 00000000..1308417d --- /dev/null +++ b/liferay-plugins-sdk-6.2/build.ebusu.properties @@ -0,0 +1,10 @@ +# Managed by Liferay IDE (remove this comment to prevent future updates) + +#Managed by Liferay IDE (remove this comment to prevent future updates) +#Tue Feb 07 14:49:02 CET 2023 +app.server.tomcat.lib.global.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\lib\\ext +app.server.tomcat.deploy.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps +app.server.parent.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5 +app.server.tomcat.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62 +app.server.type = tomcat +app.server.tomcat.portal.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps\\ROOT diff --git a/liferay-plugins-sdk-6.2/build.marco.properties b/liferay-plugins-sdk-6.2/build.marco.properties new file mode 100644 index 00000000..d726366d --- /dev/null +++ b/liferay-plugins-sdk-6.2/build.marco.properties @@ -0,0 +1,10 @@ +# Managed by Liferay IDE (remove this comment to prevent future updates) + +#Managed by Liferay IDE (remove this comment to prevent future updates) +#Fri Feb 10 15:41:28 CET 2023 +app.server.tomcat.lib.global.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\lib\\ext +app.server.tomcat.deploy.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps +app.server.parent.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5 +app.server.tomcat.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62 +app.server.type = tomcat +app.server.tomcat.portal.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps\\ROOT diff --git a/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 index 42e42084..ccd674b0 100644 --- a/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 @@ -1 +1 @@ -45b38289274e4397c600a212c5477afa +b2996cd58c16b53d0e5cba6f59304ace diff --git a/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 index 0bfa3aa2..c2efd29f 100644 --- a/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 @@ -1 +1 @@ -9e586203944d7fe5baccd02ed7bf20c1 +edfd9cc2944faf63dd7d39e25283a4b6 diff --git a/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 index d5ec36d5..158f1a5d 100644 --- a/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 @@ -1 +1 @@ -cf39082434c04fdd3a9563acce7cb551 +a7d8aaa34b7d1028a4d449b5ab8f767e diff --git a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 index e312ada4..3cbade7b 100644 --- a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 @@ -1 +1 @@ -6ad0549f4c64b52b40d871393d72f9aa +4b40da73b53b5860b9adbb52cde18473 diff --git a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar index 00556b11..90035a4f 100644 Binary files a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar and b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar differ diff --git a/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 index eac6c7a9..348d2b3f 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 @@ -1 +1 @@ -2aae42c5c43b993944b8c0fe9e31d5fb +0b9e4199159f29548166ac11ab8d12c0 diff --git a/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 index 3c011ccf..c928e5f7 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 @@ -1 +1 @@ -e1a7d560dfc36faf61c7d7da67bb03df +8f22881d5bfb74c587681be94ad54598 diff --git a/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 index 5dff026e..81034da7 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 @@ -1 +1 @@ -f6d028f89713fdbf3004b38da2b16dcf +4102c750f16136e66085045251a34292 diff --git a/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 index 6d913802..7ac73185 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 @@ -1 +1 @@ -3325db6f628a33488c6c832368b134e4 +f6d022d60b1ed1cc45a21c61c21c8f22 diff --git a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar new file mode 100644 index 00000000..98fd2a2a Binary files /dev/null and b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar new file mode 100644 index 00000000..49347f2e Binary files /dev/null and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-firma-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-firma-shared-6.2.0.1.jar new file mode 100644 index 00000000..91dd12ae Binary files /dev/null and b/liferay-plugins-sdk-6.2/dist/portos-firma-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar new file mode 100644 index 00000000..72d73b32 Binary files /dev/null and b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar new file mode 100644 index 00000000..3553cf19 Binary files /dev/null and b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar new file mode 100644 index 00000000..a5242ab8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath index e0ca4766..cc87ab46 100644 --- a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.project b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.project index 7b2a2201..eea41563 100644 --- a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.project +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957625 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml index 92ef9c01..81e6d2f5 100644 --- a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath index 991a105e..cc87ab46 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project index c3a8b7b2..f5ff974e 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957750 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml index 92ef9c01..81e6d2f5 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 index 65d421b8..4b259b98 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 @@ -1 +1 @@ -2c267788e15963b22e4e720e12f5611c +db650d63ad964c1897f8af97aac0e727 diff --git a/liferay-plugins-sdk-6.2/ivy-settings.xml b/liferay-plugins-sdk-6.2/ivy-settings.xml index 30a41fe2..db0e651c 100644 --- a/liferay-plugins-sdk-6.2/ivy-settings.xml +++ b/liferay-plugins-sdk-6.2/ivy-settings.xml @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/ivy.xml.MD5 index feae7b2a..d88ae605 100644 --- a/liferay-plugins-sdk-6.2/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/ivy.xml.MD5 @@ -1 +1 @@ -ae2292c03b059802eec34967b7e85b8a +8e943594b3e1f97e457b967864997dc5 diff --git a/liferay-plugins-sdk-6.2/layouttpl/bootstrapt_1_column-layouttpl/.project b/liferay-plugins-sdk-6.2/layouttpl/bootstrapt_1_column-layouttpl/.project index b8145540..962f81ba 100644 --- a/liferay-plugins-sdk-6.2/layouttpl/bootstrapt_1_column-layouttpl/.project +++ b/liferay-plugins-sdk-6.2/layouttpl/bootstrapt_1_column-layouttpl/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957625 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath index 6de1aafe..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath @@ -1,8 +1,7 @@ - - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.project index 94b39ac8..1a735b53 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957641 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index f8d0fffc..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-accesso-atti-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-accesso-atti-portlet-service.jar new file mode 100644 index 00000000..23dd2096 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-accesso-atti-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..2dcd1e0a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java index afe4e541..a6795a84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.accesso.atti.NoSuchRichiestaAccessoAttiException; import it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti; import it.tref.liferay.portos.accesso.atti.model.impl.RichiestaAccessoAttiImpl; import it.tref.liferay.portos.accesso.atti.model.impl.RichiestaAccessoAttiModelImpl; -import it.tref.liferay.portos.accesso.atti.service.persistence.RichiestaAccessoAttiPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties index c4168251..4b93f1c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_atti - build.number=30 - build.date=1632921863898 + build.number=31 + build.date=1675846169523 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 index 81f1995e..d86c8a39 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 @@ -1 +1 @@ -987c468ab803b131a7ff0c2ece8911b3 +c730f302e3c8f650a807fe624894d9ea diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.classpath new file mode 100644 index 00000000..df4ad34a --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.classpath @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.project new file mode 100644 index 00000000..8d02860f --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.project @@ -0,0 +1,47 @@ + + + portos-advanced-operation-portlet + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.jsdt.core.jsNature + + + + 1677484993608 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/.jsdtscope b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/.jsdtscope new file mode 100644 index 00000000..840a01d5 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/.jsdtscope @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jst.jsp.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jst.jsp.core.prefs new file mode 100644 index 00000000..3a5c98db --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jst.jsp.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +validateFragments=false +validation.use-project-settings=true diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.component similarity index 69% rename from liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component rename to liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.component index 7a047eaa..a5e9e559 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.component @@ -1,11 +1,11 @@ - + uses - - + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 00000000..500dfccb --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..63ae1192 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.container b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 00000000..3bd5d0a4 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.name b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 00000000..05bd71b6 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.tern-project new file mode 100644 index 00000000..a185ba0d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.tern-project @@ -0,0 +1 @@ +{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/build.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/build.xml new file mode 100644 index 00000000..e4a70180 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/build.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/META-INF/MANIFEST.MF b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/META-INF/MANIFEST.MF new file mode 100644 index 00000000..254272e1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..7c491a75 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..d4ce9274 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar new file mode 100644 index 00000000..b1935856 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-display.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-display.xml new file mode 100644 index 00000000..0303f995 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-display.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-plugin-package.properties new file mode 100644 index 00000000..66a3ebaf --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-plugin-package.properties @@ -0,0 +1,18 @@ +name=Portos Advanced Operation +module-group-id=liferay +module-incremental-version=1 +tags= +short-description= +long-description= +change-log= +page-url=http://www.liferay.com +author=Liferay, Inc. +licenses=LGPL +liferay-versions=6.2.0+ +portal-dependency-jars=\ + jstl-api.jar,\ + jstl-impl.jar +portal-dependency-tlds=\ + c.tld +required-deployment-contexts=\ + portos-bo-portlet diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-portlet.xml new file mode 100644 index 00000000..542caed0 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -0,0 +1,32 @@ + + + + + + 1 + /icon.png + + configuration + + 1.6 + /css/main.css + /js/main.js + portos-advanced-operation-portlet + + + administrator + Administrator + + + guest + Guest + + + power-user + Power User + + + user + User + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/portlet.xml new file mode 100644 index 00000000..66691377 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/portlet.xml @@ -0,0 +1,35 @@ + + + + + 1 + Portos Advanced Operation + it.nextmind.liferay.portos.advanced.operation.portlet.AdvancedOperationPortlet + + view-template + /html/view.jsp + + 0 + + text/html + view + + + Portos Advanced Operation + Portos Advanced Operation + + + + administrator + + + guest + + + power-user + + + user + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/portlet/AdvancedOperationPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/portlet/AdvancedOperationPortlet.java new file mode 100644 index 00000000..9b3f2729 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/portlet/AdvancedOperationPortlet.java @@ -0,0 +1,145 @@ +package it.nextmind.liferay.portos.advanced.operation.portlet; + +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.servlet.SessionErrors; +import com.liferay.portal.kernel.util.ParamUtil; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.util.WebKeys; +import com.liferay.portal.kernel.workflow.WorkflowConstants; +import com.liferay.portal.theme.ThemeDisplay; +import com.liferay.portal.util.PortalUtil; +import com.liferay.util.bridges.mvc.MVCPortlet; + +import it.nextmind.liferay.portos.advanced.operation.util.AdvancedOperationUtil; +import it.tref.liferay.portos.bo.model.DettPratica; +import it.tref.liferay.portos.bo.model.DocPratica; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; + +import java.util.Date; +import java.util.List; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + +public class AdvancedOperationPortlet extends MVCPortlet { + private static class Privati { + + static void checkIfUserIsCompanyAdmin(ActionRequest actionRequest) throws Exception{ + ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); + if(!PortalUtil.isCompanyAdmin(themeDisplay.getUser())){ + SessionErrors.add(actionRequest, "operazione-non-permessa"); + throw new Exception("Action permitted to CompanyAdmins only"); + } + } + + static void ripristinaPratica(IntPratica intPratica, int status) throws PortalException, SystemException{ + long docPraticaAnnullamentoId = intPratica.getDocPraticaAnnullamentoId(); + IntPraticaLocalServiceUtil.deleteFileAnnullamento(docPraticaAnnullamentoId); + IntPraticaLocalServiceUtil.updateStatus(intPratica.getIntPraticaId(), status); + } + + } + + public void fixNormLavoriInProprio(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ + + Privati.checkIfUserIsCompanyAdmin(actionRequest); + + long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L); + boolean normLavoriInProprioFlag = ParamUtil.getBoolean(actionRequest, "normLavoriInProprioFlag"); + + List dettPraticaList = DettPraticaLocalServiceUtil.findByIntPraticaId(intPraticaId); + for(DettPratica dettPratica : dettPraticaList){ + if(dettPratica.getNormLavoriInProprio() == normLavoriInProprioFlag){ + dettPratica.setNormLavoriInProprio(!normLavoriInProprioFlag); + dettPratica.setModifiedDate(new Date()); + DettPraticaLocalServiceUtil.updateDettPratica(dettPratica); + } + } + } + + public void fixStatusPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ + + Privati.checkIfUserIsCompanyAdmin(actionRequest); + + long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L); + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); + + if(WorkflowConstants.STATUS_DRAFT == intPratica.getStatus()){ + IntPraticaLocalServiceUtil.updateStatus(intPraticaId, WorkflowConstants.STATUS_PENDING); + } else { + SessionErrors.add(actionRequest, "operazione-impossibile"); + } + } + + public void ripristinaPraticaVidimata(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ + + Privati.checkIfUserIsCompanyAdmin(actionRequest); + + long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L); + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); + + if(WorkflowConstants.STATUS_INCOMPLETE == intPratica.getStatus()){ + Privati.ripristinaPratica(intPratica, WorkflowConstants.STATUS_DRAFT); + } else { + SessionErrors.add(actionRequest, "operazione-impossibile"); + throw new Exception("This Pratica is not in status=5, action RIPRISTINA is not available"); + } + } + + public void ripristinaPraticaConforme(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ + + Privati.checkIfUserIsCompanyAdmin(actionRequest); + + long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L); + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); + + if(WorkflowConstants.STATUS_INCOMPLETE == intPratica.getStatus()){ + Privati.ripristinaPratica(intPratica, WorkflowConstants.STATUS_APPROVED); + } else { + SessionErrors.add(actionRequest, "operazione-impossibile"); + throw new Exception("This Pratica is not in status=5, action RIPRISTINA is not available"); + } + } + + public void deleteDocPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ + + Privati.checkIfUserIsCompanyAdmin(actionRequest); + + long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L); + + List docPraticaOrfani = AdvancedOperationUtil.getDocPraticaOrfani(intPraticaId); + for(DocPratica docPratica : docPraticaOrfani){ + DocPraticaLocalServiceUtil.deleteDocPratica(docPratica); + } + } + + public void findIntPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ + + long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L); + String numeroProgetto = ParamUtil.getString(actionRequest, "numeroProgetto", ""); + + IntPratica intPratica = null; + + if(intPraticaId != -1L){ + intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); + } else { + intPratica = IntPraticaLocalServiceUtil.findByNumeroProgetto(numeroProgetto); + } + + if(Validator.isNotNull(intPratica)){ + actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPratica.getIntPraticaId())); + } else { + SessionErrors.add(actionRequest, "nessuna-pratica-trovata"); + PortalUtil.copyRequestParameters(actionRequest, actionResponse); + } + } + + public void correggiBug(ActionRequest actionRequest, ActionResponse actionResponse) { + + } + +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java new file mode 100644 index 00000000..fd403502 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java @@ -0,0 +1,121 @@ +package it.nextmind.liferay.portos.advanced.operation.util; + +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.Validator; +import com.liferay.portal.kernel.workflow.WorkflowConstants; + +import it.tref.liferay.portos.bo.model.DettPratica; +import it.tref.liferay.portos.bo.model.DocPratica; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; + +import java.util.ArrayList; +import java.util.List; + +public class AdvancedOperationUtil { + private static class P_ { + static boolean e(Exception ex) { + return !nl(ex); + } + static boolean nl(Object o) { + return Validator.isNull(o); + } + static + TupleIntPratica fetchIntPratica(long intPraticaId) { + IntPratica ip = null; + Exception ex = null; + try { + ip = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); + } catch (Exception e) { + ex = e; + } + if (e(ex)) handleIntPraticaErr(ex); + return new TupleIntPratica(ip, ex); + } + static void handleIntPraticaErr(Exception ex) { + log.error(ex,ex); + } + static + TupleDocPraticaList findByIntPraticaList(long intPraticaId) { + List dpl = new ArrayList(); + Exception ex = null; + try { + dpl = DocPraticaLocalServiceUtil.findByIntPratica(intPraticaId); + } catch (Exception e) { + ex = e; + } + if (e(ex)) handleDocPraticaListErr(ex); + return new TupleDocPraticaList(dpl, ex); + } + static void handleDocPraticaListErr(Exception ex) { + log.error(ex,ex); + } + + static List getDettPraticaList(long intPraticaId){ + List dettPraticaList = new ArrayList(); + + try { + dettPraticaList = DettPraticaLocalServiceUtil.findByIntPraticaId(intPraticaId); + } catch (SystemException e) { + log.error(e,e); + } + + return dettPraticaList; + } + static final Log log = LogFactoryUtil.getLog(AdvancedOperationUtil.class); + } + static class TupleIntPratica { + IntPratica rs; Exception er; + TupleIntPratica(IntPratica ip, Exception ex) {rs=ip;er=ex;} + } + static class TupleDocPraticaList { + List rs; Exception er; + TupleDocPraticaList(List dpl, Exception ex) {rs=dpl;er=ex;} + } + + public static boolean isPraticaAnnullata(IntPratica intPratica){ + if(Validator.isNotNull(intPratica)){ + return WorkflowConstants.STATUS_INACTIVE == intPratica.getStatus(); + } + return false; + } + + public static List getDocPraticaOrfani(long intPraticaId) { + TupleIntPratica intPratica = P_.fetchIntPratica(intPraticaId); + if (P_.nl(intPratica.er) && P_.nl(intPratica.rs)) { + TupleDocPraticaList docPraticaList = P_.findByIntPraticaList(intPraticaId); + if (P_.nl(docPraticaList.er)) + return docPraticaList.rs; + } + return new ArrayList(); + } + + public static boolean hasDettPratica(long intPraticaId){ + + return !P_.getDettPraticaList(intPraticaId).isEmpty(); + } + + public static boolean getNormLavoriInProprioFlag(long intPraticaId){ + List dettPraticaList = P_.getDettPraticaList(intPraticaId); + if(!dettPraticaList.isEmpty()){ + return dettPraticaList.get(0).getNormLavoriInProprio(); + } + return false; + } + + public static String getLavoriInEconomiaBtnLabel(boolean normLavoriInProprioFlag){ + return normLavoriInProprioFlag ? "Rimuovi flag normLavoriInProprio" : "Aggiungi flag normLavoriInProprio"; + } + + public static boolean isStatoPraticaIN(IntPratica intPratica){ + if(Validator.isNotNull(intPratica)){ + return "IN".equals(intPratica.getStatoPratica()); + } + return false; + } + +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/ControlloPraticaSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/ControlloPraticaSearch.java new file mode 100644 index 00000000..c467625d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/ControlloPraticaSearch.java @@ -0,0 +1,139 @@ +package it.nextmind.liferay.portos.advanced.operation.util; + +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.search.BooleanClauseOccur; +import com.liferay.portal.kernel.search.BooleanQuery; +import com.liferay.portal.kernel.search.BooleanQueryFactoryUtil; +import com.liferay.portal.kernel.search.Field; +import com.liferay.portal.kernel.search.Hits; +import com.liferay.portal.kernel.search.ParseException; +import com.liferay.portal.kernel.search.SearchContext; +import com.liferay.portal.kernel.search.SearchContextFactory; +import com.liferay.portal.kernel.search.SearchEngineUtil; +import com.liferay.portal.kernel.search.SearchException; +import com.liferay.portal.kernel.search.Sort; +import com.liferay.portal.kernel.search.TermQuery; +import com.liferay.portal.kernel.search.TermQueryFactoryUtil; +import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; +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.Validator; +import com.liferay.portal.kernel.workflow.WorkflowConstants; + +import it.mwg.sismica.bo.shared.util.IndexField; +import it.tref.liferay.portos.bo.model.ControlloPratica; + +import java.text.DateFormat; +import java.text.Format; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + +public class ControlloPraticaSearch { + + private static final Log _log = LogFactoryUtil.getLog(ControlloPraticaSearch.class); + + public static final Format DATE_FORMAT_LUCENE = FastDateFormatFactoryUtil.getSimpleDateFormat("yyyyMMdd"); + + public static final DateFormat DATE_FORMAT_STRING = new SimpleDateFormat("dd/MM/yyyy"); + + public static Hits searchFixBug(HttpServletRequest request,int start, int end) { + + SearchContext searchContext = SearchContextFactory.getInstance(request); + boolean searchForExport = ParamUtil.getBoolean(request, "searchForExport", false); + if (searchForExport) { + int maxEnd = GetterUtil.getInteger(PropsUtil.get(PropsKeys.INDEX_FILTER_SEARCH_LIMIT)); + searchContext.setStart(0); + searchContext.setEnd(maxEnd); + searchContext.setAttribute("paginationType", "none"); + } else { + searchContext.setAttribute("paginationType", "more"); + searchContext.setStart(start); + searchContext.setEnd(end); + } + // Gestione Ordinamento + searchContext.setSorts(getOrderedQuery(request)); + Hits hits = null; + try { + BooleanQuery query = BooleanQueryFactoryUtil.create(searchContext); + // Condizioni necessarie per questa ricerca: entryClassName=ControlloPratica & roleIds non e tra i + // taskAssigneeIds userId non e tra taskAssigneeId + TermQuery term = TermQueryFactoryUtil.create(searchContext, Field.ENTRY_CLASS_NAME, + ControlloPratica.class.getName()); + query.add(term, BooleanClauseOccur.MUST); + + BooleanQuery subQuery = BooleanQueryFactoryUtil.create(searchContext); + if (subQuery.clauses().size() > 0) { + query.add(subQuery, BooleanClauseOccur.MUST_NOT); + } + term = TermQueryFactoryUtil.create(searchContext, IndexField.STATUS, WorkflowConstants.STATUS_PENDING); + query.add(term, BooleanClauseOccur.MUST); + // Ricavo i groupId relativi all utente che effettua la ricerca per filtrare + subQuery = BooleanQueryFactoryUtil.create(searchContext); + // Condizioni aggiuntive + query(query, searchContext); + hits = SearchEngineUtil.search(searchContext, query); + logResults(query, hits); + } catch (ParseException | SearchException e) { + _log.error(e, e); + } + return hits; + } + + protected static void logResults(BooleanQuery query, Hits hits) { + + if (_log.isDebugEnabled()) { + _log.debug(query + " --- " + hits.getLength()); + } + } + + private static void query(BooleanQuery query, SearchContext searchContext) throws ParseException { + + + String task = "signal_cittadino"; + + TermQuery term = TermQueryFactoryUtil.create(searchContext, IndexField.TASK, task); + + query.add(term, BooleanClauseOccur.MUST_NOT); + + String statoPratica = "IN"; + + term = TermQueryFactoryUtil.create(searchContext, IndexField.STATO_PRATICA, statoPratica); + query.add(term, BooleanClauseOccur.MUST); + } + + public static List getFields() { + + return Arrays.asList(IndexField.NUMERO_PROGETTO, IndexField.TIPO_PROCEDURA, IndexField.CODICE_PROVINCIA, + IndexField.COMUNE_ID, IndexField.TITOLARE, IndexField.ISTRUTTORE, IndexField.ISTRUTTORE_ID, + IndexField.COMMITTENTE, IndexField.SOGGETTO, IndexField.UNITA_OPERATIVA, IndexField.GEOLOGO_ID, + IndexField.PARERI_FORNITI, IndexField.TASK, IndexField.DATA_RICHIESTA_DA, IndexField.DATA_RICHIESTA_A, + IndexField.DATA_ESITO_DA, IndexField.DATA_ESITO_A, IndexField.STATO_PRATICA); + } + + protected static Sort[] getOrderedQuery(HttpServletRequest request) { + + Sort[] sortes = new Sort[1]; + String orderField = ParamUtil.getString(request, "orderByCol", "numeroProgetto"); + String orderType = ParamUtil.getString(request, "orderByType", "dec"); + sortes[0] = new Sort(); + if (Validator.isNotNull(orderField)) { + sortes[0].setFieldName(orderField + "_sortable"); + } + switch (orderField) { + case IndexField.NUMERO_PROGETTO: + sortes[0].setType(Sort.LONG_TYPE); + break; + default: + sortes[0].setType(Sort.STRING_TYPE); + } + sortes[0].setReverse(!"asc".equals(orderType)); + return sortes; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/IndexField.java b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/IndexField.java new file mode 100644 index 00000000..40dba16e --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/IndexField.java @@ -0,0 +1,37 @@ +package it.nextmind.liferay.portos.advanced.operation.util; + +import java.io.Serializable; + +@SuppressWarnings("serial") +public class IndexField implements Serializable { + + public static final String CODICE_PROVINCIA = "codiceProvincia"; + public static final String COMMITTENTE = "committente"; + public static final String COMUNE_ID = "comuneId"; + public static final String CONTROLLO_PRATICA_ID = "controlloPraticaId"; + public static final String DATA_ESITO = "dataEsito"; + public static final String DATA_ESITO_A = "dataEsitoA"; + public static final String DATA_ESITO_DA = "dataEsitoDa"; + public static final String DATA_RICHIESTA = "dataRichiesta"; + public static final String DATA_RICHIESTA_A = "dataRichiestaA"; + public static final String DATA_RICHIESTA_DA = "dataRichiestaDa"; + public static final String DESCRIZIONE = "descrizione"; + public static final String ESITO_PENDENTE = "esitoPendente"; + public static final String GEOLOGO_ID = "geologoId"; + public static final String IN_LAVORAZIONE_SUE = "inLavorazioneSue"; + public static final String INT_PRATICA_ID = "intPraticaId"; + public static final String ISTRUTTORE = "istruttore"; + public static final String ISTRUTTORE_ID = "istruttoreId"; + public static final String NUMERO_PROGETTO = "numeroProgetto"; + public static final String PARERI_FORNITI = "pareriForniti"; + public static final String PRATICA_APERTA = "praticaAperta"; + public static final String SOGGETTO = "soggetto"; + public static final String STATO_PRATICA = "statoPratica"; + public static final String STATUS = "status"; + public static final String TASK = "task"; + public static final String TASK_ASSIGNEE_ROLE_IDS = "taskAssigneeRoleIds"; + public static final String TASK_ASSIGNEE_USER_ID = "taskAssigneeUserId"; + public static final String TIPO_PROCEDURA = "tipoProcedura"; + public static final String TITOLARE = "titolare"; + public static final String UNITA_OPERATIVA = "unitaOperativa"; +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/aui.tld b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/aui.tld new file mode 100644 index 00000000..1eeac884 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/aui.tld @@ -0,0 +1,2568 @@ + + + + aui:.]]> + 1.0 + aui + http://alloy.liferay.com/tld/aui + + + button-item + com.liferay.taglib.aui.ButtonItemTag + JSP + + ]]> + activeState + false + true + boolean + + + ]]> + boundingBox + false + true + java.lang.String + + + ]]> + classNames + false + true + java.lang.Object + + + ]]> + contentBox + false + true + java.lang.String + + + boundingBox.]]> + cssClass + false + true + java.lang.String + + + ]]> + defaultState + false + true + boolean + + + ]]> + depth + false + true + java.lang.Object + + + ]]> + destroyed + false + true + boolean + + + ]]> + disabled + false + true + boolean + + + ]]> + focused + false + true + boolean + + + {fn: // The function to execute + context: // The context to execute the function in + type: // The type of event to listen for (defaults to "click") + }]]> + handler + false + true + java.lang.Object + + + ]]> + height + false + true + java.lang.Object + + + boundingBox when + visible is set to + false.]]> + hideClass + false + true + java.lang.String + + + ]]> + hoverState + false + true + boolean + + + ]]> + icon + false + true + java.lang.String + + + aui-button-icon.]]> + iconNode + false + true + java.lang.String + + + ]]> + buttonitemId + false + true + java.lang.String + + + ]]> + index + false + true + java.lang.Object + + + ]]> + initialized + false + true + boolean + + + ]]> + label + false + true + java.lang.String + + + aui-button-label.]]> + labelNode + false + true + java.lang.String + + + ]]> + buttonitemParent + false + true + java.lang.Object + + + true the render phase will be autimatically invoked + preventing the .render() manual call.]]> + render + false + true + java.lang.Object + + + ]]> + rendered + false + true + boolean + + + ]]> + root + false + true + java.lang.Object + + + +
0
(Default) Not selected
+
1
Fully selected
+
2
Partially selected
+ ]]>
+ selected + false + true + java.lang.Object +
+ + ]]> + srcNode + false + true + java.lang.String + + + ]]> + strings + false + true + java.lang.Object + + + ]]> + tabIndex + false + true + java.lang.Object + + + ]]> + title + false + true + java.lang.String + + + ]]> + type + false + true + java.lang.String + + + ]]> + useARIA + false + true + boolean + + + ]]> + visible + false + true + boolean + + + ]]> + width + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterActiveStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterBoundingBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterClassNamesChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterContentBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterCssClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDefaultStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDepthChange + false + true + java.lang.Object + + + + Lifecycle event for the destroy phase, + fired prior to destruction. Invoking the preventDefault + method on the event object provided to subscribers will + prevent destruction from proceeding. +

+

+ Subscribers to the "after" moment of this event, will be notified + after destruction is complete (and as a result cannot prevent + destruction). +

]]>
+ afterDestroy + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDestroyedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDisabledChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterFocusedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHandlerChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHeightChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHideClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHoverStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIconChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIconNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIdChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIndexChange + false + true + java.lang.Object + + + + Lifecycle event for the init phase, fired prior to initialization. + Invoking the preventDefault() method on the event object provided + to subscribers will prevent initialization from occuring. +

+

+ Subscribers to the "after" momemt of this event, will be notified + after initialization of the object is complete (and therefore + cannot prevent initialization). +

]]>
+ afterInit + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterInitializedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterLabelChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterLabelNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterParentChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterRenderChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterRenderedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterRootChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterSelectedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterSrcNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterStringsChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterTabIndexChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterTitleChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterTypeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterUseARIAChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterVisibleChange + false + true + java.lang.Object + + + ]]> + afterContentUpdate + false + true + java.lang.Object + + + + Subscribers to the "on" moment of this event, will be notified + before the widget is rendered. +

+

+ Subscribers to the "after" moment of this event, will be notified + after rendering is complete. +

]]>
+ afterRender + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterWidthChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onActiveStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onBoundingBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onClassNamesChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onContentBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onCssClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDefaultStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDepthChange + false + true + java.lang.Object + + + + Lifecycle event for the destroy phase, + fired prior to destruction. Invoking the preventDefault + method on the event object provided to subscribers will + prevent destruction from proceeding. +

+

+ Subscribers to the "after" moment of this event, will be notified + after destruction is complete (and as a result cannot prevent + destruction). +

]]>
+ onDestroy + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDestroyedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDisabledChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onFocusedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHandlerChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHeightChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHideClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHoverStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIconChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIconNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIdChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIndexChange + false + true + java.lang.Object + + + + Lifecycle event for the init phase, fired prior to initialization. + Invoking the preventDefault() method on the event object provided + to subscribers will prevent initialization from occuring. +

+

+ Subscribers to the "after" momemt of this event, will be notified + after initialization of the object is complete (and therefore + cannot prevent initialization). +

]]>
+ onInit + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onInitializedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onLabelChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onLabelNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onParentChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onRenderChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onRenderedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onRootChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onSelectedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onSrcNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onStringsChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onTabIndexChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onTitleChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onTypeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onUseARIAChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onVisibleChange + false + true + java.lang.Object + + + ]]> + onContentUpdate + false + true + java.lang.Object + + + + Subscribers to the "on" moment of this event, will be notified + before the widget is rendered. +

+

+ Subscribers to the "after" moment of this event, will be notified + after rendering is complete. +

]]>
+ onRender + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onWidthChange + false + true + java.lang.Object + + true +
+ + + a + com.liferay.taglib.aui.ATag + JSP + + <p> tag could be used for something other than a paragraph.]]> + ariaRole + false + true + java.lang.String + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.util.Map + + + + href + true + true + java.lang.String + + + + id + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + + lang + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + self. Possible values are blank, self, parent, top, and a unique frame's name.]]> + target + false + true + java.lang.String + + + + title + false + true + java.lang.String + + true + + + button + com.liferay.taglib.aui.ButtonTag + JSP + + primary attribute.]]> + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + false.]]> + disabled + false + true + boolean + + + + href + false + true + java.lang.String + + + here.]]> + icon + false + true + java.lang.String + + + left.]]> + iconAlign + false + true + java.lang.String + + + + name + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + type attribute is set to submit, this value is set to true. For all other types, the value is set to false by default.]]> + primary + false + true + java.lang.Object + + + button, submit, cancel and reset. The default value is button.]]> + type + false + true + java.lang.String + + + href location when a user clicks the button. The default value is false.]]> + useDialog + false + true + boolean + + + value + false + true + java.lang.String + + true + + + <div> tag to wrap <aui:button> components and offer additional styling.]]> + button-row + com.liferay.taglib.aui.ButtonRowTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + true + + + <aui:row> component.]]> + col + com.liferay.taglib.aui.ColTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + offset + false + true + int + + + offsetWidth + false + true + int + + + 12. For example, a span of 4 would result in a column width 4/12 (or 1/3) of the total width of the containing row.]]> + span + false + true + int + + + span attribute. The width is then converted to a span expressed as ((width/100) x 12), rounded to the nearest whole number. For example, a width of 33 would be converted to 3.96, which would be rounded up to a span value of 4.]]> + width + false + true + int + + true + + + aui:col.]]> + column + com.liferay.taglib.aui.ColumnTag + JSP + + 20 would be 20%. The default value is 0.]]> + columnWidth + false + true + int + + + + cssClass + false + true + java.lang.String + + + false.]]> + first + false + true + boolean + + + + id + false + true + java.lang.String + + + false.]]> + last + false + true + boolean + + true + + + component + com.liferay.taglib.aui.ComponentTag + JSP + + defineVar + false + true + boolean + + + excludeAttributes + false + true + java.lang.String + + + javaScriptAttributes + false + true + java.lang.String + + + module + false + true + java.lang.String + + + name + false + true + java.lang.String + + + options + false + true + java.util.Map + + + scriptPosition + false + true + java.lang.String + + + tagPageContext + true + true + javax.servlet.jsp.JspContext + + + useJavaScript + false + true + java.io.Serializable + + + var + false + true + java.lang.String + + true + + + <div> tag to wrap <aui:row> components and offer additional styling.]]> + container + com.liferay.taglib.aui.ContainerTag + JSP + + + cssClass + false + true + java.lang.String + + + true.]]> + fluid + false + true + boolean + + + + id + false + true + java.lang.String + + true + + + <div> tag to wrap form fields and offer additional styling.]]> + field-wrapper + com.liferay.taglib.aui.FieldWrapperTag + JSP + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + false.]]> + first + false + true + boolean + + + + helpMessage + false + true + java.lang.String + + + false.]]> + inlineField + false + true + boolean + + + right and left.]]> + inlineLabel + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + false.]]> + last + false + true + boolean + + + + name + false + true + java.lang.String + + + + required + false + true + boolean + + + + <div> tag to group related form elements and offer additional styling.]]> + fieldset + com.liferay.taglib.aui.FieldsetTag + JSP + + + column + false + true + boolean + + + + cssClass + false + true + java.lang.String + + + + helpMessage + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + + label + false + true + java.lang.String + + true + + + + form + com.liferay.taglib.aui.FormTag + JSP + + + action + false + true + java.lang.String + + + + cssClass + false + true + java.lang.String + + + true.]]> + escapeXml + false + true + boolean + + + false.]]> + inlineLabels + false + true + boolean + + + post. Possible values are get and post.]]> + method + false + true + java.lang.String + + + fm.]]> + name + false + true + java.lang.String + + + + onSubmit + false + true + java.lang.String + + + + portletNamespace + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + true + + + + icon + com.liferay.taglib.aui.IconTag + JSP + + image attribute.]]> + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.util.Map + + + + id + false + true + java.lang.String + + + icon-edit CSS class by setting the value edit. If an icon image is referenced for cssClass and image, both icons are shown in the component.]]> + image + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + self. Possible values are blank, self, parent, top, and a unique frame's name.]]> + target + false + true + java.lang.String + + + + url + false + true + java.lang.String + + true + + + + input + com.liferay.taglib.aui.InputTag + JSP + + + autoFocus + false + true + boolean + + + + autoSize + false + true + boolean + + + + bean + false + true + java.lang.Object + + + false.]]> + changesContext + false + true + boolean + + + type is radio or checkbox.]]> + checked + false + true + boolean + + + 0.]]> + classPK + false + true + long + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + dateTogglerCheckboxLabel + false + true + java.lang.String + + + + defaultLanguageId + false + true + java.lang.String + + + false.]]> + disabled + false + true + boolean + + + field + false + true + java.lang.String + + + field of the component.]]> + fieldParam + false + true + java.lang.String + + + + first + false + true + boolean + + + + formName + false + true + java.lang.String + + + + helpMessage + false + true + java.lang.String + + + input-group-addon.]]> + helpTextCssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + false.]]> + ignoreRequestValue + false + true + boolean + + + false.]]> + inlineField + false + true + boolean + + + right and left.]]> + inlineLabel + false + true + java.lang.String + + + name attribute's value.]]> + label + false + true + java.lang.String + + + languageId + false + true + java.lang.String + + + + last + false + true + boolean + + + false.]]> + localized + false + true + boolean + + + type is number or range. Note that the max value is inclusive if the input's type is range.]]> + max + false + true + java.lang.Object + + + + model + false + true + java.lang.Class + + + type is number or range. Note that the min value is inclusive if the input's type is range.]]> + min + false + true + java.lang.Object + + + multiple + false + true + boolean + + + + name + true + true + java.lang.String + + + + onChange + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + + placeholder + false + true + java.lang.String + + + + prefix + false + true + java.lang.String + + + + required + false + true + boolean + + + textarea.]]> + resizable + false + true + boolean + + + + showRequiredLabel + false + true + boolean + + + + suffix + false + true + java.lang.String + + + + title + false + true + java.lang.String + + + text, hidden, assetCategories, assetTags, textarea, timeZone, password, checkbox, radio, submit, button, color, email, number, range, resource, url, and an empty value. If an empty value or no value is set, the input's type is obtained automatically from the input component's bean.]]> + type + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + + + value + false + true + java.lang.Object + + + div that wraps the input component.]]> + wrapperCssClass + false + true + java.lang.String + + true + + + + layout + com.liferay.taglib.aui.LayoutTag + JSP + + + cssClass + false + true + java.lang.String + + true + + + + model-context + com.liferay.taglib.aui.ModelContextTag + JSP + + + bean + false + true + java.lang.Object + + + + defaultLanguageId + false + true + java.lang.String + + + + model + false + true + java.lang.Class + + + + <nav:item> components for an <aui:nav-bar> component.]]> + nav + com.liferay.taglib.aui.NavTag + JSP + + + ariaLabel + false + true + java.lang.String + + + <p> tag could be used for something other than a paragraph.]]> + ariaRole + false + true + java.lang.String + + + collapsible + false + true + boolean + + + + cssClass + false + true + java.lang.String + + + icon + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + true + + + + nav-bar + com.liferay.taglib.aui.NavBarTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + true + + + <aui:nav-bar> component.]]> + nav-bar-search + com.liferay.taglib.aui.NavBarSearchTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + file + false + true + java.lang.String + + + + searchContainer + false + true + com.liferay.portal.kernel.dao.search.SearchContainer + + true + + + <aui:nav> component.]]> + nav-item + com.liferay.taglib.aui.NavItemTag + JSP + + href attribute.]]> + anchorCssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + anchorData + false + true + java.lang.Object + + + href attribute.]]> + anchorId + false + true + java.lang.String + + + + ariaLabel + false + true + java.lang.String + + + <p> tag could be used for something other than a paragraph.]]> + ariaRole + false + true + java.lang.String + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + false.]]> + dropdown + false + true + boolean + + + + href + false + true + java.lang.Object + + + + iconCssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + localizeLabel + false + true + boolean + + + false.]]> + selected + false + true + boolean + + + state + false + true + java.lang.String + + + + title + false + true + java.lang.String + + + toggle + false + true + boolean + + + href location when a user clicks the navigation item. The default value is false.]]> + useDialog + false + true + boolean + + + drop-down-menu class. The default value is true.]]> + wrapDropDownMenu + false + true + boolean + + true + + + <aui:select> component.]]> + option + com.liferay.taglib.aui.OptionTag + JSP + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.util.Map + + + false.]]> + disabled + false + true + boolean + + + + label + false + true + java.lang.Object + + + false.]]> + selected + false + true + boolean + + + text-align:right;.]]> + style + false + true + java.lang.String + + + useModelValue + false + true + boolean + + + label attribute.]]> + value + false + true + java.lang.Object + + true + + + panel + com.liferay.taglib.aui.PanelTag + JSP + + collapsed + false + true + boolean + + + collapsible + false + true + boolean + + + id + false + true + java.lang.String + + + label + false + true + java.lang.String + + + + <aui:col> components.]]> + row + com.liferay.taglib.aui.RowTag + JSP + + + cssClass + false + true + java.lang.String + + + row-fluid CSS class to the row. The default value is true. If set to false, the row CSS class is assigned.]]> + fluid + false + true + boolean + + + + id + false + true + java.lang.String + + true + + + + script + com.liferay.taglib.aui.ScriptTag + JSP + + + position + false + true + java.lang.String + + + + use + false + true + java.lang.String + + + + <aui:option> components.]]> + select + com.liferay.taglib.aui.SelectTag + JSP + + + bean + false + true + java.lang.Object + + + false.]]> + changesContext + false + true + boolean + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", "foo"> would render as the attribute data-class-name = "foo";.]]> + data + false + true + java.util.Map + + + false.]]> + disabled + false + true + boolean + + + false.]]> + first + false + true + boolean + + + + helpMessage + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + ignoreRequestValue + false + true + boolean + + + false.]]> + inlineField + false + true + boolean + + + right and left.]]> + inlineLabel + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + false.]]> + last + false + true + boolean + + + ListTypeImpl.java.]]> + listType + false + true + java.lang.String + + + listTypeFieldName + false + true + java.lang.String + + + true, the select field expands to allow for multiple selections. The default value is false.]]> + multiple + false + true + boolean + + + label attribute and takes the place of the label.]]> + name + true + true + java.lang.String + + + + onChange + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + + prefix + false + true + java.lang.String + + + false.]]> + required + false + true + boolean + + + false.]]> + showEmptyOption + false + true + boolean + + + required attribute is set to true. The default value is false.]]> + showRequiredLabel + false + true + boolean + + + + suffix + false + true + java.lang.String + + + + title + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + true + + + + spacer + com.liferay.taglib.aui.SpacerTag + JSP + + + + translation-manager + com.liferay.taglib.aui.TranslationManagerTag + JSP + + + availableLocales + false + true + java.util.Locale[] + + + + defaultLanguageId + false + true + java.lang.String + + + editingLanguageId + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + true. If this is set to false, the translation manager will not work entirely.]]> + initialize + false + true + boolean + + + false.]]> + readOnly + false + true + boolean + + + + + validator + com.liferay.taglib.aui.ValidatorTagImpl + JSP + + true.]]> + customValidatorRequired + false + true + boolean + + + + errorMessage + false + true + java.lang.String + + + acceptFiles, alpha, alphanum, date, digits, email, equalTo, iri, max, maxLength, min, minLength, number, required, and url.]]> + name + true + true + java.lang.String + + + + + workflow-status + com.liferay.taglib.aui.WorkflowStatusTag + JSP + + + bean + false + true + java.lang.Object + + + + helpMessage + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + + model + false + true + java.lang.Class + + + true.]]> + showIcon + false + true + boolean + + + true.]]> + showLabel + false + true + boolean + + + 0 (Approved), 1 (Pending), 2 (Draft), 3 (Expired), 4 (Denied), 5 (Inactive), 6 (Incomplete), 7 (Scheduled), and 8 (In-Trash). Any other value defaults to status (Any).]]> + status + false + true + java.lang.Integer + + + + statusMessage + false + true + java.lang.String + + + + version + false + true + java.lang.String + + +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld new file mode 100644 index 00000000..7c046647 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld @@ -0,0 +1,538 @@ + + + + + 1.0 + 1.1 + liferay-portlet + http://liferay.com/tld/portlet + + + + + actionURL + com.liferay.taglib.portlet.ActionURLTag + com.liferay.taglib.portlet.ActionURLTei + JSP + + allowEmptyParam + false + true + + + anchor + false + true + + + copyCurrentRenderParameters + false + true + + + doAsGroupId + false + true + + + doAsUserId + false + true + + + encrypt + false + true + + + escapeXml + false + true + + + name + false + true + + + plid + false + true + + + portletConfiguration + false + true + + + portletMode + false + true + + + portletName + false + true + + + refererGroupId + false + true + + + refererPlid + false + true + + + secure + false + true + + + var + false + true + + + varImpl + false + true + + + windowState + false + true + + + + icon-back + com.liferay.taglib.portletext.IconBackTag + JSP + + + icon-close + com.liferay.taglib.portletext.IconCloseTag + JSP + + + icon-configuration + com.liferay.taglib.portletext.IconConfigurationTag + JSP + + + icon-edit + com.liferay.taglib.portletext.IconEditTag + JSP + + + icon-edit-defaults + com.liferay.taglib.portletext.IconEditDefaultsTag + JSP + + + icon-edit-guest + com.liferay.taglib.portletext.IconEditGuestTag + JSP + + + icon-export-import + com.liferay.taglib.portletext.IconExportImportTag + JSP + + + icon-help + com.liferay.taglib.portletext.IconHelpTag + JSP + + + icon-maximize + com.liferay.taglib.portletext.IconMaximizeTag + JSP + + + icon-minimize + com.liferay.taglib.portletext.IconMinimizeTag + JSP + + + icon-options + com.liferay.taglib.portletext.IconOptionsTag + JSP + + + icon-portlet + com.liferay.taglib.portletext.IconPortletTag + JSP + + ariaRole + false + true + + + id + false + true + + + label + false + true + + + portlet + false + true + + + url + false + true + + + + icon-portlet-css + com.liferay.taglib.portletext.IconPortletCssTag + JSP + + + icon-print + com.liferay.taglib.portletext.IconPrintTag + JSP + + + icon-refresh + com.liferay.taglib.portletext.IconRefreshTag + JSP + + + param + com.liferay.taglib.util.ParamTag + empty + + name + true + true + + + value + true + true + + + + preview + com.liferay.taglib.portletext.PreviewTag + JSP + + portletName + true + true + + + queryString + false + true + + + showBorders + false + true + + + width + false + true + + + + + + + renderURL + com.liferay.taglib.portlet.RenderURLTag + com.liferay.taglib.portlet.RenderURLTei + JSP + + allowEmptyParam + false + true + + + anchor + false + true + + + copyCurrentRenderParameters + false + true + + + doAsGroupId + false + true + + + doAsUserId + false + true + + + encrypt + false + true + + + escapeXml + false + true + + + plid + false + true + + + portletConfiguration + false + true + + + portletMode + false + true + + + portletName + false + true + + + refererGroupId + false + true + + + refererPlid + false + true + + + secure + false + true + + + var + false + true + + + varImpl + false + true + + + windowState + false + true + + + + renderURLParams + com.liferay.taglib.portlet.RenderURLParamsTag + JSP + + varImpl + true + true + + + + + + + resourceURL + com.liferay.taglib.portlet.ResourceURLTag + com.liferay.taglib.portlet.ResourceURLTei + JSP + + anchor + false + true + + + copyCurrentRenderParameters + false + true + + + doAsGroupId + false + true + + + doAsUserId + false + true + + + encrypt + false + true + + + escapeXml + false + true + + + id + false + true + + + plid + false + true + + + portletConfiguration + false + true + + + portletMode + false + true + + + portletName + false + true + + + refererGroupId + false + true + + + refererPlid + false + true + + + secure + false + true + + + var + false + true + + + varImpl + false + true + + + windowState + false + true + + + + runtime + com.liferay.taglib.portletext.RuntimeTag + JSP + + defaultPreferences + false + true + + + portletName + true + true + + + queryString + false + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-portlet.tld b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-portlet.tld new file mode 100644 index 00000000..a7cd2fdf --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-portlet.tld @@ -0,0 +1,158 @@ + + + + + 1.0 + 1.1 + portlet + http://java.sun.com/portlet + + actionURL + com.liferay.taglib.portlet.ActionURLTag + com.liferay.taglib.portlet.ActionURLTei + JSP + + copyCurrentRenderParameters + false + true + + + escapeXml + false + true + + + name + false + true + + + portletMode + false + true + + + secure + false + true + + + var + false + true + + + windowState + false + true + + + + defineObjects + com.liferay.taglib.portlet.DefineObjectsTag + com.liferay.taglib.portlet.DefineObjectsTei + empty + + + namespace + com.liferay.taglib.portlet.NamespaceTag + empty + + + param + com.liferay.taglib.util.ParamTag + empty + + name + true + true + + + value + true + true + + + + property + com.liferay.taglib.util.PropertyTag + empty + + name + true + true + + + value + true + true + + + + renderURL + com.liferay.taglib.portlet.RenderURLTag + com.liferay.taglib.portlet.RenderURLTei + JSP + + copyCurrentRenderParameters + false + true + + + escapeXml + false + true + + + portletMode + false + true + + + secure + false + true + + + var + false + true + + + windowState + false + true + + + + resourceURL + com.liferay.taglib.portlet.ResourceURLTag + com.liferay.taglib.portlet.ResourceURLTei + JSP + + cacheability + false + true + + + escapeXml + false + true + + + id + false + true + + + secure + false + true + + + var + false + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-security.tld b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-security.tld new file mode 100644 index 00000000..f8e6f6dd --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-security.tld @@ -0,0 +1,106 @@ + + + + + 1.0 + 1.1 + liferay-security + http://liferay.com/tld/security + + doAsURL + com.liferay.taglib.security.DoAsURLTag + com.liferay.taglib.security.DoAsURLTei + JSP + + doAsUserId + false + true + + + var + false + true + + + + encrypt + com.liferay.taglib.security.EncryptTag + JSP + + className + false + true + + + protocol + true + true + + + style + false + true + + + target + false + true + + + unencryptedParams + false + true + + + url + true + true + + + + permissionsURL + com.liferay.taglib.security.PermissionsURLTag + com.liferay.taglib.security.PermissionsURLTei + JSP + + modelResource + true + true + + + modelResourceDescription + true + true + + + redirect + false + true + + + resourceGroupId + false + true + + + resourcePrimKey + true + true + + + roleTypes + false + true + + + var + false + true + + + windowState + false + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-theme.tld b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-theme.tld new file mode 100644 index 00000000..90ac81db --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-theme.tld @@ -0,0 +1,65 @@ + + + + + 1.0 + 1.1 + theme + http://liferay.com/tld/theme + + defineObjects + com.liferay.taglib.theme.DefineObjectsTag + com.liferay.taglib.theme.DefineObjectsTei + empty + + + include + com.liferay.taglib.theme.IncludeTag + JSP + + page + true + true + + + + layout-icon + com.liferay.taglib.theme.LayoutIconTag + JSP + + layout + true + true + + + + meta-tags + com.liferay.taglib.theme.MetaTagsTag + JSP + + + param + com.liferay.taglib.util.ParamTag + JSP + + name + true + true + + + value + true + true + + + + wrap-portlet + com.liferay.taglib.theme.WrapPortletTag + JSP + + page + true + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-ui.tld b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-ui.tld new file mode 100644 index 00000000..daa2c534 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-ui.tld @@ -0,0 +1,4696 @@ + + + + Provides the Liferay UI component tags, prefixed with liferay-ui:]]>. + 1.0 + liferay-ui + http://liferay.com/tld/ui + + app-view-display-style + com.liferay.taglib.ui.AppViewDisplayStyleTag + empty + + displayStyle + true + true + + + displayStyles + true + true + + + requestParams + true + true + + + + Creates a component for displaying entry items such as images, documents, folders, etc. in a concise but informative manner. Items are displayed in a similar fashion to entries in the file system of most operating systems. + app-view-entry + com.liferay.taglib.ui.AppViewEntryTag + empty + + The path to an action JSP page. + actionJsp + false + true + + + The Java class name for any categories added to the entry. + assetCategoryClassName + false + true + + + The Java class primary key for any categories added to the entry. This is a Java long]]>. + assetCategoryClassPK + false + true + + + The Java class name for any tags added to the entry. + assetTagClassName + false + true + + + The Java class primary key for any tags added to the entry. This is a Java long]]>. + assetTagClassPK + false + true + + + The name of the entry's author. + author + false + true + + + The date the entry was created. + createDate + false + true + + + A CSS class for styling this component. + cssClass + false + true + + + Miscellaneous data to be stored via a map. This data is not shared with the browser. The map holds key value pairs of type <String, Object>]]>. + data + false + true + java.util.Map + + + A description of the entry. + description + false + true + + + A date to display the entry. + displayDate + false + true + + + A display style for the component. Options are list]]>, icon]]>, and descriptive]]>. + displayStyle + true + true + + + A date for the entry to expire and be automatically deleted. + expirationDate + false + true + + + Whether the entry is a folder. The default is false]]>. + folder + false + true + boolean + + + The group ID of the entry. This is a Java long]]>. + groupId + false + true + + + The version number of the most recently published copy of the entry. + latestApprovedVersion + false + true + + + The author of the most recently published version of the entry. + latestApprovedVersionAuthor + false + true + + + Whether the entry is locked. The default value is false]]>. + locked + false + true + boolean + + + The date of the most recent modification to the entry. + modifiedDate + false + true + + + The date the entry was reviewed. + reviewDate + false + true + + + A checkbox input ID to be used for the entry row checker. + rowCheckerId + false + true + + + A name for the entry row checker. + rowCheckerName + false + true + + + Whether to show a shortcut icon link to the entry. The default value is false]]>. + shortcut + false + true + boolean + + + Whether the entry is selectable. An actual checkbox is used when the display style is icon]]> or descriptive]]>. The default value is false]]>. + showCheckbox + true + true + boolean + + + Whether to show the link title. The default value is true]]>. + showLinkTitle + false + true + boolean + + + The current status of the entry, as represented by an integer. Options are -1: STATUS_ANY]]>, 0: STATUS_APPROVED]]>, 1: ACTION_PUBLISH]]>, 2: STATUS_DRAFT]]>, and 4: STATUS_DENIED]]>. The default value is -1]]>. + status + false + true + int + + + A CSS style to be applied to the div containing the thumbnail for the entry. + thumbnailDivStyle + false + true + + + The source URL for an entry thumbnail image. + thumbnailSrc + true + true + + + A CSS style to be applied to the thumbnail for the entry. + thumbnailStyle + false + true + + + A title for the entry. + title + true + true + + + The current version of the entry. + version + false + true + + + A URL to view the full entry. + url + false + true + + + + Creates a navigation list item component for navigating app view entries. + app-view-navigation-entry + com.liferay.taglib.ui.AppViewNavigationEntryTag + empty + + The path for an action JSP page. + actionJsp + false + true + + + A CSS class for styling this component. + cssClass + false + true + + + Data to be applied to the component link and stored via a map. This data is not shared with the browser. The map holds key value pairs of type <String, Object>]]>. + dataView + false + true + java.util.Map + + + A title for the component. + entryTitle + true + true + + + A CSS class for setting the icon of the component. + iconImage + false + true + + + iconSrc + false + true + + + Whether the entry is selected. + selected + false + true + boolean + + + A URL to view the entry. + viewURL + true + true + + + + Creates a toolbar for viewing items in app view. + app-view-toolbar + com.liferay.taglib.ui.AppViewToolbarTag + JSP + + Whether to include the option to choose a display style for component items. If the value is true]]>, a list of display style options is rendered. The default value is false]]>. + includeDisplayStyle + false + true + boolean + + + Whether to include an option to select all component items. The default value is false]]>. + includeSelectAll + false + true + boolean + + + The file path for a search JSP page. + searchJsp + false + true + + + + Creates a component for displaying search results of entries in app view. + app-view-search-entry + com.liferay.taglib.ui.AppViewSearchEntryTag + empty + + The file path for an action JSP page. + actionJsp + false + true + + + containerIcon + false + true + + + The name of the container that the entry is in, such as the name of a folder. + containerName + false + true + + + containerSrc + false + true + + + The type of container the entry is in, such as Folder]]>. + containerType + false + true + + + A CSS class for styling this component. + cssClass + false + true + + + A description of the entry. + description + true + true + + + A list of objects containing information such as content, user ID, and titles of the entry file attachments. + fileEntryTuples + false + true + + + Whether the entry is locked. The default value is false]]>. + locked + false + true + boolean + + + A list of objects containing information such as content, author, and status of entry messages. An example would be a comment made by one user on another user's blog post. + mbMessages + false + true + + + Query terms of the search. + queryTerms + true + true + + + A checkbox input ID to be used for the entry row checker. This is a Java long]]>. + rowCheckerId + false + true + + + A name to be used for the entry row checker. + rowCheckerName + false + true + + + Whether the entry is selectable via a checkbox. The default value is true]]>. + showCheckbox + false + true + boolean + + + The current status of the entry as represented by an integer. Options are -1: STATUS_ANY]]>, 0: STATUS_APPROVED]]>, 1: ACTION_PUBLISH]]>, 2: STATUS_DRAFT]]>, and 4: STATUS_DENIED]]>. + status + false + true + + + The URL for an entry thumbnail image. + thumbnailSrc + false + true + + + A title for the entry. + title + true + true + + + A URL used to view the full entry. + url + true + true + + + The current and past versions of the entry. + versions + false + true + + + + asset-categories-error + com.liferay.taglib.ui.AssetCategoriesErrorTag + JSP + + + asset-categories-navigation + com.liferay.taglib.ui.AssetCategoriesNavigationTag + JSP + + hidePortletWhenEmpty + false + true + + + vocabularyIds + false + true + + + + asset-categories-selector + com.liferay.taglib.ui.AssetCategoriesSelectorTag + JSP + + className + false + true + + + classPK + false + true + + + contentCallback + false + true + + + curCategoryIds + false + true + + + groupIds + false + true + + + hiddenInput + false + true + + + ignoreRequestValue + false + true + + + + asset-categories-summary + com.liferay.taglib.ui.AssetCategoriesSummaryTag + JSP + + className + true + true + + + classPK + true + true + + + message + false + true + + + portletURL + false + true + + + + asset-links + com.liferay.taglib.ui.AssetLinksTag + JSP + + assetEntryId + false + true + + + className + false + true + + + classPK + false + true + + + + Creates a liferay-ui:error]]> component to display tag-related error messages. + asset-tags-error + com.liferay.taglib.ui.AssetTagsErrorTag + JSP + + + asset-tags-navigation + com.liferay.taglib.ui.AssetTagsNavigationTag + JSP + + classNameId + false + true + + + displayStyle + false + true + + + hidePortletWhenEmpty + false + true + + + maxAssetTags + false + true + + + showAssetCount + false + true + + + showZeroAssetCount + false + true + + + + Creates a Liferay.AssetTagsSelector]]> component to create and select tags to add to an asset, such as a blog entry, bookmark, or wiki page. + asset-tags-selector + com.liferay.taglib.ui.AssetTagsSelectorTag + JSP + + Whether to automatically focus the tag input field. The default value is false]]>. + autoFocus + false + true + boolean + + + The Java class of the asset. + className + false + true + + + The Java class primary key of an asset to associate with the tags. This is a Java long]]>. + classPK + false + true + + + A function to get tag suggestions based on the asset's content. + contentCallback + false + true + + + The current selected tags. + curTags + false + true + + + The group IDs of the asset tags. + groupIds + false + true + + + The name of the hidden input for passing in the asset's current tags. + hiddenInput + false + true + + + An ID for the component instance. + id + false + true + + + ignoreRequestValue + false + true + + + + Creates a component to display all the tags associated with an asset, such as a blog entry, wiki page, or message boards message. + asset-tags-summary + com.liferay.taglib.ui.AssetTagsSummaryTag + JSP + + An array of the asset tag names. + assetTagNames + false + true + + + The Java class of the asset. + className + true + true + + + The Java class primary key of an asset. This is a Java long]]>. + classPK + true + true + + + A message to display before the tag labels. A standard example is tags]]>, which renders as Tags:]]>. + message + false + true + + + The URL of a portlet to display the tags. + portletURL + false + true + + + + breadcrumb + com.liferay.taglib.ui.BreadcrumbTag + JSP + + displayStyle + false + true + + + portletURL + false + true + + + selLayout + false + true + + + selLayoutParam + false + true + + + showCurrentGroup + false + true + + + showCurrentPortlet + false + true + + + showGuestGroup + false + true + + + showLayout + false + true + + + showParentGroups + false + true + + + showPortletBreadcrumb + false + true + + + + Creates a calendar with configurable events. + calendar + com.liferay.taglib.ui.CalendarTag + JSP + + A given set of integers, corresponding to a day of the chosen month, and to mark with a dot. + data + false + true + java.util.Set + + + A day of the month to highlight in the calendar. + day + false + true + int + + + A format for the header. + headerFormat + false + true + java.text.Format + + + A pattern for the calendar header. A possible value is MMM/dd/yyyy]]>. + headerPattern + false + true + + + A month of the year to display at the top of the calendar. + month + true + true + int + + + Whether to display up to six calendar weeks relative to the set day. If the set day of the month is in the latter part of the month, the current month's weeks will be displayed and up to two weeks of the next month will be displayed. The default value is false]]>. + showAllPotentialWeeks + false + true + boolean + + + A year to display at the top of the calendar. + year + true + true + int + + + + Creates an image CAPTCHA with a corresponding verification input. + captcha + com.liferay.taglib.ui.CaptchaTag + JSP + + The source URL for the image CAPTCHA. + url + true + true + + + + categorization-filter + com.liferay.taglib.ui.CategorizationFilterTag + JSP + + assetType + false + true + + + portletURL + false + true + + + + custom-attribute + com.liferay.taglib.ui.CustomAttributeTag + JSP + + className + true + true + + + classPK + true + true + + + editable + false + true + + + label + false + true + + + name + true + true + + + + custom-attribute-list + com.liferay.taglib.ui.CustomAttributeListTag + JSP + + className + true + true + + + classPK + true + true + + + editable + false + true + + + ignoreAttributeNames + false + true + + + label + false + true + + + + custom-attributes-available + com.liferay.taglib.ui.CustomAttributesAvailableTag + JSP + + className + true + true + + + classPK + false + true + + + companyId + false + true + + + ignoreAttributeNames + false + true + + + editable + false + true + + + + ddm-template-selector + com.liferay.taglib.ui.DDMTemplateSelectorTag + JSP + + classNameId + true + true + + + displayStyle + true + true + + + displayStyleGroupId + true + true + + + displayStyles + false + true + + + icon + false + true + + + label + false + true + + + refreshURL + false + true + + + showEmptyOption + false + true + + + + diff + com.liferay.taglib.ui.DiffTag + JSP + + diffResults + true + true + + + sourceName + true + true + + + targetName + true + true + + + + diff-html + com.liferay.taglib.ui.DiffHtmlTag + JSP + + diffHtmlResults + true + true + + + + discussion + com.liferay.taglib.ui.DiscussionTag + JSP + + assetEntryVisible + false + true + + + className + true + true + + + classPK + true + true + + + formAction + true + true + + + formName + false + true + + + hideControls + false + true + + + permissionClassName + false + true + + + permissionClassPK + false + true + + + ratingsEnabled + false + true + + + redirect + false + true + + + Deprecated as of 6.2.0, with no direct replacement + subject + false + true + + + userId + true + true + + + + Creates an error message to display to the user. + error + com.liferay.taglib.ui.ErrorTag + com.liferay.taglib.ui.ErrorTei + JSP + + A class for the exception. + exception + false + true + + + The name of a field on which to focus the error message. + focusField + false + true + + + A key to place in the SessionErrors]]> object to trigger the error message. + key + false + true + + + Explicit message text or a language key name from which to derive text for the message. + message + false + true + + + rowBreak + false + true + + + Whether to translate the message into the user's language. The default value is true]]>. + translateMessage + false + true + boolean + + + + error-marker + com.liferay.taglib.ui.ErrorMarkerTag + JSP + + key + false + true + + + value + false + true + + + + Creates a flag icon that lets users report inappropriate content. + flags + com.liferay.taglib.ui.FlagsTag + JSP + + The flagged asset's Java class name. + className + true + true + + + The flagged asset's entry ID. + classPK + true + true + + + The flagged asset's title. + contentTitle + true + true + + + Whether to show message text as a label next to the flag icon or as a tooltip. The default value is true]]>. + label + false + true + boolean + + + Text to display next to the flag icon. The default text is Flag]]>. + message + false + true + + + The user ID of the user who flagged the asset. + reportedUserId + true + true + + + + flash + com.liferay.taglib.ui.FlashTag + JSP + + align + false + true + + + allowFullScreen + false + true + + + allowScriptAccess + false + true + + + base + false + true + + + bgcolor + false + true + + + devicefont + false + true + + + flashvars + false + true + + + height + false + true + + + id + false + true + + + loop + false + true + + + menu + false + true + + + movie + true + true + + + play + false + true + + + quality + false + true + + + salign + false + true + + + scale + false + true + + + swliveconnect + false + true + + + version + false + true + + + width + false + true + + + wmode + false + true + + + + Creates a navigable form for multiple section forms. It's default navigation is a side navigation box with links to each section. But the navigation can be configured as a progressive step navigation positioned above the form or as vertically stacked accordion style sections that expand when clicked. + form-navigator + com.liferay.taglib.ui.FormNavigatorTag + JSP + + A URL for the form's cancel button. + backURL + false + true + + + The name of each category in the form. + categoryNames + true + true + + + The name of each section within a category. + categorySections + true + true + + + A type of navigation to be used. Options are steps]]> and panel]]>. The default display style is side navigation. + displayStyle + false + true + + + A name for the form. + formName + false + true + + + HTML to append to the navigator. Examples include alternate form buttons, form instructions, or information about the form. + htmlBottom + false + true + + + HTML to prepend to the navigator. + htmlTop + false + true + + + A path to the formSection.jsp]]> file's folder /path/to/jsp/folder/]]>. + jspPath + false + true + + + Whether to show the Submit]]> and Cancel]]> buttons. The default value is true]]>. + showButtons + false + true + boolean + + + + group-search + com.liferay.taglib.ui.GroupSearchTag + JSP + + groupParams + true + true + + + portletURL + true + true + + + rowChecker + false + true + + + + Creates a header that displays its text above a horizontal rule accompanied by a configurable back URL button. + header + com.liferay.taglib.ui.HeaderTag + JSP + + Text to display on mouse over of the back URL. The default value is Back]]>. + backLabel + false + true + + + A URL for navigating back to. + backURL + false + true + + + A CSS class for styling the header component. + cssClass + false + true + + + Whether to escape the header's XML tags. The default value is true]]>. + escapeXml + false + true + boolean + + + Whether to translate the header's title]]> into the localized language. The default value is true]]>. + localizeTitle + false + true + boolean + + + Whether to display the back URL. The default value is true]]>. + showBackURL + false + true + boolean + + + A title to display as the header text. + title + true + true + + + + Creates a fully configurable icon that provides access to current Liferay theme icons. + icon + com.liferay.taglib.ui.IconTag + JSP + + A value for the alt]]> attribute of the embedded img]]> tag. + alt + false + true + + + A role for assistive technologies to interpret for HTML elements that have been used for something other than their intended purpose. For example, the <p>]]> tag could be used for something other than a paragraph. + ariaRole + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + Miscellaneous data to be stored via a map. This data is not shared with the browser. The map holds key value pairs of type <String, Object>]]>. + data + false + true + java.util.Map + + + An icon from a Bootstrap icon CSS Class. Note that any image for the image]]> attribute takes precedence. Icon CSS classes to specify for this attribute can be found at http://marcoceppi.github.io/bootstrap-glyphicons/]]>. + iconCssClass + false + true + + + An ID for the component instance. + id + false + true + + + An image for the icon, from the current theme. The value can be the filename prefix of any image file in the theme's common]]> image folder. This image takes precedence over any icon value set via the iconCssClass]]> attribute. + image + false + true + + + An icon to display on mouse over of the component. The icon image comes from the current theme. The value can be the filename prefix of any image file in the theme's common]]> image folder. + imageHover + false + true + + + Whether to display the message]]> attribute's value as the icon's label. + label + false + true + boolean + + + A language to associate with the icon, to assist search engines and web browsers in finding and rendering the icon appropriately. + lang + false + true + + + A CSS class for styling the icon's URL. + linkCssClass + false + true + + + Whether to translate the icon's message]]> into the user's language. + localizeMessage + false + true + boolean + + + Text to be displayed for the icon on mouse over. + message + false + true + + + An HTTP request method. Possible values are get]]> and post]]>. + method + false + true + + + A function to be called on a user clicking the icon. + onClick + false + true + + + The location of an image file to use in the icon. + src + false + true + + + The location of an image file to use on mouse over of the icon. This value takes precedence over the imageHover]]> attribute. This image takes precedence over icons set with the imageHover]]> attribute. + srcHover + false + true + + + A target window in which to open the URL. The default value is self]]>. Possible values are blank]]>, self]]>, parent]]>, top]]>, and a unique frame's name. + target + false + true + + + Whether to use a tooltip. The default value is true]]>. + toolTip + false + true + boolean + + + A URL to navigate to when the icon is clicked. + url + false + true + + + Whether to open the URL in a dialog window. The default value is false]]>. + useDialog + false + true + boolean + + + + Creates an icon to associate with deactivating an item. + icon-deactivate + com.liferay.taglib.ui.IconDeactivateTag + JSP + + Whether to display a message on the icon's label on mouse over of the icon. The default value is false]]>. + label + false + true + boolean + + + A URL navigated to when the icon is clicked. + url + true + true + + + + Creates a configurable icon to associate with deleting or removing an item. + icon-delete + com.liferay.taglib.ui.IconDeleteTag + JSP + + Text to use in place of the text from the default deletion confirmation message language key are-you-sure-you-want-to-delete-this]]>. If the trash]]> attribute is set to true]]>, no confirmation message is shown. + confirmation + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + An ID for the component instance. + id + false + true + + + An image for the icon, from the current theme. The value can be the filename prefix of any image file in the theme's common]]> image folder. The image takes precedence over any default icon images. + image + false + true + + + Whether to display the message]]> attribute's value as the icon's label. The default value is false]]>. + label + false + true + boolean + + + Text to display on mouse over of the icon. + message + false + true + + + An HTTP request method to invoke. Possible values are get]]> and post]]>. + method + false + true + + + Whether to use the trash icon instead of the remove icon. The default value isfalse]]>. + trash + false + true + boolean + + + A URL navigated to when the icon is clicked. + url + true + true + + + + Creates a help icon that displays a custom message as a tooltip on mouse over of the help icon. + icon-help + com.liferay.taglib.ui.IconHelpTag + JSP + + Text to be displayed on mouse over of the icon. + message + true + true + + + + Creates a list of icons from a list of child components. + icon-list + com.liferay.taglib.ui.IconListTag + JSP + + Whether to render the icon list when there is only one child component. The default value is false]]>. + showWhenSingleIcon + false + true + boolean + + + + Creates an icon menu from a list of child components. + icon-menu + com.liferay.taglib.ui.IconMenuTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + A position from which to pop up the icon menu dialog in relation to the trigger. The default direction is left]]>. Possible values are up]]>, down]]>, left]]> or right]]>. + direction + false + true + + + Whether to disable the icon menu. + disabled + false + true + boolean + + + Whether to extend the icon menu trigger by wrapping it in a button. The default value is true]]>. + extended + false + true + boolean + + + The location of an image file to use in the icon. + icon + false + true + + + An ID for the component instance. + id + false + true + + + Whether to translate the message to the user's language. The default value is true]]>. + localizeMessage + false + true + boolean + + + The number of items to show in the icon menu before scrolling. The default value is 15. + maxDisplayItems + false + true + int + + + Text to display next to the icon menu trigger. The default value is actions]]>. + message + false + true + + + Whether to add the select]]> CSS class to the icon menu. If set to true]]>, the selected icon is added to the icon menu's trigger when the icon is selected. The default value is false]]>. + select + false + true + boolean + + + Whether to extend the icon menu by default. The default value is false]]>. + showExpanded + false + true + boolean + + + Whether to show an arrow, indicating a popup dialog, next to the icon menu's trigger icon. The default value is true]]>. + showArrow + false + true + boolean + + + Whether to show the icon menu when there is only one icon. The default value is false]]>. + showWhenSingleIcon + false + true + boolean + + + A CSS class for styling the trigger for the icon menu. The default value is btn btn-default]]>. + triggerCssClass + false + true + + + Whether the icon menu drop-down caret points to the direction set by the direction]]> attribute. + useIconCaret + false + true + boolean + + + + input-asset-links + com.liferay.taglib.ui.InputAssetLinksTag + JSP + + assetEntryId + false + true + + + className + false + true + + + classPK + false + true + + + + Creates a configurable input checkbox. + input-checkbox + com.liferay.taglib.ui.InputCheckBoxTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + Whether the checkbox is selected by default. + defaultValue + false + true + boolean + + + Whether the checkbox is disabled. + disabled + false + true + boolean + + + A name for the checkbox's form. + formName + false + true + + + An ID for the component instance. + id + false + true + + + A function to be called on a user clicking the checkbox. + onClick + false + true + + + A variable name for the component. + param + true + true + + + + Creates a date input field that displays a calendar for date selection. + input-date + com.liferay.taglib.ui.InputDateTag + JSP + + Whether the date field gets focus by default. The default value is false]]>. + autoFocus + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + A variable name to refer to the day of the component. + dayParam + false + true + + + A day value to display in the input field. + dayValue + false + true + int + + + Whether to disable the namespace for the component. The default value is false]]>. + disableNamespace + false + true + boolean + + + Whether to disable the input field. The default value is false]]>. + disabled + false + true + boolean + + + A day to set as the first day of the week. The default value is Calendar.SUNDAY - 2]]>. + firstDayOfWeek + false + true + int + + + A name for the date input's form. + formName + false + true + + + A variable name to refer to the combined month and year of the component. + monthAndYearParam + false + true + + + A variable name to refer to the month of the component. + monthParam + false + true + + + The numerical value for a month to display in the input field. Integer values for the month start with 0]]>. + monthValue + false + true + int + + + A name for the date input. + name + false + true + + + Whether the component's values can be set to null. + nullable + false + true + + + A variable name to refer to the year of the component. + yearParam + false + true + + + A year value to display in the input field. + yearValue + false + true + int + + + + Creates an input field for editing rich text. + input-editor + com.liferay.taglib.ui.InputEditorTag + JSP + + A map of configuration parameters. The map holds key value pairs of type <String, String>]]>. + configParams + false + true + java.util.Map + + + The ID of a language for the input editor's text. + contentsLanguageId + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + editorImpl + false + true + + + inlineEdit + false + true + + + inlineEditSaveURL + false + true + + + A map of configuration parameters. The map holds key value pairs of <String, String>]]>. + fileBrowserParams + false + true + java.util.Map + + + height + false + true + + + initMethod + false + true + + + A name for the input editor. The default value is editor]]>. + name + false + true + + + A function to be called when the input editor loses focus. + onBlurMethod + false + true + + + A function to be called on a change in the input editor. + onChangeMethod + false + true + + + A function to be called when the input editor gets focus. + onFocusMethod + false + true + + + Whether the field for the input editor is resizable. The default value is true]]>. + resizable + false + true + boolean + + + Whether to skip loading resources necessary for the CKEditor. The default value is false]]>. + skipEditorLoading + false + true + boolean + + + A toolbar for the input editor. The default value is liferay]]>. Possible values are bbcode]]>, creole]]>, editInPlace]]>, email]]>, liferay]]>, liferayArticle]]>, phone]]>, simple]]>, and tablet]]>. + toolbarSet + false + true + + + width + false + true + + + + input-field + com.liferay.taglib.ui.InputFieldTag + JSP + + autoComplete + false + true + + + autoFocus + false + true + + + autoSize + false + true + + + bean + false + true + + + cssClass + false + true + + + dateTogglerCheckboxLabel + false + true + + + defaultLanguageId + false + true + + + defaultValue + false + true + + + disabled + false + true + + + field + true + true + + + fieldParam + false + true + + + formName + false + true + + + format + false + true + + + id + false + true + + + ignoreRequestValue + false + true + + + languageId + false + true + + + model + true + true + + + placeholder + false + true + + + + input-localized + com.liferay.taglib.ui.InputLocalizedTag + JSP + + autoFocus + false + true + + + autoSize + false + true + + + availableLocales + false + true + + + cssClass + false + true + + + defaultLanguageId + false + true + + + disabled + false + true + + + displayWidth + false + true + + + formName + false + true + + + id + false + true + + + ignoreRequestValue + false + true + + + languageId + false + true + + + maxLength + false + true + + + name + true + true + + + type + false + true + + + xml + true + true + + true + + + Creates an input move boxes component comprised of two columns of key value pairs that can be rearranged. + input-move-boxes + com.liferay.taglib.ui.InputMoveBoxesTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + A name for the left box. + leftBoxName + true + true + + + A list of key value pairs for the left box. + leftList + true + true + java.util.List + + + A function to be called on a change in selection in the left list. + leftOnChange + false + true + + + Whether the left list can be reordered. The default value is false]]>. + leftReorder + false + true + boolean + + + A title to display at the top of the right box. + leftTitle + true + true + + + A name for the right box. + rightBoxName + true + true + + + A list of key value pairs for the right box. + rightList + true + true + java.util.List + + + A function to be called on a change in selection in the right list. + rightOnChange + false + true + + + Whether the right list can be reordered. The default value is false]]>. + rightReorder + false + true + boolean + + + A title to display at the top of the right box. + rightTitle + true + true + + + + input-permissions + com.liferay.taglib.ui.InputPermissionsTag + JSP + + formName + false + true + + + modelName + false + true + + + + input-permissions-params + com.liferay.taglib.ui.InputPermissionsParamsTag + JSP + + modelName + true + true + + + + input-repeat + com.liferay.taglib.ui.InputRepeatTag + JSP + + cssClass + false + true + + + event + false + true + + + + input-resource + com.liferay.taglib.ui.InputResourceTag + JSP + + cssClass + false + true + + + id + false + true + + + title + false + true + + + url + true + true + + + + input-scheduler + com.liferay.taglib.ui.InputSchedulerTag + JSP + + + Creates a configurable search box. + input-search + com.liferay.taglib.ui.InputSearchTag + JSP + + Whether the search field gets focus by default. The default value is false]]>. + autoFocus + false + true + boolean + + + A text value for the search button's label. The default value is Search]]>. + buttonLabel + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + An ID for the component instance. The default value is displayTerms.KEYWORDS]]>. + id + false + true + + + A name for the search box. The default value is displayTerms.KEYWORDS]]>. + name + false + true + + + Placeholder text for the search field. The default value is the value of the buttonLabel]]> attribute. + placeholder + false + true + + + Whether to show the search button. The default value is true]]>. + showButton + false + true + boolean + + + A title for the search box. + title + false + true + + + Whether to use a namespace with the search button. The default value is true]]>. + useNamespace + false + true + boolean + + + + Creates a select input component with yes or no options. + input-select + com.liferay.taglib.ui.InputSelectTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + Whether to select yes]]> as the input's default value. + defaultValue + false + true + boolean + + + Whether to disable input. + disabled + false + true + boolean + + + A name for the input select's form. + formName + false + true + + + A variable name for the component. + param + true + true + + + + Creates a configurable text area input field. + input-textarea + com.liferay.taglib.ui.InputTextAreaTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + Text to display in the text area. + defaultValue + false + true + + + Whether to disable input. The default value is false]]>. + disabled + false + true + boolean + + + A variable name for the component. + param + true + true + + + + Creates a time input field that provides a scrollable dropdown list of hours, in intervals designated by the minuteInterval]]> attribute. + input-time + com.liferay.taglib.ui.InputTimeTag + JSP + + The name of the AM/PM parameter for the time input. An acceptable value is ampm]]>. + amPmParam + true + true + + + A time to AM or PM. Acceptable values are 0]]> for AM and 1]]> for PM. The default value is 0]]>. + amPmValue + false + true + int + + + A CSS class for styling the time input. + cssClass + false + true + + + A date parameter for the time input. An acceptable value is date]]>. + dateParam + false + true + + + A date to associate with the time displayed. + dateValue + false + true + java.util.Date + + + Whether the input field is disabled. + disabled + false + true + boolean + + + The name of the hour parameter for the component. An acceptable value is hour]]>. + hourParam + true + true + + + An hour value for the time displayed. The default value is 12]]>. + hourValue + false + true + int + + + A minute interval displayed in the input. The default value is 30]]>. + minuteInterval + false + true + int + + + The name of the minute parameter for the component. An acceptable value is minute]]>. + minuteParam + true + true + + + A minute value for the time displayed. The default value is 00]]>. + minuteValue + false + true + int + + + A name for the time input. + name + false + true + + + + Creates a configurable timezone drop-down menu. + input-time-zone + com.liferay.taglib.ui.InputTimeZoneTag + JSP + + Whether the field gets focus by default. + autoFocus + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + Whether to consider daylight savings for the times. The default value is true]]>. + daylight + false + true + boolean + + + Whether the field is disabled. + disabled + false + true + boolean + + + A style number corresponding to the time zone. A value of 0]]> displays the time zone's abbreviated name and a value of 1]]> displays its full name, e.g. "Pacific Standard Time." The default value is 0]]>. + displayStyle + false + true + int + + + A name for the component. + name + true + true + + + Whether the times can be null. + nullable + false + true + boolean + + + The ID of a time zone to associate with the component. For example, setting the value to PST]]> associates the component with the Pacific Standard Time zone. + value + false + true + + + + journal-article + com.liferay.taglib.ui.JournalArticleTag + JSP + + articleId + false + true + + + articlePage + false + true + + + articleResourcePrimKey + false + true + + + groupId + false + true + + + languageId + false + true + + + showAvailableLocales + false + true + + + showTitle + false + true + + + templateId + false + true + + + xmlRequest + false + true + + + + journal-content-search + com.liferay.taglib.ui.JournalContentSearchTag + JSP + + showListed + false + true + + + targetPortletId + false + true + + + type + false + true + + + + language + com.liferay.taglib.ui.LanguageTag + JSP + + displayCurrentLocale + false + true + + + displayStyle + false + true + + + formAction + false + true + + + formName + false + true + + + languageId + false + true + + + languageIds + false + true + + + name + false + true + + + + logo-selector + com.liferay.taglib.ui.LogoSelectorTag + JSP + + currentLogoURL + false + true + + + defaultLogoURL + false + true + + + editLogoURL + false + true + + + imageId + false + true + + + logoDisplaySelector + false + true + + + showBackground + false + true + + + + membership-policy-error + com.liferay.taglib.ui.MembershipPolicyErrorTag + JSP + + + Creates a message to display to the user. + message + com.liferay.taglib.ui.MessageTag + JSP + + Arguments for the language key, if the language key is configured to recieve arguments. + arguments + false + true + + + The name of a language key from which to derive the message to be displayed. + key + true + true + + + Whether to translate the language key value into the user's language. The default value is true]]>. + localizeKey + false + true + boolean + + + Whether to translate the arguments into the user's language. The default value is true]]>. + translateArguments + false + true + boolean + + + unicode + false + true + boolean + + + + my-sites + com.liferay.taglib.ui.MySitesTag + JSP + + classNames + false + true + + + cssClass + false + true + + + includeControlPanel + false + true + + + max + false + true + + + + navigation + com.liferay.taglib.ui.NavigationTag + JSP + + bulletStyle + false + true + + + displayStyle + false + true + + + headerType + false + true + + + includedLayouts + false + true + + + nestedChildren + false + true + + + preview + false + true + + + rootLayoutLevel + false + true + + + rootLayoutType + false + true + + + + Creates a page iterator for paginating through lists of items. + page-iterator + com.liferay.taglib.ui.PageIteratorTag + JSP + + Which page of items to display (e.g., first, second, third, etc.). + cur + true + true + int + + + A variable name to refer to the cur]]> value of the component. + curParam + true + true + + + The number of items to display per page. + delta + false + true + int + + + Whether the user can choose the number of items displayed per page. The default value is false]]>. + deltaConfigurable + false + true + boolean + + + A variable name to refer to the delta value of the component. + deltaParam + false + true + + + A name for the form. + formName + false + true + + + An ID for the component instance. + id + false + true + + + JavaScript to be called when the first]]>, previous]]>, next]]>, or last]]> links are clicked if the URL property is not set. + jsCall + false + true + + + A maximum number of pages to iterate through. + maxPages + false + true + int + + + A target for the first]]>, previous]]>, next]]>, and last]]> link buttons. + target + false + true + + + The total number of items in the iterator. + total + true + true + int + + + A type of iterator to display. Options are approximate]]>, article]]>, more]]>, and regular]]>. + type + false + true + + + A base URL for the iterator. Parameters are added to and removed from this URL as the user navigates through pages. + url + false + true + + + + Creates a collapsible panel for housing content. + panel + com.liferay.taglib.ui.PanelTag + JSP + + Whether the panel can be collapsed. The default value is true]]>. + collapsible + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + A default state for the component. Possible values are open]]> and any string other than open. Any string other than open]]> collapses the panel. The default value is open]]>. + defaultState + false + true + + + Whether the panel is extended. The default value is false]]>. + extended + false + true + boolean + + + Text to display as a help tool tip on mouse over of the panel's help icon. + helpMessage + false + true + + + An icon to display next to the panel's title. The icon can be specified using the name of one of the Bootstrap icon CSS classes found at http://marcoceppi.github.io/bootstrap-glyphicons/]]>. + iconCssClass + false + true + + + An ID for the component instance. + id + false + true + + + The ID of the component that contains the panel. If a liferay-ui:panel-container]]> is used as the container for the panel, its ID is used as the value for the parentID]]>. + parentId + false + true + + + Whether to remember the component's state and persist it to the database. The default value is false]]>. + persistState + false + true + boolean + + + A state for the component. Possible values are open]]> and any string other than open. Any string other than open]]> collapses the panel. + state + false + true + + + A title to display at the top of the panel. + title + true + true + + + + Creates a collapsible container to house liferay-ui:panel]]> components. + panel-container + com.liferay.taglib.ui.PanelContainerTag + JSP + + Whether only one panel can be shown at a time. As one panel is opened, the others close, creating an accordian effect. The default value is false]]>. + accordion + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + Whether to extend the interface with additional styling. The default value is false]]>. + extended + false + true + boolean + + + An ID for the component instance. + id + false + true + + + Whether to remember the component's state and persist it to the database. The default value is false]]>. + persistState + false + true + boolean + + + + param + com.liferay.taglib.util.ParamTag + JSP + + name + true + true + + + value + true + true + + + + Renders a PNG image with the source given for the image]]> attribute. + png-image + com.liferay.taglib.ui.PngImageTag + JSP + + The height of the image in pixels. A possible value would be 16]]>. px]]> is then appended to the end of the value. + height + true + true + int + + + The location of a PNG image file to use. + image + true + true + + + The height of the image in pixels. A possible value would be 16]]>. px]]> is then appended to the end of the value. + width + true + true + int + + + + progress + com.liferay.taglib.ui.ProgressTag + JSP + + height + false + true + + + id + true + true + + + message + false + true + + + sessionKey + true + true + + + updatePeriod + false + true + + + + ratings + com.liferay.taglib.ui.RatingsTag + JSP + + className + true + true + + + classPK + true + true + + + numberOfStars + false + true + + + ratingsEntry + false + true + + + ratingsStats + false + true + + + type + false + true + + + url + false + true + + + + ratings-score + com.liferay.taglib.ui.RatingsScoreTag + JSP + + score + true + true + + + + restore-entry + com.liferay.taglib.ui.RestoreEntryTag + JSP + + duplicateEntryAction + false + true + + + overrideMessage + false + true + + + renameMessage + false + true + + + restoreEntryAction + false + true + + + + Creates a clickable link and/or icon to an RSS feed document. + rss + com.liferay.taglib.ui.RSSTag + JSP + + A default maximum number of items to display. The default value is 20]]>. + delta + false + true + int + + + A default style to display. + displayStyle + false + true + + + A default format for the RSS feed. Options are atom_1.0]]>, rss_1.0]]>, and rss_2.0]]>. + feedType + false + true + + + A message to display next to the RSS icon. + message + false + true + + + A name for the RSS feed. + name + false + true + + + A URL from which to retrieve feed information. + resourceURL + false + true + + + The URL for an RSS feed file. + url + false + true + + + + Creates a configuration component for users to define RSS settings, such as how many articles to display. + rss-settings + com.liferay.taglib.ui.RSSSettingsTag + JSP + + A default maximum number of items to display. The default value is 20]]>. + delta + false + true + int + + + A default style to display. + displayStyle + false + true + + + Available RSS display styles from which the user can choose. Options are abstract]]>, full-content]]>, and title]]>. + displayStyles + false + true + + + Whether users are able to subscribe. Default value is false]]>. + enabled + false + true + boolean + + + A default format for the RSS feed. Options are atom_1.0]]>, rss_1.0]]>, and rss_2.0]]>. + feedType + false + true + + + A name for the component. + name + false + true + + + Whether the RSS feed has a name. The default value is false]]>. + nameEnabled + false + true + boolean + + + + Creates a search form, with an additional select input to set the scope of the search. + search + com.liferay.taglib.ui.SearchTag + JSP + + + Creates a grid for displaying a list of objects and their properties. + search-container + com.liferay.taglib.ui.SearchContainerTag + com.liferay.taglib.ui.SearchContainerTei + JSP + + A variable for the search container's pagination. Different pagination variables ensure independent pagination when multiple search containers are on a JSP. + curParam + false + true + + + The number of items to show on each search container page. + delta + false + true + int + + + The delta]]> attribute as configurable by users. + deltaConfigurable + false + true + + + deltaParam + false + true + + + displayTerms + false + true + + + A message displayed when the search container is empty. + emptyResultsMessage + false + true + + + headerNames + false + true + + + hover + false + true + + + id + false + true + + + iteratorURL + false + true + + + orderByCol + false + true + + + orderByColParam + false + true + + + orderByComparator + false + true + + + An order type for the columns, either ascending or descending. Values are asc]]> or desc]]>. + orderByType + false + true + + + orderByTypeParam + false + true + + + Inserts a checkbox column in the search container. Value must be a RowChecker]]> object. + rowChecker + false + true + + + searchContainer + false + true + + + searchTerms + false + true + + + The total number of objects in the search container. + total + false + true + int + + + A variable name for the results of the total]]> attribute. The default is total]]>. + totalVar + false + true + + + A variable name for the SearchContainer]]> object. The default is searchContainer]]>. + var + false + true + + + + search-container-column-button + com.liferay.taglib.ui.SearchContainerColumnButtonTag + JSP + + align + false + true + + + colspan + false + true + + + cssClass + false + true + + + href + true + true + + + index + false + true + + + name + false + true + + + valign + false + true + + + + Creates a date column in a search container. + search-container-column-date + com.liferay.taglib.ui.SearchContainerColumnDateTag + JSP + + A horizontal alignment for the column contents. The default is left]]>. + align + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + A URL for the items in the column. + href + false + true + + + index + false + true + + + A name for the column. + name + false + true + + + Whether to set the column as sortable. The default value is false]]>. + orderable + false + true + boolean + + + An object's property by which to sort the column. + orderableProperty + false + true + + + A property to request from the row object. + property + false + true + + + A vertical alignment for the column contents. The default is middle]]>. + valign + false + true + + + A value for the column. + value + false + true + + + + Creates a column in a search container with the contents of a JSP file. + search-container-column-jsp + com.liferay.taglib.ui.SearchContainerColumnJSPTag + JSP + + A horizontal alignment for the column contents. The default is left]]>. + align + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + index + false + true + + + name + false + true + + + The JSP file's location. + path + true + true + + + valign + false + true + + + + Creates a column in a search container for the workflow status. + search-container-column-status + com.liferay.taglib.ui.SearchContainerColumnStatusTag + JSP + + A horizontal alignment for the column contents. The default is left]]>. + align + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + A URL for the column's contents. + href + false + true + + + index + false + true + + + name + false + true + + + Whether to set the column as sortable. The default value is false]]>. + orderable + false + true + boolean + + + An object's property by which to sort the column. + orderableProperty + false + true + + + An object's property to use for the column. + property + false + true + + + A vertical alignment for the column contents. The default is middle]]>. + valign + false + true + + + A workflow status for the item. + status + false + true + + + statusByUserId + false + true + + + statusDate + false + true + + + + Creates a text column in a search container. + search-container-column-text + com.liferay.taglib.ui.SearchContainerColumnTextTag + com.liferay.taglib.ui.SearchContainerColumnTextTei + JSP + + A horizontal alignment for the column contents. + align + false + true + + + A string buffer variable for constructing a URL in a scriptlet. + buffer + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + href + false + true + + + index + false + true + + + name + false + true + + + Whether to set the column as sortable. The default value is false]]>. + orderable + false + true + boolean + + + An object's property by which to sort the column. + orderableProperty + false + true + + + property + false + true + + + target + false + true + + + title + false + true + + + Whether to automatically translate values. The default value is false]]>. + translate + false + true + boolean + + + A vertical alignment for the column contents. The default is middle]]>. + valign + false + true + + + value + false + true + + + + The list of objects to display in the search container. + search-container-results + com.liferay.taglib.ui.SearchContainerResultsTag + com.liferay.taglib.ui.SearchContainerResultsTei + JSP + + A list of objects to display in the search container. + results + false + true + + + A variable to use for the results. + resultsVar + false + true + + + Deprecated as of 6.2.0, replaced by liferay-ui:search-container#total + total + false + true + + + Deprecated as of 6.2.0, replaced by liferay-ui:search-container#totalVar + totalVar + false + true + + + + Creates rows in the search container for each object returned by liferay-ui:search-container-results]]>. + search-container-row + com.liferay.taglib.ui.SearchContainerRowTag + com.liferay.taglib.ui.SearchContainerRowTei + JSP + + bold + false + true + + + The class name of the objects to display in rows. + className + true + true + + + The returned model instances as HTML escaped. + escapedModel + false + true + + + A variable name to use for the rows' index. + indexVar + false + true + + + A property to use as the primary key for the object type in the className]]> attribute. + keyProperty + false + true + + + A variable name to use for each object as the search container iterates through the objects returned by liferay-ui:search-container-results]]>. + modelVar + false + true + + + A model property to use as the row ID. + rowIdProperty + false + true + + + A variable name to use for the rows. + rowVar + false + true + + + servletContext + false + true + + + stringKey + false + true + + + + Creates parameters for rows in the search container. The liferay-ui:search-container-row]]> tag is required. + search-container-row-parameter + com.liferay.taglib.ui.SearchContainerRowParameterTag + JSP + + A name for the row parameter. + name + true + true + + + A value for the row parameter. + value + true + true + + + + search-form + com.liferay.taglib.ui.SearchFormTag + JSP + + page + true + true + + + searchContainer + false + true + + + servletContext + false + true + + + showAddButton + false + true + + + + Creates a search results page iterator with an optional paginator. + search-iterator + com.liferay.taglib.ui.SearchIteratorTag + JSP + + Whether to add a liferay-ui:search-paginator]]> to the search container. The default value is true]]>. + paginate + false + true + boolean + + + All configurable properties of the search container, such as cur]]> and curParam]]>. These properties are set with searchContainer.getCur()]]> and searchContainer.getCurParam()]]> respectively. + searchContainer + false + true + + + A type of iterator to display. Options are approximate]]>, article]]>, more]]>, and regular]]>. + type + false + true + + + + Creates a page iterator to paginate through search results + search-paginator + com.liferay.taglib.ui.SearchPaginatorTag + JSP + + An ID for the component instance. + id + false + true + + + All configurable porperties of the search container, such as cur]]> and curParam]]>. These properties are set with searchContainer.getCur()]]> and searchContainer.getCurParam()]]> respectively. + searchContainer + true + true + + + A type of iterator to display. Options are approximate]]>, article]]>, more]]>, and regular]]>. + type + false + true + + + + search-speed + com.liferay.taglib.ui.SearchSpeedTag + JSP + + hits + true + true + + + searchContainer + true + true + + + + Creates a search instance that can be toggled between basic and advanced search. + search-toggle + com.liferay.taglib.ui.SearchToggleTag + JSP + + Whether the search input field is automatically focused. The default value is false]]>. + autoFocus + false + true + boolean + + + A label for the search button such as Search]]> or Go]]>. + buttonLabel + false + true + + + Terms to be used and displayed through the search instance. Term examples include keywords]]>, advancedSearch]]>, and description]]>. + displayTerms + true + true + + + The component instance's ID. + id + true + true + + + width + false + true + + + + section + com.liferay.taglib.ui.SectionTag + com.liferay.taglib.ui.SectionTei + JSP + + + sites-directory + com.liferay.taglib.ui.SitesDirectoryTag + JSP + + displayStyle + false + true + + + sites + false + true + + + + social-activities + com.liferay.taglib.ui.SocialActivitiesTag + JSP + + activities + false + true + + + className + false + true + + + classPK + false + true + + + displayRSSFeed + false + true + + + feedDelta + false + true + + + feedDisplayStyle + false + true + + + feedEnabled + false + true + + + feedLink + false + true + + + feedLinkMessage + false + true + + + feedTitle + false + true + + + feedType + false + true + + + + social-bookmark + com.liferay.taglib.ui.SocialBookmarkTag + JSP + + contentId + false + true + + + target + false + true + + + title + true + true + + + type + true + true + + + url + true + true + + + + social-bookmarks + com.liferay.taglib.ui.SocialBookmarksTag + JSP + + contentId + false + true + + + displayStyle + false + true + + + target + false + true + + + title + true + true + + + types + false + true + + + url + true + true + + + + staging + com.liferay.taglib.ui.StagingTag + JSP + + cssClass + false + true + + + extended + false + true + + + groupId + false + true + + + icon + false + true + + + layoutSetBranchId + false + true + + + message + false + true + + + onlyActions + false + true + + + privateLayout + false + true + + + selPlid + false + true + + + showManageBranches + false + true + + + + Creates a success message to display to the user. + success + com.liferay.taglib.ui.SuccessTag + empty + + A key to be placed in the SessionMessages]]> object to trigger the success message. + key + true + true + + + Explicit message text or the name of a language key from which to derive the message text. + message + true + true + + + Whether to translate the success message into the user's language. The default value is true]]>. + translateMessage + false + true + boolean + + + + table-iterator + com.liferay.taglib.ui.TableIteratorTag + com.liferay.taglib.ui.TableIteratorTei + JSP + + bodyPage + false + true + + + list + true + true + + + listType + true + true + + + rowBreak + false + true + + + rowLength + true + true + + + rowPadding + false + true + + + rowValign + false + true + + + width + false + true + + + + Creates a tabbed UI of section dividers that each house their own content. + tabs + com.liferay.taglib.ui.TabsTag + JSP + + + A label for the back URL. + backLabel + false + true + + + A URL for navigating back to. + backURL + false + true + + + A name for the tab's form. + formName + false + true + + + The names of the tabs. Each name must be separated by a comma with no spaces. + names + true + true + + + A function to be called on a user clicking any of the tabs. + onClick + false + true + + + A variable for the component. + param + false + true + + + A URL to refer to the portlet that contains the component. + portletURL + false + true + + + Whether the page refreshes when a tab is clicked. + refresh + false + true + boolean + + + Tab values that must follow the same order as the names]]> attribute. Each value must be separated by a comma with no spaces. + tabsValues + false + true + + + A design type for the tabs. Possible values are tabs]]> and pills]]>. + type + false + true + + + A URL to which all the tabs are linked when clicked. You can also set each tab's URL individually using url[number]]]> attribute. + url + false + true + + + url0 + false + true + + + A URL to which the second tab is linked when clicked. + url1 + false + true + + + A URL to which the third tab is linked when clicked + url2 + false + true + + + A URL to which the fourth tab is linked when clicked + url3 + false + true + + + A URL to which the fifth tab is linked when clicked + url4 + false + true + + + A URL to which the sixth tab is linked when clicked + url5 + false + true + + + A URL to which the seventh tab is linked when clicked + url6 + false + true + + + A URL to which the eighth tab is linked when clicked + url7 + false + true + + + A URL to which the ninth tab is linked when clicked + url8 + false + true + + + A URL to which the tenth tab is linked when clicked + url9 + false + true + + + An active tab from the value given in the attribute tabsValues]]>. No matter which tab a user selects, the tab given for this value always remains active. + value + false + true + + + + Creates a component that toggles the visibility of the content of the component matching the given id]]>. Default icons are used as the component's default mechanism for showing and hiding the content. + toggle + com.liferay.taglib.ui.ToggleTag + JSP + + Whether to initially show content by default. The default value is true]]>. + defaultShowContent + false + true + boolean + + + An icon to use as the mechanism for hiding the content. You can specify the location of an image file to use in the icon; otherwise a default icon is used. + hideImage + false + true + + + Text to display as a link for hiding the content. It overrides the hideImage]]> attribute. Note that the showMessage]]> attribute must also be configured in order for the hide message to render. + hideMessage + false + true + + + The ID of a component instance whose content's visibility to toggle. + id + true + true + + + An icon to use as the mechanism for showing the content. You can specify the location of an image file to use in the icon; otherwise a default icon is used. + showImage + false + true + + + A link to use as the mechanism for showing the content. The text value of this attribute is used as the link's text. The message takes precedence over showing an image, via the showImage]]> attribute. If you specify a showMessage]]> attribute, you should also specify the hideMessage]]> attribute; a null]]> is otherwise displayed for the text of the hide link. + showMessage + false + true + + + Text to be prefixed to the Toggle()]]> function that is called to toggle visibility of the content. If this is not configured, a random key is generated and prefixed to the Toggle()]]> function. For example, a value of run]]> would result in a function named runToggle()]]>. + stateVar + false + true + + + + toggle-area + com.liferay.taglib.ui.ToggleAreaTag + JSP + + align + false + true + + + defaultShowContent + false + true + + + hideImage + false + true + + + hideMessage + false + true + + + id + false + true + + + showImage + false + true + + + showMessage + false + true + + + stateVar + false + true + + + + toggle-value + com.liferay.taglib.ui.ToggleValueTag + JSP + + defaultValue + false + true + + + id + true + true + + + + Creates a component for users to permanently delete items such as images, articles, etc. from the recycle bin. + trash-empty + com.liferay.taglib.ui.TrashEmptyTag + empty + + A message to display to confirm that the user wants to remove the item(s) from the recycle bin. + confirmMessage + false + true + + + A message to be used for the empty-trash]]> button and link. + emptyMessage + false + true + + + A message to display to give users information about removing items from the recycle bin. + infoMessage + false + true + + + A URL for the empty-trash]]> button/link. + portletURL + true + true + + + The number of items to be removed from the recycle bin. + totalEntries + true + true + int + + + + Creates a message confirming items were moved to the recycle bin and presenting an option to restore them. + trash-undo + com.liferay.taglib.ui.TrashUndoTag + empty + + The URL of the undo link. + portletURL + true + true + + + A redirect URL. + redirect + false + true + + + + upload-progress + com.liferay.taglib.ui.UploadProgressTag + JSP + + height + false + true + + + id + true + true + + + message + false + true + + + redirect + false + true + + + updatePeriod + false + true + + + + user-display + com.liferay.taglib.ui.UserDisplayTag + com.liferay.taglib.ui.UserDisplayTei + JSP + + displayStyle + false + true + + + url + false + true + + + userId + true + true + + + userName + false + true + + + + user-search + com.liferay.taglib.ui.UserSearchTag + JSP + + portletURL + true + true + + + rowChecker + false + true + + + userParams + true + true + + + + webdav + com.liferay.taglib.ui.WebDAVTag + JSP + + path + true + true + + + + write + com.liferay.taglib.ui.WriteTag + JSP + + bean + true + true + + + property + true + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-util.tld b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-util.tld new file mode 100644 index 00000000..72a4caf0 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/tld/liferay-util.tld @@ -0,0 +1,141 @@ + + + + + 1.2 + 1.1 + liferay-util + http://liferay.com/tld/util + + body-bottom + com.liferay.taglib.util.BodyBottomTag + JSP + + outputKey + false + true + + + + body-top + com.liferay.taglib.util.BodyTopTag + JSP + + outputKey + false + true + + + + buffer + com.liferay.taglib.util.BufferTag + com.liferay.taglib.util.BufferTei + JSP + + var + true + true + + + + get-url + com.liferay.taglib.util.GetUrlTag + com.liferay.taglib.util.GetUrlTei + JSP + + expires + false + true + + + url + true + true + + + var + false + true + + + + html-bottom + com.liferay.taglib.util.HtmlBottomTag + JSP + + outputKey + false + true + + + position + false + true + + + + html-top + com.liferay.taglib.util.HtmlTopTag + JSP + + outputKey + false + true + + + position + false + true + + + + include + com.liferay.taglib.util.IncludeTag + JSP + + page + true + true + + + portletId + false + true + + + servletContext + false + true + + + strict + false + true + + + useCustomPage + false + true + + + + param + com.liferay.taglib.util.ParamTag + JSP + + name + true + true + + + value + true + true + + + + whitespace-remover + com.liferay.taglib.util.WhitespaceRemoverTag + JSP + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/web.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/web.xml new file mode 100644 index 00000000..1aa8cdb8 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/web.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/css/main.css b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/css/main.css new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/altri_task.jsp b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/altri_task.jsp new file mode 100644 index 00000000..de9115ed --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/altri_task.jsp @@ -0,0 +1,253 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="com.liferay.portal.kernel.util.GetterUtil"%> +<%@page import="com.liferay.portal.kernel.util.ParamUtil"%> +<%@page import="javax.portlet.PortletURL"%> +<%@page import="com.liferay.portal.kernel.search.Document"%> +<%@page import="com.liferay.portal.kernel.search.Hits"%> +<%@page import="it.nextmind.liferay.portos.advanced.operation.util.IndexField"%> +<%@page import="it.nextmind.liferay.portos.advanced.operation.util.ControlloPraticaSearch"%> +<%@page import="java.util.ArrayList"%> +<%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%> +<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> +<%@page import="com.liferay.portal.kernel.util.StringPool"%> +<%@page import="com.liferay.portal.kernel.util.Validator"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowInstance"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowTask"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil"%> +<%@page import="com.liferay.portal.model.User"%> +<%@page import="com.liferay.portal.model.WorkflowInstanceLink"%> +<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.Generics"%> +<%@page import="it.tref.liferay.portos.bo.model.Comune"%> +<%@page import="it.tref.liferay.portos.bo.model.ControlloPratica"%> +<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> +<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> +<%@page import="it.tref.liferay.portos.bo.model.ParereGeologo"%> +<%@page import="it.tref.liferay.portos.bo.model.Provincia"%> +<%@page import="it.tref.liferay.portos.bo.model.Territorio"%> +<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> +<%@page import="it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants"%> +<%@page import="java.util.List"%> +<%@ include file="/html/init.jsp" %> + +<% +PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); +//GESTIONE RICERCA CON PAGINATORE SEARCH CONTAINER + +for (String param : ControlloPraticaSearch.getFields()) { + iteratorURL.setParameter(param, ParamUtil.getString(request, param, StringPool.BLANK)); +} +String orderByCol = ParamUtil.getString(request, "orderByCol", IndexField.NUMERO_PROGETTO); +String orderByType = ParamUtil.getString(request, "orderByType", "dec"); +request.setAttribute("tabs1", "Tab_AtriTask"); +%> + + <% + List listaControlloPratica = new ArrayList(); + Hits hits = ControlloPraticaSearch.searchFixBug(request, searchContainer.getStart(), + searchContainer.getEnd()); + for (Document doc : hits.toList()) { + String controlloPraticaId = doc.get("controlloPraticaId"); + if (Validator.isNotNull(controlloPraticaId)) { + ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.fetchControlloPratica( + GetterUtil.getLong(controlloPraticaId)); + if (Validator.isNotNull(controlloPratica)) { + listaControlloPratica.add(controlloPratica); + } + } + } + searchContainer.setTotal(hits.getLength()); + %> + + + + + + + <% + //ADT - BUG-12 Aggiunta colonna Data Esito + String currentTab = (String) request.getAttribute("tabs1"); + //Informazioni relative alla pratica + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica.getIntPraticaId()); + DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); + %> + + <% + ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica.getControlloPraticaId()); + Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio + .getCodiceProvincia()); + //Informazioni relative al workflow + WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink( + controlloPratica.getCompanyId(), controlloPratica.getGroupId(), ControlloPratica.class.getName(), + controlloPratica.getPrimaryKey()); + List listaTask = null; + WorkflowInstance workflowInstance = null; + if (workflowInstanceLink != null) { + long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId(); + workflowInstance = WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), + workflowInstanceId); + listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null, + workflowInstance.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + } + WorkflowTask task = null; + if (listaTask != null && !listaTask.isEmpty()) { + task = listaTask.get(0); + } + %> + + <% + if (task != null) { + out.print(LanguageUtil.get(pageContext,task.getName())); + User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId()); + if (userTask != null) { + out.print(" ("); + out.print(Generics.capitalizeFull(userTask.getFullName())); + out.print(StringPool.CLOSE_PARENTHESIS); + } + } else if (workflowInstance != null) { + out.print(LanguageUtil.get(pageContext, workflowInstance.getState())); + } + if (lastDettPratica != null) { + if (lastDettPratica.getTipoIntegrazione() != null) { + //BUG BO ID=14: NOME TASK SEZIONE ATTIVITÀ + if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) { + out.print(" - Integrazione #"); + out.print(lastDettPratica.getIntegrazione()); + } else if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) { + out.print(" - Variante #"); + out.print(lastDettPratica.getVarianteNumero()); + } + } + } + if (intPratica.hasRichiestaIntegrazioneAttiva()) { + out.print(StringPool.SPACE); + out.print(LanguageUtil.get(pageContext, "in-corso")); + } + %> + + + <% + out.print(ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica.getControlloPraticaId())); + if (intPratica.getStatoPratica().equals(StatoPraticaConstants.INTEGRAZIONE)) { + out.print(StringPool.SPACE); + out.print(LanguageUtil.get(pageContext, "in-corso")); + } + %> + + <%-- ADT - BUG-12 Aggiunta colonna Data Esito --%> + + + + + + <%= intPratica.getTitle(locale, true) %> + <%= Validator.isNull(intPratica.getTipoProcedura()) ? StringPool.BLANK + : "
" + LanguageUtil.get(pageContext, "label_procedura_" + intPratica.getTipoProcedura()) + + ") " + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) + + "" %> +
+ + + <% + User tecnico = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); + if (tecnico != null) { + out.print(tecnico.getFullName()); + } else { + out.print(StringPool.OPEN_BRACKET); + out.print(intPratica.getStatusByUserId()); + out.print(StringPool.CLOSE_BRACKET); + } + %> + + + - + + + + <%= intPratica.getUnitaOperativa() > 0 ? String.valueOf(intPratica.getUnitaOperativa()) : StringPool.BLANK %> + + + + + <%= provincia.getProvincia() %> - <%= comune.getDenominazione() %> + + + + <% + List tutti = ParereGeologoLocalServiceUtil + .findByIntPraticaId(intPratica.getIntPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS); + if (tutti.size() > 0) { + List inCorso = ParereGeologoLocalServiceUtil.findByIntPraticaIdInCorso( + intPratica.getIntPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS); + if (inCorso.size() > 0) { + out.print("In attesa di:
    "); + for (ParereGeologo parere : inCorso) { + String fullName; + if (parere.getGeologoUserId() != 0) { + fullName = UserLocalServiceUtil.fetchUser(parere.getGeologoUserId()).getFullName(); + } else { + fullName = "U.O. " + parere.getUnitaOperativa(); + } + %> +
  • + <%= dateFormatDate.format(parere.getCreateDate()) %>: + <%= fullName %> +
  • + <% + } + out.print("
"); + } + int espressi = 0; + int annullati = 0; + for (ParereGeologo parere : tutti) { + if (Validator.isNotNull(parere.getDtAnnullamento())) { + annullati++; + } else if (Validator.isNotNull(parere.getDtCompilazione()) + && (parere.getAssegnatoreUserId() == 0 || Validator.isNotNull(parere.getDtApprovazione()))) { + espressi++; + } + } + if (espressi == 1) { + out.print(" 1 parere già espresso"); + } else if (espressi > 1) { + out.print(" " + espressi + " pareri già espressi"); + } + if (annullati == 1) { + out.print(" 1 richiesta annullata"); + } else if (annullati > 1) { + out.print(" " + annullati + " richieste annullate"); + } + } + %> +
+
+ + <%= ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(controlloPratica + .getControlloPraticaId()) %> + + +
+ + + +
+ +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/azione_correttiva.jsp b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/azione_correttiva.jsp new file mode 100644 index 00000000..d0c0f521 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/azione_correttiva.jsp @@ -0,0 +1,36 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + +<%@include file="/html/init.jsp"%> +<% + +%> + + + + +<% + String functionRipristinaVidimata = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"ripristinaPraticaVidimata','Sei sicuro di voler ripristinare questa pratica come VIDIMATA?')"; +%> + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/init.jsp new file mode 100644 index 00000000..a7f23ce0 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/init.jsp @@ -0,0 +1,23 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="java.text.Format"%> +<%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%> +<%@page import="com.liferay.portal.kernel.util.TimeZoneUtil"%> +<%@page import="com.liferay.portal.kernel.util.LocaleUtil"%> + + +<%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<%@taglib uri="http://liferay.com/tld/aui" prefix="aui" %> +<%@taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %> +<%@taglib uri="http://liferay.com/tld/security" prefix="liferay-security" %> +<%@taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %> +<%@taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %> +<%@taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> + + + + +<% +Format dateFormatDate = FastDateFormatFactoryUtil.getDate(LocaleUtil.ITALY, TimeZoneUtil.getTimeZone("Europe/Rome")); +%> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp new file mode 100644 index 00000000..2a6794a1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp @@ -0,0 +1,339 @@ +<%@page import="com.liferay.portal.kernel.util.DateFormatFactoryUtil"%> +<%@page import="java.util.Date"%> +<%@page import="com.liferay.portal.util.PortalUtil"%> +<%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> +<%@page import="java.util.List"%> +<%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> +<%@page import="com.liferay.portal.kernel.util.StringPool"%> +<%@page import="it.nextmind.liferay.portos.advanced.operation.util.AdvancedOperationUtil"%> +<%@page import="com.liferay.portal.kernel.workflow.WorkflowHandlerUtil"%> +<%@page import="com.liferay.portal.kernel.util.Validator"%> +<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> +<%@page import="com.liferay.portal.kernel.util.ParamUtil"%> +<%@ include file="/html/init.jsp"%> + +<% + long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); + String numeroProgetto = ParamUtil.getString(request, "numeroProgetto", StringPool.BLANK); + + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); +%> + + + + + + + +

Problemi pratica

+ + + + + + +

Gestisci pratica

+ + + + Form per trovare una pratica + + + + + + + + + + + + + + + + + + + + + + <% if(Validator.isNotNull(intPratica)){ %> + + + + + + +

+ Pratica: <%= intPraticaId %> + + +

+
+
+ + +

Numero Progetto: <%= intPratica.getNumeroProgetto() %>

+
+ +

Username: <%= intPratica.getUserName() %>

+
+ +

Tipo Pratica: <%= intPratica.getTipoPratica() %>

+
+ +

ID Territorio: <%= intPratica.getTerritorioId() %>

+
+
+ + +

Tipo Procedura: <%= intPratica.getTipoProcedura() %>

+
+ +

Stato Pratica: <%= intPratica.getStatoPratica() %>

+
+ +

Validata: <%= intPratica.getValidata() %>

+
+ +

Esito Controllo: <%= intPratica.getEsitoControllo() %>

+
+
+ + +

Status: <%= intPratica.getStatus() %>

+
+
+ + <% if(AdvancedOperationUtil.hasDettPratica(intPraticaId)){ + boolean normLavoriInProprioFlag = AdvancedOperationUtil.getNormLavoriInProprioFlag(intPraticaId); + %> + + + + + + + <% + String functionLavori = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"fixLavoriInEconomia','Sei sicuro di voler cambiare i flag LAVORI IN ECONOMIA di questa pratica?')"; + %> + + + + + <% } %> + + <% if(AdvancedOperationUtil.isStatoPraticaIN(intPratica)){ %> + + + + + + <% + String functionStatus = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"fixStatusPratica','Sei sicuro di voler modificare lo status di questa pratica?')"; + %> + + + + + + <% } %> + + <% if(AdvancedOperationUtil.isPraticaAnnullata(intPratica)){ %> + + + + + + <% + String functionRipristinaVidimata = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"ripristinaPraticaVidimata','Sei sicuro di voler ripristinare questa pratica come VIDIMATA?')"; + %> + + + + + + + + + + + <% + String functionRipristinaConforme = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"ripristinaPraticaConforme','Sei sicuro di voler ripristinare questa pratica come AUTORIZZATA/CONFORME?')"; + %> + + + + + + <% } %> + +
+ +

Problemi documenti

+ +

Gestione documenti con IntPratica inestistente

+ <% + List docPraticaList = DocPraticaLocalServiceUtil.findByIntPratica(intPraticaId); + %> +

Documenti Totali: <%= docPraticaList.size() %>

+ <% + List docPraticaOrfaniList = AdvancedOperationUtil.getDocPraticaOrfani(intPraticaId); + if(!docPraticaOrfaniList.isEmpty()){ + %> + + + + + +

Documenti orfani di DettPratica: <%= docPraticaOrfaniList.size() %>

+ + <% + String functionEliminaDoc = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"deleteDocPratica','Sei sicuro di voler eliminare tutti i documenti?')"; + %> + + + + + + +
+ <% + } + %> +
+
+ <% } %> +
+ +
+
+
+ +
+ +
+ +
+ + + + A.one('#intPraticaId').on('valuechange', function(e){ + if(e.newVal <= 0 ){ + A.one('#numeroProgetto').attr('disabled', false); + } else { + A.one('#numeroProgetto').attr('disabled', true); + A.one('#numeroProgetto').val(''); + } + }); + A.one('#numeroProgetto').on('valuechange', function(e){ + if(e.newVal == "" ){ + A.one('#intPraticaId').attr('disabled', false); + } else { + A.one('#intPraticaId').attr('disabled', true); + A.one('#intPraticaId').val(''); + } + }); + + Liferay.provide( + window, + "openConfirmationDialog", + function(formName, text){ + + A.one('#confirmationModalDiv').html('

'+text+'

'); + + var modal = new A.Modal( + { + centered: true, + bodyContent: A.one('#confirmationModalDiv'), + destroyOnHide: false, + headerContent: '

Conferma azione

', + modal: true, + render: '#confirmationModal', + visible: false, + close: false + } + ).render(); + + modal.addToolbar( + [ + { + label: 'Annulla e torna indietro', + on: { + click: function() { + A.one('#confirmationModalDiv').hide(); + modal.hide(); + + } + } + }, + { + label: 'Conferma azione', + on: { + click: function() { + modal.hide(); + var form = Liferay.Form.get(formName).form; + submitForm(form); + } + } + } + ] + ); + A.one('#confirmationModalDiv').show(); + modal.show(); + } + ); + + +
+ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/icon.png b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/icon.png new file mode 100644 index 00000000..807b862c Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/icon.png differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/js/main.js b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/js/main.js new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml new file mode 100644 index 00000000..4feea605 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml.MD5 new file mode 100644 index 00000000..8de6524a --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml.MD5 @@ -0,0 +1 @@ +bbd8978cdaa2759963331e49ea986f22 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/test/integration/arquillian.xml b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/test/integration/arquillian.xml new file mode 100644 index 00000000..9413609b --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/test/integration/arquillian.xml @@ -0,0 +1,15 @@ + + + + + + 8099 + tomcat + tomcat + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/checksums/checksums.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/checksums/checksums.lock new file mode 100644 index 00000000..7cf09203 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/checksums/checksums.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 00000000..3cc28b14 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/dependencies-accessors/gc.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/executionHistory/executionHistory.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/executionHistory/executionHistory.lock new file mode 100644 index 00000000..a5588909 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/executionHistory/executionHistory.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/fileChanges/last-build.bin b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/fileChanges/last-build.bin differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/fileHashes/fileHashes.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/fileHashes/fileHashes.lock new file mode 100644 index 00000000..416fa998 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/fileHashes/fileHashes.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/gc.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/7.4.2/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 00000000..a46bc7ca Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/buildOutputCleanup/cache.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..cb2146a8 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Feb 15 14:15:46 CET 2023 +gradle.version=7.4.2 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/vcs-1/gc.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.project index 7b191d17..9714760b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.project @@ -5,6 +5,11 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.wst.jsdt.core.javascriptValidator @@ -32,5 +37,17 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + org.eclipse.buildship.core.gradleprojectnature + + + 1676466957641 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.buildship.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 00000000..378964eb --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments=--init-script C\:\\Users\\ebusu\\AppData\\Local\\Temp\\d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script C\:\\Users\\ebusu\\AppData\\Local\\Temp\\52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle --init-script C\:\\Users\\ebusu\\AppData\\Local\\Temp\\bd95fba452cd16942039615189e617a1932f63d661f1f661840274c40bc05cbb.gradle +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2)) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=C\:/Program Files/Java/jre7 +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-portlet-service.jar new file mode 100644 index 00000000..1d6905f1 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar new file mode 100644 index 00000000..e9d60ed8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml index a7be6d90..d7167b8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml index 26746469..3b654a43 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + Marco diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/audit/NoSuchAuditEventException.java b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/audit/NoSuchAuditEventException.java new file mode 100644 index 00000000..0b1a088b --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/audit/NoSuchAuditEventException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.audit; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Marco + */ +public class NoSuchAuditEventException extends NoSuchModelException { + + public NoSuchAuditEventException() { + super(); + } + + public NoSuchAuditEventException(String msg) { + super(msg); + } + + public NoSuchAuditEventException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchAuditEventException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java index 8436cb5b..14a029f4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.audit.NoSuchAuditEventException; import it.tref.liferay.portos.audit.model.AuditEvent; import it.tref.liferay.portos.audit.model.impl.AuditEventImpl; import it.tref.liferay.portos.audit.model.impl.AuditEventModelImpl; -import it.tref.liferay.portos.audit.service.persistence.AuditEventPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties index 82b8c24f..1c71764f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_AUDIT - build.number=17 - build.date=1606300425089 + build.number=19 + build.date=1675846283103 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp index 3b091aab..851b5a30 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.TextFormatter"%> <%@page import="com.liferay.portal.kernel.json.JSONArray"%> <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp index 72b2cb90..f5287023 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.TextFormatter"%> <%@page import="com.liferay.portal.kernel.json.JSONArray"%> <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp index 94e694cc..ffc929c3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%> <%@page import="com.liferay.portal.security.permission.ActionKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp index 3c18f252..3d6b7058 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%> <%@page import="com.liferay.portal.security.permission.ActionKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp index ff21f2e4..f77b3e2e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%> <%@page import="com.liferay.portal.security.permission.ActionKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp index 71379d79..f6d6d4c6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp index 646951b9..cb89ae81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp index ff47f72b..8447c350 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath index 8a8be4f4..eb2a23ce 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath @@ -1,23 +1,22 @@ - - - - + + - + - - + + + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project index 43d3ec29..37af4c91 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1679562748565 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.apache.ivyde.eclipse.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.apache.ivyde.eclipse.prefs deleted file mode 100644 index a95f7447..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.apache.ivyde.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.apache.ivyde.eclipse.standaloneretrieve= diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.core.resources.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 5d72a74b..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -encoding//docroot/html/amministrazione/tabs/territori/view.jsp=UTF-8 -encoding//docroot/html/common/import_window.jsp=UTF-8 -encoding//docroot/html/fascicolo/actions/action_toggle_sospensione.jsp=UTF-8 -encoding//docroot/html/fascicolo/navigator/header.jsp=UTF-8 -encoding//docroot/html/fascicolo/soggetto_details.jsp=UTF-8 -encoding//docroot/html/gestioneattivita/search.jsp=UTF-8 -encoding//docroot/html/paesaggistica_administration/init.jsp=UTF-8 -encoding//docroot/html/paesaggistica_administration/view.jsp=UTF-8 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index e68706c1..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - uses - - - uses - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index f4beb943..b0264dbc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,9 +1,9 @@ - - + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore index 840e7d31..4e474f1e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore @@ -1 +1,2 @@ /classes/ +/classes-service/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar new file mode 100644 index 00000000..98fd2a2a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..fdad23ea Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..49347f2e Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar new file mode 100644 index 00000000..72d73b32 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar new file mode 100644 index 00000000..36c85b7d Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar new file mode 100644 index 00000000..3553cf19 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar new file mode 100644 index 00000000..a5242ab8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml index 8234053b..5dc0d86c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index 1ea70d2e..71c87d03 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -1,6 +1,6 @@ - - + + + Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l. portos_bo 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 aae0c9c9..4456f4f3 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 @@ -317,6 +317,18 @@ public interface IntPraticaLocalService extends BaseLocalService, java.lang.String[] parameterTypes, java.lang.Object[] arguments) throws java.lang.Throwable; + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException; + + public java.util.List filtraPraticheIntegrazioni( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException; + + public java.util.List filtraPraticheAutorizzate( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public java.util.Map getTipiProcedure(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java index 52caf1c5..704fcdae 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java @@ -131,267 +131,285 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { _methodParameterTypes21 = new String[] { "java.lang.String" }; - _methodName23 = "getTipiProcedure"; + _methodName23 = "filtraPraticheStato"; - _methodParameterTypes23 = new String[] { }; + _methodParameterTypes23 = new String[] { + "java.util.Date", "java.util.Date" + }; - _methodName24 = "getVecchieProcedure"; + _methodName24 = "filtraPraticheIntegrazioni"; - _methodParameterTypes24 = new String[] { }; + _methodParameterTypes24 = new String[] { + "java.util.Date", "java.util.Date" + }; - _methodName25 = "addIntPratica"; + _methodName25 = "filtraPraticheAutorizzate"; _methodParameterTypes25 = new String[] { + "java.util.Date", "java.util.Date" + }; + + _methodName26 = "getTipiProcedure"; + + _methodParameterTypes26 = new String[] { }; + + _methodName27 = "getVecchieProcedure"; + + _methodParameterTypes27 = new String[] { }; + + _methodName28 = "addIntPratica"; + + _methodParameterTypes28 = new String[] { "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName26 = "addIntPratica"; + _methodName29 = "addIntPratica"; - _methodParameterTypes26 = new String[] { + _methodParameterTypes29 = new String[] { "long", "java.lang.String", "java.lang.String", "long", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "int", "java.util.Date", "com.liferay.portal.service.ServiceContext" }; - _methodName27 = "findByStatoPratica"; + _methodName30 = "findByStatoPratica"; - _methodParameterTypes27 = new String[] { "java.lang.String" }; + _methodParameterTypes30 = new String[] { "java.lang.String" }; - _methodName28 = "findByStatoPratica"; + _methodName31 = "findByStatoPratica"; - _methodParameterTypes28 = new String[] { "java.lang.String", "int", "int" }; + _methodParameterTypes31 = new String[] { "java.lang.String", "int", "int" }; - _methodName29 = "deleteIntPratica"; + _methodName32 = "deleteIntPratica"; - _methodParameterTypes29 = new String[] { + _methodParameterTypes32 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName30 = "cloneIntPratica"; + _methodName33 = "cloneIntPratica"; - _methodParameterTypes30 = new String[] { + _methodParameterTypes33 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName31 = "updateDelegati"; + _methodName34 = "updateDelegati"; - _methodParameterTypes31 = new String[] { + _methodParameterTypes34 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName32 = "findFascicoliNotProgetto"; + _methodName35 = "findFascicoliNotProgetto"; - _methodParameterTypes32 = new String[] { "int", "int" }; + _methodParameterTypes35 = new String[] { "int", "int" }; - _methodName33 = "countFascicoliNotProgetto"; + _methodName36 = "countFascicoliNotProgetto"; - _methodParameterTypes33 = new String[] { }; + _methodParameterTypes36 = new String[] { }; - _methodName34 = "countByPosizione"; + _methodName37 = "countByPosizione"; - _methodParameterTypes34 = new String[] { "double", "double", "int" }; + _methodParameterTypes37 = new String[] { "double", "double", "int" }; - _methodName35 = "findByPosizione"; + _methodName38 = "findByPosizione"; - _methodParameterTypes35 = new String[] { "double", "double", "int" }; + _methodParameterTypes38 = new String[] { "double", "double", "int" }; - _methodName36 = "findByPosizione"; + _methodName39 = "findByPosizione"; - _methodParameterTypes36 = new String[] { + _methodParameterTypes39 = new String[] { "double", "double", "int", "int", "int" }; - _methodName37 = "addNumeroProgetto"; + _methodName40 = "addNumeroProgetto"; - _methodParameterTypes37 = new String[] { "long" }; + _methodParameterTypes40 = new String[] { "long" }; - _methodName38 = "sospendiPratica"; + _methodName41 = "sospendiPratica"; - _methodParameterTypes38 = new String[] { "long", "boolean" }; + _methodParameterTypes41 = new String[] { "long", "boolean" }; - _methodName39 = "cambiaTitolare"; + _methodName42 = "cambiaTitolare"; - _methodParameterTypes39 = new String[] { + _methodParameterTypes42 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName40 = "updateStatoPratica"; + _methodName43 = "updateStatoPratica"; - _methodParameterTypes40 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes43 = new String[] { "long", "java.lang.String" }; - _methodName41 = "findByC_UserId"; + _methodName44 = "findByC_UserId"; - _methodParameterTypes41 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes44 = new String[] { "long", "long", "int", "int" }; - _methodName42 = "countByC_UserId"; + _methodName45 = "countByC_UserId"; - _methodParameterTypes42 = new String[] { "long", "long" }; + _methodParameterTypes45 = new String[] { "long", "long" }; - _methodName43 = "updateStatus"; + _methodName46 = "updateStatus"; - _methodParameterTypes43 = new String[] { "long", "int" }; + _methodParameterTypes46 = new String[] { "long", "int" }; - _methodName44 = "findByCompanyIdSoggettoProgetti"; + _methodName47 = "findByCompanyIdSoggettoProgetti"; - _methodParameterTypes44 = new String[] { "long", "long" }; + _methodParameterTypes47 = new String[] { "long", "long" }; - _methodName45 = "countByCompanyIdSoggettoProgetti"; + _methodName48 = "countByCompanyIdSoggettoProgetti"; - _methodParameterTypes45 = new String[] { "long", "long" }; + _methodParameterTypes48 = new String[] { "long", "long" }; - _methodName46 = "findByCompanyIdSoggettoArchivio"; + _methodName49 = "findByCompanyIdSoggettoArchivio"; - _methodParameterTypes46 = new String[] { "long", "long" }; + _methodParameterTypes49 = new String[] { "long", "long" }; - _methodName47 = "countByCompanyIdSoggettoArchivio"; + _methodName50 = "countByCompanyIdSoggettoArchivio"; - _methodParameterTypes47 = new String[] { "long", "long" }; + _methodParameterTypes50 = new String[] { "long", "long" }; - _methodName48 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName51 = "findByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes48 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes51 = new String[] { "long", "long", "int", "int" }; - _methodName49 = "countByCompanyIdSoggettoAltriProgetti"; + _methodName52 = "countByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes49 = new String[] { "long", "long" }; + _methodParameterTypes52 = new String[] { "long", "long" }; - _methodName50 = "findByCanAddFineLavori"; + _methodName53 = "findByCanAddFineLavori"; - _methodParameterTypes50 = new String[] { + _methodParameterTypes53 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName51 = "countByCanAddFineLavori"; + _methodName54 = "countByCanAddFineLavori"; - _methodParameterTypes51 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes54 = new String[] { "long", "java.lang.String" }; - _methodName52 = "findByCanAddCollaudo"; + _methodName55 = "findByCanAddCollaudo"; - _methodParameterTypes52 = new String[] { + _methodParameterTypes55 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName53 = "countByCanAddCollaudo"; + _methodName56 = "countByCanAddCollaudo"; - _methodParameterTypes53 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes56 = new String[] { "long", "java.lang.String" }; - _methodName54 = "search"; + _methodName57 = "search"; - _methodParameterTypes54 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes57 = new String[] { "java.util.List", "int", "int" }; - _methodName55 = "countSearch"; + _methodName58 = "countSearch"; - _methodParameterTypes55 = new String[] { "java.util.List" }; + _methodParameterTypes58 = new String[] { "java.util.List" }; - _methodName56 = "searchWithIntPraticaId"; + _methodName59 = "searchWithIntPraticaId"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes59 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName57 = "allegaFileAnnullamento"; + _methodName60 = "allegaFileAnnullamento"; - _methodParameterTypes57 = new String[] { + _methodParameterTypes60 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName58 = "generateFileAnnullamento"; + _methodName61 = "generateFileAnnullamento"; - _methodParameterTypes58 = new String[] { + _methodParameterTypes61 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName59 = "deleteFileAnnullamento"; + _methodName62 = "deleteFileAnnullamento"; - _methodParameterTypes59 = new String[] { "long" }; + _methodParameterTypes62 = new String[] { "long" }; - _methodName60 = "completeAnnullamento"; + _methodName63 = "completeAnnullamento"; - _methodParameterTypes60 = new String[] { "long" }; + _methodParameterTypes63 = new String[] { "long" }; - _methodName61 = "cambiaIstruttore"; + _methodName64 = "cambiaIstruttore"; - _methodParameterTypes61 = new String[] { "long", "long", "long" }; + _methodParameterTypes64 = new String[] { "long", "long", "long" }; - _methodName62 = "countCaricoLavoroCF"; + _methodName65 = "countCaricoLavoroCF"; - _methodParameterTypes62 = new String[] { + _methodParameterTypes65 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName63 = "countCaricoLavoroIstruttore"; + _methodName66 = "countCaricoLavoroIstruttore"; - _methodParameterTypes63 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes66 = new String[] { "long", "java.lang.String" }; - _methodName64 = "generateReportPratica"; + _methodName67 = "generateReportPratica"; - _methodParameterTypes64 = new String[] { + _methodParameterTypes67 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName65 = "updateModifiedDate"; + _methodName68 = "updateModifiedDate"; - _methodParameterTypes65 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes68 = new String[] { "long", "java.util.Date" }; - _methodName66 = "reIndexFascicolo"; + _methodName69 = "reIndexFascicolo"; - _methodParameterTypes66 = new String[] { + _methodParameterTypes69 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName67 = "reIndexFasciolo"; + _methodName70 = "reIndexFasciolo"; - _methodParameterTypes67 = new String[] { "java.lang.String", "long" }; + _methodParameterTypes70 = new String[] { "java.lang.String", "long" }; - _methodName68 = "reIndexFasciolo"; + _methodName71 = "reIndexFasciolo"; - _methodParameterTypes68 = new String[] { "long", "long" }; + _methodParameterTypes71 = new String[] { "long", "long" }; - _methodName69 = "findByNumeroProgetto"; + _methodName72 = "findByNumeroProgetto"; - _methodParameterTypes69 = new String[] { "java.lang.String" }; + _methodParameterTypes72 = new String[] { "java.lang.String" }; - _methodName70 = "findByTerritorioId"; + _methodName73 = "findByTerritorioId"; - _methodParameterTypes70 = new String[] { "long" }; + _methodParameterTypes73 = new String[] { "long" }; - _methodName71 = "getOrganizationByIntPraticaId"; + _methodName74 = "getOrganizationByIntPraticaId"; - _methodParameterTypes71 = new String[] { "long" }; + _methodParameterTypes74 = new String[] { "long" }; - _methodName72 = "hasRichiestaIntegrazioneAttiva"; + _methodName75 = "hasRichiestaIntegrazioneAttiva"; - _methodParameterTypes72 = new String[] { "long" }; + _methodParameterTypes75 = new String[] { "long" }; - _methodName73 = "invioMailNotifica"; + _methodName76 = "invioMailNotifica"; - _methodParameterTypes73 = new String[] { + _methodParameterTypes76 = new String[] { "long", "long", "java.lang.String", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName74 = "searchAltriProgetti"; + _methodName77 = "searchAltriProgetti"; - _methodParameterTypes74 = new String[] { + _methodParameterTypes77 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName75 = "searchArchivioProgetti"; + _methodName78 = "searchArchivioProgetti"; - _methodParameterTypes75 = new String[] { + _methodParameterTypes78 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName76 = "searchMieiProgetti"; + _methodName79 = "searchMieiProgetti"; - _methodParameterTypes76 = new String[] { + _methodParameterTypes79 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; @@ -1098,12 +1116,114 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { } @Override - public java.util.Map getTipiProcedure() { + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { returnObj = _invokableLocalService.invokeMethod(_methodName23, - _methodParameterTypes23, new Object[] { }); + _methodParameterTypes23, + new Object[] { + ClpSerializer.translateInput(dataInizioLavori), + + ClpSerializer.translateInput(dataFineLavori) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + + @Override + public java.util.List filtraPraticheIntegrazioni( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName24, + _methodParameterTypes24, + new Object[] { + ClpSerializer.translateInput(dataInizioLavori), + + ClpSerializer.translateInput(dataFineLavori) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + + @Override + public java.util.List filtraPraticheAutorizzate( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName25, + _methodParameterTypes25, + new Object[] { + ClpSerializer.translateInput(dataInizioLavori), + + ClpSerializer.translateInput(dataFineLavori) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + + @Override + public java.util.Map getTipiProcedure() { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName26, + _methodParameterTypes26, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1125,8 +1245,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName24, - _methodParameterTypes24, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName27, + _methodParameterTypes27, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1152,8 +1272,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName25, - _methodParameterTypes25, + returnObj = _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, new Object[] { territorioId, @@ -1197,8 +1317,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName26, - _methodParameterTypes26, + returnObj = _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { userId, @@ -1253,8 +1373,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName27, - _methodParameterTypes27, + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { ClpSerializer.translateInput(statoPratica) }); } catch (Throwable t) { @@ -1283,8 +1403,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName28, - _methodParameterTypes28, + returnObj = _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { ClpSerializer.translateInput(statoPratica), @@ -1320,8 +1440,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName29, - _methodParameterTypes29, + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { ClpSerializer.translateInput(intPratica), @@ -1360,8 +1480,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, + returnObj = _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { intPraticaId, @@ -1401,8 +1521,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, + returnObj = _invokableLocalService.invokeMethod(_methodName34, + _methodParameterTypes34, new Object[] { intPraticaId, @@ -1444,8 +1564,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName35, + _methodParameterTypes35, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1472,8 +1592,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1500,8 +1620,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName34, - _methodParameterTypes34, new Object[] { lat, lng, raggio }); + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { lat, lng, raggio }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1529,8 +1649,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName35, - _methodParameterTypes35, new Object[] { lat, lng, raggio }); + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { lat, lng, raggio }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1558,8 +1678,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { lat, lng, raggio, start, end }); } catch (Throwable t) { @@ -1589,8 +1709,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1623,8 +1743,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { intPraticaId, sospesa }); } catch (Throwable t) { @@ -1659,8 +1779,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { intPraticaId, @@ -1700,8 +1820,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { intPraticaId, @@ -1738,8 +1858,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { companyId, userId, start, end }); } catch (Throwable t) { @@ -1767,8 +1887,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, new Object[] { companyId, userId }); + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { companyId, userId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1794,8 +1914,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, new Object[] { intPraticaId, status }); + _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { intPraticaId, status }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1826,8 +1946,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1860,8 +1980,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1895,8 +2015,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1929,8 +2049,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1964,8 +2084,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { companyId, soggettoId, start, end }); } catch (Throwable t) { @@ -1999,8 +2119,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -2034,8 +2154,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { companyId, @@ -2077,8 +2197,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { companyId, @@ -2116,8 +2236,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { companyId, @@ -2159,8 +2279,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { companyId, @@ -2197,8 +2317,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2232,8 +2352,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { ClpSerializer.translateInput(groupIds) }); } catch (Throwable t) { @@ -2262,8 +2382,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2304,8 +2424,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + returnObj = _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { intPraticaId, @@ -2355,8 +2475,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, + returnObj = _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { intPraticaId, @@ -2395,8 +2515,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { docPraticaAnnullamentoId }); } catch (Throwable t) { @@ -2425,8 +2545,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2455,8 +2575,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, + _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { intPraticaId, controlloPraticaId, istruttoreId }); } catch (Throwable t) { @@ -2488,8 +2608,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + returnObj = _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { ispettoreId, @@ -2528,8 +2648,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, + returnObj = _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { ispettoreId, @@ -2563,8 +2683,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, + returnObj = _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { ClpSerializer.translateInput(intPratica), @@ -2602,8 +2722,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + returnObj = _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, new Object[] { intPraticaId, @@ -2637,8 +2757,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFascicolo( it.tref.liferay.portos.bo.model.IntPratica pratica, long companyId) { try { - _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, + _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { ClpSerializer.translateInput(pratica), companyId }); } catch (Throwable t) { @@ -2658,8 +2778,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFasciolo(java.lang.String numeroProgetto, long companyId) throws com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, + _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { ClpSerializer.translateInput(numeroProgetto), @@ -2688,8 +2808,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName68, - _methodParameterTypes68, + _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { intPraticaId, companyId }); } catch (Throwable t) { @@ -2720,8 +2840,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, + returnObj = _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { ClpSerializer.translateInput(numeroProgetto) }); } catch (Throwable t) { @@ -2750,8 +2870,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, new Object[] { territorioId }); + returnObj = _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { territorioId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2780,8 +2900,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName74, + _methodParameterTypes74, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2811,8 +2931,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName75, + _methodParameterTypes75, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2840,8 +2960,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, + _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { dettPraticaId, @@ -2892,8 +3012,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, + returnObj = _invokableLocalService.invokeMethod(_methodName77, + _methodParameterTypes77, new Object[] { ClpSerializer.translateInput(request), @@ -2926,8 +3046,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName75, - _methodParameterTypes75, + returnObj = _invokableLocalService.invokeMethod(_methodName78, + _methodParameterTypes78, new Object[] { ClpSerializer.translateInput(request), @@ -2960,8 +3080,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, + returnObj = _invokableLocalService.invokeMethod(_methodName79, + _methodParameterTypes79, new Object[] { ClpSerializer.translateInput(request), @@ -3140,4 +3260,10 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { private String[] _methodParameterTypes75; private String _methodName76; private String[] _methodParameterTypes76; + private String _methodName77; + private String[] _methodParameterTypes77; + private String _methodName78; + private String[] _methodParameterTypes78; + private String _methodName79; + private String[] _methodParameterTypes79; } \ 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/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 435b5474..2b4f28f8 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 @@ -342,6 +342,26 @@ public class IntPraticaLocalServiceUtil { return getService().invokeMethod(name, parameterTypes, arguments); } + public static java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().filtraPraticheStato(dataInizioLavori, dataFineLavori); + } + + public static java.util.List filtraPraticheIntegrazioni( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return getService() + .filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori); + } + + public static java.util.List filtraPraticheAutorizzate( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return getService() + .filtraPraticheAutorizzate(dataInizioLavori, dataFineLavori); + } + public static java.util.Map getTipiProcedure() { return getService().getTipiProcedure(); } 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 4b5f0a28..5b6c4ab8 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 @@ -362,6 +362,30 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, arguments); } + @Override + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return _intPraticaLocalService.filtraPraticheStato(dataInizioLavori, + dataFineLavori); + } + + @Override + public java.util.List filtraPraticheIntegrazioni( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return _intPraticaLocalService.filtraPraticheIntegrazioni(dataInizioLavori, + dataFineLavori); + } + + @Override + public java.util.List filtraPraticheAutorizzate( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return _intPraticaLocalService.filtraPraticheAutorizzate(dataInizioLavori, + dataFineLavori); + } + @Override public java.util.Map getTipiProcedure() { return _intPraticaLocalService.getTipiProcedure(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java index 39f3c26d..49138396 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java @@ -25,4 +25,16 @@ public interface IntPraticaFinder { public int canAddCollaudoCount( java.lang.String codiceFiscaleDelegatoCollaudo) throws com.liferay.portal.kernel.exception.SystemException; + + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException; + + public java.util.List filtraPraticheIntegrazioni( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException; + + public java.util.List filtraPraticheAutorizzate( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException; } \ 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/persistence/IntPraticaFinderUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java index ce64d4d1..f580f358 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java @@ -34,6 +34,26 @@ public class IntPraticaFinderUtil { return getFinder().canAddCollaudoCount(codiceFiscaleDelegatoCollaudo); } + public static java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return getFinder().filtraPraticheStato(dataInizioLavori, dataFineLavori); + } + + public static java.util.List filtraPraticheIntegrazioni( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return getFinder() + .filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori); + } + + public static java.util.List filtraPraticheAutorizzate( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) + throws com.liferay.portal.kernel.exception.SystemException { + return getFinder() + .filtraPraticheAutorizzate(dataInizioLavori, dataFineLavori); + } + public static IntPraticaFinder getFinder() { if (_finder == null) { _finder = (IntPraticaFinder)PortletBeanLocatorUtil.locate(it.tref.liferay.portos.bo.service.ClpSerializer.getServletContextName(), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml index 2454f7cb..3fc7c130 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml @@ -16,4 +16,40 @@ and fine.completata = true order by int.createdate; ]]> + + ? + and pbi.dtpratica < ? + group by tipoprocedura, statopratica + order by tipoprocedura, statopratica; + ]]> + + + ? + and pbi.createdate < ? + and tipodocumento = 'IN' + group by tipoprocedura order by tipoprocedura; + ]]> + + + ? + and pbi.statusdate < ? + and statopratica in ('AU', 'AN') + group by tipoprocedura, statopratica + order by tipoprocedura, statopratica; + ]]> + \ 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/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index 46cc3f46..ff2942c1 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 @@ -408,17 +408,17 @@ public class SismicaUtil { } public static List riparaWorkflow(long companyId, long userId) { - + _log.info("avvio riparaWorkflow"); List esito = new ArrayList<>(); esito.addAll(riparaControlli(companyId)); esito.addAll(riparaAssegnazioniAlRuolo(companyId, userId)); esito.addAll(creaWorkflowMancanti(companyId)); esito.addAll(riparaContextWorkflow(companyId)); - try { - esito.addAll(riparaDocumenti(companyId)); - } catch (SystemException | PortalException e) { - esitoLog(esito, "Errore durante l'elaborazione: " + e.getMessage()); - } +// try { +// esito.addAll(riparaDocumenti(companyId)); +// } catch (SystemException | PortalException e) { +// esitoLog(esito, "Errore durante l'elaborazione: " + e.getMessage()); +// } return esito; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java index d229b7d2..d054286b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java @@ -796,8 +796,8 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { } return nuoviSoggetti.size() > 0; } else { - boolean collaudatoreNotRequired = getNoCollaudo() || getCollaudoStatico(); - boolean direttoreLavoriNotRequired = getLavoriPubblici() || getNormLavoriNoDirettore(); + boolean collaudatoreNotRequired = true/*getNoCollaudo() || getCollaudoStatico()//@eabus20230321*/; + boolean direttoreLavoriNotRequired = true/*getLavoriPubblici() || getNormLavoriNoDirettore()*/; boolean dittaNotRequired = getNormLavoriInProprio() || getLavoriPubblici(); boolean progettistaNotRequired = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P9) || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q9); @@ -891,10 +891,10 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { long intPraticaId = getIntPraticaId(); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - boolean collaudatoreNotRequired = getNoCollaudo() || getCollaudoStatico() || getNormLavoriInProprio() - || getNominaCollaudatore() || getLavoriPubblici(); - boolean direttoreLavoriNotRequired = getLavoriPubblici() || getNormLavoriNoDirettore() - || getNormLavoriInProprio() || getNominaDirettoreLavori(); + boolean collaudatoreNotRequired = true/*getNoCollaudo() || getCollaudoStatico() || getNormLavoriInProprio() + || getNominaCollaudatore() || getLavoriPubblici()//@eabus20230321*/; + boolean direttoreLavoriNotRequired = true/*getLavoriPubblici() || getNormLavoriNoDirettore() + || getNormLavoriInProprio() || getNominaDirettoreLavori()*/; boolean dittaNotRequired = getNormLavoriInProprio() || getLavoriPubblici() || getNominaImpresa(); List soggettiRichiesti = new ArrayList<>(); List notCompleted = new ArrayList<>(); @@ -917,8 +917,8 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { soggettiRichiesti.add(TipoSoggettoUtil.COMMITTENTE); soggettiRichiesti.add(TipoSoggettoUtil.PROGETTISTA); soggettiRichiesti.add(TipoSoggettoUtil.DITTA); - soggettiRichiesti.add(TipoSoggettoUtil.DIRETTORE_LAVORI); - soggettiRichiesti.add(TipoSoggettoUtil.COLLAUDATORE); + //soggettiRichiesti.add(TipoSoggettoUtil.DIRETTORE_LAVORI); + //soggettiRichiesti.add(TipoSoggettoUtil.COLLAUDATORE)/*@eabus20230321*/; break; case Constants.PROCEDURA_P3: case Constants.PROCEDURA_Q3: @@ -941,17 +941,17 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { if (!isDelegaCommittente) { notCompleted.add("delega-committente"); } - boolean isDelegaFinelavori = direttoreLavoriNotRequired + /*boolean isDelegaFinelavori = direttoreLavoriNotRequired || Validator.isNotNull(getCodiceFiscaleDelegatoFineLavori()) || !soggettiRichiesti.contains(TipoSoggettoUtil.DIRETTORE_LAVORI); if (!isDelegaFinelavori) { notCompleted.add("delega-direttoreLavori"); - } - boolean isDelegaCollaudo = collaudatoreNotRequired || Validator.isNotNull(getCodiceFiscaleDelegatoCollaudo()) + }*/ + /*boolean isDelegaCollaudo = collaudatoreNotRequired || Validator.isNotNull(getCodiceFiscaleDelegatoCollaudo()) || !soggettiRichiesti.contains(TipoSoggettoUtil.COLLAUDATORE); if (!isDelegaCollaudo) { notCompleted.add("delega-collaudatore"); - } + }//@eabus20230321*/ List soggettiPratica = SoggettoLocalServiceUtil.getValidTmpByIntPratica(intPraticaId); boolean direttoreLavoriPresente = false; boolean collaudatorePresente = false; @@ -979,7 +979,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { } } } - if (direttoreLavoriNotRequired) { + /*if (direttoreLavoriNotRequired) { soggettiRichiesti.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); if (direttoreLavoriPresente && !TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(getTipoIntegrazione())) { StringBuilder sb = new StringBuilder(); @@ -1027,7 +1027,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { sb.append("\""); notCompleted.add(sb.toString()); } - } + }@eabus20230321*/ if (dittaNotRequired) { soggettiRichiesti.remove(TipoSoggettoUtil.DITTA); if (dittaPresente && !TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(getTipoIntegrazione())) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java index 45a41f83..120cc8c8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java @@ -33,7 +33,7 @@ public class SchedulerGeneraProtocollo implements MessageListener { private static final Lock lock = new ReentrantLock(); - private static final int SIZE = 10; + private static final int SIZE = 20; @Override public void receive(Message message) throws MessageListenerException { @@ -52,7 +52,8 @@ public class SchedulerGeneraProtocollo implements MessageListener { if (Validator.isNotNull(fileEntryBase)) { generaProtocollo(avviso, fileEntryBase); } - } catch (PortalException e) { + } catch (Exception e) { + _log.error(e,e); if (_log.isDebugEnabled()) { _log.debug("SchedulerGeneraProtocollo - non esiste file base | avvisoId=" + avvisoId); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java index db12a39c..96b7605c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java @@ -130,277 +130,295 @@ public class IntPraticaLocalServiceClpInvoker { _methodParameterTypes171 = new String[] { "java.lang.String" }; - _methodName176 = "getTipiProcedure"; + _methodName176 = "filtraPraticheStato"; - _methodParameterTypes176 = new String[] { }; + _methodParameterTypes176 = new String[] { + "java.util.Date", "java.util.Date" + }; - _methodName177 = "getVecchieProcedure"; + _methodName177 = "filtraPraticheIntegrazioni"; - _methodParameterTypes177 = new String[] { }; + _methodParameterTypes177 = new String[] { + "java.util.Date", "java.util.Date" + }; - _methodName178 = "addIntPratica"; + _methodName178 = "filtraPraticheAutorizzate"; _methodParameterTypes178 = new String[] { + "java.util.Date", "java.util.Date" + }; + + _methodName179 = "getTipiProcedure"; + + _methodParameterTypes179 = new String[] { }; + + _methodName180 = "getVecchieProcedure"; + + _methodParameterTypes180 = new String[] { }; + + _methodName181 = "addIntPratica"; + + _methodParameterTypes181 = new String[] { "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName179 = "addIntPratica"; + _methodName182 = "addIntPratica"; - _methodParameterTypes179 = new String[] { + _methodParameterTypes182 = new String[] { "long", "java.lang.String", "java.lang.String", "long", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "int", "java.util.Date", "com.liferay.portal.service.ServiceContext" }; - _methodName180 = "findByStatoPratica"; + _methodName183 = "findByStatoPratica"; - _methodParameterTypes180 = new String[] { "java.lang.String" }; + _methodParameterTypes183 = new String[] { "java.lang.String" }; - _methodName181 = "findByStatoPratica"; + _methodName184 = "findByStatoPratica"; - _methodParameterTypes181 = new String[] { "java.lang.String", "int", "int" }; + _methodParameterTypes184 = new String[] { "java.lang.String", "int", "int" }; - _methodName182 = "deleteIntPratica"; + _methodName185 = "deleteIntPratica"; - _methodParameterTypes182 = new String[] { + _methodParameterTypes185 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName183 = "deleteIntPratica"; + _methodName186 = "deleteIntPratica"; - _methodParameterTypes183 = new String[] { + _methodParameterTypes186 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica" }; - _methodName184 = "cloneIntPratica"; + _methodName187 = "cloneIntPratica"; - _methodParameterTypes184 = new String[] { + _methodParameterTypes187 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName186 = "updateDelegati"; + _methodName189 = "updateDelegati"; - _methodParameterTypes186 = new String[] { + _methodParameterTypes189 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName187 = "fetchIntPratica"; + _methodName190 = "fetchIntPratica"; - _methodParameterTypes187 = new String[] { "long" }; + _methodParameterTypes190 = new String[] { "long" }; - _methodName188 = "findFascicoliNotProgetto"; + _methodName191 = "findFascicoliNotProgetto"; - _methodParameterTypes188 = new String[] { "int", "int" }; + _methodParameterTypes191 = new String[] { "int", "int" }; - _methodName189 = "countFascicoliNotProgetto"; + _methodName192 = "countFascicoliNotProgetto"; - _methodParameterTypes189 = new String[] { }; + _methodParameterTypes192 = new String[] { }; - _methodName191 = "countByPosizione"; + _methodName194 = "countByPosizione"; - _methodParameterTypes191 = new String[] { "double", "double", "int" }; + _methodParameterTypes194 = new String[] { "double", "double", "int" }; - _methodName192 = "findByPosizione"; + _methodName195 = "findByPosizione"; - _methodParameterTypes192 = new String[] { "double", "double", "int" }; + _methodParameterTypes195 = new String[] { "double", "double", "int" }; - _methodName193 = "findByPosizione"; + _methodName196 = "findByPosizione"; - _methodParameterTypes193 = new String[] { + _methodParameterTypes196 = new String[] { "double", "double", "int", "int", "int" }; - _methodName195 = "addNumeroProgetto"; + _methodName198 = "addNumeroProgetto"; - _methodParameterTypes195 = new String[] { "long" }; + _methodParameterTypes198 = new String[] { "long" }; - _methodName196 = "sospendiPratica"; + _methodName199 = "sospendiPratica"; - _methodParameterTypes196 = new String[] { "long", "boolean" }; + _methodParameterTypes199 = new String[] { "long", "boolean" }; - _methodName197 = "cambiaTitolare"; + _methodName200 = "cambiaTitolare"; - _methodParameterTypes197 = new String[] { + _methodParameterTypes200 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName198 = "updateStatoPratica"; + _methodName201 = "updateStatoPratica"; - _methodParameterTypes198 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes201 = new String[] { "long", "java.lang.String" }; - _methodName199 = "findByC_UserId"; + _methodName202 = "findByC_UserId"; - _methodParameterTypes199 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes202 = new String[] { "long", "long", "int", "int" }; - _methodName200 = "countByC_UserId"; + _methodName203 = "countByC_UserId"; - _methodParameterTypes200 = new String[] { "long", "long" }; + _methodParameterTypes203 = new String[] { "long", "long" }; - _methodName201 = "updateStatus"; + _methodName204 = "updateStatus"; - _methodParameterTypes201 = new String[] { "long", "int" }; + _methodParameterTypes204 = new String[] { "long", "int" }; - _methodName202 = "findByCompanyIdSoggettoProgetti"; + _methodName205 = "findByCompanyIdSoggettoProgetti"; - _methodParameterTypes202 = new String[] { "long", "long" }; + _methodParameterTypes205 = new String[] { "long", "long" }; - _methodName203 = "countByCompanyIdSoggettoProgetti"; + _methodName206 = "countByCompanyIdSoggettoProgetti"; - _methodParameterTypes203 = new String[] { "long", "long" }; + _methodParameterTypes206 = new String[] { "long", "long" }; - _methodName205 = "findByCompanyIdSoggettoArchivio"; + _methodName208 = "findByCompanyIdSoggettoArchivio"; - _methodParameterTypes205 = new String[] { "long", "long" }; + _methodParameterTypes208 = new String[] { "long", "long" }; - _methodName206 = "countByCompanyIdSoggettoArchivio"; + _methodName209 = "countByCompanyIdSoggettoArchivio"; - _methodParameterTypes206 = new String[] { "long", "long" }; + _methodParameterTypes209 = new String[] { "long", "long" }; - _methodName208 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName211 = "findByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes208 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes211 = new String[] { "long", "long", "int", "int" }; - _methodName209 = "countByCompanyIdSoggettoAltriProgetti"; + _methodName212 = "countByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes209 = new String[] { "long", "long" }; + _methodParameterTypes212 = new String[] { "long", "long" }; - _methodName211 = "findByCanAddFineLavori"; + _methodName214 = "findByCanAddFineLavori"; - _methodParameterTypes211 = new String[] { + _methodParameterTypes214 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName212 = "countByCanAddFineLavori"; + _methodName215 = "countByCanAddFineLavori"; - _methodParameterTypes212 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes215 = new String[] { "long", "java.lang.String" }; - _methodName214 = "findByCanAddCollaudo"; + _methodName217 = "findByCanAddCollaudo"; - _methodParameterTypes214 = new String[] { + _methodParameterTypes217 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName215 = "countByCanAddCollaudo"; + _methodName218 = "countByCanAddCollaudo"; - _methodParameterTypes215 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes218 = new String[] { "long", "java.lang.String" }; - _methodName216 = "search"; + _methodName219 = "search"; - _methodParameterTypes216 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes219 = new String[] { "java.util.List", "int", "int" }; - _methodName217 = "countSearch"; + _methodName220 = "countSearch"; - _methodParameterTypes217 = new String[] { "java.util.List" }; + _methodParameterTypes220 = new String[] { "java.util.List" }; - _methodName218 = "searchWithIntPraticaId"; + _methodName221 = "searchWithIntPraticaId"; - _methodParameterTypes218 = new String[] { + _methodParameterTypes221 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName219 = "allegaFileAnnullamento"; + _methodName222 = "allegaFileAnnullamento"; - _methodParameterTypes219 = new String[] { + _methodParameterTypes222 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName220 = "generateFileAnnullamento"; + _methodName223 = "generateFileAnnullamento"; - _methodParameterTypes220 = new String[] { + _methodParameterTypes223 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName221 = "deleteFileAnnullamento"; + _methodName224 = "deleteFileAnnullamento"; - _methodParameterTypes221 = new String[] { "long" }; + _methodParameterTypes224 = new String[] { "long" }; - _methodName222 = "completeAnnullamento"; + _methodName225 = "completeAnnullamento"; - _methodParameterTypes222 = new String[] { "long" }; + _methodParameterTypes225 = new String[] { "long" }; - _methodName223 = "cambiaIstruttore"; + _methodName226 = "cambiaIstruttore"; - _methodParameterTypes223 = new String[] { "long", "long", "long" }; + _methodParameterTypes226 = new String[] { "long", "long", "long" }; - _methodName224 = "countCaricoLavoroCF"; + _methodName227 = "countCaricoLavoroCF"; - _methodParameterTypes224 = new String[] { + _methodParameterTypes227 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName225 = "countCaricoLavoroIstruttore"; + _methodName228 = "countCaricoLavoroIstruttore"; - _methodParameterTypes225 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes228 = new String[] { "long", "java.lang.String" }; - _methodName226 = "generateReportPratica"; + _methodName229 = "generateReportPratica"; - _methodParameterTypes226 = new String[] { + _methodParameterTypes229 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName227 = "updateModifiedDate"; + _methodName230 = "updateModifiedDate"; - _methodParameterTypes227 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes230 = new String[] { "long", "java.util.Date" }; - _methodName228 = "reIndexFascicolo"; + _methodName231 = "reIndexFascicolo"; - _methodParameterTypes228 = new String[] { + _methodParameterTypes231 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName229 = "reIndexFasciolo"; + _methodName232 = "reIndexFasciolo"; - _methodParameterTypes229 = new String[] { "java.lang.String", "long" }; + _methodParameterTypes232 = new String[] { "java.lang.String", "long" }; - _methodName230 = "reIndexFasciolo"; + _methodName233 = "reIndexFasciolo"; - _methodParameterTypes230 = new String[] { "long", "long" }; + _methodParameterTypes233 = new String[] { "long", "long" }; - _methodName231 = "findByNumeroProgetto"; + _methodName234 = "findByNumeroProgetto"; - _methodParameterTypes231 = new String[] { "java.lang.String" }; + _methodParameterTypes234 = new String[] { "java.lang.String" }; - _methodName232 = "findByTerritorioId"; + _methodName235 = "findByTerritorioId"; - _methodParameterTypes232 = new String[] { "long" }; + _methodParameterTypes235 = new String[] { "long" }; - _methodName233 = "getOrganizationByIntPraticaId"; + _methodName236 = "getOrganizationByIntPraticaId"; - _methodParameterTypes233 = new String[] { "long" }; + _methodParameterTypes236 = new String[] { "long" }; - _methodName234 = "hasRichiestaIntegrazioneAttiva"; + _methodName237 = "hasRichiestaIntegrazioneAttiva"; - _methodParameterTypes234 = new String[] { "long" }; + _methodParameterTypes237 = new String[] { "long" }; - _methodName235 = "invioMailNotifica"; + _methodName238 = "invioMailNotifica"; - _methodParameterTypes235 = new String[] { + _methodParameterTypes238 = new String[] { "long", "long", "java.lang.String", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName236 = "searchAltriProgetti"; + _methodName239 = "searchAltriProgetti"; - _methodParameterTypes236 = new String[] { + _methodParameterTypes239 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName237 = "searchArchivioProgetti"; + _methodName240 = "searchArchivioProgetti"; - _methodParameterTypes237 = new String[] { + _methodParameterTypes240 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName238 = "searchMieiProgetti"; + _methodName241 = "searchMieiProgetti"; - _methodParameterTypes238 = new String[] { + _methodParameterTypes241 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; @@ -533,23 +551,41 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName176.equals(name) && Arrays.deepEquals(_methodParameterTypes176, parameterTypes)) { - return IntPraticaLocalServiceUtil.getTipiProcedure(); + return IntPraticaLocalServiceUtil.filtraPraticheStato((java.util.Date)arguments[0], + (java.util.Date)arguments[1]); } if (_methodName177.equals(name) && Arrays.deepEquals(_methodParameterTypes177, parameterTypes)) { - return IntPraticaLocalServiceUtil.getVecchieProcedure(); + return IntPraticaLocalServiceUtil.filtraPraticheIntegrazioni((java.util.Date)arguments[0], + (java.util.Date)arguments[1]); } if (_methodName178.equals(name) && Arrays.deepEquals(_methodParameterTypes178, parameterTypes)) { + return IntPraticaLocalServiceUtil.filtraPraticheAutorizzate((java.util.Date)arguments[0], + (java.util.Date)arguments[1]); + } + + if (_methodName179.equals(name) && + Arrays.deepEquals(_methodParameterTypes179, parameterTypes)) { + return IntPraticaLocalServiceUtil.getTipiProcedure(); + } + + if (_methodName180.equals(name) && + Arrays.deepEquals(_methodParameterTypes180, parameterTypes)) { + return IntPraticaLocalServiceUtil.getVecchieProcedure(); + } + + if (_methodName181.equals(name) && + Arrays.deepEquals(_methodParameterTypes181, parameterTypes)) { return IntPraticaLocalServiceUtil.addIntPratica(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName179.equals(name) && - Arrays.deepEquals(_methodParameterTypes179, parameterTypes)) { + if (_methodName182.equals(name) && + Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) { return IntPraticaLocalServiceUtil.addIntPratica(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Long)arguments[3]).longValue(), @@ -561,74 +597,74 @@ public class IntPraticaLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[10]); } - if (_methodName180.equals(name) && - Arrays.deepEquals(_methodParameterTypes180, parameterTypes)) { + if (_methodName183.equals(name) && + Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) { return IntPraticaLocalServiceUtil.findByStatoPratica((java.lang.String)arguments[0]); } - if (_methodName181.equals(name) && - Arrays.deepEquals(_methodParameterTypes181, parameterTypes)) { + if (_methodName184.equals(name) && + Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) { return IntPraticaLocalServiceUtil.findByStatoPratica((java.lang.String)arguments[0], ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName182.equals(name) && - Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) { + if (_methodName185.equals(name) && + Arrays.deepEquals(_methodParameterTypes185, parameterTypes)) { return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Boolean)arguments[1]).booleanValue()); } - if (_methodName183.equals(name) && - Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) { + if (_methodName186.equals(name) && + Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0]); } - if (_methodName184.equals(name) && - Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) { + if (_methodName187.equals(name) && + Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { return IntPraticaLocalServiceUtil.cloneIntPratica(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName186.equals(name) && - Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { + if (_methodName189.equals(name) && + Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { return IntPraticaLocalServiceUtil.updateDelegati(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Boolean)arguments[3]).booleanValue()); } - if (_methodName187.equals(name) && - Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { + if (_methodName190.equals(name) && + Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) { return IntPraticaLocalServiceUtil.fetchIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName188.equals(name) && - Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) { + if (_methodName191.equals(name) && + Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { return IntPraticaLocalServiceUtil.findFascicoliNotProgetto(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName189.equals(name) && - Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { + if (_methodName192.equals(name) && + Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { return IntPraticaLocalServiceUtil.countFascicoliNotProgetto(); } - if (_methodName191.equals(name) && - Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { + if (_methodName194.equals(name) && + Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) { return IntPraticaLocalServiceUtil.countByPosizione(((Double)arguments[0]).doubleValue(), ((Double)arguments[1]).doubleValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName192.equals(name) && - Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { + if (_methodName195.equals(name) && + Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) { return IntPraticaLocalServiceUtil.findByPosizione(((Double)arguments[0]).doubleValue(), ((Double)arguments[1]).doubleValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName193.equals(name) && - Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) { + if (_methodName196.equals(name) && + Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { return IntPraticaLocalServiceUtil.findByPosizione(((Double)arguments[0]).doubleValue(), ((Double)arguments[1]).doubleValue(), ((Integer)arguments[2]).intValue(), @@ -636,168 +672,168 @@ public class IntPraticaLocalServiceClpInvoker { ((Integer)arguments[4]).intValue()); } - if (_methodName195.equals(name) && - Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) { + if (_methodName198.equals(name) && + Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { return IntPraticaLocalServiceUtil.addNumeroProgetto(((Long)arguments[0]).longValue()); } - if (_methodName196.equals(name) && - Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { + if (_methodName199.equals(name) && + Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { return IntPraticaLocalServiceUtil.sospendiPratica(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue()); } - if (_methodName197.equals(name) && - Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { + if (_methodName200.equals(name) && + Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { return IntPraticaLocalServiceUtil.cambiaTitolare(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName198.equals(name) && - Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { + if (_methodName201.equals(name) && + Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { return IntPraticaLocalServiceUtil.updateStatoPratica(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName199.equals(name) && - Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { + if (_methodName202.equals(name) && + Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { return IntPraticaLocalServiceUtil.findByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName200.equals(name) && - Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { + if (_methodName203.equals(name) && + Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { return IntPraticaLocalServiceUtil.countByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName201.equals(name) && - Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { + if (_methodName204.equals(name) && + Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { IntPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); return null; } - if (_methodName202.equals(name) && - Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { + if (_methodName205.equals(name) && + Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName203.equals(name) && - Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { + if (_methodName206.equals(name) && + Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName205.equals(name) && - Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { + if (_methodName208.equals(name) && + Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName206.equals(name) && - Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName208.equals(name) && - Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { + if (_methodName211.equals(name) && + Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName209.equals(name) && - Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + if (_methodName212.equals(name) && + Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName211.equals(name) && - Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName212.equals(name) && - Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { + if (_methodName215.equals(name) && + Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName214.equals(name) && - Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { + if (_methodName217.equals(name) && + Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName218.equals(name) && + Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName219.equals(name) && + Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return IntPraticaLocalServiceUtil.search((java.util.List)arguments[0], ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName217.equals(name) && - Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { + if (_methodName220.equals(name) && + Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearch((java.util.List)arguments[0]); } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName221.equals(name) && + Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { return IntPraticaLocalServiceUtil.searchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { + if (_methodName222.equals(name) && + Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { return IntPraticaLocalServiceUtil.allegaFileAnnullamento(((Long)arguments[0]).longValue(), (byte[])arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], (com.liferay.portal.service.ServiceContext)arguments[4]); } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName223.equals(name) && + Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { return IntPraticaLocalServiceUtil.generateFileAnnullamento(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName221.equals(name) && - Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { IntPraticaLocalServiceUtil.deleteFileAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName222.equals(name) && - Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { IntPraticaLocalServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName226.equals(name) && + Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { IntPraticaLocalServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); @@ -805,76 +841,76 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName227.equals(name) && + Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.Long[])arguments[2]); } - if (_methodName225.equals(name) && - Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { + if (_methodName228.equals(name) && + Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { + if (_methodName229.equals(name) && + Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); } - if (_methodName227.equals(name) && - Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { + if (_methodName230.equals(name) && + Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName228.equals(name) && - Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { + if (_methodName231.equals(name) && + Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName229.equals(name) && - Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { + if (_methodName232.equals(name) && + Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName230.equals(name) && - Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + if (_methodName233.equals(name) && + Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); return null; } - if (_methodName231.equals(name) && - Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { + if (_methodName234.equals(name) && + Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); } - if (_methodName232.equals(name) && - Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { + if (_methodName235.equals(name) && + Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { + if (_methodName236.equals(name) && + Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { return IntPraticaLocalServiceUtil.getOrganizationByIntPraticaId(((Long)arguments[0]).longValue()); } - if (_methodName234.equals(name) && - Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { + if (_methodName237.equals(name) && + Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { return IntPraticaLocalServiceUtil.hasRichiestaIntegrazioneAttiva(((Long)arguments[0]).longValue()); } - if (_methodName235.equals(name) && - Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { + if (_methodName238.equals(name) && + Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { IntPraticaLocalServiceUtil.invioMailNotifica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2], @@ -889,24 +925,24 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName236.equals(name) && - Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { + if (_methodName239.equals(name) && + Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { return IntPraticaLocalServiceUtil.searchAltriProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName237.equals(name) && - Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { + if (_methodName240.equals(name) && + Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { return IntPraticaLocalServiceUtil.searchArchivioProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName238.equals(name) && - Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { + if (_methodName241.equals(name) && + Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { return IntPraticaLocalServiceUtil.searchMieiProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), @@ -978,26 +1014,26 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes183; private String _methodName184; private String[] _methodParameterTypes184; + private String _methodName185; + private String[] _methodParameterTypes185; private String _methodName186; private String[] _methodParameterTypes186; private String _methodName187; private String[] _methodParameterTypes187; - private String _methodName188; - private String[] _methodParameterTypes188; private String _methodName189; private String[] _methodParameterTypes189; + private String _methodName190; + private String[] _methodParameterTypes190; private String _methodName191; private String[] _methodParameterTypes191; private String _methodName192; private String[] _methodParameterTypes192; - private String _methodName193; - private String[] _methodParameterTypes193; + private String _methodName194; + private String[] _methodParameterTypes194; private String _methodName195; private String[] _methodParameterTypes195; private String _methodName196; private String[] _methodParameterTypes196; - private String _methodName197; - private String[] _methodParameterTypes197; private String _methodName198; private String[] _methodParameterTypes198; private String _methodName199; @@ -1010,6 +1046,8 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes202; private String _methodName203; private String[] _methodParameterTypes203; + private String _methodName204; + private String[] _methodParameterTypes204; private String _methodName205; private String[] _methodParameterTypes205; private String _methodName206; @@ -1026,8 +1064,6 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes214; private String _methodName215; private String[] _methodParameterTypes215; - private String _methodName216; - private String[] _methodParameterTypes216; private String _methodName217; private String[] _methodParameterTypes217; private String _methodName218; @@ -1072,4 +1108,10 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes237; private String _methodName238; private String[] _methodParameterTypes238; + private String _methodName239; + private String[] _methodParameterTypes239; + private String _methodName240; + private String[] _methodParameterTypes240; + private String _methodName241; + private String[] _methodParameterTypes241; } \ 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/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index 9588b2dc..0d1c49d7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -8,6 +8,45 @@ package it.tref.liferay.portos.bo.service.impl; +import com.liferay.portal.kernel.dao.orm.Disjunction; +import com.liferay.portal.kernel.dao.orm.DynamicQuery; +import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil; +import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil; +import com.liferay.portal.kernel.dao.orm.Property; +import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; +import com.liferay.portal.kernel.dao.orm.QueryUtil; +import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONObject; +import com.liferay.portal.kernel.json.JSONSerializer; +import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.kernel.repository.model.Folder; +import com.liferay.portal.kernel.search.Hits; +import com.liferay.portal.kernel.search.Indexable; +import com.liferay.portal.kernel.search.IndexableType; +import com.liferay.portal.kernel.search.Indexer; +import com.liferay.portal.kernel.search.IndexerRegistryUtil; +import com.liferay.portal.kernel.util.LocaleUtil; +import com.liferay.portal.kernel.util.MimeTypesUtil; +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil; +import com.liferay.portal.kernel.workflow.WorkflowTask; +import com.liferay.portal.model.Group; +import com.liferay.portal.model.Organization; +import com.liferay.portal.model.User; +import com.liferay.portal.security.permission.PermissionThreadLocal; +import com.liferay.portal.service.GroupLocalServiceUtil; +import com.liferay.portal.service.OrganizationLocalServiceUtil; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil; +import com.liferay.portlet.documentlibrary.NoSuchFolderException; + import it.mwg.sismica.bo.search.IntPraticaSearch; import it.mwg.sismica.bo.shared.util.AvvisoUtil; import it.mwg.sismica.bo.shared.util.DocumentiPraticaUtil; @@ -31,6 +70,7 @@ import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.service.base.IntPraticaLocalServiceBaseImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaFinderUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; @@ -66,45 +106,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; -import com.liferay.portal.kernel.dao.orm.Disjunction; -import com.liferay.portal.kernel.dao.orm.DynamicQuery; -import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil; -import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil; -import com.liferay.portal.kernel.dao.orm.Property; -import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; -import com.liferay.portal.kernel.dao.orm.QueryUtil; -import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.json.JSONSerializer; -import com.liferay.portal.kernel.language.LanguageUtil; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.repository.model.Folder; -import com.liferay.portal.kernel.search.Hits; -import com.liferay.portal.kernel.search.Indexable; -import com.liferay.portal.kernel.search.IndexableType; -import com.liferay.portal.kernel.search.Indexer; -import com.liferay.portal.kernel.search.IndexerRegistryUtil; -import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portal.kernel.util.MimeTypesUtil; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil; -import com.liferay.portal.kernel.workflow.WorkflowTask; -import com.liferay.portal.model.Group; -import com.liferay.portal.model.Organization; -import com.liferay.portal.model.User; -import com.liferay.portal.security.permission.PermissionThreadLocal; -import com.liferay.portal.service.GroupLocalServiceUtil; -import com.liferay.portal.service.OrganizationLocalServiceUtil; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil; -import com.liferay.portlet.documentlibrary.NoSuchFolderException; - /** * The implementation of the int pratica local service. *

@@ -131,7 +132,15 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { private static Map vecchieProcedure = null; private static final Log _log = LogFactoryUtil.getLog(IntPraticaLocalServiceImpl.class); - + public List filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) throws SystemException { + return IntPraticaFinderUtil.filtraPraticheStato(dataInizioLavori, dataFineLavori); + } + public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) throws SystemException { + return IntPraticaFinderUtil.filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori); + } + public List filtraPraticheAutorizzate(Date dataInizioLavori, Date dataFineLavori) throws SystemException { + return IntPraticaFinderUtil.filtraPraticheAutorizzate(dataInizioLavori, dataFineLavori); + } @Override public Map getTipiProcedure() { @@ -232,7 +241,10 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { @Override public IntPratica deleteIntPratica(IntPratica intPratica, boolean forced) throws SystemException, PortalException { - if (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || forced) { + + int contoDett = dettPraticaPersistence.countByIntPraticaId(intPratica.getIntPraticaId()); + + if (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || forced || contoDett==1) { if (Validator.isNotNull(intPratica.getDocPraticaAnnullamentoId())) { deleteFileAnnullamento(intPratica.getDocPraticaAnnullamentoId()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java index e8b6fef6..5e28829f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java @@ -8,6 +8,11 @@ package it.tref.liferay.portos.bo.service.impl; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.service.ServiceContext; + import it.mwg.sismica.bo.shared.util.AzioniPraticheUtil; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Territorio; @@ -18,11 +23,6 @@ import it.tref.liferay.portos.bo.shared.util.ActionKeys; import java.io.IOException; import java.util.List; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.service.ServiceContext; - /** * The implementation of the int pratica remote service. *

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index 0ef33164..392af44e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; -import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index e86c49f7..1dd062fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index 39126b3b..6d670b4e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 1c9ee855..a676849e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index b5054e85..691776e7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index b8d76564..b88225f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 4a0e9a11..66d67c23 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 7c1fa3f1..0cc84b84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index a2090464..bbf7e7de 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index c11f11fb..8c254e2b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java index a7160077..491ebf9f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java @@ -47,8 +47,6 @@ import it.tref.liferay.portos.bo.NoSuchDiocesiException; import it.tref.liferay.portos.bo.model.Diocesi; import it.tref.liferay.portos.bo.model.impl.DiocesiImpl; import it.tref.liferay.portos.bo.model.impl.DiocesiModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DiocesiPersistence; -import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 13626ed5..91ed3905 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 3e71e802..d521d3f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index e2a7716d..908947c5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; -import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index 7b45230e..b1f93960 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; -import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; 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 df6ad3dc..190363dd 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 @@ -1,10 +1,5 @@ package it.tref.liferay.portos.bo.service.persistence; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; - -import java.util.List; - import com.liferay.portal.kernel.dao.orm.ORMException; import com.liferay.portal.kernel.dao.orm.QueryPos; import com.liferay.portal.kernel.dao.orm.SQLQuery; @@ -15,6 +10,12 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.service.persistence.impl.BasePersistenceImpl; import com.liferay.util.dao.orm.CustomSQLUtil; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; + +import java.util.Date; +import java.util.List; + public class IntPraticaFinderImpl extends BasePersistenceImpl implements IntPraticaFinder { private static final Log _log = LogFactoryUtil.getLog(IntPraticaFinderImpl.class); @@ -71,4 +72,80 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl implem } } } + private final String FILTRA_PRATICHE_STATO = "IntPratica.reportPraticaStato"; + private final String FILTRA_PRATICHE_INTEGRAZIONI = "IntPratica.reportPraticaIntegrazioni"; + private final String FILTRA_PRATICHE_AUTORIZZAZIONI = "IntPratica.reportPraticaAutorizzazioni"; + + + public List filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) + throws SystemException { + Session session = null; + try { + session = openSession(); + String sql = CustomSQLUtil.get(FILTRA_PRATICHE_STATO); + SQLQuery query = session.createSQLQuery(sql); + query.setCacheable(false); + QueryPos qPos = QueryPos.getInstance(query); + qPos.add(dataInizioLavori); + qPos.add(dataFineLavori); + @SuppressWarnings("unchecked") + List l = query.list(); + return l; + } catch (ORMException e) { + _log.error("Errore", e); + throw new RuntimeException(e); + } finally { + if (session != null) { + closeSession(session); + } + } + } + + public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) + throws SystemException { + Session session = null; + try { + session = openSession(); + String sql = CustomSQLUtil.get(FILTRA_PRATICHE_INTEGRAZIONI); + SQLQuery query = session.createSQLQuery(sql); + query.setCacheable(false); + QueryPos qPos = QueryPos.getInstance(query); + qPos.add(dataInizioLavori); + qPos.add(dataFineLavori); + @SuppressWarnings("unchecked") + List l = query.list(); + return l; + } catch (ORMException e) { + _log.error("Errore", e); + throw new RuntimeException(e); + } finally { + if (session != null) { + closeSession(session); + } + } + } + + public List filtraPraticheAutorizzate(Date dataInizioLavori, Date dataFineLavori) + throws SystemException { + Session session = null; + try { + session = openSession(); + String sql = CustomSQLUtil.get(FILTRA_PRATICHE_AUTORIZZAZIONI); + SQLQuery query = session.createSQLQuery(sql); + query.setCacheable(false); + QueryPos qPos = QueryPos.getInstance(query); + qPos.add(dataInizioLavori); + qPos.add(dataFineLavori); + @SuppressWarnings("unchecked") + List l = query.list(); + return l; + } catch (ORMException e) { + _log.error("Errore", e); + throw new RuntimeException(e); + } finally { + if (session != null) { + closeSession(session); + } + } + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 2a9673dd..bdaf914f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,7 +48,6 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index fc11289b..fa8c2ebd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index b750d9b1..7ccfc052 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -47,7 +47,6 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index 986dcd3e..fedc632c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -47,8 +47,6 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DiocesiPersistence; -import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index bbf346c5..98681e47 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 4aec658e..14d6996c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index c41df113..ecea7d65 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,7 +44,6 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; -import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; 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 35a46aff..4196a399 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=3611 - build.date=1659531879936 + build.number=3649 + build.date=1680100687665 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml index 888d0c08..0101065a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml @@ -11,10 +11,7 @@ - - - - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 index 0ab3f4ac..88bfdf70 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 @@ -1 +1 @@ -b4706b93723ae9407536bf048d125586 +30b06262b749a3d1553865d3eb08ea92 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath index 329e4ccb..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project index 14074ed1..ce760932 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957663 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component index fdec0d03..9a27a472 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..2aab4bcd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/portos-calendar-appointments-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/portos-calendar-appointments-portlet-service.jar new file mode 100644 index 00000000..729a840a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/lib/portos-calendar-appointments-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml index e19fc1c3..a2779281 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + 3F Consulting + Manifattura Web Group s.r.l. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java index 6a9e1899..0eb7de10 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DuplicateFunzionarioException extends PortalException { public DuplicateFunzionarioException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java index 8ddd98e0..f36f0237 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DuplicatePrenotazioneException extends PortalException { public DuplicatePrenotazioneException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java index a6ed4a53..15346fde 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DuplicateProfessionistaException extends PortalException { public DuplicateProfessionistaException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java index 1a9c7f25..767cb4f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchDisponibilitaException extends NoSuchModelException { public NoSuchDisponibilitaException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java index ca5c71de..7cb3399a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchFunzionarioException extends NoSuchModelException { public NoSuchFunzionarioException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java index 9a831064..77e4c805 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchPrenotazioneException extends NoSuchModelException { public NoSuchPrenotazioneException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java index 24e17d50..7314eb85 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchProfessionistaException extends NoSuchModelException { public NoSuchProfessionistaException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java index 58a65b67..d1db8c58 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class SlotNotAvailableException extends PortalException { public SlotNotAvailableException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java index f6278f0c..eeed0fd5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java @@ -20,7 +20,6 @@ package it.tref.portos.calendar.appointments.model.impl; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DisponibilitaImpl extends DisponibilitaBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a disponibilita model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java index eddb1e39..8bdec5dd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java @@ -22,7 +22,6 @@ import com.liferay.portal.kernel.util.StringPool; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class FunzionarioImpl extends FunzionarioBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a funzionario model instance @@ -30,8 +29,7 @@ public class FunzionarioImpl extends FunzionarioBaseImpl { */ public FunzionarioImpl() {} - @Override - public String getFullDescription() { - return getNome() + StringPool.SPACE + getCognome(); - } + public String getFullDescription() { + return getNome() + StringPool.SPACE + getCognome(); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java index a1cec9bd..73c6cce8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java @@ -24,7 +24,6 @@ import org.apache.commons.lang.time.DateUtils; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class PrenotazioneImpl extends PrenotazioneBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a prenotazione model instance @@ -32,9 +31,17 @@ public class PrenotazioneImpl extends PrenotazioneBaseImpl { */ public PrenotazioneImpl() {} - @Override - public boolean isExpired(Date now) { + public boolean isExpired(Date now) { - return now.after(getStartDate()) || DateUtils.isSameDay(now, getStartDate()); - } + if (now.after(getStartDate())) { + return true; + } + + if (DateUtils.isSameDay(now, getStartDate())) { + return true; + + } + + return false; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java index ae04c853..dce6ea28 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java @@ -20,7 +20,6 @@ package it.tref.portos.calendar.appointments.model.impl; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class ProfessionistaImpl extends ProfessionistaBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a professionista model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java index 36dbee16..3855217a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java @@ -1,9 +1,13 @@ /** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in - * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under the terms of the + * GNU Lesser General Public License as published by the Free Software Foundation; either version + * 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. */ package it.tref.portos.calendar.appointments.service.impl; @@ -26,13 +30,11 @@ import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.Order; import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil; import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; -import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Organization; import com.liferay.portal.model.Role; import com.liferay.portal.model.User; @@ -40,508 +42,650 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the disponibilita local service. + * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy - * their definitions into the {@link it.tref.portos.calendar.appointments.service.DisponibilitaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the + * {@link it.tref.portos.calendar.appointments.service.DisponibilitaLocalService} interface. + * *

- * This is a local service. Methods of this service will not have security checks based on the propagated JAAS - * credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the + * propagated JAAS credentials because this service can only be accessed from within the same VM. *

* - * @author 3F Consulting + Manifattura Web Group s.r.l. + * @author 3F Consulting * @see it.tref.portos.calendar.appointments.service.base.DisponibilitaLocalServiceBaseImpl * @see it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil */ public class DisponibilitaLocalServiceImpl extends DisponibilitaLocalServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil} to access the disponibilita local - * service. + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link + * it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil} to access the + * disponibilita local service. */ private static Log _log = LogFactoryUtil.getLog(DisponibilitaLocalServiceImpl.class); - @Override - public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate) throws SystemException { + //Bug 32935 + public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate) throws SystemException{ long exist = 0L; + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDate))); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDate)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDate)); - @SuppressWarnings("unchecked") + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDate)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDate)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (!results.isEmpty()) { + if(!results.isEmpty()){ exist = results.get(0).getDisponibilitaId(); } + return exist; } - @Override - public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate, long presidio) - throws SystemException { + public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate, long presidio) throws SystemException{ long exist = 0L; + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDate))); - dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio", presidio)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDate)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDate)); - @SuppressWarnings("unchecked") + dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio",presidio)); + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDate)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDate)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (!results.isEmpty()) { + if(!results.isEmpty()){ exist = results.get(0).getDisponibilitaId(); } + return exist; } - @Override public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { Organization organization = OrganizationLocalServiceUtil.fetchOrganization(presidio); + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + Disponibilita disponibilita = disponibilitaPersistence.create(counterLocalService.increment(Disponibilita.class.getName())); + User user = userPersistence.findByPrimaryKey(userId); + Date now = new Date(); + disponibilita.setCompanyId(serviceContext.getCompanyId()); disponibilita.setUserId(user.getUserId()); disponibilita.setUserName(user.getFullName()); disponibilita.setCreateDate(serviceContext.getCreateDate(now)); disponibilita.setModifiedDate(serviceContext.getModifiedDate(now)); disponibilita.setGroupId(organization.getGroupId()); + disponibilita.setFunzionarioId(funzionarioId); disponibilita.setStartDate(startDate); disponibilita.setEndDate(endDate); disponibilita.setPresidio(presidio); disponibilita.setExactDate(sdf.format(startDate)); disponibilita.setDisponibile(true); - disponibilita = updateDisponibilita(disponibilita); + + disponibilita = disponibilitaLocalService.updateDisponibilita(disponibilita); + + return disponibilita; } - @Override - public Disponibilita addIndisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, - long presidio, ServiceContext serviceContext) throws SystemException, PortalException { + public Disponibilita addIndisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio, + ServiceContext serviceContext) throws SystemException, PortalException { Organization organization = OrganizationLocalServiceUtil.fetchOrganization(presidio); + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + Disponibilita disponibilita = disponibilitaPersistence.create(counterLocalService.increment(Disponibilita.class.getName())); + User user = userPersistence.findByPrimaryKey(userId); + Date now = new Date(); + disponibilita.setCompanyId(serviceContext.getCompanyId()); disponibilita.setUserId(user.getUserId()); disponibilita.setUserName(user.getFullName()); disponibilita.setCreateDate(serviceContext.getCreateDate(now)); disponibilita.setModifiedDate(serviceContext.getModifiedDate(now)); disponibilita.setGroupId(organization.getGroupId()); + disponibilita.setFunzionarioId(funzionarioId); disponibilita.setStartDate(startDate); disponibilita.setEndDate(endDate); disponibilita.setPresidio(presidio); disponibilita.setExactDate(sdf.format(startDate)); disponibilita.setDisponibile(false); - disponibilita = updateDisponibilita(disponibilita); + + disponibilita = disponibilitaLocalService.updateDisponibilita(disponibilita); + + return disponibilita; } - @Override - public void addDisponibilitaGenerale(long userId, Date startDate, Date endDate, long presidioId, String oraInizio, - String oraFine, int giornoSettimana, ServiceContext serviceContext) throws SystemException, - PortalException, ParseException { + public void addDisponibilitaGenerale(long userId, Date startDate, Date endDate, long presidioId, + String oraInizio, String oraFine, int giornoSettimana, ServiceContext serviceContext) throws SystemException, PortalException, ParseException{ Organization organization = OrganizationLocalServiceUtil.fetchOrganization(presidioId); + List userDefinitivo = new ArrayList(); + try { - if (organization != null) { - List users = userLocalService.getOrganizationUsers(presidioId); + + if(organization != null){ + List users = UserLocalServiceUtil.getOrganizationUsers(presidioId); + for (User user : users) { + Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosIstruttore = - RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isIstruttore = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - if (isIstruttore) { + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + + if(isIstruttore){ userDefinitivo.add(user); } } } + } + } catch (NumberFormatException | SystemException e) { - _log.error(e, e); + _log.error(e,e); } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Calendar calendarStartDate = Calendar.getInstance(); calendarStartDate.setTime(startDate); - if (calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana) { + + if(calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana){ + Date startDateToInsert = formatDateTime(oraInizio, startDate); Date endDateToInsert = formatDateTime(oraFine, startDate); + for (User user : userDefinitivo) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", user.getUserId())); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDateToInsert))); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", organization.getGroupId())); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDateToInsert)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDateToInsert)); - @SuppressWarnings("unchecked") + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDateToInsert)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDateToInsert)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (results.isEmpty()) { + if(results.isEmpty()){ addDisponibilita(serviceContext.getUserId(), user.getUserId(), startDateToInsert, endDateToInsert, organization.getOrganizationId(), serviceContext); - } else { - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - Disponibilita disponibilita = iterator.next(); + } + //Bug 32935 + else{ + for (Iterator iterator = results.iterator(); iterator.hasNext();) { + Disponibilita disponibilita = (Disponibilita) iterator.next(); disponibilita.setDisponibile(true); - updateDisponibilita(disponibilita); + disponibilitaLocalService.updateDisponibilita(disponibilita); } } } } - addDayForDisponibilita(startDate, endDate, oraInizio, oraFine, giornoSettimana, userDefinitivo, - organization.getOrganizationId(), serviceContext); + + addDayForDisponibilita(startDate, endDate, oraInizio, oraFine, giornoSettimana, + userDefinitivo, organization.getOrganizationId(), serviceContext); + } - private void addDayForDisponibilita(Date date, Date endDate, String oraInizio, String oraFine, int giornoSettimana, - List users, long presidioId, ServiceContext serviceContext) throws ParseException, SystemException, - PortalException { + private void addDayForDisponibilita(Date date, Date endDate, String oraInizio, String oraFine,int giornoSettimana,List users, + long presidioId, ServiceContext serviceContext) + throws ParseException, SystemException, PortalException{ Organization org = OrganizationLocalServiceUtil.fetchOrganization(presidioId); + Date datePlus = datePlusOneDay(date); - if (date.before(datePlus) && (endDate.after(datePlus) || isSameDate(endDate, datePlus))) { + if(date.before(datePlus) && (endDate.after(datePlus) || isSameDate(endDate, datePlus))){ + Calendar calendarStartDate = Calendar.getInstance(); calendarStartDate.setTime(datePlus); - if (calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana) { + + if(calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana){ + Date startDateToInsert = formatDateTime(oraInizio, datePlus); Date endDateToInsert = formatDateTime(oraFine, datePlus); + for (User user : users) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", user.getUserId())); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDateToInsert))); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", org.getGroupId())); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDateToInsert)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDateToInsert)); - @SuppressWarnings("unchecked") + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDateToInsert)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDateToInsert)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (results.isEmpty()) { - addDisponibilita(serviceContext.getUserId(), user.getUserId(), startDateToInsert, - endDateToInsert, presidioId, serviceContext); - } else { - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - Disponibilita disponibilita = iterator.next(); + if(results.isEmpty()){ + addDisponibilita(serviceContext.getUserId(), user.getUserId(), startDateToInsert, endDateToInsert, + presidioId, serviceContext); + } + //Bug 32935 + else{ + for (Iterator iterator = results.iterator(); iterator.hasNext();) { + Disponibilita disponibilita = (Disponibilita) iterator.next(); disponibilita.setDisponibile(true); - updateDisponibilita(disponibilita); + disponibilitaLocalService.updateDisponibilita(disponibilita); } } + } - addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, presidioId, - serviceContext); + + addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, + presidioId, serviceContext); + } else { - addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, presidioId, - serviceContext); + addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, + presidioId, serviceContext); } } } - private Date datePlusOneDay(Date date) { + private Date datePlusOneDay(Date date){ Calendar calendar = Calendar.getInstance(); calendar.setTime(date); + calendar.add(Calendar.DATE, 1); + return calendar.getTime(); } - private boolean isSameDate(Date date1, Date date2) { + private boolean isSameDate(Date date1 , Date date2){ Calendar cal1 = Calendar.getInstance(); Calendar cal2 = Calendar.getInstance(); cal1.setTime(date1); cal2.setTime(date2); - boolean sameDay = - cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) - && cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR); + + boolean sameDay = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) && + cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR); + return sameDay; + } - @SuppressWarnings("unchecked") - @Override public List findByStartDate(Date date) throws SystemException { - Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); Date end = DateUtils.addDays(start, 1); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", start, end)); dynamicQuery.addOrder(OrderFactoryUtil.desc("funzionarioId")); + return disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - } - @Override - public List findByFunzionarioStartAndPresidio(long funzionarioId, Date date, long presidio) - throws SystemException { + } + public List findByFunzionarioStartAndPresidio(long funzionarioId, Date date, long presidio) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); Date end = DateUtils.addHours(start, 22); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", presidio)); - @SuppressWarnings("unchecked") + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); return results; - } - @SuppressWarnings("unchecked") - @Override - public List findByFunzionario_StartDate(long funzionarioId, Date date, long presidio) - throws SystemException { + } + public List findByFunzionario_StartDate(long funzionarioId, Date date, long presidio) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); Date end = DateUtils.addHours(start, 22); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", presidio)); - return disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); + + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); + return results; + } - @SuppressWarnings("unchecked") - @Override - public List findByFunzionarioStartDate(long funzionarioId, Date date, int startRow, int endRow) - throws SystemException { + public List findByFunzionarioStartDate(long funzionarioId, Date date, int startRow, int endRow) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + Date end = DateUtils.addHours(start, 22); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, startRow, endRow); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, startRow, endRow); + return results; + } - @Override public int countByFunzionarioStartDate(long funzionarioId, Date date) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, QueryUtil.ALL_POS, QueryUtil.ALL_POS).size(); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, -1, -1); + return results.size(); + } - @SuppressWarnings("unchecked") - @Override - public List findByPOStartDateAndFilters(long funzionarioId, Date date, int startRow, int endRow, - String provinciaFilter, String funzionarioIdFilter) throws SystemException { + public List findByPOStartDateAndFilters(long funzionarioId, Date date, int startRow, int endRow, String provinciaFilter, String funzionarioIdFilter) throws SystemException { + + User user = UserLocalServiceUtil.fetchUser(funzionarioId); - User user = userLocalService.fetchUser(funzionarioId); List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); - if (provinciaFilter.equals("-1") || provinciaFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); - } else { + + if(!provinciaFilter.equals("-1") && !provinciaFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio", Long.valueOf(provinciaFilter))); - } - if (funzionarioIdFilter.equals("-1") || funzionarioIdFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } else { + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); + } + + if(!funzionarioIdFilter.equals("-1") && !funzionarioIdFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", Long.valueOf(funzionarioIdFilter))); + } else { + dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } + dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, startRow, endRow); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, startRow, endRow); + return results; + } - @Override - public int countByPOStartDateAndFilters(long funzionarioId, Date date, String provinciaFilter, - String funzionarioIdFilter) throws SystemException { + public int countByPOStartDateAndFilters(long funzionarioId, Date date, String provinciaFilter, String funzionarioIdFilter) throws SystemException { + + User user = UserLocalServiceUtil.fetchUser(funzionarioId); - User user = userLocalService.fetchUser(funzionarioId); List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); - if (provinciaFilter.equals("-1") || provinciaFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); - } else { + + if(!provinciaFilter.equals("-1") && !provinciaFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio", Long.valueOf(provinciaFilter))); - } - if (funzionarioIdFilter.equals("-1") || funzionarioIdFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } else { + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); + } + + if(!funzionarioIdFilter.equals("-1") && !funzionarioIdFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", Long.valueOf(funzionarioIdFilter))); + } else { + dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } + dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, QueryUtil.ALL_POS, QueryUtil.ALL_POS).size(); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, -1, -1); + return results.size(); + } - @SuppressWarnings("unchecked") - @Override - public List findByPOStartDate(long funzionarioId, Date date, int startRow, int endRow) - throws SystemException { + public List findByPOStartDate(long funzionarioId, Date date, int startRow, int endRow) throws SystemException { + + User user = UserLocalServiceUtil.fetchUser(funzionarioId); - User user = userLocalService.fetchUser(funzionarioId); List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, startRow, endRow); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, startRow, endRow); + return results; + } - @Override public int countByPOStartDate(long funzionarioId, Date date) throws SystemException { - User user = userLocalService.fetchUser(funzionarioId); + User user = UserLocalServiceUtil.fetchUser(funzionarioId); + List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, QueryUtil.ALL_POS, QueryUtil.ALL_POS).size(); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, -1, -1); + return results.size(); + } private Date formatDateTime(String orario, Date day) throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); Date data = sdf.parse(orario); Calendar calendar = GregorianCalendar.getInstance(); calendar.setTime(data); Date date = DateUtils.addHours(day, calendar.get(Calendar.HOUR_OF_DAY)); date = DateUtils.addMinutes(date, calendar.get(Calendar.MINUTE)); + return date; } + } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java index 05497c8a..5ffdc835 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java @@ -11,6 +11,7 @@ package it.tref.portos.calendar.appointments.service.impl; import it.tref.portos.calendar.appointments.model.Disponibilita; import it.tref.portos.calendar.appointments.model.Funzionario; import it.tref.portos.calendar.appointments.model.Prenotazione; +import it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil; import it.tref.portos.calendar.appointments.service.base.DisponibilitaServiceBaseImpl; import java.text.ParseException; @@ -37,6 +38,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the disponibilita remote service. @@ -61,7 +63,6 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { private static Log _log = LogFactoryUtil.getLog(DisponibilitaServiceImpl.class); - @Override public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { @@ -69,7 +70,6 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { serviceContext); } - @Override public List addDisponibilitaGenerale(long presidio, long userId, Date dataInizioDisponibilita, Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita, String oraFineDisponibilita, ServiceContext serviceContext) throws SystemException, PortalException { @@ -87,9 +87,7 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { return listDisponibilita; } - @Override - public String verifyDisponibilitaByDateHour(String presidio, String date, String[] oreInizio, String idFunzionario) - throws SystemException, ParseException { + public String verifyDisponibilitaByDateHour(String presidio, String date,String[] oreInizio, String idFunzionario) throws SystemException, ParseException { JSONObject json = JSONFactoryUtil.createJSONObject(); JSONArray array = JSONFactoryUtil.createJSONArray(); @@ -101,9 +99,18 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { String oraInizio = oreInizio[i]; jsonFiglio.put("ora", oraInizio); Date dateVerify = formatDateTime(oraInizio, dateVerifyTemp); - List lista = prenotazioneLocalService.findByDateHourFunzionario(dateVerify, - Long.parseLong(idFunzionario), org.getGroupId()); - jsonFiglio.put("disponibile", lista.isEmpty()); + + + List lista = + PrenotazioneLocalServiceUtil.findByDateHourFunzionario( + dateVerify, Long.parseLong(idFunzionario), org.getGroupId()); + + if(lista.isEmpty()){ + jsonFiglio.put("disponibile", true); + } else { + jsonFiglio.put("disponibile", false); + } + array.put(jsonFiglio); } json.put("slot", array); @@ -117,24 +124,34 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); List userDefinitivo = new ArrayList(); try { - if (organization != null) { - List users = userLocalService.getOrganizationUsers(Long.valueOf(presidio)); + + if(organization != null){ + List users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio)); + for (User user : users) { Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - "portos_calendario"); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - if (isIstruttore) { + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + + if(isIstruttore){ userDefinitivo.add(user); } } } } - } catch (NumberFormatException | PortalException | SystemException e) { - _log.error(e, e); + + } catch (NumberFormatException | SystemException e) { + _log.error(e,e); + } catch (PortalException e) { + _log.error(e,e); } + Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); JSONArray json = JSONFactoryUtil.createJSONArray(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java index 21ca8470..3feb7d48 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java @@ -40,9 +40,8 @@ public class FunzionarioLocalServiceImpl extends FunzionarioLocalServiceBaseImpl * service. */ - @Override - public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, - ServiceContext serviceContext) throws PortalException, SystemException { + public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, + ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); Date now = new Date(); @@ -75,9 +74,8 @@ public class FunzionarioLocalServiceImpl extends FunzionarioLocalServiceBaseImpl return this.deleteFunzionario(funzionario); } - @Override - public List findByPresidio(String presidio) throws SystemException { + public List findByPresidio(String presidio) throws SystemException { - return funzionarioPersistence.findByPresidio(presidio); - } + return funzionarioPersistence.findByPresidio(presidio); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java index 447943fe..60dfe822 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java @@ -8,7 +8,6 @@ package it.tref.portos.calendar.appointments.service.impl; -import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.portos.calendar.appointments.model.Funzionario; import it.tref.portos.calendar.appointments.service.base.FunzionarioServiceBaseImpl; @@ -23,7 +22,6 @@ import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.json.JSONObject; 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.model.Organization; import com.liferay.portal.model.Role; @@ -32,6 +30,8 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.Constants; /** * The implementation of the funzionario remote service. @@ -55,59 +55,67 @@ public class FunzionarioServiceImpl extends FunzionarioServiceBaseImpl { private static Log _log = LogFactoryUtil.getLog(FunzionarioServiceImpl.class); - @Override - public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, - ServiceContext serviceContext) throws PortalException, SystemException { + public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, + ServiceContext serviceContext) throws PortalException, SystemException { return funzionarioLocalService.addFunzionario(userId, nome, cognome, presidio, tipologia, serviceContext); } - @Override - public String getFunzionariByPresidio(String presidio) { - - JSONArray json = JSONFactoryUtil.createJSONArray(); - try { - Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); - if (organization != null) { - List users = userLocalService.getOrganizationUsers(Long.valueOf(presidio)); - Collections.sort(users, new UserComparator()); - for (User user : users) { - Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosGeologo = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - Constants.ROLE_NAME_GEOLOGO); - Role portosCalendario = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - "portos_calendario"); - Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - Constants.ROLE_NAME_ISTRUTTORE); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosCalendario.getRoleId()); - boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - boolean isGeologo = userLocalService.hasRoleUser(portosGeologo.getRoleId(), - user.getUserId()); - if (isCalendario) { - JSONObject jsonFunzionario = JSONFactoryUtil.createJSONObject(); - jsonFunzionario.put("id", user.getUserId()); - jsonFunzionario.put("nome", user.getFirstName()); - jsonFunzionario.put("cognome", user.getLastName()); - if (isIstruttore) { - jsonFunzionario.put("tipologia", "Istruttore"); - } else if (isGeologo) { - jsonFunzionario.put("tipologia", "Geologo"); - } else { - jsonFunzionario.put("tipologia", StringPool.BLANK); - } - json.put(jsonFunzionario); + public String getFunzionariByPresidio(String presidio) { + + JSONArray json = JSONFactoryUtil.createJSONArray(); + try { + Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); + if(organization != null){ + + List users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio)); + + //Bug 32935 + Collections.sort(users, new UserComparator()); + for (User user : users) { + Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); + + Role portosGeologo = RoleLocalServiceUtil.getRole(organization.getCompanyId(), Constants.ROLE_NAME_GEOLOGO); + + Role portosCalendario = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosCalendario.getRoleId()); + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + boolean isGeologo = UserLocalServiceUtil.hasRoleUser(portosGeologo.getRoleId(), user.getUserId()); + + + if(isCalendario){ + JSONObject jsonFunzionario = JSONFactoryUtil.createJSONObject(); + jsonFunzionario.put("id", user.getUserId()); + jsonFunzionario.put("nome", user.getFirstName()); + jsonFunzionario.put("cognome", user.getLastName()); + if(isIstruttore){ + jsonFunzionario.put("tipologia", "Istruttore"); + } else if(isGeologo){ + jsonFunzionario.put("tipologia", "Geologo"); + } else { + jsonFunzionario.put("tipologia", ""); } + json.put(jsonFunzionario); } } } - } catch (NumberFormatException | PortalException | SystemException e) { - _log.error(e, e); } - return json.toString(); + } catch (NumberFormatException | SystemException e) { + _log.error(e,e); + } catch (PortalException e) { + _log.error(e,e); } + return json.toString(); + } } class UserComparator implements Comparator { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java index b0bb7950..b21c40ee 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java @@ -33,6 +33,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the prenotazione local service. @@ -55,45 +56,56 @@ public class PrenotazioneLocalServiceImpl extends PrenotazioneLocalServiceBaseIm * service. */ - @Override - public Prenotazione addPrenotazione(long userId, long funzionarioId, long professionistaId, Date startDate, - Date endDate, String descrizione, String telefono, String email, long presidio, - ServiceContext serviceContext) throws SystemException, PortalException { - - Prenotazione prenotazione = - prenotazionePersistence.create(counterLocalService.increment(Prenotazione.class.getName())); - User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - prenotazione.setCompanyId(serviceContext.getCompanyId()); - prenotazione.setUserId(user.getUserId()); - prenotazione.setUserName(user.getFullName()); - prenotazione.setCreateDate(serviceContext.getCreateDate(now)); - prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); - prenotazione.setGroupId(presidio); - prenotazione.setFunzionarioId(funzionarioId); - prenotazione.setProfessionistaId(professionistaId); - prenotazione.setStartDate(startDate); - prenotazione.setEndDate(endDate); - prenotazione.setDescLong(descrizione); - prenotazione.setTelefono(telefono); - prenotazione.setEmail(email); - prenotazione = updatePrenotazione(prenotazione); - return prenotazione; - } +//Product Backlog Item 32934 + public Prenotazione addPrenotazione(long userId, long funzionarioId, long professionistaId, Date startDate, + Date endDate, String descrizione, String telefono, String email, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { - @Override - public Prenotazione updatePrenotazione(long prenotazioneId, Date startDate, Date endDate, String descrizione, - ServiceContext serviceContext) throws SystemException, PortalException { + Prenotazione prenotazione = + prenotazionePersistence.create(counterLocalService.increment(Prenotazione.class.getName())); - Prenotazione prenotazione = prenotazionePersistence.findByPrimaryKey(prenotazioneId); - Date now = new Date(); - prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); - prenotazione.setStartDate(startDate); - prenotazione.setEndDate(endDate); - prenotazione.setDescLong(descrizione); - prenotazione = updatePrenotazione(prenotazione); - return prenotazione; - } + User user = userPersistence.findByPrimaryKey(userId); + + Date now = new Date(); + + prenotazione.setCompanyId(serviceContext.getCompanyId()); + prenotazione.setUserId(user.getUserId()); + prenotazione.setUserName(user.getFullName()); + prenotazione.setCreateDate(serviceContext.getCreateDate(now)); + prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); + prenotazione.setGroupId(presidio); + + prenotazione.setFunzionarioId(funzionarioId); + prenotazione.setProfessionistaId(professionistaId); + prenotazione.setStartDate(startDate); + prenotazione.setEndDate(endDate); + prenotazione.setDescLong(descrizione); + + //Product Backlog Item 32934 + prenotazione.setTelefono(telefono); + prenotazione.setEmail(email); + + prenotazione = prenotazioneLocalService.updatePrenotazione(prenotazione); + + return prenotazione; + } + + public Prenotazione updatePrenotazione(long prenotazioneId, Date startDate, Date endDate, String descrizione, + ServiceContext serviceContext) throws SystemException, PortalException { + + Prenotazione prenotazione = prenotazionePersistence.findByPrimaryKey(prenotazioneId); + + Date now = new Date(); + + prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); + + prenotazione.setStartDate(startDate); + prenotazione.setEndDate(endDate); + prenotazione.setDescLong(descrizione); + + prenotazione = prenotazioneLocalService.updatePrenotazione(prenotazione); + + return prenotazione; + } @Override public Prenotazione deletePrenotazione(Prenotazione prenotazione) throws SystemException { @@ -108,33 +120,31 @@ public class PrenotazioneLocalServiceImpl extends PrenotazioneLocalServiceBaseIm return this.deletePrenotazione(prenotazione); } - @SuppressWarnings("unchecked") - @Override - public List findByStartDate(Date date) throws SystemException { + public List findByStartDate(Date date) throws SystemException { + Date start = DateUtils.truncate(date, java.util.Calendar.DAY_OF_MONTH); + Date end = DateUtils.addDays(start, 1); - Date start = DateUtils.truncate(date, java.util.Calendar.DAY_OF_MONTH); - Date end = DateUtils.addDays(start, 1); - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", start, end)); - dynamicQuery.addOrder(OrderFactoryUtil.desc("funzionarioId")); - return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - } + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", start, end)); + dynamicQuery.addOrder(OrderFactoryUtil.desc("funzionarioId")); + return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - @SuppressWarnings("unchecked") - @Override - public List findByDateHourFunzionario(Date date, long funzionarioId, long groupId) - throws SystemException { + } + + public List findByDateHourFunzionario(Date date, long funzionarioId, long groupId) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", date)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); + + return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", date)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); - return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); } - @Override - public int getAvailableSlotByStartDate_EndDate(long funzionarioId, Date startDate, Date endDate) - throws SystemException { + public int getAvailableSlotByStartDate_EndDate(long funzionarioId, Date startDate, Date endDate) + throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); @@ -151,45 +161,53 @@ public class PrenotazioneLocalServiceImpl extends PrenotazioneLocalServiceBaseIm return (int) prenotazionePersistence.countWithDynamicQuery(dynamicQuery); } - @SuppressWarnings("unchecked") - @Override - public List findByFunzionario_StartDate(long funzionarioId, Date date, long groupId) - throws SystemException { - Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); - Date end = DateUtils.addHours(start, 22); - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); - dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); - dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); - return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - } + public List findByFunzionario_StartDate(long funzionarioId, Date date, long groupId) throws SystemException { + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + Date end = DateUtils.addHours(start, 22); + + DynamicQuery dynamicQuery = dynamicQuery(); + + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); + dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); + + return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); + } + + public int countPrenotazioniPresidioPeriodo(long presidioId, String fromString, String toString) throws SystemException, PortalException, ParseException{ + + int count = 0; + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + Date from = sdf.parse(fromString); + Date to = sdf.parse(toString); + + Calendar fromCal = Calendar.getInstance(); + fromCal.setTime(from); + fromCal.set(Calendar.HOUR_OF_DAY, 2); + + Calendar toCal = Calendar.getInstance(); + toCal.setTime(to); + toCal.set(Calendar.HOUR_OF_DAY, 22); + + + Organization org = OrganizationLocalServiceUtil.fetchOrganization(presidioId); + Role portosCalendario = RoleLocalServiceUtil.getRole(org.getCompanyId(), "portos_calendario"); + + if (org != null) { + + List users = UserLocalServiceUtil.getOrganizationUsers(presidioId); + for (User user : users) { + boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), org.getGroupId(), portosCalendario.getRoleId()); + + if(isCalendario){ + + DynamicQuery dynamicQuery = dynamicQuery(); - @Override - public int countPrenotazioniPresidioPeriodo(long presidioId, String fromString, String toString) - throws SystemException, PortalException, ParseException { - - int count = 0; - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - Date from = sdf.parse(fromString); - Date to = sdf.parse(toString); - Calendar fromCal = Calendar.getInstance(); - fromCal.setTime(from); - fromCal.set(Calendar.HOUR_OF_DAY, 2); - Calendar toCal = Calendar.getInstance(); - toCal.setTime(to); - toCal.set(Calendar.HOUR_OF_DAY, 22); - Organization org = OrganizationLocalServiceUtil.fetchOrganization(presidioId); - Role portosCalendario = RoleLocalServiceUtil.getRole(org.getCompanyId(), "portos_calendario"); - if (org != null) { - List users = userLocalService.getOrganizationUsers(presidioId); - for (User user : users) { - boolean isCalendario = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), org.getGroupId(), - portosCalendario.getRoleId()); - if (isCalendario) { - DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", user.getUserId())); dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", fromCal.getTime(), toCal.getTime())); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", org.getGroupId())); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java index b9831cea..5d27ed97 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java @@ -10,6 +10,7 @@ package it.tref.portos.calendar.appointments.service.impl; import it.tref.portos.calendar.appointments.SlotNotAvailableException; import it.tref.portos.calendar.appointments.model.Prenotazione; +import it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil; import it.tref.portos.calendar.appointments.service.base.PrenotazioneServiceBaseImpl; import java.text.ParseException; @@ -34,6 +35,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the prenotazione remote service. @@ -57,7 +59,7 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { private static Log _log = LogFactoryUtil.getLog(PrenotazioneServiceImpl.class); - @Override + //Product Backlog Item 32934 public void addPrenotazione(long userId, long funzionarioId, long professionistaId, Date startDate, Date endDate, String descrizione, String telefono, String email, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { @@ -69,11 +71,10 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { descrizione, telefono, email, presidio, serviceContext); } - @Override public void updatePrenotazione(long prenotazioneId, long userId, Date startDate, Date endDate, String descrizione, ServiceContext serviceContext) throws SystemException, PortalException { - Prenotazione prenotazione = prenotazioneLocalService.fetchPrenotazione(prenotazioneId); + Prenotazione prenotazione = PrenotazioneLocalServiceUtil.fetchPrenotazione(prenotazioneId); if (prenotazione.getUserId() != userId) { throw new SystemException("error.calendar.appointments.prenotazione.not.allowed.update " + prenotazioneId + " user " + userId); @@ -81,38 +82,52 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { prenotazioneLocalService.updatePrenotazione(prenotazioneId, startDate, endDate, descrizione, serviceContext); } - @Override public void deletePrenotazione(long prenotazioneId, long userId) throws SystemException, PortalException { + Prenotazione prenotazione = PrenotazioneLocalServiceUtil.fetchPrenotazione(prenotazioneId); + + //Product Backlog Item 32933 +// if (prenotazione.getUserId() != userId) { +// throw new SystemException("error.calendar.appointments.prenotazione.not.allowed.update " + prenotazioneId +// + " user " + userId); +// } + prenotazioneLocalService.deletePrenotazione(prenotazioneId); } - @Override - public String getPrenotazioniByDate(String presidio, String date, String userId) throws SystemException, - ParseException { + public String getPrenotazioniByDate(String presidio, String date, String userId) throws SystemException, ParseException { long loggetUserId = Long.parseLong(userId); Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); List userDefinitivo = new ArrayList(); try { - if (organization != null) { - List users = userLocalService.getOrganizationUsers(Long.valueOf(presidio)); + if(organization != null){ + List users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio)); + for (User user : users) { Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - "portos_calendario"); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - if (isIstruttore) { + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + + if(isIstruttore){ userDefinitivo.add(user); } } } } - } catch (NumberFormatException | PortalException | SystemException e) { - _log.error(e, e); + + } catch (NumberFormatException | SystemException e) { + _log.error(e,e); + } catch (PortalException e) { + _log.error(e,e); } + Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); JSONArray json = JSONFactoryUtil.createJSONArray(); @@ -131,8 +146,10 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { jsonPrenotazione.put("idPrenotazione", prenotazione.getPrenotazioneId()); jsonPrenotazione.put("inizio", sdf.format(prenotazione.getStartDate())); jsonPrenotazione.put("fine", sdf.format(prenotazione.getEndDate())); - User richiedente = userLocalService.fetchUser(prenotazione.getProfessionistaId()); - if (loggetUserId == prenotazione.getProfessionistaId()) { + + User richiedente = UserLocalServiceUtil.fetchUser(prenotazione.getProfessionistaId()); + + if(loggetUserId == prenotazione.getProfessionistaId()){ jsonPrenotazione.put("visible", true); } else { jsonPrenotazione.put("visible", canSeeFullInformations(loggetUserId)); @@ -153,8 +170,9 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { private boolean canSeeFullInformations(long loggetUserId) throws SystemException { boolean canDo = false; - User user = userLocalService.fetchUser(loggetUserId); - if (user != null) { + + User user = UserLocalServiceUtil.fetchUser(loggetUserId); + if(user != null){ Group siteBO = GroupLocalServiceUtil.fetchGroup(user.getCompanyId(), "Portos BackOffice"); boolean isBoUser = GroupLocalServiceUtil.hasUserGroup(user.getUserId(), siteBO.getGroupId()); if (isBoUser) { @@ -164,7 +182,6 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { return canDo; } - @Override public boolean isSlotAvailable(long funzionarioId, Date startDate, Date endDate) throws SystemException { return prenotazioneLocalService.getAvailableSlotByStartDate_EndDate(funzionarioId, startDate, endDate) == 0; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java index e3a33173..f0f76529 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.portos.calendar.appointments.NoSuchDisponibilitaException; import it.tref.portos.calendar.appointments.model.Disponibilita; import it.tref.portos.calendar.appointments.model.impl.DisponibilitaImpl; import it.tref.portos.calendar.appointments.model.impl.DisponibilitaModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.DisponibilitaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java index 0106fbec..aef95370 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.portos.calendar.appointments.NoSuchFunzionarioException; import it.tref.portos.calendar.appointments.model.Funzionario; import it.tref.portos.calendar.appointments.model.impl.FunzionarioImpl; import it.tref.portos.calendar.appointments.model.impl.FunzionarioModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.FunzionarioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java index 8942c4b7..d056c031 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.portos.calendar.appointments.NoSuchPrenotazioneException; import it.tref.portos.calendar.appointments.model.Prenotazione; import it.tref.portos.calendar.appointments.model.impl.PrenotazioneImpl; import it.tref.portos.calendar.appointments.model.impl.PrenotazioneModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.PrenotazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java index 9cf11dd3..ca7237cc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.portos.calendar.appointments.NoSuchProfessionistaException; import it.tref.portos.calendar.appointments.model.Professionista; import it.tref.portos.calendar.appointments.model.impl.ProfessionistaImpl; import it.tref.portos.calendar.appointments.model.impl.ProfessionistaModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.ProfessionistaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java index 37cc5b1e..4b114261 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java @@ -5,6 +5,7 @@ import it.tref.portos.calendar.appointments.model.Prenotazione; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.regex.Matcher; @@ -13,6 +14,8 @@ import java.util.regex.Pattern; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; +import org.apache.log4j.net.TelnetAppender; + import com.liferay.mail.service.MailServiceUtil; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.mail.MailMessage; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties index 6ee3fbbd..63499da9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_calendar_appointments - build.number=178 - build.date=1655995359988 + build.number=179 + build.date=1675853211115 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp index 8e7e7acd..d654039d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.model.Role"%> <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp index 4b1c0905..6a89a46b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil"%> <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> <%@page import="com.liferay.portal.model.Organization"%> @@ -245,11 +244,11 @@ String dataFine = ParamUtil.getString(request, "dataFineRicerca","");
- - - - - + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp index 2f0ab821..f373ee8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> <%@page import="com.liferay.portal.model.Organization"%> <%@page import="it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp index 9a975ce9..26ec43e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> <%@page import="it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil"%> <%@page import="it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp index 5815f9f3..c732457f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.portos.calendar.appointments.model.Disponibilita"%> <%@ include file="/html/calendar_appointments/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp index b8d77306..161d8081 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> <%@ include file="/html/calendar_appointments/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp index 11c883c0..f3db762d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.text.Format"%> <%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%> <%@page import="com.liferay.portal.kernel.util.StringUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp index 07d5fcb0..8a21a366 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <% /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 index 2e919d89..bd5d4b5b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 @@ -1 +1 @@ -4c011c888941fe61afd3a1627c1f69ff +75bfb39003bc9425cfe9dbfddb78d9ab diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath index 8870e168..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project index 484c8979..d11625d5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957680 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java index 1e36fa75..2ef3c8b7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java @@ -1,8 +1,5 @@ package it.tref.liferay.portos.companyconfig.portlet; -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; - import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.model.Company; @@ -11,6 +8,9 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.util.bridges.mvc.MVCPortlet; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + public class CompanyConfigurationPortlet extends MVCPortlet { public void saveCustomFields(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp index 0afcda91..065d3d8b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 index b4753adf..9fd6310c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 @@ -1 +1 @@ -fd5e412787336cba1834a2f9ea43ca38 +2558fcea11a1b513e80faab1bbcc1c41 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.project index 2a3de83b..6bb194f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957684 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index cfe958eb..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..a7548146 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 index a1326e7a..c1ede356 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 @@ -1 +1 @@ -95d8843f04e59c4342e21f003b5c8deb +fffd049f465a4f20c2137621362b0ef2 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.project index cfa27f35..cc731f4a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957688 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath index 26409659..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project index 60d50a01..73112274 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957693 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component index 63870e17..6cba4c13 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component @@ -2,9 +2,6 @@ - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-deploy-alert-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-deploy-alert-portlet-service.jar new file mode 100644 index 00000000..70868c11 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-deploy-alert-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar new file mode 100644 index 00000000..36c85b7d Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar new file mode 100644 index 00000000..6320191c Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java index 5297156b..c2913866 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java @@ -1,14 +1,5 @@ package it.tref.liferay.portos.deployalert.action; -import it.tref.liferay.portos.deployalert.constants.MailConstants; -import it.tref.liferay.portos.deployalert.model.NotificationMail; -import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil; -import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; -import it.tref.liferay.portos.deployalert.util.DeployAlertUtil; -import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; - -import java.util.List; - import com.liferay.portal.kernel.events.ActionException; import com.liferay.portal.kernel.events.SimpleAction; import com.liferay.portal.kernel.exception.PortalException; @@ -25,6 +16,15 @@ import com.liferay.portal.model.Company; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.util.PortalUtil; +import it.tref.liferay.portos.deployalert.constants.MailConstants; +import it.tref.liferay.portos.deployalert.model.NotificationMail; +import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil; +import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; +import it.tref.liferay.portos.deployalert.util.DeployAlertUtil; +import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; + +import java.util.List; + public class DeployAction extends SimpleAction { private static final Log _log = LogFactoryUtil.getLog(DeployAction.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java index 79fcadd2..1db8998c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java @@ -1,11 +1,5 @@ package it.tref.liferay.portos.deployalert.portlet; -import it.tref.liferay.portos.deployalert.model.NotificationMail; -import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; - -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; - import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.servlet.SessionErrors; @@ -14,6 +8,11 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.util.bridges.mvc.MVCPortlet; +import it.tref.liferay.portos.deployalert.model.NotificationMail; +import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; public class NotificatorPortlet extends MVCPortlet { public void addNotification(ActionRequest request, ActionResponse response) throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java index f581bdc7..6b3e8ead 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java @@ -8,6 +8,10 @@ package it.tref.liferay.portos.deployalert.service.impl; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.util.Validator; + import it.tref.liferay.portos.deployalert.NotificationNomePluginException; import it.tref.liferay.portos.deployalert.NotificationTipoException; import it.tref.liferay.portos.deployalert.model.NotificationLog; @@ -15,10 +19,6 @@ import it.tref.liferay.portos.deployalert.service.base.NotificationLogLocalServi import java.util.Date; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.util.Validator; - /** * The implementation of the notification log local service. *

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java index 1b8d384a..ddd42548 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java @@ -8,15 +8,6 @@ package it.tref.liferay.portos.deployalert.service.impl; -import it.tref.liferay.portos.deployalert.NotificationNomePluginException; -import it.tref.liferay.portos.deployalert.NotificationNomeTemplateException; -import it.tref.liferay.portos.deployalert.model.NotificationMail; -import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; -import it.tref.liferay.portos.deployalert.service.base.NotificationMailLocalServiceBaseImpl; - -import java.util.Date; -import java.util.List; - import com.liferay.portal.kernel.dao.orm.Disjunction; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil; @@ -28,6 +19,15 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; +import it.tref.liferay.portos.deployalert.NotificationNomePluginException; +import it.tref.liferay.portos.deployalert.NotificationNomeTemplateException; +import it.tref.liferay.portos.deployalert.model.NotificationMail; +import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; +import it.tref.liferay.portos.deployalert.service.base.NotificationMailLocalServiceBaseImpl; + +import java.util.Date; +import java.util.List; + /** * The implementation of the notification mail local service. *

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java index 78a471b1..c9c20815 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationLogException; import it.tref.liferay.portos.deployalert.model.NotificationLog; import it.tref.liferay.portos.deployalert.model.impl.NotificationLogImpl; import it.tref.liferay.portos.deployalert.model.impl.NotificationLogModelImpl; -import it.tref.liferay.portos.deployalert.service.persistence.NotificationLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java index 9297ba1f..2940148c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationMailException; import it.tref.liferay.portos.deployalert.model.NotificationMail; import it.tref.liferay.portos.deployalert.model.impl.NotificationMailImpl; import it.tref.liferay.portos.deployalert.model.impl.NotificationMailModelImpl; -import it.tref.liferay.portos.deployalert.service.persistence.NotificationMailPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties index f2bb7f16..183fa0ca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=DA - build.number=12 - build.date=1632922531750 + build.number=13 + build.date=1675847285435 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 index 0d659d7c..7391a9a0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 @@ -1 +1 @@ -5ae48f34ca95a715172797941f9c2717 +20e44765a9887ba15a07be7f690ea28b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath index b498b336..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath @@ -1,6 +1,11 @@ + + + + + @@ -13,7 +18,5 @@ - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project index e1e8384b..3fa5d8b3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957694 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 26b0e067..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - uses - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar index c778df33..7663a6fd 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..28fe9716 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..e1b72855 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-fe-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-fe-portlet-service.jar new file mode 100644 index 00000000..d4f0c6c5 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-fe-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar new file mode 100644 index 00000000..60cce08c Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar new file mode 100644 index 00000000..0833f6eb Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp index 3eed818c..739100b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/fascicolo_action.jsp @@ -9,6 +9,8 @@ <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@page import="java.util.Map"%> <%@page import="java.util.HashMap"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%> + <%@include file="/html/fascicolofe/init.jsp"%> <% SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer"); @@ -35,6 +37,9 @@ if (searchContainer != null) { intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); } String randomId = StringUtil.randomId() + StringPool.UNDERLINE + intPratica.getIntPraticaId(); +String tipoProc = intPratica.getTipoProcedura(); +final List tipiProcedure_task22Febbraio = Arrays.asList(Constants.PROCEDURA_P8, Constants.PROCEDURA_Q8, + Constants.PROCEDURA_P9, Constants.PROCEDURA_Q9, Constants.PROCEDURA_P10, Constants.PROCEDURA_Q10); %> @@ -107,11 +112,15 @@ String randomId = StringUtil.randomId() + StringPool.UNDERLINE + intPratica.getI + && !intPratica.getSospesa() + && !( + tipiProcedure_task22Febbraio.contains(tipoProc.toUpperCase()) + ) %>"> <% Map dataMap = new HashMap(); dataMap.put("id", "dialogAnnullamento"); %> + @@ -119,6 +128,7 @@ String randomId = StringUtil.randomId() + StringPool.UNDERLINE + intPratica.getI + @@ -141,7 +151,10 @@ String randomId = StringUtil.randomId() + StringPool.UNDERLINE + intPratica.getI + && canAddVariante + && !( + tipiProcedure_task22Febbraio.contains(tipoProc.toUpperCase()) + ) %>"> @@ -217,95 +230,6 @@ String randomId = StringUtil.randomId() + StringPool.UNDERLINE + intPratica.getI - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- <% if (Validator.isNotNull(delega)) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index afc957e2..374c3e6d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -290,7 +290,7 @@ document.addEventListener('DOMContentLoaded', function(event) { window.addEventListener('message', messageListener, false); }); function messageListener(event) { - if (event.origin == '<%= originMappe %>') { + console.log("Page dettagli principali @ebus"); try { var data = JSON.parse(event.data); } catch (e) { @@ -308,7 +308,7 @@ function messageListener(event) { lng = data[key]; break; case 'paesaggioLocale': - name = 'input_contestoPaesaggistico'; + name = 'input_paesaggioLocale'; data[key] = duplicati(data[key]); break; case 'livelloDiTutela': @@ -329,7 +329,7 @@ function messageListener(event) { var el = document.getElementById('localizzazioneGeografica'); el.value = lat + '|' + lng + '|8'; } - } + } function duplicati(input) { @@ -808,15 +808,15 @@ $('#tc-intervento-opere-escavazioneCheckbox').change(functio enableDisableChk('#tc-no-opere-escavazioneCheckbox', 'not_enable', false); } }); */ - -$('#normEsenteBolloCheckbox').change(function () { +/*@eabus20230321*/ +/*$('#normEsenteBolloCheckbox').change(function () { var _this = $(this); if (_this.is(":checked")){ enableDisableChk('#lavoriPubbliciCheckbox', 'enable', false); } else { enableDisableChk('#lavoriPubbliciCheckbox', 'not_enable', false); } -}); +});*/ $('#beneDiocesiCheckbox').change(function () { var _this = $(this); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp index c3d470a0..2385662b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp @@ -84,6 +84,7 @@ String keywords = StringPool.BLANK; + <% @@ -128,24 +129,6 @@ String keywords = StringPool.BLANK;
-
- - - - - - -
-
- - - - - - -
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp index 5d5ec546..187ece3f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_finelavori_columns.jsp @@ -28,7 +28,7 @@ String rowUrl = StringPool.BLANK; %> - - \ No newline at end of file + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp index fadad1f5..22ef5592 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view.jsp @@ -561,7 +561,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
-
+<%-- div class="container-fluid container-delega-direttoreLavori">
@@ -629,8 +629,8 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
-
-
+
+<%-- div class="container-fluid container-delega-collaudatore">
@@ -706,7 +706,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
- + Liferay.fire('soggetti-ready', { isCommittenteAndDitta: <%= intPratica.isCommittenteAndDitta() %>, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp index 5fc896a1..f8fa18c1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp @@ -355,153 +355,6 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false); -
-
-
-
- -
-
-
- <% - boolean enabledDelegatoFineLavori = false; - List direttoriLavori = SoggettoServiceUtil - .getValidByIntPratica_TipologiaSoggetto(dettPratica.getIntPraticaId(), - TipoSoggettoUtil.DIRETTORE_LAVORI); - %> - -
- <%= LanguageUtil.get(pageContext, "text-delega-direttoreLavori-disabled") %> -
-
- - - <% - for (Soggetto direttoreLavori : direttoriLavori) { - if (dettPratica.getCodiceFiscaleDelegatoFineLavori() - .equalsIgnoreCase(direttoreLavori.getCodiceFiscale())) { - enabledDelegatoFineLavori = true; - } - %> - - <% - } - %> - - <% - List direttori = SoggettoLocalServiceUtil - .findByIntPratica_CodiceFiscale(dettPratica.getIntPraticaId(), - dettPratica.getCodiceFiscaleDelegatoFineLavori()); - Soggetto direttore = null; - if(!direttori.isEmpty()){ - direttore = direttori.get(0); - } - %> - - -
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- <% - boolean enabledDelegatoCollaudo = false; - List collaudatori = SoggettoServiceUtil - .getValidTmpByIntPratica_TipologiaSoggetto(dettPratica.getIntPraticaId(), - TipoSoggettoUtil.COLLAUDATORE); - %> - -
- <% - String text_delega_collaudatore = StringPool.BLANK; - if (dettPratica.getCollaudoStatico()) { - text_delega_collaudatore = "text-delega-collaudatore-notRequired"; - } else { - text_delega_collaudatore = "text-delega-collaudatore-disabled"; - } - %> - <%= LanguageUtil.get(pageContext, text_delega_collaudatore) %> -
-
- - - <% - for (Soggetto collaudatore : collaudatori) { - if (dettPratica.getCodiceFiscaleDelegatoCollaudo().equalsIgnoreCase( - collaudatore.getCodiceFiscale())) { - enabledDelegatoCollaudo = true; - } - %> - - <% - } - %> - - <% - List collaudatoriDelegati = SoggettoLocalServiceUtil - .findByIntPratica_CodiceFiscale(dettPratica.getIntPraticaId(), - dettPratica.getCodiceFiscaleDelegatoCollaudo()); - Soggetto collaudatoreDelegato = null; - if (!collaudatoriDelegati.isEmpty()) { - collaudatoreDelegato = collaudatoriDelegati.get(0); - } - %> - - -
-
-
-
-
-
-
-
Liferay.fire('soggetti-ready', { isCommittenteAndDitta: <%= intPratica.isCommittenteAndDitta() %>, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml index fe4214ac..0a3a154a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 index 487b85f1..d2167a1a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 @@ -1 +1 @@ -2b88062fbb293f8650a3e1f7d317db7f +044d954232675ea75046a771b446dacf diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath index fcf44f2b..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project index 65a765ba..207ed4e5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957694 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.core.resources.prefs b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 584cbc00..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//docroot/html/firma/configuration.jsp=UTF-8 -encoding//docroot/html/firma/init.jsp=UTF-8 -encoding//docroot/html/firma/view.jsp=UTF-8 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar index 970c9891..8af45610 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar index 99715b6a..16ed0d16 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar index b631ceb4..fe2cf8e3 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..a7548146 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-firma-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-firma-shared.jar new file mode 100644 index 00000000..9013d90c Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/portos-firma-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 index ddcc2b49..d2d59262 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 @@ -1 +1 @@ -a15636541520cd34beccb182ca342eb1 +273d0824c78cff25a3e65a82a4794cba diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath index 1d33a4b7..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath @@ -1,11 +1,9 @@ - - - + - + @@ -13,9 +11,11 @@ - + + + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.project index ddd2cf09..9d4d7211 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957694 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index af295340..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,11 +1,11 @@ - - + + + - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/lib/portos-jbpm-log-task-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/lib/portos-jbpm-log-task-portlet-service.jar new file mode 100644 index 00000000..9a872a60 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/lib/portos-jbpm-log-task-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchInstanceException.java b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchInstanceException.java new file mode 100644 index 00000000..250214c5 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchInstanceException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.workflowweb; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Brian Wing Shun Chan + */ +public class NoSuchInstanceException extends NoSuchModelException { + + public NoSuchInstanceException() { + super(); + } + + public NoSuchInstanceException(String msg) { + super(msg); + } + + public NoSuchInstanceException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchInstanceException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchLogException.java b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchLogException.java new file mode 100644 index 00000000..7b474397 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchLogException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.workflowweb; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Brian Wing Shun Chan + */ +public class NoSuchLogException extends NoSuchModelException { + + public NoSuchLogException() { + super(); + } + + public NoSuchLogException(String msg) { + super(msg); + } + + public NoSuchLogException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchLogException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchTaskException.java b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchTaskException.java new file mode 100644 index 00000000..f9766351 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchTaskException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.workflowweb; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Brian Wing Shun Chan + */ +public class NoSuchTaskException extends NoSuchModelException { + + public NoSuchTaskException() { + super(); + } + + public NoSuchTaskException(String msg) { + super(msg); + } + + public NoSuchTaskException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchTaskException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties index 372e3658..8d9e3b3e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=WorkflowWeb - build.number=9 - build.date=1489666088972 + build.number=13 + build.date=1675936623880 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/tld/c.tld similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/tld/c.tld rename to liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/tld/c.tld diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/ivy.xml.MD5 new file mode 100644 index 00000000..92687bb3 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/ivy.xml.MD5 @@ -0,0 +1 @@ +2ba9fdf0fa9799422d0120a5d4b9fea7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath index e3868bf1..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project index ec7efd4d..a42ab929 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957710 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 2763cf33..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-kaleo-controller-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-kaleo-controller-portlet-service.jar new file mode 100644 index 00000000..77d838ac Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-kaleo-controller-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-kaleo-web-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-kaleo-web-service.jar new file mode 100644 index 00000000..d7f29548 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/portos-kaleo-web-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml index 8796c801..41b5d165 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -2,10 +2,18 @@ - 1 + + it.tref.liferay.portos.kaleo.controller.scheduler.SchedulerKaleoController + + + 240 + second + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml index 3013f16a..669d4b42 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + 3FC + Manifattura Web Group s.r.l. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java index a4c148b8..1fbfd4ba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoInstanceTokenImpl extends KaleoInstanceTokenBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo instance token model diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java index 77d355a7..7b3ed9f5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoLogImpl extends KaleoLogBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo log model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java index 7a09744c..95c3ef40 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoNodeImpl extends KaleoNodeBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo node model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java index 7964dc04..ba2c7535 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java @@ -19,8 +19,8 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") -public class KaleoTaskAssignmentInstanceImpl extends KaleoTaskAssignmentInstanceBaseImpl { +public class KaleoTaskAssignmentInstanceImpl + extends KaleoTaskAssignmentInstanceBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task assignment * instance model instance should use the {@link diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java index 75d3958d..4f935241 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoTaskImpl extends KaleoTaskBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java index d84351ee..f47d858a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoTaskInstanceTokenImpl extends KaleoTaskInstanceTokenBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task instance token diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties index 7f48e8e0..8d35ed8b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_kaleo_controller - build.number=14 - build.date=1633513819560 + build.number=15 + build.date=1675847554551 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 index 42fe76f7..706e4a97 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 @@ -1 +1 @@ -28d87e1dbe151a6703074206020c93ee +0f0b5b50a25011b4f0d632dde76fd71b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath index b600399e..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project index 6ef6b9ff..60e717f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957715 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component index 52ca29e6..7788a07b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar new file mode 100644 index 00000000..495cb0e9 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml index 967a6059..944195a7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml index 8b9a04f4..4a9d3804 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java index e0e765dd..2a3cdcaa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.model.impl; * * @author */ -@SuppressWarnings("serial") public class FormDefinitionLinkImpl extends FormDefinitionLinkBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form definition link model diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java index 1ba04359..bf449f81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java @@ -18,7 +18,6 @@ package it.tref.liferay.portos.kaleo.model.impl; * * @author */ -@SuppressWarnings("serial") public class FormLogImpl extends FormLogBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form log model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java index caf798c6..0758a627 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.model.impl; * * @author */ -@SuppressWarnings("serial") public class FormTemplateLinkImpl extends FormTemplateLinkBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form template link model diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java index 06c048b2..d001cb81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java @@ -12,6 +12,11 @@ public class WorkflowFormAdminPortletControlPanelEntry extends BaseControlPanelE protected boolean hasAccessPermissionDenied(PermissionChecker permissionChecker, Group group, Portlet portlet) throws Exception { - return group.isLayoutSetPrototype() || !WorkflowEngineManagerUtil.isDeployed(); - } + if (group.isLayoutSetPrototype() || !WorkflowEngineManagerUtil.isDeployed()) { + + return true; + } + + return false; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java index 567b830e..c20e3c14 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java @@ -48,9 +48,8 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS * service. */ - @Override - public FormDefinitionLink addFormDefinitionLink(String name, String definitionName, int definitionVersion, - long ddmStructureId, ServiceContext serviceContext) throws PortalException, SystemException { + public FormDefinitionLink addFormDefinitionLink(String name, String definitionName, int definitionVersion, + long ddmStructureId, ServiceContext serviceContext) throws PortalException, SystemException { User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); @@ -67,10 +66,9 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS return addFormDefinitionLink(formDefinitionLink); } - @Override - public FormDefinitionLink updateFormDefinitionLink(long formDefinitionLinkId, String name, String definitionName, - int definitionVersion, long ddmStructureId, ServiceContext serviceContext) throws PortalException, - SystemException { + public FormDefinitionLink updateFormDefinitionLink(long formDefinitionLinkId, String name, String definitionName, + int definitionVersion, long ddmStructureId, ServiceContext serviceContext) throws PortalException, + SystemException { FormDefinitionLink formDefinitionLink = formDefinitionLinkLocalService .getFormDefinitionLink(formDefinitionLinkId); @@ -101,45 +99,40 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS return formDefinitionLink; } - @Override - public int countByCompany(long companyId) throws SystemException { + public int countByCompany(long companyId) throws SystemException { + return formDefinitionLinkPersistence.countByCompany(companyId); + } - return formDefinitionLinkPersistence.countByCompany(companyId); - } + public List findByCompany(long companyId) throws SystemException { + return formDefinitionLinkPersistence.findByCompany(companyId); + } - @Override - public List findByCompany(long companyId) throws SystemException { + public List findByCompany(long companyId, int start, int end) throws SystemException { + return formDefinitionLinkPersistence.findByCompany(companyId, start, end); + } - return formDefinitionLinkPersistence.findByCompany(companyId); - } + public List findByCompany(long companyId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + return formDefinitionLinkPersistence.findByCompany(companyId, start, end, orderByComparator); + } - @Override - public List findByCompany(long companyId, int start, int end) throws SystemException { + public int countByDDMStructureId(long ddmStructureId) throws SystemException { + return formDefinitionLinkPersistence.countByDDMStructureId(ddmStructureId); + } - return formDefinitionLinkPersistence.findByCompany(companyId, start, end); - } + public FormDefinitionLink fetchByC_DefinitionName_DefinitionVersion(long companyId, String definitionName, + int definitionVersion) throws SystemException { - @Override - public List findByCompany(long companyId, int start, int end, - OrderByComparator orderByComparator) throws SystemException { + List formDefinitionLinks = + formDefinitionLinkPersistence.findByC_DefinitionName_DefinitionVersion(companyId, definitionName, + definitionVersion); - return formDefinitionLinkPersistence.findByCompany(companyId, start, end, orderByComparator); - } - - @Override - public int countByDDMStructureId(long ddmStructureId) throws SystemException { - - return formDefinitionLinkPersistence.countByDDMStructureId(ddmStructureId); - } + if (formDefinitionLinks.isEmpty()) { + return null; + } - @Override - public FormDefinitionLink fetchByC_DefinitionName_DefinitionVersion(long companyId, String definitionName, - int definitionVersion) throws SystemException { - - List formDefinitionLinks = formDefinitionLinkPersistence - .findByC_DefinitionName_DefinitionVersion(companyId, definitionName, definitionVersion); - return formDefinitionLinks.isEmpty() ? null : formDefinitionLinks.get(0); - } + return formDefinitionLinks.get(0); + } private void setFormDefinitionLink(FormDefinitionLink formDefinitionLink, String name, String definitionName, int definitionVersion, long ddmStructureId) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java index 82c61219..1de6654d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java @@ -39,9 +39,8 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl { * it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil} to access the form log local service. */ - @Override - public FormLog addFormLog(long workflowInstanceId, long workflowTaskId, String transitionName, - String formParameters, ServiceContext serviceContext) throws SystemException, PortalException { + public FormLog addFormLog(long workflowInstanceId, long workflowTaskId, String transitionName, String formParameters, + ServiceContext serviceContext) throws SystemException, PortalException { Date now = new Date(); User user = userLocalService.getUser(serviceContext.getUserId()); @@ -59,9 +58,8 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl { return addFormLog(formLog); } - @Override - public FormLog updateFormLog(long formLogId, long workflowInstanceId, long workflowTaskId, String transitionName, - String formParameters, ServiceContext serviceContext) throws SystemException, PortalException { + public FormLog updateFormLog(long formLogId, long workflowInstanceId, long workflowTaskId, String transitionName, + String formParameters, ServiceContext serviceContext) throws SystemException, PortalException { FormLog formLog = formLogLocalService.getFormLog(formLogId); formLog.setModifiedDate(serviceContext.getModifiedDate(new Date())); @@ -72,26 +70,20 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl { return updateFormLog(formLog); } - @Override - public List findByC_Instance(long companyId, long workflowInstanceId, int start, int end) - throws SystemException { + public List findByC_Instance(long companyId, long workflowInstanceId, int start, int end) + throws SystemException { + return formLogPersistence.findByC_Instance(companyId, workflowInstanceId, start, end); + } - return formLogPersistence.findByC_Instance(companyId, workflowInstanceId, start, end); - } - - @Override - public FormLog findByC_Task(long companyId, long workflowTaskId) throws SystemException { - - List list = formLogPersistence.findByC_Task(companyId, workflowTaskId, 0, 1); - return list.isEmpty() ? null : list.get(0); - } - - @Override - public FormLog findByC_Task_TransitionName(long companyId, long workflowTaskId, String transitionName) - throws SystemException { + public FormLog findByC_Task(long companyId, long workflowTaskId) throws SystemException { + List list = formLogPersistence.findByC_Task(companyId, workflowTaskId, 0, 1); + return list.isEmpty() ? null : list.get(0); + } - List list = formLogPersistence.findByC_Task_TransitionName(companyId, workflowTaskId, transitionName, - 0, 1); - return list.isEmpty() ? null : list.get(0); - } + public FormLog findByC_Task_TransitionName(long companyId, long workflowTaskId, String transitionName) + throws SystemException { + List list = + formLogPersistence.findByC_Task_TransitionName(companyId, workflowTaskId, transitionName, 0, 1); + return list.isEmpty() ? null : list.get(0); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java index dbc9a2b1..8a4f45fc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java @@ -43,9 +43,8 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi * service. */ - @Override - public FormTemplateLink addFormTemplateLink(long formDefinitionLinkId, long ddmTemplateId, long kaleoNodeId, - String transitionName) throws SystemException, PortalException { + public FormTemplateLink addFormTemplateLink(long formDefinitionLinkId, long ddmTemplateId, long kaleoNodeId, + String transitionName) throws SystemException, PortalException { validate(0, formDefinitionLinkId, ddmTemplateId, kaleoNodeId, transitionName); FormTemplateLink formTemplateLink = createFormTemplateLink(counterLocalService.increment(FormTemplateLink.class @@ -54,9 +53,8 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi return addFormTemplateLink(formTemplateLink); } - @Override - public FormTemplateLink updateFormTemplateLink(long formTemplateLinkId, long formDefinitionLinkId, - long ddmTemplateId, long kaleoNodeId, String transitionName) throws SystemException, PortalException { + public FormTemplateLink updateFormTemplateLink(long formTemplateLinkId, long formDefinitionLinkId, + long ddmTemplateId, long kaleoNodeId, String transitionName) throws SystemException, PortalException { FormTemplateLink formTemplateLink = getFormTemplateLink(formTemplateLinkId); validate(formTemplateLinkId, formDefinitionLinkId, ddmTemplateId, kaleoNodeId, transitionName); @@ -64,34 +62,25 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi return updateFormTemplateLink(formTemplateLink); } - @Override - public int countByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { - - return formTemplateLinkPersistence.countByFormDefinitionLinkId(formDefinitionLinkId); - } + public int countByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { + return formTemplateLinkPersistence.countByFormDefinitionLinkId(formDefinitionLinkId); + } - @Override - public List findByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { - - return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId); - } + public List findByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { + return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId); + } - @Override - public List findByFormDefinitionLinkId(long formDefinitionLinkId, int start, int end) - throws SystemException { + public List findByFormDefinitionLinkId(long formDefinitionLinkId, int start, int end) + throws SystemException { + return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId, start, end); + } - return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId, start, end); - } - - @Override - public int countByDDMTemplateId(long ddmTemplateId) throws SystemException { - - return formTemplateLinkPersistence.countByDDMTemplateId(ddmTemplateId); - } + public int countByDDMTemplateId(long ddmTemplateId) throws SystemException { + return formTemplateLinkPersistence.countByDDMTemplateId(ddmTemplateId); + } - @Override - public FormTemplateLink fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(long formDefinitionLinkId, - long kaleoNodeId, String transitionName) throws SystemException { + public FormTemplateLink fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(long formDefinitionLinkId, + long kaleoNodeId, String transitionName) throws SystemException { return formTemplateLinkPersistence.fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(formDefinitionLinkId, kaleoNodeId, transitionName); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java index b455af46..dbedd1a7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.kaleo.NoSuchFormDefinitionLinkException; import it.tref.liferay.portos.kaleo.model.FormDefinitionLink; import it.tref.liferay.portos.kaleo.model.impl.FormDefinitionLinkImpl; import it.tref.liferay.portos.kaleo.model.impl.FormDefinitionLinkModelImpl; -import it.tref.liferay.portos.kaleo.service.persistence.FormDefinitionLinkPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java index 130fab6e..b1b227fa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.kaleo.NoSuchFormLogException; import it.tref.liferay.portos.kaleo.model.FormLog; import it.tref.liferay.portos.kaleo.model.impl.FormLogImpl; import it.tref.liferay.portos.kaleo.model.impl.FormLogModelImpl; -import it.tref.liferay.portos.kaleo.service.persistence.FormLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java index d863ff1e..2b7e6a71 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.kaleo.NoSuchFormTemplateLinkException; import it.tref.liferay.portos.kaleo.model.FormTemplateLink; import it.tref.liferay.portos.kaleo.model.impl.FormTemplateLinkImpl; import it.tref.liferay.portos.kaleo.model.impl.FormTemplateLinkModelImpl; -import it.tref.liferay.portos.kaleo.service.persistence.FormTemplateLinkPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties index 8d10657b..5d490d12 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Kaleo - build.number=29 - build.date=1643195718440 + build.number=31 + build.date=1675847724806 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp index 1c412f4a..f48c6d2d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.StringUtil"%> <%@page import="java.util.Arrays"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp index 7c27449c..79ab159f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.workflow.kaleo.definition.NodeType"%> <%@page import="com.liferay.portal.workflow.kaleo.model.KaleoTransition"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp index 1df8200b..cc24d1b3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.kaleo.model.FormDefinitionLink"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp index 771a9225..2a47faca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp @@ -1,3 +1,2 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp index fcdf48fb..4a484421 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.HtmlUtil"%> <%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp index b299e5d0..ebdf9125 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.kaleo.service.FormDefinitionLinkLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.kaleo.FormTemplateLinkKaleoNodeIdException"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp index bee31ed9..bf3646b2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.kaleo.model.FormTemplateLink"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp index 5b28a987..7ed5a235 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="javax.portlet.PortletRequest"%> <%@page import="com.liferay.portal.kernel.language.UnicodeLanguageUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp index 5935af2d..d362e95f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.language.UnicodeLanguageUtil"%> <%@page import="com.liferay.portal.kernel.dao.search.RowChecker"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp index 29837573..a71783d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMStructure"%> <%@page import="javax.portlet.PortletRequest"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp index ad2dc99a..86a69556 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portlet.dynamicdatamapping.service.DDMStructureLocalServiceUtil"%> <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMStructure"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 index 4240e55c..b516fd24 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 @@ -1 +1 @@ -7de40a8d6325963ff798df2ebe07ecbc +cae08a4d6200ab538326b79a73153f0b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath index 317e9542..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project index e106cdd8..d39b6c0c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957723 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml index f4efe922..7ea9cf5f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java index d9142b9e..6fed5397 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java @@ -28,9 +28,9 @@ import com.liferay.portal.util.PortalUtil; import eu.bitwalker.useragentutils.UserAgent; import it.tref.portos.liferay.log.camel.core.CamelCoreInitializer; import it.tref.portos.liferay.log.model.LogActionDetails; +import it.tref.portos.liferay.log.utility.Constants; import it.tref.portos.liferay.log.spring.SpringContextBeanScanner; import it.tref.portos.liferay.log.utility.ClassUtils; -import it.tref.portos.liferay.log.utility.Constants; import java.lang.reflect.Field; import java.text.ParseException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java index 22b7df63..fbffb9e0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java @@ -1,7 +1,5 @@ package it.tref.portos.liferay.log.action; -import it.tref.portos.liferay.log.utility.Constants; - import com.liferay.portal.kernel.events.ActionException; import com.liferay.portal.kernel.events.SimpleAction; import com.liferay.portal.kernel.exception.PortalException; @@ -26,6 +24,9 @@ import com.liferay.portlet.expando.model.ExpandoTableConstants; import com.liferay.portlet.expando.service.ExpandoColumnLocalServiceUtil; import com.liferay.portlet.expando.service.ExpandoTableLocalServiceUtil; +import it.tref.portos.liferay.log.utility.Constants; + + public class LogStartupAction extends SimpleAction { private static Log _log = LogFactoryUtil.getLog(LogStartupAction.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp index d43a95e8..bce00918 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp index 27251fd3..486845c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <% /** * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 index ce0b87f8..2adf20b3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 @@ -1 +1 @@ -34c76a0a5e5c00d50cd4f61ccdf0db5d +d8cadd651d191bed698cd2e918237a31 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath index 502539e1..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project index 88f25f07..24b75d79 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957723 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component index d3bd6d76..04dff753 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar new file mode 100644 index 00000000..36c85b7d Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar new file mode 100644 index 00000000..6320191c Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml index 01e21b2d..4bc6119b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml index f326de8a..5e530faf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java index c1982e22..73479b6b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java @@ -30,7 +30,8 @@ public class MailManagerMessageListener implements MessageListener { String mode = (String) message.get("mode"); MailMessage mailMessage = (MailMessage) message.getPayload(); ServiceContext serviceContext = (ServiceContext) message.get("serviceContext"); - boolean checkPermission = GetterUtil.getBoolean(message.get("checkPermission"), true); + boolean checkPermission = GetterUtil.getBoolean(message.get("checkPermission"), Boolean.TRUE); + String className = GetterUtil.getString(message.get("className")); long classPK = GetterUtil.getLong(message.get("classPK")); boolean sendSync = false; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java index dcf03919..e63fc4fe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java @@ -45,14 +45,15 @@ import com.liferay.portal.service.ServiceContext; * @see it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil */ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil} to access the email attachment local - * service. - */ - @Override - public EmailAttachment addEmailAttachment(long companyId, long emailId, long folderId, String fileName, File file) - throws PortalException, SystemException { + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link + * it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil} to access the + * email attachment local service. + */ + public EmailAttachment addEmailAttachment(long companyId, long emailId, long folderId, String fileName, File file) + throws PortalException, SystemException { Company company = companyLocalService.getCompany(companyId); @@ -78,19 +79,18 @@ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalService dlAppLocalService.addFileEntry(defaultUser.getUserId(), folder.getRepositoryId(), folder.getFolderId(), sourceFileName, mimeType, title, StringPool.BLANK, StringPool.BLANK, file, serviceContext); - EmailAttachment emailAttachment = - createEmailAttachment(new EmailAttachmentPK(emailId, fileEntry - .getFileEntryId())); + EmailAttachment emailAttachment = + emailAttachmentLocalService.createEmailAttachment(new EmailAttachmentPK(emailId, fileEntry.getFileEntryId())); - return addEmailAttachment(emailAttachment); - } + return emailAttachmentLocalService.addEmailAttachment(emailAttachment); + } - @Override - public EmailAttachment deleteEmailAttachment(EmailAttachmentPK emailAttachmentPK) throws PortalException, - SystemException { - EmailAttachment emailAttachment = getEmailAttachment(emailAttachmentPK); - return deleteEmailAttachment(emailAttachment); - } + @Override + public EmailAttachment deleteEmailAttachment(EmailAttachmentPK emailAttachmentPK) throws PortalException, + SystemException { + EmailAttachment emailAttachment = emailAttachmentLocalService.getEmailAttachment(emailAttachmentPK); + return deleteEmailAttachment(emailAttachment); + } @Override public EmailAttachment deleteEmailAttachment(EmailAttachment emailAttachment) throws SystemException { @@ -106,25 +106,21 @@ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalService return emailAttachment; } - @Override - public List findByEmailId(long emailId) throws SystemException { - return emailAttachmentPersistence.findByEmailId(emailId); - } + public List findByEmailId(long emailId) throws SystemException { + return emailAttachmentPersistence.findByEmailId(emailId); + } - @Override - public List findByEmailId(long emailId, int start, int end) throws SystemException { - return emailAttachmentPersistence.findByEmailId(emailId); - } + public List findByEmailId(long emailId, int start, int end) throws SystemException { + return emailAttachmentPersistence.findByEmailId(emailId); + } - @Override - public int countByEmailId(long emailId) throws SystemException { - return emailAttachmentPersistence.countByEmailId(emailId); - } + public int countByEmailId(long emailId) throws SystemException { + return emailAttachmentPersistence.countByEmailId(emailId); + } - @Override - public EmailAttachment fetchByFileEntryId(long fileEntryId) throws SystemException { - return emailAttachmentPersistence.fetchByFileEntryId(fileEntryId); - } + public EmailAttachment fetchByFileEntryId(long fileEntryId) throws SystemException { + return emailAttachmentPersistence.fetchByFileEntryId(fileEntryId); + } private void validate(long emailId, String fileName, File file) throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java index 75c4fb19..e4eb1948 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java @@ -7,6 +7,24 @@ package it.tref.liferay.portos.mailmanager.service.impl; +import com.liferay.mail.model.FileAttachment; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.repository.model.Folder; +import com.liferay.portal.kernel.util.FileUtil; +import com.liferay.portal.kernel.util.OrderByComparator; +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.model.Company; +import com.liferay.portal.model.Group; +import com.liferay.portal.model.User; +import com.liferay.portal.security.permission.ActionKeys; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portlet.documentlibrary.model.DLFolderConstants; + import it.tref.liferay.portos.mailmanager.EmailBccException; import it.tref.liferay.portos.mailmanager.EmailBulkAddressesException; import it.tref.liferay.portos.mailmanager.EmailCcException; @@ -27,24 +45,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import com.liferay.mail.model.FileAttachment; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.repository.model.Folder; -import com.liferay.portal.kernel.util.FileUtil; -import com.liferay.portal.kernel.util.OrderByComparator; -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.model.Company; -import com.liferay.portal.model.Group; -import com.liferay.portal.model.User; -import com.liferay.portal.security.permission.ActionKeys; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; - /** * The implementation of the email local service. + * *

* All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy * their definitions into the {@link it.noovle.azimut.icf.mailmanager.service.EmailLocalService} interface. @@ -63,63 +66,61 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { * it.noovle.azimut.icf.mailmanager.service.EmailLocalServiceUtil} to access the email local service. */ - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, ServiceContext serviceContext) throws Exception { + private final static Log _log = LogFactoryUtil.getLog(EmailLocalServiceImpl.class); - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, Collections. emptyList(), serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, ServiceContext serviceContext) + throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, Collections. emptyList(), serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, List fileAttachments, - ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, fileAttachments, false, null, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, + List fileAttachments, ServiceContext serviceContext) throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, fileAttachments, false, null, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String[] bulkAddresses, String subject, String body, boolean htmlFormat, String[] replyTo, - String messageId, String inReplyTo, String smtpHost, int smtpPort, boolean smtpSecure, String smtpUsername, - String smtpPassword, List fileAttachments, ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, bulkAddresses, subject, body, htmlFormat, replyTo, - messageId, inReplyTo, smtpHost, smtpPort, smtpSecure, smtpUsername, smtpPassword, fileAttachments, - false, null, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String[] bulkAddresses, String subject, String body, boolean htmlFormat, + String[] replyTo, String messageId, String inReplyTo, String smtpHost, int smtpPort, + boolean smtpSecure, String smtpUsername, String smtpPassword, + List fileAttachments, ServiceContext serviceContext) throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, bulkAddresses, subject, body, htmlFormat, + replyTo, messageId, inReplyTo, smtpHost, smtpPort, smtpSecure, smtpUsername, smtpPassword, + fileAttachments, false, null, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, List fileAttachments, boolean sendSync, - ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, fileAttachments, sendSync, null, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, + List fileAttachments, boolean sendSync, ServiceContext serviceContext) + throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, fileAttachments, sendSync, null, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, List fileAttachments, boolean sendSync, - String templateName, ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, fileAttachments, sendSync, templateName, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, + List fileAttachments, boolean sendSync, String templateName, + ServiceContext serviceContext) throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, fileAttachments, sendSync, templateName, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String[] bulkAddresses, String subject, String body, boolean htmlFormat, String[] replyTo, - String messageId, String inReplyTo, String smtpHost, int smtpPort, boolean smtpSecure, String smtpUsername, - String smtpPassword, List fileAttachments, boolean sendSync, String templateName, + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String[] bulkAddresses, String subject, String body, boolean htmlFormat, + String[] replyTo, String messageId, String inReplyTo, String smtpHost, int smtpPort, + boolean smtpSecure, String smtpUsername, String smtpPassword, + List fileAttachments, boolean sendSync, String templateName, ServiceContext serviceContext) throws Exception { User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); validate(from, to, cc, bcc, bulkAddresses, subject, body, replyTo); - Email email = createEmail(counterLocalService.increment(Email.class.getName())); + + Email email = emailLocalService.createEmail(counterLocalService.increment(Email.class.getName())); + email.setGroupId(serviceContext.getScopeGroupId()); email.setCompanyId(serviceContext.getCompanyId()); email.setCreateDate(serviceContext.getCreateDate(now)); @@ -171,11 +172,11 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return email; } - @Override - public Email updateEmail(long emailId, String from, String to[], String cc[], String bcc[], String subject, - String body, ServiceContext serviceContext) throws Exception { + public Email updateEmail(long emailId, String from, String to[], String cc[], String bcc[], + String subject, String body, ServiceContext serviceContext) throws Exception { + + Email email = emailLocalService.getEmail(emailId); - Email email = getEmail(emailId); validate(from, to, cc, bcc, null, subject, body, null); email.setModifiedDate(new Date()); email.setFrom(from); @@ -187,10 +188,10 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return updateEmail(email); } - @Override - public Email markAsSent(long emailId, Date sentDate, String statusMessage) throws PortalException, SystemException { + public Email markAsSent(long emailId, Date sentDate, String statusMessage) throws PortalException, + SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setSent(true); email.setSentDate(sentDate); @@ -198,19 +199,18 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return updateEmail(email); } - @Override - public Email updateStatusMessage(long emailId, String statusMessage) throws PortalException, SystemException { + public Email updateStatusMessage(long emailId, String statusMessage) throws PortalException, + SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setStatusMessage(statusMessage); return updateEmail(email); } - @Override public Email resendEmail(long emailId) throws PortalException, SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setStatusMessage(""); email.setSent(false); @@ -219,10 +219,9 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return updateEmail(email); } - @Override public Email cancelEmail(long emailId) throws PortalException, SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setCancel(true); return updateEmail(email); @@ -230,8 +229,7 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { @Override public Email deleteEmail(long emailId) throws PortalException, SystemException { - - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); return deleteEmail(email); } @@ -247,92 +245,76 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return email; } - @Override public List findByCompany(long companyId) throws SystemException { return emailPersistence.findByCompany(companyId); } - @Override public List findByCompany(long companyId, int start, int end) throws SystemException { return emailPersistence.findByCompany(companyId, start, end); } - @Override public List findByCompany(long companyId, int start, int end, OrderByComparator orderByComparator) throws SystemException { return emailPersistence.findByCompany(companyId, start, end, orderByComparator); } - @Override public int countByCompany(long companyId) throws SystemException { return emailPersistence.countByCompany(companyId); } - @Override public List findByC_G(long companyId, long groupId) throws SystemException { return emailPersistence.findByC_G(companyId, groupId); } - @Override public List findByC_G(long companyId, long groupId, int start, int end) throws SystemException { return emailPersistence.findByC_G(companyId, groupId, start, end); } - @Override - public List findByC_G(long companyId, long groupId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { - + public List findByC_G(long companyId, long groupId, int start, int end, + OrderByComparator orderByComparator) throws SystemException { return emailPersistence.findByC_G(companyId, groupId, start, end, orderByComparator); } - @Override public int countByC_G(long companyId, long groupId) throws SystemException { return emailPersistence.countByC_G(companyId, groupId); } - @Override public List findByC_G_T(long companyId, long groupId, String templateName) throws SystemException { return emailPersistence.findByC_G_T(companyId, groupId, templateName); } - @Override public List findByC_G_T(long companyId, long groupId, String templateName, int start, int end) throws SystemException { return emailPersistence.findByC_G_T(companyId, groupId, templateName, start, end); } - @Override public int countByC_G_T(long companyId, long groupId, String templateName) throws SystemException { return emailPersistence.countByC_G_T(companyId, groupId, templateName); } - @Override public List findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK) throws SystemException { return emailPersistence.findByC_G_C_C(companyId, groupId, classNameId, classPK); } - @Override - public List findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK, int start, int end) - throws SystemException { - + public List findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK, int start, + int end) throws SystemException { return emailPersistence.findByC_G_C_C(companyId, groupId, classNameId, classPK, start, end); } - @Override - public int countByC_G_C_C(long companyId, long groupId, long classNameId, long classPK) throws SystemException { - + public int countByC_G_C_C(long companyId, long groupId, long classNameId, long classPK) + throws SystemException { return emailPersistence.countByC_G_C_C(companyId, groupId, classNameId, classPK); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java index f929eeef..ec5814cf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java @@ -59,57 +59,71 @@ public class EmailTemplateLocalServiceImpl extends EmailTemplateLocalServiceBase String subject, String body, boolean attachmentPermitted, ServiceContext serviceContext) throws SystemException, PortalException { - User user = userLocalService.getUser(serviceContext.getUserId()); - Date now = new Date(); - validate(templateName, from, to, cc, ccn, subject, body); - EmailTemplate emailTemplate = createEmailTemplate(counterLocalService.increment(EmailTemplate.class.getName())); - emailTemplate.setCompanyId(serviceContext.getCompanyId()); - emailTemplate.setUserId(user.getUserId()); - emailTemplate.setUserName(user.getFullName()); - emailTemplate.setCreateDate(serviceContext.getCreateDate(now)); - emailTemplate.setModifiedDate(serviceContext.getModifiedDate(now)); - emailTemplate.setGroupId(serviceContext.getScopeGroupId()); - emailTemplate.setTemplateName(templateName); - emailTemplate.setFrom(from); - emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); - emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); - emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); - emailTemplate.setSubject(subject); - emailTemplate.setBody(body); - emailTemplate.setAttachmentPermitted(attachmentPermitted); - emailTemplate = addEmailTemplate(emailTemplate); - // Resource - resourceLocalService.addResources(emailTemplate.getCompanyId(), emailTemplate.getGroupId(), - emailTemplate.getUserId(), EmailTemplate.class.getName(), emailTemplate.getPrimaryKey(), false, true, - true); - return emailTemplate; - } + User user = userLocalService.getUser(serviceContext.getUserId()); + Date now = new Date(); + validate(templateName, from, to, cc, ccn, subject, body); + + EmailTemplate emailTemplate = + emailTemplateLocalService.createEmailTemplate(counterLocalService.increment(EmailTemplate.class.getName())); + + emailTemplate.setCompanyId(serviceContext.getCompanyId()); + emailTemplate.setUserId(user.getUserId()); + emailTemplate.setUserName(user.getFullName()); + emailTemplate.setCreateDate(serviceContext.getCreateDate(now)); + emailTemplate.setModifiedDate(serviceContext.getModifiedDate(now)); + emailTemplate.setGroupId(serviceContext.getScopeGroupId()); + + emailTemplate.setTemplateName(templateName); + + emailTemplate.setFrom(from); + emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); + emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); + emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); + emailTemplate.setSubject(subject); + emailTemplate.setBody(body); + + emailTemplate.setAttachmentPermitted(attachmentPermitted); + + emailTemplate = emailTemplateLocalService.addEmailTemplate(emailTemplate); + + // Resource + + resourceLocalService.addResources(emailTemplate.getCompanyId(), emailTemplate.getGroupId(), + emailTemplate.getUserId(), EmailTemplate.class.getName(), emailTemplate.getPrimaryKey(), false, true, true); + + return emailTemplate; + } @Override public EmailTemplate updateEmailTemplate(long emailTemplateId, String templateName, String from, String[] to, String[] cc, String[] ccn, String subject, String body, boolean attachmentPermitted, ServiceContext serviceContext) throws SystemException, PortalException { - EmailTemplate emailTemplate = getEmailTemplate(emailTemplateId); - validate(templateName, from, to, cc, ccn, subject, body); - emailTemplate.setModifiedDate(serviceContext.getModifiedDate(new Date())); - emailTemplate.setFrom(from); - emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); - emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); - emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); - emailTemplate.setSubject(subject); - emailTemplate.setBody(body); - emailTemplate.setAttachmentPermitted(attachmentPermitted); - emailTemplate = updateEmailTemplate(emailTemplate); - return emailTemplate; - } + EmailTemplate emailTemplate = emailTemplateLocalService.getEmailTemplate(emailTemplateId); - @Override - public EmailTemplate deleteEmailTemplate(long emailTemplateId) throws PortalException, SystemException { + validate(templateName, from, to, cc, ccn, subject, body); - EmailTemplate emailTemplate = getEmailTemplate(emailTemplateId); - return deleteEmailTemplate(emailTemplate); - } + emailTemplate.setModifiedDate(serviceContext.getModifiedDate(new Date())); + + emailTemplate.setFrom(from); + emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); + emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); + emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); + emailTemplate.setSubject(subject); + emailTemplate.setBody(body); + + emailTemplate.setAttachmentPermitted(attachmentPermitted); + + emailTemplate = emailTemplateLocalService.updateEmailTemplate(emailTemplate); + + return emailTemplate; + } + + @Override + public EmailTemplate deleteEmailTemplate(long emailTemplateId) throws PortalException, SystemException { + EmailTemplate emailTemplate = emailTemplateLocalService.getEmailTemplate(emailTemplateId); + return deleteEmailTemplate(emailTemplate); + } @Override public EmailTemplate deleteEmailTemplate(EmailTemplate emailTemplate) throws SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java index 6931e006..967ba906 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException; import it.tref.liferay.portos.mailmanager.model.EmailAttachment; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java index 6b806a45..12f7c61e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java @@ -44,7 +44,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailException; import it.tref.liferay.portos.mailmanager.model.Email; import it.tref.liferay.portos.mailmanager.model.impl.EmailImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java index b4583674..c7944800 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailTemplateException; import it.tref.liferay.portos.mailmanager.model.EmailTemplate; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailTemplatePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java index e22be439..5f01e625 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java @@ -64,6 +64,8 @@ import javax.mail.internet.MimeMultipart; * @author Brett Swaim */ public class MailEngine { + + private static boolean mwgDebug = false; public static Session getSession() { return getSession(false); @@ -74,7 +76,7 @@ public class MailEngine { Session session = Session.getInstance(properties); - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { session.setDebug(true); session.getProperties().list(System.out); @@ -89,14 +91,14 @@ public class MailEngine { try { session = MailServiceUtil.getSession(); } catch (SystemException se) { - if (_log.isWarnEnabled()) { + if (mwgDebug || _log.isWarnEnabled()) { _log.warn(se, se); } session = InfrastructureUtil.getMailSession(); } - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { session.setDebug(true); session.getProperties().list(System.out); @@ -151,7 +153,7 @@ public class MailEngine { long startTime = System.currentTimeMillis(); - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { _log.debug("From: " + from); _log.debug("To: " + Arrays.toString(to)); _log.debug("CC: " + Arrays.toString(cc)); @@ -164,7 +166,7 @@ public class MailEngine { _log.debug("Message ID: " + messageId); _log.debug("In Reply To: " + inReplyTo); - if ((fileAttachments != null) && _log.isDebugEnabled()) { + if ((fileAttachments != null) && (mwgDebug || _log.isDebugEnabled())) { for (int i = 0; i < fileAttachments.size(); i++) { FileAttachment fileAttachment = fileAttachments.get(i); @@ -326,7 +328,7 @@ public class MailEngine { throw new MailEngineException(e); } - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { _log.debug("Sending mail takes " + (System.currentTimeMillis() - startTime) + " ms"); } } @@ -503,7 +505,7 @@ public class MailEngine { } } catch (MessagingException me) { if (me.getNextException() instanceof SocketException) { - if (_log.isWarnEnabled()) { + if (mwgDebug || _log.isWarnEnabled()) { _log.warn("Failed to connect to a valid mail server. Please " + "make sure one is properly configured. " + me.getMessage()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java index e0aeda5b..1d65582c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java @@ -24,6 +24,8 @@ import java.util.List; public class MailManagerUtil { + private final static Log _log = LogFactoryUtil.getLog(MailManagerUtil.class); + public static Email addEmailByTemplate(String className, long classPK, long emailTemplateId, JSONObject templateParamJSON, List fileAttachments, ServiceContext serviceContext) throws Exception { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties index 78467adf..8217d5d6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Mail - build.number=94 - build.date=1643195697895 + build.number=96 + build.date=1675847807042 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp index 39f77085..a4859bbe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp index 114d25d0..fdde85d0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp index 25082e4d..7e89ec84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp index f69c6d61..d451e1e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp index 79168c4b..291e245a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/init.jsp" %> <%@page import="org.apache.log4j.Logger"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp index 67111b66..73bfc8be 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/send_popup/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp index 5ce28676..ea4e3093 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <% String className = ParamUtil.getString(request, "className"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp index 0450532b..e84a3723 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/send_popup/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp index 57316f64..490715d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp index f513b796..ca92fe43 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <%@page import="it.tref.liferay.portos.mailmanager.service.EmailTemplateLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp index f7a89418..191d09e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.util.PortalUtil"%> <%@page import="com.liferay.portlet.PortletURLUtil"%> @@ -28,6 +27,8 @@ <%@page import="it.tref.liferay.portos.mailmanager.shared.util.MailManagerConstants"%> +<%@ page contentType="text/html; charset=UTF-8" %> + <%@page import="com.liferay.portal.kernel.util.GetterUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp index 89ef8581..72c4f394 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp index 43de79f2..03f22413 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp index 08210e78..96e85b6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp index e1014604..8936f925 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/init.jsp" %> <%@page import="com.liferay.portal.kernel.util.TextFormatter"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp index 5a3f7523..8057dbba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 index 144cb25b..b813789a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 @@ -1 +1 @@ -0fc42888686cd86e960405746a231750 +1f8ac7aadaf94495088b42383cd9d705 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.project index d40dfb40..50a39a7c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957739 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/portos-maintenance-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/portos-maintenance-portlet-service.jar new file mode 100644 index 00000000..a477f72f Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/lib/portos-maintenance-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml index 6141f4eb..47e9c9fa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml index 88c74249..fb874c15 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java index 56360468..5a857eb3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java @@ -26,6 +26,10 @@ import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.util.PortalUtil; import com.liferay.util.bridges.mvc.MVCPortlet; + +/** + * Portlet implementation class AdminMaintenancePortlet + */ public class AdminMaintenancePortlet extends MVCPortlet { private static final Log _log = LogFactoryUtil.getLog(AdminMaintenancePortlet.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java index efe4a7f2..2d43c614 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.maintenance.NoSuchMaintenanceScheduleException; import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule; import it.tref.liferay.portos.maintenance.model.impl.MaintenanceScheduleImpl; import it.tref.liferay.portos.maintenance.model.impl.MaintenanceScheduleModelImpl; -import it.tref.liferay.portos.maintenance.service.persistence.MaintenanceSchedulePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties index d7415bae..3127ec7d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_maintenance - build.number=44 - build.date=1632922838322 + build.number=46 + build.date=1675847919564 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp index 0025417d..dce6f59c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%-- /** * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp index e6211f90..828aeff3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceType"%> <%@page import="it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceOnReboot"%> <%@include file="/html/admin_maintenance/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp index eb4f843f..bc3709cb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="it.tref.liferay.portos.maintenance.model.MaintenanceSchedule"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp index 03471ada..f9fd8c27 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/admin_maintenance/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp index de935915..4fe2697a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/admin_maintenance/init.jsp"%> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp index a2ce1bd1..fc9c070f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/admin_maintenance/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp index bf3879d1..9d478468 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/admin_maintenance/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp index 62f983fd..17ee0431 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.text.SimpleDateFormat"%> <%@page import="com.liferay.portlet.PortletURLUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp index fc2ebbf3..3d749f84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp index 64293d88..c2f4fef2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/poller_maintenance/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.project index 82c63569..bafdd3db 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957744 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar index 39c715bb..de58504c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp index 73846011..0d7187ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp index 7e4b2740..0ed21100 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portlet.PortletURLUtil"%> <%@page import="javax.portlet.PortletURL"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp index a45de3b9..f3b2be04 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.mapit.constants.WebKeys"%> <%@page import="javax.portlet.PortletPreferences"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp index aa1f367c..3caf7e4b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.security.permission.ResourceActionsUtil"%> <%@page import="com.liferay.portal.util.PortalUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> @@ -60,7 +59,7 @@ String verifyComune = ParamUtil.getString(request, "verifyComune", "true"); }

- +
@@ -81,7 +80,7 @@ String verifyComune = ParamUtil.getString(request, "verifyComune", "true"); var portletNamespace = "<%= portletNamespace %>", mapItMap; -var verifyComune = <%= verifyComune %>; + Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getServletContextName() %>', function(event) { AUI().use('liferay-mapit-map', 'aui-io-request', function(A) { @@ -93,9 +92,8 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer mapItMap = Liferay.MapItMap.get(portletId); var latitude = AUI().one("#"+portletNamespace+"lat"), - longitude = AUI().one("#"+portletNamespace+"long"); - var isEditable = AUI().one("#"+portletNamespace+"geoIsEditable"); - isEditable = (undefined == isEditable) || (isEditable.val() == "true"); + longitude = AUI().one("#"+portletNamespace+"long"), + isEditable = AUI().one("#"+portletNamespace+"geoIsEditable").val() == "true"; var editableLatitude = AUI().one("#"+portletNamespace+"lat_hidden"), editableLongitude = AUI().one("#"+portletNamespace+"long_hidden"), @@ -108,7 +106,87 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer var geographic = new OpenLayers.Projection("EPSG:4326"); var mercator = new OpenLayers.Projection( "EPSG:3857"); extent.transform(geographic,mercator ); - + //mapItMap.addOption({restrictedExtent: extent}); + + /* var boxes = new OpenLayers.Layer.Boxes("boxes"); + var box = new OpenLayers.Marker.Box(extent); + boxes.addMarker(box); + mapItMap.addWMSLayer(boxes); */ + + + var civici = new OpenLayers.Layer.WMS( + 'Numeri Civici', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmsosm_d&map_resolution=91&', { + styles: 'etichette_blu', + layers: 'rt_osm.civici.point', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(civici); + + var comuni = new OpenLayers.Layer.WMS( + 'Comuni', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmsambamm&map_resolution=91', { + styles: 'contorno_senza_etichette', + layers: 'rt_ambamm.idcomuni.rt.poly', transparent: true}, + {isBaseLayer: false} + ); + //mapItMap.addWMSLayer(comuni); + + var topografico = new OpenLayers.Layer.WMS( + 'Topografico', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscartoteca&map_resolution=91&', { + styles: 'senza_etichette', + layers: 'rt_cartoteca.dbt.2k', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(topografico); + + var rischio_bacini_regionali = new OpenLayers.Layer.WMS( + 'Rischio Idrogeologico', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmsperidr&map_resolution=91&language=ita&', { + styles: 'default', + layers: 'rt_peridr.rischio_bacini_regionali', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(rischio_bacini_regionali); + + var catasto_strade = new OpenLayers.Layer.WMS( + 'Strade', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'terra_di_siena_bruciata', + layers: 'rt_cat.idcatstrade.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_strade); + + var catasto_fabbricati = new OpenLayers.Layer.WMS( + 'Fabbricati', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'carminio_chiaro', + layers: 'rt_cat.idcatfabbr.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_fabbricati); + + var catasto_fogli = new OpenLayers.Layer.WMS( + 'Fogli Catastali', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'solo_contorno_viola_fine_con_etichette', + layers: 'rt_cat.idcatbdfog.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_fogli); + + var catasto_particelle = new OpenLayers.Layer.WMS( + 'Particelle Catastali', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'contorno_rosso_mattone_con_etichette', + layers: 'rt_cat.idcatpart.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_particelle); + + var markerStyle = { graphicHeight: 29, graphicWidth: 22, @@ -174,19 +252,44 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer Liferay.fire('mapIt-ready'); - A.one("#map").append('
'); - var lockButton = A.one('#container_btn .bloccamap'), - lockLayer = A.one('#map .layermap'), - latValue = editableLatitude != null ? editableLatitude.val() : latitude.val(), - longValue = editableLongitude != null ? editableLongitude.val() : longitude.val(), - locked = latValue != "" && longValue != ""; - lockMap(lockButton, lockLayer, latValue, longValue, !locked) - - A.one('#container_btn .bloccamap').on('click', function(event) { - var nodeObject = event.currentTarget, - locked = event.currentTarget.hasClass('fa-lock'); - lockMap(lockButton, lockLayer, latValue, longValue, locked); - }); + + /* featurePicker = new OpenLayers.Control.WMSGetFeatureInfo({ + url: 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', + title: 'Identify features by clicking', + layers: [catasto_particelle, catasto_fogli], + queryVisible: false, + output:'features', + + eventListeners: { + getfeatureinfo: function(event) { + console.log(event); + console.log(event.features); + console.log(event.text); + }, + nogetfeatureinfo: function(event) { + console.err("No queriable layers found"); + } + + } + }); + + mapItMap.insertControl(featurePicker); + featurePicker.activate(); + console.log("Activated"); */ + + A.one("#map").append('
'); + var lockButton = A.one('#container_btn .bloccamap'), + lockLayer = A.one('#map .layermap'), + latValue = editableLatitude != null ? editableLatitude.val() : latitude.val(), + longValue = editableLongitude != null ? editableLongitude.val() : longitude.val(), + locked = latValue!="" && longValue!=""; + lockMap(lockButton, lockLayer, latValue, longValue, !locked) + + A.one('#container_btn .bloccamap').on('click', function(event){ + var nodeObject = event.currentTarget, + locked = event.currentTarget.hasClass('fa-lock'); + lockMap(lockButton, lockLayer, latValue, longValue, locked); + }); } }); @@ -219,7 +322,9 @@ Liferay.on('geolocation-ready',function(event) { if (latitude != "" && longitude != "") { var zoom = mapItMap.getCurrentZoom() > 8 ? mapItMap.getCurrentZoom() : 12; - if (full) { + console.log(full); + if(full){ + //zoom = 14; var markerStyle = { graphicHeight: 29, graphicWidth: 22, @@ -282,64 +387,73 @@ function updateCoords(lat_coord, long_coord, zoom_coord, fullUpdate, noTransform if (fullUpdate) { A.io.request(url, { - dataType: 'json', - on: { - success: function() { - var response = this.get('responseData'), - town = response.address.city != undefined - ? response.address.city - : (response.address.town != undefined - ? response.address.town - : response.address.village) - .replaceAll(' ', '-') - .toLowerCase(); - - if (verifyComune && city.val().toLowerCase().split(" ").join("-") != town) { - alert("Attenzione!\nHai selezionato un punto esterno al comune di riferimento..."); - address.val(""); - } else { - var fullAddress = ''; - if(response.address.road != undefined) { - fullAddress += response.address.road; - } else if (response.address.pedestrian != undefined) { - fullAddress += response.address.pedestrian; - } - if (fullAddress != '') { - fullAddress += (response.address.house_number != undefined ? " " + response.address.house_number : ""); - } - address.val(fullAddress); - if (!verifyComune) { - var provincia = response.address.county.replaceAll(' ', '-').toLowerCase(); - var province = window[portletNamespace + 'province']; - if (undefined != province[provincia]) { - AUI().use('event', 'node-event-simulate', function(A) { - A.one('#' + portletNamespace + 'provincia') - .set('value', province[provincia]) - .simulate('change'); - window[portletNamespace + 'comuneSelezionato'] = town.replaceAll(' ', '-').toLowerCase(); - }); - } - } - } - } + dataType: 'json', + on: { + success: function() { + + var response = this.get('responseData'), + town = response.address.city!=undefined ? response.address.city : (response.address.town!=undefined ? response.address.town : response.address.village); + + if(city.val().toLowerCase().split(" ").join("_") != town.toLowerCase().split(" ").join("_")){ + alert("Attenzione!\nHai selezionato un punto esterno al comune di riferimento..."); + address.val(""); + } else { + + var fullAddress = ''; + if(response.address.road != undefined) + fullAddress += response.address.road; + else if(response.address.pedestrian != undefined) + fullAddress += response.address.pedestrian; + + if(fullAddress != '') + fullAddress += (response.address.house_number != undefined ? " " + response.address.house_number : ""); + + address.val(fullAddress); + } + } + } }); } editableLatitude.val(newlonLat.lat); - latitude.val(newlonLat.lat); - editableLongitude.val(newlonLat.lon); - longitude.val(newlonLat.lon); - editableZoom.val(zoom_coord); + latitude.val(newlonLat.lat); + editableLongitude.val(newlonLat.lon); + editableZoom.val(zoom_coord); + longitude.val(newlonLat.lon); + }); } window.alert = function(msg){ - $('.customAlertMessage').text(msg); - $('.customAlert').css('animation', 'fadeIn 0.3s linear'); - $('.customAlert').css('display', 'inline'); - setTimeout(function(){ - $('.customAlert').css('animation', 'none'); - }, 100); + $('.customAlertMessage').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); + }); +}); + +/* +var globalGeolocationParams; +window.confirm = function(msg, callback){ + $('.message').text(msg); + $('.customConfirm').css('animation', 'fadeIn 0.3s linear'); + $('.customConfirm').css('display', 'inline'); + setTimeout(function(){ + $('.customConfirm').css('animation', 'none'); + }, 100); + + globalGeolocationParams = callback; }; $(function() { @@ -348,7 +462,27 @@ $(function() { setTimeout(function() { $('.customAlert').css('animation', 'none'); $('.customAlert').css('display', 'none'); - }, 100); + }, 100); + }); + $('.agreeButton').click(function(){ + console.log('agree'); + $('.customConfirm').css('animation', 'fadeOut 0.3s linear'); + setTimeout(function(){ + $('.customConfirm').css('animation', 'none'); + $('.customConfirm').css('display', 'none'); + }, 100); + + updateCoords(globalGeolocationParams.x, globalGeolocationParams.y, globalGeolocationParams.z); + }); -}); + $('.refuseButton').click(function(){ + console.log('refused'); + $('.customConfirm').css('animation', 'fadeOut 0.3s linear'); + setTimeout(function(){ + $('.customConfirm').css('animation', 'none'); + $('.customConfirm').css('display', 'none'); + }, 100); + return; + }); +}); */ \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp index e28deb24..73ccf13b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <% /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 index 37a015a0..21008fec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 @@ -1 +1 @@ -2a1242d44db7e53bd980b1eb314a3f21 +741392c57d2aef67bc950613f3fdcdaa diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath index e2e2522a..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project index b4246e62..8c877eb7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957747 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 40a16c0a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - uses - - - uses - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..a7548146 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml index f4efe922..7ea9cf5f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 index ec4fd47b..798e1b5d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 @@ -1 +1 @@ -135a537b937200127d08ecde3d9a7757 +93e662066f3920536858fa4147b8a2b0 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath index 20efb31a..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath @@ -1,7 +1,11 @@ - + + + + + @@ -9,8 +13,10 @@ - - - + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project index 7d7b8912..9816aec3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957754 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 656a29b6..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index f4beb943..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,8 +2,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.tern-project new file mode 100644 index 00000000..a185ba0d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.tern-project @@ -0,0 +1 @@ +{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/portos-report-engine-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/portos-report-engine-portlet-service.jar new file mode 100644 index 00000000..56a2cee1 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/portos-report-engine-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml index b5718e1c..def90ed4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + 3F Consulting + Manifattura Web Group s.r.l. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java index 29882b7a..9740e498 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java @@ -19,8 +19,8 @@ package it.tref.liferay.portos.report.model.impl; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") -public class KaleoTaskAssignmentInstanceImpl extends KaleoTaskAssignmentInstanceBaseImpl { +public class KaleoTaskAssignmentInstanceImpl + extends KaleoTaskAssignmentInstanceBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task assignment * instance model instance should use the {@link it.tref.liferay.portos.report.model.KaleoTaskAssignmentInstance} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java index eb7dc52c..19cd1f96 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java @@ -32,20 +32,17 @@ import com.liferay.portal.kernel.exception.SystemException; * @see it.tref.liferay.portos.report.service.KaleoTaskAssignmentInstanceLocalServiceUtil */ public class KaleoTaskAssignmentInstanceLocalServiceImpl extends KaleoTaskAssignmentInstanceLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.report.service.KaleoTaskAssignmentInstanceLocalServiceUtil} to access the kaleo task - * assignment instance local service. - */ - - @Override - public List distinctKaleoAssignee() throws SystemException { + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.report.service.KaleoTaskAssignmentInstanceLocalServiceUtil} to access + * the kaleo task assignment instance local service. + */ + public List distinctKaleoAssignee() throws SystemException { return KaleoTaskAssignmentInstanceFinderUtil.distinctKaleoAssignee(); } - @Override - public List distinctKaleoAssigneeId(long userId) throws SystemException { + public List distinctKaleoAssigneeId(long userId) throws SystemException { return KaleoTaskAssignmentInstanceFinderUtil.distinctKaleoAssigneeId(userId); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java index c81fb9dd..eddf8b3f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.report.NoSuchKaleoInstanceException; import it.tref.liferay.portos.report.model.KaleoInstance; import it.tref.liferay.portos.report.model.impl.KaleoInstanceImpl; import it.tref.liferay.portos.report.model.impl.KaleoInstanceModelImpl; -import it.tref.liferay.portos.report.service.persistence.KaleoInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java index c4b09bab..ddadcd0e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java @@ -23,8 +23,7 @@ public class KaleoTaskAssignmentInstanceFinderImpl extends BasePersistenceImpl distinctKaleoAssignee() throws SystemException { + public List distinctKaleoAssignee() throws SystemException { Session session = null; try { @@ -45,8 +44,7 @@ public class KaleoTaskAssignmentInstanceFinderImpl extends BasePersistenceImpl distinctKaleoAssigneeId(long userId) throws SystemException { + public List distinctKaleoAssigneeId(long userId) throws SystemException { Session session = null; try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java index da9a4e7c..2187ba72 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.report.NoSuchKaleoTaskAssignmentInstanceException; import it.tref.liferay.portos.report.model.KaleoTaskAssignmentInstance; import it.tref.liferay.portos.report.model.impl.KaleoTaskAssignmentInstanceImpl; import it.tref.liferay.portos.report.model.impl.KaleoTaskAssignmentInstanceModelImpl; -import it.tref.liferay.portos.report.service.persistence.KaleoTaskAssignmentInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java index fe3c0cad..419f295a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java @@ -31,7 +31,6 @@ import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Organization; import com.liferay.portal.service.OrganizationLocalServiceUtil; @@ -42,8 +41,8 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { @Override public String generateHTML(HttpServletRequest httpServletRequest) { + String html = ""; - String html = StringPool.BLANK; try { ByteArrayOutputStream bos = new ByteArrayOutputStream(); JasperHtmlExporterBuilder htmlExporter = DynamicReports.export.htmlExporter(bos).setIgnoreHyperLink(true); @@ -62,62 +61,45 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { public JasperReportBuilder generateReport(HttpServletRequest request) { String tipoPraticaSelected = ParamUtil.getString(request, "tipologiaPratica", null); - TextColumnBuilder presidioColumn = DynamicReports.col.column("Ufficio", "presidioColumn", - DynamicReports.type.stringType()); - TextColumnBuilder numeroPraticheDaAssegnareColumn = DynamicReports.col.column( - "N° pratiche da assegnare da parte delle PO", "numeroPraticheDaAssegnareColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheDaApprovareColumn = DynamicReports.col.column( - "N° pratiche da approvare da parte delle PO", "numeroPraticheDaApprovareColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheInIstruttoriaOrdinarieColumn = DynamicReports.col.column( - "N° pratiche In Istruttoria", "numeroPraticheInIstruttoriaOrdinarieColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheConIntegrazOrdinarieColumn = DynamicReports.col.column( - "N° pratiche con Int.Richieste", "numeroPraticheConIntegrazOrdinarieColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheInIstruttoriaInScadenzaColumn = DynamicReports.col.column( - "N° pratiche In Istruttoria", "numeroPraticheInIstruttoriaInScadenzaColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheConIntegrazInScadenzaColumn = DynamicReports.col.column( - "N° pratiche con Int.Richieste", "numeroPraticheConIntegrazInScadenzaColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheInIstruttoriaScaduteColumn = DynamicReports.col.column( - "N° pratiche In Istruttoria", "numeroPraticheInIstruttoriaScaduteColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheConIntegrazScaduteColumn = DynamicReports.col.column( - "N° pratiche con Int.Richieste", "numeroPraticheConIntegrazScaduteColumn", - DynamicReports.type.integerType()); - ColumnTitleGroupBuilder titleGroupOrdinarie = DynamicReports.grid.titleGroup(tipoPraticaSelected - + " Ordinarie ( 0-39 gg) ", numeroPraticheInIstruttoriaOrdinarieColumn, - numeroPraticheConIntegrazOrdinarieColumn); - ColumnTitleGroupBuilder titleGroupInScadenza = DynamicReports.grid.titleGroup(tipoPraticaSelected - + " In Scadenza ( 40-60 gg) ", numeroPraticheInIstruttoriaInScadenzaColumn, - numeroPraticheConIntegrazInScadenzaColumn); - ColumnTitleGroupBuilder titleGroupScadute = DynamicReports.grid.titleGroup(tipoPraticaSelected - + " Scadute ( oltre 60 gg) ", numeroPraticheInIstruttoriaScaduteColumn, - numeroPraticheConIntegrazScaduteColumn); + + TextColumnBuilder presidioColumn = DynamicReports.col.column("Ufficio", "presidioColumn", DynamicReports.type.stringType()); + TextColumnBuilder numeroPraticheDaAssegnareColumn = DynamicReports.col.column("N�pratiche da assegnare da parte delle PO", "numeroPraticheDaAssegnareColumn", DynamicReports.type.integerType()); + + TextColumnBuilder numeroPraticheDaApprovareColumn = DynamicReports.col.column("N� pratiche da approvare da parte delle PO", "numeroPraticheDaApprovareColumn", DynamicReports.type.integerType()); + + // + TextColumnBuilder numeroPraticheInIstruttoriaOrdinarieColumn = DynamicReports.col.column("N�pratiche In Istruttoria", "numeroPraticheInIstruttoriaOrdinarieColumn", DynamicReports.type.integerType()); + + TextColumnBuilder numeroPraticheConIntegrazOrdinarieColumn = DynamicReports.col.column("N� pratiche con Int.Richieste", "numeroPraticheConIntegrazOrdinarieColumn", DynamicReports.type.integerType()); + + // + TextColumnBuilder numeroPraticheInIstruttoriaInScadenzaColumn = DynamicReports.col.column("N� pratiche In Istruttoria", "numeroPraticheInIstruttoriaInScadenzaColumn", DynamicReports.type.integerType()); + + TextColumnBuilder numeroPraticheConIntegrazInScadenzaColumn = DynamicReports.col.column("N� pratiche con Int.Richieste", "numeroPraticheConIntegrazInScadenzaColumn", DynamicReports.type.integerType()); + // + TextColumnBuilder numeroPraticheInIstruttoriaScaduteColumn = DynamicReports.col.column("N� pratiche In Istruttoria", "numeroPraticheInIstruttoriaScaduteColumn", DynamicReports.type.integerType()); + TextColumnBuilder numeroPraticheConIntegrazScaduteColumn = DynamicReports.col.column("N� pratiche con Int.Richieste", "numeroPraticheConIntegrazScaduteColumn", DynamicReports.type.integerType()); + + ColumnTitleGroupBuilder titleGroupOrdinarie = DynamicReports.grid.titleGroup(tipoPraticaSelected + " Ordinarie ( 0-39gg) ", numeroPraticheInIstruttoriaOrdinarieColumn, numeroPraticheConIntegrazOrdinarieColumn); + + ColumnTitleGroupBuilder titleGroupInScadenza = DynamicReports.grid.titleGroup(tipoPraticaSelected + " In Scadenza ( 40-60 gg) ", numeroPraticheInIstruttoriaInScadenzaColumn, numeroPraticheConIntegrazInScadenzaColumn); + + ColumnTitleGroupBuilder titleGroupScadute = DynamicReports.grid.titleGroup(tipoPraticaSelected + " Scadute ( oltre 60 gg) ", numeroPraticheInIstruttoriaScaduteColumn, numeroPraticheConIntegrazScaduteColumn); + JasperReportBuilder builder = DynamicReports .report() .setTemplate(TemplatesADV.reportTemplate) - .columnGrid(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, - titleGroupOrdinarie, titleGroupInScadenza, titleGroupScadute) - .columns(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, - numeroPraticheInIstruttoriaOrdinarieColumn, numeroPraticheConIntegrazOrdinarieColumn, - numeroPraticheInIstruttoriaInScadenzaColumn, numeroPraticheConIntegrazInScadenzaColumn, - numeroPraticheInIstruttoriaScaduteColumn, numeroPraticheConIntegrazScaduteColumn) - .setDataSource(createDataSource(request)) + .columnGrid(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, titleGroupOrdinarie, titleGroupInScadenza, titleGroupScadute) + .columns(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, numeroPraticheInIstruttoriaOrdinarieColumn, numeroPraticheConIntegrazOrdinarieColumn, numeroPraticheInIstruttoriaInScadenzaColumn, + numeroPraticheConIntegrazInScadenzaColumn, numeroPraticheInIstruttoriaScaduteColumn, numeroPraticheConIntegrazScaduteColumn).setDataSource(createDataSource(request)) .addProperty("net.sf.jasperreports.export.xls.detect.cell.type", "true"); return builder; } private JRDataSource createDataSource(HttpServletRequest request) { + DRDataSource dataSource = new DRDataSource("presidioColumn", "numeroPraticheDaAssegnareColumn", "numeroPraticheDaApprovareColumn", "numeroPraticheInIstruttoriaOrdinarieColumn", "numeroPraticheConIntegrazOrdinarieColumn", + "numeroPraticheInIstruttoriaInScadenzaColumn", "numeroPraticheConIntegrazInScadenzaColumn", "numeroPraticheInIstruttoriaScaduteColumn", "numeroPraticheConIntegrazScaduteColumn"); - DRDataSource dataSource = new DRDataSource("presidioColumn", "numeroPraticheDaAssegnareColumn", - "numeroPraticheDaApprovareColumn", "numeroPraticheInIstruttoriaOrdinarieColumn", - "numeroPraticheConIntegrazOrdinarieColumn", "numeroPraticheInIstruttoriaInScadenzaColumn", - "numeroPraticheConIntegrazInScadenzaColumn", "numeroPraticheInIstruttoriaScaduteColumn", - "numeroPraticheConIntegrazScaduteColumn"); try { String dateMaxString = ParamUtil.getString(request, "dateMax", null); String tipoPraticaSelected = ParamUtil.getString(request, "tipologiaPratica", null); @@ -149,16 +131,19 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { for (Organization org : orgs) { if (org.getParentOrganization() != null) { long groupId = org.getGroup().getGroupId(); - Map dbResult = ReportEngineServiceUtil.praticheAperte(dateMax, groupId, - tipoPraticaSelected); - numPraticheOrdInIstruttoriaTecnico = dbResult.get("numPraticheOrdInIstruttoriaTecnico"); - numPraticheOrdInAttesaIntegrazione = dbResult.get("numPraticheOrdInAttesaIntegrazione"); + + Map dbResult=ReportEngineServiceUtil.praticheAperte(dateMax,groupId,tipoPraticaSelected); + + numPraticheOrdInIstruttoriaTecnico=dbResult.get("numPraticheOrdInIstruttoriaTecnico"); + numPraticheOrdInAttesaIntegrazione=dbResult.get("numPraticheOrdInAttesaIntegrazione"); numPraticheInScadenzaInIstruttoriaTecnico = dbResult .get("numPraticheInScadenzaInIstruttoriaTecnico"); numPraticheInScadenzaInAttesaIntegrazione = dbResult .get("numPraticheInScadenzaInAttesaIntegrazione"); - numPraticheScaduteInIstruttoriaTecnico = dbResult.get("numPraticheScaduteInIstruttoriaTecnico"); - numPraticheScaduteInAttesaIntegrazione = dbResult.get("numPraticheScaduteInAttesaIntegrazione"); + numPraticheScaduteInIstruttoriaTecnico=dbResult.get("numPraticheScaduteInIstruttoriaTecnico"); + numPraticheScaduteInAttesaIntegrazione=dbResult.get("numPraticheScaduteInAttesaIntegrazione"); + + totPraticheAperteFinePeriodo += dbResult.get("totPraticheAperteFinePeriodo"); numeroPraticheDaAssegnareColumnTOTALE += numeroPraticheDaAssegnareColumn; numeroPraticheDaApprovareColumnTOTALE += numeroPraticheDaApprovareColumn; @@ -181,7 +166,11 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { numPraticheInScadenzaInAttesaIntegrazioneTOTALE, numPraticheScaduteInIstruttoriaTecnicoTOTALE, numPraticheScaduteInAttesaIntegrazioneTOTALE); } - } catch (ParseException | PortalException | SystemException e) { + } catch (SystemException e) { + _log.error(e, e); + } catch (PortalException e) { + _log.error(e, e); + } catch (ParseException e) { _log.error(e, e); } return dataSource; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java index 4948b61f..29b41712 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java @@ -1,9 +1,11 @@ package it.tref.portos.report.engine; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.portos.report.engine.PortosSearchTermsReport.FieldType; import it.tref.portos.report.engine.annotation.PortosReport; import it.tref.portos.report.engine.template.TemplatesADV; import it.tref.portos.report.engine.util.ReportEngineServiceUtil; +import it.tref.portos.report.engine.util.ReportTempisticheBean; import java.io.ByteArrayOutputStream; import java.text.ParseException; @@ -11,8 +13,10 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; @@ -32,7 +36,6 @@ import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Organization; import com.liferay.portal.service.OrganizationLocalServiceUtil; @@ -47,20 +50,26 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { @Override public String generateHTML(HttpServletRequest httpServletRequest) { + String html = ""; - String html = StringPool.BLANK; - try { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - JasperHtmlExporterBuilder htmlExporter = DynamicReports.export.htmlExporter(bos).setIgnoreHyperLink(true); - JasperReportBuilder builder = generateReport(httpServletRequest); - builder.pageFooter(DynamicReports.cmp.pageNumber().setStyle(TemplatesADV.boldCenteredStyle)); - builder.toHtml(htmlExporter); - byte[] byteArray = bos.toByteArray(); - html = new String(byteArray); - } catch (DRException e) { - _log.error(e, e); - } - return html; + try { + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + + JasperHtmlExporterBuilder htmlExporter = DynamicReports.export.htmlExporter(bos).setIgnoreHyperLink(true); + + JasperReportBuilder builder = generateReport(httpServletRequest); + builder.pageFooter(DynamicReports.cmp.pageNumber().setStyle(TemplatesADV.boldCenteredStyle)); + builder.toHtml(htmlExporter); + + byte[] byteArray = bos.toByteArray(); + html = new String(byteArray); + + } catch (DRException e) { + _log.error(e, e); + } + + return html; } @Override @@ -96,16 +105,16 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { TextFieldBuilder note2 = DynamicReports.cmp.text(nota2); note1.setStyle(DynamicReports.stl.style(TemplatesADV.rootStyle).setFontSize(6)); note2.setStyle(DynamicReports.stl.style(TemplatesADV.rootStyle).setFontSize(6)); - JasperReportBuilder builder = DynamicReports - .report() - .setTemplate(TemplatesADV.reportTemplate) - .pageFooter(note1, note2) - .columnGrid(presidioColumn, numeroPraticheTotaliColumn, titleGroupInScadenza, titleGroupScadute) - .columns(presidioColumn, numeroPraticheTotaliColumn, numeroTotaleAutorizzateInScadenzaColumn, - durataMediaIstruttorieInScadenzaColumn, durataMediaApprovazionePraticaInScadenzaColumn, - numeroTotaleAutorizzateScaduteColumn, durataMediaIstruttorieScaduteColumn, - durataMediaApprovazionePraticaScaduteColumn).setDataSource(createDataSource(request)) - .addProperty("net.sf.jasperreports.export.xls.detect.cell.type", "true"); + + JasperReportBuilder builder = + DynamicReports.report().setTemplate(TemplatesADV.reportTemplate) + .pageFooter(note1, note2) + .columnGrid(presidioColumn, numeroPraticheTotaliColumn, titleGroupInScadenza, titleGroupScadute) + .columns(presidioColumn, numeroPraticheTotaliColumn + , numeroTotaleAutorizzateInScadenzaColumn, durataMediaIstruttorieInScadenzaColumn, durataMediaApprovazionePraticaInScadenzaColumn + , numeroTotaleAutorizzateScaduteColumn, durataMediaIstruttorieScaduteColumn, durataMediaApprovazionePraticaScaduteColumn) + .setDataSource(createDataSource(request)).addProperty("net.sf.jasperreports.export.xls.detect.cell.type", "true");; + return builder; } @@ -132,48 +141,57 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { dateMax = calendarMax.getTime(); List orgs = new ArrayList(); orgs = OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); - int numeroPraticheTotaliTotale = 0; - int numeroTotaleAutorizzateInScadenzaTotale = 0; - float durataMediaIstruttorieInScadenzaTotale = 0; - float durataMediaApprovazionePraticaInScadenzaTotale = 0; - int numeroTotaleAutorizzateScaduteTotale = 0; - float durataMediaIstruttorieScaduteTotale = 0; - float durataMediaApprovazionePraticaScaduteTotale = 0; + + int numeroPraticheTotaliTotale = 0; + int numeroTotaleAutorizzateInScadenzaTotale = 0; + float durataMediaIstruttorieInScadenzaTotale = 0; + float durataMediaApprovazionePraticaInScadenzaTotale = 0; + int numeroTotaleAutorizzateScaduteTotale = 0; + float durataMediaIstruttorieScaduteTotale = 0; + float durataMediaApprovazionePraticaScaduteTotale = 0; + int countOrganization = 0; int countOrganizationPraticheInScadenza = 0; int countOrganizationPraticheScadute = 0; for (Organization org : orgs) { if (org.getParentOrganization() != null) { long groupId = org.getGroup().getGroupId(); - Map dbResult = ReportEngineServiceUtil.praticheChiuse(dateMin, dateMax, groupId, - tipoPraticaSelected); - int numeroPraticheTotali = dbResult.get("count").intValue(); + + + //Retrieve data from DB + //Map dbResult=elaboraAutorizzazioniNew(dateMin,dateMax,groupId,tipoPraticaSelected); + Map dbResult=ReportEngineServiceUtil.praticheChiuse(dateMin, dateMax, groupId, tipoPraticaSelected); + + + int numeroPraticheTotali =dbResult.get("count").intValue(); int numeroTotaleAutorizzateInScadenza = dbResult.get("countOrdinarie").intValue(); int numeroTotaleAutorizzateScadute = dbResult.get("countScadute").intValue(); - float durataMediaIstruttorieInScadenza = dbResult.get("countOrdinarie") > 0 ? dbResult - .get("giorniTotOrdinarieIstruttorie") / dbResult.get("countOrdinarie") : 0; - float durataMediaApprovazionePraticaInScadenza = dbResult.get("countOrdinarie") > 0 ? dbResult - .get("giorniTotOrdinarieApprovazioni") / dbResult.get("countOrdinarie") : 0; - float durataMediaIstruttorieScadute = dbResult.get("countScadute") > 0 ? dbResult - .get("giorniTotScaduteIstruttorie") / dbResult.get("countScadute") : 0; - float durataMediaApprovazionePraticaScadute = dbResult.get("countScadute") > 0 ? dbResult - .get("giorniTotScaduteApprovazioni") / dbResult.get("countScadute") : 0; - dataSource.add(org.getName(), numeroPraticheTotali, numeroTotaleAutorizzateInScadenza, - durataMediaIstruttorieInScadenza, durataMediaApprovazionePraticaInScadenza, - numeroTotaleAutorizzateScadute, durataMediaIstruttorieScadute, - durataMediaApprovazionePraticaScadute); - numeroPraticheTotaliTotale += numeroPraticheTotali; - numeroTotaleAutorizzateInScadenzaTotale += numeroTotaleAutorizzateInScadenza; - numeroTotaleAutorizzateScaduteTotale += numeroTotaleAutorizzateScadute; - durataMediaApprovazionePraticaInScadenzaTotale += durataMediaApprovazionePraticaInScadenza; - durataMediaApprovazionePraticaScaduteTotale += durataMediaApprovazionePraticaScadute; - durataMediaIstruttorieInScadenzaTotale += durataMediaIstruttorieInScadenza; - durataMediaIstruttorieScaduteTotale += durataMediaIstruttorieScadute; - if (numeroTotaleAutorizzateInScadenza > 0) { - countOrganizationPraticheInScadenza++; - } - if (numeroTotaleAutorizzateScadute > 0) { - countOrganizationPraticheScadute++; - } + + float durataMediaIstruttorieInScadenza =dbResult.get("countOrdinarie")>0? dbResult.get("giorniTotOrdinarieIstruttorie")/dbResult.get("countOrdinarie"):0; + float durataMediaApprovazionePraticaInScadenza =dbResult.get("countOrdinarie")>0? dbResult.get("giorniTotOrdinarieApprovazioni")/dbResult.get("countOrdinarie"):0; + + float durataMediaIstruttorieScadute = dbResult.get("countScadute")>0?dbResult.get("giorniTotScaduteIstruttorie")/dbResult.get("countScadute"):0; + float durataMediaApprovazionePraticaScadute =dbResult.get("countScadute")>0?dbResult.get("giorniTotScaduteApprovazioni")/dbResult.get("countScadute"):0; + + dataSource.add(org.getName(), numeroPraticheTotali + , numeroTotaleAutorizzateInScadenza, durataMediaIstruttorieInScadenza, durataMediaApprovazionePraticaInScadenza + , numeroTotaleAutorizzateScadute, durataMediaIstruttorieScadute, durataMediaApprovazionePraticaScadute); + + numeroPraticheTotaliTotale+=numeroPraticheTotali; + numeroTotaleAutorizzateInScadenzaTotale+=numeroTotaleAutorizzateInScadenza; + numeroTotaleAutorizzateScaduteTotale+=numeroTotaleAutorizzateScadute; + durataMediaApprovazionePraticaInScadenzaTotale+=durataMediaApprovazionePraticaInScadenza; + durataMediaApprovazionePraticaScaduteTotale+=durataMediaApprovazionePraticaScadute; + durataMediaIstruttorieInScadenzaTotale+=durataMediaIstruttorieInScadenza; + durataMediaIstruttorieScaduteTotale+=durataMediaIstruttorieScadute; + + + if (numeroTotaleAutorizzateInScadenza>0) + countOrganizationPraticheInScadenza++; + if (numeroTotaleAutorizzateScadute>0) + countOrganizationPraticheScadute++; + + + countOrganization++; } } dataSource.add("TOTALI", numeroPraticheTotaliTotale, numeroTotaleAutorizzateInScadenzaTotale, @@ -186,7 +204,11 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { countOrganizationPraticheScadute > 0 ? durataMediaApprovazionePraticaScaduteTotale / countOrganizationPraticheScadute : 0); } - } catch (ParseException | PortalException | SystemException e) { + } catch (SystemException e) { + _log.error(e, e); + } catch (PortalException e) { + _log.error(e, e); + } catch (ParseException e) { _log.error(e, e); } return dataSource; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java index a6e4d87f..4358503d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java @@ -12,6 +12,8 @@ import java.util.Locale; import javax.servlet.http.HttpServletRequest; +import com.liferay.portal.kernel.util.ParamUtil; + import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter; import net.sf.dynamicreports.report.builder.HyperLinkBuilder; import net.sf.dynamicreports.report.builder.ReportTemplateBuilder; @@ -26,9 +28,6 @@ import net.sf.dynamicreports.report.constant.SplitType; import net.sf.dynamicreports.report.constant.VerticalTextAlignment; import net.sf.dynamicreports.report.definition.ReportParameters; -import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; - public class TemplatesADV { public static final StyleBuilder rootStyle; @@ -90,54 +89,76 @@ public class TemplatesADV { .setDetailSplitType(SplitType.PREVENT); currencyType = new CurrencyType(); - HyperLinkBuilder link = hyperLink(StringPool.BLANK); - - dynamicReportsComponent = cmp.horizontalList( - cmp.verticalList( - cmp.text("GENIO CIVILE").setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text(StringPool.BLANK) - .setStyle(italicStyle).setHyperLink(link))).setFixedWidth(300); - footerComponent = cmp.pageXofY().setStyle(stl.style(boldCenteredStyle).setTopBorder(stl.pen1Point())); - } - - // Creates custom component which is possible to add to any report band component - public static ComponentBuilder createTitleComponent(String label) { - - HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); - horizontalListBuilder.add(dynamicReportsComponent, cmp.text(label).setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); - horizontalListBuilder.newRow(); - return horizontalListBuilder; - } - - // ADT: BUG BO ID=34 - REPORT PRATICHE VIDIMATE - public static ComponentBuilder createTitleComponentNew(String label, String className, - HttpServletRequest request) { - - if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())) { - HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); - HyperLinkBuilder link = hyperLink(StringPool.BLANK); - StringBuilder stBuilder = new StringBuilder(); - if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())) { - String dateMinString = ParamUtil.getString(request, "dateMin", null); - String dateMaxString = ParamUtil.getString(request, "dateMax", null); - stBuilder.append("Periodo di Osservazione: dal "); - stBuilder.append(dateMinString); - stBuilder.append(" al "); - stBuilder.append(dateMaxString); - } - ComponentBuilder dynamicReportsComponentNew = cmp.horizontalList( - cmp.verticalList(cmp.text(stBuilder.toString()).setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text(StringPool.BLANK) - .setStyle(italicStyle).setHyperLink(link))).setFixedWidth(300); - horizontalListBuilder.add(dynamicReportsComponentNew, cmp.text(label).setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); - horizontalListBuilder.newRow(); - return horizontalListBuilder; - } else { - return null; - } - } + HyperLinkBuilder link = hyperLink(""); + + dynamicReportsComponent = + cmp.horizontalList( + // cmp.image(TemplatesADV.class.getResource("images/aaa.png")).setFixedDimension(60, 60), + cmp.verticalList( + cmp.text("GENIO CIVILE").setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text("").setStyle(italicStyle) + .setHyperLink(link))).setFixedWidth(300); + footerComponent = cmp.pageXofY().setStyle(stl.style(boldCenteredStyle).setTopBorder(stl.pen1Point())); + + } + + /** + * + * Creates custom component which is possible to add to any report band component + */ + + public static ComponentBuilder createTitleComponent(String label) { + HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); + horizontalListBuilder.add(dynamicReportsComponent, cmp.text(label).setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); + horizontalListBuilder.newRow(); + return horizontalListBuilder; + + } + + + /** + * ADT: BUG BO ID=34 � REPORT PRATICHE VIDIMATE + * + * @param label + * @param className + * @param request + * @return + */ + public static ComponentBuilder createTitleComponentNew(String label,String className,HttpServletRequest request) { + + + if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())){ + HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); + HyperLinkBuilder link = hyperLink(""); + StringBuilder stBuilder=new StringBuilder(); + if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())){ + String dateMinString = ParamUtil.getString(request, "dateMin", null); + String dateMaxString = ParamUtil.getString(request, "dateMax", null); + stBuilder.append("Periodo di Osservazione: dal "); + stBuilder.append(dateMinString); + stBuilder.append(" al "); + stBuilder.append(dateMaxString); + } + ComponentBuilder dynamicReportsComponentNew = + cmp.horizontalList( + // cmp.image(TemplatesADV.class.getResource("images/aaa.png")).setFixedDimension(60, 60), + cmp.verticalList( + cmp.text(stBuilder.toString()).setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text("").setStyle(italicStyle) + .setHyperLink(link))).setFixedWidth(300); + + + horizontalListBuilder.add(dynamicReportsComponentNew, cmp.text(label).setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); + horizontalListBuilder.newRow(); + return horizontalListBuilder; + + }else{ + return null; + } + + } public static CurrencyValueFormatter createCurrencyValueFormatter(String label) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.gitignore new file mode 100644 index 00000000..0a8642fa --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin ignored files +/ZeppelinRemoteNotebooks/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.name b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.name new file mode 100644 index 00000000..df0d44e6 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.name @@ -0,0 +1 @@ +ReportEngineServiceUtil.java \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/jpa-buddy.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/jpa-buddy.xml new file mode 100644 index 00000000..966d5f56 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/misc.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/misc.xml new file mode 100644 index 00000000..d79bd4e1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/modules.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/modules.xml new file mode 100644 index 00000000..345f9096 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/util.iml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/util.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/util.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/vcs.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/vcs.xml new file mode 100644 index 00000000..cf49fc8c --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java index 04a92f4a..6447c3d5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java @@ -1,5 +1,7 @@ package it.tref.portos.report.engine.util; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; + import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -11,8 +13,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.omg.CORBA.SystemException; - +import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -30,6 +31,7 @@ public class ReportEngineServiceUtil { } /** + * * Pratiche aperte alla data in input * * @param dateMax @@ -52,9 +54,8 @@ public class ReportEngineServiceUtil { String tipoDocumentoApprovato = co ? "CO" : "AU"; try { - // returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax, - // groupId, - // type); + //returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax, groupId, + //type); for (Object[] tmp : returnedList) { if (tmp.length == 8) { Long avvisoid = (Long) tmp[0]; @@ -143,7 +144,7 @@ public class ReportEngineServiceUtil { returnedMap.put("totPraticheAperteFinePeriodo", praticheAperteFinePeriodo.size()); - } catch (SystemException e) { + } catch (Exception e) { _log.error("Errore in ReportPraticheVidimate - ", e); } return returnedMap; @@ -155,10 +156,11 @@ public class ReportEngineServiceUtil { Map returnedMap = new HashMap(); List returnedList = new ArrayList<>(); boolean co = type.equalsIgnoreCase("Depositi a controllo obbligatorio"); + String tipoDocumentoApprovato = co ? "CO" : "AU"; try { - // returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin, - // dateMax, groupId, type); + //returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin, + //dateMax, groupId, type); for (Object[] tmp : returnedList) { if (tmp.length == 7) { Long avvisoid = (Long) tmp[0]; @@ -341,7 +343,7 @@ public class ReportEngineServiceUtil { returnedMap.put("giorniTotTrasmissioneIntegrazioniFEIntegrazioniMultiple", giorniTotTrasmissioneIntegrazioniFEIntegrazioniMultiple); - } catch (SystemException e) { + } catch (Exception e) { _log.error("Errore in ReportTempisticheIstruttorie - ", e); } return returnedMap; @@ -492,6 +494,7 @@ public class ReportEngineServiceUtil { } /** + * * @param dataEnd * @param dataStart * @return diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/util.iml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/util.iml new file mode 100644 index 00000000..2c23df85 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/util.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties index dfaf62c7..d696374f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_report - build.number=27 - build.date=1632924679303 + build.number=31 + build.date=1675936189149 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 index 4bf212dc..332a3243 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 @@ -1 +1 @@ -5c7079f092c74ee1765720cef73ee501 +8afa694bc6dcd4521395feebec7a44ec diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath index 13ef5107..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project index 2bcf3cc7..0fa14022 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project @@ -32,6 +32,16 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature + + + 1676466957754 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component index 453ec811..50111eec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..2aab4bcd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-portlet-service.jar new file mode 100644 index 00000000..72ca0a52 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-shared.jar new file mode 100644 index 00000000..d89d73b1 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml index eb52e37b..d16aa930 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java index 0cd178cd..63d14518 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java @@ -1,7 +1,5 @@ package it.tref.liferay.portos.report.html.core; -import java.io.IOException; - import com.itextpdf.text.Document; import com.itextpdf.text.DocumentException; import com.itextpdf.text.Element; @@ -14,6 +12,8 @@ import com.itextpdf.tool.xml.ElementList; import com.itextpdf.tool.xml.XMLWorkerHelper; import com.liferay.portal.kernel.util.Validator; +import java.io.IOException; + public class HeaderFooterPageEvent extends PdfPageEventHelper { private ElementList header; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java index 409411a8..3702fb04 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java @@ -175,12 +175,22 @@ public abstract class AbstractReportProvider { exporter.setParameter(JRPdfExporterParameter.METADATA_AUTHOR, getMetadataAuthor()); exporter.setParameter(JRPdfExporterParameter.METADATA_CREATOR, getMetadataCreator()); exporter.setParameter(JRPdfExporterParameter.IS_TAGGED, true); - if (getPermission() != null) { - exporter.setParameter(JRPdfExporterParameter.PERMISSIONS, getPermission()); - } - } else if (exportType == ReportEngine.EXPORT_TO_DOC || exportType == ReportEngine.EXPORT_TO_RTF) { - } else if (exportType == ReportEngine.EXPORT_TO_DOCX) {} else if (exportType == ReportEngine.EXPORT_TO_HTML - || exportType == ReportEngine.EXPORT_TO_HTM) {} else if (exportType == ReportEngine.EXPORT_TO_CSV) { + if (getPermission() != null) + exporter.setParameter( + JRPdfExporterParameter.PERMISSIONS, getPermission()); + } + else if (exportType == ReportEngine.EXPORT_TO_DOC || + exportType == ReportEngine.EXPORT_TO_RTF) { + + } + else if (exportType == ReportEngine.EXPORT_TO_DOCX) { + + } + else if (exportType == ReportEngine.EXPORT_TO_HTML || + exportType == ReportEngine.EXPORT_TO_HTM) { + + } + else if (exportType == ReportEngine.EXPORT_TO_CSV) { exporter = null; } return exporter; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java index ea83560c..cabf6af1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java @@ -16,13 +16,11 @@ public class BeanReport implements ReportInterface { this.bean = bean; } - @Override public boolean isValido() { return true; } - @Override public JRDataSource generaDataSource() { JRDataSource ds = null; @@ -36,10 +34,10 @@ public class BeanReport implements ReportInterface { return ds; } - @Override - public void closeDataSource() {} + public void closeDataSource() { + + } - @Override public byte[] getCSVBytes() { return null; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java index 69e16e5a..e4336442 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java @@ -131,26 +131,16 @@ public class ProtocolloMessageListener extends BaseMessageListener { ServiceContext serviceContext = new ServiceContext(); serviceContext.setUserId(userId); serviceContext.setCompanyId(companyId); - long repositoryId = fileEntry.getRepositoryId(); - long folderId = fileEntry.getFolderId(); - String sourceFileName = reportDto.getFileName() + ".pdf"; - String mimeType = ContentTypes.APPLICATION_PDF; - String title = reportDto.getFileName(); - String description = StringPool.BLANK; - String changeLog = StringPool.BLANK; - FileEntry newFileEntry; + FileEntry newFileEntry = null; try { - newFileEntry = - DLAppLocalServiceUtil.addFileEntry(userId, repositoryId, folderId, sourceFileName, - mimeType, title, description, changeLog, outputBytes, serviceContext); + newFileEntry = DLAppLocalServiceUtil.addFileEntry(userId, fileEntry.getRepositoryId(), + fileEntry.getFolderId(), reportDto.getFileName() + ".pdf", ContentTypes.APPLICATION_PDF, + reportDto.getFileName(), StringPool.BLANK, StringPool.BLANK, outputBytes, serviceContext); } catch (DuplicateFileException e) { - FileEntry fe = - DLAppServiceUtil.getFileEntry(fileEntry.getGroupId(), fileEntry.getFolderId(), - reportDto.getFileName()); - DLAppLocalServiceUtil.deleteFileEntry(fe.getFileEntryId()); - newFileEntry = - DLAppLocalServiceUtil.addFileEntry(userId, repositoryId, folderId, sourceFileName, - mimeType, title, description, changeLog, outputBytes, serviceContext); + FileEntry fe = DLAppServiceUtil.getFileEntry(fileEntry.getGroupId(), fileEntry.getFolderId(), + reportDto.getFileName()); + _log.info("File duplicato : " + fe.getFileEntryId()); + return; } if (Validator.isNotNull(newFileEntry)) { long[] fileEntryIds = new long[0]; @@ -176,15 +166,18 @@ public class ProtocolloMessageListener extends BaseMessageListener { Company company = CompanyLocalServiceUtil.fetchCompany(companyId); StringBuilder sb = new StringBuilder(); - sb.append( - (String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, false)) - .append(StringPool.SLASH) - .append(protocollo) - .append(StringPool.SLASH) - .append((String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, false)).append(" del ") - .append(sdf.format(dtProtocollo)); + + sb.append((String) company.getExpandoBridge().getAttribute( + Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, false)); + sb.append(StringPool.SLASH); + sb.append(protocollo); + sb.append(StringPool.SLASH); + sb.append((String) company.getExpandoBridge().getAttribute( + Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, false)); + + sb.append(" del "); + sb.append(sdf.format(dtProtocollo)); + return sb.toString(); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java index a126a417..1ad1fa8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java @@ -29,9 +29,9 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.ServiceContext; public class ReportMessageListener extends BaseMessageListener { + private final static Log _log = LogFactoryUtil.getLog(ReportTaskMessageListener.class); - private static final Log _log = LogFactoryUtil.getLog(ReportTaskMessageListener.class); - + @SuppressWarnings("unchecked") @Override protected void doReceive(Message message) throws Exception { @@ -39,7 +39,6 @@ public class ReportMessageListener extends BaseMessageListener { long companyId = message.getLong(ReportConstants.COMPANY_ID); long userId = message.getLong(ReportConstants.USER_ID); Object dataSouce = message.get(ReportConstants.REPORT_DATASOURCE); - @SuppressWarnings("unchecked") Map taskContextMap = (Map) message .get(ReportConstants.PARAMATERS); if (taskContextMap == null) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java index 7d0fcb12..1512433d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java @@ -19,6 +19,8 @@ import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.messaging.BaseMessageListener; import com.liferay.portal.kernel.messaging.Message; import com.liferay.portal.kernel.messaging.MessageBusUtil; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java index f5a8f1ae..ff8d32c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java @@ -40,13 +40,16 @@ public class ReportTaskLocalServiceImpl extends ReportTaskLocalServiceBaseImpl { * it.tref.liferay.portos.report.service.ReportTaskLocalServiceUtil} to access the report task local service. */ - @Override - public ReportTask addReportTask(Map taskContextMap, ServiceContext serviceContext) - throws PortalException, SystemException { + public ReportTask addReportTask( + Map taskContextMap, ServiceContext serviceContext) + throws PortalException, SystemException { User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); - ReportTask reportTask = createReportTask(counterLocalService.increment(ReportTask.class.getName())); + + ReportTask reportTask = + reportTaskLocalService.createReportTask(counterLocalService.increment(ReportTask.class.getName())); + reportTask.setCompanyId(serviceContext.getCompanyId()); reportTask.setUserId(user.getUserId()); reportTask.setUserName(user.getFullName()); @@ -56,16 +59,20 @@ public class ReportTaskLocalServiceImpl extends ReportTaskLocalServiceBaseImpl { String taskContext = JSONFactoryUtil.looseSerializeDeep(taskContextMap); reportTask.setTaskContext(taskContext); } - return addReportTask(reportTask); + + return reportTaskLocalService.addReportTask(reportTask); } - @Override - public ReportTask markAsCompleted(long reportTaskId, Date completionDate) throws PortalException, SystemException { + public ReportTask markAsCompleted(long reportTaskId, Date completionDate) + throws PortalException, SystemException { + + ReportTask reportTask = + reportTaskLocalService.getReportTask(reportTaskId); - ReportTask reportTask = getReportTask(reportTaskId); reportTask.setModifiedDate(new Date()); reportTask.setCompleted(true); reportTask.setCompletionDate(completionDate); - return updateReportTask(reportTask); + + return reportTaskLocalService.updateReportTask(reportTask); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java index 4fb530c6..f0d88ea9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java @@ -143,8 +143,9 @@ public class ReportTaskManagerServiceImpl extends ReportTaskManagerServiceBaseIm serviceContext.setUserId(userId); serviceContext.setGroupPermissions(new String[] { ActionKeys.VIEW }); _log.info("addFileEntry userId=" + serviceContext.getUserId() + ", repositoryId=" - + folder.getRepositoryId() + ", folderId=" + folder.getFolderId() + ", sourceFileName=" - + sourceFileName + ", mimeType=" + mimeType + ", title=" + title); + + folder.getRepositoryId() + ", folderId=" + folder.getFolderId() + + ", sourceFileName=" + sourceFileName + ", mimeType=" + mimeType + ", title=" + + title); FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), folder.getRepositoryId(), folder.getFolderId(), sourceFileName, mimeType, title, StringPool.BLANK, StringPool.BLANK, bytes, serviceContext); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java index fc05c5d9..264e8d9e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.report.NoSuchReportTaskException; import it.tref.liferay.portos.report.model.ReportTask; import it.tref.liferay.portos.report.model.impl.ReportTaskImpl; import it.tref.liferay.portos.report.model.impl.ReportTaskModelImpl; -import it.tref.liferay.portos.report.service.persistence.ReportTaskPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties index 7b73e20d..116ea687 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_rep - build.number=36 - build.date=1645093778756 + build.number=37 + build.date=1675935929684 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml index 89aa194f..f5152293 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 index c8cd60e8..56f82136 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 @@ -1 +1 @@ -3983ec64257638ed926baedf51077cc9 +c79836c5d79b7c9cfc4251cfa456028c diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.classpath new file mode 100644 index 00000000..1be364fa --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.classpath @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.project new file mode 100644 index 00000000..a5eb5351 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.project @@ -0,0 +1,48 @@ + + + portos-reportistica-portlet + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.apache.ivyde.eclipse.ivynature + org.eclipse.wst.jsdt.core.jsNature + + + + 1679410576394 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.tern-project new file mode 100644 index 00000000..a185ba0d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/.tern-project @@ -0,0 +1 @@ +{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/build.xml b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/build.xml new file mode 100644 index 00000000..23d15575 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/build.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/META-INF/MANIFEST.MF b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/META-INF/MANIFEST.MF new file mode 100644 index 00000000..254272e1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/commons-csv.jar b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/commons-csv.jar new file mode 100644 index 00000000..e9eb0bd3 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/commons-csv.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..fdad23ea Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-reportistica-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-reportistica-portlet-service.jar new file mode 100644 index 00000000..5081b1c5 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-reportistica-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-display.xml b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-display.xml new file mode 100644 index 00000000..5a1077ba --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-display.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-plugin-package.properties new file mode 100644 index 00000000..17ceae47 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-plugin-package.properties @@ -0,0 +1,18 @@ +name=Portos Reportistica +module-group-id=liferay +module-incremental-version=1 +tags= +short-description= +long-description= +change-log= +page-url=http://www.liferay.com +author=Liferay, Inc. +licenses=LGPL +liferay-versions=6.2.0+ +portal-dependency-jars=\ + jstl-api.jar,\ + jstl-impl.jar +portal-dependency-tlds=\ + c.tld +required-deployment-contexts=\ + portos-bo-portlet diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-portlet.xml new file mode 100644 index 00000000..0a3c29a3 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -0,0 +1,32 @@ + + + + + + 1 + /icon.png + + configuration + + 1.8 + /css/main.css + /js/main.js + portos-reportistica-portlet + + + administrator + Administrator + + + guest + Guest + + + power-user + Power User + + + user + User + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/portlet.xml new file mode 100644 index 00000000..061bfef8 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/portlet.xml @@ -0,0 +1,36 @@ + + + + + 1 + Portos Reportistica + reportistica.Reportistica + + view-template + /html/view.jsp + + 0 + + text/html + view + + content.Language + + Portos Reportistica + Portos Reportistica + Portos Reportistica + + + administrator + + + guest + + + power-user + + + user + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/src/content/Language.properties new file mode 100644 index 00000000..07ea6179 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/src/content/Language.properties @@ -0,0 +1,107 @@ +regione_sicilia_paesaggistica=Portale Paesaggistica +portale_liferay_tooltip=liferay-portal-6.2-ce-ga6-6.2.5 +pagina_reportistica=Pagina di reportistica +filtra_pratiche_tooltip=Date per limitare la ricerca + +date_picker_inizio=Data iniziale: +date_picker_fine=Data finale: +pulsante_filtra_submit=Applica range +titolo_pagina_reportistica=Dashboard di Reportistica +titolo_campi_filtro=Range date di filtro: +titolo_tabella_risultati_stato=Filtro Pratiche per Stato e Tipo +titolo_tabella_risultati_integrazioni=Filtro Pratiche per Integrazioni +titolo_tabella_risultati_autorizzazioni=Filtro Pratiche Autorizzate e non Autorizzate +titolo_period=nel periodo +titolo_report_aggreg=Aggregazione Reportistica +pulsante_scarica_report_1=Scarica CSV Stati +pulsante_scarica_report_2=Scarica CSV Integrazioni +pulsante_scarica_report_3=Scarica CSV Autorizzazioni + +stringa_csv_vuoto_stato=Filtro stati senza risultati +stringa_csv_vuoto_integrazioni=Filtro integrazioni senza risultati +stringa_csv_vuoto_autorizzazioni=Filtro autorizzazioni senza risultati + +report_stato_vuoto=Report stati senza risultati +report_integra_vuoto=Report integrazioni senza risultati +report_autor_vuoto=Report autorizzazioni senza risultati + +tipo_procedura=Tipo procedura +traduzione_tipo_procedura=Traduzione Tipo procedura +stato_pratica=Stato pratica +traduzione_stato_pratica=Traduzione Stato pratica + +numero_pratiche=Numero pratiche + +label_procedura_P0 = 1 +tipo_procedura_P0 = Autorizzazione per interventi su Beni Culturali (D.Lgs. 42/2004 art. 21, 31, 48, 49, 50) +label_procedura_P1 = 1.1 +tipo_procedura_P1 = Interventi su Beni Culturali mobili +label_procedura_P2 = 1.2 +tipo_procedura_P2 = Interventi su Beni Culturali immobili +label_procedura_P3 = 2 +tipo_procedura_P3 = Verifica preventiva dell'interesse archeologico (D.Lgs. 25/2016, art. 25) +label_procedura_P4 = 3 +tipo_procedura_P4 = Autorizzazione per interventi di edilizia su Beni Culturali (D.Lgs. 42/2004 artt. 21, 22) +label_procedura_P5 = 4 +tipo_procedura_P5 = Autorizzazione paesaggistica per interventi e/o opere di grande impegno territoriale (D.Lgs. 42/2004 art. 146) +label_procedura_P6 = 5 +tipo_procedura_P6 = Autorizzazione paesaggistica per opere il cui impatto è valutato mediante documentazione semplificata (D.Lgs. 42/2004 art. 146) +label_procedura_P7 = 6 +tipo_procedura_P7 = Autorizzazione paesaggistica per interventi di lieve entità (L.R. 5/2019 artt. 3, 5) +label_procedura_P8 = 7 +tipo_procedura_P8 = Accertamento di compatibilità paesaggistica (D.Lgs. 42/2004 art. 146, 167) +label_procedura_P9 = 8 +tipo_procedura_P9 = Accertamento di compatibilità paesaggistica per Sanatorie Edilizie (L. 47/1985 e L.R. 37/1985 - L. 724/1994 - L. 326/2003 e L.R. 15/2004) +label_procedura_P10 = 9 +tipo_procedura_P10 = Certificazione di sussistenza vincoli + +label_procedura_Q1 = 1 +tipo_procedura_Q1 = Autorizzazione per interventi su Beni Culturali mobili, apparati decorativi, organi a canne +label_procedura_Q2 = 2 +tipo_procedura_Q2 = Autorizzazione per interventi su Beni Culturali immobili +label_procedura_Q3 = 3 +tipo_procedura_Q3 = Verifica preventiva dell'interesse archeologico +label_procedura_Q4 = 4 +tipo_procedura_Q4 = Autorizzazione prevista dagli strumenti urbanistici per interventi in aree e immobili non assoggettati a tutela ai sensi del D.Lgs. 42/2004 +label_procedura_Q5 = 5 +tipo_procedura_Q5 = Autorizzazione per "Settori Speciali" +label_procedura_Q6 = 6 +tipo_procedura_Q6 = Autorizzazione paesaggistica +label_procedura_Q7 = 7 +tipo_procedura_Q7 = Autorizzazione paesaggistica per interventi di lieve entità +label_procedura_Q8 = 8 +tipo_procedura_Q8 = Accertamento di compatibilità paesaggistica +label_procedura_Q9 = 9 +tipo_procedura_Q9 = Accertamento di compatibilità paesaggistica per istanze di Condono Edilizio +label_procedura_Q10 = 10 +tipo_procedura_Q10 = Certificazione di sussistenza vincoli + +stato-pratica-AL = Annullata +stato-pratica-AU = Autorizzata +stato-pratica-AV = Attestazione vincoli +stato-pratica-CL = Collaudo +stato-pratica-CP = Collaudo parziale +stato-pratica-CO = Conforme +stato-pratica-FL = Fine lavori +stato-pratica-FP = Fine lavori parziale +stato-pratica-IN = Richiesta integrazione +stato-pratica-SI = Integrazione accettata +stato-pratica-AN = Non autorizzata +stato-pratica-NC = Non conforme +stato-pratica-NP = Non si rilascia parere (conclusione procedimento) +stato-pratica-PC = Preavviso di parere contrario +stato-pratica-RI = Rifiutata +stato-pratica-SP = Sottoposta a parere +stato-pratica-VA = Variata +stato-pratica-VI = Vidimata + +stato-pratica-AI = Richiesto annullamento +stato-pratica-AU = Autorizzazione +stato-pratica-CI = Cambio istruttore +stato-pratica-AN = Autorizzazione negata +stato-pratica-VS = Variazione soggetti + +stato-pratica-V1 = Apertura VIArch +stato-pratica-V2 = Chiusura VIArch +stato-pratica-DS = Decreto sanzione +stato-pratica-PS = Perizia sanzione \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/src/reportistica/Reportistica.java b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/src/reportistica/Reportistica.java new file mode 100644 index 00000000..cec75fea --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/src/reportistica/Reportistica.java @@ -0,0 +1,141 @@ +package reportistica; + +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.portlet.PortletResponseUtil; +import com.liferay.portal.kernel.util.ContentTypes; +import com.liferay.portal.kernel.util.DateFormatFactoryUtil; +import com.liferay.portal.kernel.util.ParamUtil; +import com.liferay.util.bridges.mvc.MVCPortlet; + +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; + +import java.io.IOException; +import java.io.StringWriter; +import java.math.BigInteger; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +import javax.portlet.PortletException; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; + +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVPrinter; + +public class Reportistica extends MVCPortlet { + @Override + public void serveResource(ResourceRequest req, ResourceResponse rep) throws IOException, PortletException { + String idAzione = req.getResourceID(); + Date dataInizioLavori = ParamUtil.getDate(req, "dataInizioInput", DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd")); + Date dataFineLavori = ParamUtil.getDate(req, "dataFineInput", DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd")); + String contentType = ContentTypes.APPLICATION_TEXT; + Locale loc = req.getLocale(); + String tipo_procedura = LanguageUtil.get(loc, "tipo_procedura"); + String stato_pratica = LanguageUtil.get(loc, "stato_pratica"); + String numero_pratiche = LanguageUtil.get(loc, "numero_pratiche"); + DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); + String nel_periodo =formatter.format(dataInizioLavori) +"-"+formatter.format(dataFineLavori); + if ("azioneScarica1".equals(idAzione)) { + + String fileName = "report_stati"+nel_periodo+".csv"; + + try( + StringWriter sw = new StringWriter(); + CSVPrinter csvPrinter = new CSVPrinter(sw, CSVFormat.DEFAULT. + withHeader( + tipo_procedura, + stato_pratica, + numero_pratiche) + ); + ){ + List i = IntPraticaLocalServiceUtil.filtraPraticheStato(dataInizioLavori, dataFineLavori); + + for(Object[] record : i){ + + String tipoprocedura = (String)record[0]; + tipoprocedura+= ":"+LanguageUtil.get(loc, "tipo_procedura_"+tipoprocedura); + String statopratica = (String)record[1]; + statopratica+= ":"+LanguageUtil.get(loc, "stato-pratica-"+statopratica); + BigInteger countStati = (BigInteger)record[2]; + csvPrinter.printRecord(tipoprocedura, statopratica, countStati); + } + csvPrinter.flush(); + PortletResponseUtil.sendFile(req, rep, + fileName, sw.toString().getBytes(), contentType); + return; + } catch (SystemException | IOException e) { + e.printStackTrace(); + return; + } + } + if ("azioneScarica2".equals(idAzione)) { + + String fileName = "report_integ"+nel_periodo+".csv"; + + try( + StringWriter sw = new StringWriter(); + CSVPrinter csvPrinter = new CSVPrinter(sw, CSVFormat.DEFAULT. + withHeader( + tipo_procedura, + numero_pratiche) + ); + ){ + + List j = IntPraticaLocalServiceUtil.filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori); + + for(Object[] record : j){ + String tipoprocedura = (String)record[0]; + tipoprocedura+= ":"+LanguageUtil.get(loc, "tipo_procedura_"+tipoprocedura); + BigInteger countIntegrazioni = (BigInteger)record[1]; + csvPrinter.printRecord(tipoprocedura, countIntegrazioni); + } + csvPrinter.flush(); + PortletResponseUtil.sendFile(req, rep, + fileName, sw.toString().getBytes(), contentType); + return; + } catch (SystemException | IOException e) { + e.printStackTrace(); + return; + } + } + if ("azioneScarica3".equals(idAzione)) { + + String fileName = "report_autor"+nel_periodo+".csv"; + + try( + StringWriter sw = new StringWriter(); + CSVPrinter csvPrinter = new CSVPrinter(sw, CSVFormat.DEFAULT. + withHeader( + tipo_procedura, + stato_pratica, + numero_pratiche) + ); + ){ + List k = IntPraticaLocalServiceUtil.filtraPraticheAutorizzate(dataInizioLavori, dataFineLavori); + + for(Object[] record : k){ + + String tipoprocedura = (String)record[0]; + tipoprocedura+= ":"+LanguageUtil.get(loc, "tipo_procedura_"+tipoprocedura); + String statopratica = (String)record[1]; + statopratica+= ":"+LanguageUtil.get(loc, "stato-pratica-"+statopratica); + BigInteger countStati = (BigInteger)record[2]; + csvPrinter.printRecord(tipoprocedura, statopratica, countStati); + } + csvPrinter.flush(); + PortletResponseUtil.sendFile(req, rep, + fileName, sw.toString().getBytes(), contentType); + return; + } catch (SystemException | IOException e) { + e.printStackTrace(); + return; + } + } + + super.serveResource(req, rep); + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/aui.tld b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/aui.tld new file mode 100644 index 00000000..1eeac884 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/aui.tld @@ -0,0 +1,2568 @@ + + + + aui:.]]> + 1.0 + aui + http://alloy.liferay.com/tld/aui + + + button-item + com.liferay.taglib.aui.ButtonItemTag + JSP + + ]]> + activeState + false + true + boolean + + + ]]> + boundingBox + false + true + java.lang.String + + + ]]> + classNames + false + true + java.lang.Object + + + ]]> + contentBox + false + true + java.lang.String + + + boundingBox.]]> + cssClass + false + true + java.lang.String + + + ]]> + defaultState + false + true + boolean + + + ]]> + depth + false + true + java.lang.Object + + + ]]> + destroyed + false + true + boolean + + + ]]> + disabled + false + true + boolean + + + ]]> + focused + false + true + boolean + + + {fn: // The function to execute + context: // The context to execute the function in + type: // The type of event to listen for (defaults to "click") + }]]> + handler + false + true + java.lang.Object + + + ]]> + height + false + true + java.lang.Object + + + boundingBox when + visible is set to + false.]]> + hideClass + false + true + java.lang.String + + + ]]> + hoverState + false + true + boolean + + + ]]> + icon + false + true + java.lang.String + + + aui-button-icon.]]> + iconNode + false + true + java.lang.String + + + ]]> + buttonitemId + false + true + java.lang.String + + + ]]> + index + false + true + java.lang.Object + + + ]]> + initialized + false + true + boolean + + + ]]> + label + false + true + java.lang.String + + + aui-button-label.]]> + labelNode + false + true + java.lang.String + + + ]]> + buttonitemParent + false + true + java.lang.Object + + + true the render phase will be autimatically invoked + preventing the .render() manual call.]]> + render + false + true + java.lang.Object + + + ]]> + rendered + false + true + boolean + + + ]]> + root + false + true + java.lang.Object + + + +
0
(Default) Not selected
+
1
Fully selected
+
2
Partially selected
+ ]]>
+ selected + false + true + java.lang.Object +
+ + ]]> + srcNode + false + true + java.lang.String + + + ]]> + strings + false + true + java.lang.Object + + + ]]> + tabIndex + false + true + java.lang.Object + + + ]]> + title + false + true + java.lang.String + + + ]]> + type + false + true + java.lang.String + + + ]]> + useARIA + false + true + boolean + + + ]]> + visible + false + true + boolean + + + ]]> + width + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterActiveStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterBoundingBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterClassNamesChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterContentBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterCssClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDefaultStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDepthChange + false + true + java.lang.Object + + + + Lifecycle event for the destroy phase, + fired prior to destruction. Invoking the preventDefault + method on the event object provided to subscribers will + prevent destruction from proceeding. +

+

+ Subscribers to the "after" moment of this event, will be notified + after destruction is complete (and as a result cannot prevent + destruction). +

]]>
+ afterDestroy + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDestroyedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterDisabledChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterFocusedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHandlerChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHeightChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHideClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterHoverStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIconChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIconNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIdChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterIndexChange + false + true + java.lang.Object + + + + Lifecycle event for the init phase, fired prior to initialization. + Invoking the preventDefault() method on the event object provided + to subscribers will prevent initialization from occuring. +

+

+ Subscribers to the "after" momemt of this event, will be notified + after initialization of the object is complete (and therefore + cannot prevent initialization). +

]]>
+ afterInit + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterInitializedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterLabelChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterLabelNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterParentChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterRenderChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterRenderedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterRootChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterSelectedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterSrcNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterStringsChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterTabIndexChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterTitleChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterTypeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterUseARIAChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterVisibleChange + false + true + java.lang.Object + + + ]]> + afterContentUpdate + false + true + java.lang.Object + + + + Subscribers to the "on" moment of this event, will be notified + before the widget is rendered. +

+

+ Subscribers to the "after" moment of this event, will be notified + after rendering is complete. +

]]>
+ afterRender + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + afterWidthChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onActiveStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onBoundingBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onClassNamesChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onContentBoxChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onCssClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDefaultStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDepthChange + false + true + java.lang.Object + + + + Lifecycle event for the destroy phase, + fired prior to destruction. Invoking the preventDefault + method on the event object provided to subscribers will + prevent destruction from proceeding. +

+

+ Subscribers to the "after" moment of this event, will be notified + after destruction is complete (and as a result cannot prevent + destruction). +

]]>
+ onDestroy + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDestroyedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onDisabledChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onFocusedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHandlerChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHeightChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHideClassChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onHoverStateChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIconChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIconNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIdChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onIndexChange + false + true + java.lang.Object + + + + Lifecycle event for the init phase, fired prior to initialization. + Invoking the preventDefault() method on the event object provided + to subscribers will prevent initialization from occuring. +

+

+ Subscribers to the "after" momemt of this event, will be notified + after initialization of the object is complete (and therefore + cannot prevent initialization). +

]]>
+ onInit + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onInitializedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onLabelChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onLabelNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onParentChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onRenderChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onRenderedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onRootChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onSelectedChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onSrcNodeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onStringsChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onTabIndexChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onTitleChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onTypeChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onUseARIAChange + false + true + java.lang.Object + + + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onVisibleChange + false + true + java.lang.Object + + + ]]> + onContentUpdate + false + true + java.lang.Object + + + + Subscribers to the "on" moment of this event, will be notified + before the widget is rendered. +

+

+ Subscribers to the "after" moment of this event, will be notified + after rendering is complete. +

]]>
+ onRender + false + true + java.lang.Object +
+ + on method if you wish to be notified before the attribute's value has changed, or using the after method if you wish to be notified after the attribute's value has changed.]]> + onWidthChange + false + true + java.lang.Object + + true +
+ + + a + com.liferay.taglib.aui.ATag + JSP + + <p> tag could be used for something other than a paragraph.]]> + ariaRole + false + true + java.lang.String + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.util.Map + + + + href + true + true + java.lang.String + + + + id + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + + lang + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + self. Possible values are blank, self, parent, top, and a unique frame's name.]]> + target + false + true + java.lang.String + + + + title + false + true + java.lang.String + + true + + + button + com.liferay.taglib.aui.ButtonTag + JSP + + primary attribute.]]> + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + false.]]> + disabled + false + true + boolean + + + + href + false + true + java.lang.String + + + here.]]> + icon + false + true + java.lang.String + + + left.]]> + iconAlign + false + true + java.lang.String + + + + name + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + type attribute is set to submit, this value is set to true. For all other types, the value is set to false by default.]]> + primary + false + true + java.lang.Object + + + button, submit, cancel and reset. The default value is button.]]> + type + false + true + java.lang.String + + + href location when a user clicks the button. The default value is false.]]> + useDialog + false + true + boolean + + + value + false + true + java.lang.String + + true + + + <div> tag to wrap <aui:button> components and offer additional styling.]]> + button-row + com.liferay.taglib.aui.ButtonRowTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + true + + + <aui:row> component.]]> + col + com.liferay.taglib.aui.ColTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + offset + false + true + int + + + offsetWidth + false + true + int + + + 12. For example, a span of 4 would result in a column width 4/12 (or 1/3) of the total width of the containing row.]]> + span + false + true + int + + + span attribute. The width is then converted to a span expressed as ((width/100) x 12), rounded to the nearest whole number. For example, a width of 33 would be converted to 3.96, which would be rounded up to a span value of 4.]]> + width + false + true + int + + true + + + aui:col.]]> + column + com.liferay.taglib.aui.ColumnTag + JSP + + 20 would be 20%. The default value is 0.]]> + columnWidth + false + true + int + + + + cssClass + false + true + java.lang.String + + + false.]]> + first + false + true + boolean + + + + id + false + true + java.lang.String + + + false.]]> + last + false + true + boolean + + true + + + component + com.liferay.taglib.aui.ComponentTag + JSP + + defineVar + false + true + boolean + + + excludeAttributes + false + true + java.lang.String + + + javaScriptAttributes + false + true + java.lang.String + + + module + false + true + java.lang.String + + + name + false + true + java.lang.String + + + options + false + true + java.util.Map + + + scriptPosition + false + true + java.lang.String + + + tagPageContext + true + true + javax.servlet.jsp.JspContext + + + useJavaScript + false + true + java.io.Serializable + + + var + false + true + java.lang.String + + true + + + <div> tag to wrap <aui:row> components and offer additional styling.]]> + container + com.liferay.taglib.aui.ContainerTag + JSP + + + cssClass + false + true + java.lang.String + + + true.]]> + fluid + false + true + boolean + + + + id + false + true + java.lang.String + + true + + + <div> tag to wrap form fields and offer additional styling.]]> + field-wrapper + com.liferay.taglib.aui.FieldWrapperTag + JSP + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + false.]]> + first + false + true + boolean + + + + helpMessage + false + true + java.lang.String + + + false.]]> + inlineField + false + true + boolean + + + right and left.]]> + inlineLabel + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + false.]]> + last + false + true + boolean + + + + name + false + true + java.lang.String + + + + required + false + true + boolean + + + + <div> tag to group related form elements and offer additional styling.]]> + fieldset + com.liferay.taglib.aui.FieldsetTag + JSP + + + column + false + true + boolean + + + + cssClass + false + true + java.lang.String + + + + helpMessage + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + + label + false + true + java.lang.String + + true + + + + form + com.liferay.taglib.aui.FormTag + JSP + + + action + false + true + java.lang.String + + + + cssClass + false + true + java.lang.String + + + true.]]> + escapeXml + false + true + boolean + + + false.]]> + inlineLabels + false + true + boolean + + + post. Possible values are get and post.]]> + method + false + true + java.lang.String + + + fm.]]> + name + false + true + java.lang.String + + + + onSubmit + false + true + java.lang.String + + + + portletNamespace + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + true + + + + icon + com.liferay.taglib.aui.IconTag + JSP + + image attribute.]]> + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.util.Map + + + + id + false + true + java.lang.String + + + icon-edit CSS class by setting the value edit. If an icon image is referenced for cssClass and image, both icons are shown in the component.]]> + image + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + self. Possible values are blank, self, parent, top, and a unique frame's name.]]> + target + false + true + java.lang.String + + + + url + false + true + java.lang.String + + true + + + + input + com.liferay.taglib.aui.InputTag + JSP + + + autoFocus + false + true + boolean + + + + autoSize + false + true + boolean + + + + bean + false + true + java.lang.Object + + + false.]]> + changesContext + false + true + boolean + + + type is radio or checkbox.]]> + checked + false + true + boolean + + + 0.]]> + classPK + false + true + long + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + dateTogglerCheckboxLabel + false + true + java.lang.String + + + + defaultLanguageId + false + true + java.lang.String + + + false.]]> + disabled + false + true + boolean + + + field + false + true + java.lang.String + + + field of the component.]]> + fieldParam + false + true + java.lang.String + + + + first + false + true + boolean + + + + formName + false + true + java.lang.String + + + + helpMessage + false + true + java.lang.String + + + input-group-addon.]]> + helpTextCssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + false.]]> + ignoreRequestValue + false + true + boolean + + + false.]]> + inlineField + false + true + boolean + + + right and left.]]> + inlineLabel + false + true + java.lang.String + + + name attribute's value.]]> + label + false + true + java.lang.String + + + languageId + false + true + java.lang.String + + + + last + false + true + boolean + + + false.]]> + localized + false + true + boolean + + + type is number or range. Note that the max value is inclusive if the input's type is range.]]> + max + false + true + java.lang.Object + + + + model + false + true + java.lang.Class + + + type is number or range. Note that the min value is inclusive if the input's type is range.]]> + min + false + true + java.lang.Object + + + multiple + false + true + boolean + + + + name + true + true + java.lang.String + + + + onChange + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + + placeholder + false + true + java.lang.String + + + + prefix + false + true + java.lang.String + + + + required + false + true + boolean + + + textarea.]]> + resizable + false + true + boolean + + + + showRequiredLabel + false + true + boolean + + + + suffix + false + true + java.lang.String + + + + title + false + true + java.lang.String + + + text, hidden, assetCategories, assetTags, textarea, timeZone, password, checkbox, radio, submit, button, color, email, number, range, resource, url, and an empty value. If an empty value or no value is set, the input's type is obtained automatically from the input component's bean.]]> + type + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + + + value + false + true + java.lang.Object + + + div that wraps the input component.]]> + wrapperCssClass + false + true + java.lang.String + + true + + + + layout + com.liferay.taglib.aui.LayoutTag + JSP + + + cssClass + false + true + java.lang.String + + true + + + + model-context + com.liferay.taglib.aui.ModelContextTag + JSP + + + bean + false + true + java.lang.Object + + + + defaultLanguageId + false + true + java.lang.String + + + + model + false + true + java.lang.Class + + + + <nav:item> components for an <aui:nav-bar> component.]]> + nav + com.liferay.taglib.aui.NavTag + JSP + + + ariaLabel + false + true + java.lang.String + + + <p> tag could be used for something other than a paragraph.]]> + ariaRole + false + true + java.lang.String + + + collapsible + false + true + boolean + + + + cssClass + false + true + java.lang.String + + + icon + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + true + + + + nav-bar + com.liferay.taglib.aui.NavBarTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + true + + + <aui:nav-bar> component.]]> + nav-bar-search + com.liferay.taglib.aui.NavBarSearchTag + JSP + + + cssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + file + false + true + java.lang.String + + + + searchContainer + false + true + com.liferay.portal.kernel.dao.search.SearchContainer + + true + + + <aui:nav> component.]]> + nav-item + com.liferay.taglib.aui.NavItemTag + JSP + + href attribute.]]> + anchorCssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + anchorData + false + true + java.lang.Object + + + href attribute.]]> + anchorId + false + true + java.lang.String + + + + ariaLabel + false + true + java.lang.String + + + <p> tag could be used for something other than a paragraph.]]> + ariaRole + false + true + java.lang.String + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.lang.Object + + + false.]]> + dropdown + false + true + boolean + + + + href + false + true + java.lang.Object + + + + iconCssClass + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + localizeLabel + false + true + boolean + + + false.]]> + selected + false + true + boolean + + + state + false + true + java.lang.String + + + + title + false + true + java.lang.String + + + toggle + false + true + boolean + + + href location when a user clicks the navigation item. The default value is false.]]> + useDialog + false + true + boolean + + + drop-down-menu class. The default value is true.]]> + wrapDropDownMenu + false + true + boolean + + true + + + <aui:select> component.]]> + option + com.liferay.taglib.aui.OptionTag + JSP + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", foo> would render as the attribute data-class-name = foo;.]]> + data + false + true + java.util.Map + + + false.]]> + disabled + false + true + boolean + + + + label + false + true + java.lang.Object + + + false.]]> + selected + false + true + boolean + + + text-align:right;.]]> + style + false + true + java.lang.String + + + useModelValue + false + true + boolean + + + label attribute.]]> + value + false + true + java.lang.Object + + true + + + panel + com.liferay.taglib.aui.PanelTag + JSP + + collapsed + false + true + boolean + + + collapsible + false + true + boolean + + + id + false + true + java.lang.String + + + label + false + true + java.lang.String + + + + <aui:col> components.]]> + row + com.liferay.taglib.aui.RowTag + JSP + + + cssClass + false + true + java.lang.String + + + row-fluid CSS class to the row. The default value is true. If set to false, the row CSS class is assigned.]]> + fluid + false + true + boolean + + + + id + false + true + java.lang.String + + true + + + + script + com.liferay.taglib.aui.ScriptTag + JSP + + + position + false + true + java.lang.String + + + + use + false + true + java.lang.String + + + + <aui:option> components.]]> + select + com.liferay.taglib.aui.SelectTag + JSP + + + bean + false + true + java.lang.Object + + + false.]]> + changesContext + false + true + boolean + + + + cssClass + false + true + java.lang.String + + + HashMap<"class-name", "foo"> would render as the attribute data-class-name = "foo";.]]> + data + false + true + java.util.Map + + + false.]]> + disabled + false + true + boolean + + + false.]]> + first + false + true + boolean + + + + helpMessage + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + ignoreRequestValue + false + true + boolean + + + false.]]> + inlineField + false + true + boolean + + + right and left.]]> + inlineLabel + false + true + java.lang.String + + + + label + false + true + java.lang.String + + + false.]]> + last + false + true + boolean + + + ListTypeImpl.java.]]> + listType + false + true + java.lang.String + + + listTypeFieldName + false + true + java.lang.String + + + true, the select field expands to allow for multiple selections. The default value is false.]]> + multiple + false + true + boolean + + + label attribute and takes the place of the label.]]> + name + true + true + java.lang.String + + + + onChange + false + true + java.lang.String + + + + onClick + false + true + java.lang.String + + + + prefix + false + true + java.lang.String + + + false.]]> + required + false + true + boolean + + + false.]]> + showEmptyOption + false + true + boolean + + + required attribute is set to true. The default value is false.]]> + showRequiredLabel + false + true + boolean + + + + suffix + false + true + java.lang.String + + + + title + false + true + java.lang.String + + + true.]]> + useNamespace + false + true + boolean + + true + + + + spacer + com.liferay.taglib.aui.SpacerTag + JSP + + + + translation-manager + com.liferay.taglib.aui.TranslationManagerTag + JSP + + + availableLocales + false + true + java.util.Locale[] + + + + defaultLanguageId + false + true + java.lang.String + + + editingLanguageId + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + true. If this is set to false, the translation manager will not work entirely.]]> + initialize + false + true + boolean + + + false.]]> + readOnly + false + true + boolean + + + + + validator + com.liferay.taglib.aui.ValidatorTagImpl + JSP + + true.]]> + customValidatorRequired + false + true + boolean + + + + errorMessage + false + true + java.lang.String + + + acceptFiles, alpha, alphanum, date, digits, email, equalTo, iri, max, maxLength, min, minLength, number, required, and url.]]> + name + true + true + java.lang.String + + + + + workflow-status + com.liferay.taglib.aui.WorkflowStatusTag + JSP + + + bean + false + true + java.lang.Object + + + + helpMessage + false + true + java.lang.String + + + + id + false + true + java.lang.String + + + + model + false + true + java.lang.Class + + + true.]]> + showIcon + false + true + boolean + + + true.]]> + showLabel + false + true + boolean + + + 0 (Approved), 1 (Pending), 2 (Draft), 3 (Expired), 4 (Denied), 5 (Inactive), 6 (Incomplete), 7 (Scheduled), and 8 (In-Trash). Any other value defaults to status (Any).]]> + status + false + true + java.lang.Integer + + + + statusMessage + false + true + java.lang.String + + + + version + false + true + java.lang.String + + +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld new file mode 100644 index 00000000..7c046647 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld @@ -0,0 +1,538 @@ + + + + + 1.0 + 1.1 + liferay-portlet + http://liferay.com/tld/portlet + + + + + actionURL + com.liferay.taglib.portlet.ActionURLTag + com.liferay.taglib.portlet.ActionURLTei + JSP + + allowEmptyParam + false + true + + + anchor + false + true + + + copyCurrentRenderParameters + false + true + + + doAsGroupId + false + true + + + doAsUserId + false + true + + + encrypt + false + true + + + escapeXml + false + true + + + name + false + true + + + plid + false + true + + + portletConfiguration + false + true + + + portletMode + false + true + + + portletName + false + true + + + refererGroupId + false + true + + + refererPlid + false + true + + + secure + false + true + + + var + false + true + + + varImpl + false + true + + + windowState + false + true + + + + icon-back + com.liferay.taglib.portletext.IconBackTag + JSP + + + icon-close + com.liferay.taglib.portletext.IconCloseTag + JSP + + + icon-configuration + com.liferay.taglib.portletext.IconConfigurationTag + JSP + + + icon-edit + com.liferay.taglib.portletext.IconEditTag + JSP + + + icon-edit-defaults + com.liferay.taglib.portletext.IconEditDefaultsTag + JSP + + + icon-edit-guest + com.liferay.taglib.portletext.IconEditGuestTag + JSP + + + icon-export-import + com.liferay.taglib.portletext.IconExportImportTag + JSP + + + icon-help + com.liferay.taglib.portletext.IconHelpTag + JSP + + + icon-maximize + com.liferay.taglib.portletext.IconMaximizeTag + JSP + + + icon-minimize + com.liferay.taglib.portletext.IconMinimizeTag + JSP + + + icon-options + com.liferay.taglib.portletext.IconOptionsTag + JSP + + + icon-portlet + com.liferay.taglib.portletext.IconPortletTag + JSP + + ariaRole + false + true + + + id + false + true + + + label + false + true + + + portlet + false + true + + + url + false + true + + + + icon-portlet-css + com.liferay.taglib.portletext.IconPortletCssTag + JSP + + + icon-print + com.liferay.taglib.portletext.IconPrintTag + JSP + + + icon-refresh + com.liferay.taglib.portletext.IconRefreshTag + JSP + + + param + com.liferay.taglib.util.ParamTag + empty + + name + true + true + + + value + true + true + + + + preview + com.liferay.taglib.portletext.PreviewTag + JSP + + portletName + true + true + + + queryString + false + true + + + showBorders + false + true + + + width + false + true + + + + + + + renderURL + com.liferay.taglib.portlet.RenderURLTag + com.liferay.taglib.portlet.RenderURLTei + JSP + + allowEmptyParam + false + true + + + anchor + false + true + + + copyCurrentRenderParameters + false + true + + + doAsGroupId + false + true + + + doAsUserId + false + true + + + encrypt + false + true + + + escapeXml + false + true + + + plid + false + true + + + portletConfiguration + false + true + + + portletMode + false + true + + + portletName + false + true + + + refererGroupId + false + true + + + refererPlid + false + true + + + secure + false + true + + + var + false + true + + + varImpl + false + true + + + windowState + false + true + + + + renderURLParams + com.liferay.taglib.portlet.RenderURLParamsTag + JSP + + varImpl + true + true + + + + + + + resourceURL + com.liferay.taglib.portlet.ResourceURLTag + com.liferay.taglib.portlet.ResourceURLTei + JSP + + anchor + false + true + + + copyCurrentRenderParameters + false + true + + + doAsGroupId + false + true + + + doAsUserId + false + true + + + encrypt + false + true + + + escapeXml + false + true + + + id + false + true + + + plid + false + true + + + portletConfiguration + false + true + + + portletMode + false + true + + + portletName + false + true + + + refererGroupId + false + true + + + refererPlid + false + true + + + secure + false + true + + + var + false + true + + + varImpl + false + true + + + windowState + false + true + + + + runtime + com.liferay.taglib.portletext.RuntimeTag + JSP + + defaultPreferences + false + true + + + portletName + true + true + + + queryString + false + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-portlet.tld b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-portlet.tld new file mode 100644 index 00000000..a7cd2fdf --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-portlet.tld @@ -0,0 +1,158 @@ + + + + + 1.0 + 1.1 + portlet + http://java.sun.com/portlet + + actionURL + com.liferay.taglib.portlet.ActionURLTag + com.liferay.taglib.portlet.ActionURLTei + JSP + + copyCurrentRenderParameters + false + true + + + escapeXml + false + true + + + name + false + true + + + portletMode + false + true + + + secure + false + true + + + var + false + true + + + windowState + false + true + + + + defineObjects + com.liferay.taglib.portlet.DefineObjectsTag + com.liferay.taglib.portlet.DefineObjectsTei + empty + + + namespace + com.liferay.taglib.portlet.NamespaceTag + empty + + + param + com.liferay.taglib.util.ParamTag + empty + + name + true + true + + + value + true + true + + + + property + com.liferay.taglib.util.PropertyTag + empty + + name + true + true + + + value + true + true + + + + renderURL + com.liferay.taglib.portlet.RenderURLTag + com.liferay.taglib.portlet.RenderURLTei + JSP + + copyCurrentRenderParameters + false + true + + + escapeXml + false + true + + + portletMode + false + true + + + secure + false + true + + + var + false + true + + + windowState + false + true + + + + resourceURL + com.liferay.taglib.portlet.ResourceURLTag + com.liferay.taglib.portlet.ResourceURLTei + JSP + + cacheability + false + true + + + escapeXml + false + true + + + id + false + true + + + secure + false + true + + + var + false + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-security.tld b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-security.tld new file mode 100644 index 00000000..f8e6f6dd --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-security.tld @@ -0,0 +1,106 @@ + + + + + 1.0 + 1.1 + liferay-security + http://liferay.com/tld/security + + doAsURL + com.liferay.taglib.security.DoAsURLTag + com.liferay.taglib.security.DoAsURLTei + JSP + + doAsUserId + false + true + + + var + false + true + + + + encrypt + com.liferay.taglib.security.EncryptTag + JSP + + className + false + true + + + protocol + true + true + + + style + false + true + + + target + false + true + + + unencryptedParams + false + true + + + url + true + true + + + + permissionsURL + com.liferay.taglib.security.PermissionsURLTag + com.liferay.taglib.security.PermissionsURLTei + JSP + + modelResource + true + true + + + modelResourceDescription + true + true + + + redirect + false + true + + + resourceGroupId + false + true + + + resourcePrimKey + true + true + + + roleTypes + false + true + + + var + false + true + + + windowState + false + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-theme.tld b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-theme.tld new file mode 100644 index 00000000..90ac81db --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-theme.tld @@ -0,0 +1,65 @@ + + + + + 1.0 + 1.1 + theme + http://liferay.com/tld/theme + + defineObjects + com.liferay.taglib.theme.DefineObjectsTag + com.liferay.taglib.theme.DefineObjectsTei + empty + + + include + com.liferay.taglib.theme.IncludeTag + JSP + + page + true + true + + + + layout-icon + com.liferay.taglib.theme.LayoutIconTag + JSP + + layout + true + true + + + + meta-tags + com.liferay.taglib.theme.MetaTagsTag + JSP + + + param + com.liferay.taglib.util.ParamTag + JSP + + name + true + true + + + value + true + true + + + + wrap-portlet + com.liferay.taglib.theme.WrapPortletTag + JSP + + page + true + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-ui.tld b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-ui.tld new file mode 100644 index 00000000..daa2c534 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-ui.tld @@ -0,0 +1,4696 @@ + + + + Provides the Liferay UI component tags, prefixed with liferay-ui:]]>. + 1.0 + liferay-ui + http://liferay.com/tld/ui + + app-view-display-style + com.liferay.taglib.ui.AppViewDisplayStyleTag + empty + + displayStyle + true + true + + + displayStyles + true + true + + + requestParams + true + true + + + + Creates a component for displaying entry items such as images, documents, folders, etc. in a concise but informative manner. Items are displayed in a similar fashion to entries in the file system of most operating systems. + app-view-entry + com.liferay.taglib.ui.AppViewEntryTag + empty + + The path to an action JSP page. + actionJsp + false + true + + + The Java class name for any categories added to the entry. + assetCategoryClassName + false + true + + + The Java class primary key for any categories added to the entry. This is a Java long]]>. + assetCategoryClassPK + false + true + + + The Java class name for any tags added to the entry. + assetTagClassName + false + true + + + The Java class primary key for any tags added to the entry. This is a Java long]]>. + assetTagClassPK + false + true + + + The name of the entry's author. + author + false + true + + + The date the entry was created. + createDate + false + true + + + A CSS class for styling this component. + cssClass + false + true + + + Miscellaneous data to be stored via a map. This data is not shared with the browser. The map holds key value pairs of type <String, Object>]]>. + data + false + true + java.util.Map + + + A description of the entry. + description + false + true + + + A date to display the entry. + displayDate + false + true + + + A display style for the component. Options are list]]>, icon]]>, and descriptive]]>. + displayStyle + true + true + + + A date for the entry to expire and be automatically deleted. + expirationDate + false + true + + + Whether the entry is a folder. The default is false]]>. + folder + false + true + boolean + + + The group ID of the entry. This is a Java long]]>. + groupId + false + true + + + The version number of the most recently published copy of the entry. + latestApprovedVersion + false + true + + + The author of the most recently published version of the entry. + latestApprovedVersionAuthor + false + true + + + Whether the entry is locked. The default value is false]]>. + locked + false + true + boolean + + + The date of the most recent modification to the entry. + modifiedDate + false + true + + + The date the entry was reviewed. + reviewDate + false + true + + + A checkbox input ID to be used for the entry row checker. + rowCheckerId + false + true + + + A name for the entry row checker. + rowCheckerName + false + true + + + Whether to show a shortcut icon link to the entry. The default value is false]]>. + shortcut + false + true + boolean + + + Whether the entry is selectable. An actual checkbox is used when the display style is icon]]> or descriptive]]>. The default value is false]]>. + showCheckbox + true + true + boolean + + + Whether to show the link title. The default value is true]]>. + showLinkTitle + false + true + boolean + + + The current status of the entry, as represented by an integer. Options are -1: STATUS_ANY]]>, 0: STATUS_APPROVED]]>, 1: ACTION_PUBLISH]]>, 2: STATUS_DRAFT]]>, and 4: STATUS_DENIED]]>. The default value is -1]]>. + status + false + true + int + + + A CSS style to be applied to the div containing the thumbnail for the entry. + thumbnailDivStyle + false + true + + + The source URL for an entry thumbnail image. + thumbnailSrc + true + true + + + A CSS style to be applied to the thumbnail for the entry. + thumbnailStyle + false + true + + + A title for the entry. + title + true + true + + + The current version of the entry. + version + false + true + + + A URL to view the full entry. + url + false + true + + + + Creates a navigation list item component for navigating app view entries. + app-view-navigation-entry + com.liferay.taglib.ui.AppViewNavigationEntryTag + empty + + The path for an action JSP page. + actionJsp + false + true + + + A CSS class for styling this component. + cssClass + false + true + + + Data to be applied to the component link and stored via a map. This data is not shared with the browser. The map holds key value pairs of type <String, Object>]]>. + dataView + false + true + java.util.Map + + + A title for the component. + entryTitle + true + true + + + A CSS class for setting the icon of the component. + iconImage + false + true + + + iconSrc + false + true + + + Whether the entry is selected. + selected + false + true + boolean + + + A URL to view the entry. + viewURL + true + true + + + + Creates a toolbar for viewing items in app view. + app-view-toolbar + com.liferay.taglib.ui.AppViewToolbarTag + JSP + + Whether to include the option to choose a display style for component items. If the value is true]]>, a list of display style options is rendered. The default value is false]]>. + includeDisplayStyle + false + true + boolean + + + Whether to include an option to select all component items. The default value is false]]>. + includeSelectAll + false + true + boolean + + + The file path for a search JSP page. + searchJsp + false + true + + + + Creates a component for displaying search results of entries in app view. + app-view-search-entry + com.liferay.taglib.ui.AppViewSearchEntryTag + empty + + The file path for an action JSP page. + actionJsp + false + true + + + containerIcon + false + true + + + The name of the container that the entry is in, such as the name of a folder. + containerName + false + true + + + containerSrc + false + true + + + The type of container the entry is in, such as Folder]]>. + containerType + false + true + + + A CSS class for styling this component. + cssClass + false + true + + + A description of the entry. + description + true + true + + + A list of objects containing information such as content, user ID, and titles of the entry file attachments. + fileEntryTuples + false + true + + + Whether the entry is locked. The default value is false]]>. + locked + false + true + boolean + + + A list of objects containing information such as content, author, and status of entry messages. An example would be a comment made by one user on another user's blog post. + mbMessages + false + true + + + Query terms of the search. + queryTerms + true + true + + + A checkbox input ID to be used for the entry row checker. This is a Java long]]>. + rowCheckerId + false + true + + + A name to be used for the entry row checker. + rowCheckerName + false + true + + + Whether the entry is selectable via a checkbox. The default value is true]]>. + showCheckbox + false + true + boolean + + + The current status of the entry as represented by an integer. Options are -1: STATUS_ANY]]>, 0: STATUS_APPROVED]]>, 1: ACTION_PUBLISH]]>, 2: STATUS_DRAFT]]>, and 4: STATUS_DENIED]]>. + status + false + true + + + The URL for an entry thumbnail image. + thumbnailSrc + false + true + + + A title for the entry. + title + true + true + + + A URL used to view the full entry. + url + true + true + + + The current and past versions of the entry. + versions + false + true + + + + asset-categories-error + com.liferay.taglib.ui.AssetCategoriesErrorTag + JSP + + + asset-categories-navigation + com.liferay.taglib.ui.AssetCategoriesNavigationTag + JSP + + hidePortletWhenEmpty + false + true + + + vocabularyIds + false + true + + + + asset-categories-selector + com.liferay.taglib.ui.AssetCategoriesSelectorTag + JSP + + className + false + true + + + classPK + false + true + + + contentCallback + false + true + + + curCategoryIds + false + true + + + groupIds + false + true + + + hiddenInput + false + true + + + ignoreRequestValue + false + true + + + + asset-categories-summary + com.liferay.taglib.ui.AssetCategoriesSummaryTag + JSP + + className + true + true + + + classPK + true + true + + + message + false + true + + + portletURL + false + true + + + + asset-links + com.liferay.taglib.ui.AssetLinksTag + JSP + + assetEntryId + false + true + + + className + false + true + + + classPK + false + true + + + + Creates a liferay-ui:error]]> component to display tag-related error messages. + asset-tags-error + com.liferay.taglib.ui.AssetTagsErrorTag + JSP + + + asset-tags-navigation + com.liferay.taglib.ui.AssetTagsNavigationTag + JSP + + classNameId + false + true + + + displayStyle + false + true + + + hidePortletWhenEmpty + false + true + + + maxAssetTags + false + true + + + showAssetCount + false + true + + + showZeroAssetCount + false + true + + + + Creates a Liferay.AssetTagsSelector]]> component to create and select tags to add to an asset, such as a blog entry, bookmark, or wiki page. + asset-tags-selector + com.liferay.taglib.ui.AssetTagsSelectorTag + JSP + + Whether to automatically focus the tag input field. The default value is false]]>. + autoFocus + false + true + boolean + + + The Java class of the asset. + className + false + true + + + The Java class primary key of an asset to associate with the tags. This is a Java long]]>. + classPK + false + true + + + A function to get tag suggestions based on the asset's content. + contentCallback + false + true + + + The current selected tags. + curTags + false + true + + + The group IDs of the asset tags. + groupIds + false + true + + + The name of the hidden input for passing in the asset's current tags. + hiddenInput + false + true + + + An ID for the component instance. + id + false + true + + + ignoreRequestValue + false + true + + + + Creates a component to display all the tags associated with an asset, such as a blog entry, wiki page, or message boards message. + asset-tags-summary + com.liferay.taglib.ui.AssetTagsSummaryTag + JSP + + An array of the asset tag names. + assetTagNames + false + true + + + The Java class of the asset. + className + true + true + + + The Java class primary key of an asset. This is a Java long]]>. + classPK + true + true + + + A message to display before the tag labels. A standard example is tags]]>, which renders as Tags:]]>. + message + false + true + + + The URL of a portlet to display the tags. + portletURL + false + true + + + + breadcrumb + com.liferay.taglib.ui.BreadcrumbTag + JSP + + displayStyle + false + true + + + portletURL + false + true + + + selLayout + false + true + + + selLayoutParam + false + true + + + showCurrentGroup + false + true + + + showCurrentPortlet + false + true + + + showGuestGroup + false + true + + + showLayout + false + true + + + showParentGroups + false + true + + + showPortletBreadcrumb + false + true + + + + Creates a calendar with configurable events. + calendar + com.liferay.taglib.ui.CalendarTag + JSP + + A given set of integers, corresponding to a day of the chosen month, and to mark with a dot. + data + false + true + java.util.Set + + + A day of the month to highlight in the calendar. + day + false + true + int + + + A format for the header. + headerFormat + false + true + java.text.Format + + + A pattern for the calendar header. A possible value is MMM/dd/yyyy]]>. + headerPattern + false + true + + + A month of the year to display at the top of the calendar. + month + true + true + int + + + Whether to display up to six calendar weeks relative to the set day. If the set day of the month is in the latter part of the month, the current month's weeks will be displayed and up to two weeks of the next month will be displayed. The default value is false]]>. + showAllPotentialWeeks + false + true + boolean + + + A year to display at the top of the calendar. + year + true + true + int + + + + Creates an image CAPTCHA with a corresponding verification input. + captcha + com.liferay.taglib.ui.CaptchaTag + JSP + + The source URL for the image CAPTCHA. + url + true + true + + + + categorization-filter + com.liferay.taglib.ui.CategorizationFilterTag + JSP + + assetType + false + true + + + portletURL + false + true + + + + custom-attribute + com.liferay.taglib.ui.CustomAttributeTag + JSP + + className + true + true + + + classPK + true + true + + + editable + false + true + + + label + false + true + + + name + true + true + + + + custom-attribute-list + com.liferay.taglib.ui.CustomAttributeListTag + JSP + + className + true + true + + + classPK + true + true + + + editable + false + true + + + ignoreAttributeNames + false + true + + + label + false + true + + + + custom-attributes-available + com.liferay.taglib.ui.CustomAttributesAvailableTag + JSP + + className + true + true + + + classPK + false + true + + + companyId + false + true + + + ignoreAttributeNames + false + true + + + editable + false + true + + + + ddm-template-selector + com.liferay.taglib.ui.DDMTemplateSelectorTag + JSP + + classNameId + true + true + + + displayStyle + true + true + + + displayStyleGroupId + true + true + + + displayStyles + false + true + + + icon + false + true + + + label + false + true + + + refreshURL + false + true + + + showEmptyOption + false + true + + + + diff + com.liferay.taglib.ui.DiffTag + JSP + + diffResults + true + true + + + sourceName + true + true + + + targetName + true + true + + + + diff-html + com.liferay.taglib.ui.DiffHtmlTag + JSP + + diffHtmlResults + true + true + + + + discussion + com.liferay.taglib.ui.DiscussionTag + JSP + + assetEntryVisible + false + true + + + className + true + true + + + classPK + true + true + + + formAction + true + true + + + formName + false + true + + + hideControls + false + true + + + permissionClassName + false + true + + + permissionClassPK + false + true + + + ratingsEnabled + false + true + + + redirect + false + true + + + Deprecated as of 6.2.0, with no direct replacement + subject + false + true + + + userId + true + true + + + + Creates an error message to display to the user. + error + com.liferay.taglib.ui.ErrorTag + com.liferay.taglib.ui.ErrorTei + JSP + + A class for the exception. + exception + false + true + + + The name of a field on which to focus the error message. + focusField + false + true + + + A key to place in the SessionErrors]]> object to trigger the error message. + key + false + true + + + Explicit message text or a language key name from which to derive text for the message. + message + false + true + + + rowBreak + false + true + + + Whether to translate the message into the user's language. The default value is true]]>. + translateMessage + false + true + boolean + + + + error-marker + com.liferay.taglib.ui.ErrorMarkerTag + JSP + + key + false + true + + + value + false + true + + + + Creates a flag icon that lets users report inappropriate content. + flags + com.liferay.taglib.ui.FlagsTag + JSP + + The flagged asset's Java class name. + className + true + true + + + The flagged asset's entry ID. + classPK + true + true + + + The flagged asset's title. + contentTitle + true + true + + + Whether to show message text as a label next to the flag icon or as a tooltip. The default value is true]]>. + label + false + true + boolean + + + Text to display next to the flag icon. The default text is Flag]]>. + message + false + true + + + The user ID of the user who flagged the asset. + reportedUserId + true + true + + + + flash + com.liferay.taglib.ui.FlashTag + JSP + + align + false + true + + + allowFullScreen + false + true + + + allowScriptAccess + false + true + + + base + false + true + + + bgcolor + false + true + + + devicefont + false + true + + + flashvars + false + true + + + height + false + true + + + id + false + true + + + loop + false + true + + + menu + false + true + + + movie + true + true + + + play + false + true + + + quality + false + true + + + salign + false + true + + + scale + false + true + + + swliveconnect + false + true + + + version + false + true + + + width + false + true + + + wmode + false + true + + + + Creates a navigable form for multiple section forms. It's default navigation is a side navigation box with links to each section. But the navigation can be configured as a progressive step navigation positioned above the form or as vertically stacked accordion style sections that expand when clicked. + form-navigator + com.liferay.taglib.ui.FormNavigatorTag + JSP + + A URL for the form's cancel button. + backURL + false + true + + + The name of each category in the form. + categoryNames + true + true + + + The name of each section within a category. + categorySections + true + true + + + A type of navigation to be used. Options are steps]]> and panel]]>. The default display style is side navigation. + displayStyle + false + true + + + A name for the form. + formName + false + true + + + HTML to append to the navigator. Examples include alternate form buttons, form instructions, or information about the form. + htmlBottom + false + true + + + HTML to prepend to the navigator. + htmlTop + false + true + + + A path to the formSection.jsp]]> file's folder /path/to/jsp/folder/]]>. + jspPath + false + true + + + Whether to show the Submit]]> and Cancel]]> buttons. The default value is true]]>. + showButtons + false + true + boolean + + + + group-search + com.liferay.taglib.ui.GroupSearchTag + JSP + + groupParams + true + true + + + portletURL + true + true + + + rowChecker + false + true + + + + Creates a header that displays its text above a horizontal rule accompanied by a configurable back URL button. + header + com.liferay.taglib.ui.HeaderTag + JSP + + Text to display on mouse over of the back URL. The default value is Back]]>. + backLabel + false + true + + + A URL for navigating back to. + backURL + false + true + + + A CSS class for styling the header component. + cssClass + false + true + + + Whether to escape the header's XML tags. The default value is true]]>. + escapeXml + false + true + boolean + + + Whether to translate the header's title]]> into the localized language. The default value is true]]>. + localizeTitle + false + true + boolean + + + Whether to display the back URL. The default value is true]]>. + showBackURL + false + true + boolean + + + A title to display as the header text. + title + true + true + + + + Creates a fully configurable icon that provides access to current Liferay theme icons. + icon + com.liferay.taglib.ui.IconTag + JSP + + A value for the alt]]> attribute of the embedded img]]> tag. + alt + false + true + + + A role for assistive technologies to interpret for HTML elements that have been used for something other than their intended purpose. For example, the <p>]]> tag could be used for something other than a paragraph. + ariaRole + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + Miscellaneous data to be stored via a map. This data is not shared with the browser. The map holds key value pairs of type <String, Object>]]>. + data + false + true + java.util.Map + + + An icon from a Bootstrap icon CSS Class. Note that any image for the image]]> attribute takes precedence. Icon CSS classes to specify for this attribute can be found at http://marcoceppi.github.io/bootstrap-glyphicons/]]>. + iconCssClass + false + true + + + An ID for the component instance. + id + false + true + + + An image for the icon, from the current theme. The value can be the filename prefix of any image file in the theme's common]]> image folder. This image takes precedence over any icon value set via the iconCssClass]]> attribute. + image + false + true + + + An icon to display on mouse over of the component. The icon image comes from the current theme. The value can be the filename prefix of any image file in the theme's common]]> image folder. + imageHover + false + true + + + Whether to display the message]]> attribute's value as the icon's label. + label + false + true + boolean + + + A language to associate with the icon, to assist search engines and web browsers in finding and rendering the icon appropriately. + lang + false + true + + + A CSS class for styling the icon's URL. + linkCssClass + false + true + + + Whether to translate the icon's message]]> into the user's language. + localizeMessage + false + true + boolean + + + Text to be displayed for the icon on mouse over. + message + false + true + + + An HTTP request method. Possible values are get]]> and post]]>. + method + false + true + + + A function to be called on a user clicking the icon. + onClick + false + true + + + The location of an image file to use in the icon. + src + false + true + + + The location of an image file to use on mouse over of the icon. This value takes precedence over the imageHover]]> attribute. This image takes precedence over icons set with the imageHover]]> attribute. + srcHover + false + true + + + A target window in which to open the URL. The default value is self]]>. Possible values are blank]]>, self]]>, parent]]>, top]]>, and a unique frame's name. + target + false + true + + + Whether to use a tooltip. The default value is true]]>. + toolTip + false + true + boolean + + + A URL to navigate to when the icon is clicked. + url + false + true + + + Whether to open the URL in a dialog window. The default value is false]]>. + useDialog + false + true + boolean + + + + Creates an icon to associate with deactivating an item. + icon-deactivate + com.liferay.taglib.ui.IconDeactivateTag + JSP + + Whether to display a message on the icon's label on mouse over of the icon. The default value is false]]>. + label + false + true + boolean + + + A URL navigated to when the icon is clicked. + url + true + true + + + + Creates a configurable icon to associate with deleting or removing an item. + icon-delete + com.liferay.taglib.ui.IconDeleteTag + JSP + + Text to use in place of the text from the default deletion confirmation message language key are-you-sure-you-want-to-delete-this]]>. If the trash]]> attribute is set to true]]>, no confirmation message is shown. + confirmation + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + An ID for the component instance. + id + false + true + + + An image for the icon, from the current theme. The value can be the filename prefix of any image file in the theme's common]]> image folder. The image takes precedence over any default icon images. + image + false + true + + + Whether to display the message]]> attribute's value as the icon's label. The default value is false]]>. + label + false + true + boolean + + + Text to display on mouse over of the icon. + message + false + true + + + An HTTP request method to invoke. Possible values are get]]> and post]]>. + method + false + true + + + Whether to use the trash icon instead of the remove icon. The default value isfalse]]>. + trash + false + true + boolean + + + A URL navigated to when the icon is clicked. + url + true + true + + + + Creates a help icon that displays a custom message as a tooltip on mouse over of the help icon. + icon-help + com.liferay.taglib.ui.IconHelpTag + JSP + + Text to be displayed on mouse over of the icon. + message + true + true + + + + Creates a list of icons from a list of child components. + icon-list + com.liferay.taglib.ui.IconListTag + JSP + + Whether to render the icon list when there is only one child component. The default value is false]]>. + showWhenSingleIcon + false + true + boolean + + + + Creates an icon menu from a list of child components. + icon-menu + com.liferay.taglib.ui.IconMenuTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + A position from which to pop up the icon menu dialog in relation to the trigger. The default direction is left]]>. Possible values are up]]>, down]]>, left]]> or right]]>. + direction + false + true + + + Whether to disable the icon menu. + disabled + false + true + boolean + + + Whether to extend the icon menu trigger by wrapping it in a button. The default value is true]]>. + extended + false + true + boolean + + + The location of an image file to use in the icon. + icon + false + true + + + An ID for the component instance. + id + false + true + + + Whether to translate the message to the user's language. The default value is true]]>. + localizeMessage + false + true + boolean + + + The number of items to show in the icon menu before scrolling. The default value is 15. + maxDisplayItems + false + true + int + + + Text to display next to the icon menu trigger. The default value is actions]]>. + message + false + true + + + Whether to add the select]]> CSS class to the icon menu. If set to true]]>, the selected icon is added to the icon menu's trigger when the icon is selected. The default value is false]]>. + select + false + true + boolean + + + Whether to extend the icon menu by default. The default value is false]]>. + showExpanded + false + true + boolean + + + Whether to show an arrow, indicating a popup dialog, next to the icon menu's trigger icon. The default value is true]]>. + showArrow + false + true + boolean + + + Whether to show the icon menu when there is only one icon. The default value is false]]>. + showWhenSingleIcon + false + true + boolean + + + A CSS class for styling the trigger for the icon menu. The default value is btn btn-default]]>. + triggerCssClass + false + true + + + Whether the icon menu drop-down caret points to the direction set by the direction]]> attribute. + useIconCaret + false + true + boolean + + + + input-asset-links + com.liferay.taglib.ui.InputAssetLinksTag + JSP + + assetEntryId + false + true + + + className + false + true + + + classPK + false + true + + + + Creates a configurable input checkbox. + input-checkbox + com.liferay.taglib.ui.InputCheckBoxTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + Whether the checkbox is selected by default. + defaultValue + false + true + boolean + + + Whether the checkbox is disabled. + disabled + false + true + boolean + + + A name for the checkbox's form. + formName + false + true + + + An ID for the component instance. + id + false + true + + + A function to be called on a user clicking the checkbox. + onClick + false + true + + + A variable name for the component. + param + true + true + + + + Creates a date input field that displays a calendar for date selection. + input-date + com.liferay.taglib.ui.InputDateTag + JSP + + Whether the date field gets focus by default. The default value is false]]>. + autoFocus + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + A variable name to refer to the day of the component. + dayParam + false + true + + + A day value to display in the input field. + dayValue + false + true + int + + + Whether to disable the namespace for the component. The default value is false]]>. + disableNamespace + false + true + boolean + + + Whether to disable the input field. The default value is false]]>. + disabled + false + true + boolean + + + A day to set as the first day of the week. The default value is Calendar.SUNDAY - 2]]>. + firstDayOfWeek + false + true + int + + + A name for the date input's form. + formName + false + true + + + A variable name to refer to the combined month and year of the component. + monthAndYearParam + false + true + + + A variable name to refer to the month of the component. + monthParam + false + true + + + The numerical value for a month to display in the input field. Integer values for the month start with 0]]>. + monthValue + false + true + int + + + A name for the date input. + name + false + true + + + Whether the component's values can be set to null. + nullable + false + true + + + A variable name to refer to the year of the component. + yearParam + false + true + + + A year value to display in the input field. + yearValue + false + true + int + + + + Creates an input field for editing rich text. + input-editor + com.liferay.taglib.ui.InputEditorTag + JSP + + A map of configuration parameters. The map holds key value pairs of type <String, String>]]>. + configParams + false + true + java.util.Map + + + The ID of a language for the input editor's text. + contentsLanguageId + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + editorImpl + false + true + + + inlineEdit + false + true + + + inlineEditSaveURL + false + true + + + A map of configuration parameters. The map holds key value pairs of <String, String>]]>. + fileBrowserParams + false + true + java.util.Map + + + height + false + true + + + initMethod + false + true + + + A name for the input editor. The default value is editor]]>. + name + false + true + + + A function to be called when the input editor loses focus. + onBlurMethod + false + true + + + A function to be called on a change in the input editor. + onChangeMethod + false + true + + + A function to be called when the input editor gets focus. + onFocusMethod + false + true + + + Whether the field for the input editor is resizable. The default value is true]]>. + resizable + false + true + boolean + + + Whether to skip loading resources necessary for the CKEditor. The default value is false]]>. + skipEditorLoading + false + true + boolean + + + A toolbar for the input editor. The default value is liferay]]>. Possible values are bbcode]]>, creole]]>, editInPlace]]>, email]]>, liferay]]>, liferayArticle]]>, phone]]>, simple]]>, and tablet]]>. + toolbarSet + false + true + + + width + false + true + + + + input-field + com.liferay.taglib.ui.InputFieldTag + JSP + + autoComplete + false + true + + + autoFocus + false + true + + + autoSize + false + true + + + bean + false + true + + + cssClass + false + true + + + dateTogglerCheckboxLabel + false + true + + + defaultLanguageId + false + true + + + defaultValue + false + true + + + disabled + false + true + + + field + true + true + + + fieldParam + false + true + + + formName + false + true + + + format + false + true + + + id + false + true + + + ignoreRequestValue + false + true + + + languageId + false + true + + + model + true + true + + + placeholder + false + true + + + + input-localized + com.liferay.taglib.ui.InputLocalizedTag + JSP + + autoFocus + false + true + + + autoSize + false + true + + + availableLocales + false + true + + + cssClass + false + true + + + defaultLanguageId + false + true + + + disabled + false + true + + + displayWidth + false + true + + + formName + false + true + + + id + false + true + + + ignoreRequestValue + false + true + + + languageId + false + true + + + maxLength + false + true + + + name + true + true + + + type + false + true + + + xml + true + true + + true + + + Creates an input move boxes component comprised of two columns of key value pairs that can be rearranged. + input-move-boxes + com.liferay.taglib.ui.InputMoveBoxesTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + A name for the left box. + leftBoxName + true + true + + + A list of key value pairs for the left box. + leftList + true + true + java.util.List + + + A function to be called on a change in selection in the left list. + leftOnChange + false + true + + + Whether the left list can be reordered. The default value is false]]>. + leftReorder + false + true + boolean + + + A title to display at the top of the right box. + leftTitle + true + true + + + A name for the right box. + rightBoxName + true + true + + + A list of key value pairs for the right box. + rightList + true + true + java.util.List + + + A function to be called on a change in selection in the right list. + rightOnChange + false + true + + + Whether the right list can be reordered. The default value is false]]>. + rightReorder + false + true + boolean + + + A title to display at the top of the right box. + rightTitle + true + true + + + + input-permissions + com.liferay.taglib.ui.InputPermissionsTag + JSP + + formName + false + true + + + modelName + false + true + + + + input-permissions-params + com.liferay.taglib.ui.InputPermissionsParamsTag + JSP + + modelName + true + true + + + + input-repeat + com.liferay.taglib.ui.InputRepeatTag + JSP + + cssClass + false + true + + + event + false + true + + + + input-resource + com.liferay.taglib.ui.InputResourceTag + JSP + + cssClass + false + true + + + id + false + true + + + title + false + true + + + url + true + true + + + + input-scheduler + com.liferay.taglib.ui.InputSchedulerTag + JSP + + + Creates a configurable search box. + input-search + com.liferay.taglib.ui.InputSearchTag + JSP + + Whether the search field gets focus by default. The default value is false]]>. + autoFocus + false + true + boolean + + + A text value for the search button's label. The default value is Search]]>. + buttonLabel + false + true + + + A CSS class for styling the component. + cssClass + false + true + + + An ID for the component instance. The default value is displayTerms.KEYWORDS]]>. + id + false + true + + + A name for the search box. The default value is displayTerms.KEYWORDS]]>. + name + false + true + + + Placeholder text for the search field. The default value is the value of the buttonLabel]]> attribute. + placeholder + false + true + + + Whether to show the search button. The default value is true]]>. + showButton + false + true + boolean + + + A title for the search box. + title + false + true + + + Whether to use a namespace with the search button. The default value is true]]>. + useNamespace + false + true + boolean + + + + Creates a select input component with yes or no options. + input-select + com.liferay.taglib.ui.InputSelectTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + Whether to select yes]]> as the input's default value. + defaultValue + false + true + boolean + + + Whether to disable input. + disabled + false + true + boolean + + + A name for the input select's form. + formName + false + true + + + A variable name for the component. + param + true + true + + + + Creates a configurable text area input field. + input-textarea + com.liferay.taglib.ui.InputTextAreaTag + JSP + + A CSS class for styling the component. + cssClass + false + true + + + Text to display in the text area. + defaultValue + false + true + + + Whether to disable input. The default value is false]]>. + disabled + false + true + boolean + + + A variable name for the component. + param + true + true + + + + Creates a time input field that provides a scrollable dropdown list of hours, in intervals designated by the minuteInterval]]> attribute. + input-time + com.liferay.taglib.ui.InputTimeTag + JSP + + The name of the AM/PM parameter for the time input. An acceptable value is ampm]]>. + amPmParam + true + true + + + A time to AM or PM. Acceptable values are 0]]> for AM and 1]]> for PM. The default value is 0]]>. + amPmValue + false + true + int + + + A CSS class for styling the time input. + cssClass + false + true + + + A date parameter for the time input. An acceptable value is date]]>. + dateParam + false + true + + + A date to associate with the time displayed. + dateValue + false + true + java.util.Date + + + Whether the input field is disabled. + disabled + false + true + boolean + + + The name of the hour parameter for the component. An acceptable value is hour]]>. + hourParam + true + true + + + An hour value for the time displayed. The default value is 12]]>. + hourValue + false + true + int + + + A minute interval displayed in the input. The default value is 30]]>. + minuteInterval + false + true + int + + + The name of the minute parameter for the component. An acceptable value is minute]]>. + minuteParam + true + true + + + A minute value for the time displayed. The default value is 00]]>. + minuteValue + false + true + int + + + A name for the time input. + name + false + true + + + + Creates a configurable timezone drop-down menu. + input-time-zone + com.liferay.taglib.ui.InputTimeZoneTag + JSP + + Whether the field gets focus by default. + autoFocus + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + Whether to consider daylight savings for the times. The default value is true]]>. + daylight + false + true + boolean + + + Whether the field is disabled. + disabled + false + true + boolean + + + A style number corresponding to the time zone. A value of 0]]> displays the time zone's abbreviated name and a value of 1]]> displays its full name, e.g. "Pacific Standard Time." The default value is 0]]>. + displayStyle + false + true + int + + + A name for the component. + name + true + true + + + Whether the times can be null. + nullable + false + true + boolean + + + The ID of a time zone to associate with the component. For example, setting the value to PST]]> associates the component with the Pacific Standard Time zone. + value + false + true + + + + journal-article + com.liferay.taglib.ui.JournalArticleTag + JSP + + articleId + false + true + + + articlePage + false + true + + + articleResourcePrimKey + false + true + + + groupId + false + true + + + languageId + false + true + + + showAvailableLocales + false + true + + + showTitle + false + true + + + templateId + false + true + + + xmlRequest + false + true + + + + journal-content-search + com.liferay.taglib.ui.JournalContentSearchTag + JSP + + showListed + false + true + + + targetPortletId + false + true + + + type + false + true + + + + language + com.liferay.taglib.ui.LanguageTag + JSP + + displayCurrentLocale + false + true + + + displayStyle + false + true + + + formAction + false + true + + + formName + false + true + + + languageId + false + true + + + languageIds + false + true + + + name + false + true + + + + logo-selector + com.liferay.taglib.ui.LogoSelectorTag + JSP + + currentLogoURL + false + true + + + defaultLogoURL + false + true + + + editLogoURL + false + true + + + imageId + false + true + + + logoDisplaySelector + false + true + + + showBackground + false + true + + + + membership-policy-error + com.liferay.taglib.ui.MembershipPolicyErrorTag + JSP + + + Creates a message to display to the user. + message + com.liferay.taglib.ui.MessageTag + JSP + + Arguments for the language key, if the language key is configured to recieve arguments. + arguments + false + true + + + The name of a language key from which to derive the message to be displayed. + key + true + true + + + Whether to translate the language key value into the user's language. The default value is true]]>. + localizeKey + false + true + boolean + + + Whether to translate the arguments into the user's language. The default value is true]]>. + translateArguments + false + true + boolean + + + unicode + false + true + boolean + + + + my-sites + com.liferay.taglib.ui.MySitesTag + JSP + + classNames + false + true + + + cssClass + false + true + + + includeControlPanel + false + true + + + max + false + true + + + + navigation + com.liferay.taglib.ui.NavigationTag + JSP + + bulletStyle + false + true + + + displayStyle + false + true + + + headerType + false + true + + + includedLayouts + false + true + + + nestedChildren + false + true + + + preview + false + true + + + rootLayoutLevel + false + true + + + rootLayoutType + false + true + + + + Creates a page iterator for paginating through lists of items. + page-iterator + com.liferay.taglib.ui.PageIteratorTag + JSP + + Which page of items to display (e.g., first, second, third, etc.). + cur + true + true + int + + + A variable name to refer to the cur]]> value of the component. + curParam + true + true + + + The number of items to display per page. + delta + false + true + int + + + Whether the user can choose the number of items displayed per page. The default value is false]]>. + deltaConfigurable + false + true + boolean + + + A variable name to refer to the delta value of the component. + deltaParam + false + true + + + A name for the form. + formName + false + true + + + An ID for the component instance. + id + false + true + + + JavaScript to be called when the first]]>, previous]]>, next]]>, or last]]> links are clicked if the URL property is not set. + jsCall + false + true + + + A maximum number of pages to iterate through. + maxPages + false + true + int + + + A target for the first]]>, previous]]>, next]]>, and last]]> link buttons. + target + false + true + + + The total number of items in the iterator. + total + true + true + int + + + A type of iterator to display. Options are approximate]]>, article]]>, more]]>, and regular]]>. + type + false + true + + + A base URL for the iterator. Parameters are added to and removed from this URL as the user navigates through pages. + url + false + true + + + + Creates a collapsible panel for housing content. + panel + com.liferay.taglib.ui.PanelTag + JSP + + Whether the panel can be collapsed. The default value is true]]>. + collapsible + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + A default state for the component. Possible values are open]]> and any string other than open. Any string other than open]]> collapses the panel. The default value is open]]>. + defaultState + false + true + + + Whether the panel is extended. The default value is false]]>. + extended + false + true + boolean + + + Text to display as a help tool tip on mouse over of the panel's help icon. + helpMessage + false + true + + + An icon to display next to the panel's title. The icon can be specified using the name of one of the Bootstrap icon CSS classes found at http://marcoceppi.github.io/bootstrap-glyphicons/]]>. + iconCssClass + false + true + + + An ID for the component instance. + id + false + true + + + The ID of the component that contains the panel. If a liferay-ui:panel-container]]> is used as the container for the panel, its ID is used as the value for the parentID]]>. + parentId + false + true + + + Whether to remember the component's state and persist it to the database. The default value is false]]>. + persistState + false + true + boolean + + + A state for the component. Possible values are open]]> and any string other than open. Any string other than open]]> collapses the panel. + state + false + true + + + A title to display at the top of the panel. + title + true + true + + + + Creates a collapsible container to house liferay-ui:panel]]> components. + panel-container + com.liferay.taglib.ui.PanelContainerTag + JSP + + Whether only one panel can be shown at a time. As one panel is opened, the others close, creating an accordian effect. The default value is false]]>. + accordion + false + true + boolean + + + A CSS class for styling the component. + cssClass + false + true + + + Whether to extend the interface with additional styling. The default value is false]]>. + extended + false + true + boolean + + + An ID for the component instance. + id + false + true + + + Whether to remember the component's state and persist it to the database. The default value is false]]>. + persistState + false + true + boolean + + + + param + com.liferay.taglib.util.ParamTag + JSP + + name + true + true + + + value + true + true + + + + Renders a PNG image with the source given for the image]]> attribute. + png-image + com.liferay.taglib.ui.PngImageTag + JSP + + The height of the image in pixels. A possible value would be 16]]>. px]]> is then appended to the end of the value. + height + true + true + int + + + The location of a PNG image file to use. + image + true + true + + + The height of the image in pixels. A possible value would be 16]]>. px]]> is then appended to the end of the value. + width + true + true + int + + + + progress + com.liferay.taglib.ui.ProgressTag + JSP + + height + false + true + + + id + true + true + + + message + false + true + + + sessionKey + true + true + + + updatePeriod + false + true + + + + ratings + com.liferay.taglib.ui.RatingsTag + JSP + + className + true + true + + + classPK + true + true + + + numberOfStars + false + true + + + ratingsEntry + false + true + + + ratingsStats + false + true + + + type + false + true + + + url + false + true + + + + ratings-score + com.liferay.taglib.ui.RatingsScoreTag + JSP + + score + true + true + + + + restore-entry + com.liferay.taglib.ui.RestoreEntryTag + JSP + + duplicateEntryAction + false + true + + + overrideMessage + false + true + + + renameMessage + false + true + + + restoreEntryAction + false + true + + + + Creates a clickable link and/or icon to an RSS feed document. + rss + com.liferay.taglib.ui.RSSTag + JSP + + A default maximum number of items to display. The default value is 20]]>. + delta + false + true + int + + + A default style to display. + displayStyle + false + true + + + A default format for the RSS feed. Options are atom_1.0]]>, rss_1.0]]>, and rss_2.0]]>. + feedType + false + true + + + A message to display next to the RSS icon. + message + false + true + + + A name for the RSS feed. + name + false + true + + + A URL from which to retrieve feed information. + resourceURL + false + true + + + The URL for an RSS feed file. + url + false + true + + + + Creates a configuration component for users to define RSS settings, such as how many articles to display. + rss-settings + com.liferay.taglib.ui.RSSSettingsTag + JSP + + A default maximum number of items to display. The default value is 20]]>. + delta + false + true + int + + + A default style to display. + displayStyle + false + true + + + Available RSS display styles from which the user can choose. Options are abstract]]>, full-content]]>, and title]]>. + displayStyles + false + true + + + Whether users are able to subscribe. Default value is false]]>. + enabled + false + true + boolean + + + A default format for the RSS feed. Options are atom_1.0]]>, rss_1.0]]>, and rss_2.0]]>. + feedType + false + true + + + A name for the component. + name + false + true + + + Whether the RSS feed has a name. The default value is false]]>. + nameEnabled + false + true + boolean + + + + Creates a search form, with an additional select input to set the scope of the search. + search + com.liferay.taglib.ui.SearchTag + JSP + + + Creates a grid for displaying a list of objects and their properties. + search-container + com.liferay.taglib.ui.SearchContainerTag + com.liferay.taglib.ui.SearchContainerTei + JSP + + A variable for the search container's pagination. Different pagination variables ensure independent pagination when multiple search containers are on a JSP. + curParam + false + true + + + The number of items to show on each search container page. + delta + false + true + int + + + The delta]]> attribute as configurable by users. + deltaConfigurable + false + true + + + deltaParam + false + true + + + displayTerms + false + true + + + A message displayed when the search container is empty. + emptyResultsMessage + false + true + + + headerNames + false + true + + + hover + false + true + + + id + false + true + + + iteratorURL + false + true + + + orderByCol + false + true + + + orderByColParam + false + true + + + orderByComparator + false + true + + + An order type for the columns, either ascending or descending. Values are asc]]> or desc]]>. + orderByType + false + true + + + orderByTypeParam + false + true + + + Inserts a checkbox column in the search container. Value must be a RowChecker]]> object. + rowChecker + false + true + + + searchContainer + false + true + + + searchTerms + false + true + + + The total number of objects in the search container. + total + false + true + int + + + A variable name for the results of the total]]> attribute. The default is total]]>. + totalVar + false + true + + + A variable name for the SearchContainer]]> object. The default is searchContainer]]>. + var + false + true + + + + search-container-column-button + com.liferay.taglib.ui.SearchContainerColumnButtonTag + JSP + + align + false + true + + + colspan + false + true + + + cssClass + false + true + + + href + true + true + + + index + false + true + + + name + false + true + + + valign + false + true + + + + Creates a date column in a search container. + search-container-column-date + com.liferay.taglib.ui.SearchContainerColumnDateTag + JSP + + A horizontal alignment for the column contents. The default is left]]>. + align + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + A URL for the items in the column. + href + false + true + + + index + false + true + + + A name for the column. + name + false + true + + + Whether to set the column as sortable. The default value is false]]>. + orderable + false + true + boolean + + + An object's property by which to sort the column. + orderableProperty + false + true + + + A property to request from the row object. + property + false + true + + + A vertical alignment for the column contents. The default is middle]]>. + valign + false + true + + + A value for the column. + value + false + true + + + + Creates a column in a search container with the contents of a JSP file. + search-container-column-jsp + com.liferay.taglib.ui.SearchContainerColumnJSPTag + JSP + + A horizontal alignment for the column contents. The default is left]]>. + align + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + index + false + true + + + name + false + true + + + The JSP file's location. + path + true + true + + + valign + false + true + + + + Creates a column in a search container for the workflow status. + search-container-column-status + com.liferay.taglib.ui.SearchContainerColumnStatusTag + JSP + + A horizontal alignment for the column contents. The default is left]]>. + align + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + A URL for the column's contents. + href + false + true + + + index + false + true + + + name + false + true + + + Whether to set the column as sortable. The default value is false]]>. + orderable + false + true + boolean + + + An object's property by which to sort the column. + orderableProperty + false + true + + + An object's property to use for the column. + property + false + true + + + A vertical alignment for the column contents. The default is middle]]>. + valign + false + true + + + A workflow status for the item. + status + false + true + + + statusByUserId + false + true + + + statusDate + false + true + + + + Creates a text column in a search container. + search-container-column-text + com.liferay.taglib.ui.SearchContainerColumnTextTag + com.liferay.taglib.ui.SearchContainerColumnTextTei + JSP + + A horizontal alignment for the column contents. + align + false + true + + + A string buffer variable for constructing a URL in a scriptlet. + buffer + false + true + + + The number of columns to span. The default is 1]]>. + colspan + false + true + int + + + A CSS class for styling the column. + cssClass + false + true + + + href + false + true + + + index + false + true + + + name + false + true + + + Whether to set the column as sortable. The default value is false]]>. + orderable + false + true + boolean + + + An object's property by which to sort the column. + orderableProperty + false + true + + + property + false + true + + + target + false + true + + + title + false + true + + + Whether to automatically translate values. The default value is false]]>. + translate + false + true + boolean + + + A vertical alignment for the column contents. The default is middle]]>. + valign + false + true + + + value + false + true + + + + The list of objects to display in the search container. + search-container-results + com.liferay.taglib.ui.SearchContainerResultsTag + com.liferay.taglib.ui.SearchContainerResultsTei + JSP + + A list of objects to display in the search container. + results + false + true + + + A variable to use for the results. + resultsVar + false + true + + + Deprecated as of 6.2.0, replaced by liferay-ui:search-container#total + total + false + true + + + Deprecated as of 6.2.0, replaced by liferay-ui:search-container#totalVar + totalVar + false + true + + + + Creates rows in the search container for each object returned by liferay-ui:search-container-results]]>. + search-container-row + com.liferay.taglib.ui.SearchContainerRowTag + com.liferay.taglib.ui.SearchContainerRowTei + JSP + + bold + false + true + + + The class name of the objects to display in rows. + className + true + true + + + The returned model instances as HTML escaped. + escapedModel + false + true + + + A variable name to use for the rows' index. + indexVar + false + true + + + A property to use as the primary key for the object type in the className]]> attribute. + keyProperty + false + true + + + A variable name to use for each object as the search container iterates through the objects returned by liferay-ui:search-container-results]]>. + modelVar + false + true + + + A model property to use as the row ID. + rowIdProperty + false + true + + + A variable name to use for the rows. + rowVar + false + true + + + servletContext + false + true + + + stringKey + false + true + + + + Creates parameters for rows in the search container. The liferay-ui:search-container-row]]> tag is required. + search-container-row-parameter + com.liferay.taglib.ui.SearchContainerRowParameterTag + JSP + + A name for the row parameter. + name + true + true + + + A value for the row parameter. + value + true + true + + + + search-form + com.liferay.taglib.ui.SearchFormTag + JSP + + page + true + true + + + searchContainer + false + true + + + servletContext + false + true + + + showAddButton + false + true + + + + Creates a search results page iterator with an optional paginator. + search-iterator + com.liferay.taglib.ui.SearchIteratorTag + JSP + + Whether to add a liferay-ui:search-paginator]]> to the search container. The default value is true]]>. + paginate + false + true + boolean + + + All configurable properties of the search container, such as cur]]> and curParam]]>. These properties are set with searchContainer.getCur()]]> and searchContainer.getCurParam()]]> respectively. + searchContainer + false + true + + + A type of iterator to display. Options are approximate]]>, article]]>, more]]>, and regular]]>. + type + false + true + + + + Creates a page iterator to paginate through search results + search-paginator + com.liferay.taglib.ui.SearchPaginatorTag + JSP + + An ID for the component instance. + id + false + true + + + All configurable porperties of the search container, such as cur]]> and curParam]]>. These properties are set with searchContainer.getCur()]]> and searchContainer.getCurParam()]]> respectively. + searchContainer + true + true + + + A type of iterator to display. Options are approximate]]>, article]]>, more]]>, and regular]]>. + type + false + true + + + + search-speed + com.liferay.taglib.ui.SearchSpeedTag + JSP + + hits + true + true + + + searchContainer + true + true + + + + Creates a search instance that can be toggled between basic and advanced search. + search-toggle + com.liferay.taglib.ui.SearchToggleTag + JSP + + Whether the search input field is automatically focused. The default value is false]]>. + autoFocus + false + true + boolean + + + A label for the search button such as Search]]> or Go]]>. + buttonLabel + false + true + + + Terms to be used and displayed through the search instance. Term examples include keywords]]>, advancedSearch]]>, and description]]>. + displayTerms + true + true + + + The component instance's ID. + id + true + true + + + width + false + true + + + + section + com.liferay.taglib.ui.SectionTag + com.liferay.taglib.ui.SectionTei + JSP + + + sites-directory + com.liferay.taglib.ui.SitesDirectoryTag + JSP + + displayStyle + false + true + + + sites + false + true + + + + social-activities + com.liferay.taglib.ui.SocialActivitiesTag + JSP + + activities + false + true + + + className + false + true + + + classPK + false + true + + + displayRSSFeed + false + true + + + feedDelta + false + true + + + feedDisplayStyle + false + true + + + feedEnabled + false + true + + + feedLink + false + true + + + feedLinkMessage + false + true + + + feedTitle + false + true + + + feedType + false + true + + + + social-bookmark + com.liferay.taglib.ui.SocialBookmarkTag + JSP + + contentId + false + true + + + target + false + true + + + title + true + true + + + type + true + true + + + url + true + true + + + + social-bookmarks + com.liferay.taglib.ui.SocialBookmarksTag + JSP + + contentId + false + true + + + displayStyle + false + true + + + target + false + true + + + title + true + true + + + types + false + true + + + url + true + true + + + + staging + com.liferay.taglib.ui.StagingTag + JSP + + cssClass + false + true + + + extended + false + true + + + groupId + false + true + + + icon + false + true + + + layoutSetBranchId + false + true + + + message + false + true + + + onlyActions + false + true + + + privateLayout + false + true + + + selPlid + false + true + + + showManageBranches + false + true + + + + Creates a success message to display to the user. + success + com.liferay.taglib.ui.SuccessTag + empty + + A key to be placed in the SessionMessages]]> object to trigger the success message. + key + true + true + + + Explicit message text or the name of a language key from which to derive the message text. + message + true + true + + + Whether to translate the success message into the user's language. The default value is true]]>. + translateMessage + false + true + boolean + + + + table-iterator + com.liferay.taglib.ui.TableIteratorTag + com.liferay.taglib.ui.TableIteratorTei + JSP + + bodyPage + false + true + + + list + true + true + + + listType + true + true + + + rowBreak + false + true + + + rowLength + true + true + + + rowPadding + false + true + + + rowValign + false + true + + + width + false + true + + + + Creates a tabbed UI of section dividers that each house their own content. + tabs + com.liferay.taglib.ui.TabsTag + JSP + + + A label for the back URL. + backLabel + false + true + + + A URL for navigating back to. + backURL + false + true + + + A name for the tab's form. + formName + false + true + + + The names of the tabs. Each name must be separated by a comma with no spaces. + names + true + true + + + A function to be called on a user clicking any of the tabs. + onClick + false + true + + + A variable for the component. + param + false + true + + + A URL to refer to the portlet that contains the component. + portletURL + false + true + + + Whether the page refreshes when a tab is clicked. + refresh + false + true + boolean + + + Tab values that must follow the same order as the names]]> attribute. Each value must be separated by a comma with no spaces. + tabsValues + false + true + + + A design type for the tabs. Possible values are tabs]]> and pills]]>. + type + false + true + + + A URL to which all the tabs are linked when clicked. You can also set each tab's URL individually using url[number]]]> attribute. + url + false + true + + + url0 + false + true + + + A URL to which the second tab is linked when clicked. + url1 + false + true + + + A URL to which the third tab is linked when clicked + url2 + false + true + + + A URL to which the fourth tab is linked when clicked + url3 + false + true + + + A URL to which the fifth tab is linked when clicked + url4 + false + true + + + A URL to which the sixth tab is linked when clicked + url5 + false + true + + + A URL to which the seventh tab is linked when clicked + url6 + false + true + + + A URL to which the eighth tab is linked when clicked + url7 + false + true + + + A URL to which the ninth tab is linked when clicked + url8 + false + true + + + A URL to which the tenth tab is linked when clicked + url9 + false + true + + + An active tab from the value given in the attribute tabsValues]]>. No matter which tab a user selects, the tab given for this value always remains active. + value + false + true + + + + Creates a component that toggles the visibility of the content of the component matching the given id]]>. Default icons are used as the component's default mechanism for showing and hiding the content. + toggle + com.liferay.taglib.ui.ToggleTag + JSP + + Whether to initially show content by default. The default value is true]]>. + defaultShowContent + false + true + boolean + + + An icon to use as the mechanism for hiding the content. You can specify the location of an image file to use in the icon; otherwise a default icon is used. + hideImage + false + true + + + Text to display as a link for hiding the content. It overrides the hideImage]]> attribute. Note that the showMessage]]> attribute must also be configured in order for the hide message to render. + hideMessage + false + true + + + The ID of a component instance whose content's visibility to toggle. + id + true + true + + + An icon to use as the mechanism for showing the content. You can specify the location of an image file to use in the icon; otherwise a default icon is used. + showImage + false + true + + + A link to use as the mechanism for showing the content. The text value of this attribute is used as the link's text. The message takes precedence over showing an image, via the showImage]]> attribute. If you specify a showMessage]]> attribute, you should also specify the hideMessage]]> attribute; a null]]> is otherwise displayed for the text of the hide link. + showMessage + false + true + + + Text to be prefixed to the Toggle()]]> function that is called to toggle visibility of the content. If this is not configured, a random key is generated and prefixed to the Toggle()]]> function. For example, a value of run]]> would result in a function named runToggle()]]>. + stateVar + false + true + + + + toggle-area + com.liferay.taglib.ui.ToggleAreaTag + JSP + + align + false + true + + + defaultShowContent + false + true + + + hideImage + false + true + + + hideMessage + false + true + + + id + false + true + + + showImage + false + true + + + showMessage + false + true + + + stateVar + false + true + + + + toggle-value + com.liferay.taglib.ui.ToggleValueTag + JSP + + defaultValue + false + true + + + id + true + true + + + + Creates a component for users to permanently delete items such as images, articles, etc. from the recycle bin. + trash-empty + com.liferay.taglib.ui.TrashEmptyTag + empty + + A message to display to confirm that the user wants to remove the item(s) from the recycle bin. + confirmMessage + false + true + + + A message to be used for the empty-trash]]> button and link. + emptyMessage + false + true + + + A message to display to give users information about removing items from the recycle bin. + infoMessage + false + true + + + A URL for the empty-trash]]> button/link. + portletURL + true + true + + + The number of items to be removed from the recycle bin. + totalEntries + true + true + int + + + + Creates a message confirming items were moved to the recycle bin and presenting an option to restore them. + trash-undo + com.liferay.taglib.ui.TrashUndoTag + empty + + The URL of the undo link. + portletURL + true + true + + + A redirect URL. + redirect + false + true + + + + upload-progress + com.liferay.taglib.ui.UploadProgressTag + JSP + + height + false + true + + + id + true + true + + + message + false + true + + + redirect + false + true + + + updatePeriod + false + true + + + + user-display + com.liferay.taglib.ui.UserDisplayTag + com.liferay.taglib.ui.UserDisplayTei + JSP + + displayStyle + false + true + + + url + false + true + + + userId + true + true + + + userName + false + true + + + + user-search + com.liferay.taglib.ui.UserSearchTag + JSP + + portletURL + true + true + + + rowChecker + false + true + + + userParams + true + true + + + + webdav + com.liferay.taglib.ui.WebDAVTag + JSP + + path + true + true + + + + write + com.liferay.taglib.ui.WriteTag + JSP + + bean + true + true + + + property + true + true + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-util.tld b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-util.tld new file mode 100644 index 00000000..72a4caf0 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/tld/liferay-util.tld @@ -0,0 +1,141 @@ + + + + + 1.2 + 1.1 + liferay-util + http://liferay.com/tld/util + + body-bottom + com.liferay.taglib.util.BodyBottomTag + JSP + + outputKey + false + true + + + + body-top + com.liferay.taglib.util.BodyTopTag + JSP + + outputKey + false + true + + + + buffer + com.liferay.taglib.util.BufferTag + com.liferay.taglib.util.BufferTei + JSP + + var + true + true + + + + get-url + com.liferay.taglib.util.GetUrlTag + com.liferay.taglib.util.GetUrlTei + JSP + + expires + false + true + + + url + true + true + + + var + false + true + + + + html-bottom + com.liferay.taglib.util.HtmlBottomTag + JSP + + outputKey + false + true + + + position + false + true + + + + html-top + com.liferay.taglib.util.HtmlTopTag + JSP + + outputKey + false + true + + + position + false + true + + + + include + com.liferay.taglib.util.IncludeTag + JSP + + page + true + true + + + portletId + false + true + + + servletContext + false + true + + + strict + false + true + + + useCustomPage + false + true + + + + param + com.liferay.taglib.util.ParamTag + JSP + + name + true + true + + + value + true + true + + + + whitespace-remover + com.liferay.taglib.util.WhitespaceRemoverTag + JSP + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/web.xml b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/web.xml new file mode 100644 index 00000000..1aa8cdb8 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/web.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/css/main.css b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/css/main.css new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/init.jsp new file mode 100644 index 00000000..1d5cb80e --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/init.jsp @@ -0,0 +1,20 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="java.text.Format"%> +<%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%> +<%@page import="com.liferay.portal.kernel.util.TimeZoneUtil"%> +<%@page import="com.liferay.portal.kernel.util.LocaleUtil"%> + +<%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<%@taglib uri="http://liferay.com/tld/aui" prefix="aui" %> +<%@taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %> +<%@taglib uri="http://liferay.com/tld/security" prefix="liferay-security" %> +<%@taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %> +<%@taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %> +<%@taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/view.jsp new file mode 100644 index 00000000..b792822d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/view.jsp @@ -0,0 +1,306 @@ +<%@page import="java.util.Map.Entry"%> +<%@page import="java.text.DateFormat"%> +<%@page import="reportistica.Reportistica"%> +<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> +<%@page import="java.util.TreeMap"%> +<%@page import="java.util.SortedMap"%> +<%@page import="java.util.Map"%> +<%@page import="java.math.BigInteger"%> +<%@page import="java.util.ArrayList"%> +<%@page import="com.liferay.portal.kernel.util.UnmodifiableList"%> +<%@page import="java.util.Iterator"%> +<%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> +<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> +<%@page import="it.tref.liferay.portos.bo.service.persistence.IntPraticaFinderUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.persistence.IntPraticaFinderUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> +<%@page import="java.util.List"%> +<%@page import="java.util.Date"%> +<%@page import="javax.portlet.PortletURL"%> +<%@page import="com.liferay.portal.model.Group"%> +<%@page import="com.liferay.portal.kernel.util.Validator"%> +<%@page import="com.liferay.portal.kernel.util.ParamUtil"%> +<%@page import="com.liferay.portal.kernel.util.DateFormatFactoryUtil"%> +<%@page import="com.liferay.portlet.PortletURLFactoryUtil"%> +<%@page import="com.liferay.portal.kernel.util.ListUtil"%> +<%@ include file="/html/init.jsp"%> +<% + Date dataInizioLavori = ParamUtil.getDate(request, "dataInizioInput", DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd")); + Date dataFineLavori = ParamUtil.getDate(request, "dataFineInput", DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd")); +%> + + +

<%= LanguageUtil.get(pageContext, "titolo_pagina_reportistica") %>

+
+ + + +

+ <%= LanguageUtil.get(pageContext, "titolo_campi_filtro") %> +

+
+ + + + + + + + +
+ + + + + + + + + + + + + +
+
+
+
+
+ <% + Map stati = new TreeMap(); + Map integrazioni = new TreeMap(); + Map autorizzazioni = new TreeMap(); + + List i = IntPraticaLocalServiceUtil.filtraPraticheStato(dataInizioLavori, dataFineLavori); + List j = IntPraticaLocalServiceUtil.filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori); + List k = IntPraticaLocalServiceUtil.filtraPraticheAutorizzate(dataInizioLavori, dataFineLavori); + DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT); + String nel_periodo = LanguageUtil.get(pageContext, "titolo_period") + + " " + + formatter.format(dataInizioLavori) + + "-" + + formatter.format(dataFineLavori); + %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

<%= LanguageUtil.get(pageContext, "titolo_tabella_risultati_stato") %> | <%= LanguageUtil.get(pageContext, "titolo_report_aggreg") %>

+ + <%for(Object[] record : i) + {String tipoprocedura = (String)record[0]; + BigInteger countStati = (BigInteger)record[2]; + BigInteger rigaCountMappa = stati.get(tipoprocedura); + if(null!=countStati&null!=tipoprocedura) + {if(null!=rigaCountMappa) + {stati.put(tipoprocedura, countStati.add(rigaCountMappa)); + } + else + {stati.put(tipoprocedura,countStati); + } + } + } + List> statiEntryList=new ArrayList>(stati.entrySet()); + %> + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

<%= LanguageUtil.get(pageContext, "titolo_tabella_risultati_integrazioni") %> | <%= LanguageUtil.get(pageContext, "titolo_report_aggreg") %>

+ + <%for(Object[] record : j) + {String tipoprocedura = (String)record[0]; + BigInteger countInt = (BigInteger)record[1]; + BigInteger rigaCountMappa = integrazioni.get(tipoprocedura); + if(null!=countInt&null!=tipoprocedura) + {if(null!=rigaCountMappa) + {integrazioni.put(tipoprocedura, countInt.add(rigaCountMappa)); + } + else + {integrazioni.put(tipoprocedura,countInt); + } + } + } + List> intEntryList=new ArrayList>(integrazioni.entrySet()); + %> + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

<%= LanguageUtil.get(pageContext, "titolo_tabella_risultati_autorizzazioni") %> | <%= LanguageUtil.get(pageContext, "titolo_report_aggreg") %>

+ + <%for(Object[] record : k) + {String tipoprocedura = (String)record[0]; + BigInteger countAuto = (BigInteger)record[2]; + BigInteger rigaCountMappa = autorizzazioni.get(tipoprocedura); + if(null!=countAuto&null!=tipoprocedura) + {if(null!=rigaCountMappa) + {autorizzazioni.put(tipoprocedura, countAuto.add(rigaCountMappa)); + } + else + {autorizzazioni.put(tipoprocedura,countAuto); + } + } + } + List> autoEntryList=new ArrayList>(autorizzazioni.entrySet()); + %> + + + + + + + + + + + + + + + +
+
+ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/icon.png b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/icon.png new file mode 100644 index 00000000..807b862c Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/icon.png differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/js/main.js b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/js/main.js new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/view.jsp new file mode 100644 index 00000000..c28d1ea9 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/view.jsp @@ -0,0 +1,22 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<% +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ +%> + +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> + + + +This is the Portos Reportistica portlet. \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/ivy.xml new file mode 100644 index 00000000..6d3bf3c7 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/ivy.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/ivy.xml.MD5 new file mode 100644 index 00000000..edb01ff3 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/ivy.xml.MD5 @@ -0,0 +1 @@ +e801ce4e2cdef8a0bf759f7d48e9ed48 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/test/integration/arquillian.xml b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/test/integration/arquillian.xml new file mode 100644 index 00000000..9413609b --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/test/integration/arquillian.xml @@ -0,0 +1,15 @@ + + + + + + 8099 + tomcat + tomcat + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath index 24ab6033..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,10 +18,5 @@ - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project index bcb5181d..96c4e054 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project @@ -32,16 +32,15 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature - 1647533317507 + 1676466957770 30 org.eclipse.core.resources.regexFilterMatcher - node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.project.core.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.project.core.prefs deleted file mode 100644 index 8eee3c30..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.project.core.prefs +++ /dev/null @@ -1,33 +0,0 @@ -eclipse.preferences.version=1 -liferay-display-xml-reference-not-found=2 -liferay-display-xml-resource-not-found=2 -liferay-display-xml-syntax-invalid=2 -liferay-display-xml-type-hierarchy-incorrect=2 -liferay-display-xml-type-not-found=2 -liferay-hook-xml-reference-not-found=2 -liferay-hook-xml-resource-not-found=2 -liferay-hook-xml-syntax-invalid=2 -liferay-hook-xml-type-hierarchy-incorrect=2 -liferay-hook-xml-type-not-found=2 -liferay-jsp-files-java-method-not-found=2 -liferay-jsp-files-resource-property-not-found=2 -liferay-layout-templates-xml-reference-not-found=2 -liferay-layout-templates-xml-resource-not-found=2 -liferay-layout-templates-xml-syntax-invalid=2 -liferay-layout-templates-xml-type-hierarchy-incorrect=2 -liferay-layout-templates-xml-type-not-found=2 -liferay-portlet-xml-reference-not-found=2 -liferay-portlet-xml-resource-not-found=2 -liferay-portlet-xml-syntax-invalid=2 -liferay-portlet-xml-type-hierarchy-incorrect=2 -liferay-portlet-xml-type-not-found=2 -portlet-xml-reference-not-found=2 -portlet-xml-resource-not-found=2 -portlet-xml-syntax-invalid=2 -portlet-xml-type-hierarchy-incorrect=2 -portlet-xml-type-not-found=2 -service-xml-reference-not-found=2 -service-xml-resource-not-found=2 -service-xml-syntax-invalid=2 -service-xml-type-hierarchy-incorrect=2 -service-xml-type-not-found=2 diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.sdk.core.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.sdk.core.prefs deleted file mode 100644 index 720d213b..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.sdk.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -sdk-name=liferay-plugins-sdk-6.2 diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 26ffb99f..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs deleted file mode 100644 index 9cfcabe1..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.wst.ws.service.policy.projectEnabled=false diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..2aab4bcd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar index a02cdd97..6b9e7227 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java index 2d332caf..1b4201fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java @@ -43,7 +43,6 @@ import it.mwg.sicilia.sue.NoSuchApiSettingException; import it.mwg.sicilia.sue.model.ApiSetting; import it.mwg.sicilia.sue.model.impl.ApiSettingImpl; import it.mwg.sicilia.sue.model.impl.ApiSettingModelImpl; -import it.mwg.sicilia.sue.service.persistence.ApiSettingPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java index 5d8bbd46..744787f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java @@ -44,7 +44,6 @@ import it.mwg.sicilia.sue.NoSuchSportelloException; import it.mwg.sicilia.sue.model.Sportello; import it.mwg.sicilia.sue.model.impl.SportelloImpl; import it.mwg.sicilia.sue.model.impl.SportelloModelImpl; -import it.mwg.sicilia.sue.service.persistence.SportelloPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties index 91474332..0fcaaa88 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=sicilia_sue - build.number=66 - build.date=1635416035127 + build.number=71 + build.date=1675934857198 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/tld/c.tld similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/tld/c.tld rename to liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/tld/c.tld diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 index cabe985a..a35dfb5e 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 @@ -1 +1 @@ -2ca84fda03feca53b6ee9dc91aeed605 +8b2b544951ac6b80b795a561c755d6a1 diff --git a/liferay-plugins-sdk-6.2/shared/portal-http-service/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/shared/portal-http-service/ivy.xml.MD5 new file mode 100644 index 00000000..8f6bd95f --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portal-http-service/ivy.xml.MD5 @@ -0,0 +1 @@ +3f277a547f29d4308131add11b753eec diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath index 9db89fb5..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.project b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.project index 36877ecb..af2e978e 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.project +++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1676466957641 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath index 154a9659..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath @@ -2,10 +2,6 @@ - - - - - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore index ae3c1726..2a6d1626 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore @@ -1 +1,2 @@ /bin/ +/classes/ diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.project b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.project index 329d2f35..daa4e14d 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.project +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.project @@ -16,12 +16,12 @@ - 1636725892364 + 1676466957663 30 org.eclipse.core.resources.regexFilterMatcher - node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ diff --git a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath index 107701f9..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.project b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.project index 1b9b333c..0a7ed71d 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.project +++ b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1676466957694 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath index 38992c7f..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath @@ -2,6 +2,6 @@ - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.project b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.project index c1c33c24..0be27e94 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.project +++ b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1676466957720 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath index 193b7fe1..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath @@ -2,7 +2,6 @@ - - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/checksums/checksums.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/checksums/checksums.lock new file mode 100644 index 00000000..c13d2578 Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/checksums/checksums.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 00000000..c27a053b Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/dependencies-accessors/gc.properties b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/executionHistory/executionHistory.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/executionHistory/executionHistory.lock new file mode 100644 index 00000000..943b4eed Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/executionHistory/executionHistory.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/fileChanges/last-build.bin b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/fileChanges/last-build.bin differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/fileHashes/fileHashes.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/fileHashes/fileHashes.lock new file mode 100644 index 00000000..a4f1face Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/fileHashes/fileHashes.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/gc.properties b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/7.4.2/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 00000000..d8a3c9f5 Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/buildOutputCleanup/cache.properties b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..898ea602 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Feb 15 14:15:48 CET 2023 +gradle.version=7.4.2 diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/vcs-1/gc.properties b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.project b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.project index cc884b36..3f4f6d55 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.project +++ b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.project @@ -5,6 +5,11 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javabuilder @@ -13,5 +18,17 @@ org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + 1676466957723 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath index de872e86..dba4c53e 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath @@ -5,7 +5,7 @@ - - + + diff --git a/liferay-plugins-sdk-6.2/shared/portos-report-shared/.project b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.project index 6fb6a40f..d34bc43d 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-report-shared/.project +++ b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1676466957770 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath b/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath index 2ac08420..deb041ed 100644 --- a/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath @@ -1,18 +1,8 @@ - - - - - - - - - - - - - + + + diff --git a/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.project b/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.project index 3e309bb0..bf21e15d 100644 --- a/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.project +++ b/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1676466957770 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/sonar-project.properties b/liferay-plugins-sdk-6.2/sonar-project.properties new file mode 100644 index 00000000..945d653f --- /dev/null +++ b/liferay-plugins-sdk-6.2/sonar-project.properties @@ -0,0 +1,61 @@ +# must be unique in a given SonarQube instance +sonar.projectKey=Sicilia-Paesaggistica +sonar.host.url=http://sonar.nextmind.it +sonar.login=07bf5f159896d213b5bcb115c7c1a9ec1eca01ee +sonar.language=java +sonar.java.libraries="C:/progetti/paesaggistica/git/liferay-plugins-sdk-6.2/.ivy/cache" +# --- optional properties --- + +# defaults to project key +#sonar.projectName=My project +# defaults to 'not provided' +#sonar.projectVersion=1.0 + +# Path is relative to the sonar-project.properties file. Defaults to . +#sonar.sources=. + +# Encoding of the source code. Default is default system encoding +#sonar.sourceEncoding=UTF-8 + + +# Required metadata +# Path to the parent source code directory. +# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. +# Since SonarQube 4.2, this property is optional. If not set, SonarQube starts looking for source code +# from the directory containing the sonar-project.properties file. +sonar.sources=. +#sonar.sources=*/src,*/service,docroot/html +#sonar.web.file.suffixes=.jsp,.jspf +#sonar.doxygen.deploymentPath=/opt/sonarqube/war/sonar-server +sonar.java.source = 1.7 +sonar.java.binaries=modules,portlets,hooks,shared,webs,themes +# The value of the property must be the key of the language. +#sonar.language=java + +# Encoding of the source code +sonar.sourceEncoding=UTF-8 + +# Additional parameters +#sonar.my.property=value +sonar.exclusions = **/*BaseImpl.java,\ + **/model/impl/*ModelImpl.java,\ + **/model/impl/*CacheModel.java,\ + **/model/*Model.java,\ + **/model/*Wrapper.java,\ + **/service/base/*.java,\ + **/service/http/*.java,\ + **/service/persistence/*.java,\ + **/service/persistence/impl/*.java,\ + **/service/*.java,\ + **/security/permission/*.java,\ + **/migration-tool/*,\ + **/*.xml,\ + **/*.html,\ + portlets/*/docroot/WEB-INF/service/**/model/**/*.java,\ + portlets/*/docroot/WEB-INF/service/**/service/**/*.java,\ + portlets/*/docroot/WEB-INF/src/**/model/*BaseImpl.java,\ + portlets/*/docroot/WEB-INF/src/**/model/**/*ModelImpl.java,\ + portlets/*/docroot/WEB-INF/src/**/model/**/*CacheModel.java,\ + portlets/*/docroot/WEB-INF/src/**/service/base/**/*.java,\ + portlets/*/docroot/WEB-INF/src/**/service/http/**/*.java,\ + portlets/*/docroot/WEB-INF/src/**/service/persistence/**/*.java \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/sonarqube-ant-task-2.7.1.1951.jar b/liferay-plugins-sdk-6.2/sonarqube-ant-task-2.7.1.1951.jar new file mode 100644 index 00000000..f0c6871a Binary files /dev/null and b/liferay-plugins-sdk-6.2/sonarqube-ant-task-2.7.1.1951.jar differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath index cfbd58dd..88e342cf 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.project b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.project index 20b8d19a..693e5032 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.project +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.project @@ -38,4 +38,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957751 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml index db080717..9bbc4736 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath index cfbd58dd..88e342cf 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.project b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.project index 5c3583f6..62dbe14e 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.project +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.project @@ -38,4 +38,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957754 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml index db080717..9bbc4736 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath index cfbd58dd..88e342cf 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.project b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.project index aed0ce88..e2618418 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.project +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.project @@ -38,4 +38,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957754 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml index db080717..9bbc4736 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/elasticray-web/.project b/liferay-plugins-sdk-6.2/webs/elasticray-web/.project index 4e8351de..1463a52c 100644 --- a/liferay-plugins-sdk-6.2/webs/elasticray-web/.project +++ b/liferay-plugins-sdk-6.2/webs/elasticray-web/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957625 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 index 666324a8..ed7ff943 100644 --- a/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 @@ -1 +1 @@ -349605b488d054b6791b928de85f1e0c +6b77cff24775c2e999f05b9b92ee4026 diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath index 491f947b..08bf06f4 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath @@ -2,7 +2,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project index 32a08cf6..4df778fb 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957723 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component deleted file mode 100644 index cfa57ce4..00000000 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - uses - - - uses - - - - - diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf index 011c8696..a0f7d78b 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf @@ -139,7 +139,6 @@ details. -
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-portlet-service.jar new file mode 100644 index 00000000..ae60d7bd Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-shared.jar new file mode 100644 index 00000000..2aab4bcd Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-shared.jar new file mode 100644 index 00000000..0bc24a6d Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-web-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-web-service.jar new file mode 100644 index 00000000..d7f29548 Binary files /dev/null and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-web-service.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java index b821dc6a..d7ba9d57 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchActionException; import com.liferay.portal.workflow.kaleo.model.KaleoAction; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java index 67825a03..8a53a412 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchConditionException; import com.liferay.portal.workflow.kaleo.model.KaleoCondition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoConditionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java index 7b518a17..ec133caa 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchDefinitionException; import com.liferay.portal.workflow.kaleo.model.KaleoDefinition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoDefinitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java index 0ac20c87..7a81a480 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java index b0115dda..6c526317 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java index 9ade21a4..e9e4c818 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchLogException; import com.liferay.portal.workflow.kaleo.model.KaleoLog; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java index 005b6749..dfad2b8c 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNodeException; import com.liferay.portal.workflow.kaleo.model.KaleoNode; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNodePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java index 02168960..0932f643 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationException; import com.liferay.portal.workflow.kaleo.model.KaleoNotification; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java index 0cd7db55..d8c0fb51 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationRecipientException; import com.liferay.portal.workflow.kaleo.model.KaleoNotificationRecipient; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationRecipientPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java index eb7c922f..fd427cf1 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignmentInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java index a2a99f9b..8e52911f 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignment; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java index 8ab6fafe..032e8512 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java index 2749e5fe..9a339c6a 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskException; import com.liferay.portal.workflow.kaleo.model.KaleoTask; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java index 725af5ed..1400f6a2 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTimerInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java index 653aca47..a2e69d22 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerException; import com.liferay.portal.workflow.kaleo.model.KaleoTimer; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java index 79172e1a..5c157fbc 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTransitionException; import com.liferay.portal.workflow.kaleo.model.KaleoTransition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTransitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties index dbbd2bff..39af8759 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties @@ -10,5 +10,6 @@ error-portos-kaleo-required = {0} is required ## HOOK +x-assigned-the-task-to-x = Task assigned to {1} x-completed-the-task-x-y={0} completed the task {1} ({2}). x-sent-signal-x=System sent a signal {1}. \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties index 83228c65..1f5d2523 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties @@ -10,5 +10,6 @@ error-portos-kaleo-required = {0} campo obbligatorio ## HOOK +x-assigned-the-task-to-x = L'attività è stata assegnata a {1} x-completed-the-task-x-y={0} ha completato l'attività {1} ({2}). x-sent-signal-x=Il sistema ha inviato un segnale {1}. diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index c72b1baf..d792bf79 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=71 - build.date=1643195903376 + build.number=73 + build.date=1675849381256 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/webs/resources-importer-web/.project b/liferay-plugins-sdk-6.2/webs/resources-importer-web/.project index d0fffb37..1e3c9375 100644 --- a/liferay-plugins-sdk-6.2/webs/resources-importer-web/.project +++ b/liferay-plugins-sdk-6.2/webs/resources-importer-web/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1676466957770 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar differ