diff --git a/luthor/alembic/versions/74058d75b7a0_initial_commit.py b/luthor/alembic/versions/74058d75b7a0_initial_commit.py index fb57eb8..83850fb 100644 --- a/luthor/alembic/versions/74058d75b7a0_initial_commit.py +++ b/luthor/alembic/versions/74058d75b7a0_initial_commit.py @@ -251,13 +251,13 @@ def upgrade(): sa.Column("old_id", sa.Integer(), nullable=False), sa.Column("case_id", postgresql.UUID(as_uuid=True), nullable=True), sa.Column("old_case_id", sa.Integer(), nullable=False), - sa.Column("judges", sa.Unicode(length=255), nullable=True), - sa.Column("brief", sa.Unicode(length=2000), nullable=True), + sa.Column("court_number", sa.Unicode(length=255), nullable=True), + sa.Column("item_number", sa.Unicode(length=255), nullable=True), + sa.Column("bench", sa.Unicode(length=255), nullable=True), + sa.Column("proceedings", sa.Unicode(length=2000), nullable=True), sa.Column("next_hearing_date", sa.DateTime(), nullable=True), sa.Column("court_status_id", postgresql.UUID(as_uuid=True), nullable=True), sa.Column("old_court_status_id", sa.Integer(), nullable=True), - sa.Column("court_number", sa.Unicode(length=255), nullable=True), - sa.Column("item_number", sa.Unicode(length=255), nullable=True), sa.ForeignKeyConstraint(["case_id"], ["cases.id"], name=op.f("fk_hearings_case_id_cases")), sa.ForeignKeyConstraint( ["court_status_id"], ["court_statuses.id"], name=op.f("fk_hearings_court_status_id_court_statuses") diff --git a/luthor/luthor/models/case.py b/luthor/luthor/models/case.py index c347f05..98d9c5a 100644 --- a/luthor/luthor/models/case.py +++ b/luthor/luthor/models/case.py @@ -1,6 +1,7 @@ import uuid -from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Unicode, text +from luthor.models.hearing import Hearing +from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Unicode, desc, text from sqlalchemy.dialects.postgresql import UUID from sqlalchemy.orm import relationship from sqlalchemy.sql import expression @@ -60,6 +61,7 @@ class Case(Base): office_status = relationship("OfficeStatus") court_status = relationship("CourtStatus", back_populates="cases") case_source = relationship("CaseSource", back_populates="cases") + hearings = relationship("Hearing", order_by=desc(Hearing.next_hearing_date), back_populates="case") def __init__( self, @@ -94,6 +96,7 @@ class Case(Base): court_status_id=None, case_source_id=None, is_deleted=None, + hearings=None, id_=None, ): self.office_file_number = office_file_number @@ -127,4 +130,6 @@ class Case(Base): self.court_status_id = court_status_id self.is_deleted = False if is_deleted is None else is_deleted self.case_source_id = case_source_id + if hearings is not None: + self.hearings = hearings self.id = id_ diff --git a/luthor/luthor/models/hearing.py b/luthor/luthor/models/hearing.py index 8306c00..b62d30e 100644 --- a/luthor/luthor/models/hearing.py +++ b/luthor/luthor/models/hearing.py @@ -20,27 +20,32 @@ class Hearing(Base): nullable=False, index=True, ) - judges = Column("judges", Unicode(255), nullable=False, unique=True) - brief = Column("brief", Unicode(255), nullable=False, unique=True) - next_hearing_date = Column("next_hearing_date", DateTime, nullable=False, index=True) - court_status_id = Column("court_status_id", UUID(as_uuid=True), ForeignKey("court_statuses.id"), nullable=True) court_number = Column("court_number", Unicode(255), nullable=False, unique=True) item_number = Column("item_number", Unicode(255), nullable=False, unique=True) + bench = Column("bench", Unicode(255), nullable=False, unique=True) + proceedings = Column("proceedings", Unicode(255), nullable=False, unique=True) + next_hearing_date = Column("next_hearing_date", DateTime, nullable=False, index=True) + court_status_id = Column("court_status_id", UUID(as_uuid=True), ForeignKey("court_statuses.id"), nullable=True) court_status = relationship("CourtStatus", back_populates="hearings") + case = relationship("Case", back_populates="hearings") def __init__( self, - voucher_id=None, - code=None, - food_table_id=None, - date=None, - user_id=None, + case_id=None, + court_number=None, + item_number=None, + bench=None, + proceedings=None, + next_hearing_date=None, + court_status_id=None, id_=None, ): self.id = id_ - self.voucher_id = voucher_id - self.code = code - self.food_table_id = food_table_id - self.date = date - self.user_id = user_id + self.case_id = case_id + self.court_number = court_number + self.item_number = item_number + self.bench = bench + self.proceedings = proceedings + self.next_hearing_date = next_hearing_date + self.court_status_id = court_status_id diff --git a/luthor/luthor/routers/case.py b/luthor/luthor/routers/case.py index 15e3970..9837cd2 100644 --- a/luthor/luthor/routers/case.py +++ b/luthor/luthor/routers/case.py @@ -7,6 +7,7 @@ import luthor.schemas.case as schemas from fastapi import APIRouter, Depends, HTTPException, Security, status from luthor.models.case_source import CaseSource +from luthor.models.hearing import Hearing from sqlalchemy import desc, func from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.orm import Session @@ -37,6 +38,7 @@ def save( ) -> schemas.Case: try: item = Case( + case_source_id=data.case_source.id_, office_file_number=data.office_file_number, court_case_number=data.court_case_number, year=data.year, @@ -66,6 +68,17 @@ def save( nature_id=data.nature.id_ if data.nature is not None else None, office_status_id=data.office_status.id_ if data.office_status is not None else None, court_status_id=data.court_status.id_ if data.court_status is not None else None, + hearings=[ + Hearing( + court_number=h.court_number, + item_number=h.item_number, + bench=h.bench, + proceedings=h.proceedings, + next_hearing_date=h.next_hearing_date, + court_status_id=h.court_status.id_ if h.court_status is not None else None, + ) + for h in data.hearings + ], ) db.add(item) db.commit() @@ -90,6 +103,7 @@ def update( ) -> schemas.Case: try: item: Case = db.query(Case).filter(Case.id == id_).first() + item.case_source_id = data.case_source.id_, item.office_file_number = data.office_file_number item.court_case_number = data.court_case_number item.year = data.year @@ -119,6 +133,36 @@ def update( item.nature_id = data.nature.id_ if data.nature is not None else None item.office_status_id = data.office_status.id_ if data.office_status is not None else None item.court_status_id = data.court_status.id_ if data.court_status is not None else None + + old_ids = set(h.id for h in item.hearings) + new_ids = set(h.id_ for h in data.hearings if h.id_ is not None) + # Delete removed + for ids in old_ids - new_ids: + h: Hearing = next(x for x in item.hearings if x.id == ids) + db.delete(h) + item.hearings.remove(h) + + # Update Common + for ids in old_ids & new_ids: + h: Hearing = next(x for x in item.hearings if x.id == ids) + d: schemas.Hearing = next(x for x in data.hearings if x.id_ == ids) + h.court_number = d.court_number + h.item_number = d.item_number + h.bench = d.bench + h.proceedings = d.proceedings + h.next_hearing_date = d.next_hearing_date + h.court_status_id = d.court_status.id_ if d.court_status is not None else None + for d in [d for d in data.hearings if d.id_ is None]: + h = Hearing( + court_number=d.court_number, + item_number=d.item_number, + bench=d.bench, + proceedings=d.proceedings, + next_hearing_date=d.next_hearing_date, + court_status_id=d.court_status.id_ if d.court_status is not None else None, + ) + item.hearings.append(h) + db.add(h) db.commit() return case_info(item) except SQLAlchemyError as e: @@ -243,6 +287,20 @@ def case_info(item: Case) -> schemas.Case: courtStatus=schemas.CourtStatusLink(id=item.court_status.id, name=item.court_status.name) if item.court_status is not None else None, + hearings=[ + schemas.Hearing( + id=h.id, + courtNumber=h.court_number if h.court_number is not None else "", + itemNumber=h.item_number if h.item_number is not None else "", + bench=h.bench if h.bench is not None else "", + proceedings=h.proceedings if h.proceedings is not None else "", + nextHearingDate=h.next_hearing_date, + courtStatus=schemas.CourtStatusLink(id=h.court_status.id, name=h.court_status.name) + if h.court_status is not None + else None, + ) + for h in item.hearings + ], ) @@ -267,4 +325,5 @@ def case_blank() -> schemas.CaseBlank: contactDetail="", caseConnectedWith="", bunchCases="", + hearings=[], ) diff --git a/luthor/luthor/schemas/case.py b/luthor/luthor/schemas/case.py index 6c2e363..d0547b3 100644 --- a/luthor/luthor/schemas/case.py +++ b/luthor/luthor/schemas/case.py @@ -1,8 +1,9 @@ import uuid from datetime import date, datetime -from typing import Optional +from typing import List, Optional +from luthor.schemas.hearing import Hearing from pydantic import BaseModel, Field, validator from . import to_camel @@ -50,6 +51,8 @@ class CaseIn(BaseModel): office_status: Optional[OfficeStatusLink] court_status: Optional[CourtStatusLink] + hearings: List[Hearing] + class Config: anystr_strip_whitespace = True alias_generator = to_camel diff --git a/luthor/luthor/schemas/hearing.py b/luthor/luthor/schemas/hearing.py new file mode 100644 index 0000000..e52a2cf --- /dev/null +++ b/luthor/luthor/schemas/hearing.py @@ -0,0 +1,47 @@ +import uuid + +from datetime import date, datetime +from typing import Optional + +from luthor.schemas.court_status import CourtStatusLink +from pydantic import BaseModel, Field, validator + +from . import to_camel + + +class HearingIn(BaseModel): + court_number: str + item_number: str + bench: str + proceedings: str + next_hearing_date: Optional[date] + court_status: Optional[CourtStatusLink] + + class Config: + anystr_strip_whitespace = True + alias_generator = to_camel + json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} + + @validator("next_hearing_date", pre=True) + def parse_next_hearing_date(cls, value): + if isinstance(value, date): + return value + if value is None: + return None + return datetime.strptime(value, "%d-%b-%Y").date() + + +class Hearing(HearingIn): + id_: Optional[uuid.UUID] + + class Config: + anystr_strip_whitespace = True + alias_generator = to_camel + json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} + + +class HearingLink(BaseModel): + id_: uuid.UUID = Field(...) + + class Config: + fields = {"id_": "id"} diff --git a/otis/src/app/cases/case-detail/case-detail-datasource.ts b/otis/src/app/cases/case-detail/case-detail-datasource.ts new file mode 100644 index 0000000..1e60451 --- /dev/null +++ b/otis/src/app/cases/case-detail/case-detail-datasource.ts @@ -0,0 +1,16 @@ +import { DataSource } from '@angular/cdk/collections'; +import { Observable } from 'rxjs'; + +import { Hearing } from '../../core/hearing'; + +export class HearingDatasource extends DataSource { + constructor(private data: Observable) { + super(); + } + + connect(): Observable { + return this.data; + } + + disconnect() {} +} diff --git a/otis/src/app/cases/case-detail/case-detail.component.css b/otis/src/app/cases/case-detail/case-detail.component.css index 12052db..7d4d15f 100644 --- a/otis/src/app/cases/case-detail/case-detail.component.css +++ b/otis/src/app/cases/case-detail/case-detail.component.css @@ -1,3 +1,6 @@ +.example-card { + max-width: 900px; +} .right-align { text-align: right; } diff --git a/otis/src/app/cases/case-detail/case-detail.component.html b/otis/src/app/cases/case-detail/case-detail.component.html index cde3c53..851f0aa 100644 --- a/otis/src/app/cases/case-detail/case-detail.component.html +++ b/otis/src/app/cases/case-detail/case-detail.component.html @@ -1,402 +1,536 @@ -
+
Case - -
- - Source - - - {{ cs.name }} - - - - - Office File Number - - - - Receipt Date - - - - -
-
- - Title - - -
-
- - Court Case Number - - - - Filing Date - - - - -
-
- - Case Type - - -- Not Applicable -- - - {{ ct.name }} - - - -
-
- - Year - - -
-
- - Connected Cases - - -
-
- - Appearing for the - - Petitioner - Respondent - - -
-
- - Forum - - -- Not Applicable -- - - {{ c.name }} - - - -
-
- - Department - - -- Not Applicable -- - - {{ d.name }} - - - - - Office - - -- Not Applicable -- - - {{ o.name }} - - - -
-
- - Contact Person - - -
-
- - Court Status - - -- Not Applicable -- - - {{ cs.name }} - - - - - Office Status - - -- Not Applicable -- - - {{ os.name }} - - - -
-
- - Act - - -- Not Applicable -- - - {{ a.name }} - - - - - Nature - - -- Not Applicable -- - - {{ n.name }} - - - -
-
- - Docket No of Departments/ Legal Cell - - -
-
- - Petition/Counter - - -
-
- - Question of Law - - -
-
- - Brief Description - - -
-
- - Advocate on Record - - - - Opposing Advocate on Record - - -
-
- - Previous Court Case No - - - - Date of Impunged Judgement - - - - -
-
- - Date of Limitation/Target - - - - -
-
- - Bunch Cases - - -
-
- - Remarks/Status - - -
- +
+ + Source + + + {{ cs.name }} + + + + + Office File Number + + + + Receipt Date + + + + +
+
+ + Title + + +
+
+ + Court Case Number + + + + Year + + + + Filing Date + + + + +
+
+ + Forum + + -- Not Applicable -- + + {{ c.name }} + + + + + Case Type + + -- Not Applicable -- + + {{ ct.name }} + + + + + Appearing for the + + Petitioner + Respondent + + +
+
+ + Connected Cases + + +
+
+ + Department + + -- Not Applicable -- + + {{ d.name }} + + + + + Office + + -- Not Applicable -- + + {{ o.name }} + + + +
+
+ + Contact Person + + +
+
+ + Court Status + + -- Not Applicable -- + + {{ cs.name }} + + + + + Office Status + + -- Not Applicable -- + + {{ os.name }} + + + +
+
+ + Act + + -- Not Applicable -- + + {{ a.name }} + + + + + Nature + + -- Not Applicable -- + + {{ n.name }} + + + +
+
+ + Docket No of Departments/ Legal Cell + + +
+
+ + Petition/Counter + + +
+
+ + Question of Law + + +
+
+ + Brief Description + + +
+
+ + Advocate on Record + + + + Opposing Advocate on Record + + +
+
+ + Previous Court Case No + + + + Date of Impunged Judgement + + + + +
+
+ + Date of Limitation/Target + + + + +
+
+ + Bunch Cases + + +
+
+ + Remarks/Status + + +
+ +
+ + + Hearings + + +
+ + Court Number + + + + Item Number + + +
+
+ + Bench + + + + Latest Status + + -- Not Applicable -- + + {{ cs.name }} + + + +
+
+ + Proceedings + + +
+
+ + Next Hearing Date + + + + + +
+ + + + Court and Item Number + {{ row.courtNumber }} / {{ row.itemNumber }} + + + + + Bench + {{ row.bench }} + + + + + Status + {{ row.courtStatus?.name }} + + + + + Proceedings + {{ row.proceedings }} + + + + + Next Hearing + {{ row.nextHearingDate }} + + + + + Action + + + + + + + + + @@ -405,4 +539,4 @@ -
+ diff --git a/otis/src/app/cases/case-detail/case-detail.component.ts b/otis/src/app/cases/case-detail/case-detail.component.ts index 297eaa4..168d445 100644 --- a/otis/src/app/cases/case-detail/case-detail.component.ts +++ b/otis/src/app/cases/case-detail/case-detail.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import * as moment from 'moment'; -import { Observable } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; import { distinctUntilChanged, startWith, switchMap } from 'rxjs/operators'; import { Act } from '../../core/act'; @@ -13,14 +13,17 @@ import { CaseType } from '../../core/case-type'; import { Court } from '../../core/court'; import { CourtStatus } from '../../core/court-status'; import { Department } from '../../core/department'; +import { Hearing } from '../../core/hearing'; import { Nature } from '../../core/nature'; import { Office } from '../../core/office'; import { OfficeStatus } from '../../core/office-status'; import { ToasterService } from '../../core/toaster.service'; -import { OfficeService } from '../../offices/office.service'; import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component'; import { CaseService } from '../case.service'; +import { HearingDatasource } from './case-detail-datasource'; +import { HearingDialogComponent } from './hearing-dialog.component'; + @Component({ selector: 'app-case-detail', templateUrl: './case-detail.component.html', @@ -28,6 +31,8 @@ import { CaseService } from '../case.service'; }) export class CaseDetailComponent implements OnInit, AfterViewInit { @ViewChild('nameElement', { static: true }) nameElement?: ElementRef; + public hearingsObservable = new BehaviorSubject([]); + dataSource: HearingDatasource = new HearingDatasource(this.hearingsObservable); form: FormGroup; caseSources: CaseSource[] = []; caseTypes: CaseType[] = []; @@ -40,6 +45,15 @@ export class CaseDetailComponent implements OnInit, AfterViewInit { natures: Nature[] = []; item: Case = new Case(); + displayedColumns = [ + 'itemNumber', + 'bench', + 'courtStatus', + 'proceedings', + 'nextHearingDate', + 'action', + ]; + constructor( private route: ActivatedRoute, private router: Router, @@ -80,6 +94,14 @@ export class CaseDetailComponent implements OnInit, AfterViewInit { nature: '', officeStatus: '', courtStatus: '', + addRow: this.fb.group({ + courtNumber: '', + itemNumber: '', + bench: '', + latestStatus: '', + proceedings: '', + nextHearingDate: '', + }), }); } @@ -110,7 +132,7 @@ export class CaseDetailComponent implements OnInit, AfterViewInit { showItem(item: Case) { this.item = item; - this.form.setValue({ + this.form.patchValue({ caseSource: this.item.caseSource.id, officeFileNumber: this.item.officeFileNumber, courtCaseNumber: this.item.courtCaseNumber, @@ -164,6 +186,7 @@ export class CaseDetailComponent implements OnInit, AfterViewInit { this.form.patchValue({ officeFileNumber: x }); } }); + this.hearingsObservable.next(this.item.hearings); } ngAfterViewInit() { @@ -228,7 +251,6 @@ export class CaseDetailComponent implements OnInit, AfterViewInit { } else { this.item.limitationDate = moment(formModel.limitationDate).format('DD-MMM-YYYY'); } - console.log(formModel.filingDate); if (formModel.filingDate === '') { this.item.filingDate = null; } else { @@ -320,4 +342,71 @@ export class CaseDetailComponent implements OnInit, AfterViewInit { } return this.item; } + + addHearing() { + const formValue = (this.form.get('addRow') as FormControl).value; + const courtNumber: string = formValue.courtNumber; + const itemNumber: string = formValue.itemNumber; + const bench: string = formValue.bench; + const latestStatus = + formValue.latestStatus === '' + ? null + : new CourtStatus({ + id: formValue.latestStatus, + name: (this.courtStatuses.find((x) => x.id === formValue.latestStatus) as CourtStatus) + .name, + }); + + const proceedings = formValue.proceedings; + const nextHearingDate = + formValue.nextHearingDate === '' + ? null + : moment(formValue.nextHearingDate).format('DD-MMM-YYYY'); + + this.item.hearings.push( + new Hearing({ + courtNumber, + itemNumber, + bench, + courtStatus: latestStatus, + proceedings, + nextHearingDate, + }), + ); + this.hearingsObservable.next(this.item.hearings); + this.resetAddRow(); + } + + resetAddRow() { + (this.form.get('addRow') as FormControl).reset({ + courtNumber: '', + itemNumber: '', + bench: '', + courtStatus: '', + proceedings: '', + nextHearingDate: '', + }); + } + + editRow(row: Hearing) { + const dialogRef = this.dialog.open(HearingDialogComponent, { + width: '750px', + data: { hearing: { ...row }, courtStatuses: this.courtStatuses }, + }); + + dialogRef.afterClosed().subscribe((result: boolean | Hearing) => { + if (!result) { + return; + } + const h = result as Hearing; + Object.assign(row, h); + this.hearingsObservable.next(this.item.hearings); + this.resetAddRow(); + }); + } + + deleteRow(row: Hearing) { + this.item.hearings.splice(this.item.hearings.indexOf(row), 1); + this.hearingsObservable.next(this.item.hearings); + } } diff --git a/otis/src/app/cases/case-detail/hearing-dialog.component.css b/otis/src/app/cases/case-detail/hearing-dialog.component.css new file mode 100644 index 0000000..e69de29 diff --git a/otis/src/app/cases/case-detail/hearing-dialog.component.html b/otis/src/app/cases/case-detail/hearing-dialog.component.html new file mode 100644 index 0000000..9d1fddc --- /dev/null +++ b/otis/src/app/cases/case-detail/hearing-dialog.component.html @@ -0,0 +1,109 @@ +

Edit Journal Entry

+
+
+
+ + Court Number + + + + Item Number + + +
+
+ + Bench + + + + Latest Status + + -- Not Applicable -- + + {{ cs.name }} + + + +
+
+ + Proceedings + + +
+
+ + Next Hearing Date + + + + +
+
+
+
+ + +
diff --git a/otis/src/app/cases/case-detail/hearing-dialog.component.spec.ts b/otis/src/app/cases/case-detail/hearing-dialog.component.spec.ts new file mode 100644 index 0000000..e2ed6e9 --- /dev/null +++ b/otis/src/app/cases/case-detail/hearing-dialog.component.spec.ts @@ -0,0 +1,26 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; + +import { HearingDialogComponent } from './hearing-dialog.component'; + +describe('HearingDialogComponent', () => { + let component: HearingDialogComponent; + let fixture: ComponentFixture; + + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [HearingDialogComponent], + }).compileComponents(); + }), + ); + + beforeEach(() => { + fixture = TestBed.createComponent(HearingDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/otis/src/app/cases/case-detail/hearing-dialog.component.ts b/otis/src/app/cases/case-detail/hearing-dialog.component.ts new file mode 100644 index 0000000..b170bb9 --- /dev/null +++ b/otis/src/app/cases/case-detail/hearing-dialog.component.ts @@ -0,0 +1,69 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import * as moment from 'moment'; + +import { CourtStatus } from '../../core/court-status'; +import { Hearing } from '../../core/hearing'; + +@Component({ + selector: 'app-hearing-dialog', + templateUrl: './hearing-dialog.component.html', + styleUrls: ['./hearing-dialog.component.css'], +}) +export class HearingDialogComponent implements OnInit { + form: FormGroup; + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: { hearing: Hearing; courtStatuses: CourtStatus[] }, + private fb: FormBuilder, + ) { + this.form = this.fb.group({ + courtNumber: '', + itemNumber: '', + bench: '', + latestStatus: '', + proceedings: '', + nextHearingDate: '', + }); + } + + ngOnInit() { + this.form.setValue({ + courtNumber: this.data.hearing.courtNumber, + itemNumber: this.data.hearing.itemNumber, + bench: this.data.hearing.bench, + latestStatus: this.data.hearing.courtStatus ? this.data.hearing.courtStatus.id : '', + proceedings: this.data.hearing.proceedings, + nextHearingDate: this.data.hearing.nextHearingDate + ? moment(this.data.hearing.nextHearingDate, 'DD-MMM-YYYY').toDate() + : '', + }); + } + + accept(): void { + const formValue = this.form.value; + this.data.hearing.courtNumber = formValue.courtNumber; + this.data.hearing.itemNumber = formValue.itemNumber; + this.data.hearing.bench = formValue.bench; + + this.data.hearing.courtStatus = + formValue.latestStatus === '' + ? null + : new CourtStatus({ + id: formValue.latestStatus, + name: (this.data.courtStatuses.find( + (x) => x.id === formValue.latestStatus, + ) as CourtStatus).name, + }); + this.data.hearing.proceedings = formValue.proceedings; + if (formValue.nextHearingDate === '') { + this.data.hearing.nextHearingDate = null; + } else { + this.data.hearing.nextHearingDate = moment(formValue.nextHearingDate).format('DD-MMM-YYYY'); + } + + this.dialogRef.close(this.data.hearing); + } +} diff --git a/otis/src/app/cases/cases.module.ts b/otis/src/app/cases/cases.module.ts index fdfa3f6..89697f2 100644 --- a/otis/src/app/cases/cases.module.ts +++ b/otis/src/app/cases/cases.module.ts @@ -13,6 +13,7 @@ import { 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'; @@ -21,6 +22,7 @@ import { MatSelectModule } from '@angular/material/select'; import { MatTableModule } from '@angular/material/table'; import { CaseDetailComponent } from './case-detail/case-detail.component'; +import { HearingDialogComponent } from './case-detail/hearing-dialog.component'; import { CaseListComponent } from './case-list/case-list.component'; import { CasesRoutingModule } from './cases-routing.module'; @@ -52,8 +54,9 @@ export const MY_FORMATS = { MatSelectModule, MatPaginatorModule, MatDatepickerModule, + MatDialogModule, ], - declarations: [CaseListComponent, CaseDetailComponent], + declarations: [CaseListComponent, CaseDetailComponent, HearingDialogComponent], providers: [ { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] }, { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS }, diff --git a/otis/src/app/core/case.ts b/otis/src/app/core/case.ts index d13d098..84c837f 100644 --- a/otis/src/app/core/case.ts +++ b/otis/src/app/core/case.ts @@ -4,6 +4,7 @@ import { CaseType } from './case-type'; import { Court } from './court'; import { CourtStatus } from './court-status'; import { Department } from './department'; +import { Hearing } from './hearing'; import { Nature } from './nature'; import { Office } from './office'; import { OfficeStatus } from './office-status'; @@ -40,6 +41,7 @@ export class Case { nature?: Nature; officeStatus?: OfficeStatus; courtStatus?: CourtStatus; + hearings: Hearing[]; public constructor(init?: Partial) { this.id = undefined; @@ -65,6 +67,7 @@ export class Case { this.contactDetail = ''; this.caseConnectedWith = ''; this.bunchCases = ''; + this.hearings = []; Object.assign(this, init); } } diff --git a/otis/src/app/core/hearing.ts b/otis/src/app/core/hearing.ts new file mode 100644 index 0000000..1447137 --- /dev/null +++ b/otis/src/app/core/hearing.ts @@ -0,0 +1,22 @@ +import { CourtStatus } from './court-status'; + +export class Hearing { + id: string | undefined; + courtNumber: string; + itemNumber: string; + bench: string; + courtStatus: CourtStatus | null; + proceedings: string; + nextHearingDate: string | null; + + public constructor(init?: Partial) { + this.id = undefined; + this.courtNumber = ''; + this.itemNumber = ''; + this.bench = ''; + this.courtStatus = null; + this.proceedings = ''; + this.nextHearingDate = ''; + Object.assign(this, init); + } +}