Merge pull request #46 from DevCom-IITB/bug-fix

Resolved Issue #25, #26, #23

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" *ngIf="auth.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

@@ -123,4 +123,6 @@ export class AppComponent {
     this.router.navigate([place])
   }
 
-  }
+}
+
+

src/app/auth.service.ts

@@ -159,6 +159,7 @@ export class AuthService {
   getRoll(){
     return this.roll_no;
   }
+
 
   forgetPassword(username:any) {
     let url = this.baseurl.concat("/api/change_password");
@@ -173,4 +174,5 @@ export class AuthService {
       })
     );
   }
+
 }

src/app/home/devices/devices.component.css

@@ -7,6 +7,7 @@
 .device-data{
     display: flex;
     flex-direction: column;
+
 }
 .device-info{
     display: flex;
@@ -20,4 +21,8 @@ img{
 }
 p{
     padding-right:15px;
+}
+
+h3{
+    font-weight: bold;
 }

src/app/home/devices/devices.component.ts

@@ -7,7 +7,8 @@ import { Component, Input, OnInit } from '@angular/core';
 })
 export class DevicesComponent implements OnInit {
 
-  @Input() device:any;
+  @Input() device : any ;
+
   constructor() { }
 
   ngOnInit(): void {

src/app/home/home.component.ts

@@ -13,6 +13,29 @@ export class HomeComponent implements OnInit {
 
   public pending_rebates: RebateRequest[] = new Array();
   devices:any;
+  // devices = [
+  //   {
+  //     hostel: 'Hostel A',
+  //     id: 123,
+  //     sync: '2024-08-15 10:00 AM',
+  //     version: '1.0.3',
+  //     cards: ['Card1', 'Card2', 'Card3']
+  //   },
+  //   {
+  //     hostel: 'Hostel B',
+  //     id: 456,
+  //     sync: '2024-08-15 10:05 AM',
+  //     version: '1.0.4',
+  //     cards: ['Card4', 'Card5', 'Card6']
+  //   },
+  //   {
+  //     hostel: 'Hostel C',
+  //     id: 789,
+  //     sync: '2024-08-15 10:10 AM',
+  //     version: '1.0.5',
+  //     cards: ['Card7', 'Card8', 'Card9']
+  //   }
+  // ];
   date:string;
 
   constructor(private data_service:StudentdataService, public auth_service: AuthService, private router: Router) { 
@@ -33,7 +56,8 @@ export class HomeComponent implements OnInit {
       //FIXME: Remove the console log, maybe log somewhere else
       console.log(e);
     });
-
+
+
     this.data_service.getDevices().then((res)=>{
       this.devices = res;
     }).catch((e)=>{

src/app/rebate/rebate.component.ts

@@ -24,6 +24,10 @@ export class RebateComponent implements OnInit {
       this.router.navigate(['login'])
     }
     // console.log(this.rejected_rebates)
+    if(!this.auth.isStudent() ){
+      this.router.navigate(['landing'])
+    }
+
   }
 
 

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

@@ -61,14 +61,16 @@
     <button
       class="btn btn-light rebate-action-btn"
       (click)="updateRebateData(p_rebate_reason, p_rebate_start, p_rebate_end)"
-      *ngIf="auth.isStudent()"
+
+      *ngIf="isStudentPage()"
     >
       Make Amendments
     </button>
     <button
       class="btn btn-light rebate-action-btn"
       (click)="deleteRebate()"
-      *ngIf="auth.isStudent()"
+
+      *ngIf="isStudentPage()"
     >
       Cancel your rebate
     </button>
@@ -82,7 +84,8 @@
     <button
       class="btn btn-light rebate-action-btn"
       (click)="updateAcceptedRebate(p_rebate_start, p_rebate_end)"
-      *ngIf="auth.isStudent()"
+
+      *ngIf="isStudentPage()"
     >
       Shrink Duration
     </button>

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

@@ -25,6 +25,8 @@ export class StuRebCardComponent implements OnInit {
   public p_rebate_comment: string;
   private numToMonth: string[] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
   // @Input() public isApproved: boolean = false;
+  public on_admin_page:boolean ;
+  private adminRoutes: string[] = ["/rebate-admin","/studentcard"];
   @Input() public approval_state: string = "pending";
   @Output() public updateList = new EventEmitter();
 
@@ -41,6 +43,8 @@ export class StuRebCardComponent implements OnInit {
     this.p_rebate_reason = "";
     this.p_rebate_reason = this.rebate_request.reason;
     this.p_rebate_comment = this.rebate_request?.comment ?? "";
+    this.on_admin_page = this.adminRoutes.some(sub => this.router.url.startsWith(sub));
+
     // console.log(this.rebate_request)
   }
 
@@ -115,5 +119,9 @@ export class StuRebCardComponent implements OnInit {
       console.log(e);
     })
   }
+  isStudentPage() {
+    return this.auth.isStudent() && !this.on_admin_page;
+  }
+
 }