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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from Jun 30, 2019
Merged

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

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/src/main/resources/messages.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.conditionui.removeCondition=Remove Condition
coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
coreapps.conditionui.editCondition=Edit Condition: {0}
coreapps.conditionui.showVoided=Show Voided
coreapps.conditionui.active.label=ACTIVE
coreapps.conditionui.inactive.label=INACTIVE
coreapps.conditionui.active.label=Active
coreapps.conditionui.inactive.label=Inactive
coreapps.conditionui.undo=Undo delete
coreapps.conditionui.activeConditions=Active Conditions
coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_ar.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.vitals.confirm.no=لا، البحث عن مريض آخر
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_de.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.dashboardwidgets.programstatus.history=Geschichte
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_el.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.clinicianfacing.active=Ενεργό
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_es.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.dashboardwidgets.programstatus.confirmDelete=¿Seguro que desea elimina
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_fa.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.clinicianfacing.noneRecorded=هیچکدام
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_fr.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.conditionui.removeCondition=Supprimer la condition
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
coreapps.conditionui.editCondition=Modifier la condition: {0}
# coreapps.conditionui.showVoided=Show Voided
coreapps.conditionui.active.label=ACTIVE
coreapps.conditionui.inactive.label=INACTIVE
coreapps.conditionui.active.label=Active
coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
coreapps.conditionui.activeConditions=Conditions actives
coreapps.conditionui.inactiveConditions=Conditions inactives
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_ht.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.noAccess=Kont itilizatè ou a pa gen privilèj oblije wè paj sa a
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_hy.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_id_ID.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.noAccess=Akun pengguna anda tidak memiliki hak akses untuk melihat hala
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_it.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.clinicianfacing.noneRecorded=Nessuno
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_ku.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_lt.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.vitals.minutesAgo=prieš {0} minutes(-čių)
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_pl.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.noAccess=Twoje konto nie posiada uprawnień do wyświetlenia tej strony
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_pt.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.noAccess=Sua conta de usuário não tem privilégios para visualizar es
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_ru.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.conditionui.message.fail=Не получилось сохранить
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
coreapps.conditionui.undo=Отменить удаление
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_si.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.clinicianfacing.noneRecorded=None
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_sw.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.simpleFormUi.confirm.title=Hakikisha
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
4 changes: 2 additions & 2 deletions api/src/main/resources/messages_te.properties
View file
Open in desktop
Expand Up @@ -644,8 +644,8 @@ coreapps.search.name=పేరు
# coreapps.conditionui.removeCondition.message=Are you sure you want to remove {0} condition for this patient?
# coreapps.conditionui.editCondition=Edit Condition: {0}
# coreapps.conditionui.showVoided=Show Voided
# coreapps.conditionui.active.label=ACTIVE
# coreapps.conditionui.inactive.label=INACTIVE
# coreapps.conditionui.active.label=Active
# coreapps.conditionui.inactive.label=Inactive
# coreapps.conditionui.undo=Undo delete
# coreapps.conditionui.activeConditions=Active Conditions
# coreapps.conditionui.inactiveConditions=Inactive Conditions
1 change: 0 additions & 1 deletion omod/src/main/webapp/pages/conditionlist/addCondition.gsp
View file
Open in desktop
Expand Up @@ -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>
Copy link
Member

Choose a reason for hiding this comment

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

Is this part of the ticket?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

</div>

<div id="actions">
Expand Down
5 changes: 0 additions & 5 deletions omod/src/main/webapp/resources/scripts/conditionlist/controllers/addcondition.controller.js
View file
Open in desktop
Expand Up @@ -51,10 +51,6 @@ function ConditionController($scope, RestfulService, ConditionModel, ConceptMode
self.saveCondition();
}

self.unselectStatus = self.unselectStatus || function () {
Copy link
Member

Choose a reason for hiding this comment

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

Is this part of the ticket?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

$scope.condition.status = null;
}

self.getSelectedDate = self.getSelectedDate || function () {
var datePicker = angular.element(document.getElementsByName('conditionStartDate'))[0];
return datePicker.value;
Expand All @@ -65,5 +61,4 @@ function ConditionController($scope, RestfulService, ConditionModel, ConceptMode

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

Choose a reason for hiding this comment

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

Is this part of the ticket?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

}