Merge pull request #266 from DSACMS/sachin/graph-consolidation-2

Consolidated Language Graphs V2
DSACMS · Oct 15, 2024 · 15123cd · 15123cd
2 parents 5044252 + 1b8ed1b
commit 15123cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/site/_includes/graph-toggle.liquid b/app/site/_includes/graph-toggle.liquid
@@ -34,7 +34,7 @@
             {% endif %}
             {% assign graphPath = graph | strip %}
             {% assign distPath = baseurl | append: "/assets/img/graphs" | append: graphPath %}
-            {% assign fileExtension = path | split: '.' | last %}
+            {% assign fileExtension = graphPath | split: '.' | last %}
             <figure>
             {% if fileExtension == 'svg' %}
                 <embed type="image/svg+xml" src="{{ distPath }}" />

diff --git a/templates/repo_report_template.md b/templates/repo_report_template.md
@@ -111,14 +111,14 @@ date_stampLastWeek: {date_stamp}
       {{% assign optionsArray = '1 Month, 6 Month' | split: ',' %}}
       {{% assign graphsArray = '/{repo_owner}/{repo_name}/new_commit_contributors_by_day_over_last_month_{repo_name}_data.svg, /{repo_owner}/{repo_name}/new_commit_contributors_by_day_over_last_six_months_{repo_name}_data.svg' | split: ',' %}}
       {{% render "graph-toggle", baseurl: site.baseurl, name: "new-contributors" options: optionsArray, graphs: graphsArray, title: "Number of Contributors Joining per Interval" %}}
-    <!-- Predominant Languages Graph -->
-    {{% render "graph-section" baseurl: site.baseurl, path: "/{repo_owner}/{repo_name}/predominant_langs_{repo_name}_data.svg", title: "Predominant Languages" %}}
+    <!-- Languages Graphs - Summary + Predominant -->
+    {{% assign optionsArray = 'Summary, Predominant' | split: ',' %}}
+    {{% assign graphsArray = "/{repo_owner}/{repo_name}/language_summary_{repo_name}_data.svg, /{repo_owner}/{repo_name}/predominant_langs_{repo_name}_data.svg" | split: ',' %}}
+    {{% render "graph-toggle" baseurl: site.baseurl, name:"language-information" options: optionsArray, graphs: graphsArray, title: "Language Information" %}}
     <!-- Libyear Timeline Graph -->
     {{% render "graph-section" baseurl: site.baseurl, path: "/{repo_owner}/{repo_name}/libyear_timeline_{repo_name}_data.svg", title: "Dependency Libyears" %}}
     <!-- DRYness Percentages Graph -->
     {{% render "graph-section" baseurl: site.baseurl, path: "/{repo_owner}/{repo_name}/DRYness_{repo_name}_data.svg", title: "DRYness Percentage Graph" %}}
-     <!-- Language Summary Chart -->
-    {{% render "graph-section" baseurl: site.baseurl, path: "/{repo_owner}/{repo_name}/language_summary_{repo_name}_data.svg", title: "Language Summary" %}}
     <!-- Cost Estimate Chart -->
     {{% render "graph-section" baseurl: site.baseurl, path: "/{repo_owner}/{repo_name}/estimated_project_costs_{repo_name}_data.svg", title: "Estimated Costs" %}}
 </div>