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

IDEMPIERE-669 Zk: User Feedback Service. Added shortcut key ( ctrl+u for request, alt+u for email ) support. Added auto screen capture support ( tested on firefox and chrome, doesn't work for report and iframe ).

This commit is contained in:
Heng Sin Low 2013-02-28 16:00:04 +08:00
parent ac93bd4473
commit e0279e57d4
7 changed files with 2996 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
View File

@ -41,6 +41,7 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
<javascript src="/js/jquery-patch.js" charset="UTF-8"/>
<javascript src="/js/jquery.slimscroll.min.js" charset="UTF-8"/>
<javascript src="/js/jquery-ui-1.10.1.min.js" charset="UTF-8"/>
<javascript src="/js/html2canvas.js" charset="UTF-8"/>
<javascript package="jawwa.atmosphere" merge="false" />

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
View File

@ -235,7 +235,7 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
keyListener = new Keylistener();
keyListener.setPage(this.getPage());
keyListener.setCtrlKeys("@a@c@d@e@f@h@n@o@p@r@s@t@z@x@#left@#right@#up@#down@#home@#end#enter");
keyListener.setCtrlKeys("@a@c@d@e@f@h@n@o@p@r@s@t@z@x@#left@#right@#up@#down@#home@#end#enter^u@u");
keyListener.setAutoBlur(false);
IDesktop d = (IDesktop) currSess.getAttribute(APPLICATION_DESKTOP_KEY);

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
View File

@ -284,15 +284,15 @@ public class FeedbackRequestWindow extends Window implements EventListener<Event
ByteArrayDataSource dataSource = new ByteArrayDataSource(data, media.getContentType());
dataSource.setName(media.getName());
addAttachment(dataSource, true);
getFirstChild().invalidate();
}
}
}
private void addAttachment(DataSource dataSource, boolean removable) {
public void addAttachment(DataSource dataSource, boolean removable) {
attachments.add(dataSource);
AttachmentItem item = new AttachmentItem(dataSource, attachments, removable);
attachmentBox.appendChild(item);
getFirstChild().invalidate();
}
private byte[] getMediaData(Media media) {

132
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
View File

@ -14,17 +14,24 @@
package org.adempiere.webui.factory;
import javax.activation.DataSource;
import javax.xml.bind.DatatypeConverter;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.apps.FeedbackRequestWindow;
import org.adempiere.webui.component.Window;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.FeedbackManager;
import org.adempiere.webui.window.WEMailDialog;
import org.compiere.model.MSystem;
import org.compiere.model.MUser;
import org.compiere.util.ByteArrayDataSource;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.zkoss.zk.au.out.AuScript;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Window.Mode;
/**
@ -44,24 +51,7 @@ public class DefaultFeedbackService implements IFeedbackService {
*/
@Override
public void emailSupport(boolean errorOnly) {
DataSource ds = FeedbackManager.getLogAttachment(errorOnly);
WEMailDialog dialog = new WEMailDialog(
Msg.getMsg(Env.getCtx(), "EMailSupport"),
MUser.get(Env.getCtx()),
"", // to
"iDempiere " + Msg.getMsg(Env.getCtx(), "TraceInfo"),
"", ds);
dialog.setAttribute(Window.MODE_KEY, Mode.OVERLAPPED);
MSystem system = MSystem.get(Env.getCtx());
if (!Util.isEmpty(system.getSupportEMail()))
{
dialog.addTo(system.getSupportEMail(), true);
}
AEnv.showWindow(dialog);
dialog.focus();
new EmailSupportAction(errorOnly);
}
/* (non-Javadoc)
@ -69,9 +59,109 @@ public class DefaultFeedbackService implements IFeedbackService {
*/
@Override
public void createNewRequest() {
FeedbackRequestWindow window = new FeedbackRequestWindow();
AEnv.showWindow(window);
window.focus();
new CreateNewRequestAction();
}
private static class EmailSupportAction implements EventListener<Event>{
private boolean errorOnly;
protected EmailSupportAction(boolean errorOnly) {
this.errorOnly = errorOnly;
SessionManager.getAppDesktop().getComponent().addEventListener("onEmailSupport", this);
String script = "html2canvas(document.body, { onrendered: function(canvas) " +
"{ var dataUrl = canvas.toDataURL();" +
" var widget = zk.Widget.$('#" + SessionManager.getAppDesktop().getComponent().getUuid()+"');"+
" var event = new zk.Event(widget, 'onEmailSupport', dataUrl, {toServer: true});" +
" zAu.send(event); } " +
"});";
Clients.response(new AuScript(script));
}
@Override
public void onEvent(Event event) throws Exception {
SessionManager.getAppDesktop().getComponent().removeEventListener("onEmailSupport", this);
String dataUrl = (String) event.getData();
byte[] imageBytes = null;
if (dataUrl != null && dataUrl.startsWith("data:image/png;base64,"))
{
try {
// remove data:image/png;base64, and then take rest sting
String img64 = dataUrl.substring("data:image/png;base64,".length()).trim();
imageBytes = DatatypeConverter.parseBase64Binary(img64 );
} catch(Exception e) {
}
}
showEmailDialog(imageBytes);
}
private void showEmailDialog(byte[] imageBytes) {
DataSource ds = FeedbackManager.getLogAttachment(errorOnly);
WEMailDialog dialog = new WEMailDialog(
Msg.getMsg(Env.getCtx(), "EMailSupport"),
MUser.get(Env.getCtx()),
"", // to
"iDempiere " + Msg.getMsg(Env.getCtx(), "TraceInfo"),
"", ds);
dialog.setAttribute(Window.MODE_KEY, Mode.OVERLAPPED);
MSystem system = MSystem.get(Env.getCtx());
if (!Util.isEmpty(system.getSupportEMail()))
{
dialog.addTo(system.getSupportEMail(), true);
}
AEnv.showWindow(dialog);
if (imageBytes != null && imageBytes.length > 0) {
ByteArrayDataSource screenShot = new ByteArrayDataSource(imageBytes, "image/png");
screenShot.setName("screenshot.png");
dialog.addAttachment(screenShot, true);
}
dialog.focus();
}
}
private static class CreateNewRequestAction implements EventListener<Event>{
protected CreateNewRequestAction() {
SessionManager.getAppDesktop().getComponent().addEventListener("onCreateFeedbackRequest", this);
String script = "html2canvas(document.body, { onrendered: function(canvas) " +
"{ var dataUrl = canvas.toDataURL();" +
" var widget = zk.Widget.$('#" + SessionManager.getAppDesktop().getComponent().getUuid()+"');"+
" var event = new zk.Event(widget, 'onCreateFeedbackRequest', dataUrl, {toServer: true});" +
" zAu.send(event); } " +
"});";
Clients.response(new AuScript(script));
}
@Override
public void onEvent(Event event) throws Exception {
SessionManager.getAppDesktop().getComponent().removeEventListener("onCreateFeedbackRequest", this);
String dataUrl = (String) event.getData();
byte[] imageBytes = null;
if (dataUrl != null && dataUrl.startsWith("data:image/png;base64,"))
{
try {
// remove data:image/png;base64, and then take rest sting
String img64 = dataUrl.substring("data:image/png;base64,".length()).trim();
imageBytes = DatatypeConverter.parseBase64Binary(img64 );
} catch(Exception e) {
}
}
showRequestDialog(imageBytes);
}
private void showRequestDialog(byte[] imageBytes) {
FeedbackRequestWindow window = new FeedbackRequestWindow();
AEnv.showWindow(window);
if (imageBytes != null && imageBytes.length > 0) {
ByteArrayDataSource screenShot = new ByteArrayDataSource(imageBytes, "image/png");
screenShot.setName("screenshot.png");
window.addAttachment(screenShot, true);
}
window.focus();
}
}
}

20
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java
View File

@ -36,6 +36,7 @@ import org.compiere.util.Msg;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.event.KeyEvent;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Menuitem;
import org.zkoss.zul.Separator;
@ -145,6 +146,9 @@ public class UserPanel extends Vbox implements EventListener<Event>
mi.setId("EmailSupport");
mi.addEventListener(Events.ON_CLICK, this);
feedbackMenu.appendChild(mi);
SessionManager.getSessionApplication().getKeylistener().addEventListener(Events.ON_CTRL_KEY, this);
addEventListener("onEmailSupport", this);
}
private String getUserName()
@ -228,6 +232,22 @@ public class UserPanel extends Vbox implements EventListener<Event>
FeedbackManager.emailSupport(false);
}
}
else if (event instanceof KeyEvent)
{
//alt+u for email, ctrl+u for request
KeyEvent ke = (KeyEvent) event;
if (ke.getKeyCode() == 0x55)
{
if (ke.isAltKey())
{
FeedbackManager.emailSupport(false);
}
else if (ke.isCtrlKey())
{
FeedbackManager.createNewRequest();
}
}
}
}
}

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
View File

@ -514,14 +514,22 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
byte[] data = getMediaData(media);
ByteArrayDataSource dataSource = new ByteArrayDataSource(data, media.getContentType());
dataSource.setName(media.getName());
attachments.add(dataSource);
AttachmentItem item = new AttachmentItem(dataSource, attachments, true);
attachmentBox.appendChild(item);
getFirstChild().invalidate();
addAttachment(dataSource, true);
}
}
}
/**
* @param dataSource
* @param removeable
*/
public void addAttachment(DataSource dataSource, boolean removeable) {
attachments.add(dataSource);
AttachmentItem item = new AttachmentItem(dataSource, attachments, removeable);
attachmentBox.appendChild(item);
getFirstChild().invalidate();
}
private byte[] getMediaData(Media media) {
byte[] bytes = null;

2848
org.adempiere.ui.zk/js/html2canvas.js Normal file
View File

File diff suppressed because it is too large Load Diff