From 0ee95c42b0937998e20d55b6a14e424fff9b9d93 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 19 Mar 2015 17:51:43 +0000 Subject: [PATCH] Updated Ribbon git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@113667 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/client/TabularDataController.java | 70 ++-- .../client/resource/TabularDataResources.java | 28 +- .../td/client/resource/column-replace-all.png | Bin 0 -> 766 bytes .../client/resource/column-replace-all_32.png | Bin 0 -> 1286 bytes .../td/client/resource/table-replace-rows.png | Bin 0 -> 773 bytes .../client/resource/table-replace-rows_32.png | Bin 0 -> 1135 bytes .../table-row-delete-byexpression.png | Bin 0 -> 849 bytes .../table-row-delete-byexpression_32.png | Bin 0 -> 1645 bytes .../resource/table-row-delete-selected.png | Bin 0 -> 879 bytes .../resource/table-row-delete-selected_32.png | Bin 0 -> 1926 bytes .../td/client/ribbon/CurationToolBar.java | 72 +--- .../user/td/client/ribbon/FileToolBar.java | 57 ++- .../user/td/client/ribbon/ModifyToolBar.java | 396 ++++++++++++------ .../td/client/ribbon/TemplateToolBar.java | 23 + .../td/client/resource/column-replace-all.png | Bin 0 -> 766 bytes .../client/resource/column-replace-all_32.png | Bin 0 -> 1286 bytes .../td/client/resource/table-replace-rows.png | Bin 0 -> 773 bytes .../client/resource/table-replace-rows_32.png | Bin 0 -> 1135 bytes .../table-row-delete-byexpression.png | Bin 0 -> 849 bytes .../table-row-delete-byexpression_32.png | Bin 0 -> 1645 bytes .../resource/table-row-delete-selected.png | Bin 0 -> 879 bytes .../resource/table-row-delete-selected_32.png | Bin 0 -> 1926 bytes .../user/td/tabulardataportlet.gwt.xml | 8 +- 23 files changed, 382 insertions(+), 272 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/column-replace-all.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/column-replace-all_32.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/table-replace-rows.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/table-replace-rows_32.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/table-row-delete-byexpression.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/table-row-delete-byexpression_32.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/table-row-delete-selected.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/table-row-delete-selected_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/column-replace-all.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/column-replace-all_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/table-replace-rows.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/table-replace-rows_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/table-row-delete-byexpression.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/table-row-delete-byexpression_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/table-row-delete-selected.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/table-row-delete-selected_32.png diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index 5338838..01e144f 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -765,15 +765,6 @@ public class TabularDataController { case EXPORT_JSON: openJSONExportWizard(); break; - case TEMPLATE_OPEN: - openTemplateOpen(); - break; - case TEMPLATE_NEW: - openTemplateNew(); - break; - case TEMPLATE_DELETE: - openTemplateDelete(); - break; case SHARE: openShareWindow(); break; @@ -802,9 +793,6 @@ public class TabularDataController { case DUPLICATE_DETECTION: openDuplicatesRows(); break; - case TEMPLATE_APPLY: - openTemplateApply(); - break; case TABLE_TYPE: openTableType(); break; @@ -843,7 +831,29 @@ public class TabularDataController { break; case GENERATE_SUMMARY: break; - case TABLE_FILTER: + case COLUMN_MULTI_FILTER: + //Filter On multicolumn + break; + case TABLE_REPLACE_BATCH: + break; + case TABLE_REPLACE_BY_EXPRESSION: + break; + case TABLE_REPLACE_BY_EXTERNAL_COL: + openReplaceByExternalColWizard(); + break; + case ROW_DELETE: + doRowsDelete(); + break; + case DUPLICATE_DELETE: + openDuplicatesRows(); + break; + case BYEXPRESSION_DELETE: + break; + case ROW_ADD: + doRowAdd(); + break; + case COLUMN_FILTER: + openColumnFilter(); break; case TABLE_UNION: openTableUnionWizard(); @@ -856,18 +866,6 @@ public class TabularDataController { break; case TABLE_AGGREAGETE: break; - case TABLE_REPLACE_BY_EXTERNAL_COL: - openReplaceByExternalColWizard(); - break; - case ROW_ADD: - doRowAdd(); - break; - case ROW_DELETE: - doRowsDelete(); - break; - case DUPLICATE_DELETE: - openDuplicatesRows(); - break; case GEOSPATIAL_CSQUARE: openGeospatialCSquare(); break; @@ -882,11 +880,20 @@ public class TabularDataController { break; case ANNOTATION_ADD: break; - case COLUMN_FILTER: - openMultiColumnFilter(); - break; case COLUMN_BATCH_REPLACE: break; + case TEMPLATE_OPEN: + openTemplateOpen(); + break; + case TEMPLATE_NEW: + openTemplateNew(); + break; + case TEMPLATE_DELETE: + openTemplateDelete(); + break; + case TEMPLATE_APPLY: + openTemplateApply(); + break; case ANALYSE_TABLE_FILTER: break; case ANALYSE_TABLE_UNION: @@ -921,6 +928,7 @@ public class TabularDataController { case CREATE_GIS_MAP: openCreateMapWizard(); break; + default: break; } @@ -1680,6 +1688,7 @@ public class TabularDataController { } + @SuppressWarnings("unused") private void openMultiColumnFilter() { Log.debug("Request Open Multi Column Filter Dialog"); if (trId != null) { @@ -1691,6 +1700,11 @@ public class TabularDataController { UtilsGXT3.alert("Error", "No current tabular resource present"); } } + + private void openColumnFilter(){ + openColumnFilter(null,null); + } + private void openColumnFilter(String columnLocalId, String columnName) { Log.debug("Request Open Column Filter Dialog"); diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java index b496977..c580d9b 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java +++ b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java @@ -228,6 +228,12 @@ public interface TabularDataResources extends ClientBundle { @Source("column-replace_32.png") ImageResource columnReplace32(); + @Source("column-replace-all.png") + ImageResource columnReplaceAll(); + + @Source("column-replace-all_32.png") + ImageResource columnReplaceAll32(); + @Source("column-replace-batch.png") ImageResource columnReplaceBatch(); @@ -277,10 +283,28 @@ public interface TabularDataResources extends ClientBundle { ImageResource rowInsert(); @Source("table-row-delete_32.png") - ImageResource rowRemove32(); + ImageResource tableRowDelete32(); @Source("table-row-delete.png") - ImageResource rowRemove(); + ImageResource tableRowDelete(); + + @Source("table-row-delete-selected_32.png") + ImageResource tableRowDeleteSelected32(); + + @Source("table-row-delete-selected.png") + ImageResource tableRowDeleteSelected(); + + @Source("table-row-delete-byexpression_32.png") + ImageResource tableRowDeleteByExpression32(); + + @Source("table-row-delete-byexpression.png") + ImageResource tableRowDeleteByExpression(); + + @Source("table-replace-rows_32.png") + ImageResource tableReplaceRows32(); + + @Source("table-replace-rows.png") + ImageResource tableReplaceRows(); @Source("help_32.png") ImageResource help32(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/column-replace-all.png b/src/main/java/org/gcube/portlets/user/td/client/resource/column-replace-all.png new file mode 100644 index 0000000000000000000000000000000000000000..f17ffa6787f006e9dcd45533f2363a796cea1da2 GIT binary patch literal 766 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 literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/table-row-delete-selected.png b/src/main/java/org/gcube/portlets/user/td/client/resource/table-row-delete-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..8114e20ff346d2a04956fb3bb6c297bc19f8baca GIT binary patch literal 879 zcmV-#1CacQP)uY~t&q&rq(`IeV@^PiKa=X5NSN8X}6JEUsPR z@Xk*NMQH=2;-5URXBSV8--`iTIx}=#o}ju~WB)Dt$z?OGO|Lb6TqvO%fybVFj(mJ! z;|`@tm0Idb&P-S7&Nf+XL>SNrl>0_#;8`Z$KFbX|MmT-02tXrL?i|ih z^3v;o6XB|XUS53TUB<2*AV_TG$P2e~>dY5h*ApYE)z~|-8STjv1Lg~V@X}8wIJILa z>&?#ByhA4o_Eh0xyux`>o`>&;Bt)o$0qS|A8zJ3|WsaSmAr-+Lg8^L+@5RcMOI}BE zG$G>9sadio4#UFlr2T+c5R&(OXol!&m6d%5m>4qbk%w@^(HpPF{d{3tICuWlgai@t z*CO#<_fswVbjBkp)c|bY$Co_fLlss_hH32P|zJt6(WukVhd30jViA0tqHJxsP+sUaKF@Np36oVgxoH-TJe!7FYx;jJ@r-}|x zLNxjY{Uh!RhzO|)JHm;)42&A2fT~W+`^wx2Ii7#%4fY;7LBb{|`T?O6RyW+vn9+4? z-TqI;r!S^5l_Us4GMO})nrddxoCJU>fX4NJK2ViR(73*ZRD~UR?iF}p=x8~#pWpp@ z7d`m`#z3|=pl(>24NpD9gt5_@>Gfl2eq}c!GigTDW-ta${O2s6KI>CgTLT&iLy79R zQE+)wBZZvG5Da*&M_bsneOt7|7&uKwae_8fc% zYs~*f^cWKnBg$F;oG6!$AH(I7#^FRrSbN_6yhMU~=FegIH=kq4vIeZRgS=UvUIqvS zZktvMNg43+6GVR%tnOfRtxRdKO~_3n%WY zMr3qCSp~e3r-C&PuAt@UG3qCMs;mMnM_PGu-A{OZ)6aN(^$NcIgBR$UR8Ms}&5}8v zD7)rFdloO@#lWNt1_prRvMH0<^7;Xev>xxD;GCnQ^CQ-N=ZE}t`%a#I{9#`B(y+gCHk=X}e!3oTra#5s+P}TxopKm9=tIDc0lV{z@ zzuQjW*N$MywKJJsRgJ@tun7Qen0F^nHLd4Y&wZb-et9XoT6-8siXjA1rQ4<$ra>76 z;vk~2A2$ZPRGLTczZHNNx3>e(@Y%t4JT-GSYaja_t!-zRd)G4Vy|Fw7j(w1&kV><4 z*JG@oypZN{77!7nGKmWK$*MuN3R2Z&H@vDNvu%_9f2RBp(AM(LZMI$zzOOc>Kr(SIw5Hkb%I|A z@UmU}{>8sjk<0dDV0L{CeyW;rOBNs%Ni=W}294=I|FJ3d12GFs0%t6KZxKJ|BgGK) z9fjV2d@eu(hXf7{9U2N6DjEvKf}>an(TXHmkp!cWPpG*FQI>!dV0Y{79b3vuXYX%qM9&_PU8ZM=aKvFvlMbUmd>aF zYLL&*hh&OSz|NS8yWX&x%$#-{G?^v^`AjfRY(v*q(oEZ@ZRSm z766<&jV3Db5L5)e5TY&up@xoPF^mL;k-$DMCQUrBzbajpWX%V2VBo%K5nb;EpyU(Y zZR-M6#1By8L3Hw_0kI%TolUj?**vxT4>%k~gc&0QSYuLBGs?wu6pT#5- zWuxKoRE3?`xW1)7b=Gqp8cyODkqR0o7H-fhXz3DqeNCwit_Fk0?JHm54= z$iCEBhHS3!6U#() { + + @Override + public void onSelection(SelectionEvent event) { + eventBus.fireEvent(new RibbonEvent( + RibbonType.TABLE_REPLACE_BATCH)); + + } + }); + + replaceByExpressionItem + .addSelectionHandler(new SelectionHandler() { + + @Override + public void onSelection(SelectionEvent event) { + eventBus.fireEvent(new RibbonEvent( + RibbonType.TABLE_REPLACE_BY_EXPRESSION)); + + } + }); + + replaceByExternalColItem + .addSelectionHandler(new SelectionHandler() { + + @Override + public void onSelection(SelectionEvent event) { + eventBus.fireEvent(new RibbonEvent( + RibbonType.TABLE_REPLACE_BY_EXTERNAL_COL)); + + } + }); + + menuReplace.add(replaceBatchItem); + menuReplace.add(replaceByExpressionItem); + menuReplace.add(replaceByExternalColItem); + return menuReplace; + } + + private Menu createDeleteMenu() { + Menu menuDelete = new Menu(); + deleteSelectedRowsItem = new MenuItem("Selected Rows", + TabularDataResources.INSTANCE.tableRowDeleteSelected()); + deleteDuplicateItem = new MenuItem("Duplicate", + TabularDataResources.INSTANCE.tableDuplicateRowsRemove()); + deleteByExpression = new MenuItem("By Expression", + TabularDataResources.INSTANCE.tableRowDeleteByExpression()); + + deleteSelectedRowsItem + .addSelectionHandler(new SelectionHandler() { + + @Override + public void onSelection(SelectionEvent event) { + eventBus.fireEvent(new RibbonEvent(RibbonType.ROW_DELETE)); + + } + }); + + deleteDuplicateItem + .addSelectionHandler(new SelectionHandler() { + + @Override + public void onSelection(SelectionEvent event) { + eventBus.fireEvent(new RibbonEvent(RibbonType.DUPLICATE_DELETE)); + + } + }); + + deleteByExpression + .addSelectionHandler(new SelectionHandler() { + + @Override + public void onSelection(SelectionEvent event) { + eventBus.fireEvent(new RibbonEvent(RibbonType.BYEXPRESSION_DELETE)); + + } + }); + + menuDelete.add(deleteSelectedRowsItem); + menuDelete.add(deleteDuplicateItem); + menuDelete.add(deleteByExpression); + return menuDelete; + } + protected void cleanCells(Element elem) { NodeList tds = elem. cast().select("td"); for (int i = 0; i < tds.getLength(); i++) { @@ -320,74 +436,80 @@ public class ModifyToolBar { } } + + public void setUI(UIStateEvent event) { UIStateType uiStateType = event.getUIStateType(); try { switch (uiStateType) { case START: - // Table + // Tools + replaceButton.disable(); + deleteButton.disable(); + filterButton.disable(); unionButton.disable(); + addRowButton.disable(); + //Group groupbyButton.disable(); timeAggregationButton.disable(); - replaceByExternalCol.disable(); - addRowButton.disable(); - deleteRowButton.disable(); - deleteDuplicateButton.disable(); // Geospatial csquareButton.disable(); - oceanAreaButton.disable(); downscaleCSquareButton.disable(); + oceanAreaButton.disable(); // Geometry pointButton.disable(); break; case TR_CLOSE: case TR_READONLY: - // Table + // Tools + replaceButton.disable(); + deleteButton.disable(); + filterButton.disable(); unionButton.disable(); + addRowButton.disable(); + //Group groupbyButton.disable(); timeAggregationButton.disable(); - replaceByExternalCol.disable(); - addRowButton.disable(); - deleteRowButton.disable(); - deleteDuplicateButton.disable(); // Geospatial csquareButton.disable(); - oceanAreaButton.disable(); downscaleCSquareButton.disable(); + oceanAreaButton.disable(); // Geometry pointButton.disable(); break; case TR_OPEN: case TABLEUPDATE: case TABLECURATION: - // Table + // Tools + replaceButton.enable(); + deleteButton.enable(); + filterButton.enable(); unionButton.enable(); + addRowButton.enable(); + //Group groupbyButton.enable(); timeAggregationButton.enable(); - replaceByExternalCol.enable(); - addRowButton.enable(); - deleteRowButton.enable(); - deleteDuplicateButton.enable(); // Geospatial csquareButton.enable(); - oceanAreaButton.enable(); downscaleCSquareButton.enable(); + oceanAreaButton.enable(); // Geometry pointButton.enable(); break; case WIZARD_OPEN: - // Table + // Tools + replaceButton.disable(); + deleteButton.disable(); + filterButton.disable(); unionButton.disable(); + addRowButton.disable(); + //Group groupbyButton.disable(); timeAggregationButton.disable(); - replaceByExternalCol.disable(); - addRowButton.disable(); - deleteRowButton.disable(); - deleteDuplicateButton.disable(); // Geospatial csquareButton.disable(); - oceanAreaButton.disable(); downscaleCSquareButton.disable(); + oceanAreaButton.disable(); // Geometry pointButton.disable(); break; diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java index 812666a..cc1b329 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java @@ -39,6 +39,7 @@ public class TemplateToolBar { private TextButton templateNewButton; private TextButton templateOpenButton; private TextButton templateDeleteButton; + private TextButton templateApplyButton; public TemplateToolBar(EventBus eventBus) { @@ -121,6 +122,24 @@ public class TemplateToolBar { templateLayout.setWidget(0, 2, templateDeleteButton); templateLayout.getFlexCellFormatter().setRowSpan(0, 2, 2); + + templateApplyButton = new TextButton("Apply", + TabularDataResources.INSTANCE.templateApply32()); + templateApplyButton.disable(); + templateApplyButton.setScale(ButtonScale.LARGE); + templateApplyButton.setIconAlign(IconAlign.TOP); + templateApplyButton.setToolTip("Apply Template"); + templateApplyButton.setArrowAlign(ButtonArrowAlign.BOTTOM); + templateApplyButton.addSelectHandler(new SelectHandler() { + + public void onSelect(SelectEvent event) { + eventBus.fireEvent(new RibbonEvent(RibbonType.TEMPLATE_APPLY)); + } + }); + + templateLayout.setWidget(0, 3, templateApplyButton); + templateLayout.getFlexCellFormatter().setRowSpan(0, 3, 2); + cleanCells(templateLayout.getElement()); eventBus.addHandler(UIStateEvent.TYPE, @@ -153,12 +172,14 @@ public class TemplateToolBar { templateOpenButton.enable(); templateNewButton.enable(); templateDeleteButton.enable(); + templateApplyButton.disable(); break; case TR_CLOSE: case TR_READONLY: templateOpenButton.enable(); templateNewButton.enable(); templateDeleteButton.enable(); + templateApplyButton.disable(); break; case TR_OPEN: case TABLEUPDATE: @@ -166,11 +187,13 @@ public class TemplateToolBar { templateOpenButton.enable(); templateNewButton.enable(); templateDeleteButton.enable(); + templateApplyButton.enable(); break; case WIZARD_OPEN: templateOpenButton.disable(); templateNewButton.disable(); templateDeleteButton.disable(); + templateApplyButton.disable(); break; default: break; diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/column-replace-all.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/column-replace-all.png new file mode 100644 index 0000000000000000000000000000000000000000..f17ffa6787f006e9dcd45533f2363a796cea1da2 GIT binary patch literal 766 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/table-row-delete-selected.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/table-row-delete-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..8114e20ff346d2a04956fb3bb6c297bc19f8baca GIT binary patch literal 879 zcmV-#1CacQP)uY~t&q&rq(`IeV@^PiKa=X5NSN8X}6JEUsPR z@Xk*NMQH=2;-5URXBSV8--`iTIx}=#o}ju~WB)Dt$z?OGO|Lb6TqvO%fybVFj(mJ! z;|`@tm0Idb&P-S7&Nf+XL>SNrl>0_#;8`Z$KFbX|MmT-02tXrL?i|ih z^3v;o6XB|XUS53TUB<2*AV_TG$P2e~>dY5h*ApYE)z~|-8STjv1Lg~V@X}8wIJILa z>&?#ByhA4o_Eh0xyux`>o`>&;Bt)o$0qS|A8zJ3|WsaSmAr-+Lg8^L+@5RcMOI}BE zG$G>9sadio4#UFlr2T+c5R&(OXol!&m6d%5m>4qbk%w@^(HpPF{d{3tICuWlgai@t z*CO#<_fswVbjBkp)c|bY$Co_fLlss_hH32P|zJt6(WukVhd30jViA0tqHJxsP+sUaKF@Np36oVgxoH-TJe!7FYx;jJ@r-}|x zLNxjY{Uh!RhzO|)JHm;)42&A2fT~W+`^wx2Ii7#%4fY;7LBb{|`T?O6RyW+vn9+4? z-TqI;r!S^5l_Us4GMO})nrddxoCJU>fX4NJK2ViR(73*ZRD~UR?iF}p=x8~#pWpp@ z7d`m`#z3|=pl(>24NpD9gt5_@>Gfl2eq}c!GigTDW-ta${O2s6KI>CgTLT&iLy79R zQE+)wBZZvG5Da*&M_bsneOt7|7&uKwae_8fc% zYs~*f^cWKnBg$F;oG6!$AH(I7#^FRrSbN_6yhMU~=FegIH=kq4vIeZRgS=UvUIqvS zZktvMNg43+6GVR%tnOfRtxRdKO~_3n%WY zMr3qCSp~e3r-C&PuAt@UG3qCMs;mMnM_PGu-A{OZ)6aN(^$NcIgBR$UR8Ms}&5}8v zD7)rFdloO@#lWNt1_prRvMH0<^7;Xev>xxD;GCnQ^CQ-N=ZE}t`%a#I{9#`B(y+gCHk=X}e!3oTra#5s+P}TxopKm9=tIDc0lV{z@ zzuQjW*N$MywKJJsRgJ@tun7Qen0F^nHLd4Y&wZb-et9XoT6-8siXjA1rQ4<$ra>76 z;vk~2A2$ZPRGLTczZHNNx3>e(@Y%t4JT-GSYaja_t!-zRd)G4Vy|Fw7j(w1&kV><4 z*JG@oypZN{77!7nGKmWK$*MuN3R2Z&H@vDNvu%_9f2RBp(AM(LZMI$zzOOc>Kr(SIw5Hkb%I|A z@UmU}{>8sjk<0dDV0L{CeyW;rOBNs%Ni=W}294=I|FJ3d12GFs0%t6KZxKJ|BgGK) z9fjV2d@eu(hXf7{9U2N6DjEvKf}>an(TXHmkp!cWPpG*FQI>!dV0Y{79b3vuXYX%qM9&_PU8ZM=aKvFvlMbUmd>aF zYLL&*hh&OSz|NS8yWX&x%$#-{G?^v^`AjfRY(v*q(oEZ@ZRSm z766<&jV3Db5L5)e5TY&up@xoPF^mL;k-$DMCQUrBzbajpWX%V2VBo%K5nb;EpyU(Y zZR-M6#1By8L3Hw_0kI%TolUj?**vxT4>%k~gc&0QSYuLBGs?wu6pT#5- zWuxKoRE3?`xW1)7b=Gqp8cyODkqR0o7H-fhXz3DqeNCwit_Fk0?JHm54= z$iCEBhHS3!6U# - + - +