Merge pull request #67 from DevCom-IITB/develop

Fixed Dashboard Rebate not Appearing Issue and added total number of rebatedays taken

Author: https-kanika

src/app/app.component.html

@@ -8,7 +8,7 @@
       <img class="mess-i-logo" src="assets/mess-i-logo.png"> <!-- isme issues hai -->
       <a id="nav_home" class="nav-link nav-items-style" *ngIf="auth.isStaff()" routerLink="/home" >HOME</a>
       <a id="nav_student_list" class="nav-link nav-items-style" *ngIf="auth.isStaff()" routerLink="/list">STUDENTS' LIST</a>
-      <a id="nav_rebate" class="nav-link nav-items-style" role="button" *ngIf="isStudent" routerLink="/rebate">REBATES</a> 
+      <a id="nav_rebate" class="nav-link nav-items-style" role="button" *ngIf="auth.isStudent()" routerLink="/rebate">REBATES</a> 
       <a id="nav_rebate_admin" class="nav-link nav-items-style" *ngIf="auth.isRebate()" routerLink="/rebate-admin" >REBATES ADMIN</a>
       <a id="nav_guest_admin" class="nav-link nav-items-style" *ngIf="auth.isStaff()" routerLink="/guest-admin">GUEST ADMIN</a>
       <a id="nav_overview" class="nav-link nav-items-style" *ngIf="auth.isStaff()" routerLink="/overview" >MESS STATS</a>

src/app/app.component.ts

@@ -33,6 +33,7 @@ export class AppComponent {
     this.navIdtoUrl.set("nav_guest_admin","/guest-admin")
     // this.navIdtoUrl.set("nav_mess_bill","/mess-bill")
     this.isStudent = this.auth.isStudent();
+    //console.log("is student: ",this.isStudent);
   }
 
   showNavbar() {

src/app/rebate-admin/rebate-admin.component.css

@@ -39,7 +39,7 @@
     background-color: rgba(255, 196, 75, 0.1); 
 }
 .no-rebates-message {
-    color: #ffffff;
+    color: #28272c;
 }
 
 @media screen and (max-width: 431px){
@@ -217,6 +217,7 @@
         background-color: #ffc24b !important;
     }
     .no-rebates-message {
+        color: #ffffff !important;
         margin: 10px 0;
         padding-top: 2vw;
         padding-bottom: 2vw;

src/app/rebate/pd-rebate-card/pd-rebate-card.component.css

@@ -183,3 +183,27 @@
 *{
     font-family: 'Open Sans', sans-serif;
 }
+
+.rebate-taken-days {
+    margin: 12px 0px;
+    position: relative;
+    bottom: 10px;
+}
+
+.total-rebate-info {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.total-rebate-info .label {
+    font-weight: 600;
+    color: #28272c;
+    font-size: 16px;
+}
+
+.total-rebate-info .total-days {
+    font-weight: 600;
+    color: #28272c;
+    font-size: 16px;
+}

src/app/rebate/pd-rebate-card/pd-rebate-card.component.html

@@ -21,6 +21,12 @@
     <div id="days">
         <span id="noofdays">{{ p_rebate_days }} days </span><span id="nobold">(both inclusive)</span>
     </div>
+    <div class="rebate-taken-days">
+        <div class="total-rebate-info">
+            <span class="label">Total Rebate Days Taken:</span>
+            <span class="total-days">{{p_total_rebate_days}} days</span>
+        </div>
+    </div>
     <div id="rebate-reason-container" class="row">
         <p id="reason">{{ p_rebate_reason }}</p>
         <button id="official" *ngIf="rebate_request.official" (click)="downloadRebateDoc()">

src/app/rebate/pd-rebate-card/pd-rebate-card.component.ts

@@ -26,7 +26,7 @@ export class PdRebateCardComponent implements OnInit {
   public card_comment: string;
   public rebate_status: string;
   private numToMonth: string[] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-
+  public p_total_rebate_days: string = "0";
   constructor(
   private data_service: StudentdataService, 
   private dialog: MatDialog, 
@@ -43,6 +43,7 @@ export class PdRebateCardComponent implements OnInit {
     this.p_rebate_reason = this.rebate_request.reason;
     this.card_comment="";
     this.p_rebate_days= this.noOfDays(this.rebate_request.start, this.rebate_request.end);
+    this.calculateTotalRebateDays();
   }
 
   acceptRebate(){
@@ -91,7 +92,7 @@ export class PdRebateCardComponent implements OnInit {
   }
 
   isAdmin(): boolean {
-    return !this.auth.isStudent();
+    return this.auth.isRebate();
   }
 
   updateRebateData() {
@@ -165,4 +166,21 @@ export class PdRebateCardComponent implements OnInit {
     return "0";
   }
 }
+
+  private async calculateTotalRebateDays(): Promise<void> {
+    try {
+      const res: any = await this.data_service.getAdminRebatesRoll(this.rebate_request.roll);
+      const acceptedRebates = res.accepted_rebate || [];
+      
+      let totalDays = 0;
+      acceptedRebates.forEach((rebate: any) => {
+        totalDays += parseInt(this.noOfDays(rebate.start, rebate.end));
+      });
+      
+      this.p_total_rebate_days = totalDays.toString();
+    } catch (error) {
+      console.error('Error calculating total rebate days:', error);
+      this.p_total_rebate_days = "0";
+    }
+  }
 }

src/app/rebate/stu-reb-card/stu-reb-card.component.css

@@ -231,4 +231,33 @@ p{
     .rebate-card-container{
         min-width: 80vw;
     }
+    .total-rebate-info .label {
+        font-size: 4vw;
+    }
+    
+    .total-rebate-info .total-days {
+        font-size: 4vw;
+    }
+}
+
+.rebate-taken-days {
+    margin-bottom: 12px;
+}
+
+.total-rebate-info {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.total-rebate-info .label {
+    font-weight: 600;
+    color: #28272c;
+    font-size: 16px;
+}
+
+.total-rebate-info .total-days {
+    font-weight: 600;
+    color: #28272c;
+    font-size: 16px;
 }

src/app/rebate/stu-reb-card/stu-reb-card.component.html

@@ -35,6 +35,13 @@
   <div id="days">
     <span id="noOfDays">{{ p_rebate_days }} days </span><span id="both-inclusive">(Both inclusive)</span>
   </div>
+  <div class="rebate-taken-days" *ngIf="on_admin_page">
+    <div class="total-rebate-info">
+      <span class="label">Total Rebate Days Taken:</span>
+      <span class="total-days">{{p_total_rebate_days}} days</span>
+    </div>
+  </div>
+
   <div class="row">
     <p id="reason-txt" *ngIf="!isStudentPage()">{{ p_rebate_reason }}</p>
     <p id="reason-txt" *ngIf="isStudentPage()" style="font-size: 18px;">{{ p_rebate_reason }}</p>

src/app/rebate/stu-reb-card/stu-reb-card.component.ts

@@ -23,6 +23,7 @@ export class StuRebCardComponent implements OnInit {
   public p_rebate_reason: string;
   public p_rebate_comment: string;
   private numToMonth: string[] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+  public p_total_rebate_days: string = "0"; 
   @Input() public rebate_request: RebateRequest;
   // @Input() public isApproved: boolean = false;
   public on_admin_page:boolean ;
@@ -55,6 +56,9 @@ export class StuRebCardComponent implements OnInit {
     is_student_page: this.isStudentPage(),
     current_url: this.router.url
   });
+  if (this.on_admin_page) {
+      this.calculateTotalRebateDays();
+    }
   }
 
   readableDate(inp: Date): string{
@@ -186,5 +190,22 @@ export class StuRebCardComponent implements OnInit {
       return true; // Default to showing buttons if there's an error
     }
   }
+  private async calculateTotalRebateDays(): Promise<void> {
+    try {
+      const res: any = await this.data_service.getAdminRebatesRoll(this.rebate_request.roll);
+      const acceptedRebates = res.accepted_rebate || [];
+      
+      let totalDays = 0;
+      acceptedRebates.forEach((rebate: any) => {
+        totalDays += parseInt(this.noOfDays(rebate.start, rebate.end));
+      });
+      
+      this.p_total_rebate_days = totalDays.toString();
+    } catch (error) {
+      console.error('Error calculating total rebate days:', error);
+      this.p_total_rebate_days = "0";
+    }
+  }
+
 }