ADAM / AIAHTML5

Commit ca8fd718e299e90976c46dcdf07c9238f249a132

Authored by unknown
2 parents 4608b011 51fabdf9

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into LexiconImplementation 

Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
Inline Side-by-side
Showing 18 changed files with 142 additions and 57 deletions
150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 27(13-Jan-17).ods 0 → 100644
View file @ca8fd71
No preview for this file type
150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 28(31-Jan-17).ods 0 → 100644
View file @ca8fd71
No preview for this file type
150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 29(13-Feb-17).ods 0 → 100644
View file @ca8fd71
No preview for this file type
150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17)(1).ods 0 → 100644
View file @ca8fd71
No preview for this file type
150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17).ods 0 → 100644
View file @ca8fd71
No preview for this file type
400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
  View file @ca8fd71
... ... @@ -49,13 +49,13 @@ namespace AIAHTML5.API.Controllers
49 49 {
50 50 logger.Debug("2. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
51 51  
52   - isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, true);
  52 + isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
53 53 }
54 54 else
55 55 {
56 56 logger.Debug("3. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
57 57  
58   - isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, false);
  58 + isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
59 59 }
60 60 logger.Debug("isMailSent= " + isMailSent);
61 61 if (isMailSent)
... ...
400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
  View file @ca8fd71
... ... @@ -21,7 +21,7 @@ namespace AIAHTML5.API.Models
21 21 public static bool SendEmail(dynamic UserDetails, bool havePassword)
22 22 {
23 23 ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
24   - logger.Debug("inside SendEmail in for isPassword =" + havePassword);
  24 + logger.Debug("inside SendEmail in for havePassword =" + havePassword);
25 25  
26 26 try
27 27 {
... ...
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @ca8fd71
... ... @@ -37,9 +37,9 @@
37 37 <add key="SMTPAddress" value="10.100.12.13" />
38 38 <add key="SMTPPort" value="25" />
39 39 <add key="EnableSSL" value="false" />
40   - <add key="Site_Url" value ="//52.2.38.120"/>
  40 + <add key="Site_Url" value ="http://34.207.39.107/"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="true"/>
  42 + <add key="isUserAuthenticated" value="false"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
44 44 </appSettings>
45 45 <system.web>
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @ca8fd71
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
  View file @ca8fd71
... ... @@ -37,7 +37,7 @@
37 37 <add key="SMTPAddress" value="10.100.12.13" />
38 38 <add key="SMTPPort" value="25" />
39 39 <add key="EnableSSL" value="false" />
40   - <add key="Site_Url" value ="//52.2.38.120"/>
  40 + <add key="Site_Url" value ="http://34.207.39.107/"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42 42 <add key="isUserAuthenticated" value="false"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @ca8fd71
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
  View file @ca8fd71
1   -AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log","$location",
2   -function ($scope, $rootScope, pages, log, $location) {
3   - $scope.showTabButton = true;
4   - $scope.IsVisible = function () {
5   - $scope.scroll();
6   -
7   - }
8   -
9   - $scope.scroll = function () {
10   - // $window.scrollTo(0, 0);
11   - $("html,body").scrollTop(0);
12   - //alert("scroll");
13   - }
14   - $scope.$on('$viewContentLoaded', function (event) {
15   - // code that will be executed ...
16   - // every time this view is loaded
17   -
  1 +AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log", "$location",
  2 +function ($scope, $rootScope, pages, log, $location) {
  3 + $scope.showTabButton = true;
  4 + $scope.IsVisible = function () {
  5 + $scope.scroll();
  6 +
  7 + }
  8 +
  9 + $scope.scroll = function () {
  10 + // $window.scrollTo(0, 0);
  11 + $("html,body").scrollTop(0);
  12 + //alert("scroll");
  13 + }
  14 + $scope.$on('$viewContentLoaded', function (event) {
  15 + // code that will be executed ...
  16 + // every time this view is loaded
  17 +
18 18 //get current path
19 19 var currentURL = $location.path();
20 20 var selectedModuleName = '';
... ... @@ -24,11 +24,11 @@ function ($scope, $rootScope, pages, log, $location) {
24 24 selectedModuleName = value.name;
25 25 }
26 26 $rootScope.currentActiveModuleTitle = selectedModuleName;
27   - })
28   - })
29   -
30   -}]
31   -
32   -
33   -
  27 + })
  28 + })
  29 +
  30 +}]
  31 +
  32 +
  33 +
34 34 );
35 35 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @ca8fd71
... ... @@ -552,7 +552,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
552 552 ' kind="captions" srclang="en" label="On"><object width="640" height="360"' +
553 553 ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' +
554 554 ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' +
555   - ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
  555 + ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
556 556  
557 557 //ajax: {
558 558 // url: 'app/views/ca/ca-view-detail.html'
... ... @@ -581,12 +581,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
581 581 var videoHeight = $('#divplayerinlineVideo div').height();
582 582 if (videoHeight <= 0)
583 583 videoHeight = 360;
584   - var textH = $('.well').height();
  584 + var textH = $('.video-subtitle').height();
585 585 textH = textH + 40;
586 586 var blackBorderHeight = jspContentHeight - (videoHeight + textH);
587 587  
588 588 if ($('.jsPanel-content').length > 0) {
589   - $('.well').css('margin-bottom', blackBorderHeight);
  589 + $('.video-subtitle').css('margin-bottom', blackBorderHeight);
590 590 $('#divplayerinlineVideo').css('background', '#fff');
591 591 }
592 592  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @ca8fd71
... ... @@ -158,7 +158,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
158 158 };
159 159  
160 160 $scope.loadAllCI = function () {
161   -
  161 + $('#ciSpinner').css('visibility', 'visible');
  162 + $('#ciSpinner').css('zIndex', '20000');
162 163 var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json')
163 164 promise.then(
164 165 function (result) {
... ... @@ -170,32 +171,41 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
170 171 .select();
171 172  
172 173 // console.log($scope.selectedCIListViewData);
173   - $('#grid-view').empty();
174   - angular.forEach($scope.selectedCIListViewData, function (value, key) {
175   - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
  174 +
176 175  
177   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  176 +
  177 + $('#grid-view').empty();
  178 + var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" ><div id="{{value._id}}" class="col-sm-3 col-md-2" title = "{{value._Title}}" data-ng-click="openView($event)">'
178 179 + '<div class="thumbnail" >'
179   - + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
180   - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  180 + + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
  181 + + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
  182 + $compile($e1)($scope);
  183 + //angular.forEach($scope.selectedCIListViewData, function (value, key) {
  184 + // $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
181 185  
  186 + // var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  187 + // + '<div class="thumbnail" >'
  188 + // + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
  189 + // + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
182 190  
183   - $compile($el)($scope);
184 191  
185   - $(".sidebar").mCustomScrollbar({
186   - autoHideScrollbar: true,
187   - //theme:"rounded"
188   - });
  192 + // $compile($el)($scope);
189 193  
190   - });
  194 + // $(".sidebar").mCustomScrollbar({
  195 + // autoHideScrollbar: true,
  196 + // //theme:"rounded"
  197 + // });
191 198  
  199 + //});
  200 +
  201 + $timeout(function () { $('#ciSpinner').css('visibility', 'hidden'); }, 300);
192 202 },
193 203 function (error) {
194 204 // handle errors here
195 205 console.log(' $scope.IllustrationData = ' + error.statusText);
196 206 }
197 207 );
198   -
  208 +
199 209 }
200 210  
201 211 $scope.IsVisible = function () {
... ... @@ -583,7 +593,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
583 593 parentSlug: 'clinical-illustrations',
584 594 content: '<div class="row" id="canvasDiv"><div style="align:left;width:100%;height:100%"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' +
585 595 '<div class="col-sm-12 img-thumbnail" align="center">' +
586   - '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well">' +
  596 + '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
587 597 '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
588 598 '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +
589 599 '</div></div>',
... ... @@ -612,14 +622,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
612 622 var imgHeight = $('.img-thumbnail').find('img').height();
613 623 if (imgHeight <= 0)
614 624 imgHeight = 320;
615   - var textH = $('.well').height();
  625 + var textH = $('.img-subtitle').height();
616 626 textH = textH + 40;
617 627 var blackBorderHeight = jspContentHeight - (imgHeight + textH);
618 628 if ($('.jsPanel-content').length > 0) {
619   - $('.jsPanel-btn-min').attr('style', 'display: none');
620   - $('.jsPanel-btn-max').attr('style', 'display: none');
621   - $('.jsPanel-btn-norm').attr('style', 'display: none');
622   - $('.well').css('margin-bottom', blackBorderHeight);
  629 + $('.img-subtitle').css('margin-bottom', blackBorderHeight);
623 630 }
624 631 }
625 632  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ca8fd71
... ... @@ -428,7 +428,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
428 428 //da-body-views functions
429 429  
430 430 $scope.openBodyView = function () {
431   -
  431 + //Check if browser 'REFRESHED' or 'RELOADED'
  432 + if ($rootScope.CommonData != null) {
432 433 //0. we will initially append container to load body
433 434  
434 435 //check if localstorage has any settings
... ... @@ -455,7 +456,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
455 456 $rootScope.isVisibleLogin = false;
456 457 $rootScope.loadSearchDataForBodyView();
457 458  
458   -
459 459 console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
460 460  
461 461 var openViews;
... ... @@ -568,8 +568,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
568 568 $('#daImagePanel').css("left", '1px');
569 569  
570 570 }, 350);
571   - }
  571 + }
  572 + }
  573 + else
  574 + {
  575 + //for now we are redirecting user to index page on page refresh because on refresh we lost the rootscope data and some of application
  576 + //features stopped working which were depenedent of rootscope data like List manager, annotation toolbar, settings, usermodule list, etc.
  577 +
  578 + $location.path('/');
572 579  
  580 + /*relaoding unavailable data for resolving refesh issue*/
  581 + /* console.log('Reloading json data for body view => BROWSER REFRESH ISSUE...');
  582 + $scope.loadDissectibleAnatomyData();
  583 +
  584 + if ((typeof($rootScope.MenuModuleName) == "undefined") || $rootScope.MenuModuleName == null) {
  585 + $rootScope.MenuModuleName = "DA";
  586 + }*/
  587 +
  588 +
  589 + }
573 590 }
574 591  
575 592 angular.element(document).ready(function (e) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ca8fd71
... ... @@ -3611,8 +3611,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3611 3611 }
3612 3612  
3613 3613 $rootScope.CheckRefresh = function (e) {
  3614 + //Checking if 'REFRESHED' or 'RELOADED'
3614 3615 if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey))
3615   - $location.path('/');
  3616 + $location.path('/'); //Redirecting to landing page
3616 3617 };
3617 3618 }]
3618 3619 );
3619 3620 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Link/iframeresizer.html 0 → 100644
  View file @ca8fd71
  1 +
  2 +<html>
  3 +<head>
  4 +<title></title>
  5 +</head>
  6 + <body onload="parentIframeResize();" >
  7 + <script type="text/javascript">
  8 + // Tell the parent iframe what height the iframe needs to be
  9 + function parentIframeResize() {
  10 + var height = getParam('h');
  11 + //checking for broweser IE7/8/9,FF
  12 + if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) { //test for MSIE x.x;
  13 + var ieversion = new Number(RegExp.$1) // capture x.x portion and store as a number
  14 + if (ieversion == 9) {
  15 + if (!parent.parent.name)
  16 + parent.parent.resizeIframe(height);
  17 + else
  18 + parent.resizeIframe(height);
  19 + }
  20 + else {
  21 + if (!parent.parent.parent.id) {
  22 + if (parent.parent.resizeIframe!=undefined)
  23 + parent.parent.parent.resizeIframe(height);
  24 +
  25 + }
  26 + else if (!parent.parent.id) {
  27 + parent.parent.resizeIframe(height);
  28 + }
  29 + else
  30 + parent.resizeIframe(height);
  31 + }
  32 + }
  33 + else {
  34 + if (!parent.parent.name)
  35 + {
  36 + if (parent.parent.resizeIframe!=undefined)
  37 + parent.parent.resizeIframe(height);
  38 + }
  39 + else
  40 + parent.resizeIframe(height);
  41 + }
  42 + }
  43 +
  44 + // Helper function, parse param from request string
  45 + function getParam(name) {
  46 + name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
  47 + var regexS = "[\\?&]" + name + "=([^&#]*)";
  48 + var regex = new RegExp(regexS);
  49 + var results = regex.exec(window.location.href);
  50 + if (results == null)
  51 + return "";
  52 + else
  53 + return results[1];
  54 + }
  55 + </script>
  56 + </body>
  57 +</html>
0 58 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @ca8fd71
... ... @@ -180,6 +180,9 @@
180 180 </div>
181 181 </div>
182 182 </div>
  183 + <div id="ciSpinner" class="spinner" ng-show="isLoading" style="visibility:hidden">
  184 + <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading" />
  185 + </div>
183 186 </div>
184 187  
185 188  
... ...