Merge branch 'dev' into feature/#433

CHANGELOG.md

@@ -5,47 +5,52 @@ Every change is marked with issue ID.
 
 ## 1.3.0 - TBA
 
-## Added
+### Added 
 
 - Added new multi-user field _Prosjektstøtte_ #526
-- Added read-only project cards to projectlist #498
+- Added read-only project cards to project list #498
+- Added "Avventer" as a new choice for "Prosjektstatus" #537
+- Added a new section in "ProjectStatus" for timeline list #506  
+- Added a new project webpart 'Prosjekttidslinje' for showcasing projects and items for the current project on a timeline #497
 
-## Changed
+### Changed
 
 - Removed "Home" from Portfolio menu bar
 - Removed list views and risk matrix from previous status reports #374
 
-## Fixed
+### Fixed
 
 - Fixed UI bug by downgrading the `office-ui-fabric-react` package version to `6.214.0` #535
 - Fixed redirect after creating a new project status #530
+- Fixed project wizard bug when project is attached to another hub #532
+- Fixed wrong phases being displayed when switching between projects with different phases #520
 
 ## 1.2.9 - 08.09.2021
 
-## Added
+### Added
 
 - Added multiline text-wrapping in project status #493
 - Added description for site template #500
 
-## Fixed
+### Fixed
 
 - Fixed issue where the site design had to be applied post project creation #492
 - Fixed date not being recognized when exporting Portfolio overview to Excel. #495
 - Fixed issue where changing project phase did not always update the portfolio page #518
 
 ## 1.2.8 - 17.06.2021
 
-## Added
+### Added
 
 - Added rich text and lineshift support to field in project information #502
 
-## Fixed
+### Fixed
 
 - Fixed issue with checklist status field missing options #485
 
 ## 1.2.7 - 20.05.2021
 
-## Added
+### Added
 
 - Added a new portfolio webpart, 'Prosjekttidslinje' for showcasing projects on a timeline #435
 - Added list 'Tidslinjeinnhold' to portfolio level #437
@@ -54,15 +59,15 @@ Every change is marked with issue ID.
 - Added "Last Report Date" to Portfolio status overview #393
 - Added report created date next to Project Status title #456
 
-## Fixed
+### Fixed
 
 - Avoiding overwrite of portfolio views, columns, column configuration and insights graphs on update #440
 - Overwriting configuration page to support new configuration links on update #425
 - Fixed portfolio overview crashing when default view was selected #428
 - Fixed inconsistent version history settings of lists #465
 - Fixed Excel export issues at portfolio level #480
 
-## Changed
+### Changed
 
 - Changed Portfolio status view columns from "comments" to "status" #451
 - Improved project properties sync and fetching #444 #449
@@ -72,7 +77,7 @@ Every change is marked with issue ID.
 
 ## 1.2.6 - 03.03.2021
 
-## Added
+### Added
 
 - Added project template name to project properties #380
 - Added support for phase sub text in phase selector #381
@@ -81,7 +86,7 @@ Every change is marked with issue ID.
 - Added Description field to Usikkerhet #410
 - Enabled version history on Prosjektmaler list #359
 
-## Fixed
+### Fixed
 
 - Fixes issues with single folder in "Hent dokumentmal" #376
 - Issues with custom project fields #378
@@ -95,15 +100,15 @@ Every change is marked with issue ID.
 
 ## 1.2.4 - 30.11.2020
 
-## Added
+### Added
 
 - Added "default" option for extensions, similar to list content #328
 - Added info message if there are unpublished statusreports #340
 - Added published/unpublished indicators for statusreports in dropdown and ribbon #341
 - Added possiblity to delete unpublished statusreports #343
 - Added PNG snapshot when publishing project status #337
 
-## Fixed
+### Fixed
 
 - Restricted access for members to certain lists #356
 - Improved failure handling for PlannerConfiguration task in Project Setup #329
@@ -113,20 +118,20 @@ Every change is marked with issue ID.
 
 ## 1.2.3 - 2020-10-07
 
-## Added
+### Added
 
 - Descriptions on configuration page #301
 - New group "Porteføljeinnsyn". Grants users in this group insight into all projects in the portfolio #305
 - "Porteføljeinnsyn" button on configuration page for adding users to the group #306
 - Risk matrix toggle: Before and after risk reduction measures #293
 - Support for planner tasks references/attachments #287
 
-## Fixed
+### Fixed
 
 - View in portfolio overview was not changeable for non-admin users #308
 - Projects set to Avsluttet are no longer visible on the front page #307
 
-## Changed
+### Changed
 
 - Disabled "Ny statusrapport" when a report is unpublished. #309
 

SharePointFramework/@Shared/.vscode/settings.json

@@ -1,9 +1,19 @@
-
 {
-    "files.exclude": {
-      "**/.git": true,
-      "**/.DS_Store": true,
-      "**/node_modules": true,
-      "**/lib": true,
-    }
-  }
+  "files.exclude": {
+    "**/.git": true,
+    "**/.DS_Store": true,
+    "**/bower_components": true,
+    "**/coverage": true,
+    "**/lib-amd": true,
+    "src/**/*.scss.ts": true,
+    "dist": true,
+    "lib": true,
+    "node_modules": true,
+    "sharepoint": true,
+    "temp": true,
+    "teams": true,
+    "release": true,
+    "package-lock*": true
+  },
+  "typescript.tsdk": ".\\node_modules\\typescript\\lib"
+}

SharePointFramework/@Shared/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=12.13.0"
   },
-  "version": "1.2.13",
+  "version": "1.3.4",
   "description": "Shared utilities, helpers and models",
   "main": "lib/index.js",
   "scripts": {

SharePointFramework/@Shared/src/models/SectionModel.ts

@@ -3,7 +3,8 @@ export enum SectionType {
   StatusSection,
   RiskSection,
   ProjectPropertiesSection,
-  ListSection
+  ListSection,
+  TimelineSection
 }
 
 export class SectionModel {
@@ -64,5 +65,8 @@ export class SectionModel {
     if (this._item.ContentTypeId.indexOf('0x01004CEFE616A94A3A48A27D9DEBDF5EC82805') !== -1) {
       return SectionType.ListSection
     }
+    if (this._item.ContentTypeId.indexOf('0x01004CEFE616A94A3A48A27D9DEBDF5EC82806') !== -1) {
+      return SectionType.TimelineSection
+    }
   }
 }

SharePointFramework/@Shared/src/services/ProjectDataService/index.ts

@@ -18,7 +18,7 @@ export class ProjectDataService {
   private _storage: PnPClientStore
   private _storageKeys: TypedHash<string> = {
     _getPropertyItemContext: '{0}_propertyitemcontext',
-    getPhases: 'projectphases_terms'
+    getPhases: '{0}_projectphases_terms'
   }
   private _web: Web
 

SharePointFramework/PortfolioWebParts/.npmignore

@@ -6,6 +6,7 @@ nbproject
 manifest.mf
 build.xml
 node_modules/*
+sharepoint/*
 npm-debug.log
 *.ts
 !*.d.ts

SharePointFramework/PortfolioWebParts/.vscode/settings.json

@@ -1,18 +1,19 @@
-// Place your settings in this file to overwrite default and user settings.
 {
-  // Configure glob patterns for excluding files and folders in the file explorer.
   "files.exclude": {
-    "lib": true,
-    "dist": true,
-    "node_modules": false,
-    "sharepoint": true,
-    "temp": true,
     "**/.git": true,
     "**/.DS_Store": true,
-    "**/node_modules": true,
+    "**/bower_components": true,
     "**/coverage": true,
     "**/lib-amd": true,
-    "src/**/*.scss.ts": true
+    "src/**/*.scss.ts": true,
+    "dist": true,
+    "lib": true,
+    "node_modules": true,
+    "sharepoint": true,
+    "temp": true,
+    "teams": true,
+    "release": true,
+    "package-lock*": true
   },
   "typescript.tsdk": ".\\node_modules\\typescript\\lib"
 }

SharePointFramework/PortfolioWebParts/config/package-solution.json

@@ -3,7 +3,7 @@
     "solution": {
         "name": "pp-portfolio-web-parts",
         "id": "00483367-68e2-4977-9cc3-6cf0de623daa",
-        "version": "1.2.9.0",
+        "version": "1.3.1.0",
         "includeClientSideAssets": true,
         "skipFeatureDeployment": true,
         "webApiPermissionRequests": [

SharePointFramework/PortfolioWebParts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pp365-portfoliowebparts",
-  "version": "1.2.9",
+  "version": "1.3.1",
   "engines": {
     "node": ">=12.13.0"
   },
@@ -43,7 +43,7 @@
     "object-assign": "4.1.1",
     "office-ui-fabric-react": "6.214.0",
     "pp365-projectwebparts": "latest",
-    "pp365-shared": "latest",
+    "pp365-shared": "1.3.4",
     "pzl-react-reusable-components": "^0.0.14",
     "react": "16.9.0",
     "react-calendar-timeline": "0.27.0",

SharePointFramework/PortfolioWebParts/src/components/ProjectTimeline/ProjectTimeline.module.scss

@@ -22,19 +22,5 @@
     .infoText {
       padding: 23px 32px 23px 32px;
     }
-    .timeline {
-      margin: 0px auto;
-      padding: 0 32px 0 32px;
-      font-size: 12px !important;
-
-      .timelineItem {
-        cursor: pointer !important;
-        .itemContent {
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          width: 100%;
-        }
-      }
-    }
   }
 }

SharePointFramework/PortfolioWebParts/src/components/ProjectTimeline/ProjectTimeline.overrides.css

@@ -0,0 +1,5 @@
+.react-calendar-timeline .rct-header-root {
+  position: sticky;
+  top: 0;
+  z-index: 100;
+}

SharePointFramework/PortfolioWebParts/src/components/ProjectTimeline/Timeline/Timeline.module.scss

@@ -0,0 +1,16 @@
+@import "~@microsoft/sp-office-ui-fabric-core/dist/sass/SPFabricCore.scss";
+
+.timeline {
+    margin: 0px auto;
+    padding: 0 32px 0 32px;
+    font-size: 12px !important;
+
+    .timelineItem {
+        cursor: pointer !important;
+        .itemContent {
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 100%;
+        }
+    }
+}