[elvystrac] r1888 - CatDef list changed to component, list styles upgraded,..
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Thu, 25 Feb 2010 22:17:53 +0100
Author: DavidK
Date: 2010-02-25 22:17:53 +0100 (Thu, 25 Feb 2010)
New Revision: 1888
Added:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListComponentBean.java
trunk/server/webServer2/WebContent/js/components/category/catDefListComponent.js
trunk/server/webServer2/WebContent/secured/components/category/
trunk/server/webServer2/WebContent/secured/components/category/catDefListComponent.xhtml
trunk/server/webServer2/WebContent/styles/components/category/catDefListComponent.css
Removed:
trunk/server/webServer2/WebContent/js/components/category/categoryDefinitionListComponent.js
trunk/server/webServer2/WebContent/styles/components/category/categoryDefinitionListComponent.css
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefEditBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
trunk/server/webServer2/JavaSource/cz/elvys/webServer/utils/faces/BeanManager.java
trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml
trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml
trunk/server/webServer2/WebContent/secured/categrel/listOfCatDefs.xhtml
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
trunk/server/webServer2/WebContent/styles/components/file/fileListModalComponent.css
trunk/server/webServer2/WebContent/styles/elvys-template.css
trunk/server/webServer2/WebContent/template/elvys-template.xhtml
Log:
CatDef list changed to component, list styles upgraded,..
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefEditBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefEditBean.java
2010-02-25 20:46:18 UTC (rev 1887)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefEditBean.java
2010-02-25 21:17:53 UTC (rev 1888)
@@ -184,7 +184,7 @@
// everything went great, go on..
invalidateForm();
CatDefListBean bean = BeanManager.getCatDefListBean();
- return bean.prepareList();
+ return bean.navigateToShowListOfCatDef();
}
}
@@ -223,7 +223,7 @@
// everything went great, go on..
invalidateForm();
CatDefListBean bean = BeanManager.getCatDefListBean();
- return bean.prepareList();
+ return bean.navigateToShowListOfCatDef();
}
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListBean.java
2010-02-25 20:46:18 UTC (rev 1887)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListBean.java
2010-02-25 21:17:53 UTC (rev 1888)
@@ -1,67 +1,23 @@
package cz.elvys.webServer.beans.categrel;
-import java.util.List;
-
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
-
import org.apache.log4j.Logger;
-import cz.elvys.commons.utils.CommonUtils;
-import cz.elvys.webServer.HIBgen.Category;
-import cz.elvys.webServer.HIBgen.CategoryDefinition;
import cz.elvys.webServer.utils.faces.BeanManager;
import elvys.server.bl.Fact;
import elvys.server.bl.categrel.CategoryBL;
public class CatDefListBean {
- // messages
- private static final String CANNOT_PREPARE_LIST = "Error occured when
preparing list of category defintinions";
- private static final String CANNOT_REMOVE_CATEGORY = "Couldn't remove
the category definition..";
- private static final String CANNOT_PREPARE_DELETE_CAT = "Couldn't
prepare deletion of the category..";
-
// static fields
private static final Logger log;
// form fields
- private List<CategoryDefinition> list;
- private CategoryDefinition selectedToDelete;
// other fields
- private Boolean highDeleteWarning = true;
- private Integer deleteFormStep = 1;
CategoryBL cbl;
- public List<CategoryDefinition> getList() {
- return list;
- }
- public CategoryDefinition getSelectedToDelete() {
- return selectedToDelete;
- }
- public void setSelectedToDelete(CategoryDefinition selectedToDelete) {
- this.selectedToDelete = selectedToDelete;
- }
- public Boolean getHighDeleteWarning() {
- return highDeleteWarning;
- }
- public void setHighDeleteWarning(Boolean highDeleteWarning) {
- this.highDeleteWarning = highDeleteWarning;
- }
-
- public Integer getDeleteFormStep() {
- return deleteFormStep;
- }
-
- public void setDeleteFormStep(Integer deleteFormstep) {
- this.deleteFormStep = deleteFormstep;
- }
-
-
-
static {
log = Logger.getLogger(CatDefListBean.class);
}
@@ -70,89 +26,23 @@
}
+
+
+
/**
- * Prepares UC
+ * Navigates to show the UC
* @return navigation string
*/
- public String prepareList() {
- Integer compId = BeanManager.getUser().getCompanyID();
-
- try {
- list =
cbl.listCatDefinitionsOfCompanyMakeSession(compId);
- } catch (Exception e) {
- String message = CommonUtils.prepareErrorMessage(
- CANNOT_PREPARE_LIST, "companyId",
compId);
- log.error(message,e);
- throw new RuntimeException(message,e);
- }
+ public String navigateToShowListOfCatDef() {
+ CatDefListComponentBean listBean =
BeanManager.getCatDefListComponentBean();
+ listBean.setMode(CatDefListComponentBean.MODE_SELECT_ALL);
+ listBean.prepareDependingOnMode();
return "categoryList";
}
- /**
- * Deletes selected CategoryDefinition
- * @param aev aev
- */
- public void deleteCD(ActionEvent aev) {
- if (selectedToDelete == null) {
- String message = "selectedToDelete is null";
- log.error(message);
- throw new NullPointerException(message);
- }
- int updateRows;
- try {
- updateRows =
cbl.removeCategoryDefinitionMakeSession(selectedToDelete.getId());
- if (updateRows != 1) {
- throw new RuntimeException("strange count of
deleted categoryDefinition..");
- }
- } catch (Exception e) {
- String message = CommonUtils.prepareErrorMessage(
- CANNOT_REMOVE_CATEGORY,
"selectedToDeleteId",
- selectedToDelete == null ? null :
selectedToDelete.getId());
- log.error(message,e);
- throw new RuntimeException(message,e);
- }
- prepareList();
- }
-
- /**
- * @param aev
- */
- private void prepareDelete() {
- try {
- List<Category> categories =
cbl.listCategoriesByCatDefMakeSession(selectedToDelete.getId());
- if (categories.size() > 1) {
- // planning exist
- highDeleteWarning = false;
- } else {
- // planning exist
- highDeleteWarning = true;
- }
- deleteFormStep = 1;
- } catch (Exception e) {
- String message = CommonUtils.prepareErrorMessage(
- CANNOT_PREPARE_DELETE_CAT);
- log.error(message,e);
- throw new RuntimeException(e);
- }
- }
-
- /**
- * ActionListener implementation for invoking remove of the category.
- * @author David
- *
- */
- public static class PrepareDeleteCategoryActionListener implements
ActionListener {
- public void processAction(ActionEvent event)
- throws AbortProcessingException {
- CatDefListBean bean = (CatDefListBean)
BeanManager.getCatDefListBean();
- bean.prepareDelete();
- }
- }
-
-
}
Added:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListComponentBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListComponentBean.java
(rev 0)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/categrel/CatDefListComponentBean.java
2010-02-25 21:17:53 UTC (rev 1888)
@@ -0,0 +1,408 @@
+package cz.elvys.webServer.beans.categrel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
+
+import org.apache.log4j.Logger;
+
+import cz.elvys.commons.utils.CommonUtils;
+import cz.elvys.webServer.HIBgen.Category;
+import cz.elvys.webServer.HIBgen.CategoryDefinition;
+import cz.elvys.webServer.HIBgen.Elvys;
+import cz.elvys.webServer.HIBgen.ElvysGroup;
+import cz.elvys.webServer.utils.faces.BeanManager;
+import elvys.server.bl.Fact;
+import elvys.server.bl.categrel.CategoryBL;
+import elvys.server.bl.elvysrel.ElvysBL;
+
+public class CatDefListComponentBean {
+
+
+ // messages
+ private static final String CANNOT_PREPARE_LIST = "Error occured when
preparing list of category defintinions";
+ private static final String CANNOT_REMOVE_CATEGORY = "Couldn't remove
the category definition..";
+ private static final String CANNOT_PREPARE_DELETE_CAT = "Couldn't
prepare deletion of the category..";
+
+
+ // const
+ public static final String MODE_SELECT_ALL = "mode_select_all";
+ public static final String MODE_SELECT_UNUSED = "mode_select_unused";
+
+ // static fields
+ private static Logger log = null;
+
+ // fields
+ // value for filtering on the table
+ private String filterValue = null;
+ // id of elvys - when uses method="mode_select_unused" - this
param must be set
+ private Integer elvysId = null;
+ // mode of work: mode_select_all / mode_select_unused
+ private String mode = null;
+ // list of categories to display
+ private List<CategoryDefinitionListHolder> catDefs = null;
+ // selected for detail of usage
+ private Integer selectedForDetailOfUsage;
+ // list of elvyses for detail of usage
+ private List<Elvys> listOfElvysesForDetail;
+ // selected catDef to delete
+ private CategoryDefinition selectedToDelete;
+ // step of delete dialog
+ private Integer deleteFormStep = 1;
+ // high warning when deleting category assigned to some
Elvys
+ private Boolean highDeleteWarning = true;
+
+ // other fields
+ private CategoryBL catBL = null;
+ private ElvysBL elvysBL = null;
+
+
+
+
+ /**
+ * Constructor
+ */
+ public CatDefListComponentBean() {
+ catBL = Fact.getCategoryBL();
+ elvysBL = Fact.getElvysBL();
+ log = Logger.getLogger(CatDefListComponentBean.class);
+ }
+
+
+
+
+ public Boolean getHighDeleteWarning() {
+ return highDeleteWarning;
+ }
+
+ public void setHighDeleteWarning(Boolean highDeleteWarning) {
+ this.highDeleteWarning = highDeleteWarning;
+ }
+ public List<Elvys> getListOfElvysesForDetail() {
+ return listOfElvysesForDetail;
+ }
+ public void setListOfElvysesForDetail(List<Elvys>
listOfElvysesForDetail) {
+ this.listOfElvysesForDetail = listOfElvysesForDetail;
+ }
+ public String getFilterValue() {
+ return filterValue;
+ }
+ public void setFilterValue(String filterValue) {
+ this.filterValue = filterValue;
+ }
+ public Integer getElvysId() {
+ return elvysId;
+ }
+ public void setElvysId(Integer elvysId) {
+ this.elvysId = elvysId;
+ }
+ public String getMode() {
+ return mode;
+ }
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
+ public List<CategoryDefinitionListHolder> getCatDefs() {
+ return catDefs;
+ }
+ public void setCatDefs(List<CategoryDefinitionListHolder> catDefs) {
+ this.catDefs = catDefs;
+ }
+ public CategoryDefinition getSelectedToDelete() {
+ return selectedToDelete;
+ }
+ public void setSelectedToDelete(CategoryDefinition selectedToDelete) {
+ this.selectedToDelete = selectedToDelete;
+ }
+ public Integer getSelectedForDetailOfUsage() {
+ return selectedForDetailOfUsage;
+ }
+ public void setSelectedForDetailOfUsage(
+ Integer selectedForDetailOfUsage) {
+ this.selectedForDetailOfUsage = selectedForDetailOfUsage;
+ }
+ public Integer getDeleteFormStep() {
+ return deleteFormStep;
+ }
+ public void setDeleteFormStep(Integer deleteFormStep) {
+ this.deleteFormStep = deleteFormStep;
+ }
+
+
+ public void prepareDependingOnMode() {
+ if (mode==null || mode.equals("")) {
+ throw new NullPointerException("mode is null");
+ }
+ // check contract & call getting list
+ List<CategoryDefinition> lcd = null;
+ if (mode.equals(MODE_SELECT_ALL)) {
+ // doesn't need any other param, there is nothing to
validate
+ lcd = prepareListOfAllCatDef();
+ } else if (mode.equals(MODE_SELECT_UNUSED)) {
+ // select only unused categories
+ // need to have layoutId set
+ if (elvysId == null) {
+ throw new RuntimeException("elvysId == null");
+ }
+ lcd = prepareListOfUnusedCatDef(elvysId);
+ } else {
+ throw new NullPointerException("not supported mode of
CatDefListComponent: "+mode);
+ }
+
+ // transfrom lcd to catDefs
+ catDefs = transformToCategoryDefinitionListHolder(lcd);
+ }
+
+
+ public void prepareDetailOfUsageOfCatDefOnElvyses() {
+ // check contract
+ if (selectedForDetailOfUsage == null) {
+ throw new RuntimeException("selectedForDetailOfUsage is
null");
+ }
+
+ try {
+ listOfElvysesForDetail =
elvysBL.listElvysesByCatDefMakeSession(selectedForDetailOfUsage);
+ } catch (Exception e) {
+ String message= "Cannot display detail of usage";
+ log.error(message,e);
+ throw new RuntimeException(message,e);
+ }
+ }
+
+ /**
+ * Navigates to show the UC
+ * @return navigation string
+ */
+ public String navigateToShowListOfCatDef() {
+ return "categoryList";
+ }
+
+
+ /**
+ * Method converts list of CategoryDefinition to the
CategoryDefinitionListHolder
+ * @return list of CategoryDefinitionListHolder
+ */
+ private List<CategoryDefinitionListHolder>
transformToCategoryDefinitionListHolder(List<CategoryDefinition> inList) {
+ List<CategoryDefinitionListHolder> outList = new
ArrayList<CategoryDefinitionListHolder>();
+
+ try {
+
+ for (CategoryDefinition cd: inList) {
+ List<Elvys> assignedOnElvyses =
elvysBL.listElvysesByCatDefMakeSession(cd.getId());
+ CategoryDefinitionListHolder holder = new
CategoryDefinitionListHolder(cd,assignedOnElvyses.size());
+ outList.add(holder);
+ }
+
+ } catch (Exception e) {
+ String message = CommonUtils.prepareErrorMessage(
+ "Cannot prepare list");
+ log.error(message,e);
+ throw new RuntimeException(message,e);
+ }
+
+
+ return outList;
+ }
+
+ /**
+ * Method prepares list of all Category Definition objects (for the
given company)
+ */
+ private List<CategoryDefinition> prepareListOfAllCatDef() {
+ List<CategoryDefinition> catdefs = null;
+
+ Integer compId = BeanManager.getUser().getCompanyID();
+
+ try {
+ catdefs =
catBL.listCatDefinitionsOfCompanyMakeSession(compId);
+ } catch (Exception e) {
+ String message = CommonUtils.prepareErrorMessage(
+ CANNOT_PREPARE_LIST, "companyId",
compId);
+ log.error(message,e);
+ throw new RuntimeException(message,e);
+ }
+
+ return catdefs;
+ }
+
+
+ /**
+ * Method prepares list of unused Category Definition for the given
Elvys
+ */
+ private List<CategoryDefinition> prepareListOfUnusedCatDef(Integer
elvysId) {
+ List<CategoryDefinition> catdefs = null;
+
+ try {
+ ElvysGroup eg =
elvysBL.getElvysByIdMakeSession(elvysId).getElvysGroup();
+ catdefs =
catBL.listCatDefinitionsUnusedForGroupMakeSession(eg.getId());
+ } catch (Exception e) {
+ String message = CommonUtils.prepareErrorMessage(
+ CANNOT_PREPARE_LIST, "elvysId",
elvysId);
+ log.error(message,e);
+ throw new RuntimeException(e);
+ }
+
+ return catdefs;
+ }
+
+
+ /**
+ * Deletes selected CategoryDefinition
+ * @param aev aev
+ */
+ public void deleteCD(ActionEvent aev) {
+ if (selectedToDelete == null) {
+ String message = "selectedToDelete is null";
+ log.error(message);
+ throw new NullPointerException(message);
+ }
+ int updateRows;
+ try {
+ updateRows =
catBL.removeCategoryDefinitionMakeSession(selectedToDelete.getId());
+ if (updateRows != 1) {
+ throw new RuntimeException("strange count of
deleted categoryDefinition..");
+ }
+ } catch (Exception e) {
+ String message = CommonUtils.prepareErrorMessage(
+ CANNOT_REMOVE_CATEGORY,
"selectedToDeleteId",
+ selectedToDelete == null ? null :
selectedToDelete.getId());
+ log.error(message,e);
+ throw new RuntimeException(message,e);
+ }
+ prepareDependingOnMode();
+ }
+
+
+
+
+
+ /**
+ * @param aev
+ */
+ private void prepareDelete() {
+ try {
+ List<Category> categories =
catBL.listCategoriesByCatDefMakeSession(selectedToDelete.getId());
+ if (categories.size() > 1) {
+ // planning exist
+ highDeleteWarning = false;
+ } else {
+ // planning exist
+ highDeleteWarning = true;
+ }
+ deleteFormStep = 1;
+ } catch (Exception e) {
+ String message = CommonUtils.prepareErrorMessage(
+ CANNOT_PREPARE_DELETE_CAT);
+ log.error(message,e);
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ /**
+ * Method used in the table-filter on the view page
+ * @param value expects that value is of
cz.elvys.webServer.HIBgen.CategoryDefinition type
+ * @return true if object (row) meets filter rules, otherwise false
+ */
+ public boolean filterByValue(Object value) {
+ if (filterValue == null || filterValue.equals("")) {
+ // filter empty
+ return true;
+ }
+ if (!(value instanceof CategoryDefinitionListHolder)) {
+ // bad type of data
+ return false;
+ }
+ CategoryDefinitionListHolder ho =
(CategoryDefinitionListHolder) value;
+ CategoryDefinition cd = ho.getCatDef();
+
+ String filt = filterValue.toLowerCase();
+
+ if (cd.getName().toLowerCase().contains(filt)) {
+ return true;
+ }
+
+ return false;
+ }
+
+
+
+ /**
+ * Holder class for the list of category
+ * @author David
+ *
+ */
+ public static class CategoryDefinitionListHolder{
+ private CategoryDefinition catDef = null;
+ private Integer connectedElvysesSize = null;
+
+ public CategoryDefinitionListHolder(CategoryDefinition catDef,
Integer connectedElvysesSize) {
+ this.catDef = catDef;
+ this.connectedElvysesSize = connectedElvysesSize;
+ }
+
+ public CategoryDefinition getCatDef() {
+ return catDef;
+ }
+ public void setCatDef(CategoryDefinition catDef) {
+ this.catDef = catDef;
+ }
+ public Integer getConnectedElvysesSize() {
+ return connectedElvysesSize;
+ }
+ public void setConnectedElvysesSize(Integer
connectedElvysesSize) {
+ this.connectedElvysesSize = connectedElvysesSize;
+ }
+ }
+
+
+
+
+
+ /**
+ * ActionListener implementation for invoking remove of the category.
+ * @author David
+ *
+ */
+ public static class PrepareDeleteCategoryActionListener implements
ActionListener {
+ public void processAction(ActionEvent event)
+ throws AbortProcessingException {
+ CatDefListComponentBean bean =
(CatDefListComponentBean) BeanManager.getCatDefListComponentBean();
+ bean.prepareDelete();
+ }
+ }
+
+
+ /**
+ * ActionListener implementation for invoking remove of the category.
+ * @author David
+ *
+ */
+ public static class PrepareListCatDefsByMode implements ActionListener {
+ public void processAction(ActionEvent event)
+ throws AbortProcessingException {
+ CatDefListComponentBean bean =
(CatDefListComponentBean) BeanManager.getCatDefListComponentBean();
+ bean.prepareDependingOnMode();
+ }
+ }
+
+
+ /**
+ * ActionListener implementation for invoking remove of the category.
+ * @author David
+ *
+ */
+ public static class PrepareDetailOfUsageOfCatDefOnElvyses implements
ActionListener {
+ public void processAction(ActionEvent event)
+ throws AbortProcessingException {
+ CatDefListComponentBean bean =
(CatDefListComponentBean) BeanManager.getCatDefListComponentBean();
+ bean.prepareDetailOfUsageOfCatDefOnElvyses();
+ }
+ }
+
+
+
+
+}
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-25 20:46:18 UTC (rev 1887)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-25 21:17:53 UTC (rev 1888)
@@ -1,3 +1,6 @@
+user.not.authorized=U\u017Eivatel nen\u00ED opr\u00E1vn\u011Bn pro vstup na
tuto str\u00E1nku\!
+
+
elvys.planning.type.document=PDF dokument
elvys.planning.type.url=Internetov\u00E1 str\u00E1nka
elvys.planning.type.text=Statick\u00FD text
@@ -181,9 +184,12 @@
catdef.list.body.name=Jm\u00E9no kategorie
catdef.list.body.created=Vytvo\u0159eno
catdef.list.body.layout.name=Jm\u00E9no rozvr\u017Een\u00ED
-catdef.list.body.layout.preview=N\u00E1kres
-catdef.list.body.layout.preview.tooltip=Uk\u00E1zat n\u00E1kres
rozvr\u017Een\u00ED obrazovky
-catdef.list.body.usage=Pou\u017Eito
+catdef.list.body.layout.preview.tooltip=Zobrazit n\u00E1hled
rozvr\u017Een\u00ED obrazovky
+catdef.list.body.usage=\# P\u0159i\u0159azen\u00ED
+catdef.list.body.usage.tooltip=Zobrazit kiosky, na kter\u00FDch je tato
kategorie p\u0159i\u0159azena.
+catdef.list.body.usage.modal.header=Seznam p\u0159i\u0159azen\u00ED dan\u00E9
kategorie na kiosky
+catdef.list.body.usage.modal.list.name=N\u00E1zev
+catdef.list.body.usage.modal.list.address=Adresa
catdef.list.body.operations=Akce
catdef.list.body.edit.tooltip=Editovat
catdef.list.body.delete.tooltip=Odstranit
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/utils/faces/BeanManager.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/utils/faces/BeanManager.java
2010-02-25 20:46:18 UTC (rev 1887)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/utils/faces/BeanManager.java
2010-02-25 21:17:53 UTC (rev 1888)
@@ -29,6 +29,7 @@
import cz.elvys.webServer.beans.categrel.CatDefAssignStep2Bean;
import cz.elvys.webServer.beans.categrel.CatDefEditBean;
import cz.elvys.webServer.beans.categrel.CatDefListBean;
+import cz.elvys.webServer.beans.categrel.CatDefListComponentBean;
import cz.elvys.webServer.beans.companyrel.CompanyListBean;
import cz.elvys.webServer.beans.companyrel.CompanyPermittedTypesBean;
import cz.elvys.webServer.beans.elvysrel.ElvysSettingBean;
@@ -56,6 +57,7 @@
private static final String LAYOUT_SELECT_AND_CLOSE_COMP_BEAN =
"layoutSelectAndCloseCompBean";
private static final String LAYOUT_EDIT_BEAN = "layoutEditBean";
private static final String CATDEF_LIST_BEAN = "catDefListBean";
+ private static final String CATDEF_LIST_COMPONENT_BEAN =
"catDefListComponentBean";
private static final String CATDEF_EDIT_BEAN = "catDefListBean";
private static final String CATDEF_ASSIGN_STEP1_BEAN =
"catDefAssignStep1Bean";
private static final String CATDEF_ASSIGN_STEP2_BEAN =
"catDefAssignStep2Bean";
@@ -129,7 +131,12 @@
return bean;
}
+ public static CatDefListComponentBean getCatDefListComponentBean() {
+ CatDefListComponentBean bean= (CatDefListComponentBean)
getBeanByContextName(CATDEF_LIST_COMPONENT_BEAN, CatDefListComponentBean.class);
+ return bean;
+ }
+
/**
* @return
*/
Modified: trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml
===================================================================
--- trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml 2010-02-25
20:46:18 UTC (rev 1887)
+++ trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml 2010-02-25
21:17:53 UTC (rev 1888)
@@ -51,6 +51,10 @@
<source>../secured/components/dateTimeLabelComponent.xhtml</source>
</tag>
<tag>
+ <tag-name>catDefListComponent</tag-name>
+
<source>../secured/components/category/catDefListComponent.xhtml</source>
+ </tag>
+ <tag>
<tag-name>fileListComponentOld</tag-name>
<source>../secured/plug/file-choose.xhtml</source>
</tag>
Modified: trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml
===================================================================
--- trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml 2010-02-25
20:46:18 UTC (rev 1887)
+++ trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml 2010-02-25
21:17:53 UTC (rev 1888)
@@ -48,7 +48,7 @@
<managed-bean-class>cz.elvys.webServer.beans.companyrel.CompanyListBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
- <managed-bean>
+ <managed-bean>
<managed-bean-name>companyEditBean</managed-bean-name>
<managed-bean-class>cz.elvys.webServer.beans.companyrel.CompanyEditBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
@@ -68,7 +68,6 @@
<managed-bean-class>cz.elvys.webServer.beans.elvysrel.ElvysEditBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
<managed-bean>
<managed-bean-name>filePlanningBean</managed-bean-name>
<managed-bean-class>cz.elvys.webServer.beans.FilePlanningBean</managed-bean-class>
@@ -105,6 +104,11 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
+ <managed-bean-name>catDefListComponentBean</managed-bean-name>
+
<managed-bean-class>cz.elvys.webServer.beans.categrel.CatDefListComponentBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>catDefListBean</managed-bean-name>
<managed-bean-class>cz.elvys.webServer.beans.categrel.CatDefListBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
Copied:
trunk/server/webServer2/WebContent/js/components/category/catDefListComponent.js
(from rev 1748,
trunk/server/webServer2/WebContent/js/components/category/categoryDefinitionListComponent.js)
===================================================================
Deleted:
trunk/server/webServer2/WebContent/js/components/category/categoryDefinitionListComponent.js
===================================================================
Modified:
trunk/server/webServer2/WebContent/secured/categrel/listOfCatDefs.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/categrel/listOfCatDefs.xhtml
2010-02-25 20:46:18 UTC (rev 1887)
+++ trunk/server/webServer2/WebContent/secured/categrel/listOfCatDefs.xhtml
2010-02-25 21:17:53 UTC (rev 1888)
@@ -9,167 +9,37 @@
<ui:composition template="/template/elvys-template.xhtml">
-<ui:define name="title">#{lbl['catdef.list.title']}</ui:define>
-<ui:define name="contentTitle">#{lbl['catdef.list.body.title']}</ui:define>
-<ui:define name="contentSubTitle"></ui:define>
+ <ui:define name="pageStyle">
+ <a4j:loadStyle
src="/styles/components/category/catDefListComponent.css"/>
+ </ui:define>
+
+ <ui:define name="pageScript">
+ <script type="text/javascript" language="javascript"
src="/webServer2/js/components/category/categoryDefinitionListComponent.js"/>
+ </ui:define>
-<ui:define name="contentBody">
-<!-- nechat takhle, stejne se to prepise na komponentu -->
-<a4j:loadStyle
src="/styles/components/category/categoryDefinitionListComponent.css"/>
-<script type="text/javascript" language="javascript"
src="/webServer2/js/components/category/categoryDefinitionListComponent.js"/>
-
- <h:form>
- <rich:panel id="ListOfCatDefPanel">
- <f:facet
name="header">#{lbl['catdef.list.body.title']}</f:facet>
- <h:panelGrid id="ListOfCatDef">
- <rich:dataTable value="#{catDefListBean.list}"
var="catDef" rows="10"
- width="600" reRender="datascroller"
sortMode="multi">
-
- <!-- NAME -->
- <rich:column sortBy="#{catDef.name}">
- <f:facet
name="header">#{lbl['catdef.list.body.name']}</f:facet>
- <h:outputText
value="#{catDef.name}"/>
- </rich:column>
-
- <!-- CREATED DATE -->
- <rich:column sortBy="#{catDef.created}">
- <f:facet
name="header">#{lbl['catdef.list.body.created']}</f:facet>
- <h:outputText
value="#{catDef.created}">
- <f:convertDateTime
pattern="dd.MM.yyyy HH:mm" timeZone="#{user.defaultTimezone}" type="both"
timeStyle="short"/>
- </h:outputText>
- </rich:column>
-
- <!-- LAYOUT NAME -->
- <rich:column>
- <f:facet
name="header">#{lbl['catdef.list.body.layout.name']}</f:facet>
- <h:outputText
value="#{catDef.layout.name}"/>
- </rich:column>
-
- <!-- LAYOUT PREVIEW -->
- <rich:column>
- <f:facet
name="header">#{lbl['catdef.list.body.layout.preview']}</f:facet>
- <a4j:commandButton
id="ShowLayoutPreviewButton"
-
reRender="LayoutPreviewContent"
-
onclick="Richfaces.showModalPanel('LayoutPreviewModalWin')"
-
image="/images/icons/detail.png">
-
<f:setPropertyActionListener value="#{catDef.layout.id}"
-
target="#{layoutPreviewModalBean.layoutId}" />
- </a4j:commandButton>
- <rich:toolTip
for="ShowLayoutPreviewButton"
-
value="#{lbl['catdef.list.body.layout.preview.tooltip']}" />
- </rich:column>
-
- <!-- CATEGORY USAGE -->
- <rich:column>
- <f:facet
name="header">#{lbl['catdef.list.body.usage']}</f:facet>
- <h:outputText value="10
kiosku"/>
- </rich:column>
-
- <!-- OPERATIONS -->
- <h:column>
- <f:facet
name="header">#{lbl['catdef.list.body.operations']}</f:facet>
- <div
class="list-operations-main">
- <!-- EDIT -->
- <h:panelGroup
styleClass="list-operations-item">
-
<a4j:commandButton id="EditCatDef"
-
image="/images/icons/edit.png"
-
action="#{catDefEditBean.prepareUpdateForm}">
-
<f:setPropertyActionListener value="#{catDef.id}"
target="#{catDefEditBean.selectedCategoryId}" />
-
</a4j:commandButton>
- <rich:toolTip
for="EditCatDef">
-
<h:outputText value="#{lbl['catdef.list.body.edit.tooltip']}"/>
- </rich:toolTip>
- </h:panelGroup>
- <!-- DELETE -->
- <h:panelGroup
styleClass="list-operations-item">
-
<a4j:commandButton id="DeleteCatDef"
-
reRender="DeleteCatDefModalContent"
-
oncomplete="Richfaces.showModalPanel('DeleteCatDefModal',{left:300, top:300})"
-
image="/images/icons/delete.gif">
-
<f:setPropertyActionListener value="#{catDef}"
target="#{catDefListBean.selectedToDelete}" />
-
<f:actionListener
type="cz.elvys.webServer.beans.categrel.CatDefListBean$PrepareDeleteCategoryActionListener"/>
-
</a4j:commandButton>
- <rich:toolTip
for="DeleteCatDef">
-
<h:outputText value="#{lbl['catdef.list.body.delete.tooltip']}"/>
- </rich:toolTip>
- </h:panelGroup>
- </div>
- </h:column>
- <!-- CREATE NEW -->
- <h:column>
- <f:facet name="header">
- <h:panelGroup>
-
<a4j:commandButton id="CreateNewCatDef"
-
image="/images/icons/create.png"
-
action="#{catDefEditBean.prepareCreateForm}">
-
</a4j:commandButton>
- <rich:toolTip
for="CreateNewCatDef">
-
<h:outputText value="#{lbl['catdef.list.body.create.tooltip']}"/>
- </rich:toolTip>
- </h:panelGroup>
- </f:facet>
- </h:column>
- <f:facet name="footer">
- <rich:datascroller
id="datascroller" renderIfSinglePage="false" immediate="true"/>
- </f:facet>
- </rich:dataTable>
- </h:panelGrid>
- </rich:panel>
- </h:form>
+ <ui:define name="title">#{lbl['catdef.list.title']}</ui:define>
+ <ui:define
name="contentTitle">#{lbl['catdef.list.body.title']}</ui:define>
+ <ui:define name="contentSubTitle"></ui:define>
+ <ui:define name="contentBody">
- <elvys:layoutPreviewModal
- modalWinId="LayoutPreviewModalWin"
- contentId="LayoutPreviewContent"
- toRerender="#{modalWinContentId}, layoutListComponent"
- />
-
- <rich:modalPanel id="DeleteCatDefModal" minHeight="100" minWidth="200"
- autosized="true" zindex="2000">
- <center>
- <h:form id="DeleteCatDefModalContent">
- <b><h:outputText
value="#{lbl['catdef.list.body.delete.modal.deletequestion']}"/></b>
- <br/>
- <h:outputText
value="#{catDefListBean.selectedToDelete.name}"/>
- <br/>
+
+ <rich:panel id="ListOfCatDefPanel">
+ <f:facet
name="header">#{lbl['catdef.list.body.title']}</f:facet>
+
+ <!-- list of catdef component -->
+ <elvys:catDefListComponent
+ id="NOTUSEDID"
+ showCreateIcon="true"
+ showEditIcon="true"
+ showDeleteIcon="true"
+ showSelectButton1="false" />
- <b>
- <h:outputText
- rendered="#{catDefListBean.highDeleteWarning
and catDefListBean.deleteFormStep == 2}"
-
value="#{lbl['catdef.list.body.delete.modal.deletecaution']}"/>
- <br/>
- <h:outputText
- rendered="#{catDefListBean.highDeleteWarning
and catDefListBean.deleteFormStep == 2}"
-
value="#{lbl['catdef.list.body.delete.modal.deletecaution.line2']}"/>
- </b>
- <h:panelGrid columns="2">
- <h:panelGroup>
- <a4j:commandButton
-
value="#{lbl['catdef.list.body.delete.modal.yesbut']}"
-
rendered="#{catDefListBean.highDeleteWarning and catDefListBean.deleteFormStep
== 1}"
-
reRender="DeleteCatDefModalContent">
- <f:setPropertyActionListener
value="#{2}" target="#{catDefListBean.deleteFormStep}" />
- </a4j:commandButton>
- <a4j:commandButton
value="#{lbl['catdef.list.body.delete.modal.yes']}"
-
onclick="Richfaces.hideModalPanel('DeleteCatDefModal')"
- reRender="ListOfCatDefPanel"
- rendered="#{not
catDefListBean.highDeleteWarning or catDefListBean.deleteFormStep == 2}"
-
actionListener="#{catDefListBean.deleteCD}">
- </a4j:commandButton>
- </h:panelGroup>
- <a4j:commandButton
value="#{lbl['catdef.list.body.delete.modal.no']}"
-
onclick="Richfaces.hideModalPanel('DeleteCatDefModal')"
- reRender="ListOfCatDefPanel,
DeleteCatDefModalContent">
- <f:setPropertyActionListener
value="#{null}" target="#{catDefListBean.selectedToDelete}" />
- </a4j:commandButton>
- </h:panelGrid>
-
- </h:form>
- </center>
- </rich:modalPanel>
+ </rich:panel>
+
</ui:define>
Added:
trunk/server/webServer2/WebContent/secured/components/category/catDefListComponent.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/components/category/catDefListComponent.xhtml
(rev 0)
+++
trunk/server/webServer2/WebContent/secured/components/category/catDefListComponent.xhtml
2010-02-25 21:17:53 UTC (rev 1888)
@@ -0,0 +1,314 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<ui:component xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:h="http://java.sun.com/jsf/html";
+ xmlns:f="http://java.sun.com/jsf/core";
+ xmlns:ui="http://java.sun.com/jsf/facelets";
+ xmlns:a4j="http://richfaces.org/a4j";
+ xmlns:rich="http://richfaces.org/rich";
+ xmlns:elvys="http://www.elvys.farm.particle.cz";>
+
+<!-- PROTOCOL
+INITIALIZATION CALL A)
+ | (<f:actionListener
type="cz.elvys.webServer.beans.categrel.CatDefListComponentBean$PrepareListCatDefsByMode"/>)
+ | PARAMS (<f:setPropertyActionListener>)
+ | -catDefListComponentBean.mode = "mode_select_all"
+
+INITIALIZATION CALL B)
+ | (<f:actionListener
type="cz.elvys.webServer.beans.categrel.CatDefListComponentBean$PrepareListCatDefsByMode"/>)
+ | PARAMS (<f:setPropertyActionListener>)
+ | -catDefListComponentBean.mode = "mode_select_unused"
+ | -catDefListComponentBean.elvysId = <id of elvys>
+
+
+
+INPUT (params):
+ | -id (REQUIRED):
+ | id of the component
+ | -showCreateIcon (REQUIRED):
+ | enables the "create new" functionality
+ | -showEditIcon (REQUIRED):
+ | enables the "edit" functionality
+ | -showDeleteIcon (REQUIRED):
+ | enables the "delete" functionality
+ | -showSelectButton1 (REQUIRED):
+ | enables the "select catdef" functionality
+ | target1 must be then set (optinally rest of xxx1)
+
+ selecting file is available, when "target1" is specified
+ | -target1 (required if showSelectButton1 is true)
+ | -toRerender1
+ | -jsOnClick1
+ | -jsOnComplete1
+ | -chListenerTooltip1
+ | (listener is in call params)
+
+ -->
+
+
+<a4j:loadStyle src="/styles/components/category/catDefListComponent.css"/>
+<script type="text/javascript" language="javascript"
src="/webServer2/js/components/category/catDefListComponent.js"/>
+
+<!-- BAD CONTRACT -->
+<h:panelGroup
+ rendered="#{empty id
+ or empty showCreateIcon
+ or empty showEditIcon
+ or empty showDeleteIcon
+ or empty showSelectButton1}">
+ <h:outputText value="BAD CONTRACT" styleClass="error"/>
+</h:panelGroup>
+
+<!-- GOOD CONTRACT -->
+<h:panelGroup
+ rendered="#{not empty id
+ and not empty showCreateIcon
+ and not empty showEditIcon
+ and not empty showDeleteIcon
+ and not empty showSelectButton1}">
+
+ <h:form id="CatDefListComponent" styleClass="catdef-list-component">
+ <h:panelGroup id="fileListAreaAll"
styleClass="file-list-area-all">
+
+ <rich:dataTable
+ id="CatDefList"
+ value="#{catDefListComponentBean.catDefs}"
+ var="catDefRec"
+ rows="10"
+ reRender="CatDefList, SearchPanel, datascroller"
+ width="600"
+ sortMode="single"
+ align="center">
+
+ <f:facet name="header">
+ <rich:columnGroup>
+ <rich:column colspan="6">
+ <h:panelGroup
id="ControlPanel" styleClass="controlPanel">
+ <h:panelGroup
rendered="#{showCreateIcon}">
+
<h:commandButton id="CreateNewCatDef"
+
image="/images/icons/create.png"
+
action="#{catDefEditBean.prepareCreateForm}">
+
</h:commandButton>
+
<rich:toolTip for="CreateNewCatDef">
+
<h:outputText value="#{lbl['catdef.list.body.create.tooltip']}"/>
+
</rich:toolTip>
+ </h:panelGroup>
+ </h:panelGroup>
+
+ <h:panelGroup
id="SearchPanel" styleClass="searchPanel">
+
#{lbl['list.search']} :
+ <h:inputText
value="#{catDefListComponentBean.filterValue}" id="input">
+
<a4j:support event="onkeyup" reRender="CatDefList"
+
ignoreDupResponses="true" requestDelay="700"
+
oncomplete="setCaretToEnd(event);" />
+ </h:inputText>
+ </h:panelGroup>
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+
+ <!-- NAME -->
+ <rich:column
+
filterMethod="#{catDefListComponentBean.filterByValue}"
+ sortBy="#{catDefRec.catDef.name}" >
+ <f:facet
name="header">#{lbl['catdef.list.body.name']}</f:facet>
+ <h:outputText
value="#{catDefRec.catDef.name}"/>
+ </rich:column>
+
+ <!-- CREATED DATE -->
+ <rich:column
sortBy="#{catDefRec.catDef.created}">
+ <f:facet
name="header">#{lbl['catdef.list.body.created']}</f:facet>
+ <h:outputText
value="#{catDefRec.catDef.created}">
+ <f:convertDateTime
pattern="dd.MM.yyyy HH:mm" timeZone="#{user.defaultTimezone}" type="both"
timeStyle="short"/>
+ </h:outputText>
+ </rich:column>
+
+ <!-- LAYOUT NAME -->
+ <rich:column>
+ <f:facet
name="header">#{lbl['catdef.list.body.layout.name']}</f:facet>
+ <h:outputText
value="#{catDefRec.catDef.layout.name}"/>
+ </rich:column>
+
+ <!-- CATEGORY USAGE -->
+ <rich:column
sortBy="#{catDefRec.connectedElvysesSize}">
+ <f:facet
name="header">#{lbl['catdef.list.body.usage']}</f:facet>
+ <h:panelGroup
rendered="#{catDefRec.connectedElvysesSize > 0}">
+ <a4j:commandLink
id="ShowCatDefUsage"
+ style="display: block;"
+
value="#{catDefRec.connectedElvysesSize}"
+
reRender="ShowCatDefUsageModalContent"
+
oncomplete="Richfaces.showModalPanel('ShowCatDefUsageModal')">
+
<f:setPropertyActionListener value="#{catDefRec.catDef.id}"
target="#{catDefListComponentBean.selectedForDetailOfUsage}" />
+ <f:actionListener
type="cz.elvys.webServer.beans.categrel.CatDefListComponentBean$PrepareDetailOfUsageOfCatDefOnElvyses"/>
+ </a4j:commandLink>
+ <rich:toolTip
for="ShowCatDefUsage">
+ <h:outputText
value="#{lbl['catdef.list.body.usage.tooltip']}"/>
+ </rich:toolTip>
+ </h:panelGroup>
+ <h:panelGroup
rendered="#{catDefRec.connectedElvysesSize == 0}">
+ <h:outputText
value="#{catDefRec.connectedElvysesSize}"/>
+ </h:panelGroup>
+ </rich:column>
+
+ <!-- OPERATIONS -->
+ <h:column>
+ <f:facet
name="header">#{lbl['catdef.list.body.operations']}</f:facet>
+ <div class="list-operations-main">
+
+ <!-- DELETE -->
+ <h:panelGroup
styleClass="list-operations-item"
+
rendered="#{showDeleteIcon}">
+ <a4j:commandButton
id="DeleteCatDef"
+
reRender="DeleteCatDefModalContent"
+
oncomplete="Richfaces.showModalPanel('DeleteCatDefModal',{left:300, top:300})"
+
image="/images/icons/delete.gif">
+
<f:setPropertyActionListener value="#{catDefRec.catDef}"
target="#{catDefListComponentBean.selectedToDelete}" />
+
<f:actionListener
type="cz.elvys.webServer.beans.categrel.CatDefListComponentBean$PrepareDeleteCategoryActionListener"/>
+ </a4j:commandButton>
+ <rich:toolTip
for="DeleteCatDef">
+ <h:outputText
value="#{lbl['catdef.list.body.delete.tooltip']}"/>
+ </rich:toolTip>
+ </h:panelGroup>
+
+ <!-- EDIT -->
+ <h:panelGroup
styleClass="list-operations-item"
+
rendered="#{showEditIcon}">
+ <h:commandButton
id="EditCatDef"
+
image="/images/icons/edit.png"
+
action="#{catDefEditBean.prepareUpdateForm}">
+
<f:setPropertyActionListener value="#{catDefRec.catDef.id}"
target="#{catDefEditBean.selectedCategoryId}" />
+ </h:commandButton>
+ <rich:toolTip
for="EditCatDef">
+ <h:outputText
value="#{lbl['catdef.list.body.edit.tooltip']}"/>
+ </rich:toolTip>
+ </h:panelGroup>
+
+ <!-- LAYOUT PREVIEW -->
+ <h:panelGroup
styleClass="list-operations-item">
+ <a4j:commandButton
id="ShowLayoutPreviewButton"
+
reRender="LayoutPreviewContent"
+
onclick="Richfaces.showModalPanel('LayoutPreviewModalWin')"
+
image="/images/icons/detail.png">
+
<f:setPropertyActionListener value="#{catDefRec.catDef.layout.id}"
+
target="#{layoutPreviewModalBean.layoutId}" />
+ </a4j:commandButton>
+ <rich:toolTip
for="ShowLayoutPreviewButton"
+
value="#{lbl['catdef.list.body.layout.preview.tooltip']}" />
+ </h:panelGroup>
+ </div>
+ </h:column>
+ <f:facet name="footer">
+ <rich:datascroller id="datascroller"
renderIfSinglePage="false" immediate="true"/>
+ </f:facet>
+ </rich:dataTable>
+ </h:panelGroup>
+ <br style="clear:both;"/>
+ </h:form>
+
+ <elvys:layoutPreviewModal
+ modalWinId="LayoutPreviewModalWin"
+ contentId="LayoutPreviewContent"
+ toRerender="#{modalWinContentId}, CatDefListComponent"
+ />
+
+
+ <!-- DELETE MODAL WINDOW -->
+ <rich:modalPanel id="DeleteCatDefModal" minHeight="100" minWidth="200"
+ autosized="true" zindex="2000">
+ <center>
+ <h:form id="DeleteCatDefModalContent">
+ <b><h:outputText
value="#{lbl['catdef.list.body.delete.modal.deletequestion']}"/></b>
+ <br/>
+ <h:outputText
value="#{catDefListComponentBean.selectedToDelete.name}"/>
+ <br/>
+
+ <b>
+ <h:outputText
+
rendered="#{catDefListComponentBean.highDeleteWarning and
catDefListComponentBean.deleteFormStep == 2}"
+
value="#{lbl['catdef.list.body.delete.modal.deletecaution']}"/>
+ <br/>
+ <h:outputText
+
rendered="#{catDefListComponentBean.highDeleteWarning and
catDefListComponentBean.deleteFormStep == 2}"
+
value="#{lbl['catdef.list.body.delete.modal.deletecaution.line2']}"/>
+ </b>
+ <h:panelGrid columns="2">
+ <h:panelGroup>
+ <a4j:commandButton
+
value="#{lbl['catdef.list.body.delete.modal.yesbut']}"
+
rendered="#{catDefListComponentBean.highDeleteWarning and
catDefListComponentBean.deleteFormStep == 1}"
+
reRender="DeleteCatDefModalContent">
+ <f:setPropertyActionListener
value="#{2}" target="#{catDefListComponentBean.deleteFormStep}" />
+ </a4j:commandButton>
+ <a4j:commandButton
value="#{lbl['catdef.list.body.delete.modal.yes']}"
+
onclick="Richfaces.hideModalPanel('DeleteCatDefModal')"
+ reRender="ListOfCatDefPanel"
+ rendered="#{not
catDefListComponentBean.highDeleteWarning or
catDefListComponentBean.deleteFormStep == 2}"
+
actionListener="#{catDefListComponentBean.deleteCD}">
+ </a4j:commandButton>
+ </h:panelGroup>
+ <a4j:commandButton
value="#{lbl['catdef.list.body.delete.modal.no']}"
+
onclick="Richfaces.hideModalPanel('DeleteCatDefModal')"
+ reRender="ListOfCatDefPanel,
DeleteCatDefModalContent">
+ <f:setPropertyActionListener
value="#{null}" target="#{catDefListComponentBean.selectedToDelete}" />
+ </a4j:commandButton>
+ </h:panelGrid>
+ </h:form>
+ </center>
+ </rich:modalPanel>
+
+
+
+ <!-- CATDEF USAGES MODAL -->
+ <rich:modalPanel id="ShowCatDefUsageModal" minWidth="500"
minHeight="200" autosized="true" zindex="4000">
+ <f:facet name="header">
+ <h:outputText
value="#{lbl['catdef.list.body.usage.modal.header']}" />
+ </f:facet>
+
+ <rich:panel id="ShowCatDefUsageModalContent"
+ styleClass="modal-win-panel" >
+ <h:panelGroup style="overflow:auto; display: block;">
+
+ <!-- CLOSE BUTTON -->
+ <h:panelGroup
styleClass="modal-close-button-div">
+ <h:form id="ShowCatDefUsageModalForm"
style="overflow: auto;">
+ <!-- CLOSE BUTTON -->
+ <a4j:commandButton
+
id="elvysSettingCloseButton"
+
reRender="CatDefListComponent, ShowCatDefUsageModalContent"
+
onclick="Richfaces.hideModalPanel('ShowCatDefUsageModal')"
+
image="/images/icons/close.gif"
+
styleClass="modal-close-button" />
+ </h:form>
+ </h:panelGroup>
+
+ <!-- FORM -->
+ <h:panelGroup styleClass="modal-body-div">
+ <h:form>
+ <rich:dataTable
+
value="#{catDefListComponentBean.listOfElvysesForDetail}"
+ var="elvys"
+ columnsWidth="200,300">
+
+ <h:column>
+ <f:facet
name="header">#{lbl['catdef.list.body.usage.modal.list.name']}</f:facet>
+ <h:outputText
value="#{elvys.name}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet
name="header">#{lbl['catdef.list.body.usage.modal.list.address']}</f:facet>
+ <h:outputText
value="#{elvys.address}, #{elvys.psc} #{elvys.city}"/>
+ </h:column>
+ </rich:dataTable>
+ </h:form>
+ </h:panelGroup>
+ </h:panelGroup>
+ </rich:panel>
+ </rich:modalPanel>
+
+
+
+</h:panelGroup>
+
+</ui:component>
+
+
+
Modified:
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
2010-02-25 20:46:18 UTC (rev 1887)
+++
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
2010-02-25 21:17:53 UTC (rev 1888)
@@ -85,7 +85,7 @@
<f:facet name="header">
<rich:columnGroup>
<rich:column colspan="7">
- <div class="controlPanel">
+ <h:panelGroup
styleClass="controlPanel">
<h:panelGroup
rendered="#{showUploadIcon}">
<h:commandButton id="UploadNew"
image="/images/icons/create.png"
@@ -96,7 +96,7 @@
<h:outputText value="#{lbl['file.list.component.uploadnew']}"/>
</rich:toolTip>
</h:panelGroup>
- </div>
+ </h:panelGroup>
<h:panelGroup
id="fileListButtons" styleClass="file-list-buttons">
<h:selectOneRadio
id="fileTypes"
value="#{fileListComponentBean.selectedFileType}">
@@ -110,14 +110,14 @@
</h:panelGroup>
- <div class="searchPanel">
+ <h:panelGroup
styleClass="searchPanel">
#{lbl['list.search']} :
<h:inputText
value="#{fileListComponentBean.filterValue}" id="input">
<a4j:support
event="onkeyup" reRender="fileList"
ignoreDupResponses="true" requestDelay="700"
oncomplete="setCaretToEnd(event);" />
</h:inputText>
- </div>
+ </h:panelGroup>
</rich:column>
</rich:columnGroup>
</f:facet>
@@ -312,33 +312,28 @@
</f:facet>
<rich:panel id="FilePlanningsModalContent"
- styleClass="modal-layout-list-win" >
+ styleClass="modal-win-panel" >
<h:panelGroup style="overflow:auto; display: block;">
<!-- CLOSE BUTTON -->
- <h:panelGroup style="float: right; width: 50%;">
- <h:form id="FilePlanningsModalForm"
style="overflow: auto;">
+ <h:panelGroup styleClass="modal-close-button-div">
+ <h:form id="FilePlanningsModalCloseForm"
style="overflow: auto;">
<!-- CLOSE BUTTON -->
<a4j:commandButton
id="elvysSettingCloseButton"
reRender="FileListComponent,
FilePlanningsModalContent"
onclick="Richfaces.hideModalPanel('FilePlanningsModal')"
image="/images/icons/close.gif"
- style="position: absolute;
right: -10px; top: -28px;" />
+ styleClass="modal-close-button"
/>
</h:form>
</h:panelGroup>
<!-- FORM -->
- <h:panelGroup>
- <h:form>
+ <h:panelGroup styleClass="modal-body-div">
+ <h:form id="FilePlanningsModalForm">
OD - DO, kiosek 1 <br/>
OD - DO, kiosek 432 <br/>
OD - DO, kiosek 11 <br/>
- <!-- <a4j:commandButton
- image="/images/icons/close.gif"
-
reRender="ChooseFileModalContent"
-
onclick="Richfaces.hideModalPanel('FileStatisticsModal')" />
- -->
</h:form>
</h:panelGroup>
</h:panelGroup>
Copied:
trunk/server/webServer2/WebContent/styles/components/category/catDefListComponent.css
(from rev 1772,
trunk/server/webServer2/WebContent/styles/components/category/categoryDefinitionListComponent.css)
===================================================================
Deleted:
trunk/server/webServer2/WebContent/styles/components/category/categoryDefinitionListComponent.css
===================================================================
Modified:
trunk/server/webServer2/WebContent/styles/components/file/fileListModalComponent.css
===================================================================
---
trunk/server/webServer2/WebContent/styles/components/file/fileListModalComponent.css
2010-02-25 20:46:18 UTC (rev 1887)
+++
trunk/server/webServer2/WebContent/styles/components/file/fileListModalComponent.css
2010-02-25 21:17:53 UTC (rev 1888)
@@ -1,22 +1,8 @@
-.modal-layout-list-win {
- left: 1%;
- width: 98%;
- height: 98%;
- display: block;
-}
-.modal-layout-list {
-}
-.close-button {
- position: absolute;
- right: -15px;
- top: -30px;
-}
-
.modal-body-with-list {
float: left;
Modified: trunk/server/webServer2/WebContent/styles/elvys-template.css
===================================================================
--- trunk/server/webServer2/WebContent/styles/elvys-template.css
2010-02-25 20:46:18 UTC (rev 1887)
+++ trunk/server/webServer2/WebContent/styles/elvys-template.css
2010-02-25 21:17:53 UTC (rev 1888)
@@ -123,21 +123,21 @@
float:right;
}
-div.searchPanel {
+.searchPanel {
float:right;
width:250px;
text-align:right;
}
-div.searchPanel input {
+.searchPanel input {
padding-left:3px;
}
-div.controlPanel {
+.controlPanel {
float:left;
}
-div.controlPanel input {
+.controlPanel input {
padding:0px;
border:1px solid #A4D800;
}
@@ -154,7 +154,29 @@
}
+.modal-win-panel {
+ left: 1%;
+ width: 98%;
+ height: 98%;
+ display: block;
+}
+.modal-close-button-div {
+ float: right;
+ width: 50%;
+}
+
+.modal-close-button {
+ position: absolute;
+ right: -10px;
+ top: -28px;
+}
+
+.modal-body-div {
+
+}
+
+
.user-not-authorized-label {
color: red;
font-size: 14px;
Modified: trunk/server/webServer2/WebContent/template/elvys-template.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/template/elvys-template.xhtml
2010-02-25 20:46:18 UTC (rev 1887)
+++ trunk/server/webServer2/WebContent/template/elvys-template.xhtml
2010-02-25 21:17:53 UTC (rev 1888)
@@ -100,7 +100,7 @@
<rich:menuItem
id="CategoryListMenuItem"
value="#{lbl['template.menu.category.list']}"
-
action="#{catDefListBean.prepareList}"
+
action="#{catDefListBean.navigateToShowListOfCatDef}"
submitMode="server"/>
<rich:menuItem
id="CategoryCreateMenuItem"
value="#{lbl['template.menu.category.create']}"
Other related posts:
- » [elvystrac] r1888 - CatDef list changed to component, list styles upgraded,.. - elvys
