Fix to sort loan charges by due date (#1744)

Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>

src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html

@@ -1,15 +1,16 @@
 <div class="container m-b-20 space-top" fxLayout="row" fxLayoutGap="20px">
-    <div #schedulerStatus>
-    <h2 class="no-m">Scheduler Status:<span class="m-l-20 m-r-20">{{ schedulerActive ? 'Active' : 'Inactive' }}</span></h2>
-    </div>
-    <button mat-raised-button class="suspend" (click)="suspendScheduler()" *ngIf="schedulerActive">
-      <fa-icon icon="times-circle" class="m-r-10"></fa-icon>
-      Suspend
-    </button>
-    <button mat-raised-button class="activate" (click)="activateScheduler()" *ngIf="!schedulerActive">
-      <fa-icon icon="times-circle" class="m-r-10"></fa-icon>
-      Activate
-    </button>
+  <div #schedulerStatus>
+    <h2 class="no-m">Scheduler Status:<span class="m-l-20 m-r-20">{{ schedulerActive ? 'Active' : 'Inactive' }}</span>
+    </h2>
+  </div>
+  <button mat-raised-button class="suspend" (click)="suspendScheduler()" *ngIf="schedulerActive">
+    <fa-icon icon="times-circle" class="m-r-10"></fa-icon>
+    Suspend
+  </button>
+  <button mat-raised-button class="activate" (click)="activateScheduler()" *ngIf="!schedulerActive">
+    <fa-icon icon="times-circle" class="m-r-10"></fa-icon>
+    Activate
+  </button>
 
 </div>
 
@@ -35,13 +36,14 @@
 
       <ng-container matColumnDef="select">
         <th mat-header-cell *matHeaderCellDef>
-          <mat-checkbox class="m-r-10" (change)="$event ? masterToggle() : null" [checked]="selection.hasValue() && isAllSelected()"
+          <mat-checkbox class="m-r-10" (change)="$event ? masterToggle() : null"
+            [checked]="selection.hasValue() && isAllSelected()"
             [indeterminate]="selection.hasValue() && !isAllSelected()">
           </mat-checkbox>
         </th>
         <td mat-cell *matCellDef="let row">
-          <mat-checkbox class="m-r-10" (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null"
-            [checked]="selection.isSelected(row)">
+          <mat-checkbox class="m-r-10" *ngIf="!row.currentlyRunning && row.active" (click)="$event.stopPropagation()"
+            (change)="$event ? selection.toggle(row) : null" [checked]="selection.isSelected(row)">
           </mat-checkbox>
         </td>
       </ng-container>
@@ -51,6 +53,16 @@
         <td mat-cell *matCellDef="let job"> {{ job.displayName }} </td>
       </ng-container>
 
+      <ng-container matColumnDef="active">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Active ? </th>
+        <td mat-cell *matCellDef="let job" class="center">
+          <div [className]="job.active === true ? 'currently-running' : 'not-currently-running'">
+            <fa-icon matTooltip="{{ job.active === true ? 'Yes' : 'No' }}" matTooltipPosition="right" icon="circle"
+              size="lg"></fa-icon>
+          </div>
+        </td>
+      </ng-container>
+
       <ng-container matColumnDef="nextRunTime">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Next Run </th>
         <td mat-cell *matCellDef="let job"> {{ job.nextRunTime }} </td>
@@ -110,10 +122,10 @@
   <button mat-raised-button color="primary" (click)="runSelectedJobs()">
     <fa-icon icon="play" class="m-r-10"></fa-icon>
     Run Selected Jobs<ng-template #templateSchedulerJobs let-data let-popover="popover">
-  <h2>Template</h2>
-  <p>This is the template I am trying to use. Is that fine.</p>
-  <button (click)="popover.close();nextStepSchedulerJobs()">Next</button>
-</ng-template>
+      <h2>Template</h2>
+      <p>This is the template I am trying to use. Is that fine.</p>
+      <button (click)="popover.close();nextStepSchedulerJobs()">Next</button>
+    </ng-template>
   </button>
   <button mat-raised-button color="primary" (click)="refresh()">
     <fa-icon icon="sync" class="m-r-10"></fa-icon>
@@ -124,26 +136,35 @@
 <ng-template #templateSchedulerStatus let-data let-popover="popover">
   <h4>Scheduler Status. Button will be used to change the status.</h4>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
-    <button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
+    <button mat-raised-button color="warn"
+      (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
     <button mat-raised-button color="primary" (click)="popover.close();previousStep()">Back</button>
-    <button mat-raised-button color="primary" (click)="popover.close();showPopover(templateFilter, filter, 'bottom', true)">Next</button>
+    <button mat-raised-button color="primary"
+      (click)="popover.close();showPopover(templateFilter, filter, 'bottom', true)">Next</button>
   </div>
 </ng-template>
 
 <ng-template #templateFilter let-data let-popover="popover">
   <h4>Search bar to filter jobs.</h4>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
-    <button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
-    <button mat-raised-button color="primary" (click)="popover.close();showPopover(templateSchedulerStatus,schedulerStatus, 'bottom', true)">Back</button>
-    <button mat-raised-button color="primary" (click)="popover.close();showPopover(templateJobsTable,jobsTable, 'top', true)">Next</button>
+    <button mat-raised-button color="warn"
+      (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
+    <button mat-raised-button color="primary"
+      (click)="popover.close();showPopover(templateSchedulerStatus,schedulerStatus, 'bottom', true)">Back</button>
+    <button mat-raised-button color="primary"
+      (click)="popover.close();showPopover(templateJobsTable,jobsTable, 'top', true)">Next</button>
   </div>
 </ng-template>
 
 <ng-template #templateJobsTable let-data let-popover="popover">
-  <h4>List of all scheduled batch jobs <a href="https://mifosforge.jira.com/wiki/spaces/docs/pages/67895356/Manage+Scheduler+Jobs" target="_blank">Schedular Jobs</a></h4>
+  <h4>List of all scheduled batch jobs <a
+      href="https://mifosforge.jira.com/wiki/spaces/docs/pages/67895356/Manage+Scheduler+Jobs" target="_blank">Schedular
+      Jobs</a></h4>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
-    <button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
-    <button mat-raised-button color="primary" (click)="popover.close();showPopover(templateFilter, filter, 'bottom', true)">Back</button>
+    <button mat-raised-button color="warn"
+      (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
+    <button mat-raised-button color="primary"
+      (click)="popover.close();showPopover(templateFilter, filter, 'bottom', true)">Back</button>
     <button mat-raised-button color="primary" (click)="popover.close();nextStep()">Next</button>
   </div>
 </ng-template>