From 70f4933bd29a1933c23f5c1e9ca5133148254b89 Mon Sep 17 00:00:00 2001 From: marcoalderighi Date: Thu, 18 May 2023 12:46:02 +0200 Subject: [PATCH] fix reindex pratica --- .../dist/portos-bo-shared-6.2.0.1.jar | Bin 70892 -> 70892 bytes .../dist/portos-kaleo-shared-6.2.0.1.jar | Bin 2295 -> 2295 bytes .../docroot/WEB-INF/lib/portos-bo-shared.jar | Bin 70892 -> 70892 bytes .../WEB-INF/lib/portos-kaleo-shared.jar | Bin 2295 -> 2295 bytes .../portlet/AdvancedOperationPortlet.java | 44 ++++++++++++------ .../operation/util/AdvancedOperationUtil.java | 18 +++---- .../docroot/html/view.jsp | 24 ---------- 7 files changed, 37 insertions(+), 49 deletions(-) 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 index 48dae296bdc8d74ed80058bfe729f85eec5b44f8..838f02782f0123c889cc54a97ee92dacc2b64543 100644 GIT binary patch delta 1793 zcmZ9MeN0t#7{|}=oO55fZ*U15n1x^vD3S=?fD%Yj5EEv`Os)uw7fAvKH6oajw5GBU ze&J!PG}auFX38m=Z_UP5KtUJ=y~gul)y{pMAIo+B`Fzjwe4m%!Irp5Y zPI0PJG-hlUL_No8Ij$(LtH~H96e_SC3u(;ldWC!BCn)+r<@*2ZilOQ5YC!?jlW^cB zvJO~8HUdwRXBoq3qEq9wJjqkz#|J|$fsX)|@Ed?<_!!_Q{{rxFAr14wPM}##q)UQ@ z=?w4x?-@j!u7o^tD$lHTF$w&4#jU{gsvW>~af5WpOw|7D9%wmFw+L6*;0?lY9Re*k zKOx^&O%jh=9@ZrBApG?TGy=H&H{SKFG@Zb@QDD2$P3BIb&DLw8#peCj%!xap$B?7eU%CO*n_uepy9dj zKEdRfe$T(Zrb{VMdC_MwLt1u_74o&n>mrz{qtkHL?_$0}QD=Km52^m-wE_rNN&uSu z($=8o`Sco0-Pl=(OFxxqRf9PpD@FxVH7kEV{{zo)U#gV56CxFh#9zLeJ%SBr&TrVD zJpVld)Gd_7;}Bb=T?diY+6at%TQ`PPXY1QBl6tHdBVU~O2K!VsX5;+PmNHDGwo(*- zwi!@Ne>jTE_MYy;$Or9{SYCa04@O2h5=3}pOK~SBw=3(%(D9Zq>0={NOMe)MMYdnq z&BOV&IgfO|t-KJ16*TGQTIr5~=w!#m6M9Ha+|C*NM|ly_2)$Gv>M0MPKVDgaa}8cC zz$X=Z^H&W#(XEcnsTY*Lhg+GKsQfLTrlsjxy0>31-8T`foZs7xd#~&d#C78ahEN!9 zNw{~%@C14qexAli?JwQvi5-g&VX3*GpDL!5F~zOemnS|~gJHI(;$)R# zsO9OI_E5=UB|&oc-|wI+{@w&OesbE1B6emKPRN?QMg--nKp%71Jf8)c;n?gsDs6T| z0(%_z&dxjH;5ugRIp7;}TY%T+QW*njuoG)uc1A<&xHBHu>r4h3=Tm^Y=XU|m&%X-P zx^jR6u0Z;(3q1p_{Sb> za4d^`T2ca$@3pLRq>jKnkf@FnKx$D(4uUArlOhne^`r*GE-z9FqQ{G^8fqY~L!{Nf z`nV0O^L`_n-e+WeqD?Gy%0ym+D$z_1fG9V!)UcWLv00e-$U@4%WAZst*I=9 zUw9ZRjWvfPnRbfiTeGnhP!NVeFIWNdk0vq}yId}CwR4{5$8z0&KHu{^-{<9b&OK+M zU7Tna%~@Ln(a3Rnj$2>W(O`}ck`y?Oh4Idgm$^rNf};0VuKv%i7#i*_7Zgw)TQts0*wyAtUBMUN;~qk;#@)R=+;rES0}fayU|=|HE6(m(0>{uMFHJd z<#*Cv*QngiLV7SDMm`Yqu>gnI8KvFR-`fbEQDzL!ZeGYuZYd$k(E;i(smb&A?s1i~9;io#O=~qBovO^2Ld7uus*=T%14LREDYaW{Tp^ z788oe4~B8s?lV0YdB1fW%d5}r#K=%vk_eA%A>q{c7G?c7I@%N=ePkwD=?@dJ$}zJ=)Jg6>Y-dueYluA9&|fWmxB z!oAxD$Iw&%^CU)Uf9XU|{794tOU;D*R5789IWEwYkyQEeUtTP^JocFu4AWf|r>Yb~ zElw*xQCz5>*H z@_>DwVET>+J$;@%5Q~}11Rk2p1`f{U09VaBSv;7YpN|JUI*&CQ7xuz+JEO&m*A-sO z4|#V%e(eKfBjXg~iw}1~{*#9VDw}L1A6Q9pfrAA0mSPA2gLIk@*h-or1WKh$p6ph= z(x*HYNhX0sN(F2u-4a+;lt^GP={=DgfhvCu6D=C@21M*yChE21Fhs06QVpVBNA`hm zEsEWGQUa0h^{jKWfxtbGsDTthYTiH&fG9DNA`rKYqz1%xA5sdU%ZIHRZX&Niq}jy! zculPH9y6QXV`hC~Ei84~LSBU`(MtA%D7UiIpq2G;*qHdxM#{ir^<~o!`Ldx?iz45T Z?L6SeJjr%8;-a062=ZrZ9Q7x~{{n+BR|)_C 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 index 120eec49fa39ac770de9a45b48a3f0529f70500a..34da0abae760658c72b26f439f0ea56292432381 100644 GIT binary patch delta 214 zcmew^_+5}Uz?+$ci-CcIfgwF<(?nhk<}@H>(Wx>aaZ?xr5?}_hGfVUl%7F?dK2>H0 zQj@tEwZXI{qY;?SW3&L%D;e#<^lL^J5WU%mse=*B*vtH%kr`;;m5laa`Zc2qh~8|()WHa5>}CGX$PBb^@_tqekcE?fu|ibZ su<3zyBVf;VEQ4O6PQ+G_W;v{?EYZ-Fnb7?mf}bS(@h+u0Cz$<;s5{u 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 index 48dae296bdc8d74ed80058bfe729f85eec5b44f8..838f02782f0123c889cc54a97ee92dacc2b64543 100644 GIT binary patch delta 1793 zcmZ9MeN0t#7{|}=oO55fZ*U15n1x^vD3S=?fD%Yj5EEv`Os)uw7fAvKH6oajw5GBU ze&J!PG}auFX38m=Z_UP5KtUJ=y~gul)y{pMAIo+B`Fzjwe4m%!Irp5Y zPI0PJG-hlUL_No8Ij$(LtH~H96e_SC3u(;ldWC!BCn)+r<@*2ZilOQ5YC!?jlW^cB zvJO~8HUdwRXBoq3qEq9wJjqkz#|J|$fsX)|@Ed?<_!!_Q{{rxFAr14wPM}##q)UQ@ z=?w4x?-@j!u7o^tD$lHTF$w&4#jU{gsvW>~af5WpOw|7D9%wmFw+L6*;0?lY9Re*k zKOx^&O%jh=9@ZrBApG?TGy=H&H{SKFG@Zb@QDD2$P3BIb&DLw8#peCj%!xap$B?7eU%CO*n_uepy9dj zKEdRfe$T(Zrb{VMdC_MwLt1u_74o&n>mrz{qtkHL?_$0}QD=Km52^m-wE_rNN&uSu z($=8o`Sco0-Pl=(OFxxqRf9PpD@FxVH7kEV{{zo)U#gV56CxFh#9zLeJ%SBr&TrVD zJpVld)Gd_7;}Bb=T?diY+6at%TQ`PPXY1QBl6tHdBVU~O2K!VsX5;+PmNHDGwo(*- zwi!@Ne>jTE_MYy;$Or9{SYCa04@O2h5=3}pOK~SBw=3(%(D9Zq>0={NOMe)MMYdnq z&BOV&IgfO|t-KJ16*TGQTIr5~=w!#m6M9Ha+|C*NM|ly_2)$Gv>M0MPKVDgaa}8cC zz$X=Z^H&W#(XEcnsTY*Lhg+GKsQfLTrlsjxy0>31-8T`foZs7xd#~&d#C78ahEN!9 zNw{~%@C14qexAli?JwQvi5-g&VX3*GpDL!5F~zOemnS|~gJHI(;$)R# zsO9OI_E5=UB|&oc-|wI+{@w&OesbE1B6emKPRN?QMg--nKp%71Jf8)c;n?gsDs6T| z0(%_z&dxjH;5ugRIp7;}TY%T+QW*njuoG)uc1A<&xHBHu>r4h3=Tm^Y=XU|m&%X-P zx^jR6u0Z;(3q1p_{Sb> za4d^`T2ca$@3pLRq>jKnkf@FnKx$D(4uUArlOhne^`r*GE-z9FqQ{G^8fqY~L!{Nf z`nV0O^L`_n-e+WeqD?Gy%0ym+D$z_1fG9V!)UcWLv00e-$U@4%WAZst*I=9 zUw9ZRjWvfPnRbfiTeGnhP!NVeFIWNdk0vq}yId}CwR4{5$8z0&KHu{^-{<9b&OK+M zU7Tna%~@Ln(a3Rnj$2>W(O`}ck`y?Oh4Idgm$^rNf};0VuKv%i7#i*_7Zgw)TQts0*wyAtUBMUN;~qk;#@)R=+;rES0}fayU|=|HE6(m(0>{uMFHJd z<#*Cv*QngiLV7SDMm`Yqu>gnI8KvFR-`fbEQDzL!ZeGYuZYd$k(E;i(smb&A?s1i~9;io#O=~qBovO^2Ld7uus*=T%14LREDYaW{Tp^ z788oe4~B8s?lV0YdB1fW%d5}r#K=%vk_eA%A>q{c7G?c7I@%N=ePkwD=?@dJ$}zJ=)Jg6>Y-dueYluA9&|fWmxB z!oAxD$Iw&%^CU)Uf9XU|{794tOU;D*R5789IWEwYkyQEeUtTP^JocFu4AWf|r>Yb~ zElw*xQCz5>*H z@_>DwVET>+J$;@%5Q~}11Rk2p1`f{U09VaBSv;7YpN|JUI*&CQ7xuz+JEO&m*A-sO z4|#V%e(eKfBjXg~iw}1~{*#9VDw}L1A6Q9pfrAA0mSPA2gLIk@*h-or1WKh$p6ph= z(x*HYNhX0sN(F2u-4a+;lt^GP={=DgfhvCu6D=C@21M*yChE21Fhs06QVpVBNA`hm zEsEWGQUa0h^{jKWfxtbGsDTthYTiH&fG9DNA`rKYqz1%xA5sdU%ZIHRZX&Niq}jy! zculPH9y6QXV`hC~Ei84~LSBU`(MtA%D7UiIpq2G;*qHdxM#{ir^<~o!`Ldx?iz45T Z?L6SeJjr%8;-a062=ZrZ9Q7x~{{n+BR|)_C 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 index 120eec49fa39ac770de9a45b48a3f0529f70500a..34da0abae760658c72b26f439f0ea56292432381 100644 GIT binary patch delta 214 zcmew^_+5}Uz?+$ci-CcIfgwF<(?nhk<}@H>(Wx>aaZ?xr5?}_hGfVUl%7F?dK2>H0 zQj@tEwZXI{qY;?SW3&L%D;e#<^lL^J5WU%mse=*B*vtH%kr`;;m5laa`Zc2qh~8|()WHa5>}CGX$PBb^@_tqekcE?fu|ibZ su<3zyBVf;VEQ4O6PQ+G_W;v{?EYZ-Fnb7?mf}bS(@h+u0Cz$<;s5{u 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 index 87d5e867..1f6c22af 100644 --- 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 @@ -90,7 +90,20 @@ public class AdvancedOperationPortlet extends MVCPortlet { } actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId)); } + + public void reindexPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ + Privati.checkIfUserIsCompanyAdmin(actionRequest); + + ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); + + long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L); + if (intPraticaId != 0L) { + _log.info("AdvancedOperationPortlet --- Reindexing fascicolo of IntPraticaId " + intPraticaId); + IntPraticaLocalServiceUtil.reIndexFasciolo(intPraticaId, themeDisplay.getCompanyId()); + } + actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId)); + } public void fixStatusPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ @@ -112,32 +125,35 @@ public class AdvancedOperationPortlet extends MVCPortlet { Privati.checkIfUserIsCompanyAdmin(actionRequest); long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L); + _log.info("intPraticaId: "+intPraticaId); IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); int destinationUO = AdvancedOperationUtil.getDestinationUO(intPratica); - + _log.info("intPratica uo: "+intPratica.getUnitaOperativa()); if (AdvancedOperationUtil.evalUO(intPratica)) { _setUO(intPratica, destinationUO); } - + _log.info("intPratica uo: "+intPratica.getUnitaOperativa()); actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId)); } - private void _setUO(IntPratica intPratica, int uo) throws SystemException, SearchException{ + private void _setUO(IntPratica intPratica, int uo) throws SystemException, PortalException{ + _log.info("uo: "+uo); intPratica.setUnitaOperativa(uo); IntPraticaLocalServiceUtil.updateIntPratica(intPratica); - Indexer intPraticaIndexer = IndexerRegistryUtil.getIndexer(IntPratica.class); - intPraticaIndexer.reindex(intPratica); + IntPraticaLocalServiceUtil.reIndexFasciolo(intPratica.getIntPraticaId(), intPratica.getCompanyId()); - Indexer controlloPraticaIndexer = IndexerRegistryUtil.getIndexer(ControlloPratica.class); - List controlloPraticas = ControlloPraticaLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId()); - if(!controlloPraticas.isEmpty()){ - for(ControlloPratica controlloPratica : controlloPraticas){ - if(controlloPratica.getStatus() == WorkflowConstants.STATUS_PENDING){ - controlloPraticaIndexer.reindex(intPratica); - } - } - } +// Indexer intPraticaIndexer = IndexerRegistryUtil.getIndexer(IntPratica.class); +// intPraticaIndexer.reindex(intPratica); +// Indexer controlloPraticaIndexer = IndexerRegistryUtil.getIndexer(ControlloPratica.class); +// List controlloPraticas = ControlloPraticaLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId()); +// if(!controlloPraticas.isEmpty()){ +// for(ControlloPratica controlloPratica : controlloPraticas){ +// if(controlloPratica.getStatus() == WorkflowConstants.STATUS_PENDING){ +// controlloPraticaIndexer.reindex(intPratica); +// } +// } +// } } public void ripristinaPraticaVidimata(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{ 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 index 98578bdd..bc452881 100644 --- 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 @@ -283,18 +283,14 @@ public class AdvancedOperationUtil { } public static SortedSet getIstruttoreUOs(IntPratica intPratica){ - WorkflowTask lastTask = getLastTask(intPratica); - if(Validator.isNotNull(lastTask)){ - long assigneeUserId = lastTask.getAssigneeUserId(); - try { - if(-1 != assigneeUserId){ - User assignee = UserLocalServiceUtil.getUser(assigneeUserId); - return UserUtil.getUnitaOperative(assignee); - } - } catch (SystemException | PortalException e){ - _log.error("AOP ==> Error while analyzing IntPratica: " + intPratica.getIntPraticaId()); - _log.error(e,e); + try { + User tecnicoIstruttore = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); + if(-1 != tecnicoIstruttore.getUserId()){ + return UserUtil.getUnitaOperative(tecnicoIstruttore); } + } catch (SystemException e) { + _log.error("AOP ==> Error while analyzing IntPratica: " + intPratica.getIntPraticaId()); + _log.error(e,e); } return null; } 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 index befd3b49..0e1152f0 100644 --- 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 @@ -232,30 +232,6 @@ <% } %> - <% if(AdvancedOperationUtil.evalUO(intPratica)){ %> - - - - - - <% - String functionfixUO = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"fixUO','Sei sicuro di voler cambiare l unita operativa di questa pratica?')"; - %> - - - - - - <% } %> - <% if(AdvancedOperationUtil.isPraticaAnnullata(intPratica)){ %>