Update of
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
In directory
james.mmbase.org:/tmp/cvs-serv32535/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
Modified Files:
WorkflowStatusInfo.java
Log Message:
CMSC-1087 -changes the status box of a page to a dynamic tree in the Workflow
section of the CMSc
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1087
Index: WorkflowStatusInfo.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/WorkflowStatusInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- WorkflowStatusInfo.java 4 Nov 2008 12:02:06 -0000 1.3
+++ WorkflowStatusInfo.java 18 Nov 2008 01:38:16 -0000 1.4
@@ -16,16 +16,55 @@
public class WorkflowStatusInfo {
- private int contentDraft;
+ private int allcontentDraft;
+ private int allcontentFinished;
+ private int allcontentApproved;
+ private int allcontentPublished;
+
private int contentFinished;
private int contentApproved;
private int contentPublished;
+ private int contentArticleDraft;
+ private int contentArticleFinished;
+ private int contentArticleApproved;
+ private int contentArticlePublished;
+
+ private int contentBannersDraft;
+ private int contentBannersFinished;
+ private int contentBannersApproved;
+ private int contentBannersPublished;
+
+ private int contentLinkDraft;
+ private int contentLinkFinished;
+ private int contentLinkApproved;
+ private int contentLinkPublished;
+
+ private int contentFaqitemDraft;
+ private int contentFaqitemFinished;
+ private int contentFaqitemApproved;
+ private int contentFaqitemPublished;
+
private int assetDraft;
private int assetFinished;
private int assetApproved;
private int assetPublished;
+ private int assetImagesDraft;
+ private int assetImagesFinished;
+ private int assetImagesApproved;
+ private int assetImagesPublished;
+
+ private int assetAttachmentsDraft;
+ private int assetAttachmentsFinished;
+ private int assetAttachmentsApproved;
+ private int assetAttachmentsPublished;
+
+ private int assetUrlsDraft;
+ private int assetUrlsFinished;
+ private int assetUrlsApproved;
+ private int assetUrlsPublished;
+
private int linkDraft;
private int linkFinished;
private int linkApproved;
@@ -41,39 +80,54 @@
for (Iterator<Node> iter = statusList.iterator(); iter.hasNext();) {
Node node = iter.next();
String type = node.getStringValue("type");
+ String nodetype = node.getStringValue("nodetype");
String status = node.getStringValue("status");
int count = node.getIntValue("number");
if ("content".equals(type)) {
- if (Workflow.STATUS_DRAFT.equals(status))
- contentDraft = count;
- if (Workflow.STATUS_FINISHED.equals(status))
- contentFinished += count;
+ if (Workflow.STATUS_DRAFT.equals(status)){
+ /*contentDraft = count;*/
+ setNodetypeDraft(nodetype, count);
+ }
+ if (Workflow.STATUS_FINISHED.equals(status)){
+ /*contentFinished += count;*/
+ setNodetypeFinished(nodetype, count);
+ }
if (Workflow.STATUS_APPROVED.equals(status)) {
- if (Workflow.isAcceptedStepEnabled()) {
+ /*if (Workflow.isAcceptedStepEnabled()) {
contentApproved = count;
}
else {
contentFinished += count;
+ }*/
+ setNodetypeApproved(nodetype, count);
}
+ if (Workflow.STATUS_PUBLISHED.equals(status)){
+ /*contentPublished = count;*/
+ setNodetypePublished(nodetype, count);
}
- if (Workflow.STATUS_PUBLISHED.equals(status))
- contentPublished = count;
}
if ("asset".equals(type)) {
- if (Workflow.STATUS_DRAFT.equals(status))
- assetDraft = count;
- if (Workflow.STATUS_FINISHED.equals(status))
- assetFinished += count;
+ if (Workflow.STATUS_DRAFT.equals(status)){
+ /*assetDraft = count;*/
+ setNodetypeDraft(nodetype, count);
+ }
+ if (Workflow.STATUS_FINISHED.equals(status)){
+ /*assetFinished += count;*/
+ setNodetypeFinished(nodetype, count);
+ }
if (Workflow.STATUS_APPROVED.equals(status)) {
- if (Workflow.isAcceptedStepEnabled()) {
+ /*if (Workflow.isAcceptedStepEnabled()) {
assetApproved = count;
}
else {
assetFinished += count;
+ }*/
+ setNodetypeApproved(nodetype, count);
}
+ if (Workflow.STATUS_PUBLISHED.equals(status)){
+ /*assetPublished = count;*/
+ setNodetypePublished(nodetype, count);
}
- if (Workflow.STATUS_PUBLISHED.equals(status))
- assetPublished = count;
}
if ("link".equals(type)) {
if (Workflow.STATUS_DRAFT.equals(status))
@@ -110,6 +164,93 @@
pagePublished = count;
}
}
+ contentDraft = contentArticleDraft + contentBannersDraft +
contentLinkDraft + contentFaqitemDraft;
+ contentFinished = contentArticleFinished + contentBannersFinished +
contentLinkFinished + contentFaqitemFinished;
+ contentApproved = contentArticleApproved + contentBannersApproved +
contentLinkApproved + contentFaqitemApproved;
+ contentPublished = contentArticlePublished + contentBannersPublished +
contentLinkPublished + contentFaqitemPublished;
+ assetDraft = assetImagesDraft + assetAttachmentsDraft + assetUrlsDraft;
+ assetFinished = assetImagesFinished + assetAttachmentsFinished +
assetUrlsFinished;
+ assetApproved = assetImagesApproved + assetAttachmentsApproved +
assetUrlsApproved;
+ assetPublished = assetImagesPublished + assetAttachmentsPublished +
assetUrlsPublished;
+ allcontentDraft = contentDraft + assetDraft;
+ allcontentFinished = contentFinished + assetFinished;
+ allcontentApproved = contentApproved + assetApproved;
+ allcontentPublished = contentPublished + assetPublished;
+ }
+
+
+ private void setNodetypeDraft(String nodetype, int count) {
+ if("article".equals(nodetype))
+ contentArticleDraft = count;
+ if("banners".equals(nodetype))
+ contentBannersDraft = count;
+ if("link".equals(nodetype))
+ contentLinkDraft = count;
+ if("faqitem".equals(nodetype))
+ contentFaqitemDraft = count;
+ if("images".equals(nodetype))
+ assetImagesDraft = count;
+ if("attachments".equals(nodetype))
+ assetAttachmentsDraft = count;
+ if("urls".equals(nodetype))
+ assetUrlsDraft = count;
+ }
+
+
+ private void setNodetypeFinished(String nodetype, int count) {
+ if("article".equals(nodetype))
+ contentArticleFinished += count;
+ if("banners".equals(nodetype))
+ contentBannersFinished += count;
+ if("link".equals(nodetype))
+ contentLinkFinished += count;
+ if("faqitem".equals(nodetype))
+ contentFaqitemFinished += count;
+ if("images".equals(nodetype))
+ assetImagesFinished += count;
+ if("attachments".equals(nodetype))
+ assetAttachmentsFinished += count;
+ if("urls".equals(nodetype))
+ assetUrlsFinished += count;
+ }
+
+
+ private void setNodetypeApproved(String nodetype, int count) {
+ if (Workflow.isAcceptedStepEnabled()) {
+ if ("article".equals(nodetype)) contentArticleApproved = count;
+ if ("banners".equals(nodetype)) contentBannersApproved = count;
+ if ("link".equals(nodetype)) contentLinkApproved = count;
+ if ("faqitem".equals(nodetype)) contentFaqitemApproved = count;
+ if ("images".equals(nodetype)) assetImagesApproved = count;
+ if ("attachments".equals(nodetype)) assetAttachmentsApproved = count;
+ if ("urls".equals(nodetype)) assetUrlsApproved = count;
+ } else {
+ if ("article".equals(nodetype)) contentArticleFinished += count;
+ if ("banners".equals(nodetype)) contentBannersFinished += count;
+ if ("link".equals(nodetype)) contentLinkFinished += count;
+ if ("faqitem".equals(nodetype)) contentFaqitemFinished += count;
+ if ("images".equals(nodetype)) assetImagesFinished += count;
+ if ("attachments".equals(nodetype)) assetAttachmentsFinished += count;
+ if ("urls".equals(nodetype)) assetUrlsFinished += count;
+ }
+ }
+
+
+ private void setNodetypePublished(String nodetype, int count) {
+ if("article".equals(nodetype))
+ contentArticlePublished = count;
+ if("banners".equals(nodetype))
+ contentBannersPublished = count;
+ if("link".equals(nodetype))
+ contentLinkFinished = count;
+ if("faqitem".equals(nodetype))
+ contentFaqitemPublished = count;
+ if("images".equals(nodetype))
+ assetImagesPublished = count;
+ if("attachments".equals(nodetype))
+ assetAttachmentsPublished = count;
+ if("urls".equals(nodetype))
+ assetUrlsPublished = count;
}
@@ -271,4 +412,324 @@
public void setPagePublished(int pagePublished) {
this.pagePublished = pagePublished;
}
+
+ public int getContentArticleDraft() {
+ return contentArticleDraft;
+ }
+
+
+ public void setContentArticleDraft(int contentArticleDraft) {
+ this.contentArticleDraft = contentArticleDraft;
+ }
+
+
+ public int getContentArticleFinished() {
+ return contentArticleFinished;
+ }
+
+
+ public void setContentArticleFinished(int contentArticleFinished) {
+ this.contentArticleFinished = contentArticleFinished;
+ }
+
+
+ public int getContentArticleApproved() {
+ return contentArticleApproved;
+ }
+
+
+ public void setContentArticleApproved(int contentArticleApproved) {
+ this.contentArticleApproved = contentArticleApproved;
+ }
+
+
+ public int getContentArticlePublished() {
+ return contentArticlePublished;
+ }
+
+
+ public void setContentArticlePublished(int contentArticlePublished) {
+ this.contentArticlePublished = contentArticlePublished;
+ }
+
+
+ public int getContentBannersDraft() {
+ return contentBannersDraft;
+ }
+
+
+ public void setContentBannersDraft(int contentBannersDraft) {
+ this.contentBannersDraft = contentBannersDraft;
+ }
+
+
+ public int getContentBannersFinished() {
+ return contentBannersFinished;
+ }
+
+
+ public void setContentBannersFinished(int contentBannersFinished) {
+ this.contentBannersFinished = contentBannersFinished;
+ }
+
+
+ public int getContentBannersApproved() {
+ return contentBannersApproved;
+ }
+
+
+ public void setContentBannersApproved(int contentBannersApproved) {
+ this.contentBannersApproved = contentBannersApproved;
+ }
+
+
+ public int getContentBannersPublished() {
+ return contentBannersPublished;
+ }
+
+
+ public void setContentBannersPublished(int contentBannersPublished) {
+ this.contentBannersPublished = contentBannersPublished;
+ }
+
+
+ public int getContentLinkDraft() {
+ return contentLinkDraft;
+ }
+
+
+ public void setContentLinkDraft(int contentLinkDraft) {
+ this.contentLinkDraft = contentLinkDraft;
+ }
+
+
+ public int getContentLinkFinished() {
+ return contentLinkFinished;
+ }
+
+
+ public void setContentLinkFinished(int contentLinkFinished) {
+ this.contentLinkFinished = contentLinkFinished;
+ }
+
+
+ public int getContentLinkApproved() {
+ return contentLinkApproved;
+ }
+
+
+ public void setContentLinkApproved(int contentLinkApproved) {
+ this.contentLinkApproved = contentLinkApproved;
+ }
+
+
+ public int getContentLinkPublished() {
+ return contentLinkPublished;
+ }
+
+
+ public void setContentLinkPublished(int contentLinkPublished) {
+ this.contentLinkPublished = contentLinkPublished;
+ }
+
+
+ public int getContentFaqitemDraft() {
+ return contentFaqitemDraft;
+ }
+
+
+ public void setContentFaqitemDraft(int contentFaqitemDraft) {
+ this.contentFaqitemDraft = contentFaqitemDraft;
+ }
+
+
+ public int getContentFaqitemFinished() {
+ return contentFaqitemFinished;
+ }
+
+
+ public void setContentFaqitemFinished(int contentFaqitemFinished) {
+ this.contentFaqitemFinished = contentFaqitemFinished;
+ }
+
+
+ public int getContentFaqitemApproved() {
+ return contentFaqitemApproved;
+ }
+
+
+ public void setContentFaqitemApproved(int contentFaqitemApproved) {
+ this.contentFaqitemApproved = contentFaqitemApproved;
+ }
+
+
+ public int getContentFaqitemPublished() {
+ return contentFaqitemPublished;
+ }
+
+
+ public void setContentFaqitemPublished(int contentFaqitemPublished) {
+ this.contentFaqitemPublished = contentFaqitemPublished;
+ }
+
+
+ public int getAssetImagesDraft() {
+ return assetImagesDraft;
+ }
+
+
+ public void setAssetImagesDraft(int assetImagesDraft) {
+ this.assetImagesDraft = assetImagesDraft;
+ }
+
+
+ public int getAssetImagesFinished() {
+ return assetImagesFinished;
+ }
+
+
+ public void setAssetImagesFinished(int assetImagesFinished) {
+ this.assetImagesFinished = assetImagesFinished;
+ }
+
+
+ public int getAssetImagesApproved() {
+ return assetImagesApproved;
+ }
+
+
+ public void setAssetImagesApproved(int assetImagesApproved) {
+ this.assetImagesApproved = assetImagesApproved;
+ }
+
+
+ public int getAssetImagesPublished() {
+ return assetImagesPublished;
+ }
+
+
+ public void setAssetImagesPublished(int assetImagesPublished) {
+ this.assetImagesPublished = assetImagesPublished;
+ }
+
+
+ public int getAssetAttachmentsDraft() {
+ return assetAttachmentsDraft;
+ }
+
+
+ public void setAssetAttachmentsDraft(int assetAttachmentsDraft) {
+ this.assetAttachmentsDraft = assetAttachmentsDraft;
+ }
+
+
+ public int getAssetAttachmentsFinished() {
+ return assetAttachmentsFinished;
+ }
+
+
+ public void setAssetAttachmentsFinished(int assetAttachmentsFinished) {
+ this.assetAttachmentsFinished = assetAttachmentsFinished;
+ }
+
+
+ public int getAssetAttachmentsApproved() {
+ return assetAttachmentsApproved;
+ }
+
+
+ public void setAssetAttachmentsApproved(int assetAttachmentsApproved) {
+ this.assetAttachmentsApproved = assetAttachmentsApproved;
+ }
+
+
+ public int getAssetAttachmentsPublished() {
+ return assetAttachmentsPublished;
+ }
+
+
+ public void setAssetAttachmentsPublished(int assetAttachmentsPublished) {
+ this.assetAttachmentsPublished = assetAttachmentsPublished;
+ }
+
+
+ public int getAssetUrlsDraft() {
+ return assetUrlsDraft;
+ }
+
+
+ public void setAssetUrlsDraft(int assetUrlsDraft) {
+ this.assetUrlsDraft = assetUrlsDraft;
+ }
+
+
+ public int getAssetUrlsFinished() {
+ return assetUrlsFinished;
+ }
+
+
+ public void setAssetUrlsFinished(int assetUrlsFinished) {
+ this.assetUrlsFinished = assetUrlsFinished;
+ }
+
+
+ public int getAssetUrlsApproved() {
+ return assetUrlsApproved;
+ }
+
+
+ public void setAssetUrlsApproved(int assetUrlsApproved) {
+ this.assetUrlsApproved = assetUrlsApproved;
+ }
+
+
+ public int getAssetUrlsPublished() {
+ return assetUrlsPublished;
+ }
+
+
+ public void setAssetUrlsPublished(int assetUrlsPublished) {
+ this.assetUrlsPublished = assetUrlsPublished;
+ }
+ private int contentDraft;
+ public int getAllcontentDraft() {
+ return allcontentDraft;
+ }
+
+
+ public void setAllcontentDraft(int allcontentDraft) {
+ this.allcontentDraft = allcontentDraft;
+ }
+
+
+ public int getAllcontentFinished() {
+ return allcontentFinished;
+ }
+
+
+ public void setAllcontentFinished(int allcontentFinished) {
+ this.allcontentFinished = allcontentFinished;
+ }
+
+
+ public int getAllcontentApproved() {
+ return allcontentApproved;
+ }
+
+
+ public void setAllcontentApproved(int allcontentApproved) {
+ this.allcontentApproved = allcontentApproved;
+ }
+
+
+ public int getAllcontentPublished() {
+ return allcontentPublished;
+ }
+
+
+ public void setAllcontentPublished(int allcontentPublished) {
+ this.allcontentPublished = allcontentPublished;
+ }
+
+
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
