diff --git a/.sf/config.json b/.sf/config.json index a03d0e7c8..80f5f743f 100644 --- a/.sf/config.json +++ b/.sf/config.json @@ -1,3 +1,4 @@ { + "target-dev-hub": "gisle.stenseng@nav.no.dx", "target-org": "arbeidsgiver-base" -} +} \ No newline at end of file diff --git a/force-app/main/default/objectTranslations/IACooperation__c-no/Type_IA_Cooperation__c.fieldTranslation-meta.xml b/force-app/main/default/objectTranslations/IACooperation__c-no/Type_IA_Cooperation__c.fieldTranslation-meta.xml new file mode 100644 index 000000000..de2c602b7 --- /dev/null +++ b/force-app/main/default/objectTranslations/IACooperation__c-no/Type_IA_Cooperation__c.fieldTranslation-meta.xml @@ -0,0 +1,5 @@ + + + + Type_IA_Cooperation__c + diff --git a/force-app/main/default/objects/IACooperation__c/fields/Type_IA_Cooperation__c.field-meta.xml b/force-app/main/default/objects/IACooperation__c/fields/Type_IA_Cooperation__c.field-meta.xml new file mode 100644 index 000000000..1b9d3f6a9 --- /dev/null +++ b/force-app/main/default/objects/IACooperation__c/fields/Type_IA_Cooperation__c.field-meta.xml @@ -0,0 +1,21 @@ + + + Type_IA_Cooperation__c + false + IF(IncludedArbeidsmiljo__c, + "Arbeidsmiljø", + IF(IncludedPartssamarbeid__c, + "Partssamerbeid", + IF(IncludedSykefravaersarbeid__c, + "Sykefraværsarbeid", + "" + ) + ) +) + BlankAsZero + + false + false + Text + false + diff --git a/force-app/main/default/permissionsets/Arbeidsgiver_IA.permissionset-meta.xml b/force-app/main/default/permissionsets/Arbeidsgiver_IA.permissionset-meta.xml index 99b03fe02..dde2ead57 100644 --- a/force-app/main/default/permissionsets/Arbeidsgiver_IA.permissionset-meta.xml +++ b/force-app/main/default/permissionsets/Arbeidsgiver_IA.permissionset-meta.xml @@ -200,6 +200,11 @@ IACooperation__c.Status__c true + + false + IACooperation__c.Type_IA_Cooperation__c + true + false IADelivery__c.CompletedDate__c diff --git a/force-app/main/default/reportTypes/IA_Cooperations_with_IA_Themes_with_IA_Subthemes.reportType-meta.xml b/force-app/main/default/reportTypes/IA_Cooperations_with_IA_Themes_with_IA_Subthemes.reportType-meta.xml index b2e368e77..5e170aad1 100644 --- a/force-app/main/default/reportTypes/IA_Cooperations_with_IA_Themes_with_IA_Subthemes.reportType-meta.xml +++ b/force-app/main/default/reportTypes/IA_Cooperations_with_IA_Themes_with_IA_Subthemes.reportType-meta.xml @@ -114,6 +114,11 @@ PlanLastPublished__c IACooperation__c
+ + false + Type_IA_Cooperation__c + IACooperation__c
+
IA Cooperations diff --git a/force-app/main/default/reportTypes/IA_Sak_med_samarbeid_og_tilh_rende_aktiviteter.reportType-meta.xml b/force-app/main/default/reportTypes/IA_Sak_med_samarbeid_og_tilh_rende_aktiviteter.reportType-meta.xml index cf5e91d53..e6e56ff47 100644 --- a/force-app/main/default/reportTypes/IA_Sak_med_samarbeid_og_tilh_rende_aktiviteter.reportType-meta.xml +++ b/force-app/main/default/reportTypes/IA_Sak_med_samarbeid_og_tilh_rende_aktiviteter.reportType-meta.xml @@ -262,6 +262,11 @@ Status__c IACase__c.IA_Cooperations__r
+ + false + Type_IA_Cooperation__c + IACase__c.IA_Cooperations__r
+
IA Cooperations