แก้ไขเพิ่ม

src/app/portal-manage/dashboard-management/widgets/bar-chart-widget/bar-chart-widget.component.ts

@@ -17,6 +17,7 @@ export class BarChartWidgetComponent extends BaseWidgetComponent {
 
   public primaryXAxis: Object;
   public primaryYAxis: Object;
+  public dataLabel: Object = {};
 
   constructor(protected override dashboardStateService: DashboardStateService) {
     super(dashboardStateService);
@@ -28,6 +29,19 @@ export class BarChartWidgetComponent extends BaseWidgetComponent {
     this.primaryYAxis = { title: this.configObj.yAxisTitle || '' };
     this.type = this.configObj.type || 'Column';
     this.chartData = [];
+
+    // Configure data labels based on showDataLabels config
+    const showDataLabels = this.configObj.showDataLabels === true || this.configObj.showDataLabels === 'true';
+    if (showDataLabels) {
+      this.dataLabel = {
+        visible: true,
+        position: 'Top'
+      };
+    } else {
+      this.dataLabel = {
+        visible: false
+      };
+    }
   }
 
   onDataUpdate(data: any[]): void {
@@ -37,6 +51,13 @@ export class BarChartWidgetComponent extends BaseWidgetComponent {
       return;
     }
 
+    // Update data label configuration based on config
+    const showDataLabels = this.configObj.showDataLabels === true || this.configObj.showDataLabels === 'true';
+    this.dataLabel = {
+      visible: showDataLabels,
+      position: showDataLabels ? 'Top' : 'Auto'
+    };
+
     // Support multiple field name formats from config
     const xField = this.configObj.xField || this.configObj.xAxisField || 'x';
     const yField = this.configObj.yField || this.configObj.yAxisField || 'y';
@@ -48,7 +69,8 @@ export class BarChartWidgetComponent extends BaseWidgetComponent {
       yField,
       valueField,
       aggregation: this.configObj.aggregation,
-      config: this.configObj
+      config: this.configObj,
+      showDataLabels
     });
 
     // Handle aggregation if needed
@@ -62,6 +84,13 @@ export class BarChartWidgetComponent extends BaseWidgetComponent {
       }
     }
 
+    console.log('BarChart aggregation:', {
+      original: this.configObj.aggregation,
+      effective: effectiveAggregation,
+      xField,
+      valueField
+    });
+
     if (effectiveAggregation === 'sum' || effectiveAggregation === 'count') {
       const groupedData = data.reduce((acc, item) => {
         const key = item[xField] || '';

src/app/portal-manage/dashboard-management/widgets/simple-kpi-widget/simple-kpi-widget.component.ts

@@ -346,15 +346,18 @@ export class SimpleKpiWidgetComponent extends BaseWidgetComponent {
 
     // Handle count aggregation separately as it doesn't need a valueField
     if (this.aggregation === 'count') {
-      // If valueField is specified and it's a date/unique field, count unique values
-      if (this.valueField && ['dateid', 'date', 'datetime', 'day'].some(part => this.valueField.toLowerCase().includes(part))) {
+      // If valueField is specified and it's an ID field or date field, count unique values
+      if (this.valueField &&
+          (['id', 'employeeid'].some(part => this.valueField.toLowerCase().includes(part)) ||
+           ['dateid', 'date', 'datetime', 'day'].some(part => this.valueField.toLowerCase().includes(part)))) {
         // Count unique values instead of all records
         const uniqueValues = new Set(transformedData.map(item => item[this.valueField]));
         this.value = uniqueValues.size.toLocaleString();
-        console.log(`SimpleKpiWidget counting unique ${this.valueField}: ${uniqueValues.size} from ${transformedData.length} records`);
+        console.log(`SimpleKpiWidget counting unique ${this.valueField}: ${uniqueValues.size} unique values from ${transformedData.length} records`);
       } else {
         // Regular count: count all records
         this.value = (transformedData?.length || 0).toLocaleString();
+        console.log(`SimpleKpiWidget counting all records: ${this.value}`);
       }
       this.updateTrendData(transformedData);
       this.updateLabel(transformedData);

src/app/portal-manage/dashboard-management/widgets/syncfusion-pivot-widget/syncfusion-pivot-widget.component.ts

@@ -386,10 +386,28 @@ export class SyncfusionPivotWidgetComponent extends BaseWidgetComponent implemen
   getWidgetState(): string | null {
     if (this.pivotview && this.pivotview.dataSourceSettings) {
       const report = this.pivotview.dataSourceSettings;
+
+      // Convert values: if field name contains 'id' and type is 'Sum', change to 'Count'
+      const processedValues = report.values?.map(v => {
+        if (!v || !v.name) return v;
+        const fieldLower = v.name.toLowerCase();
+        let type = v.type;
+
+        // Auto-detect ID fields and change from Sum to Count
+        if (v.type === 'Sum' &&
+            (fieldLower.includes('id') ||
+             fieldLower.includes('employee') && fieldLower.includes('id'))) {
+          type = 'Count';
+          console.warn(`PivotWidget: Converting ${v.name} from Sum to Count (ID field detected)`);
+        }
+
+        return { name: v.name, type };
+      }) || [];
+
       const perspective = {
         rows: report.rows?.map(r => ({ name: r.name })) || [],
         columns: report.columns?.map(c => ({ name: c.name })) || [],
-        values: report.values?.map(v => ({ name: v.name, type: v.type })) || [],
+        values: processedValues,
         filters: report.filters?.map(f => ({ name: f.name })) || [],
         chartSettings: { chartSeries: { type: (this.pivotview.chartSettings?.chartSeries as any)?.type || (this.chartSettings?.chartSeries as any)?.type } },
       };
@@ -402,11 +420,28 @@ export class SyncfusionPivotWidgetComponent extends BaseWidgetComponent implemen
     if (state && state !== '{}') {
       try {
         const perspective = JSON.parse(state);
+
+        // Process values: detect ID fields and change type
+        const processedValues = (perspective.values || []).map((v: any) => {
+          const fieldLower = v.name.toLowerCase();
+          let type = v.type;
+
+          // Auto-detect ID fields and change from Sum to Count
+          if (v.type === 'Sum' &&
+              (fieldLower.includes('id') ||
+               fieldLower.includes('employee') && fieldLower.includes('id'))) {
+            type = 'Count';
+            console.warn(`PivotWidget setState: Converting ${v.name} from Sum to Count (ID field detected)`);
+          }
+
+          return { name: v.name, type };
+        });
+
         this.dataSourceSettings = {
           ...this.dataSourceSettings,
           rows: perspective.rows || [],
           columns: perspective.columns || [],
-          values: perspective.values || [],
+          values: processedValues,
           filters: perspective.filters || [],
         };
         if (perspective.chartSettings) {
@@ -454,6 +489,12 @@ export class SyncfusionPivotWidgetComponent extends BaseWidgetComponent implemen
         // The refresh is implicitly handled by the dataBound event now
       }
 
+      // Apply perspective if exists (for auto-converting Sum to Count for ID fields)
+      if (this.perspective && this.perspective !== '{}') {
+        console.log('PivotWidget onDataUpdate: Applying perspective', this.perspective);
+        this.setWidgetState(this.perspective as string);
+      }
+
       // Update loading and error states
       this.isLoading = false;
       this.hasError = false;