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

Fairoj : General info table dropdown display issue fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-12-30 13:22:44 +05:30
parent ee1262fcae
commit 3264e91cf1
3 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts
View File

@ -70,7 +70,7 @@ export class PdCollectedDocsComponent implements OnInit {
// requirement_control.removeAt(index); // requirement_control.removeAt(index);
const requirement_control = <FormArray>this._EditPDCollectedDocsForm.controls['docs_to_be_collected']; const requirement_control = <FormArray>this._EditPDCollectedDocsForm.controls['docs_to_be_collected'];
if(requirement_control.value[index].add_req_id != ''){ if(requirement_control.value[index].pd_doc_to_be_collect_id != ''){
requirement_control.controls[index]['controls'].isactive.setValue(0) requirement_control.controls[index]['controls'].isactive.setValue(0)
} }
else{ else{

30
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
View File

@ -70,14 +70,15 @@
<ng-container matColumnDef="qualification"> <ng-container matColumnDef="qualification">
<mat-header-cell *matHeaderCellDef> Qualification </mat-header-cell> <mat-header-cell *matHeaderCellDef> Qualification </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-select placeholder="Qualification" formControlName="qualification" <mat-form-field class="table-field" floatLabel="never" style="width: 80%">
style="width: 75%;"> <mat-select placeholder="Qualification" formControlName="qualification">
<mat-option *ngFor="let qual of qualificationList" <mat-option *ngFor="let qual of qualificationList"
[value]="qual.qualification_id">{{qual.qualification_name}}</mat-option> [value]="qual.qualification_id">{{qual.qualification_name}}</mat-option>
</mat-select> </mat-select>
<mat-error style="font-size:65%" <mat-error style="font-size:65%"
*ngIf="details.controls['qualification'].invalid">Qualification Required *ngIf="details.controls['qualification'].invalid">Qualification Required
</mat-error> </mat-error>
</mat-form-field>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="course_name"> <ng-container matColumnDef="course_name">
@ -281,14 +282,16 @@
<ng-container matColumnDef="relation"> <ng-container matColumnDef="relation">
<mat-header-cell *matHeaderCellDef> Relation </mat-header-cell> <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-form-field class="table-field" floatLabel="never" style="width: 75%;" >
<mat-select placeholder="Relation" formControlName="relationship" <mat-select placeholder="Relation" formControlName="relationship"
style="width: 75%;" (selectionChange)="updatePersonalRelation(i)"> (selectionChange)="updatePersonalRelation(i)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option [value]="member.relationship_id" <mat-option [value]="member.relationship_id"
*ngFor="let member of relationShipList">{{member.name *ngFor="let member of relationShipList">{{member.name
+ ' of' | titlecase}}</mat-option> + ' of' | titlecase}}</mat-option>
<mat-option value="0"> Not Related </mat-option> <mat-option value="0"> Not Related </mat-option>
</mat-select> </mat-select>
</mat-form-field>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -296,8 +299,9 @@
<mat-header-cell *matHeaderCellDef> Relationship To </mat-header-cell> <mat-header-cell *matHeaderCellDef> Relationship To </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i" <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"
[style.visibility]="_generalForm.controls.persons_with_relationships.value[i].relationship==0 ? 'hidden':'visible'"> [style.visibility]="_generalForm.controls.persons_with_relationships.value[i].relationship==0 ? 'hidden':'visible'">
<mat-form-field class="table-field" floatLabel="never" style="width: 75%">
<mat-select placeholder="Applicant" formControlName="relation_to" <mat-select placeholder="Applicant" formControlName="relation_to"
style="width: 75%;"
[disabled]="_generalForm.controls.persons_with_relationships.value[i].relationship==0"> [disabled]="_generalForm.controls.persons_with_relationships.value[i].relationship==0">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<!-- getRelationRestrict(_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id,_generalForm.controls.persons_with_relationships.value,individualsList)" --> <!-- getRelationRestrict(_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id,_generalForm.controls.persons_with_relationships.value,individualsList)" -->
@ -307,7 +311,7 @@
</mat-option> </mat-option>
<mat-option value="0"> Not Related </mat-option> <mat-option value="0"> Not Related </mat-option>
</mat-select> </mat-select>
</mat-form-field>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -336,21 +340,22 @@
<ng-container matColumnDef="applicant_name"> <ng-container matColumnDef="applicant_name">
<mat-header-cell *matHeaderCellDef> Applicant </mat-header-cell> <mat-header-cell *matHeaderCellDef> Applicant </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-form-field class="table-field" floatLabel="never" style="width: 75%">
<mat-select placeholder="Applicant" formControlName="applicant_name" <mat-select placeholder="Applicant" formControlName="applicant_name"
style="width: 75%;"> >
<mat-option *ngFor="let bothC of individualsListBothCase" <mat-option *ngFor="let bothC of individualsListBothCase"
[value]="bothC.pd_co_applicant_id">{{bothC.applicant_name [value]="bothC.pd_co_applicant_id">{{bothC.applicant_name
| titlecase}}</mat-option> | titlecase}}</mat-option>
</mat-select> </mat-select>
</mat-form-field>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="company_relationship"> <ng-container matColumnDef="company_relationship">
<mat-header-cell *matHeaderCellDef> Relation </mat-header-cell> <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-form-field class="table-field" floatLabel="never" style="width: 75%">
<mat-select placeholder="Relation" formControlName="company_relationship" <mat-select placeholder="Relation" formControlName="company_relationship"
style="width: 75%;" (selectionChange)="updateCompanyRelation(i)"> (selectionChange)="updateCompanyRelation(i)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let comrelShip of companyRelationShipList" <mat-option *ngFor="let comrelShip of companyRelationShipList"
[value]="comrelShip.company_relationship_id"> [value]="comrelShip.company_relationship_id">
@ -358,15 +363,16 @@
</mat-option> </mat-option>
<mat-option value="0"> Not Applicable </mat-option> <mat-option value="0"> Not Applicable </mat-option>
</mat-select> </mat-select>
</mat-form-field>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="relation_to_company"> <ng-container matColumnDef="relation_to_company">
<mat-header-cell *matHeaderCellDef> Company </mat-header-cell> <mat-header-cell *matHeaderCellDef> Company </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-form-field class="table-field" floatLabel="never" style="width: 75%">
<mat-select placeholder="Company / Firm" formControlName="relation_to_company" <mat-select placeholder="Company / Firm" formControlName="relation_to_company"
style="width: 75%;"
[style.visibility]="_generalForm.controls.company_with_relationships.value[i].company_relationship==0 ? 'hidden':'visible'"> [style.visibility]="_generalForm.controls.company_with_relationships.value[i].company_relationship==0 ? 'hidden':'visible'">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let comp of companyList" <mat-option *ngFor="let comp of companyList"
@ -375,7 +381,7 @@
</mat-option> </mat-option>
<mat-option value="0"> Not Applicable </mat-option> <mat-option value="0"> Not Applicable </mat-option>
</mat-select> </mat-select>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button
mat-icon-button (click)="removeCompanyRelationship(i)" mat-icon-button (click)="removeCompanyRelationship(i)"
matTooltip="Remove Company Relationship" matTooltipPosition="below"> matTooltip="Remove Company Relationship" matTooltipPosition="below">

21
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
View File

@ -152,3 +152,24 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7);
} }
} }
} }
::ng-deep .table-field{
// margin: 0;
// padding: 0;
.mat-form-field-underline {
background-color: blue;
height: 0px;
display: none;
}
.mat-form-field-wrapper{
padding-bottom: 0px;
}
.mat-form-field-infix{
// padding: 0px;
border-top: 0px;
// .mat-form-field-label-wrapper{
// display: none;
// }
}
}