Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCHR-3460: UI Improvement for Option Groups #2621

Conversation

ajesamson
Copy link
Contributor

@ajesamson ajesamson commented May 24, 2018

Overview

After adding tool icon for some of the option groups in Job Role, dropdown list for those options were not properly displayed. This fixed the issue.

Before

before_roles

After

after_roles

Technical Details

Initially css class crm_custom-select--full which was removed has been restored and bootstrap col added for proper arrangement of elements.

<div class="form-group">
   <label for="newDepartment" class="col-xs-4 control-label">Department:</label>
   <div class="col-xs-6">
      <div class="form-inline">
         <div class="crm_custom-select crm_custom-select--full">
             <ui-select
                  prevent-animations
                  ng-model="jobroles.editData['new_role_id']['department']"
                  theme="civihr-ui-select"
                  title="Choose a Department">
                     <ui-select-match prevent-animations allow-clear placeholder="Select a department">{{$select.selected.value.title}}</ui-select-match>
                    <ui-select-choices prevent-animations repeat="department.value.value as (key,department) in jobroles.DepartmentsData | filter: { value: { title: $select.search }}">
                        <div ng-bind-html="department.value.title | highlight: $select.search"></div>
                    </ui-select-choices>
             </ui-select>
          </div>
        </div>
   </div>
    <div class="col-xs-1">
          <a class="pointer">
               <i class="crm-i fa-wrench" ng-click="jobroles.openOptionsEditor('hrjc_department')"></i>
           </a>
     </div>
</div>

✅Manual Tests - passed

@deb1990
Copy link
Contributor

deb1990 commented May 24, 2018

Initially css class crm_custom-select--full was restored

Please add the commit or PR, where it was removed.

Also the wrench icon looks off center(slighty upwards). It was not like that in the before screenshot.

</div>
</span>
</div>
<span ng-show="editableForm.$visible">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DIV should be be present under span. Also there is no need of this span, you can directly add the ng-showto the div itself.

</div>
</span>
</div>
<span ng-show="editableForm.$visible">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DIV should be be present under span. Also there is no need of this span, you can directly add the ng-showto the div itself.

</div>
</span>
</div>
<span ng-show="editableForm.$visible">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DIV should be be present under span. Also there is no need of this span, you can directly add the ng-showto the div itself.

</div>
</span>
</div>
<span ng-show="editableForm.$visible">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DIV should be be present under span. Also there is no need of this span, you can directly add the ng-showto the div itself.

</a>
</div>
</span>
<div class="col-sm-1 control-label" ng-show="editableForm.$visible">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are two spaces before ng-show

</a>
</div>
</span>
<div class="col-sm-1 control-label" ng-show="editableForm.$visible">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are two spaces before ng-show

@ajesamson ajesamson force-pushed the PCHR-3460-add-tool-icon-to-edit-job-role-options branch from fcc9c56 to 1d2d25c Compare May 24, 2018 14:00
@ajesamson ajesamson force-pushed the PCHR-3460-add-tool-icon-to-edit-job-role-options branch from 1d2d25c to db66d02 Compare May 24, 2018 14:01
@ajesamson ajesamson merged commit f01c311 into PCHR-3162-configurability-changes May 24, 2018
@ajesamson ajesamson deleted the PCHR-3460-add-tool-icon-to-edit-job-role-options branch May 24, 2018 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants