From 27ecb036ef3d4fc942d5229afb01c21b65666ab7 Mon Sep 17 00:00:00 2001
From: gustavao <elg.gespindola@gmail.com>
Date: Mon, 2 Aug 2021 17:43:48 -0500
Subject: [PATCH 1/9] activate holidays

---
 .../view-holidays.component.html              | 76 +++++++++----------
 .../view-holidays/view-holidays.component.ts  | 18 +++++
 src/app/organization/organization.service.ts  | 11 +++
 3 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.html b/src/app/organization/holidays/view-holidays/view-holidays.component.html
index 3a2c872ae..7b64a41af 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.html
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.html
@@ -1,15 +1,15 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <span *mifosxHasPermission="'ACTIVATE_HOLIDAY'">
-    <button mat-raised-button color="accent" *ngIf="holidayData.status.value !== 'Active'">
+    <span *mifosxHasPermission="'ACTIVATE_HOLIDAY'">
+    <button mat-raised-button color="accent" (click)="activateHoliday()" *ngIf="holidayData.status.value !== 'Active'">
       <fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;
       Activate
     </button>
   </span>
-  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOLIDAY'">
+    <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOLIDAY'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteHoliday()" *mifosxHasPermission="'DELETE_HOLIDAY'">
+    <button mat-raised-button color="warn" (click)="deleteHoliday()" *mifosxHasPermission="'DELETE_HOLIDAY'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
@@ -17,52 +17,52 @@
 
 <div class="container">
 
-  <mat-card>
+    <mat-card>
 
-    <mat-card-content>
+        <mat-card-content>
 
-      <div fxLayout="row wrap" class="content">
+            <div fxLayout="row wrap" class="content">
 
-        <div fxFlex="50%" class="header">
-          Name
-        </div>
+                <div fxFlex="50%" class="header">
+                    Name
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.name }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.name }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          From Date
-        </div>
+                <div fxFlex="50%" class="header">
+                    From Date
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.fromDate | date }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.fromDate | date }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          To Date
-        </div>
+                <div fxFlex="50%" class="header">
+                    To Date
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.toDate | date }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.toDate | date }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          Repayments Scheduled To
-        </div>
+                <div fxFlex="50%" class="header">
+                    Repayments Scheduled To
+                </div>
 
-        <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo !== undefined && holidayData.repaymentsRescheduledTo !== null">
-          {{ holidayData.repaymentsRescheduledTo | date }}
-        </div>
+                <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo !== undefined && holidayData.repaymentsRescheduledTo !== null">
+                    {{ holidayData.repaymentsRescheduledTo | date }}
+                </div>
 
-        <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo === undefined || holidayData.repaymentsRescheduledTo === null">
-          Next Repayment Date
-        </div>
+                <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo === undefined || holidayData.repaymentsRescheduledTo === null">
+                    Next Repayment Date
+                </div>
 
-      </div>
+            </div>
 
-    </mat-card-content>
+        </mat-card-content>
 
-  </mat-card>
+    </mat-card>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.ts b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
index 34522bec7..deada1c43 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.ts
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
@@ -7,6 +7,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { OrganizationService } from 'app/organization/organization.service';
 
 /** Custom Components. */
+import { ConfirmationDialogComponent } from '../../../shared/confirmation-dialog/confirmation-dialog.component';
 import { DeleteDialogComponent } from '../../../shared/delete-dialog/delete-dialog.component';
 
 /**
@@ -52,4 +53,21 @@ export class ViewHolidaysComponent {
     });
   }
 
+  /**
+   * Activate holiday.
+   */
+  activateHoliday() {
+    const unAssignStaffDialogRef = this.dialog.open(ConfirmationDialogComponent, {
+      data: { heading: 'Holiday', dialogContext: `Are you sure you want to activate ${this.holidayData.name} holiday` }
+    });
+    unAssignStaffDialogRef.afterClosed().subscribe((response: { confirm: any }) => {
+      if (response.confirm) {
+        this.organizationService.activateHoliday(this.holidayData.id)
+          .subscribe((response: any) => {
+            this.router.navigate(['/organization/holidays']);
+          });
+      }
+    });
+  }
+
 }
diff --git a/src/app/organization/organization.service.ts b/src/app/organization/organization.service.ts
index 3762ba537..fed484649 100644
--- a/src/app/organization/organization.service.ts
+++ b/src/app/organization/organization.service.ts
@@ -639,6 +639,17 @@ export class OrganizationService {
     return this.http.delete(`/holidays/${holidayId}`);
   }
 
+    /**
+   * Activate Holiday.
+   * @param holidayId Holiday Id to be deleted.
+   * @returns {Observable<any>} Resource Id.
+   */
+  activateHoliday(holidayId: string): Observable<any> {
+    const httpParams = new HttpParams()
+      .set('command','activate');
+    return this.http.post(`/holidays/${holidayId}`, null, { params: httpParams });
+  }
+
   /**
    * @param {any} employeeId Employee ID of Employee to be edited.
    * @returns {Observable<any>}

From db4284d5f58fee526f79160dc5c44c79dc1c880f Mon Sep 17 00:00:00 2001
From: gustavao <elg.gespindola@gmail.com>
Date: Tue, 3 Aug 2021 10:30:42 -0500
Subject: [PATCH 2/9] tslint bugs are fixed

---
 .../view-holidays/view-holidays.component.ts  | 10 +++----
 src/app/organization/organization.service.ts  | 30 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.ts b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
index deada1c43..d794f14ee 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.ts
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
@@ -28,10 +28,10 @@ export class ViewHolidaysComponent {
    * @param {ActivatedRoute} route Activated Route.
    */
   constructor(private route: ActivatedRoute,
-              private router: Router,
-              private dialog: MatDialog,
-              private organizationService: OrganizationService ) {
-    this.route.data.subscribe((data: { holidays: any}) => {
+    private router: Router,
+    private dialog: MatDialog,
+    private organizationService: OrganizationService) {
+    this.route.data.subscribe((data: { holidays: any }) => {
       this.holidayData = data.holidays;
     });
   }
@@ -63,7 +63,7 @@ export class ViewHolidaysComponent {
     unAssignStaffDialogRef.afterClosed().subscribe((response: { confirm: any }) => {
       if (response.confirm) {
         this.organizationService.activateHoliday(this.holidayData.id)
-          .subscribe((response: any) => {
+          .subscribe(() => {
             this.router.navigate(['/organization/holidays']);
           });
       }
diff --git a/src/app/organization/organization.service.ts b/src/app/organization/organization.service.ts
index fed484649..820b17792 100644
--- a/src/app/organization/organization.service.ts
+++ b/src/app/organization/organization.service.ts
@@ -93,8 +93,8 @@ export class OrganizationService {
    */
   getOfficerTemplate(officerId: string, officeId: string): Observable<any> {
     const httpParams = new HttpParams()
-                       .set('fromLoanOfficerId', officerId.toString())
-                       .set('officeId', officerId.toString());
+      .set('fromLoanOfficerId', officerId.toString())
+      .set('officeId', officerId.toString());
     return this.http.get('/loans/loanreassignment/template', { params: httpParams });
   }
 
@@ -134,9 +134,9 @@ export class OrganizationService {
     return this.http.put(`/offices/${officeId}`, office);
   }
 
- /**
-  * @returns {Observable<any>}
-  */
+  /**
+   * @returns {Observable<any>}
+   */
   getOfficeDatatables(): Observable<any> {
     const httpParams = new HttpParams().set('apptable', 'm_office');
     return this.http.get(`/datatables`, { params: httpParams });
@@ -222,7 +222,7 @@ export class OrganizationService {
    * @returns {Observable<any>} Currencies data
    */
   updateCurrencies(currencies: any[]): Observable<any> {
-    return this.http.put('/currencies', {currencies});
+    return this.http.put('/currencies', { currencies });
   }
 
   /**
@@ -431,7 +431,7 @@ export class OrganizationService {
    */
   settleCash(tellerId: string, cashierId: string, cashData: any): Observable<any> {
     const httpParams = new HttpParams().set('command', 'settle');
-    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/settle`, cashData, {params: httpParams});
+    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/settle`, cashData, { params: httpParams });
   }
 
   /**
@@ -442,7 +442,7 @@ export class OrganizationService {
    */
   allocateCash(tellerId: string, cashierId: string, cashData: any): Observable<any> {
     const httpParams = new HttpParams().set('command', 'allocate');
-    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/allocate`, cashData, {params: httpParams});
+    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/allocate`, cashData, { params: httpParams });
   }
 
   /** Get Cashier Template.
@@ -639,14 +639,14 @@ export class OrganizationService {
     return this.http.delete(`/holidays/${holidayId}`);
   }
 
-    /**
+  /**
    * Activate Holiday.
    * @param holidayId Holiday Id to be deleted.
    * @returns {Observable<any>} Resource Id.
    */
   activateHoliday(holidayId: string): Observable<any> {
     const httpParams = new HttpParams()
-      .set('command','activate');
+      .set('command', 'activate');
     return this.http.post(`/holidays/${holidayId}`, null, { params: httpParams });
   }
 
@@ -706,7 +706,7 @@ export class OrganizationService {
    */
   getImports(entity: string): Observable<any> {
     const httpParams = new HttpParams().set('entityType', entity);
-    return this.http.get('/imports', { params: httpParams } );
+    return this.http.get('/imports', { params: httpParams });
   }
 
   /**
@@ -765,7 +765,7 @@ export class OrganizationService {
     if (legalFormType.length) {
       httpParams = httpParams.set('legalFormType', legalFormType);
     }
-    return this.http.get(`${urlSuffix}/downloadtemplate`, { params: httpParams, responseType: 'arraybuffer', observe: 'response'} );
+    return this.http.get(`${urlSuffix}/downloadtemplate`, { params: httpParams, responseType: 'arraybuffer', observe: 'response' });
   }
 
   /**
@@ -775,8 +775,8 @@ export class OrganizationService {
   getImportDocument(id: any): Observable<any> {
     const httpParams = new HttpParams()
       .set('importDocumentId', id)
-      .set('tenantIdentifier', 'default' );
-    return this.http.get('/imports/downloadOutputTemplate', { params: httpParams, responseType: 'arraybuffer', observe: 'response'});
+      .set('tenantIdentifier', 'default');
+    return this.http.get('/imports/downloadOutputTemplate', { params: httpParams, responseType: 'arraybuffer', observe: 'response' });
   }
 
   /**
@@ -794,7 +794,7 @@ export class OrganizationService {
     formData.append('file', file);
     formData.append('locale', this.settingsService.language.code);
     formData.append('dateFormat', this.settingsService.dateFormat);
-    return this.http.post(`${urlSuffix}/uploadtemplate`, formData , { params: httpParams } );
+    return this.http.post(`${urlSuffix}/uploadtemplate`, formData, { params: httpParams });
   }
 
 }

From 7b084caa617972ba46c0e3fe6638727273917bad Mon Sep 17 00:00:00 2001
From: jagadeeshakn <jaga.gowdz.99@gmail.com>
Date: Mon, 5 Jul 2021 18:18:32 +0530
Subject: [PATCH 3/9] readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a3a5cd2ba..bd0877f62 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,8 @@ Run `ng generate component component-name` to generate a new component. You can
 
 Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
 
+Run `npm run build:prod` to build a production artifacts Instead.
+
 ### Further help
 
 To get more help on the Angular CLI use `ng help` or go check out the

From 84b2d8c5dfa33932e6d34a1f10371cfac35e71f9 Mon Sep 17 00:00:00 2001
From: gustavao <elg.gespindola@gmail.com>
Date: Mon, 2 Aug 2021 17:43:48 -0500
Subject: [PATCH 4/9] activate holidays

---
 .../view-holidays.component.html              | 76 +++++++++----------
 .../view-holidays/view-holidays.component.ts  | 18 +++++
 src/app/organization/organization.service.ts  | 11 +++
 3 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.html b/src/app/organization/holidays/view-holidays/view-holidays.component.html
index 3a2c872ae..7b64a41af 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.html
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.html
@@ -1,15 +1,15 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <span *mifosxHasPermission="'ACTIVATE_HOLIDAY'">
-    <button mat-raised-button color="accent" *ngIf="holidayData.status.value !== 'Active'">
+    <span *mifosxHasPermission="'ACTIVATE_HOLIDAY'">
+    <button mat-raised-button color="accent" (click)="activateHoliday()" *ngIf="holidayData.status.value !== 'Active'">
       <fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;
       Activate
     </button>
   </span>
-  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOLIDAY'">
+    <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOLIDAY'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteHoliday()" *mifosxHasPermission="'DELETE_HOLIDAY'">
+    <button mat-raised-button color="warn" (click)="deleteHoliday()" *mifosxHasPermission="'DELETE_HOLIDAY'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
@@ -17,52 +17,52 @@
 
 <div class="container">
 
-  <mat-card>
+    <mat-card>
 
-    <mat-card-content>
+        <mat-card-content>
 
-      <div fxLayout="row wrap" class="content">
+            <div fxLayout="row wrap" class="content">
 
-        <div fxFlex="50%" class="header">
-          Name
-        </div>
+                <div fxFlex="50%" class="header">
+                    Name
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.name }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.name }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          From Date
-        </div>
+                <div fxFlex="50%" class="header">
+                    From Date
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.fromDate | date }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.fromDate | date }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          To Date
-        </div>
+                <div fxFlex="50%" class="header">
+                    To Date
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.toDate | date }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.toDate | date }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          Repayments Scheduled To
-        </div>
+                <div fxFlex="50%" class="header">
+                    Repayments Scheduled To
+                </div>
 
-        <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo !== undefined && holidayData.repaymentsRescheduledTo !== null">
-          {{ holidayData.repaymentsRescheduledTo | date }}
-        </div>
+                <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo !== undefined && holidayData.repaymentsRescheduledTo !== null">
+                    {{ holidayData.repaymentsRescheduledTo | date }}
+                </div>
 
-        <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo === undefined || holidayData.repaymentsRescheduledTo === null">
-          Next Repayment Date
-        </div>
+                <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo === undefined || holidayData.repaymentsRescheduledTo === null">
+                    Next Repayment Date
+                </div>
 
-      </div>
+            </div>
 
-    </mat-card-content>
+        </mat-card-content>
 
-  </mat-card>
+    </mat-card>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.ts b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
index 34522bec7..deada1c43 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.ts
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
@@ -7,6 +7,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { OrganizationService } from 'app/organization/organization.service';
 
 /** Custom Components. */
+import { ConfirmationDialogComponent } from '../../../shared/confirmation-dialog/confirmation-dialog.component';
 import { DeleteDialogComponent } from '../../../shared/delete-dialog/delete-dialog.component';
 
 /**
@@ -52,4 +53,21 @@ export class ViewHolidaysComponent {
     });
   }
 
+  /**
+   * Activate holiday.
+   */
+  activateHoliday() {
+    const unAssignStaffDialogRef = this.dialog.open(ConfirmationDialogComponent, {
+      data: { heading: 'Holiday', dialogContext: `Are you sure you want to activate ${this.holidayData.name} holiday` }
+    });
+    unAssignStaffDialogRef.afterClosed().subscribe((response: { confirm: any }) => {
+      if (response.confirm) {
+        this.organizationService.activateHoliday(this.holidayData.id)
+          .subscribe((response: any) => {
+            this.router.navigate(['/organization/holidays']);
+          });
+      }
+    });
+  }
+
 }
diff --git a/src/app/organization/organization.service.ts b/src/app/organization/organization.service.ts
index 3762ba537..fed484649 100644
--- a/src/app/organization/organization.service.ts
+++ b/src/app/organization/organization.service.ts
@@ -639,6 +639,17 @@ export class OrganizationService {
     return this.http.delete(`/holidays/${holidayId}`);
   }
 
+    /**
+   * Activate Holiday.
+   * @param holidayId Holiday Id to be deleted.
+   * @returns {Observable<any>} Resource Id.
+   */
+  activateHoliday(holidayId: string): Observable<any> {
+    const httpParams = new HttpParams()
+      .set('command','activate');
+    return this.http.post(`/holidays/${holidayId}`, null, { params: httpParams });
+  }
+
   /**
    * @param {any} employeeId Employee ID of Employee to be edited.
    * @returns {Observable<any>}

From 3cdc0b3de2ed7a9234639986ddc7641454325f97 Mon Sep 17 00:00:00 2001
From: gustavao <elg.gespindola@gmail.com>
Date: Mon, 2 Aug 2021 18:00:43 -0500
Subject: [PATCH 5/9] issue1317 add correct route

---
 .../employees/employees.component.html        | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/app/organization/employees/employees.component.html b/src/app/organization/employees/employees.component.html
index 959b76470..b0a5f5cb0 100644
--- a/src/app/organization/employees/employees.component.html
+++ b/src/app/organization/employees/employees.component.html
@@ -1,11 +1,11 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" *mifosxHasPermission="'CREATE_STAFF'" [routerLink]="['../', 'organization', 'bulk-import', 'Employees']">
+    <button mat-raised-button color="primary" *mifosxHasPermission="'CREATE_STAFF'" [routerLink]="['/', 'organization', 'bulk-import', 'Employees']">
     <fa-icon icon="upload"></fa-icon>&nbsp;&nbsp;
     Import Employees
   </button>
 
-  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_STAFF'">
+    <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_STAFF'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Employee
   </button>
@@ -14,53 +14,53 @@
 
 <div class="container">
 
-  <div fxLayout="row" fxLayoutGap="20px">
-    <mat-form-field fxFlex>
-      <mat-label>Filter</mat-label>
-      <input matInput (keyup)="applyFilter($event.target.value)">
-    </mat-form-field>
-  </div>
+    <div fxLayout="row" fxLayoutGap="20px">
+        <mat-form-field fxFlex>
+            <mat-label>Filter</mat-label>
+            <input matInput (keyup)="applyFilter($event.target.value)">
+        </mat-form-field>
+    </div>
 
-  <div class="mat-elevation-z8">
+    <div class="mat-elevation-z8">
 
-    <table mat-table [dataSource]="dataSource" matSort>
+        <table mat-table [dataSource]="dataSource" matSort>
 
-      <ng-container matColumnDef="displayName">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
-        <td mat-cell *matCellDef="let employee"> {{ employee.displayName }} </td>
-      </ng-container>
+            <ng-container matColumnDef="displayName">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
+                <td mat-cell *matCellDef="let employee"> {{ employee.displayName }} </td>
+            </ng-container>
 
-      <ng-container matColumnDef="isLoanOfficer">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Loan Officer </th>
-        <td mat-cell *matCellDef="let employee">
-          <div [className]="employee.isLoanOfficer === true ? 'true' : 'false'">
-            <fa-icon *ngIf="employee.isLoanOfficer" icon="check-circle" size="lg" matTooltip="Yes" matTooltipPosition="right"></fa-icon>
-            <fa-icon *ngIf="!employee.isLoanOfficer" icon="times-circle" size="lg" matTooltip="No" matTooltipPosition="right"></fa-icon>
-          </div>
-        </td>
-      </ng-container>
+            <ng-container matColumnDef="isLoanOfficer">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Loan Officer </th>
+                <td mat-cell *matCellDef="let employee">
+                    <div [className]="employee.isLoanOfficer === true ? 'true' : 'false'">
+                        <fa-icon *ngIf="employee.isLoanOfficer" icon="check-circle" size="lg" matTooltip="Yes" matTooltipPosition="right"></fa-icon>
+                        <fa-icon *ngIf="!employee.isLoanOfficer" icon="times-circle" size="lg" matTooltip="No" matTooltipPosition="right"></fa-icon>
+                    </div>
+                </td>
+            </ng-container>
 
-      <ng-container matColumnDef="officeName">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Office </th>
-        <td mat-cell *matCellDef="let employees"> {{ employees.officeName }} </td>
-      </ng-container>
+            <ng-container matColumnDef="officeName">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Office </th>
+                <td mat-cell *matCellDef="let employees"> {{ employees.officeName }} </td>
+            </ng-container>
 
-      <ng-container matColumnDef="isActive">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Status </th>
-        <td mat-cell *matCellDef="let employee">
-          <div [className]="employee.isActive === true ? 'true' : 'false'">
-            <fa-icon matTooltip="{{ employee.isActive === true ? 'Active' : 'Inactive' }}" matTooltipPosition="right" icon="circle" size="lg"></fa-icon>
-          </div>
-        </td>
-      </ng-container>
+            <ng-container matColumnDef="isActive">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Status </th>
+                <td mat-cell *matCellDef="let employee">
+                    <div [className]="employee.isActive === true ? 'true' : 'false'">
+                        <fa-icon matTooltip="{{ employee.isActive === true ? 'Active' : 'Inactive' }}" matTooltipPosition="right" icon="circle" size="lg"></fa-icon>
+                    </div>
+                </td>
+            </ng-container>
 
-      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-      <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]" class="select-row"></tr>
+            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]" class="select-row"></tr>
 
-    </table>
+        </table>
 
-    <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
+        <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
 
-  </div>
+    </div>
 
-</div>
+</div>
\ No newline at end of file

From 16728bcbbf026610e9d897068c515772d6d1b249 Mon Sep 17 00:00:00 2001
From: gustavao <elg.gespindola@gmail.com>
Date: Tue, 3 Aug 2021 12:13:10 -0500
Subject: [PATCH 6/9] tslint bugs are fixed

---
 .../view-holidays/view-holidays.component.ts  |  2 +-
 src/app/organization/organization.service.ts  | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.ts b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
index deada1c43..9ef74db51 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.ts
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
@@ -63,7 +63,7 @@ export class ViewHolidaysComponent {
     unAssignStaffDialogRef.afterClosed().subscribe((response: { confirm: any }) => {
       if (response.confirm) {
         this.organizationService.activateHoliday(this.holidayData.id)
-          .subscribe((response: any) => {
+          .subscribe(() => {
             this.router.navigate(['/organization/holidays']);
           });
       }
diff --git a/src/app/organization/organization.service.ts b/src/app/organization/organization.service.ts
index fed484649..820b17792 100644
--- a/src/app/organization/organization.service.ts
+++ b/src/app/organization/organization.service.ts
@@ -93,8 +93,8 @@ export class OrganizationService {
    */
   getOfficerTemplate(officerId: string, officeId: string): Observable<any> {
     const httpParams = new HttpParams()
-                       .set('fromLoanOfficerId', officerId.toString())
-                       .set('officeId', officerId.toString());
+      .set('fromLoanOfficerId', officerId.toString())
+      .set('officeId', officerId.toString());
     return this.http.get('/loans/loanreassignment/template', { params: httpParams });
   }
 
@@ -134,9 +134,9 @@ export class OrganizationService {
     return this.http.put(`/offices/${officeId}`, office);
   }
 
- /**
-  * @returns {Observable<any>}
-  */
+  /**
+   * @returns {Observable<any>}
+   */
   getOfficeDatatables(): Observable<any> {
     const httpParams = new HttpParams().set('apptable', 'm_office');
     return this.http.get(`/datatables`, { params: httpParams });
@@ -222,7 +222,7 @@ export class OrganizationService {
    * @returns {Observable<any>} Currencies data
    */
   updateCurrencies(currencies: any[]): Observable<any> {
-    return this.http.put('/currencies', {currencies});
+    return this.http.put('/currencies', { currencies });
   }
 
   /**
@@ -431,7 +431,7 @@ export class OrganizationService {
    */
   settleCash(tellerId: string, cashierId: string, cashData: any): Observable<any> {
     const httpParams = new HttpParams().set('command', 'settle');
-    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/settle`, cashData, {params: httpParams});
+    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/settle`, cashData, { params: httpParams });
   }
 
   /**
@@ -442,7 +442,7 @@ export class OrganizationService {
    */
   allocateCash(tellerId: string, cashierId: string, cashData: any): Observable<any> {
     const httpParams = new HttpParams().set('command', 'allocate');
-    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/allocate`, cashData, {params: httpParams});
+    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/allocate`, cashData, { params: httpParams });
   }
 
   /** Get Cashier Template.
@@ -639,14 +639,14 @@ export class OrganizationService {
     return this.http.delete(`/holidays/${holidayId}`);
   }
 
-    /**
+  /**
    * Activate Holiday.
    * @param holidayId Holiday Id to be deleted.
    * @returns {Observable<any>} Resource Id.
    */
   activateHoliday(holidayId: string): Observable<any> {
     const httpParams = new HttpParams()
-      .set('command','activate');
+      .set('command', 'activate');
     return this.http.post(`/holidays/${holidayId}`, null, { params: httpParams });
   }
 
@@ -706,7 +706,7 @@ export class OrganizationService {
    */
   getImports(entity: string): Observable<any> {
     const httpParams = new HttpParams().set('entityType', entity);
-    return this.http.get('/imports', { params: httpParams } );
+    return this.http.get('/imports', { params: httpParams });
   }
 
   /**
@@ -765,7 +765,7 @@ export class OrganizationService {
     if (legalFormType.length) {
       httpParams = httpParams.set('legalFormType', legalFormType);
     }
-    return this.http.get(`${urlSuffix}/downloadtemplate`, { params: httpParams, responseType: 'arraybuffer', observe: 'response'} );
+    return this.http.get(`${urlSuffix}/downloadtemplate`, { params: httpParams, responseType: 'arraybuffer', observe: 'response' });
   }
 
   /**
@@ -775,8 +775,8 @@ export class OrganizationService {
   getImportDocument(id: any): Observable<any> {
     const httpParams = new HttpParams()
       .set('importDocumentId', id)
-      .set('tenantIdentifier', 'default' );
-    return this.http.get('/imports/downloadOutputTemplate', { params: httpParams, responseType: 'arraybuffer', observe: 'response'});
+      .set('tenantIdentifier', 'default');
+    return this.http.get('/imports/downloadOutputTemplate', { params: httpParams, responseType: 'arraybuffer', observe: 'response' });
   }
 
   /**
@@ -794,7 +794,7 @@ export class OrganizationService {
     formData.append('file', file);
     formData.append('locale', this.settingsService.language.code);
     formData.append('dateFormat', this.settingsService.dateFormat);
-    return this.http.post(`${urlSuffix}/uploadtemplate`, formData , { params: httpParams } );
+    return this.http.post(`${urlSuffix}/uploadtemplate`, formData, { params: httpParams });
   }
 
 }

From 7044b6e34d233a6fbebc1e658f51d335a9e93c3f Mon Sep 17 00:00:00 2001
From: gustavao <elg.gespindola@gmail.com>
Date: Tue, 3 Aug 2021 10:30:42 -0500
Subject: [PATCH 7/9] tslint bugs are fixed

---
 .../holidays/view-holidays/view-holidays.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.ts b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
index 9ef74db51..d794f14ee 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.ts
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
@@ -28,10 +28,10 @@ export class ViewHolidaysComponent {
    * @param {ActivatedRoute} route Activated Route.
    */
   constructor(private route: ActivatedRoute,
-              private router: Router,
-              private dialog: MatDialog,
-              private organizationService: OrganizationService ) {
-    this.route.data.subscribe((data: { holidays: any}) => {
+    private router: Router,
+    private dialog: MatDialog,
+    private organizationService: OrganizationService) {
+    this.route.data.subscribe((data: { holidays: any }) => {
       this.holidayData = data.holidays;
     });
   }

From 5ed53be3d8f320c1153fa4bf16b466fed1427848 Mon Sep 17 00:00:00 2001
From: jagadeeshakn <jaga.gowdz.99@gmail.com>
Date: Mon, 5 Jul 2021 18:18:32 +0530
Subject: [PATCH 8/9] readme

activate holidays

issue1317 add correct route

tslint bugs are fixed

tslint bugs are fixed
---
 README.md                                     |  2 +
 .../employees/employees.component.html        | 82 +++++++++----------
 .../view-holidays.component.html              | 76 ++++++++---------
 .../view-holidays/view-holidays.component.ts  | 26 +++++-
 src/app/organization/organization.service.ts  | 37 ++++++---
 5 files changed, 127 insertions(+), 96 deletions(-)

diff --git a/README.md b/README.md
index a3a5cd2ba..bd0877f62 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,8 @@ Run `ng generate component component-name` to generate a new component. You can
 
 Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
 
+Run `npm run build:prod` to build a production artifacts Instead.
+
 ### Further help
 
 To get more help on the Angular CLI use `ng help` or go check out the
diff --git a/src/app/organization/employees/employees.component.html b/src/app/organization/employees/employees.component.html
index 959b76470..b0a5f5cb0 100644
--- a/src/app/organization/employees/employees.component.html
+++ b/src/app/organization/employees/employees.component.html
@@ -1,11 +1,11 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" *mifosxHasPermission="'CREATE_STAFF'" [routerLink]="['../', 'organization', 'bulk-import', 'Employees']">
+    <button mat-raised-button color="primary" *mifosxHasPermission="'CREATE_STAFF'" [routerLink]="['/', 'organization', 'bulk-import', 'Employees']">
     <fa-icon icon="upload"></fa-icon>&nbsp;&nbsp;
     Import Employees
   </button>
 
-  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_STAFF'">
+    <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_STAFF'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Employee
   </button>
@@ -14,53 +14,53 @@
 
 <div class="container">
 
-  <div fxLayout="row" fxLayoutGap="20px">
-    <mat-form-field fxFlex>
-      <mat-label>Filter</mat-label>
-      <input matInput (keyup)="applyFilter($event.target.value)">
-    </mat-form-field>
-  </div>
+    <div fxLayout="row" fxLayoutGap="20px">
+        <mat-form-field fxFlex>
+            <mat-label>Filter</mat-label>
+            <input matInput (keyup)="applyFilter($event.target.value)">
+        </mat-form-field>
+    </div>
 
-  <div class="mat-elevation-z8">
+    <div class="mat-elevation-z8">
 
-    <table mat-table [dataSource]="dataSource" matSort>
+        <table mat-table [dataSource]="dataSource" matSort>
 
-      <ng-container matColumnDef="displayName">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
-        <td mat-cell *matCellDef="let employee"> {{ employee.displayName }} </td>
-      </ng-container>
+            <ng-container matColumnDef="displayName">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
+                <td mat-cell *matCellDef="let employee"> {{ employee.displayName }} </td>
+            </ng-container>
 
-      <ng-container matColumnDef="isLoanOfficer">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Loan Officer </th>
-        <td mat-cell *matCellDef="let employee">
-          <div [className]="employee.isLoanOfficer === true ? 'true' : 'false'">
-            <fa-icon *ngIf="employee.isLoanOfficer" icon="check-circle" size="lg" matTooltip="Yes" matTooltipPosition="right"></fa-icon>
-            <fa-icon *ngIf="!employee.isLoanOfficer" icon="times-circle" size="lg" matTooltip="No" matTooltipPosition="right"></fa-icon>
-          </div>
-        </td>
-      </ng-container>
+            <ng-container matColumnDef="isLoanOfficer">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Loan Officer </th>
+                <td mat-cell *matCellDef="let employee">
+                    <div [className]="employee.isLoanOfficer === true ? 'true' : 'false'">
+                        <fa-icon *ngIf="employee.isLoanOfficer" icon="check-circle" size="lg" matTooltip="Yes" matTooltipPosition="right"></fa-icon>
+                        <fa-icon *ngIf="!employee.isLoanOfficer" icon="times-circle" size="lg" matTooltip="No" matTooltipPosition="right"></fa-icon>
+                    </div>
+                </td>
+            </ng-container>
 
-      <ng-container matColumnDef="officeName">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Office </th>
-        <td mat-cell *matCellDef="let employees"> {{ employees.officeName }} </td>
-      </ng-container>
+            <ng-container matColumnDef="officeName">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Office </th>
+                <td mat-cell *matCellDef="let employees"> {{ employees.officeName }} </td>
+            </ng-container>
 
-      <ng-container matColumnDef="isActive">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Status </th>
-        <td mat-cell *matCellDef="let employee">
-          <div [className]="employee.isActive === true ? 'true' : 'false'">
-            <fa-icon matTooltip="{{ employee.isActive === true ? 'Active' : 'Inactive' }}" matTooltipPosition="right" icon="circle" size="lg"></fa-icon>
-          </div>
-        </td>
-      </ng-container>
+            <ng-container matColumnDef="isActive">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Status </th>
+                <td mat-cell *matCellDef="let employee">
+                    <div [className]="employee.isActive === true ? 'true' : 'false'">
+                        <fa-icon matTooltip="{{ employee.isActive === true ? 'Active' : 'Inactive' }}" matTooltipPosition="right" icon="circle" size="lg"></fa-icon>
+                    </div>
+                </td>
+            </ng-container>
 
-      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-      <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]" class="select-row"></tr>
+            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]" class="select-row"></tr>
 
-    </table>
+        </table>
 
-    <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
+        <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
 
-  </div>
+    </div>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.html b/src/app/organization/holidays/view-holidays/view-holidays.component.html
index 3a2c872ae..7b64a41af 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.html
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.html
@@ -1,15 +1,15 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <span *mifosxHasPermission="'ACTIVATE_HOLIDAY'">
-    <button mat-raised-button color="accent" *ngIf="holidayData.status.value !== 'Active'">
+    <span *mifosxHasPermission="'ACTIVATE_HOLIDAY'">
+    <button mat-raised-button color="accent" (click)="activateHoliday()" *ngIf="holidayData.status.value !== 'Active'">
       <fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;
       Activate
     </button>
   </span>
-  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOLIDAY'">
+    <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOLIDAY'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteHoliday()" *mifosxHasPermission="'DELETE_HOLIDAY'">
+    <button mat-raised-button color="warn" (click)="deleteHoliday()" *mifosxHasPermission="'DELETE_HOLIDAY'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
@@ -17,52 +17,52 @@
 
 <div class="container">
 
-  <mat-card>
+    <mat-card>
 
-    <mat-card-content>
+        <mat-card-content>
 
-      <div fxLayout="row wrap" class="content">
+            <div fxLayout="row wrap" class="content">
 
-        <div fxFlex="50%" class="header">
-          Name
-        </div>
+                <div fxFlex="50%" class="header">
+                    Name
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.name }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.name }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          From Date
-        </div>
+                <div fxFlex="50%" class="header">
+                    From Date
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.fromDate | date }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.fromDate | date }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          To Date
-        </div>
+                <div fxFlex="50%" class="header">
+                    To Date
+                </div>
 
-        <div fxFlex="50%">
-          {{ holidayData.toDate | date }}
-        </div>
+                <div fxFlex="50%">
+                    {{ holidayData.toDate | date }}
+                </div>
 
-        <div fxFlex="50%" class="header">
-          Repayments Scheduled To
-        </div>
+                <div fxFlex="50%" class="header">
+                    Repayments Scheduled To
+                </div>
 
-        <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo !== undefined && holidayData.repaymentsRescheduledTo !== null">
-          {{ holidayData.repaymentsRescheduledTo | date }}
-        </div>
+                <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo !== undefined && holidayData.repaymentsRescheduledTo !== null">
+                    {{ holidayData.repaymentsRescheduledTo | date }}
+                </div>
 
-        <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo === undefined || holidayData.repaymentsRescheduledTo === null">
-          Next Repayment Date
-        </div>
+                <div fxFlex="50%" *ngIf="holidayData.repaymentsRescheduledTo === undefined || holidayData.repaymentsRescheduledTo === null">
+                    Next Repayment Date
+                </div>
 
-      </div>
+            </div>
 
-    </mat-card-content>
+        </mat-card-content>
 
-  </mat-card>
+    </mat-card>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.ts b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
index 34522bec7..d794f14ee 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.ts
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.ts
@@ -7,6 +7,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { OrganizationService } from 'app/organization/organization.service';
 
 /** Custom Components. */
+import { ConfirmationDialogComponent } from '../../../shared/confirmation-dialog/confirmation-dialog.component';
 import { DeleteDialogComponent } from '../../../shared/delete-dialog/delete-dialog.component';
 
 /**
@@ -27,10 +28,10 @@ export class ViewHolidaysComponent {
    * @param {ActivatedRoute} route Activated Route.
    */
   constructor(private route: ActivatedRoute,
-              private router: Router,
-              private dialog: MatDialog,
-              private organizationService: OrganizationService ) {
-    this.route.data.subscribe((data: { holidays: any}) => {
+    private router: Router,
+    private dialog: MatDialog,
+    private organizationService: OrganizationService) {
+    this.route.data.subscribe((data: { holidays: any }) => {
       this.holidayData = data.holidays;
     });
   }
@@ -52,4 +53,21 @@ export class ViewHolidaysComponent {
     });
   }
 
+  /**
+   * Activate holiday.
+   */
+  activateHoliday() {
+    const unAssignStaffDialogRef = this.dialog.open(ConfirmationDialogComponent, {
+      data: { heading: 'Holiday', dialogContext: `Are you sure you want to activate ${this.holidayData.name} holiday` }
+    });
+    unAssignStaffDialogRef.afterClosed().subscribe((response: { confirm: any }) => {
+      if (response.confirm) {
+        this.organizationService.activateHoliday(this.holidayData.id)
+          .subscribe(() => {
+            this.router.navigate(['/organization/holidays']);
+          });
+      }
+    });
+  }
+
 }
diff --git a/src/app/organization/organization.service.ts b/src/app/organization/organization.service.ts
index 3762ba537..820b17792 100644
--- a/src/app/organization/organization.service.ts
+++ b/src/app/organization/organization.service.ts
@@ -93,8 +93,8 @@ export class OrganizationService {
    */
   getOfficerTemplate(officerId: string, officeId: string): Observable<any> {
     const httpParams = new HttpParams()
-                       .set('fromLoanOfficerId', officerId.toString())
-                       .set('officeId', officerId.toString());
+      .set('fromLoanOfficerId', officerId.toString())
+      .set('officeId', officerId.toString());
     return this.http.get('/loans/loanreassignment/template', { params: httpParams });
   }
 
@@ -134,9 +134,9 @@ export class OrganizationService {
     return this.http.put(`/offices/${officeId}`, office);
   }
 
- /**
-  * @returns {Observable<any>}
-  */
+  /**
+   * @returns {Observable<any>}
+   */
   getOfficeDatatables(): Observable<any> {
     const httpParams = new HttpParams().set('apptable', 'm_office');
     return this.http.get(`/datatables`, { params: httpParams });
@@ -222,7 +222,7 @@ export class OrganizationService {
    * @returns {Observable<any>} Currencies data
    */
   updateCurrencies(currencies: any[]): Observable<any> {
-    return this.http.put('/currencies', {currencies});
+    return this.http.put('/currencies', { currencies });
   }
 
   /**
@@ -431,7 +431,7 @@ export class OrganizationService {
    */
   settleCash(tellerId: string, cashierId: string, cashData: any): Observable<any> {
     const httpParams = new HttpParams().set('command', 'settle');
-    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/settle`, cashData, {params: httpParams});
+    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/settle`, cashData, { params: httpParams });
   }
 
   /**
@@ -442,7 +442,7 @@ export class OrganizationService {
    */
   allocateCash(tellerId: string, cashierId: string, cashData: any): Observable<any> {
     const httpParams = new HttpParams().set('command', 'allocate');
-    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/allocate`, cashData, {params: httpParams});
+    return this.http.post(`/tellers/${tellerId}/cashiers/${cashierId}/allocate`, cashData, { params: httpParams });
   }
 
   /** Get Cashier Template.
@@ -639,6 +639,17 @@ export class OrganizationService {
     return this.http.delete(`/holidays/${holidayId}`);
   }
 
+  /**
+   * Activate Holiday.
+   * @param holidayId Holiday Id to be deleted.
+   * @returns {Observable<any>} Resource Id.
+   */
+  activateHoliday(holidayId: string): Observable<any> {
+    const httpParams = new HttpParams()
+      .set('command', 'activate');
+    return this.http.post(`/holidays/${holidayId}`, null, { params: httpParams });
+  }
+
   /**
    * @param {any} employeeId Employee ID of Employee to be edited.
    * @returns {Observable<any>}
@@ -695,7 +706,7 @@ export class OrganizationService {
    */
   getImports(entity: string): Observable<any> {
     const httpParams = new HttpParams().set('entityType', entity);
-    return this.http.get('/imports', { params: httpParams } );
+    return this.http.get('/imports', { params: httpParams });
   }
 
   /**
@@ -754,7 +765,7 @@ export class OrganizationService {
     if (legalFormType.length) {
       httpParams = httpParams.set('legalFormType', legalFormType);
     }
-    return this.http.get(`${urlSuffix}/downloadtemplate`, { params: httpParams, responseType: 'arraybuffer', observe: 'response'} );
+    return this.http.get(`${urlSuffix}/downloadtemplate`, { params: httpParams, responseType: 'arraybuffer', observe: 'response' });
   }
 
   /**
@@ -764,8 +775,8 @@ export class OrganizationService {
   getImportDocument(id: any): Observable<any> {
     const httpParams = new HttpParams()
       .set('importDocumentId', id)
-      .set('tenantIdentifier', 'default' );
-    return this.http.get('/imports/downloadOutputTemplate', { params: httpParams, responseType: 'arraybuffer', observe: 'response'});
+      .set('tenantIdentifier', 'default');
+    return this.http.get('/imports/downloadOutputTemplate', { params: httpParams, responseType: 'arraybuffer', observe: 'response' });
   }
 
   /**
@@ -783,7 +794,7 @@ export class OrganizationService {
     formData.append('file', file);
     formData.append('locale', this.settingsService.language.code);
     formData.append('dateFormat', this.settingsService.dateFormat);
-    return this.http.post(`${urlSuffix}/uploadtemplate`, formData , { params: httpParams } );
+    return this.http.post(`${urlSuffix}/uploadtemplate`, formData, { params: httpParams });
   }
 
 }

From 9d4726e7dd7f0a3e1cc3b31cc8a2e1d2436265b2 Mon Sep 17 00:00:00 2001
From: gustavao <elg.gespindola@gmail.com>
Date: Thu, 26 Aug 2021 18:16:07 -0500
Subject: [PATCH 9/9] add new server issue 1357

---
 .../server-selector.component.html            | 30 ++++++++++++++-----
 .../server-selector.component.scss            | 26 ++++++++++++++++
 .../server-selector.component.ts              | 24 +++++++++++++--
 3 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/server-selector/server-selector.component.html b/src/app/shared/server-selector/server-selector.component.html
index d98c450d0..f7510dc0f 100644
--- a/src/app/shared/server-selector/server-selector.component.html
+++ b/src/app/shared/server-selector/server-selector.component.html
@@ -1,8 +1,24 @@
 <mat-form-field id="server-selector">
-  <mat-label>Server</mat-label>
-  <mat-select [formControl]="serverSelector">
-    <mat-option *ngFor="let server of servers" [value]="server">
-      {{ server }}
-    </mat-option>
-  </mat-select>
-</mat-form-field>
+    <mat-label>Server</mat-label>
+    <mat-select [formControl]="serverSelector">
+        <div class="sticky">
+            <form [formGroup]="form" (ngSubmit)="setNewServer()">
+                <div class="actions">
+                    <mat-form-field class="ml" fxFlexAlign="start">
+                        <span matPrefix><mat-icon>language</mat-icon></span>
+                        <mat-label>Add new server</mat-label>
+                        <input matInput type="text" autocomplete="off" formControlName="url">
+                        <mat-error *ngIf="form.controls.url.hasError('required')">
+                            Url <strong>is required</strong>
+                        </mat-error>
+                    </mat-form-field>
+
+                    <button type="submit" [disabled]="form.invalid" class="ml" mat-raised-button color="primary">Add</button>
+                </div>
+            </form>
+        </div>
+        <mat-option *ngFor="let server of servers" [value]="server">
+            {{ server }}
+        </mat-option>
+    </mat-select>
+</mat-form-field>
\ No newline at end of file
diff --git a/src/app/shared/server-selector/server-selector.component.scss b/src/app/shared/server-selector/server-selector.component.scss
index e69de29bb..5f17f5472 100644
--- a/src/app/shared/server-selector/server-selector.component.scss
+++ b/src/app/shared/server-selector/server-selector.component.scss
@@ -0,0 +1,26 @@
+.actions {
+    display: inline-block;
+}
+
+.rg {
+    float: right;
+}
+
+.ml {
+    margin-left: 10px;
+}
+
+
+/* .pba {
+    width: 80%;
+    left: 10%;
+    margin: 12px;
+} */
+
+.sticky {
+    position: sticky;
+    z-index: 1; // appear above mat-option
+    top: 0; // fix at the top
+    background-color: white; // don't see mat-option when scrolling
+    box-shadow: 1px -2px 10px 0px grey; // shadow at the bottom
+}
\ No newline at end of file
diff --git a/src/app/shared/server-selector/server-selector.component.ts b/src/app/shared/server-selector/server-selector.component.ts
index 7267c49e9..ce6fe82d7 100644
--- a/src/app/shared/server-selector/server-selector.component.ts
+++ b/src/app/shared/server-selector/server-selector.component.ts
@@ -1,7 +1,8 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
-
+import { MatDialog } from '@angular/material/dialog';
+import { FormBuilder, Validators } from '@angular/forms';
 /** Custom Services */
 import { SettingsService } from 'app/settings/settings.service';
 
@@ -13,8 +14,12 @@ import { SettingsService } from 'app/settings/settings.service';
   templateUrl: './server-selector.component.html',
   styleUrls: ['./server-selector.component.scss']
 })
+
 export class ServerSelectorComponent implements OnInit {
 
+  /** Input server. */
+  form: any;
+
   /** Server Settings. */
   servers: string[];
 
@@ -24,12 +29,15 @@ export class ServerSelectorComponent implements OnInit {
   /**
    * @param {SettingsService} settingsService Settings Service
    */
-  constructor(private settingsService: SettingsService) { }
+  constructor(private settingsService: SettingsService, public dialog: MatDialog, private formBuilder: FormBuilder) { }
 
   ngOnInit(): void {
     this.servers = this.settingsService.servers;
     this.serverSelector.patchValue(this.settingsService.server);
     this.buildDependencies();
+    this.form = this.formBuilder.group({
+      'url': ['', [Validators.required]],
+    });
   }
 
   /**
@@ -42,4 +50,16 @@ export class ServerSelectorComponent implements OnInit {
     });
   }
 
+  /**
+   * Set new server.
+   */
+  setNewServer() {
+    let servers;
+    this.settingsService.setServer(this.form.value.url);
+    servers = this.settingsService.servers;
+    servers.push(this.form.value.url);
+    this.settingsService.setServers(servers);
+    window.location.reload();
+  }
+
 }