Skip to content
Snippets Groups Projects
Commit b2aef50b authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

MSTeams: Member: validation bugfixing

parent 8ab08a1d
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTTeamMember_entity/documentation.adoc</documentation>
<siblings />
<onValidation>%aditoprj%/entity/MSTTeamMember_entity/onValidation.js</onValidation>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
......@@ -89,14 +90,12 @@
<entityField>
<name>ROLE</name>
<title>Role</title>
<mandatoryProcess>%aditoprj%/entity/MSTTeamMember_entity/entityfields/role/mandatoryProcess.js</mandatoryProcess>
<dropDownProcess>%aditoprj%/entity/MSTTeamMember_entity/entityfields/role/dropDownProcess.js</dropDownProcess>
<stateProcess>%aditoprj%/entity/MSTTeamMember_entity/entityfields/role/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>INVITE</name>
<title>Invitation</title>
<mandatoryProcess>%aditoprj%/entity/MSTTeamMember_entity/entityfields/invite/mandatoryProcess.js</mandatoryProcess>
<dropDownProcess>%aditoprj%/entity/MSTTeamMember_entity/entityfields/invite/dropDownProcess.js</dropDownProcess>
<stateProcess>%aditoprj%/entity/MSTTeamMember_entity/entityfields/invite/stateProcess.js</stateProcess>
</entityField>
......@@ -112,6 +111,7 @@
<contentProcess>%aditoprj%/entity/MSTTeamMember_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<hasDependentRecords v="true" />
<onInsert>%aditoprj%/entity/MSTTeamMember_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/MSTTeamMember_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/MSTTeamMember_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFieldMappings>
<jDitoRecordFieldMapping>
......
import("system.result");
import("system.vars");
result.string(!vars.get("$field.MEMBERNAME") && vars.get("$field.ISEXTERN") == "true");
\ No newline at end of file
import("system.result");
import("system.vars");
result.string(vars.get("$field.ISEXTERN") != "true");
\ No newline at end of file
import("system.translate");
import("system.result");
import("system.vars");
var isExtern = vars.getString("$field.ISEXTERN") == "true";
var res;
if (vars.get("$field.CONTACT_ID"))
{
if (isExtern && !vars.get("$field.INVITE"))
{
res = translate.withArguments("Required value for %0 is missing", [vars.get("$property.INVITE.title")]);
}
else if(!isExtern && !vars.get("$field.ROLE"))
{
res = translate.withArguments("Required value for %0 is missing", [vars.get("$property.ROLE.title")]);
}
}
if (res)
result.string(res);
\ No newline at end of file
//updating is done in the MSTTeam_entity
var dummy = "dummy";
\ No newline at end of file
......@@ -10,12 +10,12 @@ var teamId = rowData["UID.value"];
var teamName = rowData["TEAMNAME.value"];
var description = rowData["DESCRIPTION.value"];
var insertedTeamMembers = vars.get("$field.TeamMembers.insertedRows");
var changedTeamMembers = vars.get("$field.TeamMembers.changedRows");
var deletedTeamMembers = vars.get("$field.TeamMembers.deletedRows");
var internalMembers = [];
var externalMembers = [];
insertedTeamMembers.forEach(function (teamMember)
{
insertedTeamMembers.forEach(function (teamMember){
var memberUser = EmployeeUtils.getUserByContactId(teamMember["CONTACT_ID"]);
if (!memberUser)
{
......@@ -45,6 +45,13 @@ if (internalMembers.length !== 0)
if (externalMembers.length !== 0)
teams.addExternalMembers(teamId, externalMembers);
changedTeamMembers.forEach(function (teamMember){
var memberUser = EmployeeUtils.getUserByContactId(teamMember["CONTACT_ID"]);
//teams.changeRole(teamId, );
});
var owners = teams.getAllOwners(teamId);
var removeMembers = deletedTeamMembers.map(function (member)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment