Author: DavidK Date: 2010-02-24 15:11:32 +0100 (Wed, 24 Feb 2010) New Revision: 1848 Modified: trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/PlanningModalBean.java trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/plug/PlanningModalPresentationBean.java trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml trunk/server/webServer2/WebContent/secured/plug/planningModalPresentation.xhtml trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml Log: planning bugs fixed Modified: trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/PlanningModalBean.java =================================================================== --- trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/PlanningModalBean.java 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/PlanningModalBean.java 2010-02-24 14:11:32 UTC (rev 1848) @@ -246,11 +246,20 @@ prepareFormDates(modifying); + // prepare list of permitted contents + formPermittedTypes = new ArrayList<SelectItem>(); + for (ContentType type : permittedTypes) { + String labelKey = MessageUtils.getElvysPlanningTypeLabelPrefix()+type.getType(); + String labelValue = MessageUtils.getLabel(labelKey); + formPermittedTypes.add(new SelectItem(type.getType(),labelValue)); + } // MODIFYING -> create temp contents by contents in Rectangle if (modifying) { // set content type by existing planning formContentType = rect.getFrameContent().getContentType(); + // string representation of selectedContentType + selectedTypeOfPlanning = formContentType.getType(); // set content by existing planning formerTimeline = rect.getOrigTimeline(); // set appropriate inner bean for managing view @@ -283,13 +292,7 @@ - // prepare list of permitted contents - formPermittedTypes = new ArrayList<SelectItem>(); - for (ContentType type : permittedTypes) { - String labelKey = MessageUtils.getElvysPlanningTypeLabelPrefix()+type.getType(); - String labelValue = MessageUtils.getLabel(labelKey); - formPermittedTypes.add(new SelectItem(type.getType(),labelValue)); - } + } @@ -330,35 +333,43 @@ nowDate = cal.getTime(); } - - /** - * Prepares modal planning component after changing type of planning. - * @param aev action event - not used + * find corresponding ContentType for given type String + * @param contentType representation value of contentType + * @return ContentType */ - public void prepareOnChangeType(ActionEvent aev) { - // at this time the selectedTypeOfPlanning has been set from the xhtml - if (selectedTypeOfPlanning == null || selectedTypeOfPlanning.equals("")) { - log.error("selectedTypeOfPlanning null"); - throw new RuntimeException("selectedTypeOfPlanning null"); - } - + private ContentType findCorrespondingCT(String sContentType) { + ContentType ct2ret = null; + // choose corresponding contentType - boolean foundCorresponding = false; for (ContentType ct: permittedTypes) { - if (selectedTypeOfPlanning.equals(ct.getType())) { - formContentType = ct; - foundCorresponding = true; + if (sContentType.equals(ct.getType())) { + ct2ret = ct; break; } } - if (!foundCorresponding) { + if (ct2ret == null) { String message = CommonUtils.prepareErrorMessage("not found corresponding", "selectedTypeOfPlanning", selectedTypeOfPlanning); log.error(message); throw new RuntimeException(message); } + return ct2ret; + } + + /** + * Prepares modal planning component after changing type of planning. + * @param aev action event - not used + */ + public void prepareOnChangeType(ActionEvent aev) { + // at this time the selectedTypeOfPlanning has been set from the xhtml + if (selectedTypeOfPlanning == null || selectedTypeOfPlanning.equals("")) { + log.error("selectedTypeOfPlanning null"); + throw new RuntimeException("selectedTypeOfPlanning null"); + } + + formContentType = findCorrespondingCT(selectedTypeOfPlanning); // find corresponding inner bean try { Modified: trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/plug/PlanningModalPresentationBean.java =================================================================== --- trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/plug/PlanningModalPresentationBean.java 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/planningrel/plug/PlanningModalPresentationBean.java 2010-02-24 14:11:32 UTC (rev 1848) @@ -82,7 +82,7 @@ PdfPresContent pc = (PdfPresContent) frc; formData = new PdfPresContent(); formData.setFile(pc.getFile()); - formData.setIntervalRfrsh(pc.getIntervalRfrsh()); + formData.setIntervalRfrsh(pc.getIntervalRfrsh()/1000); formData.setPageList(pc.getPageList()); formData.setContentType(pc.getContentType()); } Modified: trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties =================================================================== --- trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties 2010-02-24 14:11:32 UTC (rev 1848) @@ -103,7 +103,7 @@ company.edit.form.address=Adresa company.edit.form.city=M\u011Bsto company.edit.form.zipCode=PS\u010C -company.edit.form.address.tooltip=Zadejte adresu ve tvaru ulice a \u010d\u00edslo popisn\u00e9 +company.edit.form.address.tooltip=Zadejte adresu ve tvaru ulice a \u010D\u00EDslo popisn\u00E9 company.permtypes.title=Nastavov\u00E1n\u00ED povolen\u00FDch typ\u016F pl\u00E1nov\u00E1n\u00ED company.permtypes.form.title=Nastavov\u00E1n\u00ED povolen\u00FDch typ\u016F pl\u00E1nov\u00E1n\u00ED @@ -276,14 +276,14 @@ elvys.list.table.assigncategory=P\u0159i\u0159azen\u00ED kategori\u00ED pl\u00E1nov\u00E1n\u00ED pro dan\u00FD kiosek elvys.list.table.activate=Aktivovat elvys.list.table.deactivate=Deaktivovat -elvys.list.table.cannotactivate=Kiosek, kter\u00FD nem\u00E1 p\u0159i\u0159azenou \u017E\u00E1dnou kategorii, nem\u016F\u017Ee b\u00FDt aktivov\u00E1n. elvys.list.table.companyname=Jm\u00E9no spole\u010Dnosti elvys.list.table.city=M\u011Bsto elvys.list.table.adress=Adresa elvys.list.table.editelvys=Editace kiosku elvys.list.table.doplan=Pl\u00E1nov\u00E1n\u00ED -elvys.list.table.schedule=Pl\u00E1nov\u00E1n\u00ED dat na obrazovku kiosku -elvys.list.table.cannotschedule=Kiosek nem\u00E1 zvolenu \u017E\u00E1dnou kategorii. P\u0159i\u0159a\u010Fte pros\u00EDm kiosku jednu nebo v\u00EDce kategori\u00ED. +elvys.list.table.schedule=Pl\u00E1novat data na obrazovku kiosku +elvys.list.table.cannotschedule=Nelze pl\u00E1novat data na tento kiosek. Nem\u00E1 zvolenu \u017E\u00E1dnou kategorii. P\u0159i\u0159a\u010Fte pros\u00EDm kiosku jednu \u010Di v\u00EDce kategori\u00ED. +elvys.list.table.catcCount=Kategorie elvys.list.modal.layouts.header=Volba rozvr\u017Een\u00ED obrazovky elvys.list.modal.layouts.present.header=Zvolen\u00E9 rozvr\u017Een\u00ED obrazovky elvys.list.modal.layouts.daylayout=Denn\u00ED @@ -299,7 +299,6 @@ elvys.list.body.delete.tooltip.no=Ne elvys.list.body.delete.tooltip.yes=Ano elvys.list.body.delete.tooltip=Odstranit kiosek ze syst\u00E9mu -elvys.list.table.catcCount=Kategorie elvys.edit.form.title.create=Nov\u00FD kiosek elvys.edit.form.title.modify=Upravit kiosek Modified: trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml 2010-02-24 14:11:32 UTC (rev 1848) @@ -317,7 +317,7 @@ <!-- CLOSE BUTTON --> <h:panelGroup style="float: right; width: 50%;"> - <h:form id="CloseButtonForm" style="overflow: auto;"> + <h:form id="FilePlanningsModalForm" style="overflow: auto;"> <!-- CLOSE BUTTON --> <a4j:commandButton id="elvysSettingCloseButton" Modified: trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml 2010-02-24 14:11:32 UTC (rev 1848) @@ -66,7 +66,7 @@ <!-- CLOSE BUTTON --> <h:panelGroup style="float: right; width: 50%;"> - <h:form id="CloseButtonForm" style="overflow: auto;"> + <h:form id="#{modalWinId}_form" style="overflow: auto;"> <!-- CLOSE BUTTON --> <a4j:commandButton id="elvysSettingCloseButton" Modified: trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml 2010-02-24 14:11:32 UTC (rev 1848) @@ -142,10 +142,15 @@ <!-- OPERATIONS BUTTONS --> <rich:column width="150px"> + + <f:facet name="header">#{lbl['elvys.list.table.operations']}</f:facet> <div class="list-operations-main"> - <h:panelGroup rendered="#{user.compStr!='superadmin'}"> - <div class="list-operations-item"> + + <!-- PLANNING --> + <h:panelGroup + rendered="#{user.competency.canPlan}" + styleClass="list-operations-item"> <h:commandButton id="PlanDocumentsButton" rendered="#{record.catCount > 0}" @@ -163,89 +168,86 @@ <rich:toolTip for="CannotPlanDocuments" direction="bottom-left"> <h:outputText value="#{lbl['elvys.list.table.cannotschedule']}"/> </rich:toolTip> - </div> </h:panelGroup> + <!-- ASSIGN CATEGORY --> + <h:panelGroup + rendered="#{user.competency.canManageCategories}" + styleClass="list-operations-item"> + <a4j:commandButton + id="AssignCategoryButton" + image="/images/icons/category-assign.gif" + action="#{catDefAssignStep1Bean.prepare}"> + <f:setPropertyActionListener value="#{record.elvys}" target="#{catDefAssignStep1Bean.updatedElvys}" /> + </a4j:commandButton> + <rich:toolTip for="AssignCategoryButton" direction="bottom-left"> + <h:outputText value="#{lbl['elvys.list.table.assigncategory']}"/> + </rich:toolTip> + </h:panelGroup> - <h:panelGroup rendered="#{user.compStr!='user'}"> - - <div class="list-operations-item"> - <!-- Delete Elvys --> - <a4j:commandButton id="DeleteElvys" - reRender="DeleteElvysModalContent" - oncomplete="Richfaces.showModalPanel('DeleteElvysModal',{left:300, top:300})" - image="/images/icons/delete.gif"> - <f:setPropertyActionListener value="#{record.elvys}" - target="#{elvysesBean.selectedElvys}" /> - </a4j:commandButton> - <rich:toolTip for="DeleteElvys" direction="bottom-left"> - <h:outputText value="#{lbl['elvys.list.body.delete.tooltip']}" /> - </rich:toolTip> - </div> + <!-- DELETE ELVYS --> + <h:panelGroup + rendered="#{user.competency.canManageElvyses}" + styleClass="list-operations-item"> + <a4j:commandButton id="DeleteElvys" + reRender="DeleteElvysModalContent" + oncomplete="Richfaces.showModalPanel('DeleteElvysModal',{left:300, top:300})" + image="/images/icons/delete.gif"> + <f:setPropertyActionListener value="#{record.elvys}" + target="#{elvysesBean.selectedElvys}" /> + </a4j:commandButton> + <rich:toolTip for="DeleteElvys" direction="bottom-left"> + <h:outputText value="#{lbl['elvys.list.body.delete.tooltip']}" /> + </rich:toolTip> + </h:panelGroup> + <!-- EDIT ELVYS --> + <h:panelGroup + rendered="#{user.competency.canManageElvyses}" + styleClass="list-operations-item"> + <h:commandButton + id="EditElvysButton" + image="/images/icons/edit.png" + action="#{elvysEditBean.prepareUpdateElvysForm}"> + <f:setPropertyActionListener value="#{record.elvys}" target="#{elvysEditBean.selectedElvys}" /> + </h:commandButton> + <rich:toolTip for="EditElvysButton" direction="bottom-left"> + <h:outputText value="#{lbl['elvys.list.table.editelvys']}"/> + </rich:toolTip> + </h:panelGroup> - <div class="list-operations-item"> - <!-- Edit Elvys --> - <h:commandButton - id="EditElvysButton" - image="/images/icons/edit.png" - action="#{elvysEditBean.prepareUpdateElvysForm}"> - <f:setPropertyActionListener value="#{record.elvys}" target="#{elvysEditBean.selectedElvys}" /> - </h:commandButton> - <rich:toolTip for="EditElvysButton" direction="bottom-left"> - <h:outputText value="#{lbl['elvys.list.table.editelvys']}"/> - </rich:toolTip> - </div> - - <div class="list-operations-item"> - <!-- ASSIGN CATEGORY --> - <a4j:commandButton - id="AssignCategoryButton" - rendered="#{user.compStr!='superadmin'}" - image="/images/icons/category-assign.gif" - action="#{catDefAssignStep1Bean.prepare}"> - <f:setPropertyActionListener value="#{record.elvys}" target="#{catDefAssignStep1Bean.updatedElvys}" /> - </a4j:commandButton> - <rich:toolTip for="AssignCategoryButton" direction="bottom-left"> - <h:outputText value="#{lbl['elvys.list.table.assigncategory']}"/> - </rich:toolTip> - </div> + <!-- ACTIVATE / DEACTIVATE ELVYS --> + <h:panelGroup + rendered="#{user.competency.canManageElvyses}" + styleClass="list-operations-item"> - <div class="list-operations-item"> - <!-- DEACTIVATE ELVYS --> + <!-- DEACTIVATE --> + <h:panelGroup rendered="#{record.elvys.active}"> <a4j:commandButton - id="DeactivateButton" - rendered="#{record.elvys.active}" - reRender="listOfElvyses" - image="/images/icons/deactivate.png"> + id="DeactivateButton" + reRender="listOfElvyses" + image="/images/icons/deactivate.png"> <f:setPropertyActionListener value="#{record.elvys}" target="#{elvysesBean.selectedElvys}" /> <f:actionListener type="cz.elvys.webServer.beans.ElvysesCompanyBean$DeactivateElvysListener"/> </a4j:commandButton> <rich:toolTip for="DeactivateButton" direction="bottom-left"> <h:outputText value="#{lbl['elvys.list.table.deactivate']}"/> </rich:toolTip> - </div> + </h:panelGroup> - <div class="list-operations-item"> - <!-- ACTIVATE ELVYS --> + <!-- ACTIVATE --> + <h:panelGroup rendered="#{!record.elvys.active}"> <a4j:commandButton - id="ActivateButton" - rendered="#{!record.elvys.active and record.catCount > 0}" - reRender="listOfElvyses" - image="/images/icons/activate.png"> + id="ActivateButton" + reRender="listOfElvyses" + image="/images/icons/activate.png"> <f:setPropertyActionListener value="#{record.elvys}" target="#{elvysesBean.selectedElvys}" /> <f:actionListener type="cz.elvys.webServer.beans.ElvysesCompanyBean$ActivateElvysListener"/> </a4j:commandButton> <rich:toolTip for="ActivateButton" direction="bottom-left"> <h:outputText value="#{lbl['elvys.list.table.activate']}"/> </rich:toolTip> - <!-- CANNOT ACTIVATE ELVYS --> - <h:graphicImage id="CannotActivate" url="/images/icons/activate.png" rendered="#{!record.elvys.active and record.catCount == 0}"/> - <rich:toolTip for="CannotActivate" direction="bottom-left"> - <h:outputText value="#{lbl['elvys.list.table.cannotactivate']}"/> - </rich:toolTip> - </div> - + </h:panelGroup> </h:panelGroup> </div> </rich:column> Modified: trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml 2010-02-24 14:11:32 UTC (rev 1848) @@ -22,9 +22,11 @@ <br/> <!-- dynamic text size --> - <elvys:label id="DynamicPlanningTextSize" - label="#{lbl['elvys.plan.modal.form.chosendynamicsize']}" - tooltip="#{lbl['elvys.plan.modal.form.chosendynamicsize.tooltip']}"/> + <a4j:outputPanel ajaxRendered="true"> + <elvys:label id="DynamicPlanningTextSize" + label="#{lbl['elvys.plan.modal.form.chosendynamicsize']}" + tooltip="#{lbl['elvys.plan.modal.form.chosendynamicsize.tooltip']}"/> + </a4j:outputPanel> <rich:inputNumberSlider id="DynamicPlanningTextSize_input" minValue="10" maxValue="100" step="10" showInput="true" value="#{planningModalDynamicBean.formData.size}" Modified: trunk/server/webServer2/WebContent/secured/plug/planningModalPresentation.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/plug/planningModalPresentation.xhtml 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/WebContent/secured/plug/planningModalPresentation.xhtml 2010-02-24 14:11:32 UTC (rev 1848) @@ -41,10 +41,12 @@ </h:panelGroup> <br/> - <!-- dynamic text size --> - <elvys:label id="PresentationPlanningInterval" - label="#{lbl['elvys.plan.modal.form.chosenpresentation.interval']}" - tooltip="#{lbl['elvys.plan.modal.form.chosenpresentation.interval.tooltip']}"/> + <!-- INTERVAL OF PRESENTATION --> + <a4j:outputPanel ajaxRendered="true"> + <elvys:label id="PresentationPlanningInterval" + label="#{lbl['elvys.plan.modal.form.chosenpresentation.interval']}" + tooltip="#{lbl['elvys.plan.modal.form.chosenpresentation.interval.tooltip']}"/> + </a4j:outputPanel> <rich:inputNumberSlider id="PresentationPlanningInterval_input" minValue="#{planningModalPresentationBean.intervalSliderMin}" maxValue="#{planningModalPresentationBean.intervalSliderMax}" Modified: trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml 2010-02-24 14:03:14 UTC (rev 1847) +++ trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml 2010-02-24 14:11:32 UTC (rev 1848) @@ -24,9 +24,11 @@ <br/> <!-- text font size --> - <elvys:label id="TextPlanningTextSize" - label="#{lbl['elvys.plan.modal.form.chosentextsize']}" - tooltip="#{lbl['elvys.plan.modal.form.chosentextsize.tooltip']}" /> + <a4j:outputPanel ajaxRendered="true"> + <elvys:label id="TextPlanningTextSize" + label="#{lbl['elvys.plan.modal.form.chosentextsize']}" + tooltip="#{lbl['elvys.plan.modal.form.chosentextsize.tooltip']}" /> + </a4j:outputPanel> <rich:inputNumberSlider id="TextPlanningTextSize_input" minValue="10" maxValue="100" step="10" showInput="true" value="#{planningModalTextBean.formData.size}" />