From 86746daad987be7257cc723745c3fca107ece8e2 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 17 Dec 2013 23:47:35 +0000 Subject: [PATCH] lot of changes in the UI for the VME Case git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@87136 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../reportgenerator/client/Headerbar.java | 79 ++++++++++++++---- .../client/Presenter/Presenter.java | 19 +++-- .../client/WorkspacePanel.java | 8 +- .../client/toolbar/Images.java | 4 + .../RichTextToolbar$Strings.properties | 4 +- .../client/toolbar/RichTextToolbar.java | 36 +++++--- .../client/toolbar/db_save.png | Bin 0 -> 4095 bytes .../reportgenerator/client/toolbar/save.png | Bin 674 -> 454 bytes .../client/uibinder/OpenOptions.java | 2 +- .../client/uibinder/OpenOptionsVME.java | 77 +++++++++++++++++ .../client/uibinder/OpenOptionsVME.ui.xml | 19 +++++ src/main/webapp/ReportGenerator.css | 4 + src/main/webapp/images/deleteVME.png | Bin 0 -> 9435 bytes 13 files changed, 213 insertions(+), 39 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/db_save.png create mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/OpenOptionsVME.java create mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/OpenOptionsVME.ui.xml create mode 100644 src/main/webapp/images/deleteVME.png diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java index ace4fd0..21350e4 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java @@ -52,8 +52,7 @@ public class Headerbar extends Composite{ private static final String EXPORT_HTML = "Export to HTML"; private static final String EXPORT_FIMES = "Export to FiMES XML"; private static final String EXPORT_XML = "Export to XML"; - private static final String IMPORT_VME = "Open VME Report"; - private static final String IMPORT_VME_REF = "Import VME Reference Report"; + private static final String IMPORT_VME = "Edit VME"; // private static final String EXPORT_ENCRYPTED_REPORT = "Save an Encrypted Version to Desktop"; private static final String VIEW_USER_COMMENTS = "View user comments"; @@ -134,18 +133,14 @@ public class Headerbar extends Composite{ fileMenu = getFileMenu(); menuBar.addItem(fileMenu); separator1 = menuBar.addSeparator(); - vmeMenu = getVMEMenu(); - menuBar.addItem(vmeMenu); - - separator3 = menuBar.addSeparator(); viewMenu = getViewMenu(); menuBar.addItem(viewMenu); -// separator2 = menuBar.addSeparator(); -// sectionsMenu = getSectionMenu(); -// menuBar.addItem(sectionsMenu); - -// biblioMenu = getBiblioMenu(); -// menuBar.addItem(biblioMenu); + separator2 = menuBar.addSeparator(); + sectionsMenu = getSectionMenu(); + menuBar.addItem(sectionsMenu); + separator3 = menuBar.addSeparator(); + biblioMenu = getBiblioMenu(); + menuBar.addItem(biblioMenu); separator4 = menuBar.addSeparator(); exportMenu = getExportsMenu(); menuBar.addItem(exportMenu); @@ -176,6 +171,34 @@ public class Headerbar extends Composite{ initWidget(mainLayout); } + + public void setMenuForVME() { + menuBar.removeItem(viewMenu); + menuBar.removeItem(sectionsMenu); + menuBar.removeItem(biblioMenu); + menuBar.removeSeparator(separator1); + menuBar.removeSeparator(separator2); + menuBar.removeSeparator(separator3); + menuBar.removeItem(exportMenu); + + vmeMenu = getVMEMenuEdit(); + menuBar.addItem(vmeMenu); + + menuBar.addSeparator(); + + MenuItem vmeMenuCreate = getVMEMenuFake("Create"); + menuBar.addItem(vmeMenuCreate); + + separator4 = menuBar.addSeparator(); + + MenuItem vmeMenuDelete = getVMEMenuFake("Delete"); + menuBar.addItem(vmeMenuDelete); + + menuBar.addSeparator(); + exportMenu = getExportsMenu(); + menuBar.addItem(exportMenu); + } + public void setMenuForWorkflowDocument(boolean canUpdate) { presenter.setMenuForWorkflowDocument(true); menuBar.removeItem(fileMenu); @@ -309,11 +332,33 @@ public class Headerbar extends Composite{ } }; - private MenuItem getVMEMenu() { + private MenuItem getVMEMenuFake(String fakeOption) { + MenuBar createMenu = new MenuBar(true); + + createMenu.setAnimationEnabled(true); + MenuItem toReturn = new MenuItem(fakeOption+" VME-DB", createMenu); + toReturn.getElement().getStyle().setWhiteSpace(WhiteSpace.NOWRAP); + + MenuItem item = new MenuItem(""+fakeOption+" VME", true, getNullCommand()); + createMenu.addItem(item); + createMenu.addSeparator(); + + item = new MenuItem(""+fakeOption+" VME General Measure", true, getNullCommand()); + createMenu.addItem(item); + item = new MenuItem(""+fakeOption+" Information Source", true, getNullCommand()); + createMenu.addItem(item); + item = new MenuItem(""+fakeOption+" Fishing footprint", true, getNullCommand()); + createMenu.addItem(item); + item = new MenuItem(""+fakeOption+" Regional History of VMEs", true, getNullCommand()); + createMenu.addItem(item); + return toReturn; + } + + private MenuItem getVMEMenuEdit() { MenuBar importMenu = new MenuBar(true); importMenu.setAnimationEnabled(true); - MenuItem toReturn = new MenuItem("Edit VME", importMenu); + MenuItem toReturn = new MenuItem("Edit VME-DB", importMenu); toReturn.getElement().getStyle().setWhiteSpace(WhiteSpace.NOWRAP); Command importVMEReport = new Command() { @@ -574,8 +619,8 @@ public class Headerbar extends Composite{ fileMenu.setAnimationEnabled(true); MenuItem toReturn = new MenuItem("File", fileMenu); - fileMenu.addItem("Open Report", cmd.openReport); - fileMenu.addItem("Open template...", cmd.openTemplate); + fileMenu.addItem("Open Report from Workspace", cmd.openReport); + //fileMenu.addItem("Open template...", cmd.openTemplate); fileMenu.addSeparator(); fileMenu.addItem("Save", saveReport); fileMenu.addItem("Save As ..", saveReportAs); @@ -583,7 +628,7 @@ public class Headerbar extends Composite{ // fileMenu.addItem("Import from FiMES XML", importFimes); fileMenu.addItem("Close Report", cmd.newTemplate); fileMenu.addSeparator(); - fileMenu.addItem("? Open User's Guide", openHelp); +// fileMenu.addItem("? Open User's Guide", openHelp); return toReturn; } diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java index 1bd220d..d1afb2e 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java @@ -127,7 +127,7 @@ public class Presenter { private CommonCommands commonCommands; private boolean menuForWorkflowDocument = false; - + private boolean isVME = false; /** * eventbus events handler @@ -193,7 +193,7 @@ public class Presenter { //refreshWorkspace(); break; case SAVED_OPEN: - // refreshWorkspace(); + // refreshWorkspace(); toolBoxPanel.showExportedVersion(event.getItemId(), event.getItemId()); break; default: @@ -277,13 +277,18 @@ public class Presenter { public void onFailure(Throwable caught) { dlg.hide(); } - public void onSuccess(Model result) { + public void onSuccess(Model result) { + if (isVME) { + header.setMenuForVME(); + header.enableExports(); + } dlg.hide(); if (result != null) { //there was one report open in session loadModel(result, true); header.enableExports(); - } else + } else{ commonCommands.newTemplate.execute(); + } } }); } @@ -300,7 +305,7 @@ public class Presenter { } public void showOpenOptions() { - wp.showOpenOptions(); + wp.showOpenOptions(isVME); } public void showLoading() { @@ -457,7 +462,7 @@ public class Presenter { return GWT.getHostPageBaseURL() + "../../"; } - + /** * remove the user-added components from the workspace, and from the model * @@ -651,7 +656,7 @@ public class Presenter { rtbar.setWidth("100%"); ReportGenerator.get().getToolbarPanel().add(deco); } - + /** * enable the format text toolbar for the given Rich Textarea passed as argument * @param d4sArea the enabled text area diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java index 5526d99..48b7146 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java @@ -6,6 +6,7 @@ import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; import org.gcube.portlets.user.reportgenerator.client.model.TemplateModel; import org.gcube.portlets.user.reportgenerator.client.targets.DoubleColumnPanel; import org.gcube.portlets.user.reportgenerator.client.uibinder.OpenOptions; +import org.gcube.portlets.user.reportgenerator.client.uibinder.OpenOptionsVME; import org.gcube.portlets.user.reportgenerator.client.uibinder.ShowLoading; import com.google.gwt.core.client.GWT; @@ -77,8 +78,11 @@ public class WorkspacePanel extends Composite { //showOpenOptions(); } - public void showOpenOptions() { - mainLayout.add(new OpenOptions(presenter)); + public void showOpenOptions(boolean isVME) { + if (isVME) + mainLayout.add(new OpenOptionsVME(presenter)); + else + mainLayout.add(new OpenOptions(presenter)); } public void showLoading() { diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java index 59acbfc..8cf4782 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java @@ -78,6 +78,10 @@ public interface Images extends ImageBundle { * @return . */ AbstractImagePrototype save(); + /** + * @return . + */ + AbstractImagePrototype db_save(); /** * @return . */ diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties index 4c17d1c..80a8777 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties @@ -33,9 +33,9 @@ medium = Medium large = Large xlarge = X-Large xxlarge = XX-Large -save = Save +save = Save Report in Workspace newdoc = New Template open_template = Open Template -open_report = Open Report +open_report = Open Report from Workspace importing = Import from Template forecolors = Text Color diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java index ba7267e..63796f2 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java @@ -172,6 +172,7 @@ public class RichTextToolbar extends Composite { private PushButton justifyCenter; private PushButton justifyRight; private PushButton save; + private PushButton saveDB; private PushButton newdoc; private PushButton open_template; private PushButton open_report; @@ -229,17 +230,30 @@ public class RichTextToolbar extends Composite { richText.addStyleName("hasRichTextToolbar"); if (basic != null) { - //add the new template button - topPanel.add(newdoc = createPushButton(images.newdoc(), strings.newdoc())); + if (! isVme) { + //add the new template button + topPanel.add(newdoc = createPushButton(images.newdoc(), strings.newdoc())); + } open_report = createPushButton(images.open_report(),strings.open_report()); //add the open report button topPanel.add(open_report); - //add the open template button - topPanel.add(open_template = createPushButton(images.open_template(),strings.open_template())); + if (! isVme) { + //add the open template button + topPanel.add(open_template = createPushButton(images.open_template(),strings.open_template())); + //add the save button + topPanel.add(importing = createPushButton(images.importing(), strings.importing())); + } //add the save button topPanel.add(save = createPushButton(images.save(), strings.save())); - //add the save button - topPanel.add(importing = createPushButton(images.importing(), strings.importing())); + if (isVme) { + topPanel.add(saveDB = createPushButton(images.db_save(), "Commit current in VME-DB")); + saveDB.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + Window.alert("Not currently available"); + } + }); + } if (! isVme) { topPanel.add(new HTML(" ")); @@ -412,11 +426,13 @@ public class RichTextToolbar extends Composite { } public void enableCommands(boolean enable) { - save.setEnabled(enable); - newdoc.setEnabled(enable); - open_template.setEnabled(enable); open_report.setEnabled(enable); - importing.setEnabled(enable); + save.setEnabled(enable); + if (newdoc != null) { + newdoc.setEnabled(enable); + open_template.setEnabled(enable); + importing.setEnabled(enable); + } } /** diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/db_save.png b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/db_save.png new file mode 100644 index 0000000000000000000000000000000000000000..40270768760e1eccd372a056ee767c3190280e88 GIT binary patch literal 4095 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 &NZtwIPie_JnJXPr{WV|U_yV7DKc?+6_xu)v Wvn#PLt)}nwR~4$Nt5U6G9sVyc{)_Jb literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/save.png b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/save.png index 3c004243b0bc04d93c8d83e412a421df31d3187e..c2953abaac9b25bd13f12c359f10fe9dd18f8610 100644 GIT binary patch literal 454 zcmV;%0XhDOP)R~9h?&fzgrR7Hr+5T5`DYSaM0xiMfu>g)*x zDgo61&|wi!A)`#N`diIUk48myaTwtT1d9M$Cxs{<;!I~JYBB+ywuOb^bGtU ztdEcoWB&HboWbtuPP&z<*Vj4Fk79-E{@Qr}0){eAp~hnX>lL6Z5Fw1g)X?{fvzvc& zA~^;ol_3YrY^Jo}Nmh($07*qoM6N<$f>}7mI{*Lx literal 674 zcmV;T0$u%yP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXfA z4hIM2NZ6DB00JUOL_t(I%hi-kYLr0`hM(%0iDshsM}jVbf}kLXi-39)U3dXKfg%W= zK#(Bl4cv&}-U}#h6c;f)&`{9b4{yCyUGT3j8wHuE z#g6#ea}0qrIM65-2tb&GB&PQ_I5E=(GtA5Ynj_$1M_hR#tl6M;s9b~#PZ70<6z(EI z6oCnrKfGh%dV^!fPmL9hf!#G{_E3Wx7Ypvj%w%F3smg&epdg+vF7rk++^!BYx&>PdP#;3$)riz6|MN-Nlzx zv0f+ZmH51p+TeXD znQe3P{1Vq5u0X5F)%y)zzFLP!ZhsOPf!D!m&*{DkaKX3NG+SqPo;H#M$ { + } + enum OpenMode {OPEN_REPORT, OPEN_TEMPLATE, UPLOAD } + + @UiField HTML editVME; + @UiField HTML createVME; + @UiField HTML deleteVME; + + @UiField HTMLPanel myPanel; + + private Presenter p; + + public OpenOptionsVME(Presenter p) { + initWidget(uiBinder.createAndBindUi(this)); + this.p = p; + } + + public HTMLPanel getMainPanel() { + return myPanel; + } + @UiHandler("editVME") + void onEditVMEClick(ClickEvent e) { + GWT.log("editVME"); + doAction(OpenMode.OPEN_REPORT); + } + + @UiHandler("createVME") + void onOpenTemplateClick(ClickEvent e) { + doAction(OpenMode.OPEN_TEMPLATE); + } + + @UiHandler("deleteVME") + void unUploadClick(ClickEvent e) { + doAction(OpenMode.UPLOAD); + } + + private void doAction(OpenMode mode) { + CommonCommands cmd = new CommonCommands(p); + switch (mode) { + case OPEN_REPORT: + p.showVMEImportDialog(); + break; + case OPEN_TEMPLATE: + Window.alert("Not yet available"); + break; + case UPLOAD: + Window.alert("Not yet available"); + break; + default: + break; + } + + } +} diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/OpenOptionsVME.ui.xml b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/OpenOptionsVME.ui.xml new file mode 100644 index 0000000..8f9595b --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/OpenOptionsVME.ui.xml @@ -0,0 +1,19 @@ + + + + + + + + + +
+ Edit VME + + Create VME + + Delete VME +
+ + \ No newline at end of file diff --git a/src/main/webapp/ReportGenerator.css b/src/main/webapp/ReportGenerator.css index 86b6176..3bec5e9 100644 --- a/src/main/webapp/ReportGenerator.css +++ b/src/main/webapp/ReportGenerator.css @@ -55,6 +55,10 @@ background: url('images/uploadReport.png') 55% 25px no-repeat; } +.optionDeleteVME { + background: url('images/deleteVME.png') 55% 25px no-repeat; +} + .exportPanel { margin: 5px 5px 5px 20px; border: 1px solid #e3e8f3; diff --git a/src/main/webapp/images/deleteVME.png b/src/main/webapp/images/deleteVME.png new file mode 100644 index 0000000000000000000000000000000000000000..732f7a8c7b451df8a31c5c565ad85fbf546793ed GIT binary patch literal 9435 zcmbVybx>T-w(bn>n&2{c2sSggLvZ)t?(PnQyF+kG2<{NvHG~i#xJ&Th65K91=lt$_ zf84sS>g}q%TlV_CCB3?;yZ4S#R+Pd-BS8ZI0GKk;;;JuY;NKes>E+okWIXax5W7ie zxv4o?xOp18m;*%398JtYGWN!n=Bnn#X5P-j<^li!yoI&8mYbG>JfEqfJ*)9w8CEZQ zrx!E;ARz4JWNd0{?glb3x3qQ;q&{iyrUqG?2~ulvDu5N7#LTU%rF~q?)qE7yO?_-l zdCjPWg+Kycd@ls{=5EFyFMB%&S3WO6>VNU_z1079vr&WoCE{i)Nd0f4v=o#YLfARDxw)A^P%s3{28Oahpezt>K6WS{7!3N)Mg5}9#ms_FRb28v zx?Wm>)K+e8PJC=^o}Qkpp6slSE|zQ%US8h698f6Biv)|Sw}YFp7mI@{%|8s{=B}nL z)=qBLjt-!|jK(I8?rwtAFP8q>1$!q2h5sgYaQ#o9UP8v^W$eTTVFk0<+yC|JU(&8_ zs^&ERo&akoK4l-)zRI>^kqCOX#N4e#O{Ar^jGl38a^c#>z6?>wi9o$p4Dv6LT>) zc5`%5cXYJ-Cj*qN9NipUtsI>|VrrZq1!GfdhrjK=!}D)%#m!x;JTe5n~1ZzXxP0TdaF`tQIVovG(WIv!Q(#O+K~<;!Q{QL zSjC8#7FZAJ&-6Awo*UE5XCjG{g|)kLd%{r9F%s7tevM}Dp|hq}-~^zh@Mt#K%WwoJ zO*x2WTuU!v1dfJuz6Iio*FW^rXg`eEb(8>zdvGz0UIDM#HLG+QQAv8uufv_CX=Cux z4ll`C8T6R;Uxo10DRxjcFCAU`bOvo~YCPe>4_hC-pq*Kii>@Vvc&-bfjn10!7U;^zbTzSrwx z_yG>q*zH5R3O&s91{CmHN3g}~M9V;4lWR3Wp>aTS%WtRMD9?ih{{ssKybKj35D|tf z2q(k6TzCp&-J@NDmQ!s`DGdmv=s7t)PRq;76Yz-q0(qb~(NWY}%S9g;haXxnhJ&`v z%+1M}n{Tshp40haWd+L11SmoR=MFS{SC9E!{p#nO>;{L1hKfo{-)wI_!n$MQ;V^h=9g<}xS zAj9vUbWmp0MZmcIW`hW|lBfGK6>qgvG&LD05*S!4zT*pbZXV6*6?bk_Ug|bG%>Rt@eS-s9wx?soQmsEYm}xk_Jk^v^EL3- z&B#Fd^xq{m%*AReL68Ibp0YR_R&5PWruoORF7K%U$k$`{zia&#`Lc}0qxa{#{Ot|e2NJbQ&T3Wmm z%N%4ORzh8&!BjFmZJ3=Sx_AC;@#d%1L`I^&7$&CvqVa` z;*&P>4m_5IeIx1KcZ^H>Q9qfX2vjJD6l5zF%~Rn|=8p+#B_v4s+2Re6%yGviRThrR z;{TkO_!PKaWps^?`z_RS)Y*2fI`_S6;U?nzFk&cstH^s!?(|4U!c*-iN6k^oNdz;! zYZo-@4!2Xg_$%T@p3Q~T@ZfB}V4|d_f>}}3K zBJ>Qofqbkzk`0FF-&2^(Z{E}@JZSGCx_Nl;EfRuBk$4hshH>KKxQAyE#&qzVnCvBw zmZ+9 zKIyjMk8Y7e;D(ec>-X>EBTg-oZ+Hg*@`#4rF#oSafsC5(=@u@}N@%(?RxDF)zSOfB z6{~cwY?kP(ub7dP~* zQNXm07drWyi34NCzy8e1$|9zLmBUx}f%QLY*2u1JNT9CQpku6?BVmW0uIC_9B(zxR z@bH8e=*1EXr*rb9UGO6y3W10$|}a7 z7)cs>9lS^D1{7PMZK89c`8rp^2+A7LMeN9$ASFi9;J^LP&T!=YLv-+C=87c6W#wIOC(9NU3uh51A!S5?Rf>0okssV6a z3XI5s4?Q9HMOHLA3WYs&xN&kwpQW*=);SqF_yQ65bI#IBKhn(Uaq$mf;}&*3wN2}H zRYpp13Mq1qP4N8GQ@_B4hMvte{)xFH@vGttnnao=5XegvHbcovpnzX3xh*|8{BTCj zUwG8CRA{rr#W>@foCyUwUo>K@QSdm4e9~V$tI}<@C~9ER?ac$DOx^8dtHPBzhAvWs zwPA@adb`UqAEwn`%O>A;=k0Ir*p_=f&V5Hv86^sz$JGnb30ia6^vC9e=ji1z?5AZ8 zmqZCZV_kJmXKvrkBZdIg@{(NPhgo&1VzXk%Sj3Q*kVB> zzZK-6@4lDV5P}=sbPj8;HO8wI!t;4 zSOs07&`u&El?&&fQE;r4UYo&!tVP$5ECELYs3`;)D9YCXGd_ z<-2lwe9Gh|+)@FAf`p!YLY7No*|Ic`F|jQ}JpLXqTLN8gODXs@V(l-7y9e?6*){oa zkf^cb-n(#)&xyD#9u#20aZ&on^#CN-U#2f{e0I{ptjo(Ir{-3&J83w z?MH0eZy`z&64|$SL?>j51Th{W=OSr(q3K@ev}cxL6`8d}a5oP6Z7M?hn&2Yx4s?oYCx z90;|(-u4*LsMzfi+s*UsH_Czc=Vauwc{CXCVj4yUNArSv#f!aT;*A+A5pg%NmiO z1GhRja6ub@j-snxQDQ-NS!$3E9qhv8=CLA;ISKLgYrLRQN@N;knpYD)i0Biec8Dd3 z_8_5wa%fIZ=bDD8t4jW|HUuou6^K|NK<*#mJOIdm+n3-?+%*}b7QcrUKa{TPH<3`J zjj68@e>h_YvhM`KX05RTJry@EHcx{kPoL{Yv$tsy1nJ{I7Q}^1X59LVUAp)8aLUg# zEd-+aOx2GMPmhxT$pwVeE|j6korGUG5{t_%Zm%Gb-6`?_1!c5xrib&9$@||*a_;&o z3c+V=glyl1$2s76j?Q@%9$0Zcz2cfd{!JQAOx>%1CIu9%y3+sJyeo*)0y$1Nsques zZjFKQp;&cUDi93P$G=%Y{K@(N(-#Y=Y`=FP9%vjV@bd_RE+N6Uw z$b;mq>cU;^e72h{d$cQ;RAV2>y86kqNtLLEne*0OAAJ$das?8c0L^4;I>E8{)Wk)AI<7svI?GX1kP?DRX z%(^*MlDHSRzPZX96B#8i{>9e|pyin0DvIHnD=K0x=x++sq0vI!HHjkZB_2mFE(>~l z6@ z#U6D>CNC!w5B`8-M7yT@aSle%4aUWJO5(S|eFl}Gy-jwaevwqHsWuZ4mFX>D0gDpsVv9TqQ%!zCv)I)u9bKN_-ba9a{$1-O4>w>W$drL(t zBEkC+heL-~URQiby2vIQILrdn& zwVPq3@AuvJxqd{|1}Lm1pOE6-zE+q^ycTB(9Dl#wTnD8}6!Bd&4s5<`L=PiG>9G8a@_;;#<`k@XOU1)?mhX5MXEXW z03)BXBpI8#}6|G5QvsnUw}DV#Jmo+q?v6L-L>!lsweJrO$haC>RWDD-!9{+0Rw|PkQrKIW}`110`3p|0rQCy65 zgtG-Qn_Qd?j#KvCcG!7gWk{%UTm_#%r_~O3>5cFzW#|C*ySO|-Uyt*fx20$2zQ;)` zi)0@}+9Ye|^~{>nUcry4pGV>q>yMz#zJ54QcfsqaH5yJXwC{F*U+WEBf`Ucv>r7R# zG1rTxZSlYAAmW!65Z2Z;dHh~n)S=gEW8XpI(^xTWvy^8K^UmFO_*$O1(s4rbZuZ$% zK{Q-ues3jWklC>RTdY@G)^ws%pjf?^%s^gX*Km*s}ZrvEI#Vd8gc3bISuzEhi|p4i(@?y?8Ws zWQ*x$=}-I&bDujYy9HcM!@Y%k&We0~uI2Aqp3ixhAS1X0`q+2l#q|*sfVGHn!zQ~0 z%+d0?-MjhE3Ez#SHo^8dUx%Ouw~Uo4-b%VX zb{Qif1)^Q1$Q9dca>@H#r?Gr@UwIr7{tk~$sAvR7rUoDUYQLctf@%TiJ@J3xUM!V~f`Q`sgbyQl&ToutC&_Mq&N2k>}-ahIrSf7<2(JY)E$@T9gmkveuz?W05bzyL*8M+ zG0c2{urE$SZZw`JfCl`dXG zr33^wmTsF76Rre{hyZtH(7+o*?^X@~a?9rYv)6S`C+=DRw#RKQp+TZ=&`&`yvKZ*y z>wpx|1IWSpgoY4CPzq`WYT0}TZ`s<{@Kih~ai*4>K-AbVbrGtQfd^|^u8KC}W91=dou9tmr`|~fr@pZq-`8CSv+FFG2S3S{hqkZ-51-bAn6Brz zBeTPbKn{qUvUb*KSK`ZeY;xV@L3BPM4Y!m}PJOoFr=2EEd15INqpejuLDyJE%9;iS zN$ePj`zdufAeef(Pu*U~Oc(2jVCKC`W;AK3c{`P^DHa!OPb}K`>iMd<9@7Ylu}%zd zuE?$EkD_i2jg$>_u`)9z!7)dh05-FA@p<`Zi1zl|j4eKqbH_b90zNLC7qJZkaRNSw zlIne-6gOv&9073VhGyAe(OpcC{p1g%-&^})>4OhAQY}zhNTIT~l_pyJK!GJw|ux6eV8uC%(HKil1Y*W3bk#2XWM z^bK6rT7`P(vWre5*mL|+&n6~SKFiJ8%}eQRUX31^U)}|pI^jr6zk48^#riSEZb(Yj zkvD|_CO^x~D`Cf8cfg4GF=?&%%gLH>{LmrgRWK6K*Szv3$hn5 zB12>{>+-;yofD{h4<-Vm?3jLIs|x7;X)tA$v6b)p&e zX_g;MXFW}T3vNS~|H;MY(`0E?%3`@9Vmt5oDu%syqB$3!RIgvR!;ZboU;fLcbQ5x@ zqBr$kcQX2@nMbV1CE)(9h%$7PCc`}CRsY;8I$ z-o_k9X9i~j#}z&nu!)HpY%Rv5DNBBjX1e=w3=;}oS&l|~eZn&{=jjB(*~`a8s?{YJ zs|K+%FDkl?S2Kvd`!XNme?^!0s!2E9W>`f5^nv+EF%CXdU$;XmGsdmjx3dl&zd7cZ_8=b$ed&By;mCwZW?;Yq%a6O~U~+!-&(`80!s)<3BzaY_brJ)=5>G#Y zKL(b&6ktu-0}z;ahBEsPM2(MK#t)Y8n$tf~gaG!TJ_x>ia{8vC2V<)0&QE>?X)j)Z zU4~XW))c`+R4l~qdA4~=0OrWXp-eQnC}C7mLynHY@Ht%G0GHnhM(3B(O02+Q-&MM_Cj9_ndvlG#{ zIOUn2J`;Wr^-;|C*jkk@8lT)A*`~~c>F7kqZ1bt`AD6_~TR^fvO`xq}_o;nh@$pZ^ zk`ny7l2X3$P0i1l?BDRp${R{Ti>M#Z{QPG3hTh|T8H7Rk zd}ulO#lPK)%T5}-#OZCDH-@~aTFS#zb2kfrz&UE@^ebscRw?&t}&^veD>7~eD2(FpOcH80Y;OF!WxMNnkfb=Ug}*8wuF z&*!wUBfdBNWmZtm zP_R_9XE`47HO8QoT0%*Hst6ES9So;?O~7_EdKV(qeZ|T9*iR|@K@fe)T=92ZhJ|`s z4N%G{=Z9f?TRdfl&t-t~p;tYY*CNPiG>bF(6hRH0kTu8eP_8~XsVahDfT^NjR_FG# z-$kcHDdv>_yVElaCvxx;B3X|J<;yX9$88oKzL`xr%l5bcO~3F>&G9}m(-2WYvNi*oqTI ze}DX`er(xq-#mN?52oe`lV>UZ{`O%=cYlU{(CXn$k!su*c?I1q~Il# zjTR%4kenNdDe1Z7PCtZfFmE4msNM4PwiQq=WoRpMfygkQ{!P#Q$8PL|px49xMh&}4 zIbN`nRHo-BQ#g+=Y}#z-`O&yHrj_Fu^`zEv5xCzvDo)y!;tv<;5J9tW-G8_Q$vSez;m)SrHctKRGoW5gDAer1zm-9&^Ljm8zVLfeugVP#w^(v3r z{0F~f8hn{YbMy24Om<{LNBc+3<&{8g#H_+s$hGVh+}bmCx!7iwfx#;+J?c7vB28Oo zL)+iRa_dpi^{}Z4RBW`1*m+9#Z$?B=n(4Eaa8!k?(7BV^B4^RU_Z*nu_txWN1ft^a z6lCu(*NqB{QhTYw_^tAIeA0}~q@PGF$0>Y&{m69ug9OKdDDs%xN6Rg>)L%8;ms{P> zK%s&{(Q1j0@)gR2tbs?=bzdUP7}}Z9Pw}Z(kdyPRA~-e|P$i9>5UW$T*bp{E{`U13 z$!eaRNixUtyZs3$t`U&Zg&{~~(RDLpQhU}dh6|C9| zVdn`IEuC4HUc&IHo(zBwuC5EOTCZJTEjFQYuiV78anh2O;fnnjwciw**(o#?hkK$0A6ybzTcz=ZJTGfsYjeN7Ra-Cef` zxyf|FOrvqZ=cRkL7z zz$6yX_cN(NqrbBpRZ6^g=1B=upuFqFXFl0L8C6SXjqCJ&dI;#ATDa{uqMba+w6c_| zNa3}8^(AA-epx1~IHBWybkxn2hC~C(PE{YXg;*GDY z=(Y_@Ty2uR#@x}D2ejyHwnF@%*2=whi znMNp}JQXRVtbYa5(dSR6Z&|cn%k+H1{ED(`#QB^&oi&Wj&7;fn{O)o$3mMsP@6Ua9 z83)Q0HP*PD#{h!acZCr|$=dhZ92}f7kN8T`hPu4e@wf+OX(C+(by zK{SsxS1&`@*QkjM7WCSisQQ$r|*-x&{(jT#~xZuWu!A@6ko@Tl>Je~+Et7&pen;B*p)z8JU zi@c3Vm8%Ps*Gsv?(3qLA$@l2(1^BgPF=8$?+Rhb~wD@o{N#(H^5D=%?FA|-k;0M4+2*o z_=VK81sEbE#|F;omg-E0VE$X*lA39yxHRc0z9z0&jPH!GiRJ;%msmO;y8-Y3s2hdf UX)`GC@9#!35{ly0?~H=~3$vht2mk;8 literal 0 HcmV?d00001