From 10bb4deb6753e02ec5e264094681d9623ed72de0 Mon Sep 17 00:00:00 2001 From: Andre Colle Date: Fri, 21 Mar 2025 13:22:29 +0100 Subject: [PATCH 1/2] New field Dialogue Meeting Id --- ...eeting__c-Dialogue Meeting Layout.layout-meta.xml | 4 ++++ .../DialogueMeetingId__c.fieldTranslation-meta.xml | 5 +++++ .../DialogueMeeting__c.object-meta.xml | 2 +- .../fields/DialogueMeetingId__c.field-meta.xml | 12 ++++++++++++ .../Related_To_is_required.validationRule-meta.xml | 4 ++-- 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 force-app/main/default/objectTranslations/DialogueMeeting__c-no/DialogueMeetingId__c.fieldTranslation-meta.xml create mode 100644 force-app/main/default/objects/DialogueMeeting__c/fields/DialogueMeetingId__c.field-meta.xml diff --git a/force-app/main/default/layouts/DialogueMeeting__c-Dialogue Meeting Layout.layout-meta.xml b/force-app/main/default/layouts/DialogueMeeting__c-Dialogue Meeting Layout.layout-meta.xml index 7b5391e0c..731aa91ec 100644 --- a/force-app/main/default/layouts/DialogueMeeting__c-Dialogue Meeting Layout.layout-meta.xml +++ b/force-app/main/default/layouts/DialogueMeeting__c-Dialogue Meeting Layout.layout-meta.xml @@ -36,6 +36,10 @@ Edit OwnerId + + Edit + DialogueMeetingId__c + diff --git a/force-app/main/default/objectTranslations/DialogueMeeting__c-no/DialogueMeetingId__c.fieldTranslation-meta.xml b/force-app/main/default/objectTranslations/DialogueMeeting__c-no/DialogueMeetingId__c.fieldTranslation-meta.xml new file mode 100644 index 000000000..3c19af4e5 --- /dev/null +++ b/force-app/main/default/objectTranslations/DialogueMeeting__c-no/DialogueMeetingId__c.fieldTranslation-meta.xml @@ -0,0 +1,5 @@ + + + + DialogueMeetingId__c + diff --git a/force-app/main/default/objects/DialogueMeeting__c/DialogueMeeting__c.object-meta.xml b/force-app/main/default/objects/DialogueMeeting__c/DialogueMeeting__c.object-meta.xml index 467451246..54006202e 100644 --- a/force-app/main/default/objects/DialogueMeeting__c/DialogueMeeting__c.object-meta.xml +++ b/force-app/main/default/objects/DialogueMeeting__c/DialogueMeeting__c.object-meta.xml @@ -156,7 +156,7 @@ Private - + false Text diff --git a/force-app/main/default/objects/DialogueMeeting__c/fields/DialogueMeetingId__c.field-meta.xml b/force-app/main/default/objects/DialogueMeeting__c/fields/DialogueMeetingId__c.field-meta.xml new file mode 100644 index 000000000..0dd9a6aca --- /dev/null +++ b/force-app/main/default/objects/DialogueMeeting__c/fields/DialogueMeetingId__c.field-meta.xml @@ -0,0 +1,12 @@ + + + DialogueMeetingId__c + false + + 80 + false + false + false + Text + false + diff --git a/force-app/main/default/objects/Task/validationRules/Related_To_is_required.validationRule-meta.xml b/force-app/main/default/objects/Task/validationRules/Related_To_is_required.validationRule-meta.xml index b25e3b9b7..3cc9e8a49 100644 --- a/force-app/main/default/objects/Task/validationRules/Related_To_is_required.validationRule-meta.xml +++ b/force-app/main/default/objects/Task/validationRules/Related_To_is_required.validationRule-meta.xml @@ -2,6 +2,6 @@ Related_To_is_required true - IF( RecordType.Name = 'AG Oppgave' && ISBLANK( WhatId ) , true, false) - Feltet "Relatert til" må være fylt ut + IF( OR(RecordType.Name = 'AG Oppgave',RecordType.Name = 'IA task') && OR(ISBLANK( WhatId ),ISBLANK( TEXT(TAG_ActivityType__c) ),ISBLANK( TEXT(TAG_service__c) )), true, false) + Feltene "Relatert til", "Tema" og "Tjeneste" må være fylt ut From 7bde2ca8f4a4b9ad9258db740ea62bebfa1dffbc Mon Sep 17 00:00:00 2001 From: Andre Colle Date: Fri, 21 Mar 2025 19:39:03 +0100 Subject: [PATCH 2/2] Edit test-classes --- .../classes/Activity_AddAccountHelperTest.cls | 12 ++++++++++++ .../activities/classes/Activity_AddAccountTest.cls | 2 ++ 2 files changed, 14 insertions(+) diff --git a/force-app/functionality/activities/classes/Activity_AddAccountHelperTest.cls b/force-app/functionality/activities/classes/Activity_AddAccountHelperTest.cls index 2f9a23b43..d1a5d37ee 100644 --- a/force-app/functionality/activities/classes/Activity_AddAccountHelperTest.cls +++ b/force-app/functionality/activities/classes/Activity_AddAccountHelperTest.cls @@ -31,6 +31,8 @@ private without sharing class Activity_AddAccountHelperTest { TAG_NoPersonInformation__c = true, ActivityDate = Date.today(), RecordTypeId = agRecordType, + TAG_ActivityType__c = 'Rekruttere og inkludere', + TAG_service__c = 'Jobbmesser og møteplass', Subject = 'test', WhatId = tl.Id ); @@ -213,6 +215,8 @@ private without sharing class Activity_AddAccountHelperTest { TAG_NoPersonInformation__c = true, WhatId = acc.Id, ActivityDate = Date.today(), + TAG_ActivityType__c = 'Rekruttere og inkludere', + TAG_service__c = 'Jobbmesser og møteplass', Subject = 'test' ); insert t; @@ -221,6 +225,8 @@ private without sharing class Activity_AddAccountHelperTest { TAG_NoPersonInformation__c = true, WhatId = tl.Id, ActivityDate = Date.today(), + TAG_ActivityType__c = 'Rekruttere og inkludere', + TAG_service__c = 'Jobbmesser og møteplass', Subject = 'test' ); insert t2; @@ -244,6 +250,8 @@ private without sharing class Activity_AddAccountHelperTest { TAG_NoPersonInformation__c = true, WhatId = acc.Id, ActivityDate = Date.today(), + TAG_ActivityType__c = 'Rekruttere og inkludere', + TAG_service__c = 'Jobbmesser og møteplass', Subject = 'test' ); insert t; @@ -252,6 +260,8 @@ private without sharing class Activity_AddAccountHelperTest { TAG_NoPersonInformation__c = true, WhatId = tl.Id, ActivityDate = Date.today(), + TAG_ActivityType__c = 'Rekruttere og inkludere', + TAG_service__c = 'Jobbmesser og møteplass', Subject = 'test' ); insert t2; @@ -416,6 +426,8 @@ private without sharing class Activity_AddAccountHelperTest { RecordTypeId = agRecordType, ActivityDate = Date.today(), Subject = 'test', + TAG_ActivityType__c = 'Rekruttere og inkludere', + TAG_service__c = 'Jobbmesser og møteplass', WhatId = tl.Id ); diff --git a/force-app/functionality/activities/classes/Activity_AddAccountTest.cls b/force-app/functionality/activities/classes/Activity_AddAccountTest.cls index 453a767e0..a4eab0262 100644 --- a/force-app/functionality/activities/classes/Activity_AddAccountTest.cls +++ b/force-app/functionality/activities/classes/Activity_AddAccountTest.cls @@ -192,6 +192,8 @@ private without sharing class Activity_AddAccountTest { WhatId = tl.Id, ActivityDate = Date.today(), Subject = 'test', + TAG_ActivityType__c = 'Rekruttere og inkludere', + TAG_service__c = 'Jobbmesser og møteplass', RecordTypeId = agRecordType ); insert ta;