1. Changes the logic for language to be displayed along with different sparklines in different cases. co-authorship & co-investigatorship is done.

productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl

@@ -18,14 +18,20 @@
         
             function drawCoauthorsSparklineVisualization(providedSparklineImgTD) {
             
+                var unknownYearPublicationCounts = ${sparklineVO.unknownYearPublications};
+                var onlyUnknownYearPublications = false;
+    
                 var data = new google.visualization.DataTable();
                 data.addColumn('string', 'Year');
                 data.addColumn('number', 'Unique co-authors');
                 data.addRows(${sparklineVO.yearToEntityCountDataTable?size});
                 
+                var knownYearPublicationCounts = 0;
+                
                 <#list sparklineVO.yearToEntityCountDataTable as yearToUniqueCoauthorsDataElement>                        
                     data.setValue(${yearToUniqueCoauthorsDataElement.yearToEntityCounter}, 0, '${yearToUniqueCoauthorsDataElement.year}');
                     data.setValue(${yearToUniqueCoauthorsDataElement.yearToEntityCounter}, 1, ${yearToUniqueCoauthorsDataElement.currentEntitiesCount});
+                    knownYearPublicationCounts += ${yearToUniqueCoauthorsDataElement.currentEntitiesCount};
                 </#list>
                 
                 <#-- Create a view of the data containing only the column pertaining to coauthors count. -->
@@ -55,6 +61,16 @@
                     chartLabel: 'r'
                 }
                 
+                /*
+                This means that all the publications have unknown years & we do not need to display
+                the sparkline.
+                */            
+                if (unknownYearPublicationCounts > 0 && knownYearPublicationCounts < 1) {
+                    
+                    onlyUnknownYearPublications = true;
+                    
+                } else {
+
                 /* 
                 Test if we want to go for the approach when serving visualizations from a secure site..
                 If "https:" is not found in location.protocol then we do everything normally.
@@ -107,6 +123,10 @@
                 
                 }
                 
+                }
+                
+                var totalPublicationCount = knownYearPublicationCounts + unknownYearPublicationCounts;
+         
                 <#if sparklineVO.shortVisMode>
          
                     <#-- We want to display how many coauthors were considered, so this is used to calculate this. -->
@@ -117,10 +137,27 @@
                         renderedShortSparks += data.getValue(value, 1);
                     });
                     
-                    $('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedShortSparks) + parseInt(${sparklineVO.unknownYearPublications})).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> co-author(s) <br/></span>");
+                     /*
+                    In case that there are only unknown publications we want the text to mention these counts,
+                    which would not be mentioned in the other case because the renderedShortSparks only hold counts
+                    of publications which have any date associated with it.
+                    */
+                    var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedShortSparks;
+                    
+                    if (totalPubs === 1) {
+                        var pubDisplay = "co-author";
+                    } else {
+                        var pubDisplay = "co-authors";
+                    }
+         
+                    $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + pubDisplay + " <br/></span>");
             
                     var sparksText = '  within the last 10 years';
                                         
+                    if (totalPubs !== totalPublicationCount) {
+                        sparksText += ' (' + totalPublicationCount + ' total)';
+                    }
+            
                  <#else>
             
                     /*
@@ -128,15 +165,36 @@
                      * any year associated with it. Hence.
                      * */
                     var renderedSparks = ${sparklineVO.renderedSparks};
-                    $('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedSparks) + parseInt(${sparklineVO.unknownYearPublications})).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> co-author(s) <br/></span>");
+                    
+                    /*
+                    In case that there are only unknown publications we want the text to mention these counts,
+                    which would not be mentioned in the other case because the renderedSparks only hold counts
+                    of publications which have any date associated with it.
+                    */
+                    var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedSparks;
+                          
+                    if ( totalPubs == 1 ) {
+                        var pubDisplay = "co-author";
+                    } else {
+                        var pubDisplay = "co-authors";
+                    }
+                          
+                    $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + pubDisplay + " <br/></span>");
             
                     var sparksText = '  from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
-                                        + ' to ${sparklineVO.latestRenderedPublicationYear?c}</span> ' 
+                                        + ' to ${sparklineVO.latestRenderedPublicationYear?c}</span>';
-                                        + ' <br /><a href="${sparklineVO.downloadDataLink}">(.CSV File)</a> ';
+                                        
+                    if (totalPubs !== totalPublicationCount) {
+                        sparksText += ' (' + totalPublicationCount + ' total)';
+                    }
+                                         
+                    sparksText += ' <br /><a href="${sparklineVO.downloadDataLink}">(.CSV File)</a> ';
                                         
                  </#if>
          
+                 if (!onlyUnknownYearPublications) {
                     $('#${sparklineContainerID} td.sparkline_text').html(sparksText);
+                 }
          
             }
     

productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl

@@ -18,14 +18,20 @@
         
             function drawCoInvestigatorsSparklineVisualization(providedSparklineImgTD) {
     
+                var unknownYearGrantCounts = ${sparklineVO.unknownYearGrants};
+                var onlyUnknownYearGrants = false;
+                
                 var data = new google.visualization.DataTable();
                 data.addColumn('string', 'Year');
                 data.addColumn('number', 'Unique co-investigators');
                 data.addRows(${sparklineVO.yearToEntityCountDataTable?size});
                 
+                var knownYearGrantCounts = 0;
+        
                 <#list sparklineVO.yearToEntityCountDataTable as yearToUniqueCoinvestigatorsDataElement>                        
                     data.setValue(${yearToUniqueCoinvestigatorsDataElement.yearToEntityCounter}, 0, '${yearToUniqueCoinvestigatorsDataElement.year}');
                     data.setValue(${yearToUniqueCoinvestigatorsDataElement.yearToEntityCounter}, 1, ${yearToUniqueCoinvestigatorsDataElement.currentEntitiesCount});
+                    knownYearGrantCounts += ${yearToUniqueCoinvestigatorsDataElement.currentEntitiesCount};
                 </#list>
         
                 <#-- Create a view of the data containing only the column pertaining to coinvestigators count. -->
@@ -55,6 +61,16 @@
                     chartLabel: 'r'
                 }
                 
+                /*
+                This means that all the publications have unknown years & we do not need to display
+                the sparkline.
+                */            
+                if (unknownYearGrantCounts > 0 && knownYearGrantCounts < 1) {
+                    
+                    onlyUnknownYearGrants = true;
+                    
+                } else {
+
                 /* 
                 Test if we want to go for the approach when serving visualizations from a secure site..
                 If "https:" is not found in location.protocol then we do everything normally.
@@ -107,6 +123,9 @@
                 
                 }
                 
+                }
+                 
+                var totalGrantCount = knownYearGrantCounts + unknownYearGrantCounts;              
                 
                 <#if sparklineVO.shortVisMode>
                 
@@ -118,10 +137,28 @@
                         renderedShortSparks += data.getValue(value, 1);
                     });      
                     
-                    $('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedShortSparks) + parseInt(${sparklineVO.unknownYearGrants})).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> co-investigator(s) <br/></span>");
+                    /*
+                    In case that there are only unknown grants we want the text to mention these counts,
+                    which would not be mentioned in the other case because the renderedShortSparks only hold counts
+                    of grants which have any date associated with it.
+                    */
+                    var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedShortSparks;
+                    
+                                        
+                    if (totalGrants === 1) {
+                        var grantDisplay = "co-investigator";
+                    } else {
+                        var grantDisplay = "co-investigators";
+                    }
+                    
+                    $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
             
                     var sparksText = '  within the last 10 years';
                     
+                    if (totalGrants !== totalGrantCount) {
+                        sparksText += ' (' + totalGrantCount + ' total)';
+                    }
+            
                  <#else>
                        
                     /*
@@ -129,14 +166,35 @@
                      * any year associated with it. Hence.
                      * */
                     var renderedSparks = ${sparklineVO.renderedSparks};     
-                    $('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedSparks) + parseInt(${sparklineVO.unknownYearGrants})).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> co-investigator(s) <br/></span>");
+                    
+                    /*
+                    In case that there are only unknown grants we want the text to mention these counts,
+                    which would not be mentioned in the other case because the renderedSparks only hold counts
+                    of grants which have any date associated with it.
+                    */
+                    var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedSparks;
+                    
+                    if (totalGrants === 1) {
+                        var grantDisplay = "co-investigator";
+                    } else {
+                        var grantDisplay = "co-investigators";
+                    }
+                     
+                    $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
             
                     var sparksText = '  from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
-                                        + ' to ${sparklineVO.latestRenderedGrantYear?c}</span> ' 
+                                        + ' to ${sparklineVO.latestRenderedGrantYear?c}</span>';
-                                        + '<br /> <a href="${sparklineVO.downloadDataLink}">(.CSV File)</a> ';
+                                        
+                    if (totalGrants !== totalGrantCount) {
+                        sparksText += ' (' + totalGrantCount + ' total)';
+                    }
+                    
+                    sparksText += '<br /> <a href="${sparklineVO.downloadDataLink}">(.CSV File)</a> ';
                  </#if>
 
+                 if (!onlyUnknownYearGrants) {
                     $('#${sparklineContainerID} td.sparkline_text').html(sparksText).css("font-weight", "bold");
+                 } 
                  
            }