| 
					
				 | 
			
			
				@@ -10,7 +10,7 @@ let JpcDiscreteHelper = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (discreteArray && dataObj) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (let i = 0; i < discreteArray.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 let band = bands[discreteArray[i][JV.PROP_BAND_NAME]]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (band && pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] == true) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (band && pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (discreteArray[i][JV.PROP_TEXT]) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         rst.push(JpcTextHelper.outputText(discreteArray[i][JV.PROP_TEXT], band, unitFactor, 1, 0, 1, 0, multiCols, multiColIdx)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -25,7 +25,7 @@ let JpcDiscreteHelper = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             let value = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             if (df[JV.PROP_FIELD_ID]) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 let field = JE.F(df[JV.PROP_FIELD_ID], $CURRENT_RPT); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if (field.DataSeq != JV.BLANK_FIELD_INDEX) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                if (field.DataSeq !== JV.BLANK_FIELD_INDEX) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     let data = dataObj[field.DataNodeName][field.DataSeq]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     if (data && data.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                         if (data.length > segIdx) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -35,8 +35,9 @@ let JpcDiscreteHelper = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    if (field[JV.PROP_AD_HOC_DATA] && field[JV.PROP_AD_HOC_DATA].length > 0) value = field[JV.PROP_AD_HOC_DATA][0] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    else value = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    if (field[JV.PROP_AD_HOC_DATA] && field[JV.PROP_AD_HOC_DATA].length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                        value = field[JV.PROP_AD_HOC_DATA][0] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    } else value = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } else if (df[JV.PROP_PARAM_ID]) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 let param = JE.P(df[JV.PROP_PARAM_ID], $CURRENT_RPT); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -52,6 +53,23 @@ let JpcDiscreteHelper = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return rst; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    outputPreviewDiscreteInfo: function (discreteArray, bands, unitFactor, pageStatus) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let rst = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for (let i = 0; i < discreteArray.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            let band = bands[discreteArray[i][JV.PROP_BAND_NAME]]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (band && pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (discreteArray[i][JV.PROP_TEXT]) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    rst.push(JpcTextHelper.outputText(discreteArray[i][JV.PROP_TEXT], band, unitFactor, 1, 0, 1, 0, 1, 0)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (discreteArray[i][JV.PROP_TEXTS]) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    for (let j = 0; j < discreteArray[i][JV.PROP_TEXTS].length; j++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        rst.push(JpcTextHelper.outputText(discreteArray[i][JV.PROP_TEXTS][j], band, unitFactor, 1, 0, 1, 0, 1, 0)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return rst; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |