dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #41578
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21191: event/tracker-capture: booleans are now changed from drop down to radio buttons
------------------------------------------------------------
revno: 21191
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-11-25 11:41:52 +0100
message:
event/tracker-capture: booleans are now changed from drop down to radio buttons
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-11-24 16:56:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-11-25 10:41:52 +0000
@@ -140,17 +140,36 @@
</textarea>
</div>
<div ng-switch-when="BOOLEAN">
- <select ng-model="currentEvent[eventGridColumn.id]"
- ng-required={{eventGridColumn.compulsory}}
- ng-disabled="assignedFields[eventGridColumn.id]"
- name="foo"
- input-field-id={{eventGridColumn.id}}
- ng-change="saveDatavalue()"
- class="form-control">
- <option value="">{{pleaseSelectLabel}}</option>
- <option value="false">{{'no'| translate}}</option>
- <option value="true">{{'yes'| translate}}</option>
- </select>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ ng-disabled="assignedFields[eventGridColumn.id]"
+ input-field-id={{eventGridColumn.id}}
+ ng-change="saveDatavalue()"
+ value="">
+ {{'no_value'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ ng-disabled="assignedFields[eventGridColumn.id]"
+ input-field-id={{eventGridColumn.id}}
+ ng-change="saveDatavalue()"
+ value="true">
+ {{'yes'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ ng-disabled="assignedFields[eventGridColumn.id]"
+ input-field-id={{eventGridColumn.id}}
+ ng-change="saveDatavalue()"
+ value="false">
+ {{'no'| translate}}
+ </label>
</div>
<div ng-switch-when="DATE">
<input type="text"
@@ -386,17 +405,36 @@
</textarea>
</div>
<div ng-switch-when="BOOLEAN">
- <select ng-model="currentEvent[de.dataElement.id]"
- ng-required={{prStDes[de.dataElement.id].compulsory}}
- ng-disabled="assignedFields[de.dataElement.id]"
- name="foo"
- input-field-id={{de.dataElement.id}}
- ng-change="saveDatavalue()"
- class="form-control">
- <option value="">{{pleaseSelectLabel}}</option>
- <option value="false">{{'no'| translate}}</option>
- <option value="true">{{'yes'| translate}}</option>
- </select>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[de.dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="assignedFields[de.dataElement.id]"
+ input-field-id={{de.dataElement.id}}
+ ng-change="saveDatavalue()">
+ value="">
+ {{'no_value'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[de.dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="assignedFields[de.dataElement.id]"
+ input-field-id={{de.dataElement.id}}
+ ng-change="saveDatavalue()">
+ value="true">
+ {{'yes'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[de.dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="assignedFields[de.dataElement.id]"
+ input-field-id={{de.dataElement.id}}
+ ng-change="saveDatavalue()">
+ value="false">
+ {{'no'| translate}}
+ </label>
</div>
<div ng-switch-when="DATE">
<input type="text"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2015-11-23 09:52:35 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2015-11-25 10:41:52 +0000
@@ -277,16 +277,36 @@
ng-class="getInputNotifcationClass(eventGridColumn.id,false)"/>
</div>
<div ng-switch-when="BOOLEAN">
- <select ng-model="currentEvent[eventGridColumn.id]"
- ng-change="updateEventDataValue(dhis2Event, eventGridColumn.id)"
- ng-required={{eventGridColumn.compulsory}}
- input-field-id={{eventGridColumn.id}}
- name="foo"
- ng-class="getInputNotifcationClass(eventGridColumn.id,false)">
- <option value="">{{pleaseSelectLabel}}</option>
- <option value="false">{{noLabel}}</option>
- <option value="true">{{yesLabel}}</option>
- </select>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ ng-disabled="assignedFields[eventGridColumn.id]"
+ input-field-id={{eventGridColumn.id}}
+ ng-change="saveDatavalue()"
+ value="">
+ {{'no_value'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ ng-disabled="assignedFields[eventGridColumn.id]"
+ input-field-id={{eventGridColumn.id}}
+ ng-change="saveDatavalue()"
+ value="true">
+ {{'yes'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ ng-disabled="assignedFields[eventGridColumn.id]"
+ input-field-id={{eventGridColumn.id}}
+ ng-change="saveDatavalue()"
+ value="false">
+ {{'no'| translate}}
+ </label>
</div>
<div ng-switch-when="DATE">
<input type="text"
@@ -321,7 +341,6 @@
ng-change="updateEventDataValue(dhis2Event, eventGridColumn.id)"
ng-required={{eventGridColumn.compulsory}}
input-field-id={{eventGridColumn.id}}
- ng-class="getInputNotifcationClass(eventGridColumn.id,false)"
name="foo"/>
</div>
<div ng-switch-when="FILE_RESOURCE">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2015-11-24 16:56:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2015-11-25 10:41:52 +0000
@@ -145,17 +145,33 @@
name="foo"/>
</div>
<div ng-switch-when="BOOLEAN">
- <select ng-class="getInputNotifcationClass(prStDe.dataElement.id,false, currentEvent)"
- class="form-control"
- ng-model="currentEvent[prStDe.dataElement.id]"
- ng-required={{prStDe.compulsory}}
- ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[prStDe.dataElement.id]"
- ng-change="saveDatavalue(prStDe, innerForm.foo)"
- name="foo">
- <option value="">{{'please_select'| translate}}</option>
- <option value="false">{{'no'| translate}}</option>
- <option value="true">{{'yes'| translate}}</option>
- </select>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[prStDe.dataElement.id]"
+ ng-required={{prStDe.compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[prStDe.dataElement.id]"
+ ng-change="saveDatavalue(prStDe, innerForm.foo)"
+ value="">
+ {{'no_value'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[prStDe.dataElement.id]"
+ ng-required={{prStDe.compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[prStDe.dataElement.id]"
+ ng-change="saveDatavalue(prStDe, innerForm.foo)"
+ value="true">
+ {{'yes'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[prStDe.dataElement.id]"
+ ng-required={{prStDe.compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[prStDe.dataElement.id]"
+ ng-change="saveDatavalue(prStDe, innerForm.foo)"
+ value="false">
+ {{'no'| translate}}
+ </label>
</div>
<div ng-switch-when="DATE">
<input type="text"
@@ -351,17 +367,33 @@
name="foo"/>
</div>
<div ng-switch-when="BOOLEAN">
- <select class="form-control"
- ng-class="getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false, currentEvent)"
- ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
- ng-required={{prStDes[de.dataElement.id].compulsory}}
- ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[de.dataElement.id]"
- ng-change="saveDatavalue(prStDes[de.dataElement.id])"
- name="foo">
- <option value="">{{'please_select'| translate}}</option>
- <option value="false">{{'no'| translate}}</option>
- <option value="true">{{'yes'| translate}}</option>
- </select>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[de.dataElement.id]"
+ ng-change="saveDatavalue(prStDes[de.dataElement.id])"
+ value="">
+ {{'no_value'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[de.dataElement.id]"
+ ng-change="saveDatavalue(prStDes[de.dataElement.id])"
+ value="true">
+ {{'yes'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[de.dataElement.id]"
+ ng-change="saveDatavalue(prStDes[de.dataElement.id])"
+ value="false">
+ {{'no'| translate}}
+ </label>
</div>
<div ng-switch-when="DATE">
<input type="text"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html 2015-11-22 20:50:10 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html 2015-11-25 10:41:52 +0000
@@ -159,17 +159,33 @@
name="foo"/>
</div>
<div ng-switch-when="BOOLEAN">
- <select ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
- class="form-control"
- ng-model="eventRow[prStDe.dataElement.id]"
- ng-required={{prStDe.compulsory}}
- ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[prStDe.dataElement.id] "
- ng-change="saveDatavalue(prStDe, innerForm.foo)"
- name="foo">
- <option value="">{{'please_select'| translate}}</option>
- <option value="false">{{'no'| translate}}</option>
- <option value="true">{{'yes'| translate}}</option>
- </select>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="eventRow[prStDe.dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[de.dataElement.id]"
+ ng-change="saveDatavalue(prStDes[de.dataElement.id])"
+ value="">
+ {{'no_value'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="eventRow[prStDe.dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[de.dataElement.id]"
+ ng-change="saveDatavalue(prStDes[de.dataElement.id])"
+ value="true">
+ {{'yes'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="eventRow[prStDe.dataElement.id]"
+ ng-required={{prStDes[de.dataElement.id].compulsory}}
+ ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[de.dataElement.id]"
+ ng-change="saveDatavalue(prStDes[de.dataElement.id])"
+ value="false">
+ {{'no'| translate}}
+ </label>
</div>
<div ng-switch-when="DATE">
<input type="text"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html 2015-11-05 18:53:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html 2015-11-25 10:41:52 +0000
@@ -58,21 +58,45 @@
ng-required="attribute.mandatory || attribute.unique"/>
</span>
<span ng-switch-when="BOOLEAN">
- <select name="foo"
- ng-model="selectedTei[attribute.id]"
- ng-model-options="{ updateOn: 'blur', allowInvalid: true }"
- d2-attribute-validator
- attribute-data={{attribute}}
- selected-program-id={{selectedProgram.id}}
- selected-tei-id={{selectedTei.trackedEntityInstance}}
- class="form-control"
- ng-disabled="editingDisabled"
- ng-change="teiValueUpdated(selectedTei, attribute.id)"
- ng-required="attribute.mandatory || attribute.unique">
- <option value="">{{'please_select'| translate}}</option>
- <option value="false">{{'no'| translate}}</option>
- <option value="true">{{'yes'| translate}}</option>
- </select>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="selectedTei[attribute.id]"
+ d2-attribute-validator
+ attribute-data={{attribute}}
+ selected-program-id={{selectedProgram.id}}
+ selected-tei-id={{selectedTei.trackedEntityInstance}}
+ ng-disabled="editingDisabled"
+ ng-change="teiValueUpdated(selectedTei, attribute.id)"
+ ng-required="attribute.mandatory || attribute.unique"
+ value="">
+ {{'no_value'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="selectedTei[attribute.id]"
+ d2-attribute-validator
+ attribute-data={{attribute}}
+ selected-program-id={{selectedProgram.id}}
+ selected-tei-id={{selectedTei.trackedEntityInstance}}
+ ng-disabled="editingDisabled"
+ ng-change="teiValueUpdated(selectedTei, attribute.id)"
+ ng-required="attribute.mandatory || attribute.unique"
+ value="true">
+ {{'yes'| translate}}
+ </label>
+ <label class="radio-inline">
+ <input type="radio"
+ ng-model="selectedTei[attribute.id]"
+ d2-attribute-validator
+ attribute-data={{attribute}}
+ selected-program-id={{selectedProgram.id}}
+ selected-tei-id={{selectedTei.trackedEntityInstance}}
+ ng-disabled="editingDisabled"
+ ng-change="teiValueUpdated(selectedTei, attribute.id)"
+ ng-required="attribute.mandatory || attribute.unique"
+ value="false">
+ {{'no'| translate}}
+ </label>
</span>
<span ng-switch-when="NUMBER">
<input type="number"
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-11-20 22:46:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-11-25 10:41:52 +0000
@@ -402,15 +402,10 @@
' ng-blur="saveDatavalue(prStDes.' + fieldId + ', outerForm.' + fieldId + ')"' +
commonInputFieldProperty + ' >';
}
- else if (prStDe.dataElement.valueType === "BOOLEAN") {
- newInputField = '<select ' +
- ' ng-change="saveDatavalue(prStDes.' + fieldId + ', outerForm.' + fieldId + ')" ' +
- ' ng-class="{{getInputNotifcationClass(prStDes.' + fieldId + '.dataElement.id, true)}}" ' +
- commonInputFieldProperty + '>' +
- '<option value="">{{\'please_select\'| translate}}</option>' +
- '<option value="false">{{\'no\'| translate}}</option>' +
- '<option value="true">{{\'yes\'| translate}}</option>' +
- '</select> ';
+ else if (prStDe.dataElement.valueType === "BOOLEAN") {
+ newInputField = '<label class="radio-inline"><input type="radio" ng-change="saveDatavalue()" ' + commonInputFieldProperty + ' value="">{{\'no_value\'| translate}}</label>' +
+ '<label class="radio-inline"><input type="radio" ng-change="saveDatavalue()" ' + commonInputFieldProperty + ' value="true">{{\'yes\'| translate}}</label>' +
+ '<label class="radio-inline"><input type="radio" ng-change="saveDatavalue()" ' + commonInputFieldProperty + ' value="false">{{\'no\'| translate}}</label>';
}
else if (prStDe.dataElement.valueType === "DATE") {
var maxDate = prStDe.allowFutureDate ? '' : 0;
@@ -532,13 +527,9 @@
commonInputFieldProperty + ' >';
}
else if (att.valueType === "BOOLEAN") {
- newInputField = '<select ' +
- ' ng-change="teiValueUpdated(selectedTei,\'' + attId + '\')" ' +
- commonInputFieldProperty + ' > ' +
- ' <option value="">{{\'please_select\'| translate}}</option>' +
- ' <option value="false">{{\'no\'| translate}}</option>' +
- ' <option value="true">{{\'yes\'| translate}}</option>' +
- '</select> ';
+ newInputField = '<label class="radio-inline"><input type="radio" ng-change="teiValueUpdated(selectedTei,\'' + attId + '\')" ' + commonInputFieldProperty + ' value="">{{\'no_value\'| translate}}</label>' +
+ '<label class="radio-inline"><input type="radio" ng-change="teiValueUpdated(selectedTei,\'' + attId + '\')" ' + commonInputFieldProperty + ' value="true">{{\'yes\'| translate}}</label>' +
+ '<label class="radio-inline"><input type="radio" ng-change="teiValueUpdated(selectedTei,\'' + attId + '\')" ' + commonInputFieldProperty + ' value="false">{{\'no\'| translate}}</label>';
}
else if (att.valueType === "DATE") {
newInputField = '<input type="text" ' +
