diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index 2aece8a..f04abd0 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -2,7 +2,7 @@ "RequiredAttribute": "{0} is required", - "TrialService_OnlyInInitOrProgress": "Operations are allowed only when the project status is Initializing or Ongoing.", + "TrialService_OnlyInInitOrProgress": "Operations are allowed only when the project status is Ongoing.", "TrialService_ExistPN": "The same Project ID already exists", "SubjectService_ExistSubjectCode": "A patient with the relevant patient ID already exists.", diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index a0ae80c..3acbf7f 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -100,7 +100,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(userName, emailAddress)); //主题 - messageToSend.Subject = "[来自行藏] 关于重置邮箱的提醒"; + messageToSend.Subject = "[From Elevate Imaging] Reminder for Email Reset"; var builder = new BodyBuilder(); @@ -117,8 +117,8 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, - $" 尊敬的 {userName} , ", - "您正在进行邮箱重置操作", + $" Dear {userName} , ", + "You are resetting your Email.", verificationCode ); } @@ -161,7 +161,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 - messageToSend.Subject = "[来自行藏] 关于重置密码的提醒"; + messageToSend.Subject = "[From Elevate Imaging] Reminder for Password Reset"; @@ -180,7 +180,7 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, "", - "您正在进行邮箱重置密码操作", + "You are resetting your password,", verificationCode ); } @@ -226,7 +226,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 - messageToSend.Subject = $"[来自行藏]的提醒"; + messageToSend.Subject = $"[From Elevate Imaging] Reminder"; @@ -246,7 +246,7 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, "", - "您正在参与展影医疗IRC项目", + "You are participating in the image reading project of Elevate Imaging LLC.", verificationCode ); } @@ -367,7 +367,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 - messageToSend.Subject = "[来自行藏] 关于创建账户的提醒"; + messageToSend.Subject = "[From Elevate Imaging] Reminder for Account Creation"; @@ -421,7 +421,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 - messageToSend.Subject = "[来自行藏] 关于重置账户密码的提醒"; + messageToSend.Subject = "[From Elevate Imaging] Reminder for Password Reset"; @@ -469,7 +469,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 - messageToSend.Subject = $"[来自行藏] [{trialInfo.ResearchProgramNo}]邀请信"; + messageToSend.Subject = $"[From Elevate Imaging] [{trialInfo.ResearchProgramNo}] Invitation Letter"; @@ -532,7 +532,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(String.Empty, sysUserInfo.EMail)); //主题 - messageToSend.Subject = $"[来自行藏] [{trialInfo.ResearchProgramNo}]邀请信"; + messageToSend.Subject = $"[From Elevate Imaging] [{trialInfo.ResearchProgramNo}] Invitation Letter"; var builder = new BodyBuilder(); @@ -644,7 +644,7 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(doctor.FullName, doctor.EMail)); //主题 - messageToSend.Subject = $"[来自行藏] [{trialInfo.ResearchProgramNo}]邀请信"; + messageToSend.Subject = $"[From Elevate Imaging] [{trialInfo.ResearchProgramNo}] Invitation Letter"; var builder = new BodyBuilder(); diff --git a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs index 112b7e0..27ad7a0 100644 --- a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs @@ -110,7 +110,7 @@ namespace IRaCIS.Core.Application.Contracts { //userTypeEnums = new List() { UserTypeEnum.IQC, UserTypeEnum.APM, UserTypeEnum.MIM, UserTypeEnum.QA ,UserTypeEnum.MW}; - userTypeEnums = new List() { UserTypeEnum.IndependentReviewer, UserTypeEnum.ClinicalResearchCoordinator }; + userTypeEnums = new List() { UserTypeEnum.IndependentReviewer, UserTypeEnum.ClinicalResearchCoordinator,UserTypeEnum.ProjectManager }; if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin) {