diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
index ed349b1..aac0454 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
@@ -305,12 +305,12 @@ export class ViewPdComponent implements OnInit, OnDestroy {
dialogRef.afterClosed()
.subscribe(dataresult => {
if (dataresult.update_status == true) {
- this.router.navigate(['../../startpd',pdDetails.assigned_pd], { relativeTo: this.route });
+ this.router.navigate(['../../../startpd',pdDetails.assigned_pd,this.masterRandomString], { relativeTo: this.route });
}
});
}
else {
- this.router.navigate(['../../startpd', pdDetails.assigned_pd], { relativeTo: this.route });
+ this.router.navigate(['../../../startpd', pdDetails.assigned_pd,this.masterRandomString], { relativeTo: this.route });
}
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
index 03a7e6b..19bee53 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
@@ -122,7 +122,8 @@ import { GetAnswerableFormsPipe } from './../pd-pipes/get-answerable-forms.pipe'
// import { ManageRentalVerificationComponent } from './list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component';
// import { FuturePlansAndBusinessEnvironmentComponent } from './list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component';
// import { ImageCropComponent } from './list-pd/start-pd/forms/dialogue/image-crop/image-crop.component';
-import {AngularSplitModule} from 'angular-split'
+import {AngularSplitModule} from 'angular-split';
+import { ExcelUploadDialogComponent } from './list-pd/add-pd/excel-upload-dialog/excel-upload-dialog.component'
/**
* Custom angular notifier options
@@ -169,7 +170,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
};
@NgModule({
- declarations: [TelePdAllocationComponent, ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, PdReportComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, DeleteRecordsCountPipe, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
+ declarations: [TelePdAllocationComponent, ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, PdReportComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, DeleteRecordsCountPipe, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent, ExcelUploadDialogComponent],
imports: [
CommonModule,
ManagePdRoutingModule,
@@ -209,7 +210,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, PdLocatedMapViewDirective],
- entryComponents: [SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
+ entryComponents: [SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent,ExcelUploadDialogComponent],
})
export class ManagePdModule {
}
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
index 0767e1d..d5024cb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ManagePdComponent } from './manage-pd.component';
import { ListPdComponent } from './list-pd/list-pd.component';
-import { MapPdViewComponent } from './list-pd/map-pd-view/map-pd-view.component';
import { AddPdComponent } from '../manage-pd/list-pd/add-pd/add-pd.component';
import { ViewPdComponent } from '../manage-pd/list-pd/view-pd/view-pd.component';
import { PdReportComponent } from './list-pd/pd-report/pd-report.component';
@@ -22,10 +21,10 @@ const routes: Routes = [
path: 'pdlist',
component: ListPdComponent,
children: [
- {
- path: 'pdmaplist',
- component: MapPdViewComponent,
- },
+ // {
+ // path: 'pdmaplist',
+ // component: MapPdViewComponent,
+ // },
{
path: 'addpd',
component: AddPdComponent,
@@ -37,7 +36,11 @@ const routes: Routes = [
{
path: 'pd_report/:pdid/:string',
component: PdReportComponent,
- }
+ },
+ {
+ path: 'startpd/:pdid/:rdmstr',
+ loadChildren:'./list-pd/start-pd/start-pd.module#StartPdModule'
+ },
]
}
]
diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
index 2bc1967..a9a06d9 100755
--- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
@@ -264,9 +264,9 @@ export class PdTrigerService {
// }
//load pd template details
- loadPDTemplates(pdId: string): Observable
{
+ loadPDTemplates(pdId: string,randString): Observable {
const options = pdId ?
- { params: new HttpParams().set('pd_id', pdId) } : {};
+ { params: new HttpParams().set('pd_id', pdId).set('random_string',randString) } : {};
return this._http.get(this.apiUrl + "loadFullTemplate", options)
.pipe(
catchError(this.handleError('operation', []))
@@ -790,6 +790,13 @@ checkExistPDDetails(datas,entity_id){
return this._http.post(this.apiUrl+'checkExistPDDetails',{records:datas,client:entity_id})
.pipe(catchError(this.handleError("checkExistPDDetails",[])))
}
+uploadSMCDataFile(file) {
+ let records = {"rand_key":"qwerty1234"}
+ let formData= new FormData()
+ formData.append("pd_excel_data",file)
+ formData.append("records",JSON.stringify(records))
+ return this._http.post(this.apiUrl+'uploadSMCDataFile',formData)
+}
}
diff --git a/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts b/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts
index 0bc51ae..3e6e797 100755
--- a/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts
+++ b/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts
@@ -29,27 +29,27 @@ import { personalDiscussionRoutes } from './personal-discussion.routing';
imports: [
CommonModule,
RouterModule.forChild(personalDiscussionRoutes),
- CKEditorModule,
- PdfViewerModule,
- ManagePdModule,
- MatCardModule,
- MatIconModule,
- MatInputModule,
- MatRadioModule,
- MatTableModule,
- MatPaginatorModule,
- MatButtonModule,
- MatProgressBarModule,
- MatToolbarModule,
- FlexLayoutModule,
- NgxDatatableModule,
- FormsModule,MatSlideToggleModule,
- MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,
- ReactiveFormsModule,
- FileUploadModule,
- TreeModule,
- MatDialogModule,MatSortModule,
- NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule,
+ // CKEditorModule,
+ // PdfViewerModule,
+ // ManagePdModule,
+ // MatCardModule,
+ // MatIconModule,
+ // MatInputModule,
+ // MatRadioModule,
+ // MatTableModule,
+ // MatPaginatorModule,
+ // MatButtonModule,
+ // MatProgressBarModule,
+ // MatToolbarModule,
+ // FlexLayoutModule,
+ // NgxDatatableModule,
+ // FormsModule,MatSlideToggleModule,
+ // MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,
+ // ReactiveFormsModule,
+ // FileUploadModule,
+ // TreeModule,
+ // MatDialogModule,MatSortModule,
+ // NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule,
]
})
export class PersonalDiscussionModule { }
diff --git a/ng6-seed/src/app/shared/loaderService/loader.service.ts b/ng6-seed/src/app/shared/loaderService/loader.service.ts
index 07488a7..cd47194 100644
--- a/ng6-seed/src/app/shared/loaderService/loader.service.ts
+++ b/ng6-seed/src/app/shared/loaderService/loader.service.ts
@@ -1,5 +1,7 @@
import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material';
import { Subject } from 'rxjs';
+import { ProgressSpineerDialogComponent } from '../progress-spineer-dialog/progress-spineer-dialog.component';
export interface LoaderState {
show: boolean;
}
@@ -9,11 +11,26 @@ export interface LoaderState {
export class LoaderService {
private loaderSubject = new Subject();
loaderState = this.loaderSubject.asObservable();
- constructor() { }
+ spinnerdialogRef: any;
+ constructor(private dialog:MatDialog) { }
show() {
this.loaderSubject.next({ show: true });
}
hide() {
this.loaderSubject.next({ show: false });
}
+ showMatSpinnerDialog(message ?:String) {
+ this.spinnerdialogRef = this.dialog.open(ProgressSpineerDialogComponent, {
+ data:message,
+ panelClass: 'transparent',
+ // minHeight:'20%',
+ minWidth:'20%',
+ disableClose: true
+ });
+ }
+ closeMatSpinnerDialog() {
+ if(this.spinnerdialogRef) {
+ this.spinnerdialogRef.close();
+ }
+ }
}
\ No newline at end of file
diff --git a/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.html b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.html
new file mode 100644
index 0000000..5cf61c0
--- /dev/null
+++ b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.html
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.scss b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.scss
new file mode 100644
index 0000000..7d7126a
--- /dev/null
+++ b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.scss
@@ -0,0 +1,5 @@
+::ng-deep {.transparent > .mat-dialog-container {
+ box-shadow: none;
+ background: rgba(0, 0, 0, 0.0);
+}
+}
\ No newline at end of file
diff --git a/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.spec.ts b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.spec.ts
new file mode 100644
index 0000000..e2dc666
--- /dev/null
+++ b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProgressSpineerDialogComponent } from './progress-spineer-dialog.component';
+
+describe('ProgressSpineerDialogComponent', () => {
+ let component: ProgressSpineerDialogComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ProgressSpineerDialogComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ProgressSpineerDialogComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.ts b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.ts
new file mode 100644
index 0000000..7ca5a22
--- /dev/null
+++ b/ng6-seed/src/app/shared/progress-spineer-dialog/progress-spineer-dialog.component.ts
@@ -0,0 +1,19 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA } from '@angular/material';
+
+@Component({
+ selector: 'app-progress-spineer-dialog',
+ templateUrl: './progress-spineer-dialog.component.html',
+ styleUrls: ['./progress-spineer-dialog.component.scss']
+})
+export class ProgressSpineerDialogComponent implements OnInit {
+
+ spinnerMsg:String=''
+ constructor(@Inject(MAT_DIALOG_DATA)private data:any) {
+ this.spinnerMsg= this.data
+ }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/ng6-seed/src/app/shared/shared.module.ts b/ng6-seed/src/app/shared/shared.module.ts
index d8f845f..64a7a24 100755
--- a/ng6-seed/src/app/shared/shared.module.ts
+++ b/ng6-seed/src/app/shared/shared.module.ts
@@ -8,8 +8,11 @@ import { RatingComponent} from './rating/rating.component';
import { NumbersOnlyDirective } from './numbers-only/numbers-only.directive';
import { ForMobileNumbersDirective } from './for-mobile-numbers/for-mobile-numbers.directive';
import { NumberToWordsPipe } from 'app/personal-discussion/pd-pipes/number-to-words.pipe';
+import { ProgressSpineerDialogComponent } from './progress-spineer-dialog/progress-spineer-dialog.component';
+import { MatProgressSpinnerModule } from '@angular/material';
@NgModule({
+ entryComponents:[ProgressSpineerDialogComponent],
declarations: [
AccordionAnchorDirective,
AccordionLinkDirective,
@@ -18,8 +21,10 @@ import { NumberToWordsPipe } from 'app/personal-discussion/pd-pipes/number-to-wo
RatingComponent,
NumbersOnlyDirective,
ForMobileNumbersDirective,
- NumberToWordsPipe
+ NumberToWordsPipe,
+ ProgressSpineerDialogComponent
],
+ imports:[MatProgressSpinnerModule],
exports: [
AccordionAnchorDirective,
AccordionLinkDirective,
@@ -28,7 +33,8 @@ import { NumberToWordsPipe } from 'app/personal-discussion/pd-pipes/number-to-wo
RatingComponent,
NumbersOnlyDirective,
ForMobileNumbersDirective,
- NumberToWordsPipe
+ NumberToWordsPipe,
+ ProgressSpineerDialogComponent
],
providers: [ MenuItems, HorizontalMenuItems ]
})