Commit 8599f130199bfe55d12ad35796bd0a520ec72b32

Authored by Amrita Vishnoi
2 parents 089bf91a 6b2b2e64

Merge branch 'TBGrayIssue' into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -32,7 +32,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -32,7 +32,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
32 $scope.layerNumber; 32 $scope.layerNumber;
33 $scope.daCounter = 1; 33 $scope.daCounter = 1;
34 $scope.bagartDetails; 34 $scope.bagartDetails;
35 - $scope.transNumber = 50; 35 + $scope.transNumber = 100;
36 36
37 $rootScope.modestyCanvasZindex = 12100; 37 $rootScope.modestyCanvasZindex = 12100;
38 $rootScope.isModestyCanvasVisible = false; 38 $rootScope.isModestyCanvasVisible = false;
@@ -430,148 +430,147 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -430,148 +430,147 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
430 $scope.openBodyView = function () { 430 $scope.openBodyView = function () {
431 //Check if browser 'REFRESHED' or 'RELOADED' 431 //Check if browser 'REFRESHED' or 'RELOADED'
432 if ($rootScope.CommonData != null) { 432 if ($rootScope.CommonData != null) {
433 - //0. we will initially append container to load body 433 + //0. we will initially append container to load body
434 434
435 - //check if localstorage has any settings  
436 - var curentEthnicity = localStorage.getItem("globalEthnicity");  
437 - if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {  
438 - $rootScope.globalSetting.ethnicity = curentEthnicity;  
439 - } 435 + //check if localstorage has any settings
  436 + var curentEthnicity = localStorage.getItem("globalEthnicity");
  437 + if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {
  438 + $rootScope.globalSetting.ethnicity = curentEthnicity;
  439 + }
440 440
441 - var curentmodesty = localStorage.getItem("globalModesty");  
442 - if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {  
443 - $rootScope.globalSetting.modesty = curentmodesty  
444 - } 441 + var curentmodesty = localStorage.getItem("globalModesty");
  442 + if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {
  443 + $rootScope.globalSetting.modesty = curentmodesty
  444 + }
445 445
446 - //0.1 446 + //0.1
447 447
448 - var currentBodyViewId = localStorage.getItem("currentBodyViewId");  
449 - if (currentBodyViewId == null || currentBodyViewId == undefined) {  
450 - // document.location = '/';  
451 - document.location = '/';  
452 - $rootScope.isVisibleLogin = true; 448 + var currentBodyViewId = localStorage.getItem("currentBodyViewId");
  449 + if (currentBodyViewId == null || currentBodyViewId == undefined) {
  450 + // document.location = '/';
  451 + document.location = '/';
  452 + $rootScope.isVisibleLogin = true;
453 453
454 - }  
455 - else {  
456 - $rootScope.isVisibleLogin = false;  
457 - $rootScope.loadSearchDataForBodyView(); 454 + }
  455 + else {
  456 + $rootScope.isVisibleLogin = false;
  457 + $rootScope.loadSearchDataForBodyView();
458 458
459 - console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); 459 + console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
460 460
461 - var openViews;  
462 - if ($rootScope.openViews != null || $rootScope.openViews != undefined) {  
463 - if ($rootScope.openViews.length > 0) {  
464 - openViews = new jinqJs()  
465 - .from($rootScope.openViews)  
466 - .where("BodyViewId == " + currentBodyViewId)  
467 - .select(); 461 + var openViews;
  462 + if ($rootScope.openViews != null || $rootScope.openViews != undefined) {
  463 + if ($rootScope.openViews.length > 0) {
  464 + openViews = new jinqJs()
  465 + .from($rootScope.openViews)
  466 + .where("BodyViewId == " + currentBodyViewId)
  467 + .select();
  468 + }
468 } 469 }
469 - }  
470 470
471 - // 0.2 getting corresponding body view title  
472 - //var counter = 1;  
473 - var tittle = localStorage.getItem("currentViewTitleFromJson");  
474 - localStorage.setItem("currentViewTitle", tittle); 471 + // 0.2 getting corresponding body view title
  472 + //var counter = 1;
  473 + var tittle = localStorage.getItem("currentViewTitleFromJson");
  474 + localStorage.setItem("currentViewTitle", tittle);
475 475
476 - //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD  
477 - //if (openViews != null && openViews != undefined) {  
478 - // angular.forEach(openViews, function (value, key) { 476 + //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD
  477 + //if (openViews != null && openViews != undefined) {
  478 + // angular.forEach(openViews, function (value, key) {
479 479
480 - // if (value.bodyView == tittle) {  
481 - // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++;  
482 - // $rootScope.currentActiveViewTitle = tittle;  
483 - // localStorage.setItem("currentViewTitle", tittle);  
484 - // } 480 + // if (value.bodyView == tittle) {
  481 + // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++;
  482 + // $rootScope.currentActiveViewTitle = tittle;
  483 + // localStorage.setItem("currentViewTitle", tittle);
  484 + // }
485 485
486 - // });  
487 - //}  
488 - //else {  
489 - // localStorage.setItem("currentViewTitle", tittle);  
490 - //} 486 + // });
  487 + //}
  488 + //else {
  489 + // localStorage.setItem("currentViewTitle", tittle);
  490 + //}
491 491
492 - //0.3 492 + //0.3
493 493
494 - $.jsPanel({  
495 - id: 'daImagePanel',  
496 - selector: '.daBodyView',  
497 - theme: 'success',  
498 - currentController: 'DAController',  
499 - parentSlug: 'da-view-list',  
500 - ajax: {  
501 - url: 'app/views/da/da-view.html'  
502 - },  
503 - title: localStorage.getItem("currentViewTitle"), 494 + $.jsPanel({
  495 + id: 'daImagePanel',
  496 + selector: '.daBodyView',
  497 + theme: 'success',
  498 + currentController: 'DAController',
  499 + parentSlug: 'da-view-list',
  500 + ajax: {
  501 + url: 'app/views/da/da-view.html'
  502 + },
  503 + title: localStorage.getItem("currentViewTitle"),
504 504
505 - position: {  
506 - top: 70,  
507 - left: 1,  
508 - }, 505 + position: {
  506 + top: 70,
  507 + left: 1,
  508 + },
509 509
510 - size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, 510 + size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
511 511
512 - }); 512 + });
513 513
514 - console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))  
515 - //0.1  
516 - $rootScope.currentSlug = 'da-body-view'; 514 + console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))
  515 + //0.1
  516 + $rootScope.currentSlug = 'da-body-view';
517 517
518 - //0.2  
519 - $rootScope.openViews.push(  
520 - {  
521 - "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,  
522 - "slug": $rootScope.currentSlug  
523 - }  
524 - ); 518 + //0.2
  519 + $rootScope.openViews.push(
  520 + {
  521 + "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
  522 + "slug": $rootScope.currentSlug
  523 + }
  524 + );
525 525
526 - //0.3  
527 - var daBodyviewElement = angular.element(document.getElementById("daBodyview")); 526 + //0.3
  527 + var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
528 528
529 - $timeout(function () {  
530 - $compile(daBodyviewElement.contents())($scope); 529 + $timeout(function () {
  530 + $compile(daBodyviewElement.contents())($scope);
531 531
532 - console.log('html is compiled' + document.getElementById('daView'))  
533 - if (document.getElementById('daView') != null) { 532 + console.log('html is compiled' + document.getElementById('daView'))
  533 + if (document.getElementById('daView') != null) {
534 534
535 - //0.4 added some stylesheets  
536 - $('#daBodyview').css("height", $(window).outerHeight()); 535 + //0.4 added some stylesheets
  536 + $('#daBodyview').css("height", $(window).outerHeight());
537 537
538 - $('#daBodyview').css("width", $(window).outerWidth()); 538 + $('#daBodyview').css("width", $(window).outerWidth());
539 539
540 - //1. load navigator man first  
541 - console.log('before LoadBodyViewNavigatorImage call')  
542 - $scope.LoadBodyViewNavigatorImage(); 540 + //1. load navigator man first
  541 + console.log('before LoadBodyViewNavigatorImage call')
  542 + $scope.LoadBodyViewNavigatorImage();
543 543
544 - //$rootScope.loadSearchDataForBodyView(); 544 + //$rootScope.loadSearchDataForBodyView();
545 545
546 - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); 546 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
547 547
548 - $scope.layerNumber = 0; 548 + $scope.layerNumber = 0;
549 549
550 - //2. 550 + //2.
551 551
552 552
553 - console.log('currentBodyViewId just before sending: ' + currentBodyViewId);  
554 - $scope.loadBodyViewData(currentBodyViewId); 553 + console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
  554 + $scope.loadBodyViewData(currentBodyViewId);
555 555
556 - //2. load bodyRegion data  
557 - $rootScope.isLoading = true;  
558 - $rootScope.voId = localStorage.getItem("currentBodyViewId");  
559 - }  
560 - $('#daBodyview').css("height", $(window).outerHeight()); 556 + //2. load bodyRegion data
  557 + $rootScope.isLoading = true;
  558 + $rootScope.voId = localStorage.getItem("currentBodyViewId");
  559 + }
  560 + $('#daBodyview').css("height", $(window).outerHeight());
561 561
562 - $('#daBodyview').css("width", $(window).outerWidth()); 562 + $('#daBodyview').css("width", $(window).outerWidth());
563 563
564 - if ($('#daImagePanel').offset().top == 0)  
565 - $('#daImagePanel').css("top", '70px'); 564 + if ($('#daImagePanel').offset().top == 0)
  565 + $('#daImagePanel').css("top", '70px');
566 566
567 - if ($('#daImagePanel').offset().left == 0)  
568 - $('#daImagePanel').css("left", '1px'); 567 + if ($('#daImagePanel').offset().left == 0)
  568 + $('#daImagePanel').css("left", '1px');
569 569
570 - }, 350);  
571 - }  
572 - }  
573 - else  
574 - { 570 + }, 350);
  571 + }
  572 + }
  573 + else {
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 574 //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. 575 //features stopped working which were depenedent of rootscope data like List manager, annotation toolbar, settings, usermodule list, etc.
577 576
@@ -586,7 +585,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -586,7 +585,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
586 }*/ 585 }*/
587 586
588 587
589 - } 588 + }
590 } 589 }
591 590
592 angular.element(document).ready(function (e) { 591 angular.element(document).ready(function (e) {
@@ -653,11 +652,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -653,11 +652,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
653 }) 652 })
654 // $rootScope.languageArray = []; 653 // $rootScope.languageArray = [];
655 $rootScope.loadSearchDataForBodyView = function () { 654 $rootScope.loadSearchDataForBodyView = function () {
656 - 655 +
657 var languageArray = []; 656 var languageArray = [];
658 $rootScope.vocabTermDataArray = []; 657 $rootScope.vocabTermDataArray = [];
659 var languageArray = $rootScope.lexiconLanguageArray; 658 var languageArray = $rootScope.lexiconLanguageArray;
660 - 659 +
661 console.log(languageArray.length); 660 console.log(languageArray.length);
662 console.log('loadSearchDataForBodyView'); 661 console.log('loadSearchDataForBodyView');
663 662
@@ -688,14 +687,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -688,14 +687,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
688 $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt }); 687 $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt });
689 688
690 for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) { 689 for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
691 - 690 +
692 691
693 $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs() 692 $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs()
694 .from($rootScope.vocabTermDataArray[i].vocabTermTxt) 693 .from($rootScope.vocabTermDataArray[i].vocabTermTxt)
695 .distinct('_TermText', '_ActualTermNumber') 694 .distinct('_TermText', '_ActualTermNumber')
696 .orderBy([{ field: '_TermText', sort: 'asc' }]) 695 .orderBy([{ field: '_TermText', sort: 'asc' }])
697 .select('_ActualTermNumber', '_TermText', '_cdId'); 696 .select('_ActualTermNumber', '_TermText', '_cdId');
698 - 697 +
699 console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText); 698 console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText);
700 699
701 } 700 }
@@ -1588,7 +1587,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1588,7 +1587,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1588 if ($rootScope.multiAnnotationIsON == true) { 1587 if ($rootScope.multiAnnotationIsON == true) {
1589 1588
1590 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1589 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1591 - 1590 +
1592 $scope.MultiLanguageAnnationArray = []; 1591 $scope.MultiLanguageAnnationArray = [];
1593 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1592 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
1594 1593
@@ -1608,7 +1607,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1608,7 +1607,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1608 1607
1609 1608
1610 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1609 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1611 - // alert(annotationText); 1610 + // alert(annotationText);
1612 $scope.MultiLanguageAnnationArray = []; 1611 $scope.MultiLanguageAnnationArray = [];
1613 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1612 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
1614 1613
@@ -1619,7 +1618,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1619,7 +1618,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1619 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true); 1618 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1620 } 1619 }
1621 else { 1620 else {
1622 - // alert(annotationText); 1621 + // alert(annotationText);
1623 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1622 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1624 $scope.MultiLanguageAnnationArray = []; 1623 $scope.MultiLanguageAnnationArray = [];
1625 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1624 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
@@ -1992,7 +1991,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1992,7 +1991,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1992 if ($rootScope.multiAnnotationIsON == true) { 1991 if ($rootScope.multiAnnotationIsON == true) {
1993 1992
1994 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1993 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1995 - // alert(annotationText); 1994 + // alert(annotationText);
1996 $scope.MultiLanguageAnnationArray = []; 1995 $scope.MultiLanguageAnnationArray = [];
1997 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1996 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
1998 1997
@@ -2019,7 +2018,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2019,7 +2018,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2019 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 2018 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
2020 2019
2021 2020
2022 - 2021 +
2023 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 2022 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
2024 2023
2025 $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); 2024 $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
@@ -2860,12 +2859,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2860,12 +2859,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2860 } 2859 }
2861 } 2860 }
2862 } 2861 }
2863 - 2862 +
2864 return annotation; 2863 return annotation;
2865 } 2864 }
2866 2865
2867 $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) { 2866 $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) {
2868 - 2867 +
2869 var Annotation; 2868 var Annotation;
2870 $scope.ActualTermNo = actualTermNo; 2869 $scope.ActualTermNo = actualTermNo;
2871 for (var j = 0; j <= $rootScope.vocabTermDataArray.length - 1; j++) { 2870 for (var j = 0; j <= $rootScope.vocabTermDataArray.length - 1; j++) {
@@ -2882,7 +2881,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2882,7 +2881,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2882 for (var z = 0; z <= $scope.matchedActualTermData.length; z++) { 2881 for (var z = 0; z <= $scope.matchedActualTermData.length; z++) {
2883 //send actual term no to get the term text. 2882 //send actual term no to get the term text.
2884 Annotation = $scope.matchedActualTermData[0]._TermText; 2883 Annotation = $scope.matchedActualTermData[0]._TermText;
2885 - // alert("Annotation : " + Annotation); 2884 + // alert("Annotation : " + Annotation);
2886 break; 2885 break;
2887 }; 2886 };
2888 } 2887 }
@@ -2973,7 +2972,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2973,7 +2972,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2973 2972
2974 2973
2975 $.each(BodyRegionDictionary, function (index, value) { 2974 $.each(BodyRegionDictionary, function (index, value) {
2976 - 2975 +
2977 if (value.bodyRegionId == '3') { 2976 if (value.bodyRegionId == '3') {
2978 2977
2979 var BR_SixTBData = new jinqJs() 2978 var BR_SixTBData = new jinqJs()
@@ -2997,7 +2996,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2997,7 +2996,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2997 // alert(' $.each(BodyRegionDictionary3. bodyRegionRight: ' + bodyRegionRight + ', bodyRegionBottom: ' + bodyRegionBottom) 2996 // alert(' $.each(BodyRegionDictionary3. bodyRegionRight: ' + bodyRegionRight + ', bodyRegionBottom: ' + bodyRegionBottom)
2998 if (TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) { 2997 if (TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) {
2999 //var transNumber = parseInt(document.getElementById("txtTransparencyChange").value); 2998 //var transNumber = parseInt(document.getElementById("txtTransparencyChange").value);
3000 - 2999 +
3001 $scope.layerNumber = parseInt(txtlayerNumber.value); 3000 $scope.layerNumber = parseInt(txtlayerNumber.value);
3002 3001
3003 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) { 3002 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
@@ -3023,7 +3022,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -3023,7 +3022,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3023 //draw 3rd BR 3022 //draw 3rd BR
3024 $timeout(function () { 3023 $timeout(function () {
3025 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false); 3024 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
3026 - },200); 3025 + }, 200);
3027 3026
3028 } 3027 }
3029 else { 3028 else {
@@ -3612,7 +3611,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -3612,7 +3611,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3612 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:59000;" id="bord_annotation">' 3611 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:59000;" id="bord_annotation">'
3613 + '</div>'; 3612 + '</div>';
3614 $("#sppeachBubble_annotation").css("height", "auto"); 3613 $("#sppeachBubble_annotation").css("height", "auto");
3615 - // alert($("#sppeachBubble_annotation").css("height")); 3614 + // alert($("#sppeachBubble_annotation").css("height"));
3616 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) { 3615 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
3617 $("#sppeachBubble_annotation p").remove(); 3616 $("#sppeachBubble_annotation p").remove();
3618 $('#canvasDiv').append(sppechBubbleDotHTML_annotation); 3617 $('#canvasDiv').append(sppechBubbleDotHTML_annotation);
@@ -4158,7 +4157,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4158,7 +4157,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4158 $('#transparencyScale').css('left', $scope.TBDrawStartX + 130) 4157 $('#transparencyScale').css('left', $scope.TBDrawStartX + 130)
4159 $('#transparencyScale').css('visibility', 'visible') 4158 $('#transparencyScale').css('visibility', 'visible')
4160 $('#transparencyScale').css("z-index", "100000") //Dated:16-07-2016 Issue#4962:Transparency box should be on top. 4159 $('#transparencyScale').css("z-index", "100000") //Dated:16-07-2016 Issue#4962:Transparency box should be on top.
4161 - 4160 + $("#tbSlider .ui-slider-range-min").css("width", "100%");
  4161 + $("#tbSlider .ui-slider-handle").css("left", "100%");
4162 } 4162 }
4163 } 4163 }
4164 4164
@@ -4504,7 +4504,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4504,7 +4504,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4504 } 4504 }
4505 } 4505 }
4506 4506
4507 - $scope.DrawOnTBWithSelectedTransparency(tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId); 4507 + $scope.DrawOnTBWithSelectedTransparency(tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized);
4508 4508
4509 } 4509 }
4510 4510
@@ -4541,9 +4541,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4541,9 +4541,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4541 4541
4542 //set modesty image visiblility true/false as per layer 4542 //set modesty image visiblility true/false as per layer
4543 // if(bodyRegionId.match('modestyImg3')) 4543 // if(bodyRegionId.match('modestyImg3'))
4544 - var BRID='';  
4545 - if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId)!=null) {  
4546 - BRID = bodyRegionId[bodyRegionId.length - 1]; 4544 + var BRID = '';
  4545 + if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId) != null) {
  4546 + BRID = bodyRegionId[bodyRegionId.length - 1];
4547 } 4547 }
4548 else if ((bodyRegionId == '2' || bodyRegionId == '3') && document.getElementById('modestyTransCanavs_modestyImg' + bodyRegionId) != null) { 4548 else if ((bodyRegionId == '2' || bodyRegionId == '3') && document.getElementById('modestyTransCanavs_modestyImg' + bodyRegionId) != null) {
4549 BRID = bodyRegionId; 4549 BRID = bodyRegionId;
@@ -4771,7 +4771,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4771,7 +4771,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4771 } 4771 }
4772 4772
4773 4773
4774 - $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId) { 4774 + $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) {
4775 4775
4776 var transNumber = $scope.transNumber;//txtTransparencyChange.value; 4776 var transNumber = $scope.transNumber;//txtTransparencyChange.value;
4777 //this changes the transparency when transparency is already activated and user resizes or chage the layer 4777 //this changes the transparency when transparency is already activated and user resizes or chage the layer
@@ -4782,8 +4782,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4782,8 +4782,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4782 var imageData = imageD.data; 4782 var imageData = imageD.data;
4783 var length = imageData.length; 4783 var length = imageData.length;
4784 4784
4785 -  
4786 // set every fourth value to the desired number of transparency 4785 // set every fourth value to the desired number of transparency
  4786 +
  4787 +
4787 for (var i = 3; i < length; i += 4) { 4788 for (var i = 3; i < length; i += 4) {
4788 if ($scope.voId == "9" || $scope.voId == "11") { 4789 if ($scope.voId == "9" || $scope.voId == "11") {
4789 4790
@@ -4795,13 +4796,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4795,13 +4796,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4795 } 4796 }
4796 } 4797 }
4797 else { 4798 else {
4798 -  
4799 - imageData[i] = ((255) * (parseInt(transNumber))) / 100; 4799 +
  4800 + imageData[i] = ((255) * (parseInt(transNumber))) / 100;
4800 } 4801 }
4801 4802
4802 - 4803 +
4803 } 4804 }
4804 - 4805 +
4805 tempCtx.putImageData(imageD, 0, 0); 4806 tempCtx.putImageData(imageD, 0, 0);
4806 4807
4807 4808
@@ -4843,7 +4844,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4843,7 +4844,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4843 } 4844 }
4844 4845
4845 } 4846 }
4846 - 4847 +
4847 4848
4848 ctx.putImageData(imageD1, 0, 0); 4849 ctx.putImageData(imageD1, 0, 0);
4849 4850
@@ -5036,7 +5037,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5036,7 +5037,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5036 5037
5037 // var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_mci"; 5038 // var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_mci";
5038 5039
5039 - // alert(annotationText); 5040 + // alert(annotationText);
5040 $scope.MultiLanguageAnnationArray = []; 5041 $scope.MultiLanguageAnnationArray = [];
5041 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 5042 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
5042 5043
@@ -5110,7 +5111,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5110,7 +5111,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5110 } 5111 }
5111 } 5112 }
5112 5113
5113 - 5114 +
5114 if (tCanvasHeight != $scope.transparencyCanvasHeight || tCanvasWidth != $scope.transparencyCanvasWidth) { 5115 if (tCanvasHeight != $scope.transparencyCanvasHeight || tCanvasWidth != $scope.transparencyCanvasWidth) {
5115 5116
5116 5117
@@ -5137,7 +5138,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5137,7 +5138,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5137 $scope.transparencyCanvasHeight = tCanvasHeight; 5138 $scope.transparencyCanvasHeight = tCanvasHeight;
5138 $scope.transparencyCanvasWidth = tCanvasWidth; 5139 $scope.transparencyCanvasWidth = tCanvasWidth;
5139 5140
5140 - 5141 +
5141 //create temp cavas to retain the original anavs data for use in transparency change as 5142 //create temp cavas to retain the original anavs data for use in transparency change as
5142 //if u use original canvas data for transprency change then at 0 transparency all data will become transparent and if u increase transparency with this data then the canavs will be blank 5143 //if u use original canvas data for transprency change then at 0 transparency all data will become transparent and if u increase transparency with this data then the canavs will be blank
5143 if (document.getElementById('tempCanvas') != null) { 5144 if (document.getElementById('tempCanvas') != null) {
@@ -5222,7 +5223,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5222,7 +5223,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5222 //draw 3rd BR 5223 //draw 3rd BR
5223 $timeout(function () { 5224 $timeout(function () {
5224 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true); 5225 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true);
5225 - },200); 5226 + }, 200);
5226 } 5227 }
5227 else { 5228 else {
5228 //draw mirror arm 5229 //draw mirror arm
@@ -5278,7 +5279,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5278,7 +5279,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5278 } 5279 }
5279 }) 5280 })
5280 } 5281 }
5281 - 5282 +
5282 } 5283 }
5283 5284
5284 5285
@@ -5458,7 +5459,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5458,7 +5459,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5458 $scope.annotationTextArrayT2.push($rootScope.annotationTextForTrans2[i]); 5459 $scope.annotationTextArrayT2.push($rootScope.annotationTextForTrans2[i]);
5459 } 5460 }
5460 //$scope.annotationTextArrayT1.push(annotations.annotationT1); 5461 //$scope.annotationTextArrayT1.push(annotations.annotationT1);
5461 - // $scope.annotationTextArrayT2.push(annotations.annotationT2); 5462 + // $scope.annotationTextArrayT2.push(annotations.annotationT2);
5462 5463
5463 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); 5464 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
5464 } 5465 }
@@ -5710,8 +5711,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5710,8 +5711,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5710 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 5711 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
5711 $rootScope.annotationTextForTrans1.push($rootScope.annotationText[i]); 5712 $rootScope.annotationTextForTrans1.push($rootScope.annotationText[i]);
5712 } 5713 }
5713 -  
5714 - 5714 +
  5715 +
5715 //get annotation for trans canavs 5716 //get annotation for trans canavs
5716 var RedTrans; 5717 var RedTrans;
5717 var GreenTrans; 5718 var GreenTrans;
@@ -5746,7 +5747,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5746,7 +5747,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5746 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 5747 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
5747 $rootScope.annotationTextForTrans2.push($rootScope.annotationText[i]); 5748 $rootScope.annotationTextForTrans2.push($rootScope.annotationText[i]);
5748 } 5749 }
5749 - 5750 +
5750 return { 5751 return {
5751 annotationT1: annotationText1, 5752 annotationT1: annotationText1,
5752 annotationT2: annotationText2 5753 annotationT2: annotationText2
@@ -5913,8 +5914,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5913,8 +5914,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5913 //$("canvas[name*='transparencyTempCanvas']").nextUntil($("canvas[name*='transparencyTempCanvas']")) 5914 //$("canvas[name*='transparencyTempCanvas']").nextUntil($("canvas[name*='transparencyTempCanvas']"))
5914 //.remove(); 5915 //.remove();
5915 $scope.layerNumber = $scope.currentLayerNumber; 5916 $scope.layerNumber = $scope.currentLayerNumber;
5916 - $scope.transNumber = 50;  
5917 - $(".slider").slider({ value: 50 }) 5917 + $scope.transNumber = 100;
  5918 + $(".slider").slider({ value: 100 })
5918 } 5919 }
5919 5920
5920 5921
@@ -8782,4 +8783,3 @@ function onListManagerTermSelection(id, isTermListOptionClicked) { @@ -8782,4 +8783,3 @@ function onListManagerTermSelection(id, isTermListOptionClicked) {
8782 8783
8783 } 8784 }
8784 8785
8785 -  
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -368,7 +368,7 @@ @@ -368,7 +368,7 @@
368 <div class="col-sm-12"> 368 <div class="col-sm-12">
369 <div class="padded25"> 369 <div class="padded25">
370 <!--<div class="slider" id="sliderScale"></div>--> 370 <!--<div class="slider" id="sliderScale"></div>-->
371 - <div class="slider"></div> 371 + <div class="slider" id="tbSlider"></div>
372 </div> 372 </div>
373 </div> 373 </div>
374 </div> 374 </div>
@@ -385,11 +385,12 @@ @@ -385,11 +385,12 @@
385 <script> 385 <script>
386 $(window).load(function () { 386 $(window).load(function () {
387 $(".stickey-area").sticky(); 387 $(".stickey-area").sticky();
  388 +
  389 +
388 });</script> 390 });</script>
389 <script> 391 <script>
390 $(function () { 392 $(function () {
391 393
392 -  
393 var regExp = /[0-9\.\,]/; 394 var regExp = /[0-9\.\,]/;
394 $('#txtlayerNumber').on('keydown keyup', function (e) { 395 $('#txtlayerNumber').on('keydown keyup', function (e) {
395 var value = String.fromCharCode(e.which) || e.key; 396 var value = String.fromCharCode(e.which) || e.key;