From dd5b204fbf5943573b98a1f19b74de4a3a3887b5 Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 1 Sep 2017 17:47:42 +0530 Subject: [PATCH] message pops up when no system available. need to correct the design. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 15 +++++++-------- 400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js | 6 +++++- 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html | 72 +++++++++++++++++++++++++++++++++++++++++++----------------------------- 3 files changed, 55 insertions(+), 38 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index f431cb3..f0b54de 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1,8 +1,8 @@  'use strict'; -AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService","TermService", - function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService) { +AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService","TermService","AIAConstants", + function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService, AIAConstants) { $scope.genderId = ""; @@ -2645,11 +2645,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } - if ($scope.layerNumber == 224) - { - } - else { - + var worker = new Worker('term-number-wp.js'); //push workers in array to further used the refernece to delete the workers @@ -2799,7 +2795,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l worker.onerror = function (e) { alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message); }; - } + } } }, 100) @@ -2857,6 +2853,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } } + + $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE; + $("#daMessageModal").modal('show'); } else { console.log('1. HighlightBodyByTermListForBodySystem is called'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 8bcb88d..403ff17 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -335,7 +335,8 @@ AIA.constant("AdminConstants", { "ERROR_IN_SENDING_MAIL": "Some internal error occured.", "MAIL_SENT": "Mail sent.", "MAIL_NOT_SENT": "Mail not sent.", - "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon." + "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon.", + }) AIA.constant("UserTypeConstants", { "SUPER_ADMIN": "Super Admin", @@ -418,7 +419,10 @@ AIA.constant("UserModules", [ "slug": "Link/aod" } ]); +AIA.constant("AIAConstants", { + "NO_BODY_SYSTEM_AVAILABLE" : "No body system available in this layer.", +}) AIA.config(function ($routeProvider, pages, $locationProvider) { $locationProvider.html5Mode(true); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 4b3ffbd..5f04996 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -169,17 +169,17 @@
  • Current Structure
  • +
  • Digestive
  • +
  • Endocrine
  • +
  • Immune
  • +
  • Integumentary
  • +
  • Lymphatic
  • +
  • Muscular
  • +
  • Nervous
  • +
  • Reproductive
  • +
  • Respiratory
  • +
  • Skeletal
  • +
  • Urinary
  • -->
  • Cardiovascular
  • Digestive
  • @@ -212,7 +212,7 @@ Female +
  • Female
  • --> @@ -222,11 +222,11 @@