datepicker issues

ng6-seed/package-lock.json

@@ -2439,7 +2439,7 @@
     },
     "buffer": {
       "version": "4.9.1",
-      "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "requires": {
         "base64-js": "^1.0.2",
@@ -2570,7 +2570,7 @@
     },
     "calendar-utils": {
       "version": "0.1.2",
-      "resolved": "http://registry.npmjs.org/calendar-utils/-/calendar-utils-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.1.2.tgz",
       "integrity": "sha512-9j4Zd1itopNYTSWzFU4MqD2IDHMqznfxsGr8UWGh7hWv+lKzjRJz0LS29iAg5rHtP6+6x3ikQnhoMGqFUzoD2Q=="
     },
     "caller-callsite": {
@@ -7303,7 +7303,7 @@
         },
         "lodash": {
           "version": "3.10.1",
-          "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
         },
@@ -7478,7 +7478,7 @@
     },
     "load-json-file": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -7620,7 +7620,7 @@
     },
     "log4js": {
       "version": "0.6.38",
-      "resolved": "http://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
       "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
       "dev": true,
       "requires": {
@@ -7941,7 +7941,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "requires": {
         "camelcase-keys": "^2.0.0",
@@ -8456,7 +8456,7 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         },
         "tar": {
@@ -8897,7 +8897,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.10",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
@@ -12746,6 +12746,11 @@
         }
       }
     },
+    "watermarkjs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/watermarkjs/-/watermarkjs-2.1.1.tgz",
+      "integrity": "sha512-HDabpga8Fz5d61Z7gBkKO2cDsfViAU/mO5qIoWmDX92wJZLb7Dv4L+CwoHAqS4XkqWcYVGy/AF035BD1EN3v/g=="
+    },
     "wbuf": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
@@ -12781,7 +12786,7 @@
         },
         "sax": {
           "version": "0.6.1",
-          "resolved": "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
           "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=",
           "dev": true
         },

ng6-seed/package.json

@@ -81,6 +81,7 @@
     "sweetalert2": "^7.33.1",
     "tether": "^1.4.6",
     "viewerjs": "^1.3.3",
+    "watermarkjs": "^2.1.1",
     "xlsx": "^0.14.2",
     "zone.js": "^0.8.29"
   },

ng6-seed/src/app/app.module.ts

@@ -53,6 +53,7 @@ import { ServiceWorkerModule } from '@angular/service-worker';
 import { environment } from '../environments/environment';
 import { ReqTokenInterceptor } from './_guard/req-token.interceptor';
 import { MatVideoModule } from 'mat-video';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
 export function HttpLoaderFactory(http: HttpClient) {
     return new TranslateHttpLoader(http);
 }
@@ -127,7 +128,8 @@ export function createTranslateLoader(http: HttpClient) {
       provide:HTTP_INTERCEPTORS,
       useClass: ReqTokenInterceptor,
       multi: true
-    }
+    },
+    { provide:MAT_DATE_LOCALE, useValue: 'en-GB' }
   ],
   entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog, DialogOverviewExampleDialog],
   bootstrap: [AppComponent]

ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html

@@ -20,15 +20,15 @@
           </mat-option>
         </mat-select>
       </mat-form-field> 
-      <mat-form-field style="width:20%">
+      <mat-form-field style="width:20%" touchUi>
         <input matInput [matDatepicker]="picker"  [max]="todaydate"
-          formControlName="pd_from_date" placeholder="Choose a From date">
+          formControlName="pd_from_date" placeholder="Choose a From date" >
         <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
         <mat-datepicker #picker></mat-datepicker>
       </mat-form-field>
-      <mat-form-field style="width:20%">
+      <mat-form-field style="width:20%" touchUi>
         <input matInput [matDatepicker]="picker1" [min]="searchForm.get('pd_from_date').value" [max]="todaydate"
-          formControlName="pd_to_date" placeholder="Choose a To date">
+          formControlName="pd_to_date" placeholder="Choose a To date" >
         <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
         <mat-datepicker #picker1></mat-datepicker>
       </mat-form-field>
@@ -49,6 +49,12 @@
       </mat-form-field> -->
       <mat-form-field style="width:30%">
         <input matInput type="text" formControlName="pd_applicant_name" placeholder="Company/Firm Name">
+      </mat-form-field> 
+      <mat-form-field style="width:30%" class="matfieldblock">
+        <mat-select multiple formControlName="pd_typefilter" placeholder="PD Type">
+            <mat-option  [value]="1">Physical PD</mat-option>
+            <mat-option  [value]="2">Telephonic PD</mat-option>
+        </mat-select>
     </mat-form-field>
       <!-- <mat-form-field style="width: 30%">
         <input matInput type="text" formControlName="pd_officer" placeholder="PD Officer Name">