Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Master Changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-05 12:53:31 +05:30
parent 00910adc90
commit a05f4ac411
5 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html
View File

@ -116,12 +116,21 @@
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row> <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row> <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table> </mat-table>
<mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator> <mat-toolbar>
<mat-toolbar-row fxLayout >
<button class="mr-1 mb-1 save-button" fxFlex="10%" fxLayoutAlign="center" mat-raised-button color="primary" class="hover-icon" matTooltip="Save Data" matTooltipPosition="above" (click)="SaveData(dataSource)">Save</button>
<!-- <span class="empty-spacer"></span> -->
<mat-paginator fxFlex="90%" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</mat-toolbar-row>
</mat-toolbar>
<!-- <mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator> -->
</div> </div>
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
<br> <br>
<button mat-icon-button color="primary" class="hover-icon" matTooltip="Save Data" matTooltipPosition="above" (click)="SaveData(dataSource)"><mat-icon>save</mat-icon></button>
</mat-card-content> </mat-card-content>

15
ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.scss
View File

@ -3,6 +3,21 @@
margin: 10px; margin: 10px;
} }
/** Table Toolbar CSS - spacing between SaveButton and Pagination **/
.empty-spacer{
//min-width: 300px;
width: 46%;
overflow: auto;
}
/** Table Toolbar CSS - whole Toolbar Padding removed **/
.mat-toolbar-row{
padding: 0 !important;
}
// .save-button{
// padding: 0 8px !important;
// }
/** Table CSS - Dislplay Data */ /** Table CSS - Dislplay Data */
.mat-table { .mat-table {
display: table; display: table;

4
ng6-seed/src/app/settings/masters/masters.component.html
View File

@ -80,9 +80,9 @@
<div *ngIf="masterCtrl.value =='master-18'"> <div *ngIf="masterCtrl.value =='master-18'">
<app-lender-hierarchy-list></app-lender-hierarchy-list> <app-lender-hierarchy-list></app-lender-hierarchy-list>
</div> </div>
<div *ngIf="masterCtrl.value =='master-19'"> <!-- <div *ngIf="masterCtrl.value =='master-19'">
<app-company-list></app-company-list> <app-company-list></app-company-list>
</div> </div> -->
<div *ngIf="masterCtrl.value =='master-20'"> <div *ngIf="masterCtrl.value =='master-20'">
<app-question-category-list></app-question-category-list> <app-question-category-list></app-question-category-list>
</div> </div>

2
ng6-seed/src/app/settings/masters/masters.component.ts
View File

@ -118,7 +118,7 @@ export class MastersComponent implements OnInit {
{id: 'master-16',name: 'Customer Segment'}, {id: 'master-16',name: 'Customer Segment'},
{id: 'master-17',name: 'Designation'}, {id: 'master-17',name: 'Designation'},
{id: 'master-18',name: 'Lender Hierarchy'}, {id: 'master-18',name: 'Lender Hierarchy'},
{id: 'master-19',name: 'Company Details'}, // {id: 'master-19',name: 'Company Details'},
{id: 'master-20',name: 'Question Category'}, {id: 'master-20',name: 'Question Category'},
{id: 'master-21',name: 'PD Type'}, {id: 'master-21',name: 'PD Type'},
{id: 'master-22',name: 'Approach to PD location'}, {id: 'master-22',name: 'Approach to PD location'},

12
ng6-seed/src/app/settings/service/masters/masters.service.ts
View File

@ -275,18 +275,18 @@ editPDAllocationType(Records: any,MasterName:string): Observable<any> {
* argument 'res' : Response * argument 'res' : Response
*/ */
addCompanyDetails(Records: any): Observable<any> { addCompanyDetails(Records: any): Observable<any> {
let formData = new FormData(); //let formData = new FormData();
Records.fk_createdby = this._aws.getlocale();//to get user id for who is created the Records Records.fk_createdby = this._aws.getlocale();//to get user id for who is created the Records
Records.company_master_createdon = currentdate;//to get Current date and Time for when the Record is created Records.company_master_createdon = currentdate;//to get Current date and Time for when the Record is created
// var ArrayData = { "master_name":'COMPANY', var ArrayData = { "master_name":'COMPANY',
// "records": Records } "records": Records }
formData.append('logo',Records.logo); // formData.append('logo',Records.logo);
formData.append('records',JSON.stringify(Records)); // formData.append('records',JSON.stringify(Records));
return this._http.post<any>(this.apiUrl+"saveCompany", formData) return this._http.post<any>(this.apiUrl+"saveCompany", ArrayData)
.pipe( .pipe(
catchError(this.handleError('role', [])) catchError(this.handleError('role', []))
) )