Change the progress bar calculation if type is "pages" fix #6563 (#6565)

* Change the progress bar calculation if type is "pages" fix #6563

* Fix etalon for progress-bar images #6563

src/survey.ts

@@ -3275,7 +3275,7 @@ export class SurveyModel extends SurveyElementCore
         : 100;
     }
     const visPages = this.visiblePages;
-    var index = visPages.indexOf(this.currentPage) + 1;
+    var index = visPages.indexOf(this.currentPage);
     return Math.ceil((index * 100) / visPages.length);
   }
   /**

tests/surveytests.ts

@@ -941,6 +941,34 @@ QUnit.test(
     );
   }
 );
+QUnit.test("survey.progressBarType = 'pages', Bug #6563",
+  function (assert) {
+    var survey = new SurveyModel({
+      progressBarType: "pages",
+      pages: [
+        { elements: [{ type: "text", name: "q1" }] },
+        { elements: [{ type: "text", name: "q2" }] },
+        { elements: [{ type: "text", name: "q3" }] },
+        { elements: [{ type: "text", name: "q1" }] },
+      ]
+    });
+    assert.equal(survey.getProgress(), 0, "page1 #1");
+    assert.equal(survey.progressValue, 0, "page1 #2");
+    assert.equal(survey.progressText, "Page 1 of 4", "page1, #3");
+    survey.nextPage();
+    assert.equal(survey.getProgress(), 25, "page2 #1");
+    assert.equal(survey.progressValue, 25, "page2 #2");
+    assert.equal(survey.progressText, "Page 2 of 4", "page2, #3");
+    survey.nextPage();
+    assert.equal(survey.getProgress(), 50, "page3 #1");
+    assert.equal(survey.progressValue, 50, "page3 #2");
+    assert.equal(survey.progressText, "Page 3 of 4", "page3, #3");
+    survey.nextPage();
+    assert.equal(survey.getProgress(), 75, "page4 #1");
+    assert.equal(survey.progressValue, 75, "page4 #2");
+    assert.equal(survey.progressText, "Page 4 of 4", "page4, #3");
+  }
+);
 QUnit.test("Next, Prev, Next", function (assert) {
   var survey = new SurveyModel();
   survey.addPage(createPageWithQuestion("Page 1"));