{{'data_element'\| translate}}	{{'value'\| translate}} -	+
- - - + - {{$select.selected.name \|\| $select.selected}} - - - - - - - + style="width:100%;"> + {{$select.selected.name \|\| $select.selected}} + + + + + - - {{'no_value' \| translate}} - - - - {{option.name}} - - - - - - + class="form-control"/> - - - + class="form-control"/> - - - - + class="form-control"/> - - - - + class="form-control"/> - - - - + class="form-control"/> - - - - + class="form-control"/> - - + class="form-control"> - - - - {{'no_value'\| translate}} - - - - {{'yes'\| translate}} - - - - {{'no'\| translate}} - - - - - - + class="form-control"> - - - - - - - - - @@ -290,22 +244,22 @@ - - - - + class="form-control"> - - + + +	+

@@ -332,7 +285,10 @@	{{'value'\| translate}} -	+ +
+	@@ -353,19 +309,17 @@ name="foo" input-field-id={{de.dataElement.id}} on-select="saveDatavalue()" - style="width:85%;"> + style="width:100%;"> {{$select.selected.name \|\| $select.selected}} - - - {{'no_value' \| translate}} - - - - {{option.name}} - - @@ -397,8 +346,7 @@ - - - - + class="form-control"/> - - - - + ng-blur="saveDatavalue()" + class="form-control"/> - - - - + ng-blur="saveDatavalue()" + class="form-control"/> - - - - + ng-blur="saveDatavalue()" + class="form-control"/> - - - - + ng-blur="saveDatavalue()" + class="form-control"/> - - - - + ng-blur="saveDatavalue()" + class="form-control"/> - - - - - + class="form-control"/> + - - + - - - - - + blur-or-change="saveDatavalue()" + class="form-control"/> - - - - + class="form-control"/> - - - - @@ -615,17 +532,14 @@ - - - - + class="form-control"/> @@ -635,6 +549,9 @@	+ +

@@ -475,14 +461,13 @@ - + name="foo" />

@@ -493,14 +478,13 @@ -

@@ -511,14 +495,13 @@ -

@@ -529,14 +512,13 @@ -

@@ -555,7 +537,6 @@ dh-id="de.dataElement.id" dh-click="saveDataValueForRadio(prStDes[de.dataElement.id], currentEvent, value)"> -

{{'yes' | translate}} @@ -569,14 +550,13 @@ d2-date d2-date-validator max-date="prStDes[de.dataElement.id].allowFutureDate ? '' : 0" - class="form-control input-with-audit" + 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[currentEvent.event][de.dataElement.id]" blur-or-change="saveDatavalue(prStDes[de.dataElement.id])" name="foo"/> -

@@ -585,13 +565,12 @@

-

@@ -600,14 +579,14 @@

-

@@ -616,14 +595,13 @@

-

@@ -668,14 +646,13 @@

-

@@ -694,6 +671,9 @@

+ + +

+ ng-style="{'width': '100%'}"> {{$select.selected.name || $select.selected}} - @@ -35,7 +34,7 @@ - - {{'no_value'| translate}} - {{'yes'| translate}} - {{'no'| translate}} - - + - - - - - - @@ -187,7 +175,7 @@ -

@@ -212,5 +199,8 @@

'; + ' ng-required="{{true}}">'; } else { fieldId = attributes['id'].substring(4, attributes['id'].length - 1).split("-")[1]; @@ -417,14 +417,14 @@ //check if dataelement has optionset if (prStDe.dataElement.optionSetValue) { var optionSetId = prStDe.dataElement.optionSet.id; - newInputField = '

' + + newInputField = '

' + '{{$select.selected.name || $select.selected}}' + '' + '' + '' + '' + - '

'; + '

'; } else { //check data element type and generate corresponding angular input field @@ -433,31 +433,31 @@ prStDe.dataElement.valueType === "INTEGER_POSITIVE" || prStDe.dataElement.valueType === "INTEGER_NEGATIVE" || prStDe.dataElement.valueType === "INTEGER_ZERO_OR_POSITIVE") { - newInputField = '

'; + commonInputFieldProperty + '>'; } else if (prStDe.dataElement.valueType === "BOOLEAN") { - newInputField = '{{\'no_value\'| translate}}' + + newInputField = '{{\'no_value\'| translate}}' + '{{\'yes\'| translate}}' + - '{{\'no\'| translate}}

' + + '{{\'no\'| translate}}

' + '{{\'yes\'| translate}}' + '{{\'no\'| translate}}'; } else if (prStDe.dataElement.valueType === "DATE") { var maxDate = prStDe.allowFutureDate ? '' : 0; - newInputField = '

'; + commonInputFieldProperty + ' >'; } else if (prStDe.dataElement.valueType === "TRUE_ONLY") { newInputField = '

'; } else if (prStDe.dataElement.valueType === "LONG_TEXT") { - newInputField = '

'; + ' ng-style="{\'width\' : inputObj.isAuditIconPresent ? \'85%\' : \'100%\' }"' + + commonInputFieldProperty + '>'; } else if (prStDe.dataElement.valueType === "FILE_RESOURCE") { newInputField = '\n\ @@ -498,11 +498,11 @@ '; } else { - newInputField = '

'; + commonInputFieldProperty + ' >'; } } } @@ -577,23 +577,23 @@ //check if attribute has optionset if (att.optionSetValue) { var optionSetId = att.optionSet.id; - newInputField = '

' + + newInputField = '

' + '{{$select.selected.name || $select.selected}}' + '' + '' + '' + - '

'; + '

'; } else { //check attribute type and generate corresponding angular input field if (att.valueType === "NUMBER" ) { - newInputField = '' + - '' + + '' + ''; } else if (att.valueType === "BOOLEAN") { @@ -608,13 +608,13 @@ ''; } else if (att.valueType === "DATE") { - newInputField = ''+ - ''+ + ''+ ''; } else if (att.valueType === "TRUE_ONLY") { @@ -623,14 +623,14 @@ commonInputFieldProperty + ' >'; } else if (att.valueType === "EMAIL") { - newInputField = '

'; + commonInputFieldProperty + ' >'; } else if (att.valueType === "TRACKER_ASSOCIATE") { - newInputField = '

' + + commonInputFieldProperty + ' >' + ' ' + ' ' + @@ -644,9 +644,9 @@ commonInputFieldProperty + ' >'; } else { - newInputField = '

'; + commonInputFieldProperty + '>'; } } } @@ -666,7 +666,7 @@ if (programId === 'enrollmentDate') { fieldName = 'dateOfEnrollment'; var enMaxDate = trackedEntityForm.selectEnrollmentDatesInFuture ? '' : 0; - newInputField = '

'; + ' ng-required="true">'; } if (programId === 'dateOfIncident' && trackedEntityForm.displayIncidentDate) { fieldName = 'dateOfIncident'; var inMaxDate = trackedEntityForm.selectIncidentDatesInFuture ? '' : 0; - newInputField = '

'; + ' max-date="' + inMaxDate + '">'; } }