X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Fusers%2Fproject-role%2FProjectRoleComponent.html;h=31f71e432d2b62ffe09a394ae2d22a6e9e2b7696;hb=1132258413328f80cb8b2453dc4b3d24318bd3e5;hp=c093f372fbc0551facb30c6d1c3abb11083db9d0;hpb=3b4814aa2d3dec621dadb52f058ba95a3dc3a86a;p=osm%2FNG-UI.git

diff --git a/src/app/users/project-role/ProjectRoleComponent.html b/src/app/users/project-role/ProjectRoleComponent.html
index c093f37..31f71e4 100644
--- a/src/app/users/project-role/ProjectRoleComponent.html
+++ b/src/app/users/project-role/ProjectRoleComponent.html
@@ -29,25 +29,43 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
                     <i class="fas fa-plus-circle"></i> {{'PAGE.USERS.ADDMAPPINGS' | translate}}</button>
             </div>
         </div>
-        <label class="col-sm-12 col-form-label mandatory-label" [ngClass]="{'text-danger': projectRoleForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' | translate}}</label>
+        <label class="col-sm-12 col-form-label mandatory-label"
+            [ngClass]="{'text-danger': projectRoleForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' |
+            translate}}</label>
         <div *ngFor="let params of getControls(); let i = index;" [formGroupName]="i">
-            <div class="form-group row">
-                <label class="col-sm-2 col-form-label" for="project_{{i}}">{{'PROJECT' | translate}}*</label>
-                <div class="col-sm-3">
-                    <ng-select placeholder="{{'SELECT' | translate}}" [items]="projects" bindLabel="name"
-                        bindValue="name" formControlName="project_name" id="project_{{i}}"
-                        [ngClass]="{ 'is-invalid': submitted && params.controls.project_name.errors }"></ng-select>
-                </div>
-                <label class="col-sm-2 col-form-label" for="roles_{{i}}">{{'ROLES' | translate}}*</label>
-                <div class="col-sm-4">
-                    <ng-select placeholder="{{'SELECT' | translate}}" [items]="roles" bindLabel="name" bindValue="name"
-                        formControlName="role_name" id="roles_{{i}}"
-                        [ngClass]="{ 'is-invalid': submitted && params.controls.role_name.errors }"></ng-select>
-                </div>
-                <div class="col-sm-1">
-                    <button type="button" class="btn btn-sm btn-danger remove-mapping" (click)="removeMapping(i)">
-                        <i class="fas fa-times-circle"></i>
-                    </button>
+            <div class="card bg-light">
+                <div class="card-body">
+                    <div class="form-group row">
+                        <label class="col-sm-3 col-md-3 col-form-label" for="project_{{i}}">{{'PROJECT' | translate}}*</label>
+                        <div class="col-sm-8 col-md-8">
+                            <ng-select placeholder="{{'SELECT' | translate}}" [items]="projects" bindLabel="name"
+                                bindValue="name" formControlName="project_name" id="project_{{i}}"
+                                [ngClass]="{ 'is-invalid': submitted && params.controls.project_name.errors }">
+                            </ng-select>
+                        </div>
+                        <label class="col-sm-3 col-md-3 col-form-label" for="roles_{{i}}">{{'ROLES' |
+                            translate}}*</label>
+                        <div class="col-sm-8 col-md-8">
+                            <ng-select placeholder="{{'SELECT' | translate}}" [items]="roles" bindLabel="name"
+                                bindValue="name" formControlName="role_name" id="roles_{{i}}"
+                                [ngClass]="{ 'is-invalid': submitted && params.controls.role_name.errors }"></ng-select>
+                        </div>
+                        <div class="col-sm-1"
+                            *ngIf="userDetails.project_role_mappings[i] ? userDetails.project_role_mappings[i].project_name === '' : true">
+                            <button class="button-xs" type="button" class="close" (click)="removeMapping(i)"
+                                placement="right" ngbTooltip="{{ 'CANCEL' | translate }}">
+                                <i class="fas fa-minus-circle text-danger"></i>
+                            </button>
+                        </div>
+                        <div class="col-sm-1"
+                            *ngIf="userDetails.project_role_mappings[i] ? userDetails.project_role_mappings[i].project_name !== '' : false">
+                            <button class="button-xs" type="button" class="close"
+                                (click)="deleteProjectAndRoleMapping(userDetails.project_role_mappings[i])" placement="right" 
+                                ngbTooltip="{{ 'DELETE' | translate }}">
+                                <i class="fas fa-trash-alt text-danger"></i>
+                            </button>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>