Merge pull request #827 from center-for-knowledge-communication/ms-is…

…sue-781R6 Issue 781r6 - Fix my progress page missing data on display
center-for-knowledge-communication · Apr 11, 2024 · d2f5fca · d2f5fca
2 parents 7365f19 + fb2a175
commit d2f5fca
Showing 1 changed file with 44 additions and 42 deletions.
diff --git a/resources/MyProgress_new.jsp b/resources/MyProgress_new.jsp
@@ -1033,49 +1033,51 @@ $.extend({
             chart.giveFeedbackAndPlant ("remarks_"+topicId,"plant_"+topicId,topicState,studentState_disengaged,topicMastery,problemsDoneWithEffort,SHINT_SOF_sequence,SOF_SOF_sequence,neglectful_count,problemsDone,problemsSolved);
 
 //			console.log(topicId);
+
             var effortsForGraph = "${ts.effortsForGraph}";
-            if (effortsForGraph.length == 0) {
-            	return;
-            }
-//			console.log(effortsForGraph);
-			var effortValueArr = effortsForGraph.split(',');
-			
-    		var line = [];
-  			
-  			for (j=7;j>=0;j = j - 1) {
-  				var eff = [];
-	  			eff.push(effort_legend_labels[j],Number(effortValueArr[j]));
-//	  			console.log(effort_legend_labels[j] + " " + effortValueArr[j]);
-	  			line.push(eff);
-  			}
-			var canvasName = 'pie_' + topicId;
-			
-			plot_live_dashboard = $.jqplot(canvasName, [line], {
-		    seriesDefaults: {
-              renderer: $.jqplot.PieRenderer,
-		      rendererOptions: {
-		        showDataLabels: true,
-			    startAngle: -90,
-			    padding: 10,
-		        sliceMargin: 4,
-			    seriesColors: effort_series_colors
-		      },
-		    },
-//		    legend:{
-//	            show:true, 
-//	            location:'e',
-//	            fontSize: '8pt'
-//	        },
-		    highlighter: {
-		        show: true,
-		        useAxesFormatters: false,
-	            location:'n',
-	            fontSize: '12pt',
-		        tooltipFormatString: '%s%2d'
-
-		      }
-		 
-		  });
+            
+            if (effortsForGraph.length > 0) {
+				var effortValueArr = effortsForGraph.split(',');
+				
+	    		var line = [];
+	  			
+	  			for (j=7;j>=0;j = j - 1) {
+	  				var eff = [];
+		  			eff.push(effort_legend_labels[j],Number(effortValueArr[j]));
+	//	  			console.log(effort_legend_labels[j] + " " + effortValueArr[j]);
+		  			line.push(eff);
+	  			}
+				var canvasName = 'pie_' + topicId;
+				
+				plot_live_dashboard = $.jqplot(canvasName, [line], {
+			    seriesDefaults: {
+	              renderer: $.jqplot.PieRenderer,
+			      rendererOptions: {
+			        showDataLabels: true,
+				    startAngle: -90,
+				    padding: 10,
+			        sliceMargin: 4,
+				    seriesColors: effort_series_colors
+			      },
+			    },
+	//		    legend:{
+	//	            show:true, 
+	//	            location:'e',
+	//	            fontSize: '8pt'
+	//	        },
+			    highlighter: {
+			        show: true,
+			        useAxesFormatters: false,
+		            location:'n',
+		            fontSize: '12pt',
+			        tooltipFormatString: '%s%2d'
+	
+			      }
+			 
+			  });
+           }
+
+
             </c:forEach>
         }