Minor improvements

Tiledesk · Dec 31, 2024 · a81ddc7 · a81ddc7
1 parent 760c1ef
commit a81ddc7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/src/app/home-components/home-convs-graph/home-convs-graph.component.html b/src/app/home-components/home-convs-graph/home-convs-graph.component.html
@@ -95,11 +95,11 @@
     <div class="flex flex-col flex-auto overflow-hidden items-center">
 
       <span  class="graph-footer-num">
-        {{percentageOfRequestsHandledByBots}}% 
+        {{percentageOfRequestsHandledByBots}}<span class="home-percentage-symbol">%</span>
       </span>
       <!-- <span *ngIf="numOfDays === 7" class="graph-footer-num"> {{percentageOfSevenDaysRequestsHandledByBots}}% </span>
       <span *ngIf="numOfDays === 30" class="graph-footer-num"> {{percentageOfLastMonthRequestsHandledByBots}}% </span> -->
-      <span class="graph-footer-text"> percentage handled by bots</span>
+      <span class="graph-footer-text"> Percentage handled by bots</span>
     </div>
   </div>
 

diff --git a/src/app/home-components/home-convs-graph/home-convs-graph.component.scss b/src/app/home-components/home-convs-graph/home-convs-graph.component.scss
@@ -30,7 +30,7 @@
 }
 
 .gap-3 {
-    gap: 3px!important;
+    gap: 3px !important;
 }
 
 .flex-auto {
@@ -160,6 +160,10 @@
     font-weight: 400;
 }
 
+.home-percentage-symbol {
+    font-size: 21px;
+}
+
 // @media (min-width: 600px) {
 // .sm\:grid-cols-2 {
 //     grid-template-columns: repeat(2, minmax(0, 1fr)) !important;

diff --git a/src/app/home-components/home-convs-graph/home-convs-graph.component.ts b/src/app/home-components/home-convs-graph/home-convs-graph.component.ts
@@ -331,6 +331,11 @@ export class HomeConvsGraphComponent implements OnInit, OnChanges {
   }
 
 
+  getMaxValueFromArrays(array1: number[], array2: number[]): number {
+    const mergedArray = [...array1, ...array2];
+    console.log('mergedArray', mergedArray)
+    return Math.max(...mergedArray);
+  }
 
   getRequestByLastNDayMerge(lastdays) {
     this.logger.log('[HOME-CONVS-GRAPH] - -> NEW METHOD lastdays ', lastdays);
@@ -376,10 +381,9 @@ export class HomeConvsGraphComponent implements OnInit, OnChanges {
       this.totalHuman = humanCounts.reduce((sum, val) => sum + val, 0);
       this.totalBot = botCounts.reduce((sum, val) => sum + val, 0);
 
-      // const higherCount = this.getMaxOfArray(this.totalHuman + this.totalBot);
+      const higherCount = this.getMaxValueFromArrays(humanCounts, botCounts);
 
-      this.percentageOfRequestsHandledByBots =
-       this.totalBot > 0 ? ((this.totalBot / (this.totalHuman + this.totalBot)) * 100).toFixed(1).replace('.', ',') : '0';
+      this.percentageOfRequestsHandledByBots =  this.totalBot > 0 ? ((this.totalBot / (this.totalHuman + this.totalBot)) * 100).toFixed(1).replace('.', ',') : '0';
 
 
        this.logger.log('[HOME-CONVS-GRAPH] - -> NEW METHOD  Human Total:', this.totalHuman);
@@ -388,13 +392,13 @@ export class HomeConvsGraphComponent implements OnInit, OnChanges {
        this.logger.log('[HOME-CONVS-GRAPH] - -> NEW METHOD  labels:', labels);
 
       // Step 6: Render the chart
-      this.renderChart(labels, humanCounts, botCounts);
+      this.renderChart(labels, humanCounts, botCounts,higherCount);
     }, (error) => {
       this.logger.error('[HOME-CONVS-GRAPH] - -> NEW METHOD ERROR:', error);
     });
   }
 
-  renderChart(labels, humanCounts, botCounts) {
+  renderChart(labels, humanCounts, botCounts, higherCount) {
 
     this.lineChart =  new Chart('lastNdayChart', {
       type: 'line',
@@ -478,7 +482,7 @@ export class HomeConvsGraphComponent implements OnInit, OnChanges {
               },
               display: true,
               fontColor: 'white',
-              // suggestedMax: this.higherCount + 1,
+              suggestedMax: higherCount + 1,
             }
           }]
         },

diff --git a/src/app/services/role.service.ts b/src/app/services/role.service.ts
@@ -50,7 +50,7 @@ export class RoleService {
           this.logger.log('[ROLE-SERV] - checkRoleForCurrentProject  projectUserRole', projectUserRole)
         }
       } else {
-        this.logger.error('[ROLE-SERV] - checkRoleForCurrentProject  projectUserRole * Error *', projectUserRole)
+        this.logger.log('[ROLE-SERV] - checkRoleForCurrentProject  projectUserRole * Error *', projectUserRole)
         const _projectUserRole = await this.getProjectUser(userId, projectId)
         this.logger.log('[ROLE-SERV] - checkRoleForCurrentProject  _projectUserRole GET from remote', _projectUserRole)
         if (_projectUserRole === 'agent') {