Bug fixes, Ui changes

KB-iGOT · Sep 30, 2024 · b4bb179 · b4bb179
1 parent ff52467
commit b4bb179
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,39 +1,37 @@
 import { NgModule } from '@angular/core';
+import { Router, NavigationEnd } from '@angular/router';
 import { BrowserModule } from '@angular/platform-browser';
 import { HttpClientModule } from '@angular/common/http';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { ToastrModule } from 'ngx-toastr';
-
 import { AppRoutingModule } from './app-routing.module';
 import { AuthModule } from './modules/auth/auth.module';
 import { SharedModule } from './modules/shared/shared.module';
 import { TemplateModule } from './modules/template/template.module';
 import { MaterialModule } from './material.module';
-
-import { AppComponent } from './app.component';
-
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatTableModule } from '@angular/material/table';
 import { MatPaginatorModule } from '@angular/material/paginator';
+import { ToastrModule } from 'ngx-toastr';
+import { AppComponent } from './app.component';
 
 @NgModule({
   declarations: [
     AppComponent
-  ],
+    ],
   imports: [
     BrowserModule,
-    HttpClientModule,
-    FormsModule,
-    ReactiveFormsModule,
-    BrowserAnimationsModule,
     AppRoutingModule,
+    HttpClientModule,
     AuthModule,
     SharedModule,
     TemplateModule,
     MaterialModule,
+    BrowserAnimationsModule,
     MatFormFieldModule,
+    FormsModule,
+    ReactiveFormsModule,
     MatDividerModule,
     MatTableModule, 
     MatPaginatorModule,

diff --git a/src/app/modules/template/template-selection/template-selection.component.ts b/src/app/modules/template/template-selection/template-selection.component.ts
@@ -80,7 +80,7 @@ export class TemplateSelectionComponent implements OnInit {
       this.toaster.success('Downloaded successfully');
       this.selectFile = "";
     } else {
-      alert("Please select a file to download");
+      this.toaster.error('No file found ', "Please select a file");
     }
   }
 
@@ -217,7 +217,7 @@ export class TemplateSelectionComponent implements OnInit {
         }
       );
     } else {
-      alert(`Please select a file to ${action}`);
+      this.toaster.error('No file found ', "Please select a file");
     }
   }
 

diff --git a/src/app/modules/template/template-solution-list/template-solution-list.component.css b/src/app/modules/template/template-solution-list/template-solution-list.component.css
@@ -62,6 +62,6 @@ mat-paginator {
   border-top: 1px solid #e0e0e0;
 }
 .back-button {
-  color: rgb(0, 116, 182, 1) !important;
+  color: rgb(0, 116, 182, 1);
   /* font-weight: bold; */
 }
diff --git a/src/app/modules/template/template-solution-list/template-solution-list.component.html b/src/app/modules/template/template-solution-list/template-solution-list.component.html
@@ -1,6 +1,6 @@
 <div class="mat-elevation-z8">
 
-  <button mat-button color="primary" (click)="goBack()" class="back-button">
+  <button mat-button (click)="goBack()" class="back-button">
     <mat-icon>arrow_back</mat-icon> Back
   </button>
 
@@ -26,15 +26,20 @@ <h2>List of Solutions</h2>
       <td mat-cell *matCellDef="let element"> {{element.solutionName}} </td>
     </ng-container>
 
+    <ng-container matColumnDef="solution_created_date">
+      <th mat-header-cell *matHeaderCellDef mat-sort-header> Solution Created Date </th>
+      <td mat-cell *matCellDef="let element"> {{element.solution_created_date}} </td>
+    </ng-container>
+
     <!-- Start Date Column -->
     <ng-container matColumnDef="startDate">
-      <th mat-header-cell *matHeaderCellDef mat-sort-header> Start Date </th>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header> Survey Start Date </th>
       <td mat-cell *matCellDef="let element"> {{element.startDate | date:'medium'}} </td>
     </ng-container>
 
     <!-- End Date Column -->
     <ng-container matColumnDef="endDate">
-      <th mat-header-cell *matHeaderCellDef mat-sort-header> End Date </th>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header> Survey End Date </th>
       <td mat-cell *matCellDef="let element"> {{element.endDate | date:'medium'}} </td>
     </ng-container>
 

diff --git a/src/app/modules/template/template-solution-list/template-solution-list.component.ts b/src/app/modules/template/template-solution-list/template-solution-list.component.ts
@@ -13,7 +13,7 @@ import { Location } from '@angular/common';
   templateUrl: 'template-solution-list.component.html',
 })
 export class TemplateSolutionListComponent implements AfterViewInit, OnInit {
-  displayedColumns: string[] = ['solutionId', 'solutionName', 'startDate', 'endDate', 'action'];
+  displayedColumns: string[] = ['solutionId', 'solutionName','solution_created_date', 'startDate', 'endDate', 'action'];
   dataSource = new MatTableDataSource<any>();
   resourceType: string = ""
 
@@ -39,6 +39,7 @@ export class TemplateSolutionListComponent implements AfterViewInit, OnInit {
           this.dataSource.data = response.SolutionList.map((item: any) => ({
             solutionId: item.SOLUTION_ID,
             solutionName: item.SOLUTION_NAME,
+            solution_created_date: item.SOLUTION_CREATED_DATE,
             startDate: item.START_DATE,
             endDate: item.END_DATE
           }));

diff --git a/src/app/modules/template/template-success/template-success.component.html b/src/app/modules/template/template-success/template-success.component.html
@@ -1,5 +1,5 @@
 <div class="template-success-container">
-  <button mat-button color="primary" (click)="goBack()" class="back-button">
+  <button mat-button (click)="goBack()" class="back-button">
     <mat-icon>arrow_back</mat-icon> Back
   </button>
   <div class="header-container">

diff --git a/src/app/modules/template/template-success/template-success.component.scss b/src/app/modules/template/template-success/template-success.component.scss
@@ -96,6 +96,6 @@ p {
 }
 
 .back-button {
-  color: rgb(0, 116, 182, 1) !important;
+  color: rgb(0, 116, 182, 1);
   /* font-weight: bold; */
 }