renames field translater to field translator because that's how it's …

…spelt ... refs #1621
openhealthcare · Nov 22, 2018 · 5e6e991 · 5e6e991
1 parent 6478aae
commit 5e6e991
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/opal/core/application.py b/opal/core/application.py
@@ -67,7 +67,7 @@ class OpalApplication(object):
             "js/opal/services/episode_resource.js",
             "js/opal/services/record_editor.js",
             "js/opal/services/patientlist_loader.js",
-            'js/opal/services/fields_translater.js',
+            'js/opal/services/fields_translator.js',
             'js/opal/services/referencedata.js',
             'js/opal/services/metadata.js',
             'js/opal/services/patient_consultation_record.js',

diff --git a/opal/core/pathway/static/js/pathway/services/pathway.js b/opal/core/pathway/static/js/pathway/services/pathway.js
@@ -1,5 +1,5 @@
 angular.module('opal.services').service('Pathway', function(
-    $http, FieldTranslater, $q, $controller, $window, $rootScope
+    $http, FieldTranslator, $q, $controller, $window, $rootScope
 ){
     "use strict";
     var Pathway = function(pathwayDefinition, episode){
@@ -88,12 +88,12 @@ angular.module('opal.services').service('Pathway', function(
             if(_.isArray(val)){
               result = _.map(val, function(x){
                 delete x._client;
-                return FieldTranslater.jsToSubrecord(x, key);
+                return FieldTranslator.jsToSubrecord(x, key);
               });
             }
             else{
               delete val._client;
-              result = [FieldTranslater.jsToSubrecord(val, key)];
+              result = [FieldTranslator.jsToSubrecord(val, key)];
             }
             return _.filter(result, function(subrecord){
                 return _.size(subrecord);

diff --git a/opal/core/pathway/static/js/test/pathway.service.test.js b/opal/core/pathway/static/js/test/pathway.service.test.js
@@ -1,7 +1,7 @@
 describe('Pathway', function() {
   "use strict";
   var pathway, Pathway, $httpBackend, $rootScope;
-  var FieldTranslater, pathwayScope, $window;
+  var FieldTranslator, pathwayScope, $window;
 
   var pathwayDefinition = {
     icon: undefined,
@@ -36,7 +36,7 @@ describe('Pathway', function() {
       Pathway = $injector.get('Pathway');
       $httpBackend = $injector.get('$httpBackend');
       $rootScope = $injector.get('$rootScope');
-      FieldTranslater = $injector.get('FieldTranslater');
+      FieldTranslator = $injector.get('FieldTranslator');
     });
 
     pathwayScope = $rootScope.$new();
@@ -134,7 +134,7 @@ describe('Pathway', function() {
 
   describe('finish', function(){
     beforeEach(function(){
-      spyOn(FieldTranslater, "jsToSubrecord").and.returnValue({
+      spyOn(FieldTranslator, "jsToSubrecord").and.returnValue({
         "interesting": true
       });
     });

diff --git a/opal/static/js/opal/controllers/add_episode.js b/opal/static/js/opal/controllers/add_episode.js
@@ -4,7 +4,7 @@ angular.module('opal.controllers')
         function($scope, $http,
                  $timeout, $routeParams,
                  $modalInstance, $rootScope,
-                 Episode, FieldTranslater,
+                 Episode, FieldTranslator,
                  referencedata,
                  demographics,
                  tags){
@@ -39,7 +39,7 @@ angular.module('opal.controllers')
               $scope.editing.start = doa;
             }
 
-            var toSave = FieldTranslater.jsToPatient($scope.editing);
+            var toSave = FieldTranslator.jsToPatient($scope.editing);
 
 		        $http.post('/api/v0.1/episode/', toSave).success(function(episode) {
 			        episode = new Episode(episode);

diff --git a/opal/static/js/opal/services/episode.js b/opal/static/js/opal/services/episode.js
@@ -4,7 +4,7 @@
 angular.module('opal.services')
     .factory('Episode', function(
         $http, $q, $rootScope, $routeParams, $window,
-        Item, RecordEditor, FieldTranslater) {
+        Item, RecordEditor, FieldTranslator) {
         "use strict";
 
         // TODO: Set this with a more idiomatic Angular way, and set it once.
@@ -273,7 +273,7 @@ recently changed it - refresh the page and try again');
                 if(!result.patients.length){
                     callbacks.newPatient(result);
                 }else if(result.patients.length == 1){
-                    var patient = FieldTranslater.patientToJs(result.patients[0]);
+                    var patient = FieldTranslator.patientToJs(result.patients[0]);
                     callbacks.newForPatient(patient)
                 }else{
                     callbacks.error();

diff --git a/...tic/js/opal/services/fields_translater.js → ...tic/js/opal/services/fields_translator.js b/...tic/js/opal/services/fields_translater.js → ...tic/js/opal/services/fields_translator.js
@@ -1,4 +1,4 @@
-angular.module('opal.services').service('FieldTranslater', function($rootScope){
+angular.module('opal.services').service('FieldTranslator', function($rootScope){
   "use strict";
   /* this service provides translation to js, ie casting date fields and datetime
   * fields to moments

diff --git a/opal/static/js/opal/services/item.js b/opal/static/js/opal/services/item.js
@@ -1,5 +1,5 @@
 angular.module('opal.services')
-    .factory('Item', function($http, $q, $injector, $window, FieldTranslater) {
+    .factory('Item', function($http, $q, $injector, $window, FieldTranslator) {
         return function(attrs, episode, columnSchema) {
             var item = this;
             this.episode =  episode;
@@ -13,7 +13,7 @@ angular.module('opal.services')
                     delete item[field.name];
                 });
 
-                var toUpdate = FieldTranslater.subRecordToJs(attrs, columnSchema.name);
+                var toUpdate = FieldTranslator.subRecordToJs(attrs, columnSchema.name);
                 angular.extend(item, toUpdate);
                 if(columnSchema.angular_service){
                     var serv = $injector.get(columnSchema.angular_service);
@@ -65,7 +65,7 @@ angular.module('opal.services')
 
             // casts to dates/datetimes to the format the server reads dates
             this.castToType = function(attrs){
-                return FieldTranslater.jsToSubrecord(attrs, columnSchema.name);
+                return FieldTranslator.jsToSubrecord(attrs, columnSchema.name);
             }
 
             //

diff --git a/opal/static/js/opal/services/patient.js b/opal/static/js/opal/services/patient.js
@@ -1,8 +1,8 @@
-angular.module('opal.services').service('Patient', function(Episode, FieldTranslater) {
+angular.module('opal.services').service('Patient', function(Episode, FieldTranslator) {
   "use strict";
   var Patient = function(patientData){
     var self = this;
-    _.extend(this, FieldTranslater.patientToJs(patientData));
+    _.extend(this, FieldTranslator.patientToJs(patientData));
     this.episodes = _.map(this.episodes, function(resource) {
       return new Episode(resource);
     });

diff --git a/opal/static/js/opal/services/patient_loader.js b/opal/static/js/opal/services/patient_loader.js
@@ -1,6 +1,6 @@
 angular.module('opal.services').factory('patientLoader', function(
     $q, $window, $http, $route,
-    recordLoader, FieldTranslater, Patient
+    recordLoader, FieldTranslator, Patient
 ){
   return function(patientId) {
     "use strict";

diff --git a/opal/static/js/test/field_translate.service.test.js b/opal/static/js/test/field_translate.service.test.js
@@ -1,15 +1,15 @@
 describe('services', function() {
     "use strict";
 
-    var $rootScope, FieldTranslater, patientData, jsPatientData;
+    var $rootScope, FieldTranslator, patientData, jsPatientData;
     var opalTestHelper;
 
     beforeEach(function(){
       module('opal.services');
       module('opal.test');
       inject(function($injector){
           $rootScope   = $injector.get('$rootScope');
-          FieldTranslater = $injector.get('FieldTranslater');
+          FieldTranslator = $injector.get('FieldTranslator');
           opalTestHelper = $injector.get('opalTestHelper')
       })
 
@@ -60,12 +60,12 @@ describe('services', function() {
 
     describe('translateFieldsToJs()', function() {
         it('should convert dates to moments', function() {
-            var f = FieldTranslater.translateFieldsToJs({type:'date'}, new Date(2014, 2, 3));
+            var f = FieldTranslator.translateFieldsToJs({type:'date'}, new Date(2014, 2, 3));
             expect(moment.isMoment(f)).toEqual(true);
         });
 
         it('should convert date times to moments', function() {
-            var f = FieldTranslater.translateFieldsToJs(
+            var f = FieldTranslator.translateFieldsToJs(
                 {type:'date_time'}, new Date(2014, 2, 3, 11, 45, 9)
             );
             expect(moment.isMoment(f)).toEqual(true);
@@ -74,7 +74,7 @@ describe('services', function() {
 
     describe("jsToPatient", function(){
       it("should cast date and datetime fields", function(){
-          var result = FieldTranslater.jsToPatient(jsPatientData);
+          var result = FieldTranslator.jsToPatient(jsPatientData);
           expect(result.demographics).toEqual(patientData.demographics[0]);
       });
 
@@ -84,7 +84,7 @@ describe('services', function() {
 
           patientData.demographics[0].age = "35";
           patientData.demographics[0].weight = "12.2";
-          var result = FieldTranslater.jsToPatient(jsPatientData);
+          var result = FieldTranslator.jsToPatient(jsPatientData);
           expect(result.demographics).toEqual(patientData.demographics[0]);
       });
 
@@ -95,7 +95,7 @@ describe('services', function() {
 
             patientData.demographics[0].age = undefined;
             patientData.demographics[0].weight = undefined;
-            var result = FieldTranslater.jsToPatient(jsPatientData);
+            var result = FieldTranslator.jsToPatient(jsPatientData);
             expect(result.demographics).toEqual(patientData.demographics[0]);
         });
       });
@@ -107,7 +107,7 @@ describe('services', function() {
 
         patientData.demographics[0].age = undefined;
         patientData.demographics[0].weight = undefined;
-        var result = FieldTranslater.jsToPatient(jsPatientData);
+        var result = FieldTranslator.jsToPatient(jsPatientData);
         expect(result.demographics).toEqual(patientData.demographics[0]);
       });
 
@@ -118,41 +118,41 @@ describe('services', function() {
 
         patientData.demographics[0].age = null;
         patientData.demographics[0].weight = null;
-        var result = FieldTranslater.jsToPatient(jsPatientData);
+        var result = FieldTranslator.jsToPatient(jsPatientData);
         expect(result.demographics).toEqual(patientData.demographics[0]);
       })
 
 
       it('should handle strings with trailing spaces passed to dates', function(){
         jsPatientData.demographics.date_of_birth = "31/07/1980 ";
-        var result = FieldTranslater.jsToPatient(jsPatientData);
+        var result = FieldTranslator.jsToPatient(jsPatientData);
         expect(result.demographics).toEqual(patientData.demographics[0]);
       });
 
       it('should handle strings with trailing spaces passed to date times', function(){
         jsPatientData.demographics.created = "07/04/2015 11:45:00 ";
-        var result = FieldTranslater.jsToPatient(jsPatientData);
+        var result = FieldTranslator.jsToPatient(jsPatientData);
         expect(result.demographics).toEqual(patientData.demographics[0]);
       });
 
       it('should handle spaces  passed to dates', function(){
         jsPatientData.demographics.date_of_birth = "  ";
         patientData.demographics[0].date_of_birth = undefined;
-        var result = FieldTranslater.jsToPatient(jsPatientData);
+        var result = FieldTranslator.jsToPatient(jsPatientData);
         expect(result.demographics).toEqual(patientData.demographics[0]);
       });
 
       it('should handle spaces  passed to date times', function(){
         jsPatientData.demographics.created = "  ";
         patientData.demographics[0].created = undefined;
-        var result = FieldTranslater.jsToPatient(jsPatientData);
+        var result = FieldTranslator.jsToPatient(jsPatientData);
         expect(result.demographics).toEqual(patientData.demographics[0]);
       });
     });
 
     describe("patientToJs", function(){
       it("should cast date and datetime fields to moments", function(){
-          var result = FieldTranslater.patientToJs(patientData);
+          var result = FieldTranslator.patientToJs(patientData);
           expect(result.id).toEqual(123);
           var dob = result.demographics[0].date_of_birth.toDate()
           expect(dob).toEqual(new Date(1980, 6, 31));