diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss
index bcdec2ace..b2f017706 100644
--- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss
+++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss
@@ -32,7 +32,7 @@
/** Report Table Common Css (Overall)*/
.report-table-container {
- max-height: 600px;
+ max-height:600px;
width: 100%;
overflow: auto;
margin-top: 2%;
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
index 157c7c392..750eaa86e 100644
--- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
+++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
@@ -4,7 +4,8 @@ import { ReportsService } from '../reports.service';
import { DatePipe } from '@angular/common';
import { FormGroup, FormControl,FormBuilder } from '@angular/forms';
import * as XLSX from 'xlsx';
-import { MatSort,MatPaginator, MatTableDataSource } from '@angular/material';
+import { MatSort,MatPaginator, MatTableDataSource,PageEvent } from '@angular/material';
+import { NotifierService } from 'angular-notifier';
@Component({
selector: 'app-pd-mis',
@@ -12,7 +13,7 @@ import { MatSort,MatPaginator, MatTableDataSource } from '@angular/material';
styleUrls: ['./pd-mis.component.scss']
})
export class PdMisComponent implements OnInit {
-
+ pageEvent:PageEvent;
pipe = new DatePipe('en-US');
maxDate: any;
minDate: any;
@@ -28,6 +29,8 @@ export class PdMisComponent implements OnInit {
public pageSize : number;
public dataSource = new MatTableDataSource();
error:any=[];
+ pageNumber:number=10;
+ pageIndex:number=0
displayedColumns = ['serialno',
'applicant',
@@ -47,10 +50,11 @@ export class PdMisComponent implements OnInit {
'agency_name',
'officer_name',
'pd_status'];
+ expandStatus: boolean;
- constructor(private reportsService:ReportsService,private route:ActivatedRoute,private router:Router,private form_builder:FormBuilder) {
+ constructor(private reportsService:ReportsService,private route:ActivatedRoute,private router:Router,private form_builder:FormBuilder,private notifier:NotifierService) {
this.reportform = this.form_builder.group({ from_date:[null],to_date:[null],city:[null],branch:[null],applicant_id:[null] });
}
@@ -60,8 +64,8 @@ export class PdMisComponent implements OnInit {
}
getMISDailyReport() {
-
- this.reportsService.retirveDataForMISDailyReport().subscribe(
+ let array=[]
+ this.reportsService.retirveDataForMISDailyReport(array).subscribe(
data => {
if(data.dataStatus == true){
this.api_data = data.records;
@@ -114,59 +118,98 @@ export class PdMisComponent implements OnInit {
filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches
this.dataSource.filter = filterValue;
}
-
- searchform(value:any){
-
- this.reportsService.retirveDataForMISDailyReport().subscribe(
-
- data => {
- if(data['dataStatus']==true)
- {
- this.filtered_data = data.records;
-
- if(value.applicant_id !== null && value.applicant_id != ''){
- this.filtered_data = this.filterForApplicantID(this.filtered_data,value.applicant_id);
- }
- if(value.city !== null && value.city != ''){
- this.filtered_data = this.filterForCity(this.filtered_data,value.city);
- }
- if(value.branch !== null && value.branch != ''){
- // this.filtered_data = this.filtered_data.filter(val => val.branch == value.branch );
- // this.filtered_data = this.filtered_data.filter(val => this.customFilter(val,value.brach,3));
- this.filtered_data = this.filterForBranch(this.filtered_data,value.branch);
- }
- if(value.from_date !== null && value.to_date !== null){
- // console.log('value',value.from_date);
- // console.log('value',value.to_date);
- let from_Date = this.pipe.transform(value.from_date,'yyyy-MM-dd HH:mm:ss');
- let to_Date = this.pipe.transform(value.to_date,'yyyy-MM-dd HH:mm:ss');
- this.filtered_data = this.filtered_data.filter(val => val.created_on >= from_Date && val.created_on <= to_Date );
- // console.log('this.filtered_data',this.filtered_data);
- }
- this.Loading = false;
- this.dataLength = this.filtered_data.length;
- this.pageSize = this.filtered_data.length;
- if(this.filtered_data.length >= 1){
- this.api_data = this.filtered_data.map((val, i)=>{
- val['serialno'] = i + 1;
- return val;
- })
- }
- this.dataSource.data = this.filtered_data;
- }
- else{
- this.dataSource.data = this.filtered_data;
- this.dataLength = this.filtered_data.length;
- }
- },
- error => {
- this.error.push(error);
- this.dataLength = 0;
- this.Loading = false;
- }
- );
+ pageChange(e) {
+ console.log(e);
}
+ // searchform(value:any){
+
+ // this.reportsService.retirveDataForMISDailyReport(this.reportform.value).subscribe(
+ // data => {
+ // if(data['dataStatus']==true)
+ // {
+ // this.filtered_data = data.records;
+
+ // if(value.applicant_id !== null && value.applicant_id != ''){
+ // this.filtered_data = this.filterForApplicantID(this.filtered_data,value.applicant_id);
+ // }
+ // if(value.city !== null && value.city != ''){
+ // this.filtered_data = this.filterForCity(this.filtered_data,value.city);
+ // }
+ // if(value.branch !== null && value.branch != ''){
+ // // this.filtered_data = this.filtered_data.filter(val => val.branch == value.branch );
+ // // this.filtered_data = this.filtered_data.filter(val => this.customFilter(val,value.brach,3));
+ // this.filtered_data = this.filterForBranch(this.filtered_data,value.branch);
+ // }
+ // if(value.from_date !== null && value.to_date !== null){
+ // // console.log('value',value.from_date);
+ // // console.log('value',value.to_date);
+ // let from_Date = this.pipe.transform(value.from_date,'yyyy-MM-dd HH:mm:ss');
+ // let to_Date = this.pipe.transform(value.to_date,'yyyy-MM-dd HH:mm:ss');
+ // this.filtered_data = this.filtered_data.filter(val => val.created_on >= from_Date && val.created_on <= to_Date );
+ // // console.log('this.filtered_data',this.filtered_data);
+ // }
+ // this.Loading = false;
+ // this.dataLength = this.filtered_data.length;
+ // this.pageSize = this.filtered_data.length;
+ // if(this.filtered_data.length >= 1){
+ // this.api_data = this.filtered_data.map((val, i)=>{
+ // val['serialno'] = i + 1;
+ // return val;
+ // })
+ // }
+ // this.dataSource.data = this.filtered_data;
+ // }
+ // else{
+ // this.dataSource.data = this.filtered_data;
+ // this.dataLength = this.filtered_data.length;
+ // }
+ // },
+ // error => {
+ // this.error.push(error);
+ // this.dataLength = 0;
+ // this.Loading = false;
+ // }
+ // );
+ // }
+ searchPanel(){
+ this.reportform.value.from_date=this.pipe.transform(this.reportform.value.from_date,'yyyy-MM-dd')
+ this.reportform.value.to_date=this.pipe.transform(this.reportform.value.to_date,'yyyy-MM-dd')
+ this.reportsService.retirveDataForMISDailyReport(this.reportform.value).subscribe(res=>{
+ if(res['dataStatus'] == true){
+
+ this.dataSource.data=res['records'];
+ this.dataLength=res['records'].length;
+ this.expandStatus=false
+ if(this.dataLength == 0){
+ console.log("data length",this.dataLength)
+ this.notifier.notify('warning', 'No Records Found !');
+ this.dataSource.data = [];
+ this.dataLength=0
+ }
+ }
+ else{
+ this.notifier.notify('Warning', 'Something Went Wrong');
+ this.dataSource.data = [];
+ this.dataLength=0
+ }
+ },error => {
+ //this.errorMessage.push(error);
+ this.error.push(error)
+ this.dataLength=0
+ this.Loading = false;
+ this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!');
+ alert(error.html_format);
+ });
+
+ }
+ onReset(){
+ // if(this.reportform.value.filter(val=>val.))
+ this.Loading=true
+ this.reportform.reset();
+ this.getMISDailyReport()
+ this.expandStatus=false
+ }
filterForApplicantID(arrayData: any, Values: any) {
Values = Values.toLowerCase();
if (Values) {
@@ -193,12 +236,14 @@ export class PdMisComponent implements OnInit {
Values = Values.toLowerCase();
if (Values) {
let Filter: any = [];
-
- let getAllCityOnly = arrayData.map(v => v.city.replace(/[^A-Za-z0-9]/ig, "").toLowerCase());
+ // console.log("arra",JSON.parse(arrayData),Values);
+ let getAllCityOnly = arrayData.map(v => v.city.replace(/[^A-Za-z0-9]/ig, "").toLowerCase());
+ console.log("getall ",getAllCityOnly)
let searched_filter_array = getAllCityOnly.filter(val => val.includes(Values));
Filter = searched_filter_array.map(x => {
+ console.log("x",x);
let findIndex = getAllCityOnly.indexOf(x);
return arrayData[findIndex];
});
diff --git a/ng6-seed/src/app/reports/reports.module.ts b/ng6-seed/src/app/reports/reports.module.ts
index 92dcd0156..649893f44 100644
--- a/ng6-seed/src/app/reports/reports.module.ts
+++ b/ng6-seed/src/app/reports/reports.module.ts
@@ -25,10 +25,53 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable';
import { ReportsService } from '../reports/reports.service';
import { ReportsRoutingModule } from './reports-routing.module';
import { PdMisComponent } from './pd-mis/pd-mis.component';
+import {NotifierModule,NotifierOptions} from 'angular-notifier'
+const pdCustomNotifierOptions: NotifierOptions = {
+ position: {
+ horizontal: {
+ position: 'right',
+ distance: 12
+ },
+ vertical: {
+ position: 'top',
+ distance: 32,
+ gap: 10
+ }
+ },
+ theme: 'material',
+ behaviour: {
+ autoHide: 2000,
+ onClick: 'hide',
+ onMouseover: 'pauseAutoHide',
+ showDismissButton: true,
+ stacking: 4
+ },
+ animations: {
+ enabled: true,
+ show: {
+ preset: 'slide',
+ speed: 300,
+ easing: 'ease'
+ },
+ hide: {
+ preset: 'fade',
+ speed: 300,
+ easing: 'ease',
+ offset: 50
+ },
+ shift: {
+ speed: 300,
+ easing: 'ease'
+ },
+ overlap: 150
+ }
+};
+
@NgModule({
imports: [
+ NotifierModule.withConfig(pdCustomNotifierOptions),
MatExpansionModule,
CommonModule,
MatFormFieldModule,
diff --git a/ng6-seed/src/app/reports/reports.service.ts b/ng6-seed/src/app/reports/reports.service.ts
index 8c531b9d3..1462ec0eb 100644
--- a/ng6-seed/src/app/reports/reports.service.ts
+++ b/ng6-seed/src/app/reports/reports.service.ts
@@ -22,7 +22,7 @@ export class ReportsService {
// }
// get Details
- retirveDataForMISDailyReport(): Observable
{
- return this._http.get(this.apiUrl + 'PD_MIS_report');
+ retirveDataForMISDailyReport(value): Observable {
+ return this._http.post(this.apiUrl + 'PD_MIS_report',value);
}
}
diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts
index e0308b750..84d550792 100755
--- a/ng6-seed/src/app/session/login/login.component.ts
+++ b/ng6-seed/src/app/session/login/login.component.ts
@@ -81,9 +81,10 @@ export class LoginComponent implements OnInit{
if (result !== undefined) {
let auth = { 'Username': this.email, 'Password': this.password, 'newpassword': result };
this.aws.dologin(auth).subscribe(res => {
+ localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]);
this.router.navigate(['/home']);
}, err => {
- // alert(err.message);
+ alert(err.message);
})
}
});
diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts
index 0046be28d..cad7470f9 100755
--- a/ng6-seed/src/app/settings/users/register/register.component.ts
+++ b/ng6-seed/src/app/settings/users/register/register.component.ts
@@ -73,7 +73,7 @@ export class RegisterComponent implements OnInit {
this.regForm = this.fb.group({
userid: [null],
firstName: [null, Validators.compose([Validators.required, Validators.minLength(2)])],
- lastName: [null, Validators.compose([Validators.required])],
+ lastName: ['', Validators.compose([Validators.required])],
phone: [null, Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(12)])],
email: [null, Validators.compose([Validators.required, CustomValidators.email])],
role: [null, Validators.compose([Validators.required])],
diff --git a/ng6-seed/src/app/shared/messaging.service.ts b/ng6-seed/src/app/shared/messaging.service.ts
index 050dd8297..093cc0396 100644
--- a/ng6-seed/src/app/shared/messaging.service.ts
+++ b/ng6-seed/src/app/shared/messaging.service.ts
@@ -9,6 +9,7 @@ import { HttpClient } from '@angular/common/http';
/** Environment */
import { environment } from 'environments/environment'
+import { Router } from '@angular/router';
@Injectable()
export class MessagingService {
@@ -19,7 +20,8 @@ export class MessagingService {
private angularFireDB: AngularFireDatabase,
private angularFireAuth: AngularFireAuth,
private angularFireMessaging: AngularFireMessaging,
- private http: HttpClient) {
+ private http: HttpClient,
+ private router:Router) {
this.angularFireMessaging.messaging.subscribe(
(_messaging) => {
_messaging.onMessage = _messaging.onMessage.bind(_messaging);
@@ -43,11 +45,11 @@ export class MessagingService {
this.angularFireDB.object('fcmTokens/').update(data)
})
- // let params = {"records":{ "fk_user_id":userId,"token":token,"client":"WEB"}};
- // this.updateNotificationToken(params).subscribe(
- // (data) => { console.log('success',data);},
- // (err) => { console.error('Something Went wrong on update notify.', err);
- // });
+ let params = {"records":{ "fk_user_id":userId,"token":token,"client":"WEB"}};
+ this.updateNotificationToken(params).subscribe(
+ (data) => { console.log('success',data);},
+ (err) => { console.error('Something Went wrong on update notify.', err);
+ });
}
updateNotificationToken(params): Observable {
@@ -61,9 +63,11 @@ export class MessagingService {
* @param userId userId
*/
requestPermission(userId) {
+ // console.log("user id in request permission method",userId)
this.angularFireMessaging.requestToken.subscribe(
(token) => {
- // console.log(token);
+ console.log(token);
+ // this.router.navigate(['./personal_discussion'])
this.updateToken(userId, token);
},
(err) => {
@@ -78,8 +82,9 @@ export class MessagingService {
receiveMessage() {
this.angularFireMessaging.messages.subscribe(
(payload) => {
- // console.log("new message received. ", payload);
+ console.log("new message received. ", payload);
this.currentMessage.next(payload);
+ //this.router.navigate([''])
})
}
}
diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts
index cfad38453..0573e934c 100755
--- a/ng6-seed/src/environments/environment.ts
+++ b/ng6-seed/src/environments/environment.ts
@@ -8,7 +8,8 @@ export const environment = {
environmentName: 'Development Environment',//Localhost Environment.
- apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/',
+ // apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/',
+ apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/',
authorization: 'sparqvenba2018',
diff --git a/ng6-seed/src/firebase-messaging-sw.js b/ng6-seed/src/firebase-messaging-sw.js
index 3d365e41a..f1cd7bfeb 100644
--- a/ng6-seed/src/firebase-messaging-sw.js
+++ b/ng6-seed/src/firebase-messaging-sw.js
@@ -7,7 +7,8 @@ importScripts('https://www.gstatic.com/firebasejs/5.5.0/firebase-messaging.js');
// Initialize the Firebase app in the service worker by passing in the
// messagingSenderId.
firebase.initializeApp({
- 'messagingSenderId': '627754063571'
+ // 'messagingSenderId': '627754063571'
+ 'messagingSenderId': '906855209078'
});
// Retrieve an instance of Firebase Messaging so that it can handle background