From a7dc9f6a4cdf63ca056b0f108b63cecb3a85a6fd Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 24 May 2017 13:43:30 +0000 Subject: [PATCH] fixed bug on UserAcceptingInvite not reporting the invite date git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/email-templates-library@148974 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 2 +- .../templates/TemplateUserAcceptedInvite.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.classpath b/.classpath index b0366f3..d6c4436 100644 --- a/.classpath +++ b/.classpath @@ -20,7 +20,7 @@ - + diff --git a/src/main/java/org/gcube/portal/mailing/templates/TemplateUserAcceptedInvite.java b/src/main/java/org/gcube/portal/mailing/templates/TemplateUserAcceptedInvite.java index b517a94..25512e7 100644 --- a/src/main/java/org/gcube/portal/mailing/templates/TemplateUserAcceptedInvite.java +++ b/src/main/java/org/gcube/portal/mailing/templates/TemplateUserAcceptedInvite.java @@ -1,6 +1,7 @@ package org.gcube.portal.mailing.templates; import java.util.Base64; +import java.util.Date; import org.gcube.common.portal.mailing.templates.AbstractTemplate; import org.gcube.common.portal.mailing.templates.Template; @@ -14,11 +15,12 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser; public class TemplateUserAcceptedInvite extends AbstractTemplate implements Template { private final String encodedTemplateHTML = "<!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="min-height: 100%; background-color: #f3f3f3 !important;">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <meta name="viewport" content="width=device-width" />
    <title>Title</title>
  </head>
  <body style="width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; background-color: #f3f3f3 !important; margin: 0; padding: 0;" bgcolor="#f3f3f3 !important">
  <table class="body" data-made-with-foundation="" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; background-color: #f3f3f3 !important; height: 100%; width: 100%; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" bgcolor="#f3f3f3 !important"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td class="float-center" align="center" valign="top" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: center; float: none; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0;">
          <center data-parsed="" style="width: 100%; min-width: 580px;">
            <table align="center" class="wrapper header float-center" style="width: 100%; border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; float: none; margin: 0 auto; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td class="wrapper-inner" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left" valign="top">
                  <table align="center" class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; background: #fefefe; margin: 0 auto; padding: 0;" bgcolor="#fefefe"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left" valign="top">
                          <table class="row collapse" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: table; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th class="small-6 large-6 columns first" style="width: 298px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0 0 16px;" align="left">
                                  <table style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left"> <img src="{{GATEWAY_LOGO:URL}}" style="width: 200px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; max-width: 100%; clear: both; display: block;" alt="{{GATEWAY_NAME}}" title="{{GATEWAY_NAME}}" /></th>
                                    </tr></table></th>
                                <th class="small-6 large-6 columns last" style="width: 298px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0 0 16px;" align="left">
                                  <table style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left">
                                        <p class="text-right" style="text-align: right; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="right"></p>
                                      </th>
                                    </tr></table></th>
                              </tr></tbody></table></td>
                      </tr></tbody></table></td>
              </tr></table><table align="center" class="container body-border float-center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; float: none; border-top-width: 8px; border-top-color: #225f97; border-top-style: solid; background: #fefefe; margin: 0 auto; padding: 0;" bgcolor="#fefefe"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left" valign="top">
                    <table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: table; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th class="small-12 large-12 columns first last" style="width: 564px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0 16px 16px;" align="left">
                            <table style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left">
                                  <table class="spacer" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td height="32px" style="font-size: 32px; line-height: 32px; word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; mso-line-height-rule: exactly; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; margin: 0; padding: 0;" align="left" valign="top"> </td>
                                      </tr></tbody></table><center data-parsed="" style="width: 100%; min-width: 532px;">  <img src="{{USER_AVATAR_URL}}" style="width: 150px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; max-width: 100%; clear: both; display: block; float: none; text-align: center; margin: 0 auto;" align="center" class="float-center" /></center>
                                  <table class="spacer" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td height="16px" style="font-size: 16px; line-height: 16px; word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; mso-line-height-rule: exactly; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; margin: 0; padding: 0;" align="left" valign="top"> </td>
                                      </tr></tbody></table><h4 style="color: inherit; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; word-wrap: normal; font-size: 24px; margin: 0 0 10px; padding: 0;" align="left">{{USER_FULLNAME}} has accepted the invite on {{SELECTED_VRE_NAME}} VRE.</h4>
                                  
                                  <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">Further info about {{USER_FULLNAME}}:</p>
                                  <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">Email: {{USER_EMAIL}}</p>
                                  <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">Username: {{USER_ID}}</p>
                                  <br /></th>
                                <th class="expander" style="visibility: hidden; width: 0; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left"></th>
                              </tr></table></th>
                        </tr></tbody></table><table class="callout" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; margin-bottom: 16px; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th class="callout-inner warning" style="color: #fefefe; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; width: 100%; background: #fff3d9; margin: 0; padding: 10px; border: 1px solid #996800;" align="left" bgcolor="#fff3d9">
						      <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">You received this email because you are a manager of {{SELECTED_VRE_NAME}}.</p>
						      <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">The invite was sent by {{USER_WHO_INVITED}} ({{USER_WHO_INVITED_USERNAME}}) on {{INVITE_DATE}}.</p>
						    </th>
						    <th class="expander" style="visibility: hidden; width: 0; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left"></th>
						  </tr></table></td>
                </tr></tbody></table></center>
        </td>
      </tr></table></body>
</html>
"; private final String encodedTemplateTEXT = "e3tHQVRFV0FZX05BTUV9fQ0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0Ke3tVU0VSX0ZVTExOQU1FfX0gaGFzIGFjY2VwdGVkIHRoZSBpbnZpdGUgb24ge3tTRUxFQ1RFRF9WUkVfTkFNRX19IFZSRS4NCg0KRnVydGhlciBpbmZvIGFib3V0IHt7VVNFUl9GVUxMTkFNRX19Og0KDQpFbWFpbDoge3tVU0VSX0VNQUlMfX0NClVzZXJuYW1lOiB7e1VTRVJfSUR9fQ0KDQoNCllvdSByZWNlaXZlZCB0aGlzIGVtYWlsIGJlY2F1c2UgeW91IGFyZSBhIG1hbmFnZXIgb2Yge3tTRUxFQ1RFRF9WUkVfTkFNRX19Lg0KVGhlIGludml0ZSB3YXMgc2VudCBieSB7e1VTRVJfV0hPX0lOVklURUR9fSAoe3tVU0VSX1dIT19JTlZJVEVEX1VTRVJOQU1FfX0pIG9uIHt7SU5WSVRFX0RBVEV9fS4="; - + private GCubeUser theAcceptingUser; private String theUserWhoInvitedFullname; private String theUserWhoInvitedUsername; private String theVREName; + private Date inviteDate; /** * * @param theRegisteredUser @@ -27,19 +29,20 @@ public class TemplateUserAcceptedInvite extends AbstractTemplate implements Temp * @param gatewayName * @param gatewayURL */ - public TemplateUserAcceptedInvite(GCubeUser theAcceptingUser, String theVREName, String theUserWhoInvitedFullname, String theUserWhoInvitedUsername, String gatewayName, String gatewayURL) { + public TemplateUserAcceptedInvite(GCubeUser theAcceptingUser, String theVREName, String theUserWhoInvitedFullname, String theUserWhoInvitedUsername, Date inviteDate, String gatewayName, String gatewayURL) { super(gatewayName, gatewayURL); this.theAcceptingUser = theAcceptingUser; this.theVREName = theVREName; this.theUserWhoInvitedFullname = theUserWhoInvitedFullname; this.theUserWhoInvitedUsername = theUserWhoInvitedUsername; + this.inviteDate = inviteDate; } @Override public String compile(String templateContent) { String userAvatarURL = getGatewayURL()+this.theAcceptingUser.getUserAvatarURL(); - + return new String(Base64.getDecoder().decode(templateContent)) .replace("{{SELECTED_VRE_NAME}}", theVREName) .replace("{{USER_AVATAR_URL}}", userAvatarURL) @@ -49,14 +52,15 @@ public class TemplateUserAcceptedInvite extends AbstractTemplate implements Temp .replace("{{GATEWAY_NAME}}", getGatewayName()) .replace("{{USER_EMAIL}}", theAcceptingUser.getEmail()) .replace("{{USER_ID}}", theAcceptingUser.getUsername()) - .replace("{{USER_FULLNAME}}", theAcceptingUser.getFullname()); + .replace("{{USER_FULLNAME}}", theAcceptingUser.getFullname() + .replace("{{INVITE_DATE}}", this.inviteDate.toString())); } - + @Override public String getTextHTML() { return compile(encodedTemplateHTML); } - + @Override public String getTextPLAIN() { return compile(encodedTemplateTEXT);