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

merge : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-12-05 16:02:32 +05:30
parent 154d0f90bd
commit d168270d10
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ng6-seed/src/app/dashboard/dashboard.component.html
View File

@ -80,11 +80,9 @@
<div *ngIf="total3 != 0" class="donut-inner"><span>Tele - {{total3}}</span></div>
</div>
</div>
<<<<<<< HEAD
<div fxLayout="row" class="pt-3">
=======
<div fxLayout="row" class="pt-3" *ngIf="total3 != 0 && total2 != 0 && total1 != 0">
>>>>>>> c62d273c7a10f4df22b027dc9664dc37e83c93fa
<div fxFlex.gt-sm="100" fxFlex="100" style="text-align:center">
<ul class="lengend-list">
<li class="lengend-element"><span class="oval" style="background-color:#c1c1c1"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&nbsp; Draft</li>

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
View File

@ -296,7 +296,7 @@
<mat-option value="agricultural_income">Agricultural Income</mat-option>
<mat-option value="dividend_income">Dividend Income</mat-option>
<mat-option value="others">Others</mat-option> -->
</mat-select>
<!-- </mat-select>
</mat-form-field>
<mat-form-field *ngIf="details.get('source').value == 5 ">
<input matInput placeholder="Specify Others Source"
@ -309,7 +309,7 @@
<mat-form-field>
<mat-select placeholder="Frequency" formControlName="frequency" required>
<mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
</mat-select>
</mat-select> --
</mat-form-field>-->
<!-- {{otherIncomeForm.controls.frequency.value}} -->