diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index 9e0e227f6..4f8d69a11 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -13,7 +13,7 @@
- +
{{fullName}}
@@ -398,10 +398,10 @@ - - - + +
@@ -128,4 +128,5 @@ + diff --git a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts index f7d1c702e..7ecdb00de 100644 --- a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts @@ -1,7 +1,7 @@ import { Component, ViewChild, OnInit, ViewEncapsulation, EventEmitter, Output } from '@angular/core'; import { PdTrigerService } from '../pd-service/pd-triger.service'; import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; - +//import { MapPdViewComponent } from '../map-pd-view/map-pd-view.component'; @Component({ selector: 'app-list-pd', templateUrl: './list-pd.component.html', @@ -16,6 +16,7 @@ export class ListPdComponent implements OnInit { showAddComponent:boolean; showEditComponent:boolean; showViewComponent:boolean; + showMapViewComponent:boolean; errorMessage: any; public paginationList: any[] = []; // pagination variable details @@ -92,6 +93,7 @@ export class ListPdComponent implements OnInit { this.showAddComponent=false this.showEditComponent=false this.showViewComponent=false + this.showMapViewComponent=false this._pd.getPdDetails() .subscribe( data => { @@ -130,6 +132,12 @@ export class ListPdComponent implements OnInit { this.showViewComponent=!this.showViewComponent this.parentViewData=editID } + viewMapPdDetails(){ + this.showParentComponent=false + this.showAddComponent=false + this.showEditComponent=false + this.showMapViewComponent=!this.showMapViewComponent; +} updateParentComponent(event:string) { this.showParentComponent=!this.showParentComponent if(event=='1'){ @@ -158,6 +166,8 @@ export class ListPdComponent implements OnInit { } }, error => this.errorMessage = error); } + + pageChange(e) { console.log(e); } diff --git a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.html new file mode 100644 index 000000000..f9af0c590 --- /dev/null +++ b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.html @@ -0,0 +1,213 @@ +
+
+ + + + Search Options + Header subtitle + + + +
+ + + + + + + + + + + {{details.applicat_details[0].applicant_name}} + + + {{details.product_abbr}}/{{details.subproduct_abbr}} + + +

Lendor ID:{{details.lender_applicant_id}}

+

Lendor Name:{{details.lender_full_name}}

+

Date Of Initiation:{{details.pd_date_of_initiation}}

+

 {{details.loan_amount}} +

+

+ + +

+ + + + + + + + +

No Record Found ...

+ + + + + + + + +
+
+ + + + + +
+ + +
+
+
+
+ +
+ + + + All + +
+ + + + +

{{details.applicat_details[0].applicant_name}}

+ +

{{details.lender_full_name}} {{details.lender_applicant_id}}{{details.pd_date_of_initiation}}

+

{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}}  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}

+ + + +
+ + + +
+ + +
+ + + +

No Record Found ...

+ + + +
+ + + + + + + + + + In Progress + + + + + + Scheduled + + + + + + Completed + + + + + + + +
diff --git a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.scss b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.scss new file mode 100644 index 000000000..3944ca03d --- /dev/null +++ b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.scss @@ -0,0 +1,34 @@ +@import "../../../assets/styles/scss/material.variables"; + +:host { + margin-left: -5px; + margin-right: -5px; + margin-top: -5px; + display: block; + height: 100%; +} +.sebm-google-map-container { + width: 100%; + height: 500px; + display: flex; +} + +$mat-toolbar-height-desktop: 64px !default; +$mat-toolbar-height-mobile-portrait: 56px !default; +$mat-toolbar-height-mobile-landscape: 48px !default; + +.mat-card-top { + margin-top: -($mat-toolbar-height-desktop); +} + +@media ($mat-xsmall) and (orientation: portrait) { + .mat-card-top { + margin-top: -($mat-toolbar-height-mobile-portrait); + } +} + +@media ($mat-small) and (orientation: landscape) { + .mat-card-top { + margin-top: -($mat-toolbar-height-mobile-landscape); + } +} \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.spec.ts b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.spec.ts new file mode 100644 index 000000000..1d70a89d6 --- /dev/null +++ b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MapPdViewComponent } from './map-pd-view.component'; + +describe('MapPdViewComponent', () => { + let component: MapPdViewComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MapPdViewComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MapPdViewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.ts b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.ts new file mode 100644 index 000000000..441823679 --- /dev/null +++ b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.ts @@ -0,0 +1,54 @@ +import { Component, ViewChild, OnInit } from '@angular/core'; +import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; + +import { NotifierService } from 'angular-notifier'; +import { PdTrigerService } from '../pd-service/pd-triger.service'; + + +@Component({ + selector: 'app-map-pd-view', + templateUrl: './map-pd-view.component.html', + styleUrls: ['./map-pd-view.component.scss'] +}) +export class MapPdViewComponent implements OnInit { + lat = -34.397; + lng = 150.644; + recordStatus: boolean; + errorMessage: any; + // pagination variable details + length = 50; + pageIndex = 0; + pageSize = 10; + pageEvent: PageEvent; +// data source variable details +pdListData = null; +public dataLength: number; +public dataSource = new MatTableDataSource(); +@ViewChild(MatPaginator) paginator: MatPaginator; +@ViewChild(MatSort) sort: MatSort; +pdList:any[] = []; + constructor(private _pd: PdTrigerService) { + + } + + ngOnInit() { + this.recordStatus=false + this._pd.getPdDetails() + .subscribe( + data => { + if (data.status == 200) { + this.pdList = data.records; + this.pdListData = data.records; + this.dataLength = data.records.length; + this.dataSource.data = this.pdListData; + + } + else{ + this.pdList=[]; + this.dataLength = null; + this.recordStatus=true; + } + }, error => this.errorMessage = error); + } + +} diff --git a/ng6-seed/src/app/pd-triger/pd-triger.module.ts b/ng6-seed/src/app/pd-triger/pd-triger.module.ts index ce716f451..4ed7f07a8 100644 --- a/ng6-seed/src/app/pd-triger/pd-triger.module.ts +++ b/ng6-seed/src/app/pd-triger/pd-triger.module.ts @@ -8,7 +8,7 @@ import { MatRadioModule, MatButtonModule,MatTableModule,MatPaginatorModule, MatProgressBarModule,MatDialogModule, MatSortModule, - MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule } from '@angular/material'; + MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule, MatExpansionModule } from '@angular/material'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; @@ -19,6 +19,7 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; +import { AgmCoreModule } from '@agm/core'; import 'hammerjs'; import { PdTrigerRoutes } from './pd-triger-routing.module'; @@ -30,6 +31,7 @@ import { ViewPdComponent } from './view-pd/view-pd.component'; import { EditPdMasterComponent } from './edit-pd-master/edit-pd-master.component'; import { EditPdApplicantComponent } from './edit-pd-applicant/edit-pd-applicant.component'; import { PdAllocationComponent } from './pd-allocation/pd-allocation.component'; +import { MapPdViewComponent } from './map-pd-view/map-pd-view.component'; /** * Custom angular notifier options */ @@ -95,9 +97,10 @@ const pdCustomNotifierOptions: NotifierOptions = { FileUploadModule, TreeModule, MatDialogModule,MatSortModule, - NgxMatSelectSearchModule,MatTooltipModule, + NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule, + AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), ], - declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent], + declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent, MapPdViewComponent], entryComponents:[PdAllocationComponent], providers: [PdTrigerService] }) diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html index 41aef2ea3..d7fb9940b 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html @@ -17,7 +17,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts index 6b84feb28..fe0195e1b 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts @@ -31,6 +31,9 @@ export class BranchListComponent implements OnInit { userdata2:any = []; color = 'primary'; + // pagination variable details + pageSize = 10; + // changed(id: number,isactive : number) { // console.log('Id',id); // console.log('Isactive',isactive) @@ -77,7 +80,7 @@ export class BranchListComponent implements OnInit { } }) } - + /**Popup for ADD Branch */ addBranch() { this.isPopupOpened = true; diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html index 3d4975b76..c59e33199 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html @@ -161,10 +161,10 @@ - + - + diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts index 89d6eede7..0a9c73892 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts @@ -29,6 +29,8 @@ export class CityListComponent implements OnInit { userData = null; color = 'primary'; +// pagination variable details +pageSize = 10; public dataLength: number; public dataSource = new MatTableDataSource(); diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html index 2b024c19c..12e107a52 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html @@ -140,7 +140,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts index f54fef2d4..df441e9c8 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts @@ -30,6 +30,8 @@ export class CommentsOnLocalityListComponent implements OnInit { CommentsOnLocalityList: any = []; userData = null; color = 'primary'; + // pagination variable details + pageSize = 10; public dataLength: number; public dataSource = new MatTableDataSource(); diff --git a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html index b49443cc7..6ecc37adb 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html @@ -137,7 +137,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts index 53da0e3c8..894daa16b 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts @@ -38,7 +38,9 @@ export class CompanyListComponent implements OnInit { CompanyList: any = []; userData = null; color = 'primary'; - + // pagination variable details + pageSize = 10; + public dataLength: number; public dataSource = new MatTableDataSource(); displayedColumns = ['serialno', 'name', 'city_name', 'state_name' , 'actions']; diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html index 136c52c61..de991df88 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html @@ -140,7 +140,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts index 62bf47008..7aa955569 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts @@ -30,6 +30,8 @@ export class CustomerBehaviourListComponent implements OnInit { noRecordFound: boolean = false; userData = null; color = 'primary'; +// pagination variable details +pageSize = 10; public dataLength: number; public dataSource = new MatTableDataSource(); diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html index 00a5fbb45..6d7d5d5ea 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html @@ -137,7 +137,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts index 93a822eaa..af7d91e8c 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts @@ -28,6 +28,9 @@ export class CustomerSegmentListComponent implements OnInit { CustomerSegmentList: any = []; noRecordFound: boolean = false; color = 'primary'; + // pagination variable details + pageSize = 10; + // displayedColumns = ['customer_segment_id', 'abbr', 'name', 'isactive','actions']; userData = null; diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html index ff86fe450..eaf71e234 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html @@ -136,7 +136,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts index 0b8ec7447..e9d8a0194 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts @@ -29,6 +29,8 @@ export class DesignationListComponent implements OnInit { noRecordFound: boolean = false; DesignationList: any = []; color = 'primary'; +// pagination variable details +pageSize = 10; userData = null; diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html index 2fae291cd..0b5e5d7ef 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html @@ -143,7 +143,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts index 6b09aad45..13ec1b4d0 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts @@ -30,7 +30,9 @@ export class FrequencyListComponent implements OnInit { FrequencyList: any = []; noRecordFound: boolean = false; color = 'primary'; - + // pagination variable details + pageSize = 10; + userData = null; public dataLength: number; diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html index 13476f697..9e1baa7b0 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html @@ -73,7 +73,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts index ae18cadae..9d87e5dfe 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts @@ -32,6 +32,9 @@ export class LenderHierarchyListComponent implements OnInit { loader: boolean = false; LenderHierarchyList: any = []; color = 'primary'; + // pagination variable details + pageSize = 10; + //displayedColumns = ['lender_hierarchy_id', 'lender_hierarchy','isactive','actions']; userData = null; diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html index cb51c0c42..743410f48 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html @@ -151,7 +151,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts index ae9e016d6..c5c6666e1 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts @@ -31,6 +31,9 @@ export class MembersOccupationListComponent implements OnInit { loader: boolean = false; MemberOccupationList: any = []; color = 'primary'; + // pagination variable details + pageSize = 10; + userData = null; noRecordFound: boolean = false; diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html index 7a97c0acc..702f0cc0a 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html @@ -80,7 +80,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts index 629b200a8..8dbb8a3fe 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts @@ -29,6 +29,9 @@ export class PdAllocationTypeListComponent implements OnInit { noRecordFound: boolean = false; dataSourceRecords = null; color = 'primary'; + // pagination variable details + pageSize = 10; + private notifier: NotifierService; public dataLength: number; diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html index dde60b4af..122e67d21 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html @@ -130,7 +130,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts index c042bdbf0..ceab4afa1 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts @@ -37,6 +37,9 @@ export class PdLocationApproachListComponent implements OnInit { loader: boolean = false; PdLocationApproachList: any = []; color = 'primary'; + // pagination variable details + pageSize = 10; + userData = null; noRecordFound: boolean = false; public dataLength: number; diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html index 86299fe02..190dc380f 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html @@ -130,7 +130,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts index daf92efde..99306684c 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts @@ -30,6 +30,9 @@ export class PdTypeListComponent implements OnInit { PDTypeList: any = []; noRecordFound: boolean = false; color = 'primary'; + // pagination variable details + pageSize = 10; + userData = null; public dataLength: number; diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html index 0ae762158..90577dc03 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html @@ -82,7 +82,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts index 44a27719a..a21203975 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts @@ -31,6 +31,8 @@ export class ProductListComponent implements OnInit { noRecordFound: boolean = false; userData = null; color = 'primary'; + // pagination variable details + pageSize = 10; public dataLength: number; public dataSource = new MatTableDataSource(); diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html index c0fbd3c21..45ac1b8a5 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html @@ -74,7 +74,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts index 67e68cf90..105002311 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts @@ -29,6 +29,8 @@ export class QuestionCategoryListComponent implements OnInit { noRecordFound: boolean = false; userData = null; color = 'primary'; + // pagination variable details + pageSize = 10; public dataLength: number; public dataSource = new MatTableDataSource(); diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html index cd7239a84..7139f4fd2 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html @@ -11,7 +11,7 @@ - + @@ -58,6 +58,7 @@ - + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts index 8c8b04848..96484306a 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts @@ -32,6 +32,8 @@ export class RegionsListComponent implements OnInit { noRecordFound: boolean = false; color = 'primary'; userData = null; + // pagination variable details + pageSize = 10; public dataLength: number; public dataSource = new MatTableDataSource(); diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html index ffcc12601..bfa0b81b6 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html @@ -112,7 +112,7 @@ - Relation Ship Name + Relationship Name {{row.name}} @@ -153,7 +153,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts index ae8f7d6ab..d3d37ad33 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts @@ -29,6 +29,9 @@ export class RelationShipListComponent implements OnInit { RelationShipList: any = []; noRecordFound: boolean = false; color = 'primary'; + // pagination variable details + pageSize = 10; + //displayedColumns = ['relationship_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //relationship_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html index c252f5ba4..2ea2da2ee 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html @@ -176,7 +176,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts index d6cea1399..3fe180cd1 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts @@ -29,6 +29,9 @@ export class StatesListComponent implements OnInit { loader: boolean = false; StateList: any = []; color = 'primary'; + // pagination variable details + pageSize = 10; + noRecordFound: boolean = false; //displayedColumns = ['states_id', 'fk_city_id', 'name', 'createdon', 'fk_createdby', 'updatedon', 'fk_updatedby', 'isactive','actions']; diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html index e8a483667..5c08ad0b6 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html @@ -165,7 +165,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts index 2f28e4056..ee31d5e89 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts @@ -33,6 +33,8 @@ export class SubProductListComponent implements OnInit { userData = null; noRecordFound: boolean = false; + // pagination variable details + pageSize = 10; public dataLength: number; public dataSource = new MatTableDataSource(); diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html index b40fde58c..925b5c249 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html @@ -149,7 +149,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts index 9ccc07c45..473db1820 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts @@ -26,7 +26,10 @@ export class TitleListComponent implements OnInit { loader: boolean = false; TitleList: any = []; noRecordFound: boolean = false; - color = 'primary'; + color = 'primary'; + // pagination variable details + pageSize = 10; + //displayedColumns = ['title_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //title_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html index ac386e22a..11659f5a2 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html @@ -143,7 +143,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts index 43d90a2ef..7b3c2120f 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts @@ -33,6 +33,9 @@ export class ActivityListComponent implements OnInit { userData = null; noRecordFound: boolean = false; color = 'primary'; + // pagination variable details + pageSize = 10; + public dataLength: number; public dataSource = new MatTableDataSource(); displayedColumns = ['serialno','name','actions', 'isactive']; diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html index 7846b4bba..738cca2ff 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html @@ -70,7 +70,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts index e581db38e..5a93a0dce 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts @@ -33,6 +33,9 @@ export class UomListComponent implements OnInit { loader: boolean = false; UOMList: any = []; color = 'primary'; + // pagination variable details + pageSize = 10; + //displayedColumns = ['uom_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //uom_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive diff --git a/ng6-seed/src/assets/styles/scss/_app.variables.scss b/ng6-seed/src/assets/styles/scss/_app.variables.scss index cab788b37..406ea8711 100644 --- a/ng6-seed/src/assets/styles/scss/_app.variables.scss +++ b/ng6-seed/src/assets/styles/scss/_app.variables.scss @@ -37,7 +37,7 @@ $main-bg-color:linear-gradient(58deg, #f44336, #673ab7); // // Typography // -$font-size-base: 0.875rem !default; +$font-size-base: 1.2rem !default; $font-weight-base: 400 !default; $font-weight-medium: 500 !default; $font-weight-bold: 600 !default; diff --git a/ng6-seed/src/assets/styles/scss/_material.variables.scss b/ng6-seed/src/assets/styles/scss/_material.variables.scss index c218bf189..160dee2cb 100644 --- a/ng6-seed/src/assets/styles/scss/_material.variables.scss +++ b/ng6-seed/src/assets/styles/scss/_material.variables.scss @@ -4,7 +4,7 @@ @import '~@angular/material/theming'; /**-- $primary: mat-palette($mat-deep-purple); --*/ -$primary: mat-palette($mat-light-blue); +$primary: mat-palette($mat-red); $accent: mat-palette($mat-amber, A200, A100, A400); $warn: mat-palette($mat-red); $theme: mat-light-theme($primary, $accent, $warn); @@ -24,5 +24,5 @@ $dark-foreground: map-get($dark-theme, foreground); - + diff --git a/ng6-seed/src/assets/styles/scss/core/_main-header.scss b/ng6-seed/src/assets/styles/scss/core/_main-header.scss index 38eee1653..c33d92320 100644 --- a/ng6-seed/src/assets/styles/scss/core/_main-header.scss +++ b/ng6-seed/src/assets/styles/scss/core/_main-header.scss @@ -91,10 +91,10 @@ mat-toolbar { .head-menu { font-size: 1.3rem !important; border-bottom: 2px solid rgba(255, 255, 255, 0.2); - background: linear-gradient(58deg, #f44336, #673ab7); + background: linear-gradient(58deg, #ca2126, #ca2126); color: #fff; &:hover { - background: linear-gradient(58deg, #f44336, #673ab7); + background: linear-gradient(58deg, #ca2126, #673ab7); } } img { diff --git a/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss b/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss index bed7bdf91..67cb61bff 100644 --- a/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss +++ b/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss @@ -39,7 +39,7 @@ flex-direction: row; align-items: center; height: 48px; - padding: 0 16px; + padding: 0 8px; color: $sidebar-menu-color; } .sub-menu { @@ -480,7 +480,7 @@ .sidebar-red { .sidebar-panel { .bg-overlay { - background: rgba(244, 67, 54, 0.8)!important; + background: rgb(227, 31, 38)!important; } } } diff --git a/ng6-seed/src/assets/styles/scss/material/_buttons.scss b/ng6-seed/src/assets/styles/scss/material/_buttons.scss index 1a100dade..bde7a368f 100644 --- a/ng6-seed/src/assets/styles/scss/material/_buttons.scss +++ b/ng6-seed/src/assets/styles/scss/material/_buttons.scss @@ -11,6 +11,10 @@ $mat-fab-padding: 16px !default; } } +[mat-raised-button] { + color:red; +} + [mat-icon-button] { &[mat-button-sm] { padding: 0; diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html index 9ac4d4685..3a317457e 100644 --- a/ng6-seed/src/index.html +++ b/ng6-seed/src/index.html @@ -45,7 +45,7 @@ .sk-cube-grid .sk-cube { width: 33%; height: 33%; - background: #673ab7; + background: rgb(227, 31, 38); float: left; -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out;