Vinisha | OB-422 | Refactor while fetching translated section, table …

…names on display control
Bahmni · Feb 27, 2020 · 40c6eaf · 40c6eaf
1 parent 87e790e
commit 40c6eaf
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/ui/app/common/displaycontrols/observation/services/formRecordTreeBuildService.js b/ui/app/common/displaycontrols/observation/services/formRecordTreeBuildService.js
@@ -156,12 +156,8 @@ angular.module('bahmni.common.displaycontrol.observation')
                     }
                 };
                 var translationKey = column.translationKey;
-                if (translationData && translationData.labels && translationData.labels[translationKey][0] !== translationKey) {
-                    obsGroup.concept.shortName = translationData.labels[translationKey][0];
-                }
-                else {
-                    obsGroup.concept.shortName = column.value;
-                }
+                var defaultShortName = column.value;
+                self.setTranslatedShortName(translationData, translationKey, obsGroup, defaultShortName);
                 var columnRecord = self.getColumnObs(index, record);
                 column.children = columnRecord;
                 self.createGroupMembers(column, obsGroup, obsList, translationData);
@@ -171,6 +167,20 @@ angular.module('bahmni.common.displaycontrol.observation')
             });
         };
 
+        self.setTranslatedShortName = function (translationData, translationKey, obsGroup, defaultShortName) {
+            if (self.isTranslationKeyPresent) {
+                obsGroup.concept.shortName = translationData.labels[translationKey][0];
+            }
+            else {
+                obsGroup.concept.shortName = defaultShortName;
+            }
+        };
+
+        self.isTranslationKeyPresent = function (translationData, translationKey) {
+            return translationData && translationData.labels &&
+                translationData.labels[translationKey][0] !== translationKey;
+        };
+
         self.getColumnObs = function (columnIndex, record) {
             var columnChildren = [];
             _.map(record.children, function (child) {
@@ -228,12 +238,8 @@ angular.module('bahmni.common.displaycontrol.observation')
                 }
             };
             var translationKey = record.control.label.translationKey;
-            if (translationData && translationData.labels && translationData.labels[translationKey][0] !== translationKey) {
-                obsGroup.concept.shortName = translationData.labels[translationKey][0];
-            }
-            else {
-                obsGroup.concept.shortName = record.control.label.value;
-            }
+            var defaultShortName = record.control.label.value;
+            self.setTranslatedShortName(translationData, translationKey, obsGroup, defaultShortName);
             return obsGroup;
         };
     }]);