changed notification templates from dmp to plan
This commit is contained in:
Diamantis Tziotzios
parent
161826401b
commit
5ef40d80a4
|
|
@ -1414,8 +1414,8 @@ public class DmpServiceImpl implements DmpService {
|
|||
List<FieldInfo> fieldInfoList = new ArrayList<>();
|
||||
fieldInfoList.add(new FieldInfo("{recipient}", DataType.String, recipient.getName()));
|
||||
fieldInfoList.add(new FieldInfo("{reasonName}", DataType.String, this.queryFactory.query(UserQuery.class).disableTracking().ids(this.userScope.getUserIdSafe()).first().getName()));
|
||||
fieldInfoList.add(new FieldInfo("{dmpname}", DataType.String, dmp.getLabel()));
|
||||
fieldInfoList.add(new FieldInfo("{dmprole}", DataType.String, role.toString()));
|
||||
fieldInfoList.add(new FieldInfo("{planname}", DataType.String, dmp.getLabel()));
|
||||
fieldInfoList.add(new FieldInfo("{planrole}", DataType.String, role.toString()));
|
||||
fieldInfoList.add(new FieldInfo("{id}", DataType.String, dmp.getId().toString()));
|
||||
data.setFields(fieldInfoList);
|
||||
event.setData(this.jsonHandlingService.toJsonSafe(data));
|
||||
|
|
@ -1437,8 +1437,8 @@ public class DmpServiceImpl implements DmpService {
|
|||
List<FieldInfo> fieldInfoList = new ArrayList<>();
|
||||
fieldInfoList.add(new FieldInfo("{recipient}", DataType.String, email));
|
||||
fieldInfoList.add(new FieldInfo("{confirmationToken}", DataType.String, token));
|
||||
fieldInfoList.add(new FieldInfo("{dmpname}", DataType.String, dmp.getLabel()));
|
||||
fieldInfoList.add(new FieldInfo("{dmprole}", DataType.String, role.toString()));
|
||||
fieldInfoList.add(new FieldInfo("{planname}", DataType.String, dmp.getLabel()));
|
||||
fieldInfoList.add(new FieldInfo("{planrole}", DataType.String, role.toString()));
|
||||
data.setFields(fieldInfoList);
|
||||
event.setData(this.jsonHandlingService.toJsonSafe(data));
|
||||
this.eventHandler.handle(event);
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@ notification:
|
|||
value: "http://localhost:4200"
|
||||
resolver:
|
||||
global-policies:
|
||||
- #dmpInvitationExternalUser
|
||||
- #planInvitationExternalUser
|
||||
type: 065DEECD-21BB-44AF-9983-E660FDF24BC4
|
||||
contacts: [ email ]
|
||||
- #dmpInvitationExistingUser
|
||||
- #planInvitationExistingUser
|
||||
type: 4904dea2-5079-46d3-83be-3a19c9ab45dc
|
||||
contacts: [ email, inapp ]
|
||||
- #dpmModified
|
||||
type: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
|
||||
contacts: [ inapp, email ]
|
||||
- #dmpFinalised
|
||||
- #planFinalised
|
||||
type: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
|
||||
contacts: [ inapp, email ]
|
||||
- #descriptionModified
|
||||
|
|
@ -30,7 +30,7 @@ notification:
|
|||
- #removeCredentialConfirmation
|
||||
type: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
|
||||
contacts: [ email ]
|
||||
- #dmpDeposit
|
||||
- #planDeposit
|
||||
type: 55736F7A-83AB-4190-AF43-9D031A6F9612
|
||||
contacts: [ inapp, email ]
|
||||
- #descriptionTemplateInvitation
|
||||
|
|
@ -45,21 +45,21 @@ notification:
|
|||
message:
|
||||
email:
|
||||
flows:
|
||||
- #dmpInvitationExternalUser
|
||||
- #planInvitationExternalUser
|
||||
key: 065DEECD-21BB-44AF-9983-E660FDF24BC4
|
||||
subject-path: classpath:notification_templates/dmpinvitationexternaluser/email/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/planinvitationexternaluser/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpinvitationexternaluser/email/body.{language}.html
|
||||
body-path: classpath:notification_templates/planinvitationexternaluser/email/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{dmpname}", "{dmprole}", "{installation-url}", "{confirmationToken}" ]
|
||||
mandatory: [ "{planname}", "{planrole}", "{installation-url}", "{confirmationToken}" ]
|
||||
optional:
|
||||
- key: "{recipient}"
|
||||
value:
|
||||
formatting:
|
||||
'[{dmpname}]': null
|
||||
'[{dmprole}]': null
|
||||
'[{planname}]': null
|
||||
'[{planrole}]': null
|
||||
'[{recipient}]': null
|
||||
cc: [ ]
|
||||
cc-mode: 0
|
||||
|
|
@ -67,21 +67,21 @@ notification:
|
|||
bcc-mode: 0
|
||||
allow-attachments: false
|
||||
cipher-fields: [ ]
|
||||
- #dmpInvitationExistingUser
|
||||
- #planInvitationExistingUser
|
||||
key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
|
||||
subject-path: classpath:notification_templates/dmpinvitationexistinguser/email/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/planinvitationexistinguser/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpinvitationexistinguser/email/body.{language}.html
|
||||
body-path: classpath:notification_templates/planinvitationexistinguser/email/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}"]
|
||||
mandatory: [ "{planname}", "{planrole}", "{reasonName}", "{installation-url}", "{id}"]
|
||||
optional:
|
||||
- key: "{recipient}"
|
||||
value:
|
||||
formatting:
|
||||
'[{dmpname}]': null
|
||||
'[{dmprole}]': null
|
||||
'[{planname}]': null
|
||||
'[{planrole}]': null
|
||||
'[{reasonName}]': null
|
||||
'[{recipient}]': null
|
||||
cc: [ ]
|
||||
|
|
@ -90,13 +90,13 @@ notification:
|
|||
bcc-mode: 0
|
||||
allow-attachments: false
|
||||
cipher-fields: [ ]
|
||||
- #dmpModified
|
||||
- #planModified
|
||||
key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
|
||||
subject-path: classpath:notification_templates/dmpmodified/email/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/planmodified/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpmodified/email/body.{language}.html
|
||||
body-path: classpath:notification_templates/planmodified/email/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
|
||||
optional:
|
||||
|
|
@ -112,13 +112,13 @@ notification:
|
|||
bcc-mode: 0
|
||||
allow-attachments: false
|
||||
cipher-fields: [ ]
|
||||
- #dmpFinalised
|
||||
- #planFinalised
|
||||
key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
|
||||
subject-path: classpath:notification_templates/dmpfinalised/email/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/planfinalised/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpfinalised/email/body.{language}.html
|
||||
body-path: classpath:notification_templates/planfinalised/email/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
|
||||
optional:
|
||||
|
|
@ -222,13 +222,13 @@ notification:
|
|||
bcc-mode: 0
|
||||
allow-attachments: false
|
||||
cipher-fields: [ ]
|
||||
- #dmpDeposit
|
||||
- #planDeposit
|
||||
key: 55736F7A-83AB-4190-AF43-9D031A6F9612
|
||||
subject-path: classpath:notification_templates/dmpdeposit/email/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/plandeposit/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpdeposit/email/body.{language}.html
|
||||
body-path: classpath:notification_templates/plandeposit/email/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
|
||||
optional:
|
||||
|
|
@ -244,7 +244,7 @@ notification:
|
|||
bcc-mode: 0
|
||||
allow-attachments: false
|
||||
cipher-fields: [ ]
|
||||
- #descriptionTemplateInvitation
|
||||
- #descriptionTemplateInvitation
|
||||
key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
|
||||
subject-path: classpath:notification_templates/descriptiontemplateinvitation/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
|
|
@ -265,7 +265,7 @@ notification:
|
|||
bcc-mode: 0
|
||||
allow-attachments: false
|
||||
cipher-fields: [ ]
|
||||
- #contactSupportType
|
||||
- #contactSupportType
|
||||
key: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD
|
||||
subject-path: classpath:notification_templates/contactsupport/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
|
|
@ -284,7 +284,7 @@ notification:
|
|||
bcc-mode: 0
|
||||
allow-attachments: false
|
||||
cipher-fields: [ ]
|
||||
- #publicContactSupportType
|
||||
- #publicContactSupportType
|
||||
key: B542B606-ACC6-4629-ADEF-4D8EE2F01222
|
||||
subject-path: classpath:notification_templates/publiccontactsupport/email/subject.{language}.txt
|
||||
subject-field-options:
|
||||
|
|
@ -309,32 +309,32 @@ notification:
|
|||
key-pattern: "{prefix}:Notification_Message_Email_Template:{key}:v0"
|
||||
in-app:
|
||||
flows:
|
||||
- #dmpInvitationExistingUser
|
||||
- #planInvitationExistingUser
|
||||
key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
|
||||
subject-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/planinvitationexistinguser/inapp/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/body.{language}.html
|
||||
body-path: classpath:notification_templates/planinvitationexistinguser/inapp/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}" ]
|
||||
mandatory: [ "{planname}", "{planrole}", "{reasonName}", "{installation-url}", "{id}" ]
|
||||
optional:
|
||||
- key: "{recipient}"
|
||||
value:
|
||||
formatting:
|
||||
'[{dmpname}]': null
|
||||
'[{dmprole}]': null
|
||||
'[{planname}]': null
|
||||
'[{planrole}]': null
|
||||
'[{reasonName}]': null
|
||||
'[{recipient}]': null
|
||||
priority-key: null
|
||||
cipher-fields: [ ]
|
||||
- #dmpModified
|
||||
- #planModified
|
||||
key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
|
||||
subject-path: classpath:notification_templates/dmpmodified/inapp/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/planmodified/inapp/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpmodified/inapp/body.{language}.html
|
||||
body-path: classpath:notification_templates/planmodified/inapp/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
|
||||
optional:
|
||||
|
|
@ -348,13 +348,13 @@ notification:
|
|||
'[{recipient}]': null
|
||||
priority-key: null
|
||||
cipher-fields: [ ]
|
||||
- #dmpFinalised
|
||||
- #planFinalised
|
||||
key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
|
||||
subject-path: classpath:notification_templates/dmpfinalised/inapp/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/planfinalised/inapp/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpfinalised/inapp/body.{language}.html
|
||||
body-path: classpath:notification_templates/planfinalised/inapp/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
|
||||
optional:
|
||||
|
|
@ -446,13 +446,13 @@ notification:
|
|||
'[{expiration_time}]': null
|
||||
priority-key: null
|
||||
cipher-fields: [ ]
|
||||
- #dmpDeposit
|
||||
- #planDeposit
|
||||
key: 55736F7A-83AB-4190-AF43-9D031A6F9612
|
||||
subject-path: classpath:notification_templates/dmpdeposit/inapp/subject.{language}.txt
|
||||
subject-path: classpath:notification_templates/plandeposit/inapp/subject.{language}.txt
|
||||
subject-field-options:
|
||||
mandatory: [ ]
|
||||
optional: [ ]
|
||||
body-path: classpath:notification_templates/dmpdeposit/inapp/body.{language}.html
|
||||
body-path: classpath:notification_templates/plandeposit/inapp/body.{language}.html
|
||||
body-field-options:
|
||||
mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
|
||||
optional:
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
ARGOS - Dmp Deposit
|
||||
|
|
@ -1 +0,0 @@
|
|||
ARGOS - Dmp Deposit
|
||||
|
|
@ -1 +0,0 @@
|
|||
ARGOS - Dmp Finalised
|
||||
|
|
@ -1 +0,0 @@
|
|||
ARGOS - Dmp Finalised
|
||||
|
|
@ -1 +0,0 @@
|
|||
ARGOS - Dmp Modified
|
||||
|
|
@ -1 +0,0 @@
|
|||
ARGOS - Dmp Modified
|
||||
|
|
@ -0,0 +1 @@
|
|||
ARGOS - Plan Deposit
|
||||
|
|
@ -0,0 +1 @@
|
|||
ARGOS - Plan Deposit
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
<tr>
|
||||
<td>
|
||||
<p>Dear {recipient},</p>
|
||||
<p>{reasonName} just finalised the Dmp {name}.</p>
|
||||
<p>{reasonName} just finalised the Plan {name}.</p>
|
||||
|
||||
<table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
|
||||
<tbody>
|
||||
|
|
@ -0,0 +1 @@
|
|||
ARGOS - Plan Finalised
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
</head>
|
||||
<body class="">
|
||||
<p>Dear {recipient},</p>
|
||||
<p>{reasonName} just finalised the Dmp {name}.</p>
|
||||
<p>{reasonName} just finalised the Plan {name}.</p>
|
||||
<a href="{installation-url}/plans/overview/{id}" target="_blank">Click here to view it.</a>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1 @@
|
|||
ARGOS - Plan Finalised
|
||||
|
|
@ -261,8 +261,8 @@
|
|||
<tr>
|
||||
<td>
|
||||
<p>Dear {recipient},</p>
|
||||
<p>{reasonName} just add you to collaborate to Data Management plan {dmpname} with role {dmprole}.</p>
|
||||
<p>Click the button to redirect to {dmpname}.</p>
|
||||
<p>{reasonName} just add you to collaborate to the Plan {planname} with role {planrole}.</p>
|
||||
<p>Click the button to redirect to {planname}.</p>
|
||||
|
||||
<table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
|
||||
<tbody>
|
||||
|
|
@ -7,8 +7,8 @@
|
|||
</head>
|
||||
<body class="">
|
||||
<p>Dear {recipient},</p>
|
||||
<p>{reasonName} just add you to collaborate to Data Management plan {dmpname} with role {dmprole}.</p>
|
||||
<p>Click the button to redirect to {dmpname}.</p>
|
||||
<p>{reasonName} just added you to collaborate to the Plan {planname} with role {planrole}.</p>
|
||||
<p>Click the button to redirect to {planname}.</p>
|
||||
<a href="{installation-url}/plans/overview/{id}" target="_blank">Join</a>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -261,8 +261,8 @@
|
|||
<tr>
|
||||
<td>
|
||||
<p>Dear {recipient},</p>
|
||||
<p>You have been invited to collaborate to Data Management plan {dmpname} with role {dmprole}.</p>
|
||||
<p>Click the button to redirect to {dmpname}.</p>
|
||||
<p>You have been invited to collaborate to the Plan {planname} with role {planrole}.</p>
|
||||
<p>Click the button to redirect to {planname}.</p>
|
||||
|
||||
<table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
|
||||
<tbody>
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
<tr>
|
||||
<td>
|
||||
<p>Dear {recipient},</p>
|
||||
<p>{reasonName} just made changes to the Dmp {name}.</p>
|
||||
<p>{reasonName} just made changes to the Plan {name}.</p>
|
||||
|
||||
<table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
|
||||
<tbody>
|
||||
|
|
@ -0,0 +1 @@
|
|||
ARGOS - Plan Modified
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
</head>
|
||||
<body class="">
|
||||
<p>Dear {recipient},</p>
|
||||
<p>{reasonName} just made changes to the Dmp {name}.</p>
|
||||
<p>{reasonName} just made changes to the Plan {name}.</p>
|
||||
<a href="{installation-url}/plans/overview/{id}" target="_blank">Click here to view it.</a>
|
||||
</table>
|
||||
</body>
|
||||
|
|
@ -0,0 +1 @@
|
|||
ARGOS - Plan Modified
|
||||
Loading…
Reference in New Issue