Merge pull request #2544 from JohnAlva/web_geo

WEB-240: IP Tracking

src/app/system/audit-trails/audit-trails.component.html

@@ -164,6 +164,11 @@
       <td mat-cell *matCellDef="let auditTrail">{{ auditTrail.checkedOnDate | dateFormat }}</td>
     </ng-container>
 
+    <ng-container matColumnDef="clientIp">
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.Client Ip' | translate }}</th>
+      <td mat-cell *matCellDef="let auditTrail">{{ auditTrail.ip }}</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>
   </table>

src/app/system/audit-trails/audit-trails.component.ts

@@ -93,7 +93,8 @@ export class AuditTrailsComponent implements OnInit, AfterViewInit {
     'officeName',
     'madeOnDate',
     'checker',
-    'checkedOnDate'
+    'checkedOnDate',
+    'clientIp'
   ];
   /** Data source for audit trails table. */
   dataSource: AuditTrailsDataSource;

src/app/system/audit-trails/view-audit/view-audit.component.html

@@ -84,6 +84,14 @@
               {{ auditTrailData.groupLevelName }}
             </div>
           </div>
+
+          <div fxFlex="50%" class="mat-body-strong" *ngIf="auditTrailData.ip">
+            {{ 'labels.inputs.Client Ip' | translate }}
+          </div>
+
+          <div fxFlex="50%" *ngIf="auditTrailData.ip">
+            {{ auditTrailData.ip }}
+          </div>
         </div>
 
         <div class="flex-46 command">