RA-1513 Added support to allow the extensions to add the custom fragments to the Manage Account dashboard #44

suthagar23 · 2018-07-20T14:52:35Z

Description

Along with this PR,

Add New Account/Edit account dashboards can allow the fragments through the extensions
It can allow the different fragments to Add/Edit Information and View information
It can provide supports to save the person attributes (if the fragment field type is personAttribute) automatically along with the person registration/ person update.
It can provide supports to save the user properties (if the fragment field type is userProperty) automatically along with the user registration/ user update.

Ticket Information

Ticket : https://issues.openmrs.org/browse/RA-1513

dkayiwa · 2018-07-22T08:12:36Z

api/src/main/java/org/openmrs/module/adminui/account/Account.java

+		if (person != null) {
+			PersonAttribute attr = person.getAttribute(Context.getPersonService().getPersonAttributeTypeByUuid(
+					attributeTypeUuid));
+			if (attr != null) {


What value does checking for not null add?

No need it here, removed

dkayiwa · 2018-07-22T08:15:04Z

omod/src/main/webapp/resources/scripts/fragments/systemadmin/personDetails.js

@@ -13,6 +20,7 @@ angular.module("adminui.personDetails", ["personService"])
                $scope.person.familyName = familyName;
                $scope.person.givenName = givenName;
                $scope.genders = {M: male, F: female};
+                $scope.personAttributeInfoMap = personAttributeInfoMap;


What value does "Info" add to the name?

dkayiwa · 2018-07-22T08:20:25Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

+                    }
+                }
+            }
+


Can we do some bit of uniformity with our indention?

Sorry, I didn't get you properly

The indention is not the same. Can you look at it again?

Do you mention the implementation after this line which points to person attribute? I used the existing patient registration implementation to build this one. Any brief comments to make this better?

Can you look at lines 138 and 156?

You mentioned about the names at these lines? "createUser.manageAccountUserFragments" and "createUser.manageAccountPersonFragments"

At what vertical column numbers do they start? In other words, do they have the same indention?

Just got it, and fixed it as well. Please see the updated code

dkayiwa · 2018-07-23T19:27:01Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

+                String[] parameterValues = parameterMap.get(formFiledName);
+                if (parameterValues != null && parameterValues.length > 0) {
+                    if (parameterValues.length > 1) {
+                        log.warn("Multiple values for a single person attribute type not supported, ignoring extra values");


Shouldn't you throw an exception for the above?

if we sent the exception, then it will break the registration workflow. It will happen when the user configured the dashboard with duplicate filed ids. In the patient registration also, We followed this way.

dkayiwa · 2018-07-23T19:27:44Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

+			Object type = ext.getExtensionParams().get("type");
+			Object personAttributeTypeUuid = ext.getExtensionParams().get("uuid");
+			Person person = account.getPerson();
+			if (person!=null && type!=null && personAttributeTypeUuid!=null &&


Can we put some spaces for != null

dkayiwa · 2018-07-23T19:28:25Z

omod/src/main/webapp/fragments/systemadmin/accounts/personDetails.gsp

@@ -10,6 +10,11 @@
 %>

 <% if(!createAccount) { %>
+<script type="text/javascript">
+    //This function is in personDetails.js


Do we need the above comment?

removed @dkayiwa

dkayiwa · 2018-07-23T19:49:46Z

omod/src/main/webapp/fragments/systemadmin/accounts/personDetails.gsp

+                        title : ui.message(sect.extensionParams.title),
+                        label : ui.message(sect.extensionParams.label),
+                        initialValue : ui.message(account.getPersonAttribute(sect.extensionParams.uuid) != null ?
+                                account.getPersonAttribute(sect.extensionParams.uuid).value : '')


Can we indent the above line correctly?

That is the continue part of the above line. Does it contain wrong indent?

dkayiwa · 2018-07-23T19:50:10Z

omod/src/main/webapp/resources/scripts/fragments/systemadmin/personDetails.js

                var personToSave = {
                    uuid: $scope.person.personUuid,
                    gender: $scope.person.gender,
                    names: [{
                        uuid: $scope.person.personNameUuid,
                        familyName: $scope.person.familyName,
-                        givenName: $scope.person.givenName}]
+                        givenName: $scope.person.givenName}],
+                    attributes: attributesSet


Can you indent the above correctly?

dkayiwa · 2018-07-23T19:51:41Z

omod/src/main/webapp/fragments/systemadmin/accounts/personDetails.gsp

+                            personId : account.person.personId,
+                            personUuid : account.person.uuid,
+                            initialValue : ui.message(account.getPersonAttribute(sect.extensionParams.uuid) != null ?
+                                    account.getPersonAttribute(sect.extensionParams.uuid).value : '')


Can you indent the above correctly?

That is the continue part of the above line. Does it contain wrong indent?

dkayiwa · 2018-07-23T19:52:50Z

omod/src/main/webapp/resources/scripts/fragments/systemadmin/userDetails.js

@@ -138,6 +138,15 @@ angular.module("adminui.userDetails", ["userService", "ngDialog", "adminui.shoul
                if(modelUser.userProperties.forcePassword){
                    uProperties.forcePassword = "true";
                }
+                angular.forEach(modelUser.userProperties, function(value, key) {
+                    if(key != "forcePassword") {
+                        var domElement = document.getElementById(key+userUuid);


Can we put spaces around the + sign?

dkayiwa · 2018-07-23T19:55:21Z

omod/src/main/webapp/fragments/systemadmin/accounts/userFormFields.gsp

@@ -128,6 +128,16 @@
       ng-model="uuidUserMap['${userUuid}'].userProperties.forcePassword" />${ ui.message("adminui.account.user.forcePasswordChange") }
 </p>

+<% customUserFragments.each { sect -> %>
+    ${ ui.includeFragment(sect.extensionParams.provider, sect.extensionParams.fragment, [
+            formFieldName : sect.extensionParams.userPropertyName+userUuid,


Can we put spaces around the + sign?

dkayiwa · 2018-07-23T20:04:06Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

 	                   HttpServletRequest request, UiUtils uu) throws IOException {

 		Errors errors = new BeanPropertyBindingResult(account, "account");
+
+        List<Extension> customUserFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountUserFragments");


Do you have any reason for making createUser.manageAccountUserFragments plural?
The same applies for the rest downwards.

No need, better to change it to "createUser.manageAccountUserFragment"

dkayiwa · 2018-07-23T20:08:55Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

+                        log.warn("Multiple userProperty for a single user type not supported, ignoring extra values");
+                    }
+                    String parameterValue = parameterValues[0];
+                    if (userPropertyName !=null && parameterValue != null) {


Can we also put space around the above !=

dkayiwa · 2018-07-23T20:10:38Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

@@ -203,7 +254,21 @@ public void setModelAttributes(PageModel model, Account account, OtherAccountDat
 		model.addAttribute("allowedLocales", administrationService.getAllowedLocales());
 		List<ProviderRole> providerRoles = providerManagementService.getAllProviderRoles(false);
 		model.addAttribute("providerRoles", providerRoles);
-
+
+		List<Extension> customPersonFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountPersonFragments");


Since the other one has "View" shouldn't this have "Edit"?

dkayiwa · 2018-07-23T21:14:03Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

-
+
+		List<Extension> customPersonFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountPersonFragment");
+		Collections.sort(customPersonFragments);


Since the other one one has "View", shouldn't this have "Edit"?

replaced with "Edit"

dkayiwa · 2018-07-23T21:16:40Z

omod/src/main/webapp/fragments/systemadmin/accounts/userFormFields.gsp

@@ -128,6 +128,16 @@
       ng-model="uuidUserMap['${userUuid}'].userProperties.forcePassword" />${ ui.message("adminui.account.user.forcePasswordChange") }
 </p>

+<% customUserFragments.each { sect -> %>


Since the other one one has "View", shouldn't this have "Edit"?

replaced with "Edit"

dkayiwa · 2018-07-23T21:23:18Z

omod/src/main/webapp/fragments/systemadmin/accounts/personDetails.gsp

@@ -38,6 +42,19 @@
                    <th valign="top">${ui.message("Person.gender")}</th>
                    <td valign="top">{{genders[person.gender]}}</td>
                </tr>
+
+                <% customPersonViewFragments.each { sect ->


What does "sect" mean?

Updated with "fragment"

dkayiwa · 2018-07-24T05:46:29Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

 	                   HttpServletRequest request, UiUtils uu) throws IOException {

 		Errors errors = new BeanPropertyBindingResult(account, "account");
+
+        List<Extension> customUserFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountUserFragment");


I thought this would include "UserProperty" in its name?

Changed to "customUserPropertyFragments"

dkayiwa · 2018-07-24T05:46:56Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

+            }
+        }
+
+        List<Extension> customPersonFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountPersonFragment");


I thought this would include "PersonAttribute" in its name?

Changed to "customPersonAttributeFragments"

dkayiwa · 2018-07-24T05:48:00Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

@@ -203,7 +254,21 @@ public void setModelAttributes(PageModel model, Account account, OtherAccountDat
 		model.addAttribute("allowedLocales", administrationService.getAllowedLocales());
 		List<ProviderRole> providerRoles = providerManagementService.getAllProviderRoles(false);
 		model.addAttribute("providerRoles", providerRoles);
-
+
+		List<Extension> customPersonEditFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountPersonFragment");


If this is dealing with strictly person attributes, then it should include "PersonAttribute" in its name.

dkayiwa · 2018-07-24T05:48:34Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

+		Collections.sort(customPersonViewFragments);
+		model.addAttribute("customPersonViewFragments", customPersonViewFragments);
+
+		List<Extension> customUserEditFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountUserFragment");


If this is dealing with strictly user properties, then it should include "UserProperty" in its name.

dkayiwa · 2018-07-24T05:48:54Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

@@ -250,6 +315,12 @@ public void setModelAttributes(PageModel model, Account account, OtherAccountDat
 				force = (user.getUserId() == null) ? true : account.isSupposedToChangePassword(user);
 			}
 			userProperties.put(OpenmrsConstants.USER_PROPERTY_CHANGE_PASSWORD, force);


Same here as above.

I think you have mentioned the next line. Changed

dkayiwa · 2018-07-24T05:49:05Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

-
+
+		so = new SimpleObject();
+		for(Extension ext : customPersonEditFragments) {


Same here as above.

dkayiwa · 2018-07-24T05:49:19Z

omod/src/main/webapp/fragments/systemadmin/accounts/personDetails.gsp

@@ -38,6 +42,19 @@
                    <th valign="top">${ui.message("Person.gender")}</th>
                    <td valign="top">{{genders[person.gender]}}</td>
                </tr>
+
+                <% customPersonViewFragments.each { fragment ->


Same here as above.

dkayiwa · 2018-07-24T05:49:28Z

omod/src/main/webapp/fragments/systemadmin/accounts/personDetails.gsp

@@ -97,6 +114,20 @@
                    ${ui.message("adminui.field.required")}
                </span>
            </span>
+
+            <% customPersonEditFragments.each { fragment ->


Same here as above

dkayiwa · 2018-07-24T05:49:39Z

omod/src/main/webapp/fragments/systemadmin/accounts/userFormFields.gsp

@@ -128,6 +128,16 @@
       ng-model="uuidUserMap['${userUuid}'].userProperties.forcePassword" />${ ui.message("adminui.account.user.forcePasswordChange") }
 </p>

+<% customUserEditFragments.each { fragment -> %>


Same here as above

dkayiwa · 2018-07-24T05:49:47Z

omod/src/main/webapp/fragments/systemadmin/accounts/userTabContentPane.gsp

@@ -30,6 +31,18 @@
                {{yesOrNo[uuidUserMap['${uuid}'].userProperties.forcePassword]}}
            </td>
        </tr>
+
+        <% customUserViewFragments.each { fragment -> %>


Same here as above

dkayiwa · 2018-07-24T10:07:02Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

 	                   HttpServletRequest request, UiUtils uu) throws IOException {

 		Errors errors = new BeanPropertyBindingResult(account, "account");
+
+        List<Extension> customUserPropertyFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountUserFragment");


The extension names also need to reflect these changes.

Changed @dkayiwa

dkayiwa · 2018-07-24T10:39:00Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

-
+
+		List<Extension> customPersonAttributeEditFragments =
+				appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountPersonAttributeFragment");


Shouldn't the extension name include "Edit"?

@dkayiwa Just changed to "createUser.manageAccountPersonAttributeEditFragment"

dkayiwa · 2018-07-24T14:04:52Z

api/src/main/java/org/openmrs/module/adminui/account/Account.java

+	}
+
+	/**
+	 * Gets the person attribute for the specified person for the getPersonAttributeTypeByUuid


Does the javadoc have to talk about implementation details? (The actual API method being called)

dkayiwa · 2018-07-24T14:05:12Z

api/src/main/java/org/openmrs/module/adminui/account/Account.java

+	 * Gets the person attribute for the specified person for the getPersonAttributeTypeByUuid
+	 * that matches the specified uuid
+	 *
+	 * @return the attribute


Can you document the above return?

dkayiwa · 2018-07-24T14:07:14Z

...a/org/openmrs/module/adminui/page/controller/systemadmin/accounts/AccountPageController.java

 	                   HttpServletRequest request, UiUtils uu) throws IOException {

 		Errors errors = new BeanPropertyBindingResult(account, "account");
+
+        List<Extension> customUserPropertyEditFragments =


Since some times you are not creating a user, but just updating their details, can we use a convention like? userAccount.userPropertyEditFragment

Changed @dkayiwa

…ents to the dashboard Minor fix Minor fix PR review fixes PR review fixes PR review fixes PR review fixes PR review fixes PR review fixes PR review fixes PR review fixes PR review fixes

suthagar23 force-pushed the suthagar23:RA-1513 branch from 2e0916a to b25fc14 Jul 20, 2018

suthagar23 changed the title ~~RA-1513 Added support to allow the extensions to add the custom fragments to the dashboard~~ RA-1513 Added support to allow the extensions to add the custom fragments to the Manage Account dashboard Jul 20, 2018

suthagar23 requested a review from wluyima Jul 20, 2018

dkayiwa reviewed Jul 22, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch 2 times, most recently from d28ab9b to 1703c78 Jul 23, 2018

dkayiwa reviewed Jul 23, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch from 1703c78 to 6190223 Jul 23, 2018

dkayiwa reviewed Jul 23, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch from 6190223 to a631a90 Jul 23, 2018

dkayiwa reviewed Jul 23, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch from a631a90 to 29246e6 Jul 24, 2018

dkayiwa reviewed Jul 24, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch from 29246e6 to c7933f9 Jul 24, 2018

dkayiwa reviewed Jul 24, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch from c7933f9 to e63eb92 Jul 24, 2018

dkayiwa reviewed Jul 24, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch from e63eb92 to ef6fca2 Jul 24, 2018

dkayiwa reviewed Jul 24, 2018

View changes

suthagar23 force-pushed the suthagar23:RA-1513 branch from ef6fca2 to c004c11 Jul 24, 2018

dkayiwa merged commit e3832ab into openmrs:master Jul 24, 2018
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details



		List<Extension> customPersonFragments = appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountPersonFragment");
		Collections.sort(customPersonFragments);



		so = new SimpleObject();
		for(Extension ext : customPersonEditFragments) {



		List<Extension> customPersonAttributeEditFragments =
		appFrameworkService.getExtensionsForCurrentUser("createUser.manageAccountPersonAttributeFragment");

openmrs / openmrs-module-adminui

RA-1513 Added support to allow the extensions to add the custom fragments to the Manage Account dashboard #44

RA-1513 Added support to allow the extensions to add the custom fragments to the Manage Account dashboard #44

Conversation

suthagar23 commented Jul 20, 2018

Description

Ticket Information

This comment has been minimized.

dkayiwa Jul 22, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 22, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 22, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 • edited Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 23, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

suthagar23 Jul 24, 2018 Author Member

This comment has been minimized.

dkayiwa Jul 23, 2018 Member

This comment has been minimized.

dkayiwa Jul 22, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 22, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 22, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018 •

edited

Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 23, 2018
Author Member

dkayiwa Jul 23, 2018
Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 23, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member

dkayiwa Jul 24, 2018
Member

dkayiwa Jul 24, 2018
Member

suthagar23 Jul 24, 2018
Author Member