From 0fee38af93c1d05569c6dcfd25821b3153ee02dc Mon Sep 17 00:00:00 2001
From: satvik-tha-god <satviksinghsw@gmail.com>
Date: Fri, 17 Jun 2022 21:00:04 +0530
Subject: [PATCH 1/7] [statistics][studyprogression] added total visualisation
 in line chart

---
 modules/statistics/js/studyprogression.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/statistics/js/studyprogression.js b/modules/statistics/js/studyprogression.js
index b2b04edd2c0..c38a79a0386 100644
--- a/modules/statistics/js/studyprogression.js
+++ b/modules/statistics/js/studyprogression.js
@@ -38,9 +38,29 @@ $(document).ready(function() {
             dataset.push(data.datasets[i].name);
             processedData.push(dataset.concat(data.datasets[i].data));
         }
+        var totals = new Array();
+        totals.push("Total");
+        for(var j=0; j<data.datasets[0].data.length; j++){
+            var total=0;
+            for(var i=0;i<data.datasets.length;i++){
+                total+=parseInt(data.datasets[i].data[j]);
+            }
+            totals.push(total);
+        }
+        processedData.push(totals);
         return processedData;
     }
 
+    function maxY(data){
+        var maxi=0;
+        for(var j=0; j<data.datasets[0].data.length; j++){
+            for(var i=0;i<data.datasets.length;i++){
+                maxi=Math.max(maxi,parseInt(data.datasets[i].data[j]));
+            }
+        }
+        return maxi;
+    }
+
 
     // AJAX to get scan line chart data
     $.ajax({
@@ -74,6 +94,7 @@ $(document).ready(function() {
                         }
                     },
                     y: {
+                        max: maxY(data),
                         label: 'Scans'
                     }
                 },
@@ -146,6 +167,7 @@ $(document).ready(function() {
                         }
                     },
                     y: {
+                        max: maxY(data),
                         label: 'Candidates registered'
                     }
                 },

From 952e92620497c573d4831a93f004978fafa28b65 Mon Sep 17 00:00:00 2001
From: satvik-tha-god <satviksinghsw@gmail.com>
Date: Fri, 17 Jun 2022 21:02:47 +0530
Subject: [PATCH 2/7] [statistics][studyprogression] added total line css

---
 htdocs/css/c3.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/css/c3.css b/htdocs/css/c3.css
index 5a20b3cb068..3790287b00b 100644
--- a/htdocs/css/c3.css
+++ b/htdocs/css/c3.css
@@ -86,6 +86,10 @@
     stroke-width: 1px;
 }
 
+.c3-target-Total{
+    display: none;
+}
+
 /*-- Point --*/
 
 .c3-circle._expanded_ {

From 927ca3043a6a68cf1caf22b3647fc8a6cc96dff0 Mon Sep 17 00:00:00 2001
From: satvik-tha-god <satviksinghsw@gmail.com>
Date: Fri, 17 Jun 2022 21:04:41 +0530
Subject: [PATCH 3/7] [statistics][studyprogression] minor spelling fix

---
 modules/statistics/js/studyprogression.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/statistics/js/studyprogression.js b/modules/statistics/js/studyprogression.js
index c38a79a0386..c2a6c42e18e 100644
--- a/modules/statistics/js/studyprogression.js
+++ b/modules/statistics/js/studyprogression.js
@@ -67,9 +67,9 @@ $(document).ready(function() {
         url: loris.BaseURL + '/statistics/charts/scans_bymonth',
         type: 'get',
         success: function(data) {
-            let lengendNames = [];
+            let legendNames = [];
             for (let j=0; j<data.datasets.length; j++) {
-                lengendNames.push(data.datasets[j].name);
+                legendNames.push(data.datasets[j].name);
             }
             let scanLineData = formatLineData(data);
             scanLineChart = c3.generate({
@@ -108,7 +108,7 @@ $(document).ready(function() {
             d3.select('.scanChartLegend')
               .insert('div', '.scanChart')
               .attr('class', 'legend')
-              .selectAll('div').data(lengendNames).enter()
+              .selectAll('div').data(legendNames).enter()
               .append('div')
               .attr('data-id', function(id) {
                 return id;
@@ -140,9 +140,9 @@ $(document).ready(function() {
         url: loris.BaseURL + '/statistics/charts/siterecruitment_line',
         type: 'get',
         success: function(data) {
-            let lengendNames = [];
+            let legendNames = [];
             for (let j=0; j<data.datasets.length; j++) {
-                lengendNames.push(data.datasets[j].name);
+                legendNames.push(data.datasets[j].name);
             }
             let recruitmentLineData = formatLineData(data);
             recruitmentLineChart = c3.generate({
@@ -181,7 +181,7 @@ $(document).ready(function() {
             d3.select('.recruitmentChartLegend')
               .insert('div', '.recruitmentChart')
               .attr('class', 'legend')
-              .selectAll('div').data(lengendNames).enter()
+              .selectAll('div').data(legendNames).enter()
               .append('div')
               .attr('data-id', function(id) {
                 return id;

From c42d2eacedccbb9e575398ff092820e4d5a2ac33 Mon Sep 17 00:00:00 2001
From: satvik-tha-god <satviksinghsw@gmail.com>
Date: Mon, 1 Aug 2022 18:10:10 +0530
Subject: [PATCH 4/7] [statistics] moved the css back into the module

---
 htdocs/css/c3.css                      | 4 ----
 modules/statistics/css/recruitment.css | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/css/c3.css b/htdocs/css/c3.css
index 3790287b00b..5a20b3cb068 100644
--- a/htdocs/css/c3.css
+++ b/htdocs/css/c3.css
@@ -86,10 +86,6 @@
     stroke-width: 1px;
 }
 
-.c3-target-Total{
-    display: none;
-}
-
 /*-- Point --*/
 
 .c3-circle._expanded_ {
diff --git a/modules/statistics/css/recruitment.css b/modules/statistics/css/recruitment.css
index a64da3c2f2d..47d45e8f846 100644
--- a/modules/statistics/css/recruitment.css
+++ b/modules/statistics/css/recruitment.css
@@ -11,3 +11,8 @@
     background-color: #2FA4E7;
 }
 
+.c3-chart-line.c3-target.c3-target-Total{
+    display: none !important;
+}
+
+

From db9945c483784cb98a59854cf2960bb24d00c1ed Mon Sep 17 00:00:00 2001
From: Satvik Singh <64309880+satvik-tha-god@users.noreply.github.com>
Date: Tue, 2 Aug 2022 12:35:56 +0530
Subject: [PATCH 5/7] [dashboard] Update recruitment.css removed line

Co-authored-by: racostas <37309344+racostas@users.noreply.github.com>
---
 modules/statistics/css/recruitment.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/statistics/css/recruitment.css b/modules/statistics/css/recruitment.css
index 47d45e8f846..6c9c7781dae 100644
--- a/modules/statistics/css/recruitment.css
+++ b/modules/statistics/css/recruitment.css
@@ -15,4 +15,3 @@
     display: none !important;
 }
 
-

From f1d2d70323b037113c6a7dc06d131ac1df5b28fb Mon Sep 17 00:00:00 2001
From: Satvik Singh <64309880+satvik-tha-god@users.noreply.github.com>
Date: Tue, 2 Aug 2022 12:36:23 +0530
Subject: [PATCH 6/7] [dahsboard] Update recruitment.css removed line

Co-authored-by: racostas <37309344+racostas@users.noreply.github.com>
---
 modules/statistics/css/recruitment.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/statistics/css/recruitment.css b/modules/statistics/css/recruitment.css
index 6c9c7781dae..138ea4bc0fc 100644
--- a/modules/statistics/css/recruitment.css
+++ b/modules/statistics/css/recruitment.css
@@ -14,4 +14,3 @@
 .c3-chart-line.c3-target.c3-target-Total{
     display: none !important;
 }
-

From 060c21a1d6b997795d6622cd15f66588b076b41f Mon Sep 17 00:00:00 2001
From: satvik-tha-god <satviksinghsw@gmail.com>
Date: Sun, 14 Aug 2022 03:18:20 +0530
Subject: [PATCH 7/7] retrigger checks