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

RA-1522: Fixed radio buttons on add new condition UI #201

Merged
merged 1 commit into from Jun 30, 2019

Conversation

@haripriya999
Copy link
Contributor

commented Jun 26, 2019

RA-1522: Fixed radio buttons on add new condition UI

Description of what I changed

Changed spelling of Active and Inactive status and removed clear option

Issue I worked on

see https://issues.openmrs.org/browse/RA-1522

Checklist: I completed these to help reviewers :)

  • My pull request only contains ONE single commit
    (the number above, next to the 'Commits' tab is 1).

    No? -> read here on how to squash multiple commits into one

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@@ -51,10 +51,6 @@ function ConditionController($scope, RestfulService, ConditionModel, ConceptMode
self.saveCondition();
}

self.unselectStatus = self.unselectStatus || function () {

This comment has been minimized.

Copy link
@dkayiwa

dkayiwa Jun 30, 2019

Member

Is this part of the ticket?

This comment has been minimized.

Copy link
@haripriya999

haripriya999 Jun 30, 2019

Author Contributor

Yes, This is to remove the functionality of cross button 'x' as mentioned on the ticket

@@ -65,5 +61,4 @@ function ConditionController($scope, RestfulService, ConditionModel, ConceptMode

// bind functions to scope
$scope.validateCondition = self.validateCondition;
$scope.unselectStatus = self.unselectStatus;

This comment has been minimized.

Copy link
@dkayiwa

dkayiwa Jun 30, 2019

Member

Is this part of the ticket?

This comment has been minimized.

Copy link
@haripriya999

haripriya999 Jun 30, 2019

Author Contributor

yes, to remove the functionality of cross button 'x'

@@ -72,7 +72,6 @@
<input type="radio" id="status-2" class="condition-status" value="${ui.message('coreapps.conditionui.inactive.label')}" name="status" ng-model="condition.status"/>
<label for="status-2">${ui.message('coreapps.conditionui.inactive.label')}</label>
</p>
<i class="icon-remove delete-item" title="${ui.message("general.clear")}" ng-click="unselectStatus()"></i>

This comment has been minimized.

Copy link
@dkayiwa

dkayiwa Jun 30, 2019

Member

Is this part of the ticket?

This comment has been minimized.

Copy link
@haripriya999

haripriya999 Jun 30, 2019

Author Contributor

yes, to remove the functionality of cross button 'x'

@dkayiwa dkayiwa merged commit d617f64 into openmrs:master Jun 30, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.