Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

[BUG]Valideaza Datele button displayed twice[#136] #188

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BUG]Valideaza Datele button displayed twice[#136] #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 13 additions & 27 deletions ...sations/organisations/components/organisation-details/organisation-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
</div>
<div class="col-md-3 col-sm-3 col-xs-3">
<button *ngIf = "authService.is('NGO')" class="d-none d-md-inline pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span>&nbsp;&nbsp;Validează datele</button>
class="fa fa-check-square"></span>&nbsp;&nbsp;Validează datele</button>
<button *ngIf = "authService.is('NGO')" class="d-md-none pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span></button>
class="fa fa-check-square"></span></button>
</div>
</div>
<div class="table-responsive-md">
Expand All @@ -102,7 +102,7 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
</thead>
<tbody>
<tr *ngFor="let res of volunteersData">

<td>{{res.name}}</td>
<td>{{res.city.name}}, {{res.county.name}}</td>
<td>
Expand All @@ -123,11 +123,11 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
{{ course.obtained | date: 'dd.MM.yyyy' }}
</p>
</td>

<td *ngIf="currentVolunteerId !== res._id">
{{ res.courses[0]?.obtained | date: 'dd.MM.yyyy'}}
</td> -->

</table>
</td>
<td>
Expand All @@ -152,13 +152,6 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
(pageChange)="getVolunteers()" [collectionSize]="volunteerPager.total">
</ngb-pagination>
</div>
<div class="col-md-3 col-sm-3 col-xs-3">
<button *ngIf = "authService.is('NGO')" class="d-none d-md-inline pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span>&nbsp;&nbsp;Validează datele</button>
<button *ngIf = "authService.is('NGO')" class="d-md-none pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span></button>
</div>

</div>
</div>
<ng-template #noVolunteers>
Expand Down Expand Up @@ -189,7 +182,7 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
[propertyMap]="propertyMap" >
<ng-template let-option="option">
<span [ngClass]="{'pl-3': option.parent_id!=='0'}">
{{option.name}}
{{option.name}}
</span>
</ng-template>
</ngx-multiselect>
Expand All @@ -206,12 +199,12 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
</div>
<div class="col-md-3 col-sm-3 col-xs-3">
<button *ngIf = "authService.is('NGO')" class="d-none d-md-inline pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span>&nbsp;&nbsp;Validează datele</button>
class="fa fa-check-square"></span>&nbsp;&nbsp;Validează datele</button>
<button *ngIf = "authService.is('NGO')" class="d-md-none pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span></button>
</div>
class="fa fa-check-square"></span></button>
</div>
</div>

<div class="table-responsive-md">
<table class="table customTable table-sm mb-1">
<thead>
Expand Down Expand Up @@ -241,11 +234,11 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
<span class="fa fa-edit"></span>&nbsp;Editează</button>
<button class="d-lg-none m-1 pull-right btn btn-info"
[routerLink]="['/resources/edit/', res._id]">
<span class="fa fa-edit"></span></button>
<span class="fa fa-edit"></span></button>
<button class="btn btn-danger m-1 d-none d-lg-block" (click)="deleteRes(res._id)">
<span class="fa fa-trash-o"></span>&nbsp;Șterge</button>
<button class="d-lg-none m-1 pull-right btn btn-danger" (click)="deleteRes(res._id)"><span
class="fa fa-trash-o"></span></button>
class="fa fa-trash-o"></span></button>
<!-- <button class="btn btn-info m-1 d-md-none"
(click)="viewdetails(res)">
<span class="fa fa-eye"></span></button>
Expand All @@ -261,14 +254,7 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
(pageChange)="getResources()" [collectionSize]="resourcePager.total">
</ngb-pagination>
</div>
<div class="col-md-3 col-sm-3 col-xs-3">
<button *ngIf = "authService.is('NGO')" class="d-none d-md-inline pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span>&nbsp;&nbsp;Validează datele</button>
<button *ngIf = "authService.is('NGO')" class="d-md-none pull-right btn btn-info" (click)="validateinfo()"><span
class="fa fa-check-square"></span></button>
</div>
</div>

</div>
</div>
<ng-template #noResources>
Expand All @@ -282,4 +268,4 @@ <h5 class="col-md-12" style="margin-top:5px; font-weight: 500">Persoană de cont
</ngb-tab>
</ngb-tabset>
</div>
</div>
</div>