Merge branch 'main' into dev

smartcommunitylab · Mar 8, 2024 · 55b230a · 55b230a
2 parents 8d44f34 + 8b97c31
commit 55b230a
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/console_aziendale/src/services/stat.services.js b/console_aziendale/src/services/stat.services.js
@@ -44,7 +44,13 @@ function getItemsAggregation(itemAggregationValue, campaignId, companyId) {
       return employeeService.getAllEmployees(companyId).then((content) => {
         return content.filter(e => e.campaigns.indexOf(campaignId) >= 0)
         .map(e => {
-          e.label = (e.surname) ? `${e.surname} ${e.name}` : `${e.name}`;
+          e.label = (e.surname && e.surname != '-') 
+                  ? `${e.surname} ${e.name}` 
+                  : (e.name && e.name != '-') 
+                  ? `${e.name}`
+                  : (e.code)
+                  ? `- - (${e.code})`
+                  : `${e.id}`;
           return e;
         });
       });
@@ -216,7 +222,7 @@ function getAllEmployeesStats(configuration) {
     configuration.timePeriod.value != 'ALL' ? (configuration.selectedDateFrom ? configuration.selectedDateFrom : null) : null,
     configuration.timePeriod.value != 'ALL' ? (configuration.selectedDateTo ? configuration.selectedDateTo : null) : null,
     getFields(configuration),
-    true,
+    false,
     configuration.csv
     );
 }