From 99984fcd2c8319f32f1049fca8518214f6739e18 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 15 Dec 2021 15:44:31 +0100 Subject: [PATCH] integrated with WhereClause. Updated icons --- .../client/resources/layers.png | Bin 465 -> 810 bytes .../client/resources/layers2.png | Bin 0 -> 465 bytes .../client/resources/map.png | Bin 500 -> 693 bytes .../client/resources/map2.png | Bin 0 -> 500 bytes .../client/resources/map4.png | Bin 0 -> 744 bytes .../client/resources/preset_location.png | Bin 683 -> 599 bytes .../client/ui/GeonaDataViewMainPanel.java | 7 ++++--- .../client/ui/SearchFacilityUI.java | 13 ++++++++++++- .../user/geoportaldataviewer/IAMClient.java | 2 -- 9 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers2.png create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map2.png create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map4.png diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers.png index 41fc600fc69f83969e0755321c9fc3d4d15c2486..4a90fb33909bc4694a6ac0287e9bd7c0153378f7 100644 GIT binary patch delta 763 zcmV*#0n^U*7X@2Z%Z8I~WG{pQ9jEGVP z734(_)P**kS(g%BMCMkz@FD^u>_%%)7e?K6Bgi0EV3@Pb>6mk0nsc7B^RZtSfr!lK z@_nD@d3hfm1jnH3e&Xgjo1Vl7L%mcr6nt)*D#t@d2N&Ici8CpBJFv!Nni2lLE+GtD z(YR70>8>qIaKFkLbo;|}WL=qF(`0&!DjC%ltG0|{Wgif-m{sr3B&oj~rKqu!H_x>w zPS>mt@dpO&!?8OtCjBx??Xg;!mKuwOC(GlfA0NKdI${NleHkz)(;NR^)PFYKaR^McDKWfsjzWP@OP|)vl1&I)7N) z?ulL4q_*F0(mPg0A#oF5^Qk>!zkU#6=fGx5LYw)2xIt$f1Xh7XG=9?*D|=+JAc;tM z7pHTVC8Qt=Z`^1Q^;hO!G=u;E(8)(Xk~)P-*<@qS7oT~x%@e&Fr*ji&DzDKfluVRV zI8O?sLDKRT!7vho&*!el10RDsn?8o|n&9xi%q z{!0&1wEzHf*T7dB39%yz4swbHico86|6ZP((*Yc(u?;k0IIWe|pk#GP2002ovPDHLkV1iZxSziDE delta 415 zcmV;Q0bu^B2GIi{iBL{Q4GJ0x0000DNk~Le0000F0000F2nGNE06W%|N|7NN3k}o& z01eau?~%F{kwzzf0ZvIoK~yM_ozpRER8bJc@!vcpO=6*78iimZ7Ft-C!cMU81K4S0 zlS(kF8wCZQ5{TigyEb-KVwcv!La?#b516Ne;TKNsL`v!OQr4TCg{t@iqaXoW8kLg=cryG+fymY{Ii}88b z*vfNwg7agbcevqJyd4y3xXKgKVN3B|W@x)CRhYv%9_V_ejJ|fxV?!f8g({oELrmeh z-|o5{>#Ce)R=A+=jb?0F&EpCy!WC>w_s6B(6(0Giql{mk=8T>OmN31?_jS^qf8Zld z;?PiMXU_xu#|tZV%FTGK>ns+e?<3HrbVt{j0l1s?sP_4*{s8<$bFr9?OK<=H002ov JPDHLkV1lI2zeoT8 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers2.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers2.png new file mode 100644 index 0000000000000000000000000000000000000000..41fc600fc69f83969e0755321c9fc3d4d15c2486 GIT binary patch literal 465 zcmV;?0WSWDP)Ez6#xJL8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10ZvIoK~yM_ozpRER8bJc@!vcpO=6*78iimZ7Ft-C!cMU81K4S0 zlS(kF8wCZQ5{TigyEb-KVwcv!La?#b51042!8vhoA#*o`K$f_{6urHn2t+u00000NkvXX Hu0mjfZC%U! literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png index da4854a01dbab38de8bfcc75803ecc7c778a2e60..d2c357fc8dde564451b1c1c1fd091132012f7dd0 100644 GIT binary patch delta 645 zcmV;00($-Q1GNPqiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyk3j?tL z00XfB^@Ht6kwzzf0y0TNK~y-6l~YS-6HydB?`6_VTAPpgG=sm9AT2RUBQ|b=n`(tt zbnD8ELiSY@s^Vw~sDW7As9m`hH(gk%T}Tu{(Y6B?yAT>;wWPKACrzeFX2wOEHVGA) zv$`D4x$kfvhoA|!pT8Jd*fczjR!pumbUIZfuxd(@QW@u=Vz ziWC6eRXf9xGG}wKIrQkV4dRn*9@o1P4g9x?-7=d#_89<(5PCK+n(LdAL2#2x;Qpl( zSc<10E@yCm+1rb5o=5EaClI3rvDG93krbwLR_KU~5!37iMyyyyYSHMRPi+;rAj&`cF zY}*ATs!9)Q3Z)vM?!#2C>7vCFJ)|it)(EA=1U!>}TcD@gQV*DIE2~lz(uD@mdOVJm zj28LyMneJ?Rh(&CyGH*lIj~{_Yy)YtJcsLkPFrj>mr> z;gvLkW4NjG#Dpu-f<*X?3up_UR5lgPOK+ssFi4X)ju+CJailNU5H4b}S6vzwE~$JK zMit%{byI-?(+X{qi3sPA{8K7^x~lE#XfUi4)eLZ^lfDjV_8Ge%AS8#U1}82Wep zCnV+mkZ72H_ETqfNLA+>RHZwqokm?Kgdfsd-A&w0DZR$JG$x(Jvl?1;Av>n9fi2;s zsB58;p5udX0xLG1R+y1a;vLq}H`?XAEUng=j|d-e7z-w>xgI}z-urpbwprZ4cym8i t@{o=>VFt@e58aLJJ=$b3&j_o(0D8}LtO+;OCIA2m002ovPDHLkV1heB#K`~v diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map2.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map2.png new file mode 100644 index 0000000000000000000000000000000000000000..da4854a01dbab38de8bfcc75803ecc7c778a2e60 GIT binary patch literal 500 zcmV*lIlf?i%K6&nbLE2)Eph$A2K< zl{A85xT*BSge%g5MEHygXbYcIHWkiGZ=}{RNRv2@7t)$>q%YVIE@HA*T^bfHseBbi z72X$hQ-K203T>gpIZR`y?{}g;grk^}#)_I=^ko`Cr-lwH8}ZOHMos@4HPJB``gi>& zB<22)Xqfg>XLm?d=NnX|JE@&UT_}Vf(p%k4+)XLH#=0~noyD^nT6G~irm%r6;iaf+ zp^~2CgKz>XHl0?Okxt?r*3mcG<-9Dd)|rn8A8{B9Cak$0KYQN$dC<05+`)KrKUVUP qjyYil%SsR3jqN?!WHHYOtG@tx&vmQ`H`OKp0000P)WAWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10%b`=K~y-6y^~EyR8bVifA_s{92*L&@!Lj5Nf`~5(VQYHbhM2L znnjc=g;`1w1hy!mMPMzmRplngiduwVw2_F482SJ$F)}h^5Tlurz!8*{^Sfh!kKGOV>~9}q_V+Zy zFA53thVl6i10YnP&uG2SwD|kGC*#DT8gnxd0=;3~M3eecCtKf4#@1SkSBS;r-;qfv zkuq^Twiq{CjOo?XjmU%|)-=;hWah%lX2u7qb^W#xAQQco!bmm*sv=BzB2le^V$vvL zMZQ6XPG(7t9~H3%q#^{0C2>O&<~EHpkd&+fQ03c>HDxnao50($GhRS|YBDoZvUF&r z@r$kYN{(K*h|5!jJyjRhw0|bY9bocP8$t!eB8=;I4QJ^QbDMfXoxg|bR=+_B6CbAt zeZ9%T!X&xwOYA6d5S^1)k_7WJ8md)bvkQI&qXdWh2!A=noBq(!jABHlB;N*y_%U{l zz{3F({S9i{+Q=!sjH@D(lr0Lu4A}`tmIR00000@?km1=j>2iBL{Q4GJ0x0000DNk~Le0000E0000H2nGNE0PV<~pOGON3kBc+ z00rOy_N)_zkwzzf0n|xEK~yM_ebLX0%yAsY@yBO;rs6fTr(wV{ z)|n@B)w5n~#$rsvN5VtKE{dI>{)~nRDAu}2w@}A@(gz`b6eWwW6`3%$OW%fvlVIg( zw^SG)-J`8nT=Vs>B(XXhR|q=^-D2rc5MQ)Ye}`w5f9cWFGpeOh5c8XaO^UykX4Lnf zNOA83bnfviBgHOc()50D^>;#|x*r?WvvL93F(|J6G9GJzpT#$l8 zOoHJqX@{5(66&NSg4ncp6^09>2iPXQn$fsW8W0@7GSW&R9M-q~&UpWs=s|x*c8$>k z{J4N#(6|0FE>HcEa0+d*aJ3+Iycd+QSFFaV!{e%Lk{)3v3mNi&{N_3A`S`4QW_%MCS4LckNzKQz~^xU oqlB|!=|t;@t>H6be)3=TZ(6*es3ZIr$N&HU07*qoM6N<$f(EPp!~g&Q delta 635 zcmV->0)+k71gixhiBL{Q4GJ0x0000DNk~Le0000H0000H2nGNE06T3*`jH_T3j~G$ z00f2syc1Gmkwzzf0w_sDK~y-6ozqQ-)>RY+@ZY)b%!ou2Iv`2(W*}J@?jn!^cQ%e; zi+F=J4&+$02+L_maTf{UJ4p-)E(|0|7~I$@XbQBCRf~cI^CQg26xujSW5fLar^UQY z^Um1D1DAWxea`c6&&Lf*?O+b*^NO@hv0HJ=oL8|0r&K zdk%wm8I{U^`l2#|wb+1nh40+9)r^C}F|@4n%Y5>YY8UVn2Czo4vnaZX1Zr3CwDhRj zVXdeZu(7y|=W)GL)g49JbQh6d(G(_)#r0+QX#9zj9q-9y_`O(Y=N0sK-LBL$;}SkM z8pC&Gw(}@<<3_>nSk<*=G;tLzhjRIIC$oW}j`u@<4^CtAlCVec69yDVwDW+bZ(X$t zFZj(Jwe5;2;dGB#$Mo5UJJP54O6?mn&UnCsYWHinsTGxW-Y3jru(NM9=feEN9?mEH z?V4UYq#=aj%}$pZIIDPF?IgZdObS1G$Stj?{{Qb3kEwhpY{M`%;_XE#zhN{c=DX8f z@m&}~N56Db!-U!iwL!%>tj4sk-`@D>Us|^a9LhC{5ot&G;wC{0I9b Vxu)mV-9!KY002ovPDHLkV1jHfGzS0x diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java index 57735b4..37803a9 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java @@ -11,6 +11,7 @@ import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerCon import org.gcube.portlets.user.geoportaldataviewer.client.events.ChangeMapLayerEvent; import org.gcube.portlets.user.geoportaldataviewer.client.events.MapExtentToEvent; import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerMap; +import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAIcons; import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAImages; import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil; import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil.Location; @@ -150,9 +151,9 @@ public class GeonaDataViewMainPanel extends Composite { extentToEarth.getElement().appendChild(worldImg.getElement()); extentToEarth.setWidth("140px"); - //linkMap.setCustomIconStyle(GNAIcons.CustomIconType.MAP.get()); - //linkPresetLocation.setCustomIconStyle(GNAIcons.CustomIconType.PRESET_LOCATION.get()); - //linkLayers.setCustomIconStyle(GNAIcons.CustomIconType.LAYERS.get()); + linkMap.setCustomIconStyle(GNAIcons.CustomIconType.MAP.get()); + linkPresetLocation.setCustomIconStyle(GNAIcons.CustomIconType.PRESET_LOCATION.get()); + linkLayers.setCustomIconStyle(GNAIcons.CustomIconType.LAYERS.get()); searchFacility = new SearchFacilityUI(applicationBus, sortByFields, searchForFields, initialSortFilter); searchFacility.setSearchButton(searchFacilityButton); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java index 1900b13..9646e21 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java @@ -10,7 +10,9 @@ import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; import org.gcube.application.geoportalcommon.shared.ItemField; import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData; import org.gcube.application.geoportalcommon.shared.SearchingFilter; +import org.gcube.application.geoportalcommon.shared.SearchingFilter.LOGICAL_OP; import org.gcube.application.geoportalcommon.shared.SearchingFilter.ORDER; +import org.gcube.application.geoportalcommon.shared.WhereClause; import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerServiceAsync; @@ -463,7 +465,16 @@ public class SearchFacilityUI extends Composite { searchInto.put(fieldname, searchText); } - searchingFilter.setSearchInto(searchInto); + WhereClause where = new WhereClause(); + where.setSearchInto(searchInto); + where.setOperator(LOGICAL_OP.OR); + + //THIS CLAUSE IS ADDED IN ORDER TO SEARCH ONLY PUBLISHED PRODUCT (WITH SUCCESS) + Map searchInto2 = new HashMap(); + searchInto2.put("report.status", "PASSED"); + WhereClause where2 = new WhereClause(LOGICAL_OP.AND, searchInto2); + + searchingFilter.setConditions(Arrays.asList(where, where2)); } return searchingFilter; } diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java index 0aa3b91..b45ae06 100644 --- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java +++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java @@ -1,7 +1,5 @@ package org.gcube.portlets.user.geoportaldataviewer; -import java.util.List; - import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.IAMClientCredentialsReader;