diff --git a/ng6-seed/ng6-seed.zip b/ng6-seed/ng6-seed.zip deleted file mode 100644 index 38076affb..000000000 Binary files a/ng6-seed/ng6-seed.zip and /dev/null differ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 08f7c888f..bc3b23a62 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -6,7 +6,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 86e8b7e0e..037c35c73 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -6,7 +6,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index ef0a6b08f..b4ecb5c24 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -5,7 +5,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index e11883010..0153e37cc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -5,7 +5,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index 6f5fdaf0f..186a64ad6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -5,7 +5,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index 3a2f64e99..674a1dd52 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -164,10 +164,9 @@ apiLoadFinish: boolean = false; } addSupplierDetailsWithData(supp_data) { - -var result = Object.keys(supp_data).map(function(key) { - return supp_data[key]; -}); + var result = Object.keys(supp_data).map(function(key) { + return supp_data[key]; + }); if (result.length > 0) { for (let val of result) { let vals = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 3f2e4fcec..e7e216521 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -417,6 +417,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index b89a4eff2..bf5b2f28e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -115,6 +115,7 @@ export class StartPdComponent implements OnInit, OnDestroy { answeredQuestions: number; + // start // end 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 4c582d98b..d23e0e2fb 100644 --- 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 @@ -101,37 +101,66 @@ const pdCustomNotifierOptions: NotifierOptions = { }; @NgModule({ - imports: [ - CommonModule, - ManagePdRoutingModule, - NotifierModule.withConfig(pdCustomNotifierOptions), - MatCardModule, - MatIconModule, - MatInputModule, - MatRadioModule, - MatTableModule, - MatPaginatorModule, - MatButtonModule, - MatProgressBarModule, - MatAutocompleteModule, - MatToolbarModule, - FlexLayoutModule, - NgxDatatableModule, - FormsModule, - MatSlideToggleModule, - MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule, MatStepperModule, MatSidenavModule, MatMenuModule, MatButtonToggleModule, - ReactiveFormsModule, - FileUploadModule, - TreeModule, - MatDialogModule, MatSortModule, - NgxMatSelectSearchModule, MatTooltipModule, MatExpansionModule, - AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule, - OwlNativeDateTimeModule, - ], + // imports: [ + // CommonModule, + // ManagePdRoutingModule, + // NotifierModule.withConfig(pdCustomNotifierOptions), + // MatCardModule, + // MatIconModule, + // MatInputModule, + // MatRadioModule, + // MatTableModule, + // MatPaginatorModule, + // MatButtonModule, + // MatProgressBarModule, + // MatAutocompleteModule, + // MatToolbarModule, + // FlexLayoutModule, + // NgxDatatableModule, + // FormsModule, + // MatSlideToggleModule, + // MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule, MatStepperModule, MatSidenavModule, MatMenuModule, MatButtonToggleModule, + // ReactiveFormsModule, + // FileUploadModule, + // TreeModule, + // MatDialogModule, MatSortModule, + // NgxMatSelectSearchModule, MatTooltipModule, MatExpansionModule, + // AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule, + // OwlNativeDateTimeModule, + // ], declarations: [BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent], - exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], - providers: [PdTrigerService, GetGeometricLocationService], - entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent] + // exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], + // providers: [PdTrigerService, GetGeometricLocationService], + // entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent], + imports: [ + CommonModule, + ManagePdRoutingModule, + NotifierModule.withConfig(pdCustomNotifierOptions), + MatCardModule, + MatIconModule, + MatInputModule, + MatRadioModule, + MatTableModule, + MatPaginatorModule, + MatButtonModule, + MatProgressBarModule, + MatToolbarModule, + FlexLayoutModule, + NgxDatatableModule, + FormsModule,MatSlideToggleModule, + MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,MatStepperModule,MatSidenavModule ,MatMenuModule, MatButtonToggleModule, + ReactiveFormsModule, + FileUploadModule, + TreeModule, + MatDialogModule,MatSortModule, + NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule, + AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule, + OwlNativeDateTimeModule, + ], + // declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent], + exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], + providers: [PdTrigerService, GetGeometricLocationService], + entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent] }) export class ManagePdModule { } 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 0ca33f2c0..aa5c94ce0 100644 --- 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 @@ -265,7 +265,7 @@ getPDFormDetailsWithID(pdID, formID ):Observable { // saveData[0].fk_updatedby = this._aws.getlocale(); // saveData[0].updatedon = currentdate; - return this._http.post(this.apiUrl+"savePDQuestions",{"records":saveData}) + return this._http.post(this.apiUrl+"savePDQuestions",{"records1":saveData}) .pipe( catchError(this.handleError('operation', [])) ) diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 350c34216..6d24d5113 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -44,7 +44,7 @@

{{master.product_name}} / {{master.subproduct_name}}

{{master.pd_type_name}} /  {{master.loan_amount}}

-

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

+

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

Remarks : {{master.remarks}}

diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index c676e20a8..9fcaa8124 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -1,279 +1,164 @@ - - - - -
+ +
-
-
User Registration
-
-
- -
+
+
User Registration
+
+
+ +
Personal
-
- - - - - +
+ + + + + First Name Required. Atleast 5 Characters. Not More Than 10 Characters. - - - Last Name Required. - - + - - - + Isactive - -
+
- Contact
- -
- - - email Address Required. - Invalid Email Address. - - - - - - Phone Number Required. - Invalid Phone Number. + Contact
+ +
+ + + email Address Required. + Invalid Email Address. + - - - - - -- - - {{s.name}} - - - State Required. - + + + Phone Number Required. + Invalid Phone Number. + + - - - -- - - {{c.name}} - - - city Required. - -
+ + + -- + + {{s.name}} + + + State Required. + + + + + -- + + {{c.name}} + + + city Required. + +
- - - - - - - - - - - - - - Role
- -
- - - -- - - {{types.name}} - - - Enitity Type Required - Enitity Type Required +
+ + + Role
+ +
+ + + -- + + {{types.name}} + + + Enitity Type Required + Enitity Type Required + + + + + -- + + {{ent.full_name}} + + + Lender Name Required. + + + + + -- + + {{ent.full_name}} + + Vendor Name Required. + + + + + + + {{role.role_name}} + + + +
+ User Role Required + User Role Required + + + + -- + + {{pd.team_name}} + + + + +
- - - - - - -- - - {{ent.full_name}} - - - Lender Name Required. - - - - - -- - - {{ent.full_name}} - - Vendor Name Required. - - - - - - - - {{role.role_name}} - - - -
- User Role Required - User Role Required - - - - -- - - {{pd.team_name}} - - - - -
- - - - + + +
- - +
- + diff --git a/ng6-seed/src/app/settings/users/register/register.component.scss b/ng6-seed/src/app/settings/users/register/register.component.scss index cdb065060..b05fce9d5 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.scss +++ b/ng6-seed/src/app/settings/users/register/register.component.scss @@ -1,16 +1,11 @@ - - // .mat-card-title{ - - // color: #fff; - // margin-left: 13px; - // background: rgba(157, 69, 124, 1); - // box-shadow: 0 4px 20px 0 rgba(157, 69, 124, 1), 0 7px 10px -5px rgba(157, 69, 124, 1);; - // display: inline-block; - // border-radius: 6px; - // padding: 10px; - // margin-top: -52px; - - - // } - - +.hoverdp:hover img { + opacity: 0.5; +} + +.hoverdp mat-icon{ + display:none; +} +.hoverdp:hover mat-icon{ + display:block; +} + \ No newline at end of file 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 9f5c03f20..20e3fbe8c 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -200,7 +200,7 @@ this.loader = true; this.AWS.adminUpdateuser(userData, data.record).subscribe(res => { this.loader =false; console.log(res); - Swal('user Created'); + Swal('User Created'); this.router.navigate(['setting/users/userlist']); }); } @@ -216,7 +216,7 @@ this.loader = true; });} this.users.saveRecords(res,userData).subscribe(res=>{ this.loader = false; - Swal('Update User'); + Swal('User Updated'); this.router.navigate(['setting/users/userlist']); //this.shared.redirectTo('settings/userListing'); delete this.AWS.localUserId;