From ff547719b27df1a6adf61f56b456cde737e561a1 Mon Sep 17 00:00:00 2001 From: tanshu Date: Mon, 11 Jan 2021 12:08:53 +0530 Subject: [PATCH] Fix Case list was appending / at the end as the value was not null it was an empty string. --- DB/import.sh | 2 -- otis/src/app/cases/case-list-resolver.service.ts | 2 +- otis/src/app/cases/case.service.ts | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DB/import.sh b/DB/import.sh index 4f5f7ea..4157485 100755 --- a/DB/import.sh +++ b/DB/import.sh @@ -30,5 +30,3 @@ docker run -it -v /home/tanshu/Programming/luthor/DB/csv:/mnt --link postgres:db sed -i 's/\x0//g' /home/tanshu/Programming/luthor/DB/csv/o-hearings.csv docker run -it -v /home/tanshu/Programming/luthor/DB/csv:/mnt --link postgres:db --rm --env PGPASSWORD="123456" postgres:alpine bash -c 'psql -h db -U postgres luthor -c "\copy hearings(old_id, old_case_id, judges, brief, next_hearing_date, old_court_status_id, court_number, item_number) from /mnt/o-hearings.csv with delimiter E'\''\t'\'' null as '\'''\''"' alembic upgrade 87a06eaadd34 -#docker run -it -v /home/tanshu/Programming/luthor/DB/csv:/mnt --link postgres:db --rm --env PGPASSWORD="123456" postgres:alpine bash -c 'psql -h db -U postgres luthor -c "\copy section_printers(id, menu_category_id, section_name, printer_name, copies) from /mnt/o-SectionPrinters.csv"' -#alembic upgrade 48bc1c7c07ce diff --git a/otis/src/app/cases/case-list-resolver.service.ts b/otis/src/app/cases/case-list-resolver.service.ts index 5367f06..8eb21e6 100644 --- a/otis/src/app/cases/case-list-resolver.service.ts +++ b/otis/src/app/cases/case-list-resolver.service.ts @@ -13,6 +13,6 @@ export class CaseListResolver implements Resolve { constructor(private ser: CaseService) {} resolve(): Observable { - return this.ser.list(null); + return this.ser.list(''); } } diff --git a/otis/src/app/cases/case.service.ts b/otis/src/app/cases/case.service.ts index 6121283..df340ff 100644 --- a/otis/src/app/cases/case.service.ts +++ b/otis/src/app/cases/case.service.ts @@ -25,8 +25,8 @@ export class CaseService { .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable; } - list(caseSource: string | null): Observable { - const listUrl: string = caseSource === null ? `${url}/list` : `${url}/list/${caseSource}`; + list(caseSource: string): Observable { + const listUrl: string = caseSource === '' ? `${url}/list` : `${url}/list/${caseSource}`; return this.http .get(listUrl) .pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable;