Skip to content

Commit

Permalink
Asset Group Attribute and value populating when selecting the attribu…
Browse files Browse the repository at this point in the history 
…te key
  • Loading branch information
@nidhishkrishnan
nidhishkrishnan committed Jan 25, 2019
1 parent f9127bb commit f13471a
Show file tree
Hide file tree
Showing 6 changed files with 469 additions and 387 deletions.
48 changes: 14 additions & 34 deletions ...features/modules/admin/asset-groups/create-asset-groups/create-asset-groups.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
}

.widget-wrapper {
min-height: 17em;
padding: 0 1.25em 1em 1.25em;
padding-bottom: 4px;
}

.data-table-desc {
Expand All @@ -48,34 +49,6 @@
text-transform: capitalize;
}

.issue-listing-wrapper /deep/ .data-table-wrap {
min-height: calc( 100vh - 24em);
}

.issue-listing-wrapper /deep/ .data-table-content {
min-height: calc( 100vh - 32em);
}

.issue-listing-wrapper /deep/ .data-table-inner-wrap {
max-height: calc(100vh - 35em)
}

.issue-listing-wrapper /deep/ .data-table-wrap.loading {
min-height: calc( 100vh - 24em);
}

.filter-absent.issue-listing-wrapper /deep/ .data-table-wrap {
min-height: calc(100vh - 20em);
}

.filter-absent.issue-listing-wrapper /deep/ .data-table-content {
min-height: calc( 100vh - 28em);
}

.filter-absent.issue-listing-wrapper /deep/ .data-table-inner-wrap {
max-height: calc(100vh - 31em)
}

.details-bar[_ngcontent-c14] {
width: 50em !important;
}
Expand Down Expand Up @@ -189,18 +162,17 @@ input.inputarea-container {
border: 1px solid #aaa !important;
padding-bottom: 5px;
border-radius: 0.3em !important;
height: 2.3em !important;
display: inline-block;
border: none;
width: 100%;
height: 2.5em !important;
padding: 0.6em !important;
}

:host ::ng-deep ng-select span.ui-select-match-text.pull-left.ui-select-allow-clear {
border: 1px solid #aaa !important;
padding-bottom: 5px;
border-radius: 0.3em !important;
height: 2.3em !important;
display: inline-block;
border: none;
width: 100%;
Expand Down Expand Up @@ -325,6 +297,7 @@ li.list-inputs:hover {
}

.data-table-wrap {
min-height: calc(100vh - 20em);
border-radius: 3px;
background-color: #ffffff;
box-shadow: 0 1px 7px -1px #0000001e, 0 2px 4px 0 #00000023;
Expand Down Expand Up @@ -712,11 +685,15 @@ li.list-inputs:hover {
}

.data-content {
min-height: calc(100vh - 26em);
max-height: calc(100vh - 26em);
min-height: calc(100vh - 30em);
max-height: calc(100vh - 30em);
overflow: auto;
}

.data-content-attr {
max-height: inherit !important;
}

.app-button {
border-radius: 5px !important;
}
Expand Down Expand Up @@ -1059,7 +1036,7 @@ a.tmbutton,
button.tmbutton {
width: auto;
padding: 0 10px 0 10px;
height: 30px;
height: 2.5em;
border-radius: 7px;
background-color: #fff;
border: solid 2px #ed027d;
Expand Down Expand Up @@ -1208,6 +1185,9 @@ button.tmbutton:disabled:hover {
:host ::ng-deep ng-select .ui-disabled {
height: 2.6em !important;
top: auto;
margin-top: 1px;
width: 14em;
left: auto;
}

:host ::ng-deep ng-select .drop-search-box .ui-select-choices-row>a {
Expand Down
27 changes: 15 additions & 12 deletions ...eatures/modules/admin/asset-groups/create-asset-groups/create-asset-groups.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h1 class="title-text">{{pageTitle}}</h1>
Please Wait...
</div>
<div class="pacman-alert-message">
<span class="highlight-pink">{{assetLoaderTitle}}</span> is been loading...
<span class="highlight-pink">{{assetLoaderTitle}}</span> details is been loading...
</div>
</div>
<div class="pacman-progress pacman-alert" [hidden]="!assetLoaderFailure">
Expand Down Expand Up @@ -349,39 +349,42 @@ <h2 class="text">Attributes added</h2>
</div>
</div>
</div>
<div class="data-content">
<div class="data-content-attr data-content">
<div class="">
<div class="asset-formctn">
<div class="formctn">
<div class="input-box">
<ul class="parameters">
<label>Select Attribute Name :</label>
<ng-select #attributeNameElement name="attributeName" [(ngModel)]="attributeName" (selected)="getAttributeValues($event)" [allowClear]="true" [items]="selectedAttributeDetails" placeholder="Select Attribute Name" required>
<label>Select Name :</label>
<ng-select #attributeNameElement [allowClear]="true" name="attributeName" [(ngModel)]="attributeName" (selected)='getTargetTypeAttributeValues($event.text)' [items]="selectedAttributeDetails" placeholder="Select Name" required>
</ng-select>
</ul>
<ul class="parameters">
<label>Enter Attribute Value :</label>
<ul class="input-wrapper">
<input type="text" name="attributeValue" [(ngModel)]="attributeValue" class="inputarea-container " placeholder="Enter Attribute Value" required>
</ul>
<label>Select Value :
<span *ngIf="isAttributeAlreadyAdded==0" class="not-available">(Already Added)</span>
<span *ngIf="isAttributeAlreadyAdded==1" class="available"></span>
</label>
<ng-select #attributeValueElement [allowClear]="true" name="attributeValue" [(ngModel)]="attributeValue" (selected)='selectAttributes($event)' (input)="typedAttributes($event.target.value)" [items]="targetTypeAttributeValues" placeholder="Select Value"
required>
</ng-select>
</ul>
<button class="tmbutton btm30 ib" [disabled]="attributeValue=='' || attributeName.length==0" (click)="addAttributes(attributeName, attributeValue)">+ Add</button>
<button class="tmbutton btm30 ib" [disabled]="attributeValue=='' || attributeName.length==0 || isAttributeAlreadyAdded !== -1" (click)="addAttributes(attributeName, attributeValue)">+ Add</button>
</div>
</div>
<div class="data-table-content">
<div class='data-table-head-outer'>
<div class="data-table-head flex flex-around flex-align-center">
<div class="head-cells table-cells">
Attribute Name
<span class="list-sortable-arrow relative"></span>
<span class="relative"></span>
</div>
<div class="head-cells table-cells">
Attribute Value
<span class="list-sortable-arrow relative"></span>
<span class="relative"></span>
</div>
<div class="head-cells table-cells">
Action
<span class="list-sortable-arrow relative"></span>
<span class="relative"></span>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit f13471a

Please sign in to comment.