midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-126 Add unprocessed documents button to Activities dashboard 

http://jira.idempiere.com/browse/IDEMPIERE-126
This commit is contained in:
Carlos Ruiz 2012-01-27 11:33:50 -05:00
parent 9d7988ed89
commit be9a871b46
3 changed files with 77 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
migration/360lts-release/oracle/811_IDEMPIERE-126.sql Normal file
View File

@ -0,0 +1,13 @@
-- Jan 27, 2012 9:43:02 AM COT
-- IDEMPIERE-126 Add unprocessed documents
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,Value,IsActive,Updated,AD_Client_ID,AD_Org_ID,CreatedBy,Created,UpdatedBy) VALUES ('M','Unprocessed Documents',200000,'D','UnprocessedDocs','Y',TO_DATE('2012-01-27 09:43:01','YYYY-MM-DD HH24:MI:SS'),0,0,100,TO_DATE('2012-01-27 09:43:01','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Jan 27, 2012 9:43:02 AM COT
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200000 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- Jan 27, 2012 9:43:12 AM COT
UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Documentos sin Procesar',Updated=TO_DATE('2012-01-27 09:43:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200000 AND AD_Language LIKE 'es_%'
;

13
migration/360lts-release/postgresql/811_IDEMPIERE-126.sql Normal file
View File

@ -0,0 +1,13 @@
-- Jan 27, 2012 9:43:02 AM COT
-- IDEMPIERE-126 Add unprocessed documents
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,Value,IsActive,Updated,AD_Client_ID,AD_Org_ID,CreatedBy,Created,UpdatedBy) VALUES ('M','Unprocessed Documents',200000,'D','UnprocessedDocs','Y',TO_TIMESTAMP('2012-01-27 09:43:01','YYYY-MM-DD HH24:MI:SS'),0,0,100,TO_TIMESTAMP('2012-01-27 09:43:01','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Jan 27, 2012 9:43:02 AM COT
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200000 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- Jan 27, 2012 9:43:12 AM COT
UPDATE AD_Message_Trl SET IsTranslated='Y',MsgText='Documentos sin Procesar',Updated=TO_TIMESTAMP('2012-01-27 09:43:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200000 AND AD_Language LIKE 'es_%'
;

66
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
View File

@ -25,6 +25,7 @@ import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
@ -36,23 +37,26 @@ import org.zkoss.zul.Vbox;
* Dashboard item: Workflow activities, notices and requests * Dashboard item: Workflow activities, notices and requests
* @author Elaine * @author Elaine
* @date November 20, 2008 * @date November 20, 2008
*
* Contributors:
* CarlosRuiz - globalqss - Add unprocessed button to iDempiere
*/ */
public class DPActivities extends DashboardPanel implements EventListener { public class DPActivities extends DashboardPanel implements EventListener {
/** /**
* *
*/ */
private static final long serialVersionUID = 8123912981765687655L; private static final long serialVersionUID = 3787249181565314148L;
private static final CLogger logger = CLogger.getCLogger(DPActivities.class); private static final CLogger logger = CLogger.getCLogger(DPActivities.class);
private Button btnNotice, btnRequest, btnWorkflow; private Button btnNotice, btnRequest, btnWorkflow, btnUnprocessed;
private int noOfNotice; private String labelN, labelR, labelW, labelU;
private int noOfNotice, noOfRequest, noOfWorkflow, noOfUnprocessed;
private int noOfRequest; private boolean isShowUnprocessed;
private int noOfWorkflow;
public DPActivities() public DPActivities()
{ {
@ -62,12 +66,15 @@ public class DPActivities extends DashboardPanel implements EventListener {
private Box createActivitiesPanel() private Box createActivitiesPanel()
{ {
isShowUnprocessed = (Env.getAD_Client_ID(Env.getCtx()) > 0);
Vbox vbox = new Vbox(); Vbox vbox = new Vbox();
btnNotice = new Button(); btnNotice = new Button();
vbox.appendChild(btnNotice); vbox.appendChild(btnNotice);
btnNotice.setLabel(Msg.translate(Env.getCtx(), "AD_Note_ID") + " : 0"); labelN = Util.cleanAmp(Msg.translate(Env.getCtx(), "AD_Note_ID"));
btnNotice.setTooltiptext(Msg.translate(Env.getCtx(), "AD_Note_ID")); btnNotice.setLabel(labelN + " : 0");
btnNotice.setTooltiptext(labelN);
btnNotice.setImage("/images/GetMail16.png"); btnNotice.setImage("/images/GetMail16.png");
int AD_Menu_ID = DB.getSQLValue(null, "SELECT AD_Menu_ID FROM AD_Menu WHERE Name = 'Notice' AND IsSummary = 'N'"); int AD_Menu_ID = DB.getSQLValue(null, "SELECT AD_Menu_ID FROM AD_Menu WHERE Name = 'Notice' AND IsSummary = 'N'");
btnNotice.setName(String.valueOf(AD_Menu_ID)); btnNotice.setName(String.valueOf(AD_Menu_ID));
@ -75,8 +82,9 @@ public class DPActivities extends DashboardPanel implements EventListener {
btnRequest = new Button(); btnRequest = new Button();
vbox.appendChild(btnRequest); vbox.appendChild(btnRequest);
btnRequest.setLabel(Msg.translate(Env.getCtx(), "R_Request_ID") + " : 0"); labelR = Util.cleanAmp(Msg.translate(Env.getCtx(), "R_Request_ID"));
btnRequest.setTooltiptext(Msg.translate(Env.getCtx(), "R_Request_ID")); btnRequest.setLabel(labelR + " : 0");
btnRequest.setTooltiptext(labelR);
btnRequest.setImage("/images/Request16.png"); btnRequest.setImage("/images/Request16.png");
AD_Menu_ID = DB.getSQLValue(null, "SELECT AD_Menu_ID FROM AD_Menu WHERE Name = 'Request' AND IsSummary = 'N'"); AD_Menu_ID = DB.getSQLValue(null, "SELECT AD_Menu_ID FROM AD_Menu WHERE Name = 'Request' AND IsSummary = 'N'");
btnRequest.setName(String.valueOf(AD_Menu_ID)); btnRequest.setName(String.valueOf(AD_Menu_ID));
@ -84,13 +92,26 @@ public class DPActivities extends DashboardPanel implements EventListener {
btnWorkflow = new Button(); btnWorkflow = new Button();
vbox.appendChild(btnWorkflow); vbox.appendChild(btnWorkflow);
btnWorkflow.setLabel(Msg.getMsg (Env.getCtx(), "WorkflowActivities") + " : 0"); labelW = Util.cleanAmp(Msg.translate(Env.getCtx(), "WorkflowActivities"));
btnWorkflow.setTooltiptext(Msg.getMsg (Env.getCtx(), "WorkflowActivities")); btnWorkflow.setLabel(labelW + " : 0");
btnWorkflow.setTooltiptext(labelW);
btnWorkflow.setImage("/images/Assignment16.png"); btnWorkflow.setImage("/images/Assignment16.png");
AD_Menu_ID = DB.getSQLValue(null, "SELECT AD_Menu_ID FROM AD_Menu WHERE Name = 'Workflow Activities' AND IsSummary = 'N'"); AD_Menu_ID = DB.getSQLValue(null, "SELECT AD_Menu_ID FROM AD_Menu WHERE Name = 'Workflow Activities' AND IsSummary = 'N'");
btnWorkflow.setName(String.valueOf(AD_Menu_ID)); btnWorkflow.setName(String.valueOf(AD_Menu_ID));
btnWorkflow.addEventListener(Events.ON_CLICK, this); btnWorkflow.addEventListener(Events.ON_CLICK, this);
if (isShowUnprocessed) {
btnUnprocessed = new Button();
vbox.appendChild(btnUnprocessed);
labelU = Util.cleanAmp(Msg.translate(Env.getCtx(), "UnprocessedDocs"));
btnUnprocessed.setLabel(labelU + " : 0");
btnUnprocessed.setTooltiptext(labelU);
btnUnprocessed.setImage("/images/Open16.png");
AD_Menu_ID = DB.getSQLValue(null, "SELECT AD_Menu_ID FROM AD_Menu WHERE Name = 'My Unprocessed Documents' AND IsSummary = 'N'");
btnUnprocessed.setName(String.valueOf(AD_Menu_ID));
btnUnprocessed.addEventListener(Events.ON_CLICK, this);
}
return vbox; return vbox;
} }
@ -177,12 +198,26 @@ public class DPActivities extends DashboardPanel implements EventListener {
return count; return count;
} }
/**
* Get unprocessed count
* @return number of unprocessed
*/
public static int getUnprocessedCount()
{
String sql = "SELECT COUNT(1) FROM RV_Unprocessed "
+ "WHERE AD_Client_ID=? AND CreatedBy=?";
int retValue = DB.getSQLValue(null, sql, Env.getAD_Client_ID(Env.getCtx()), Env.getAD_User_ID(Env.getCtx()));
return retValue;
}
@Override @Override
public void refresh(ServerPushTemplate template) public void refresh(ServerPushTemplate template)
{ {
noOfNotice = getNoticeCount(); noOfNotice = getNoticeCount();
noOfRequest = getRequestCount(); noOfRequest = getRequestCount();
noOfWorkflow = getWorkflowCount(); noOfWorkflow = getWorkflowCount();
if (isShowUnprocessed) noOfUnprocessed = getUnprocessedCount();
template.execute(this); template.execute(this);
} }
@ -196,9 +231,10 @@ public class DPActivities extends DashboardPanel implements EventListener {
return; return;
c = c.getParent(); c = c.getParent();
} }
btnNotice.setLabel(Msg.translate(Env.getCtx(), "AD_Note_ID") + " : " + noOfNotice); btnNotice.setLabel(labelN + " : " + noOfNotice);
btnRequest.setLabel(Msg.translate(Env.getCtx(), "R_Request_ID") + " : " + noOfRequest); btnRequest.setLabel(labelR + " : " + noOfRequest);
btnWorkflow.setLabel(Msg.getMsg (Env.getCtx(), "WorkflowActivities") + " : " + noOfWorkflow); btnWorkflow.setLabel(labelW + " : " + noOfWorkflow);
if (isShowUnprocessed) btnUnprocessed.setLabel(labelU + " : " + noOfUnprocessed);
} }
public void onEvent(Event event) public void onEvent(Event event)