Fix: Return correct calculation for presentation components with items (fixes #228) (#229)

swashbuck · oliverfoster · web-flow · commit b327bb782335 · 2024-06-07T14:48:55.000+01:00
* Fix incorrect calculation for presentation components with items

* Update js/PageLevelProgressIndicatorView.js

Co-authored-by: Oliver Foster &lt;oliver.foster@kineo.com&gt;

* Update js/PageLevelProgressIndicatorView.js

Co-authored-by: Oliver Foster &lt;oliver.foster@kineo.com&gt;

* Update js/PageLevelProgressIndicatorView.js

Co-authored-by: Oliver Foster &lt;oliver.foster@kineo.com&gt;

---------

Co-authored-by: Oliver Foster &lt;oliver.foster@kineo.com&gt;
diff --git a/js/PageLevelProgressIndicatorView.js b/js/PageLevelProgressIndicatorView.js
@@ -53,12 +53,14 @@ class PageLevelProgressIndicatorView extends Backbone.View {
 
   calculatePercentage() {
     const isPresentationComponentWithItems = (!this.model.isTypeGroup('question') && this.model instanceof ItemsComponentModel);
+    const isComplete = this.model.get('_isComplete');
+    if (isComplete) return 100;
     if (isPresentationComponentWithItems) {
       const children = this.model.getChildren();
       const visited = children.filter(child => child.get('_isVisited'));
       return Math.round(visited.length / children.length * 100);
     }
-    return this.model.get('_isComplete') ? 100 : 0;
+    return 0
   }
 
   render() {

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,14 @@ class PageLevelProgressIndicatorView extends Backbone.View {`
`53`	`53`
`54`	`54`	`calculatePercentage() {`
`55`	`55`	`const isPresentationComponentWithItems = (!this.model.isTypeGroup('question') && this.model instanceof ItemsComponentModel);`
	`56`	`+ const isComplete = this.model.get('_isComplete');`
	`57`	`+ if (isComplete) return 100;`
`56`	`58`	`if (isPresentationComponentWithItems) {`
`57`	`59`	`const children = this.model.getChildren();`
`58`	`60`	`const visited = children.filter(child => child.get('_isVisited'));`
`59`	`61`	`return Math.round(visited.length / children.length * 100);`
`60`	`62`	`}`
`61`		`- return this.model.get('_isComplete') ? 100 : 0;`
	`63`	`+ return 0`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`render() {`