merge upstream

albertnadal · Dec 7, 2017 · d443c45 · d443c45
2 parents 1a165f2 + 37a48f9
commit d443c45
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 56 deletions.
diff --git a/src/ang.daterange.picker.component.html b/src/ang.daterange.picker.component.html
@@ -1,64 +1,48 @@
 <div class="ang-daterange-picker" style="z-index: 1000; min-height: 328px; position: relative; width: 810px;">
-
-    <mat-card style="width:100%;min-height:328px;padding-top:1px;">
-
-      <div style="position: absolute; width: 180px; height: 300px;">
-        <table style="margin-top: 1.9em; width:100%;">
-          <tr>
-            <td>FROM</td>
-          </tr>
+  <mat-card style="width:100%;min-height:328px;padding-top:1px;">
+    <div style="position: absolute; width: 180px; height: 300px;">
+      <table style="margin-top: 1.9em; width:100%;">
+        <tr>
+          <td>FROM</td>
+        </tr>
+        <tr>
+          <td>
+            <mat-form-field style="width:100%">
+              <input matInput disabled value="" [(ngModel)]="startDateText">
+            </mat-form-field>
+          </td>
+        </tr>
+        <tr>
+          <td>TO</td>
+        </tr>
+        <tr>
+          <td>
+            <mat-form-field style="width:100%">
+              <input matInput disabled value="" [(ngModel)]="endDateText">
+            </mat-form-field>
+          </td>
+        </tr>
+      </table>
+      <div style="bottom:0px;">
+        <table style="width:100%">
           <tr>
             <td>
-              <mat-form-field style="width:100%">
-                <input matInput disabled value="" [(ngModel)]="startDateText">
-              </mat-form-field>
+              <button mat-button [disabled]="!startDateText || !endDateText" color="primary" (click)="onApplySelectedDateRange()">Apply
+              </button>
             </td>
-          </tr>
-          <tr>
-            <td>TO</td>
-          </tr>
-          <tr>
             <td>
-              <mat-form-field style="width:100%">
-                <input matInput disabled value="" [(ngModel)]="endDateText">
-              </mat-form-field>
+              <button mat-button (click)="onCloseContextualMenu()">Cancel
+              </button>
             </td>
           </tr>
         </table>
-        <div style="bottom:0px;">
-          <table style="width:100%">
-            <tr>
-              <td>
-                  <button mat-button
-                          [disabled]="!startDateText || !endDateText"
-                          color="primary"
-                          (click)="onApplySelectedDateRange()">Apply
-                  </button>
-              </td>
-              <td>
-                  <button mat-button
-                          (click)="onCloseContextualMenu()">Cancel
-                  </button>
-              </td>
-            </tr>
-          </table>
-        </div>
-      </div>
-      <div style="margin-left:180px">
-        <ang-datepicker [(date)]="startDate"
-                        (onSelect)="onSelectStartDate($event)"
-                        dateFormat="YYYY-MM-DD"
-                        [endDate]="endDate"
-                        [startDate]="startDate">
-        </ang-datepicker>
-        <ang-datepicker [(date)]="endDate"
-                        (onSelect)="onSelectEndDate($event)"
-                        dateFormat="YYYY-MM-DD"
-                        [endDate]="endDate"
-                        [startDate]="startDate">
-        </ang-datepicker>
       </div>
-
-    </mat-card>
-
-</div>
+    </div>
+    <div style="margin-left:180px">
+      <ang-datepicker [(date)]="startDate" (onSelect)="onSelectStartDate($event)" dateFormat="YYYY-MM-DD" [endDate]="endDate" [startDate]="startDate">
+      </ang-datepicker>
+      <ang-datepicker [(date)]="endDate" (onSelect)="onSelectEndDate($event)" dateFormat="YYYY-MM-DD" [endDate]="endDate" [startDate]="startDate">
+      </ang-datepicker>
+    </div>
+  </mat-card>
+</div>
diff --git a/src/daterange.picker.module.ts b/src/daterange.picker.module.ts
@@ -1,9 +1,10 @@
-import { CommonModule }   from '@angular/common';
+import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { NgModule } from '@angular/core';
 import { MatInputModule, MatCardModule, MatFormFieldModule, MatButtonModule } from '@angular/material';
 
+
 import { DaterangePickerComponent } from './ang.daterange.picker.component';
 import { DatePickerComponent } from './ang.datepicker.component';