Compliance done field added to hearings.

Also the compliance list is not based on it and not the compliance date.

otis/src/app/compliance-list/compliance-list-datasource.ts

@@ -4,15 +4,15 @@ import { MatPaginator, PageEvent } from '@angular/material/paginator';
 import { merge, Observable, of as observableOf } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
-import { ComplianceListItem } from './compliance-list-item';
+import { ComplianceList } from './compliance-list';
 
-export class ComplianceListDatasource extends DataSource<ComplianceListItem> {
-  constructor(public data: ComplianceListItem[], private paginator?: MatPaginator) {
+export class ComplianceListDatasource extends DataSource<ComplianceList> {
+  constructor(public data: ComplianceList[], private paginator?: MatPaginator) {
     super();
   }
 
-  connect(): Observable<ComplianceListItem[]> {
-    const dataMutations: (Observable<ComplianceListItem[]> | EventEmitter<PageEvent>)[] = [
+  connect(): Observable<ComplianceList[]> {
+    const dataMutations: (Observable<ComplianceList[]> | EventEmitter<PageEvent>)[] = [
       observableOf(this.data),
     ];
     if (this.paginator) {
@@ -21,18 +21,18 @@ export class ComplianceListDatasource extends DataSource<ComplianceListItem> {
 
     return merge(...dataMutations)
       .pipe(
-        tap((x: ComplianceListItem[]) => {
+        tap((x: ComplianceList[]) => {
           if (this.paginator) {
             this.paginator.length = x.length;
           }
         }),
       )
-      .pipe(map((x: ComplianceListItem[]) => this.getPagedData(this.data)));
+      .pipe(map((x: ComplianceList[]) => this.getPagedData(this.data)));
   }
 
   disconnect() {}
 
-  private getPagedData(data: ComplianceListItem[]) {
+  private getPagedData(data: ComplianceList[]) {
     if (this.paginator === undefined) {
       return data;
     }

otis/src/app/compliance-list/compliance-list-item.ts

@@ -1,20 +0,0 @@
-export class ComplianceListItem {
-  id: string;
-  officeFileNumber: string;
-  courtNumber: string;
-  itemNumber: string;
-  title: string;
-  proceedings: string;
-  complianceDate: string;
-
-  public constructor(init?: Partial<ComplianceListItem>) {
-    this.id = '';
-    this.officeFileNumber = '';
-    this.courtNumber = '';
-    this.itemNumber = '';
-    this.title = '';
-    this.proceedings = '';
-    this.complianceDate = '';
-    Object.assign(this, init);
-  }
-}

otis/src/app/compliance-list/compliance-list-resolver.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { Resolve } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { ComplianceList } from './compliance-list';
@@ -11,8 +11,7 @@ import { ComplianceListService } from './compliance-list.service';
 export class ComplianceListResolver implements Resolve<ComplianceList> {
   constructor(private ser: ComplianceListService) {}
 
-  resolve(route: ActivatedRouteSnapshot): Observable<ComplianceList> {
-    const date = route.queryParamMap.get('date') || null;
-    return this.ser.list(date);
+  resolve(): Observable<ComplianceList> {
+    return this.ser.list();
   }
 }

otis/src/app/compliance-list/compliance-list.component.html

@@ -3,29 +3,6 @@
     <mat-card-title>Compliances</mat-card-title>
   </mat-card-title-group>
   <mat-card-content>
-    <form [formGroup]="form" fxLayout="column">
-      <div
-        fxLayout="row"
-        fxLayout.lt-md="column"
-        fxLayoutGap="20px"
-        fxLayoutGap.lt-md="0px"
-        fxLayoutAlign="space-around start"
-      >
-        <mat-form-field fxFlex="60%">
-          <input
-            matInput
-            [matDatepicker]="date"
-            (focus)="date.open()"
-            placeholder="Date"
-            formControlName="date"
-            autocomplete="off"
-          />
-          <mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
-          <mat-datepicker #date></mat-datepicker>
-        </mat-form-field>
-        <button mat-raised-button color="primary" (click)="show()" fxFlex="40%">Show</button>
-      </div>
-    </form>
     <mat-table #table [dataSource]="dataSource" aria-label="Elements">
       <!-- Office File Number Column -->
       <ng-container matColumnDef="officeFileNumber">

otis/src/app/compliance-list/compliance-list.component.ts

@@ -14,45 +14,19 @@ import { ComplianceListDatasource } from './compliance-list-datasource';
 })
 export class ComplianceListComponent implements OnInit {
   @ViewChild(MatPaginator, { static: true }) paginator?: MatPaginator;
-  form: FormGroup;
-  info: ComplianceList = new ComplianceList();
-  dataSource: ComplianceListDatasource = new ComplianceListDatasource(this.info.items);
+  info: ComplianceList[] = [];
+  dataSource: ComplianceListDatasource = new ComplianceListDatasource(this.info);
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   displayedColumns = ['officeFileNumber', 'title', 'proceedings', 'complianceDate'];
 
-  constructor(private route: ActivatedRoute, private router: Router, private fb: FormBuilder) {
-    // Create form
-    this.form = this.fb.group({
-      date: '',
-    });
-  }
+  constructor(private route: ActivatedRoute) {}
 
   ngOnInit() {
     this.route.data.subscribe((value) => {
-      const data = value as { info: ComplianceList };
+      const data = value as { info: ComplianceList[] };
 
       this.info = data.info;
-      this.form.setValue({
-        date: moment(this.info.date, 'DD-MMM-YYYY').toDate(),
-      });
-      this.dataSource = new ComplianceListDatasource(this.info.items, this.paginator);
-    });
-  }
-
-  show() {
-    const info = this.getInfo();
-    this.router.navigate(['compliance-list'], {
-      queryParams: {
-        date: info.date,
-      },
-    });
-  }
-
-  getInfo(): ComplianceList {
-    const formModel = this.form.value;
-
-    return new ComplianceList({
-      date: moment(formModel.date).format('DD-MMM-YYYY'),
+      this.dataSource = new ComplianceListDatasource(this.info, this.paginator);
     });
   }
 }

otis/src/app/compliance-list/compliance-list.module.ts

@@ -2,23 +2,12 @@ import { CdkTableModule } from '@angular/cdk/table';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FlexLayoutModule } from '@angular/flex-layout';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
-import {
-  DateAdapter,
-  MAT_DATE_FORMATS,
-  MAT_DATE_LOCALE,
-  MatNativeDateModule,
-} from '@angular/material/core';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatPaginatorModule } from '@angular/material/paginator';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSelectModule } from '@angular/material/select';
 import { MatTableModule } from '@angular/material/table';
 
 import { ComplianceListRoutingModule } from './compliance-list-routing.module';
@@ -47,17 +36,9 @@ export const MY_FORMATS = {
     MatInputModule,
     MatProgressSpinnerModule,
     MatTableModule,
-    ReactiveFormsModule,
     ComplianceListRoutingModule,
-    MatSelectModule,
     MatPaginatorModule,
-    MatDatepickerModule,
-    MatDialogModule,
   ],
   declarations: [ComplianceListComponent],
-  providers: [
-    { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
-    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
-  ],
 })
 export class ComplianceListModule {}

otis/src/app/compliance-list/compliance-list.service.ts

@@ -1,4 +1,4 @@
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { catchError } from 'rxjs/operators';
@@ -16,13 +16,9 @@ const serviceName = 'ComplianceListService';
 export class ComplianceListService {
   constructor(private http: HttpClient, private log: ErrorLoggerService) {}
 
-  list(date: string | null): Observable<ComplianceList> {
-    const options = { params: new HttpParams() };
-    if (date !== null) {
-      options.params = options.params.set('d', date);
-    }
+  list(): Observable<ComplianceList> {
     return this.http
-      .get<ComplianceList>(url, options)
+      .get<ComplianceList>(url)
       .pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable<ComplianceList>;
   }
 }

otis/src/app/compliance-list/compliance-list.ts

@@ -1,12 +1,20 @@
-import { ComplianceListItem } from './compliance-list-item';
-
 export class ComplianceList {
-  date: string;
-  items: ComplianceListItem[];
+  id: string;
+  officeFileNumber: string;
+  courtNumber: string;
+  itemNumber: string;
+  title: string;
+  proceedings: string;
+  complianceDate: string;
 
   public constructor(init?: Partial<ComplianceList>) {
-    this.date = '';
-    this.items = [];
+    this.id = '';
+    this.officeFileNumber = '';
+    this.courtNumber = '';
+    this.itemNumber = '';
+    this.title = '';
+    this.proceedings = '';
+    this.complianceDate = '';
     Object.assign(this, init);
   }
 }