diff --git a/Templates/JsonTemplates/_JsonTemplateParent.json b/Templates/JsonTemplates/_JsonTemplateParent.json
index 6b044c48f..843ae8b13 100644
--- a/Templates/JsonTemplates/_JsonTemplateParent.json
+++ b/Templates/JsonTemplates/_JsonTemplateParent.json
@@ -39,6 +39,10 @@
{
"Url": "SitePages/OverordnetKommunikasjon.aspx",
"Title": "Kommunikasjonsplaner"
+ },
+ {
+ "Url": "SitePages/OverordnetRessursallokeringer.aspx",
+ "Title": "Ressursallokeringer"
}
]
}
@@ -154,6 +158,34 @@
}
]
},
+ {
+ "Name": "OverordnetRessursallokeringer.aspx",
+ "Title": "Ressursallokeringer",
+ "PageLayoutType": "SingleWebPartAppPage",
+ "CommentsDisabled": true,
+ "Sections": [
+ {
+ "Columns": [
+ {
+ "Factor": 12,
+ "Controls": [
+ {
+ "Id": "{{ControlId_ProgramAggregationWebPart}}",
+ "Properties": {
+ "title": "Ressursallokeringer for underområder",
+ "dataSource": "Alle ressursallokeringer for underområder",
+ "dataSourceCategory": "Ressursallokering",
+ "showCommandBar": true,
+ "showViewSelector": true,
+ "showSearchBox": true
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
{
"Name": "OverordnetTidslinje.aspx",
"Title": "Tidslinje",
diff --git a/Templates/JsonTemplates/_JsonTemplateProgram.json b/Templates/JsonTemplates/_JsonTemplateProgram.json
index 451fda688..e106d2974 100644
--- a/Templates/JsonTemplates/_JsonTemplateProgram.json
+++ b/Templates/JsonTemplates/_JsonTemplateProgram.json
@@ -478,6 +478,10 @@
{
"Url": "SitePages/ProgramKommunikasjon.aspx",
"Title": "Kommunikasjonsplaner"
+ },
+ {
+ "Url": "SitePages/ProgramRessursallokeringer.aspx",
+ "Title": "Ressursallokeringer"
}
]
},
@@ -703,6 +707,34 @@
}
]
},
+ {
+ "Name": "ProgramRessursallokeringer.aspx",
+ "Title": "Ressursallokeringer",
+ "PageLayoutType": "SingleWebPartAppPage",
+ "CommentsDisabled": true,
+ "Sections": [
+ {
+ "Columns": [
+ {
+ "Factor": 12,
+ "Controls": [
+ {
+ "Id": "{{ControlId_ProgramAggregationWebPart}}",
+ "Properties": {
+ "title": "Ressursallokeringer for underområder",
+ "dataSource": "Alle ressursallokeringer for underområder",
+ "dataSourceCategory": "Ressursallokering",
+ "showCommandBar": true,
+ "showViewSelector": true,
+ "showSearchBox": true
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
{
"Name": "ProgramTidslinje.aspx",
"Title": "Tidslinje",
diff --git a/Templates/Portfolio/Objects/Lists/Datakilder.xml b/Templates/Portfolio/Objects/Lists/Datakilder.xml
index c213ac844..224017ccb 100644
--- a/Templates/Portfolio/Objects/Lists/Datakilder.xml
+++ b/Templates/Portfolio/Objects/Lists/Datakilder.xml
@@ -194,6 +194,16 @@
SizeLegacy
Portefølje
+
+ fbe4dcc8-ed4c-4c0a-ad52-4247ca90f9b3
+ Alle ressursallokeringer for underområder
+ (ContentTypeId:0x010004EAFF7AFCC94C2680042E6881264120* OR ContentTypeId:0x010029F45E75BA9CE340A83EFFB2927E11F4*) DepartmentId:{{sitecollectionid}}
+ Ressursallokering
+ 57,58,59,60,61,62,63,64,65
+ 57,58,62,64
+ SizeLegacy
+ Overordnet/Program
+
ba35f65e-a2d2-4853-8f7e-732ac0997e99
Alle prosjekter
diff --git a/Templates/Portfolio/Objects/Lists/Prosjektinnholdskolonner.xml b/Templates/Portfolio/Objects/Lists/Prosjektinnholdskolonner.xml
index 716435b70..c9b4a683a 100644
--- a/Templates/Portfolio/Objects/Lists/Prosjektinnholdskolonner.xml
+++ b/Templates/Portfolio/Objects/Lists/Prosjektinnholdskolonner.xml
@@ -387,7 +387,7 @@
610
- Status
+ Status kommunikasjonsaktivitet
GtActionStatus
GtActionStatusOWSCHCS
Text
@@ -407,7 +407,7 @@
200
- 630
+ 280
Tiltaksansvarlig
GtActionResponsible
GtActionResponsibleOWSUSER
@@ -626,7 +626,7 @@
640
- Kommentar
+ Kommentar, kommunikasjonsaktivitet
GtActionComment
GtActionCommentOWSMTXT
Note
@@ -634,6 +634,101 @@
200
300
+
+ 700
+ Navn
+ GtResourceUser
+ GtResourceUser
+ User
+ Ressursallokering
+ 100
+ 200
+ True
+
+
+ 710
+ Rolle
+ GtResourceRole
+ GtResourceRole
+ Tags
+ Ressursallokering
+ 200
+ 300
+ True
+
+
+
+ 720
+ Startdato
+ GtStartDate
+ Date
+ GtStartDateOWSDATE
+ Ressursallokering
+ 120
+ 200
+
+
+ 730
+ Sluttdato
+ GtEndDate
+ GtEndDateOWSDATE
+ Date
+ Ressursallokering
+ 120
+ 200
+
+
+ 740
+ Belastning
+ GtResourceLoad
+ GtResourceLoadOWSNMBR
+ Number
+ Ressursallokering
+ 100
+ 160
+
+
+ 750
+ Status allokering
+ GtAllocationStatus
+ GtAllocationOWSCHCS
+ Tags
+ Ressursallokering
+ 120
+ 200
+ True
+
+
+ 760
+ Kommentar, allokering
+ GtAllocationComment
+ GtAllocationCommentOWSMTXT
+ Note
+ Ressursallokering
+ 200
+ 300
+
+
+ 770
+ Fravær
+ GtResourceAbsence
+ GtResourceAbsenceOWSCHCS
+ Tags
+ Ressursallokering
+ 120
+ 200
+ True
+
+
+ 780
+ Kommentar, fravær
+ GtResourceAbsenceComment
+ GtResourceAbsenceCommentOWSMTXT
+ Note
+ Ressursallokering
+ 200
+ 300
+
\ No newline at end of file
diff --git a/Templates/Portfolio/Objects/SiteFields/ResourceAllocation/GtAllocationStatus.xml b/Templates/Portfolio/Objects/SiteFields/ResourceAllocation/GtAllocationStatus.xml
index 48f09739a..d752b1897 100644
--- a/Templates/Portfolio/Objects/SiteFields/ResourceAllocation/GtAllocationStatus.xml
+++ b/Templates/Portfolio/Objects/SiteFields/ResourceAllocation/GtAllocationStatus.xml
@@ -4,6 +4,6 @@
Forespurt
Tildelt
Avvist
- Annet (beskriv i kommentar
+ Annet (beskriv i kommentar)
\ No newline at end of file
diff --git a/Templates/Portfolio/Resources.no-NB.resx b/Templates/Portfolio/Resources.no-NB.resx
index b152bbf2f..b10f93a4e 100644
--- a/Templates/Portfolio/Resources.no-NB.resx
+++ b/Templates/Portfolio/Resources.no-NB.resx
@@ -902,7 +902,7 @@
Fravær
- Kommentar
+ Kommentar, fravær
Beskrivelse
@@ -1022,10 +1022,10 @@
Prosjektstatus
- Status
+ Status allokering
- Kommentar
+ Kommentar, allokering
Vedlegg
@@ -1052,7 +1052,7 @@
- Kommentar
+ Kommentar, kommunikasjonsaktivitet
Kommentar til kommunikasjonsaktiviteten