Tarun,Supriya,Ramu, Prajakta, Venky | BAH-1389 | MOBN-1748 | MOBN-1784 | Registration Module] Make local language field mandatory and add UI Validation to extra Patient Identifiers #489
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| 'use strict'; | ||
|
|
||
| angular.module('bahmni.registration') | ||
| .directive('extraPatientIdentifiers', function () { | ||
| return { | ||
| templateUrl: 'views/patientIdentifier.html', | ||
| scope: { | ||
| fieldValidation: '=', | ||
| patient: '=' | ||
| }, | ||
| restrict: 'E' | ||
| }; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <section ng-controller="PatientCommonController"> | ||
| <div ng-if="patient.uuid != undefined"> | ||
| <article ng-repeat="identifier in patient.extraIdentifiers" class="form-field existing-patient"> | ||
| <div class="field-attribute"> | ||
| <label class="control-label" for="patientID">{{:: getTranslatedPatientControls(identifier.identifierType.name)}} | ||
| <span ng-show=":: identifier.identifierType.required && !identifier.hasIdentifierSources()" | ||
| class="asterick">*</span> | ||
| </label> | ||
| </div> | ||
| <div class="field-value"> | ||
| <input type="text" ng-model="identifier.identifier" disabled | ||
| ng-if="identifier.hasIdentifierSources()"/> | ||
|
|
||
| <input type="text" id="{{identifier.identifierType.name}}" ng-model="identifier.registrationNumber" | ||
| ng-if="!identifier.hasIdentifierSources()" | ||
| non-blank="identifier.identifierType.required && !identifier.hasIdentifierSources()" | ||
| pattern-validate ng-change="identifier.generate()" | ||
| ng-disabled="readOnlyExtraIdentifiers.indexOf(identifier.identifierType.name)>-2"> | ||
| <div class="extension-btn" ng-show="showIdentifierVerificationButton(identifier.identifierType.name,identifier.registrationNumber)"> | ||
| <span ng-repeat="extButton in getExtButtons(identifier.identifierType.name)"> | ||
| <span> {{:: extButton.link}} </span> | ||
| <button type="button" | ||
| ng-click="openIdentifierPopup(identifier.identifierType.name, extButton.action)">{{:: extButton.display}} | ||
| </button> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </article> | ||
| </div> | ||
| <div ng-if="patient.uuid == undefined"> | ||
| <article ng-repeat="identifier in patient.extraIdentifiers" | ||
| class="form-field existing-patient"> | ||
| <div class="field-attribute"> | ||
| <label class="control-label" for="patientID">{{:: getTranslatedPatientControls(identifier.identifierType.name)}} | ||
| <span ng-show="::identifier.identifierType.required && !identifier.hasIdentifierSources()" | ||
| class="asterick">*</span> | ||
| </label> | ||
| </div> | ||
| <div ng-show="::(identifier.hasIdentifierSources() && !identifier.hasIdentifierSourceWithEmptyPrefix())" | ||
| class="field-value" id="patientID"> | ||
| <select id="identifierPrefix" ng-model="identifier.selectedIdentifierSource" | ||
| ng-options="identifierSource.prefix for identifierSource in ::identifier.identifierType.identifierSources" | ||
| ng-change="patient.generateIdentifier(identifier)" | ||
| required> | ||
| </select> | ||
| </div> | ||
| <div class="field-value" ng-if="!identifier.hasIdentifierSources()"> | ||
| <input type="text" id="{{identifier.identifierType.name}}" ng-model="identifier.registrationNumber" | ||
| non-blank="identifier.isIdentifierRequired()" pattern-validate | ||
| ng-change="identifier.generate()" focus-on="identifier.hasOldIdentifier" | ||
| ng-show="identifier.hasOldIdentifier || !identifier.hasIdentifierSources()" | ||
| ng-disabled="readOnlyExtraIdentifiers.indexOf(identifier.identifierType.name)>-1"> | ||
| <div class="extension-btn" ng-show="showIdentifierVerificationButton(identifier.identifierType.name,identifier.registrationNumber)"> | ||
| <span ng-repeat="extButton in getExtButtons(identifier.identifierType.name)"> | ||
| <span> {{:: extButton.link}} </span> | ||
| <button type="button" | ||
| ng-click="openIdentifierPopup(identifier.identifierType.name, extButton.action)">{{:: extButton.display}} | ||
| </button> | ||
| </span> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="field-value field-value-has-identifier" ng-show="::identifier.hasIdentifierSources()"> | ||
| <input type="text" id="{{identifier.identifierType.name}}" ng-model="identifier.registrationNumber" | ||
| non-blank="identifier.isIdentifierRequired()" pattern-validate | ||
| ng-change="identifier.generate()" focus-on="identifier.hasOldIdentifier" | ||
| ng-show="identifier.hasOldIdentifier || !identifier.hasIdentifierSources()" | ||
| ng-disabled="readOnlyExtraIdentifiers.indexOf(identifier.identifierType.name)>-1"> | ||
|
|
||
| <div class="fl"> | ||
| <div class="field-attribute hasOldIdentifier-field-attribute"> | ||
| <label for="hasOldIdentifier" ng-show="::showEnterID" class="control-label">{{::'REGISTRATION_LABEL_ENTER_ID' | | ||
| translate}}</label> | ||
| </div> | ||
| <div class="field-value"> | ||
| <input class="input-label-inline" ng-show="::showEnterID" type="checkbox" | ||
| id="hasOldIdentifier" ng-model="identifier.hasOldIdentifier" | ||
| ng-change="identifier.clearRegistrationNumber()"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </article> | ||
| </div> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure if this is advisable anymore i.e using person attribute. OMRS already has a name model where names in different locale can be added. I would have advised that.
Also, just because the person attribute is marked as required does not mean that value must be provided - I would have thought you enable this by some sort of configuration (which I think we already have).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed, we couldn’t see any option make the field has mandatory in the back-end so we have added this