From 9edc46cf6d2c54831e33cacbff6b6f06bb3f29a6 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 22 Oct 2018 13:36:40 -0700
Subject: [PATCH] SHIBUI-888 Fixed label issue

---
 .../app/schema-form/widget/select/select.component.html   | 8 ++++++--
 ui/src/app/shared/pipe/date.pipe.ts                       | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/schema-form/widget/select/select.component.html b/ui/src/app/schema-form/widget/select/select.component.html
index 819a89553..bcd96bcd6 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -1,9 +1,12 @@
 <div class="widget form-group">
-    <label [attr.for]="id" class="horizontal control-label" *ngIf="schema.title">
-        <span>
+    <label [attr.for]="id" class="horizontal control-label">
+        <span *ngIf="schema.title">
             <translate-i18n [key]="schema.title">{{ schema.title }}</translate-i18n>
             <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
         </span>
+        <span *ngIf="!schema.title" class="sr-only" [translate]="formProperty.parent.schema.title">
+            {{ formProperty.parent.schema.title }}
+        </span>
         <span *ngIf="schema.description">
             <info-icon [description]="schema.description | translate"></info-icon>
         </span>
@@ -12,6 +15,7 @@
         {{ schema.description }}
     </span>
     <select *ngIf="schema.type !== 'array'"
+        [id]="id"
         [formControl]="control"
         [attr.name]="name"
         class="form-control"
diff --git a/ui/src/app/shared/pipe/date.pipe.ts b/ui/src/app/shared/pipe/date.pipe.ts
index 21be68187..80f648ec4 100644
--- a/ui/src/app/shared/pipe/date.pipe.ts
+++ b/ui/src/app/shared/pipe/date.pipe.ts
@@ -8,6 +8,12 @@ export class CustomDatePipe implements PipeTransform {
         this.pipe = new DatePipe('en');
     }
     transform(value: string, format: string): string {
-        return this.pipe.transform(value, format);
+        let transformed: string;
+        try {
+            transformed = this.pipe.transform(value, format);
+        } catch (err) {
+            transformed = value;
+        }
+        return transformed;
     }
 }