Merge branch 'Test_IRC_Net8' into Uat_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
036565ec81
|
@ -122,7 +122,7 @@ namespace IRaCIS.Api.Controllers
|
||||||
{
|
{
|
||||||
var token = _tokenService.GetToken(new UserTokenInfo()
|
var token = _tokenService.GetToken(new UserTokenInfo()
|
||||||
{
|
{
|
||||||
UserRoleId = Guid.NewGuid(),
|
IdentityUserId = Guid.NewGuid(),
|
||||||
UserName = "Share001",
|
UserName = "Share001",
|
||||||
UserTypeEnum = UserTypeEnum.ShareImage,
|
UserTypeEnum = UserTypeEnum.ShareImage,
|
||||||
|
|
||||||
|
|
|
@ -660,7 +660,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
trialInfo.ResearchProgramNo,
|
trialInfo.ResearchProgramNo,
|
||||||
trialInfo.TrialCode,
|
trialInfo.TrialCode,
|
||||||
sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName,
|
sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName,
|
||||||
$"{userType.UserTypeShortName} ({userType.UserTypeName})",
|
userType.UserTypeName,
|
||||||
sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
|
sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ namespace IRaCIS.Core.Application.Services
|
||||||
StudyId = imageShare.StudyId,
|
StudyId = imageShare.StudyId,
|
||||||
Token = _tokenService.GetToken(new UserTokenInfo()
|
Token = _tokenService.GetToken(new UserTokenInfo()
|
||||||
{
|
{
|
||||||
UserRoleId = Guid.NewGuid(),
|
IdentityUserId = Guid.NewGuid(),
|
||||||
FullName = "Share001",
|
FullName = "Share001",
|
||||||
UserName = "Share001",
|
UserName = "Share001",
|
||||||
UserTypeEnum = UserTypeEnum.ShareImage,
|
UserTypeEnum = UserTypeEnum.ShareImage,
|
||||||
|
|
|
@ -672,6 +672,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
TrialSiteSurveyId = currentEntity!.Id,
|
TrialSiteSurveyId = currentEntity!.Id,
|
||||||
Token = _tokenService.GetToken(new UserTokenInfo()
|
Token = _tokenService.GetToken(new UserTokenInfo()
|
||||||
{
|
{
|
||||||
|
IdentityUserId=Guid.NewGuid(),
|
||||||
UserRoleId = Guid.NewGuid(),
|
UserRoleId = Guid.NewGuid(),
|
||||||
UserName = "SiteSurvey",
|
UserName = "SiteSurvey",
|
||||||
UserTypeEnum = UserTypeEnum.Undefined,
|
UserTypeEnum = UserTypeEnum.Undefined,
|
||||||
|
|
Loading…
Reference in New Issue