tanshu/luthor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cases add/edit should be working now. Along with the hearings in it

Browse Source
This commit is contained in:
Amritanshu Agrawal
2021-01-18 09:00:30 +05:30
parent 8845ee6a81
commit 8fe385e601
17 changed files with 1013 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
luthor/alembic/versions/74058d75b7a0_initial_commit.py
View File

@ -251,13 +251,13 @@ def upgrade():
sa.Column("old_id", sa.Integer(), nullable=False), sa.Column("old_id", sa.Integer(), nullable=False),
sa.Column("case_id", postgresql.UUID(as_uuid=True), nullable=True), sa.Column("case_id", postgresql.UUID(as_uuid=True), nullable=True),
sa.Column("old_case_id", sa.Integer(), nullable=False), sa.Column("old_case_id", sa.Integer(), nullable=False),
sa.Column("judges", sa.Unicode(length=255), nullable=True), sa.Column("court_number", sa.Unicode(length=255), nullable=True),
sa.Column("brief", sa.Unicode(length=2000), 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("next_hearing_date", sa.DateTime(), nullable=True),
sa.Column("court_status_id", postgresql.UUID(as_uuid=True), 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("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(["case_id"], ["cases.id"], name=op.f("fk_hearings_case_id_cases")),
sa.ForeignKeyConstraint( sa.ForeignKeyConstraint(
["court_status_id"], ["court_statuses.id"], name=op.f("fk_hearings_court_status_id_court_statuses") ["court_status_id"], ["court_statuses.id"], name=op.f("fk_hearings_court_status_id_court_statuses")

7
luthor/luthor/models/case.py
View File

@ -1,6 +1,7 @@
import uuid 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.dialects.postgresql import UUID
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from sqlalchemy.sql import expression from sqlalchemy.sql import expression
@ -60,6 +61,7 @@ class Case(Base):
office_status = relationship("OfficeStatus") office_status = relationship("OfficeStatus")
court_status = relationship("CourtStatus", back_populates="cases") court_status = relationship("CourtStatus", back_populates="cases")
case_source = relationship("CaseSource", 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__( def __init__(
self, self,
@ -94,6 +96,7 @@ class Case(Base):
court_status_id=None, court_status_id=None,
case_source_id=None, case_source_id=None,
is_deleted=None, is_deleted=None,
hearings=None,
id_=None, id_=None,
): ):
self.office_file_number = office_file_number self.office_file_number = office_file_number
@ -127,4 +130,6 @@ class Case(Base):
self.court_status_id = court_status_id self.court_status_id = court_status_id
self.is_deleted = False if is_deleted is None else is_deleted self.is_deleted = False if is_deleted is None else is_deleted
self.case_source_id = case_source_id self.case_source_id = case_source_id
if hearings is not None:
self.hearings = hearings
self.id = id_ self.id = id_

33
luthor/luthor/models/hearing.py
View File

@ -20,27 +20,32 @@ class Hearing(Base):
nullable=False, nullable=False,
index=True, 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) court_number = Column("court_number", Unicode(255), nullable=False, unique=True)
item_number = Column("item_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") court_status = relationship("CourtStatus", back_populates="hearings")
case = relationship("Case", back_populates="hearings")
def __init__( def __init__(
self, self,
voucher_id=None, case_id=None,
code=None, court_number=None,
food_table_id=None, item_number=None,
date=None, bench=None,
user_id=None, proceedings=None,
next_hearing_date=None,
court_status_id=None,
id_=None, id_=None,
): ):
self.id = id_ self.id = id_
self.voucher_id = voucher_id self.case_id = case_id
self.code = code self.court_number = court_number
self.food_table_id = food_table_id self.item_number = item_number
self.date = date self.bench = bench
self.user_id = user_id self.proceedings = proceedings
self.next_hearing_date = next_hearing_date
self.court_status_id = court_status_id

59
luthor/luthor/routers/case.py
View File

@ -7,6 +7,7 @@ import luthor.schemas.case as schemas
from fastapi import APIRouter, Depends, HTTPException, Security, status from fastapi import APIRouter, Depends, HTTPException, Security, status
from luthor.models.case_source import CaseSource from luthor.models.case_source import CaseSource
from luthor.models.hearing import Hearing
from sqlalchemy import desc, func from sqlalchemy import desc, func
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
@ -37,6 +38,7 @@ def save(
) -> schemas.Case: ) -> schemas.Case:
try: try:
item = Case( item = Case(
case_source_id=data.case_source.id_,
office_file_number=data.office_file_number, office_file_number=data.office_file_number,
court_case_number=data.court_case_number, court_case_number=data.court_case_number,
year=data.year, year=data.year,
@ -66,6 +68,17 @@ def save(
nature_id=data.nature.id_ if data.nature is not None else None, 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, 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, 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.add(item)
db.commit() db.commit()
@ -90,6 +103,7 @@ def update(
) -> schemas.Case: ) -> schemas.Case:
try: try:
item: Case = db.query(Case).filter(Case.id == id_).first() 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.office_file_number = data.office_file_number
item.court_case_number = data.court_case_number item.court_case_number = data.court_case_number
item.year = data.year 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.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.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 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() db.commit()
return case_info(item) return case_info(item)
except SQLAlchemyError as e: 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) courtStatus=schemas.CourtStatusLink(id=item.court_status.id, name=item.court_status.name)
if item.court_status is not None if item.court_status is not None
else 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="", contactDetail="",
caseConnectedWith="", caseConnectedWith="",
bunchCases="", bunchCases="",
hearings=[],
) )

5
luthor/luthor/schemas/case.py
View File

@ -1,8 +1,9 @@
import uuid import uuid
from datetime import date, datetime 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 pydantic import BaseModel, Field, validator
from . import to_camel from . import to_camel
@ -50,6 +51,8 @@ class CaseIn(BaseModel):
office_status: Optional[OfficeStatusLink] office_status: Optional[OfficeStatusLink]
court_status: Optional[CourtStatusLink] court_status: Optional[CourtStatusLink]
hearings: List[Hearing]
class Config: class Config:
anystr_strip_whitespace = True anystr_strip_whitespace = True
alias_generator = to_camel alias_generator = to_camel

47
luthor/luthor/schemas/hearing.py Normal file
View File

@ -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"}

16
otis/src/app/cases/case-detail/case-detail-datasource.ts Normal file
View File

@ -0,0 +1,16 @@
import { DataSource } from '@angular/cdk/collections';
import { Observable } from 'rxjs';
import { Hearing } from '../../core/hearing';
export class HearingDatasource extends DataSource<Hearing> {
constructor(private data: Observable<Hearing[]>) {
super();
}
connect(): Observable<Hearing[]> {
return this.data;
}
disconnect() {}
}

3
otis/src/app/cases/case-detail/case-detail.component.css
View File

@ -1,3 +1,6 @@
.example-card {
max-width: 900px;
}
.right-align { .right-align {
text-align: right; text-align: right;
} }

924
otis/src/app/cases/case-detail/case-detail.component.html
View File

@ -1,402 +1,536 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card"> <form [formGroup]="form" fxFlex="75%" fxLayout="column">
<mat-card fxFlex> <mat-card fxFlex>
<mat-card-title-group> <mat-card-title-group>
<mat-card-title>Case</mat-card-title> <mat-card-title>Case</mat-card-title>
</mat-card-title-group> </mat-card-title-group>
<mat-card-content> <mat-card-content>
<form [formGroup]="form" fxLayout="column"> <div
<div fxLayout="row"
fxLayout="row" fxLayoutAlign="space-around start"
fxLayoutAlign="space-around start" fxLayout.lt-md="column"
fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
fxLayoutGap.lt-md="0px" >
> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Source</mat-label>
<mat-label>Source</mat-label> <mat-select placeholder="Source" formControlName="caseSource">
<mat-select placeholder="Source" formControlName="caseSource"> <mat-option *ngFor="let cs of caseSources" [value]="cs.id">
<mat-option *ngFor="let cs of caseSources" [value]="cs.id"> {{ cs.name }}
{{ cs.name }} </mat-option>
</mat-option> </mat-select>
</mat-select> </mat-form-field>
</mat-form-field> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Office File Number</mat-label>
<mat-label>Office File Number</mat-label> <input
<input matInput
matInput #nameElement
#nameElement placeholder="Office File Number"
placeholder="Office File Number" formControlName="officeFileNumber"
formControlName="officeFileNumber" />
/> </mat-form-field>
</mat-form-field> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Receipt Date</mat-label>
<mat-label>Receipt Date</mat-label> <input
<input matInput
matInput [matDatepicker]="receiptDate"
[matDatepicker]="receiptDate" placeholder="Receipt Date"
placeholder="Receipt Date" formControlName="receiptDate"
formControlName="receiptDate" autocomplete="off"
autocomplete="off" #receiptDateElement
#receiptDateElement (focus)="receiptDateElement.select()"
(focus)="receiptDateElement.select()" />
/> <mat-datepicker-toggle matSuffix [for]="receiptDate"></mat-datepicker-toggle>
<mat-datepicker-toggle matSuffix [for]="receiptDate"></mat-datepicker-toggle> <mat-datepicker #receiptDate></mat-datepicker>
<mat-datepicker #receiptDate></mat-datepicker> </mat-form-field>
</mat-form-field> </div>
</div> <div
<div fxLayout="row"
fxLayout="row" fxLayoutAlign="space-around start"
fxLayoutAlign="space-around start" fxLayout.lt-md="column"
fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
fxLayoutGap.lt-md="0px" >
> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Title</mat-label>
<mat-label>Title</mat-label> <input matInput placeholder="Title" formControlName="title" />
<input matInput placeholder="Title" formControlName="title" /> </mat-form-field>
</mat-form-field> </div>
</div> <div
<div fxLayout="row"
fxLayout="row" fxLayoutAlign="space-around start"
fxLayoutAlign="space-around start" fxLayout.lt-md="column"
fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
fxLayoutGap.lt-md="0px" >
> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Court Case Number</mat-label>
<mat-label>Court Case Number</mat-label> <input matInput placeholder="Court Case Number" formControlName="courtCaseNumber" />
<input matInput placeholder="Court Case Number" formControlName="courtCaseNumber" /> </mat-form-field>
</mat-form-field> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Year</mat-label>
<mat-label>Filing Date</mat-label> <input matInput placeholder="Year" formControlName="year" />
<input </mat-form-field>
matInput <mat-form-field fxFlex>
[matDatepicker]="filingDate" <mat-label>Filing Date</mat-label>
placeholder="Filing Date" <input
formControlName="filingDate" matInput
autocomplete="off" [matDatepicker]="filingDate"
#filingDateElement placeholder="Filing Date"
(focus)="filingDateElement.select()" formControlName="filingDate"
/> autocomplete="off"
<mat-datepicker-toggle matSuffix [for]="filingDate"></mat-datepicker-toggle> #filingDateElement
<mat-datepicker #filingDate></mat-datepicker> (focus)="filingDateElement.select()"
</mat-form-field> />
</div> <mat-datepicker-toggle matSuffix [for]="filingDate"></mat-datepicker-toggle>
<div <mat-datepicker #filingDate></mat-datepicker>
fxLayout="row" </mat-form-field>
fxLayoutAlign="space-around start" </div>
fxLayout.lt-md="column" <div
fxLayoutGap="20px" fxLayout="row"
fxLayoutGap.lt-md="0px" fxLayoutAlign="space-around start"
> fxLayout.lt-md="column"
<mat-form-field fxFlex> fxLayoutGap="20px"
<mat-label>Case Type</mat-label> fxLayoutGap.lt-md="0px"
<mat-select placeholder="Case Type" formControlName="caseType"> >
<mat-option value=""> -- Not Applicable -- </mat-option> <mat-form-field fxFlex>
<mat-option *ngFor="let ct of caseTypes" [value]="ct.id"> <mat-label>Forum</mat-label>
{{ ct.name }} <mat-select placeholder="Forum" formControlName="court">
</mat-option> <mat-option value=""> -- Not Applicable --</mat-option>
</mat-select> <mat-option *ngFor="let c of courts" [value]="c.id">
</mat-form-field> {{ c.name }}
</div> </mat-option>
<div </mat-select>
fxLayout="row" </mat-form-field>
fxLayoutAlign="space-around start" <mat-form-field fxFlex>
fxLayout.lt-md="column" <mat-label>Case Type</mat-label>
fxLayoutGap="20px" <mat-select placeholder="Case Type" formControlName="caseType">
fxLayoutGap.lt-md="0px" <mat-option value=""> -- Not Applicable --</mat-option>
> <mat-option *ngFor="let ct of caseTypes" [value]="ct.id">
<mat-form-field fxFlex> {{ ct.name }}
<mat-label>Year</mat-label> </mat-option>
<input matInput placeholder="Year" formControlName="year" /> </mat-select>
</mat-form-field> </mat-form-field>
</div> <mat-form-field fxFlex>
<div <mat-label>Appearing for the</mat-label>
fxLayout="row" <mat-select placeholder="Appearing for the" formControlName="appearOnBehalfOf">
fxLayoutAlign="space-around start" <mat-option value="Petitioner">Petitioner</mat-option>
fxLayout.lt-md="column" <mat-option value="Respondent">Respondent</mat-option>
fxLayoutGap="20px" </mat-select>
fxLayoutGap.lt-md="0px" </mat-form-field>
> </div>
<mat-form-field fxFlex> <div
<mat-label>Connected Cases</mat-label> fxLayout="row"
<input matInput placeholder="Connected Cases" formControlName="caseConnectedWith" /> fxLayoutAlign="space-around start"
</mat-form-field> fxLayout.lt-md="column"
</div> fxLayoutGap="20px"
<div fxLayoutGap.lt-md="0px"
fxLayout="row" >
fxLayoutAlign="space-around start" <mat-form-field fxFlex>
fxLayout.lt-md="column" <mat-label>Connected Cases</mat-label>
fxLayoutGap="20px" <input matInput placeholder="Connected Cases" formControlName="caseConnectedWith" />
fxLayoutGap.lt-md="0px" </mat-form-field>
> </div>
<mat-form-field fxFlex> <div
<mat-label>Appearing for the</mat-label> fxLayout="row"
<mat-select placeholder="Appearing for the" formControlName="appearOnBehalfOf"> fxLayoutAlign="space-around start"
<mat-option value="Petitioner">Petitioner</mat-option> fxLayout.lt-md="column"
<mat-option value="Respondent">Respondent</mat-option> fxLayoutGap="20px"
</mat-select> fxLayoutGap.lt-md="0px"
</mat-form-field> >
</div> <mat-form-field fxFlex>
<div <mat-label>Department</mat-label>
fxLayout="row" <mat-select placeholder="Department" formControlName="department">
fxLayoutAlign="space-around start" <mat-option value=""> -- Not Applicable --</mat-option>
fxLayout.lt-md="column" <mat-option *ngFor="let d of departments" [value]="d.id">
fxLayoutGap="20px" {{ d.name }}
fxLayoutGap.lt-md="0px" </mat-option>
> </mat-select>
<mat-form-field fxFlex> </mat-form-field>
<mat-label>Forum</mat-label> <mat-form-field fxFlex>
<mat-select placeholder="Forum" formControlName="court"> <mat-label>Office</mat-label>
<mat-option value=""> -- Not Applicable -- </mat-option> <mat-select placeholder="Office" formControlName="office">
<mat-option *ngFor="let c of courts" [value]="c.id"> <mat-option value=""> -- Not Applicable --</mat-option>
{{ c.name }} <mat-option *ngFor="let o of offices | async" [value]="o.id">
</mat-option> {{ o.name }}
</mat-select> </mat-option>
</mat-form-field> </mat-select>
</div> </mat-form-field>
<div </div>
fxLayout="row" <div
fxLayoutAlign="space-around start" fxLayout="row"
fxLayout.lt-md="column" fxLayoutAlign="space-around start"
fxLayoutGap="20px" fxLayout.lt-md="column"
fxLayoutGap.lt-md="0px" fxLayoutGap="20px"
> fxLayoutGap.lt-md="0px"
<mat-form-field fxFlex> >
<mat-label>Department</mat-label> <mat-form-field fxFlex>
<mat-select placeholder="Department" formControlName="department"> <mat-label>Contact Person</mat-label>
<mat-option value=""> -- Not Applicable -- </mat-option> <textarea
<mat-option *ngFor="let d of departments" [value]="d.id"> matInput
{{ d.name }} placeholder="Contact Person"
</mat-option> formControlName="contactDetail"
</mat-select> ></textarea>
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex> </div>
<mat-label>Office</mat-label> <div
<mat-select placeholder="Office" formControlName="office"> fxLayout="row"
<mat-option value=""> -- Not Applicable -- </mat-option> fxLayoutAlign="space-around start"
<mat-option *ngFor="let o of offices | async" [value]="o.id"> fxLayout.lt-md="column"
{{ o.name }} fxLayoutGap="20px"
</mat-option> fxLayoutGap.lt-md="0px"
</mat-select> >
</mat-form-field> <mat-form-field fxFlex>
</div> <mat-label>Court Status</mat-label>
<div <mat-select placeholder="Court Status" formControlName="courtStatus">
fxLayout="row" <mat-option value=""> -- Not Applicable --</mat-option>
fxLayoutAlign="space-around start" <mat-option *ngFor="let cs of courtStatuses" [value]="cs.id">
fxLayout.lt-md="column" {{ cs.name }}
fxLayoutGap="20px" </mat-option>
fxLayoutGap.lt-md="0px" </mat-select>
> </mat-form-field>
<mat-form-field fxFlex> <mat-form-field fxFlex>
<mat-label>Contact Person</mat-label> <mat-label>Office Status</mat-label>
<input matInput placeholder="Contact Person" formControlName="contactDetail" /> <mat-select placeholder="Office Status" formControlName="officeStatus">
</mat-form-field> <mat-option value=""> -- Not Applicable --</mat-option>
</div> <mat-option *ngFor="let os of officeStatuses" [value]="os.id">
<div {{ os.name }}
fxLayout="row" </mat-option>
fxLayoutAlign="space-around start" </mat-select>
fxLayout.lt-md="column" </mat-form-field>
fxLayoutGap="20px" </div>
fxLayoutGap.lt-md="0px" <div
> fxLayout="row"
<mat-form-field fxFlex> fxLayoutAlign="space-around start"
<mat-label>Court Status</mat-label> fxLayout.lt-md="column"
<mat-select placeholder="Court Status" formControlName="courtStatus"> fxLayoutGap="20px"
<mat-option value=""> -- Not Applicable -- </mat-option> fxLayoutGap.lt-md="0px"
<mat-option *ngFor="let cs of courtStatuses" [value]="cs.id"> >
{{ cs.name }} <mat-form-field fxFlex>
</mat-option> <mat-label>Act</mat-label>
</mat-select> <mat-select placeholder="Act" formControlName="act">
</mat-form-field> <mat-option value=""> -- Not Applicable --</mat-option>
<mat-form-field fxFlex> <mat-option *ngFor="let a of acts" [value]="a.id">
<mat-label>Office Status</mat-label> {{ a.name }}
<mat-select placeholder="Office Status" formControlName="officeStatus"> </mat-option>
<mat-option value=""> -- Not Applicable -- </mat-option> </mat-select>
<mat-option *ngFor="let os of officeStatuses" [value]="os.id"> </mat-form-field>
{{ os.name }} <mat-form-field fxFlex>
</mat-option> <mat-label>Nature</mat-label>
</mat-select> <mat-select placeholder="Nature" formControlName="nature">
</mat-form-field> <mat-option value=""> -- Not Applicable --</mat-option>
</div> <mat-option *ngFor="let n of natures" [value]="n.id">
<div {{ n.name }}
fxLayout="row" </mat-option>
fxLayoutAlign="space-around start" </mat-select>
fxLayout.lt-md="column" </mat-form-field>
fxLayoutGap="20px" </div>
fxLayoutGap.lt-md="0px" <div
> fxLayout="row"
<mat-form-field fxFlex> fxLayoutAlign="space-around start"
<mat-label>Act</mat-label> fxLayout.lt-md="column"
<mat-select placeholder="Act" formControlName="act"> fxLayoutGap="20px"
<mat-option value=""> -- Not Applicable -- </mat-option> fxLayoutGap.lt-md="0px"
<mat-option *ngFor="let a of acts" [value]="a.id"> >
{{ a.name }} <mat-form-field fxFlex>
</mat-option> <mat-label>Docket No of Departments/ Legal Cell</mat-label>
</mat-select> <input
</mat-form-field> matInput
<mat-form-field fxFlex> placeholder="Docket No of Departments/ Legal Cell"
<mat-label>Nature</mat-label> formControlName="docketNumber"
<mat-select placeholder="Nature" formControlName="nature"> />
<mat-option value=""> -- Not Applicable -- </mat-option> </mat-form-field>
<mat-option *ngFor="let n of natures" [value]="n.id"> </div>
{{ n.name }} <div
</mat-option> fxLayout="row"
</mat-select> fxLayoutAlign="space-around start"
</mat-form-field> fxLayout.lt-md="column"
</div> fxLayoutGap="20px"
<div fxLayoutGap.lt-md="0px"
fxLayout="row" >
fxLayoutAlign="space-around start" <mat-form-field fxFlex>
fxLayout.lt-md="column" <mat-label>Petition/Counter</mat-label>
fxLayoutGap="20px" <input matInput placeholder="Petition/Counter" formControlName="slpCounter" />
fxLayoutGap.lt-md="0px" </mat-form-field>
> </div>
<mat-form-field fxFlex> <div
<mat-label>Docket No of Departments/ Legal Cell</mat-label> fxLayout="row"
<input fxLayoutAlign="space-around start"
matInput fxLayout.lt-md="column"
placeholder="Docket No of Departments/ Legal Cell" fxLayoutGap="20px"
formControlName="docketNumber" fxLayoutGap.lt-md="0px"
/> >
</mat-form-field> <mat-form-field fxFlex>
</div> <mat-label>Question of Law</mat-label>
<div <textarea
fxLayout="row" matInput
fxLayoutAlign="space-around start" placeholder="Question of Law"
fxLayout.lt-md="column" formControlName="questionOfLaw"
fxLayoutGap="20px" ></textarea>
fxLayoutGap.lt-md="0px" </mat-form-field>
> </div>
<mat-form-field fxFlex> <div
<mat-label>Petition/Counter</mat-label> fxLayout="row"
<input matInput placeholder="Petition/Counter" formControlName="slpCounter" /> fxLayoutAlign="space-around start"
</mat-form-field> fxLayout.lt-md="column"
</div> fxLayoutGap="20px"
<div fxLayoutGap.lt-md="0px"
fxLayout="row" >
fxLayoutAlign="space-around start" <mat-form-field fxFlex>
fxLayout.lt-md="column" <mat-label>Brief Description</mat-label>
fxLayoutGap="20px" <textarea matInput placeholder="(Synopsis)" formControlName="briefDescription"></textarea>
fxLayoutGap.lt-md="0px" </mat-form-field>
> </div>
<mat-form-field fxFlex> <div
<mat-label>Question of Law</mat-label> fxLayout="row"
<input matInput placeholder="Question of Law" formControlName="questionOfLaw" /> fxLayoutAlign="space-around start"
</mat-form-field> fxLayout.lt-md="column"
</div> fxLayoutGap="20px"
<div fxLayoutGap.lt-md="0px"
fxLayout="row" >
fxLayoutAlign="space-around start" <mat-form-field fxFlex>
fxLayout.lt-md="column" <mat-label>Advocate on Record</mat-label>
fxLayoutGap="20px" <input matInput placeholder="Advocate on Record" formControlName="aorName" />
fxLayoutGap.lt-md="0px" </mat-form-field>
> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Opposing Advocate on Record</mat-label>
<mat-label>Brief Description</mat-label> <input
<input matInput placeholder="(Synopsis)" formControlName="briefDescription" /> matInput
</mat-form-field> placeholder="Opposing Advocate on Record"
</div> formControlName="opposingCouncilAor"
<div />
fxLayout="row" </mat-form-field>
fxLayoutAlign="space-around start" </div>
fxLayout.lt-md="column" <div
fxLayoutGap="20px" fxLayout="row"
fxLayoutGap.lt-md="0px" fxLayoutAlign="space-around start"
> fxLayout.lt-md="column"
<mat-form-field fxFlex> fxLayoutGap="20px"
<mat-label>Advocate on Record</mat-label> fxLayoutGap.lt-md="0px"
<input matInput placeholder="Advocate on Record" formControlName="aorName" /> >
</mat-form-field> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Previous Court Case No</mat-label>
<mat-label>Opposing Advocate on Record</mat-label> <input
<input matInput
matInput placeholder="Lower Court Case No"
placeholder="Opposing Advocate on Record" formControlName="lowerCourtCaseNumber"
formControlName="opposingCouncilAor" />
/> </mat-form-field>
</mat-form-field> <mat-form-field fxFlex>
</div> <mat-label>Date of Impunged Judgement</mat-label>
<div <input
fxLayout="row" matInput
fxLayoutAlign="space-around start" [matDatepicker]="dateOfImpugnedJudgement"
fxLayout.lt-md="column" placeholder="Date of Impunged Judgement"
fxLayoutGap="20px" formControlName="dateOfImpugnedJudgement"
fxLayoutGap.lt-md="0px" autocomplete="off"
> #dateOfImpugnedJudgementElement
<mat-form-field fxFlex> (focus)="dateOfImpugnedJudgementElement.select()"
<mat-label>Previous Court Case No</mat-label> />
<input <mat-datepicker-toggle matSuffix [for]="dateOfImpugnedJudgement"></mat-datepicker-toggle>
matInput <mat-datepicker #dateOfImpugnedJudgement></mat-datepicker>
placeholder="Lower Court Case No" </mat-form-field>
formControlName="lowerCourtCaseNumber" </div>
/> <div
</mat-form-field> fxLayout="row"
<mat-form-field fxFlex> fxLayoutAlign="space-around start"
<mat-label>Date of Impunged Judgement</mat-label> fxLayout.lt-md="column"
<input fxLayoutGap="20px"
matInput fxLayoutGap.lt-md="0px"
[matDatepicker]="dateOfImpugnedJudgement" >
placeholder="Date of Impunged Judgement" <mat-form-field fxFlex>
formControlName="dateOfImpugnedJudgement" <mat-label>Date of Limitation/Target</mat-label>
autocomplete="off" <input
#dateOfImpugnedJudgementElement matInput
(focus)="dateOfImpugnedJudgementElement.select()" [matDatepicker]="limitationDate"
/> placeholder="Date of Limitation/Target"
<mat-datepicker-toggle formControlName="limitationDate"
matSuffix autocomplete="off"
[for]="dateOfImpugnedJudgement" #limitationDateElement
></mat-datepicker-toggle> (focus)="limitationDateElement.select()"
<mat-datepicker #dateOfImpugnedJudgement></mat-datepicker> />
</mat-form-field> <mat-datepicker-toggle matSuffix [for]="limitationDate"></mat-datepicker-toggle>
</div> <mat-datepicker #limitationDate></mat-datepicker>
<div </mat-form-field>
fxLayout="row" </div>
fxLayoutAlign="space-around start" <div
fxLayout.lt-md="column" fxLayout="row"
fxLayoutGap="20px" fxLayoutAlign="space-around start"
fxLayoutGap.lt-md="0px" fxLayout.lt-md="column"
> fxLayoutGap="20px"
<mat-form-field fxFlex> fxLayoutGap.lt-md="0px"
<mat-label>Date of Limitation/Target</mat-label> >
<input <mat-form-field fxFlex>
matInput <mat-label>Bunch Cases</mat-label>
[matDatepicker]="limitationDate" <input matInput placeholder="Bunch Cases" formControlName="bunchCases" />
placeholder="Date of Limitation/Target" </mat-form-field>
formControlName="limitationDate" </div>
autocomplete="off" <div
#limitationDateElement fxLayout="row"
(focus)="limitationDateElement.select()" fxLayoutAlign="space-around start"
/> fxLayout.lt-md="column"
<mat-datepicker-toggle matSuffix [for]="limitationDate"></mat-datepicker-toggle> fxLayoutGap="20px"
<mat-datepicker #limitationDate></mat-datepicker> fxLayoutGap.lt-md="0px"
</mat-form-field> >
</div> <mat-form-field fxFlex>
<div <mat-label>Remarks/Status</mat-label>
fxLayout="row" <textarea matInput placeholder="Remarks/Status" formControlName="remarks"></textarea>
fxLayoutAlign="space-around start" </mat-form-field>
fxLayout.lt-md="column" </div>
fxLayoutGap="20px" </mat-card-content>
fxLayoutGap.lt-md="0px" </mat-card>
> <mat-card fxFlex>
<mat-form-field fxFlex> <mat-card-title-group>
<mat-label>Bunch Cases</mat-label> <mat-card-title>Hearings</mat-card-title>
<input matInput placeholder="Bunch Cases" formControlName="bunchCases" /> </mat-card-title-group>
</mat-form-field> <mat-card-content formGroupName="addRow">
</div> <div
<div fxLayout="row"
fxLayout="row" fxLayoutAlign="space-around start"
fxLayoutAlign="space-around start" fxLayout.lt-md="column"
fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
fxLayoutGap.lt-md="0px" >
> <mat-form-field fxFlex>
<mat-form-field fxFlex> <mat-label>Court Number</mat-label>
<mat-label>Remarks/Status</mat-label> <input
<input matInput placeholder="Remarks/Status" formControlName="remarks" /> type="text"
</mat-form-field> matInput
</div> placeholder="Court Number"
</form> formControlName="courtNumber"
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex>
<mat-label>Item Number</mat-label>
<input
type="text"
matInput
placeholder="Item Number"
formControlName="itemNumber"
autocomplete="off"
/>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Bench</mat-label>
<input
type="text"
matInput
placeholder="Bench"
formControlName="bench"
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex>
<mat-label>Latest Status</mat-label>
<mat-select placeholder="Latest Status" formControlName="latestStatus">
<mat-option value=""> -- Not Applicable --</mat-option>
<mat-option *ngFor="let cs of courtStatuses" [value]="cs.id">
{{ cs.name }}
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fx
>
<mat-form-field fxFlex>
<mat-label>Proceedings</mat-label>
<textarea
type="text"
matInput
placeholder="Proceedings"
formControlName="proceedings"
autocomplete="off"
cdkTextareaAutosize
cdkAutosizeMinRows="5"
>
></textarea
>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="80%">
<mat-label>Next Hearing Date</mat-label>
<input
matInput
[matDatepicker]="nextHearingDate"
placeholder="Next Hearing Date"
formControlName="nextHearingDate"
autocomplete="off"
#nextHearingDateElement
(focus)="nextHearingDateElement.select()"
/>
<mat-datepicker-toggle matSuffix [for]="nextHearingDate"></mat-datepicker-toggle>
<mat-datepicker #nextHearingDate></mat-datepicker>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addHearing()" fxFlex="80%">Add</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Item Number Column -->
<ng-container matColumnDef="itemNumber">
<mat-header-cell *matHeaderCellDef>Court and Item Number</mat-header-cell>
<mat-cell *matCellDef="let row">{{ row.courtNumber }} / {{ row.itemNumber }}</mat-cell>
</ng-container>
<!-- Bench Column -->
<ng-container matColumnDef="bench">
<mat-header-cell *matHeaderCellDef>Bench</mat-header-cell>
<mat-cell *matCellDef="let row">{{ row.bench }}</mat-cell>
</ng-container>
<!-- Status Column -->
<ng-container matColumnDef="courtStatus">
<mat-header-cell *matHeaderCellDef class="right">Status</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.courtStatus?.name }}</mat-cell>
</ng-container>
<!-- Proceedings Column -->
<ng-container matColumnDef="proceedings">
<mat-header-cell *matHeaderCellDef class="right">Proceedings</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.proceedings }}</mat-cell>
</ng-container>
<!-- Next Hearing Date Column -->
<ng-container matColumnDef="nextHearingDate">
<mat-header-cell *matHeaderCellDef class="right">Next Hearing</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.nextHearingDate }}</mat-cell>
</ng-container>
<!-- Action Column -->
<ng-container matColumnDef="action">
<mat-header-cell *matHeaderCellDef class="center">Action</mat-header-cell>
<mat-cell *matCellDef="let row" class="center">
<button mat-icon-button tabindex="-1" (click)="editRow(row)">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button tabindex="-1" color="warn" (click)="deleteRow(row)">
<mat-icon>delete</mat-icon>
</button>
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
</mat-table>
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<button mat-raised-button color="primary" (click)="save()">Save</button> <button mat-raised-button color="primary" (click)="save()">Save</button>
@ -405,4 +539,4 @@
</button> </button>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
</div> </form>

97
otis/src/app/cases/case-detail/case-detail.component.ts
View File

@ -3,7 +3,7 @@ import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import * as moment from 'moment'; import * as moment from 'moment';
import { Observable } from 'rxjs'; import { BehaviorSubject, Observable } from 'rxjs';
import { distinctUntilChanged, startWith, switchMap } from 'rxjs/operators'; import { distinctUntilChanged, startWith, switchMap } from 'rxjs/operators';
import { Act } from '../../core/act'; import { Act } from '../../core/act';
@ -13,14 +13,17 @@ import { CaseType } from '../../core/case-type';
import { Court } from '../../core/court'; import { Court } from '../../core/court';
import { CourtStatus } from '../../core/court-status'; import { CourtStatus } from '../../core/court-status';
import { Department } from '../../core/department'; import { Department } from '../../core/department';
import { Hearing } from '../../core/hearing';
import { Nature } from '../../core/nature'; import { Nature } from '../../core/nature';
import { Office } from '../../core/office'; import { Office } from '../../core/office';
import { OfficeStatus } from '../../core/office-status'; import { OfficeStatus } from '../../core/office-status';
import { ToasterService } from '../../core/toaster.service'; import { ToasterService } from '../../core/toaster.service';
import { OfficeService } from '../../offices/office.service';
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component'; import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
import { CaseService } from '../case.service'; import { CaseService } from '../case.service';
import { HearingDatasource } from './case-detail-datasource';
import { HearingDialogComponent } from './hearing-dialog.component';
@Component({ @Component({
selector: 'app-case-detail', selector: 'app-case-detail',
templateUrl: './case-detail.component.html', templateUrl: './case-detail.component.html',
@ -28,6 +31,8 @@ import { CaseService } from '../case.service';
}) })
export class CaseDetailComponent implements OnInit, AfterViewInit { export class CaseDetailComponent implements OnInit, AfterViewInit {
@ViewChild('nameElement', { static: true }) nameElement?: ElementRef; @ViewChild('nameElement', { static: true }) nameElement?: ElementRef;
public hearingsObservable = new BehaviorSubject<Hearing[]>([]);
dataSource: HearingDatasource = new HearingDatasource(this.hearingsObservable);
form: FormGroup; form: FormGroup;
caseSources: CaseSource[] = []; caseSources: CaseSource[] = [];
caseTypes: CaseType[] = []; caseTypes: CaseType[] = [];
@ -40,6 +45,15 @@ export class CaseDetailComponent implements OnInit, AfterViewInit {
natures: Nature[] = []; natures: Nature[] = [];
item: Case = new Case(); item: Case = new Case();
displayedColumns = [
'itemNumber',
'bench',
'courtStatus',
'proceedings',
'nextHearingDate',
'action',
];
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router, private router: Router,
@ -80,6 +94,14 @@ export class CaseDetailComponent implements OnInit, AfterViewInit {
nature: '', nature: '',
officeStatus: '', officeStatus: '',
courtStatus: '', courtStatus: '',
addRow: this.fb.group({
courtNumber: '',
itemNumber: '',
bench: '',
latestStatus: '',
proceedings: '',
nextHearingDate: '',
}),
}); });
} }
@ -110,7 +132,7 @@ export class CaseDetailComponent implements OnInit, AfterViewInit {
showItem(item: Case) { showItem(item: Case) {
this.item = item; this.item = item;
this.form.setValue({ this.form.patchValue({
caseSource: this.item.caseSource.id, caseSource: this.item.caseSource.id,
officeFileNumber: this.item.officeFileNumber, officeFileNumber: this.item.officeFileNumber,
courtCaseNumber: this.item.courtCaseNumber, courtCaseNumber: this.item.courtCaseNumber,
@ -164,6 +186,7 @@ export class CaseDetailComponent implements OnInit, AfterViewInit {
this.form.patchValue({ officeFileNumber: x }); this.form.patchValue({ officeFileNumber: x });
} }
}); });
this.hearingsObservable.next(this.item.hearings);
} }
ngAfterViewInit() { ngAfterViewInit() {
@ -228,7 +251,6 @@ export class CaseDetailComponent implements OnInit, AfterViewInit {
} else { } else {
this.item.limitationDate = moment(formModel.limitationDate).format('DD-MMM-YYYY'); this.item.limitationDate = moment(formModel.limitationDate).format('DD-MMM-YYYY');
} }
console.log(formModel.filingDate);
if (formModel.filingDate === '') { if (formModel.filingDate === '') {
this.item.filingDate = null; this.item.filingDate = null;
} else { } else {
@ -320,4 +342,71 @@ export class CaseDetailComponent implements OnInit, AfterViewInit {
} }
return this.item; 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);
}
} }

0
otis/src/app/cases/case-detail/hearing-dialog.component.css Normal file
View File

109
otis/src/app/cases/case-detail/hearing-dialog.component.html Normal file
View File

@ -0,0 +1,109 @@
<h1 mat-dialog-title>Edit Journal Entry</h1>
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Court Number</mat-label>
<input
type="text"
matInput
placeholder="Court Number"
formControlName="courtNumber"
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex>
<mat-label>Item Number</mat-label>
<input
type="text"
matInput
placeholder="Item Number"
formControlName="itemNumber"
autocomplete="off"
/>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Bench</mat-label>
<input
type="text"
matInput
placeholder="Bench"
formControlName="bench"
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex>
<mat-label>Latest Status</mat-label>
<mat-select placeholder="Latest Status" formControlName="latestStatus">
<mat-option value=""> -- Not Applicable --</mat-option>
<mat-option *ngFor="let cs of data.courtStatuses" [value]="cs.id">
{{ cs.name }}
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fx
>
<mat-form-field fxFlex>
<mat-label>Proceedings</mat-label>
<textarea
type="text"
matInput
placeholder="Proceedings"
formControlName="proceedings"
autocomplete="off"
cdkTextareaAutosize
cdkAutosizeMinRows="5"
>
></textarea
>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="80%">
<mat-label>Next Hearing Date</mat-label>
<input
matInput
[matDatepicker]="nextHearingDate"
placeholder="Next Hearing Date"
formControlName="nextHearingDate"
autocomplete="off"
#nextHearingDateElement
(focus)="nextHearingDateElement.select()"
/>
<mat-datepicker-toggle matSuffix [for]="nextHearingDate"></mat-datepicker-toggle>
<mat-datepicker #nextHearingDate></mat-datepicker>
</mat-form-field>
</div>
</form>
</div>
<div mat-dialog-actions>
<button mat-button [mat-dialog-close]="false" cdkFocusInitial>Cancel</button>
<button mat-button (click)="accept()" color="primary">Ok</button>
</div>

26
otis/src/app/cases/case-detail/hearing-dialog.component.spec.ts Normal file
View File

@ -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<HearingDialogComponent>;
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [HearingDialogComponent],
}).compileComponents();
}),
);
beforeEach(() => {
fixture = TestBed.createComponent(HearingDialogComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

69
otis/src/app/cases/case-detail/hearing-dialog.component.ts Normal file
View File

@ -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<HearingDialogComponent>,
@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);
}
}

5
otis/src/app/cases/cases.module.ts
View File

@ -13,6 +13,7 @@ import {
MatNativeDateModule, MatNativeDateModule,
} from '@angular/material/core'; } from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatDialogModule } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import { MatPaginatorModule } from '@angular/material/paginator'; import { MatPaginatorModule } from '@angular/material/paginator';
@ -21,6 +22,7 @@ import { MatSelectModule } from '@angular/material/select';
import { MatTableModule } from '@angular/material/table'; import { MatTableModule } from '@angular/material/table';
import { CaseDetailComponent } from './case-detail/case-detail.component'; 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 { CaseListComponent } from './case-list/case-list.component';
import { CasesRoutingModule } from './cases-routing.module'; import { CasesRoutingModule } from './cases-routing.module';
@ -52,8 +54,9 @@ export const MY_FORMATS = {
MatSelectModule, MatSelectModule,
MatPaginatorModule, MatPaginatorModule,
MatDatepickerModule, MatDatepickerModule,
MatDialogModule,
], ],
declarations: [CaseListComponent, CaseDetailComponent], declarations: [CaseListComponent, CaseDetailComponent, HearingDialogComponent],
providers: [ providers: [
{ provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] }, { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
{ provide: MAT_DATE_FORMATS, useValue: MY_FORMATS }, { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },

3
otis/src/app/core/case.ts
View File

@ -4,6 +4,7 @@ import { CaseType } from './case-type';
import { Court } from './court'; import { Court } from './court';
import { CourtStatus } from './court-status'; import { CourtStatus } from './court-status';
import { Department } from './department'; import { Department } from './department';
import { Hearing } from './hearing';
import { Nature } from './nature'; import { Nature } from './nature';
import { Office } from './office'; import { Office } from './office';
import { OfficeStatus } from './office-status'; import { OfficeStatus } from './office-status';
@ -40,6 +41,7 @@ export class Case {
nature?: Nature; nature?: Nature;
officeStatus?: OfficeStatus; officeStatus?: OfficeStatus;
courtStatus?: CourtStatus; courtStatus?: CourtStatus;
hearings: Hearing[];
public constructor(init?: Partial<Case>) { public constructor(init?: Partial<Case>) {
this.id = undefined; this.id = undefined;
@ -65,6 +67,7 @@ export class Case {
this.contactDetail = ''; this.contactDetail = '';
this.caseConnectedWith = ''; this.caseConnectedWith = '';
this.bunchCases = ''; this.bunchCases = '';
this.hearings = [];
Object.assign(this, init); Object.assign(this, init);
} }
} }

22
otis/src/app/core/hearing.ts Normal file
View File

@ -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<Hearing>) {
this.id = undefined;
this.courtNumber = '';
this.itemNumber = '';
this.bench = '';
this.courtStatus = null;
this.proceedings = '';
this.nextHearingDate = '';
Object.assign(this, init);
}
}