ADAM / AIAHTML5

Commit 4608b01180562174fe5200edb95ce0b1339c0b62

Authored by unknown
1 parent ac3d8045

Commit Changes

Inline Side-by-side
Showing 1 changed file with 13 additions and 24 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4608b01
... ... @@ -641,7 +641,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
641 641 $rootScope.loadSearchDataForBodyView = function () {
642 642  
643 643 var languageArray = [];
644   - $rootScope.vocabTermTxtArray = [];
  644 + $rootScope.vocabTermDataArray = [];
645 645 var languageArray = $rootScope.lexiconLanguageArray;
646 646  
647 647 console.log(languageArray.length);
... ... @@ -671,29 +671,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
671 671 $rootScope.VocabTermData = e.data.VocabTermData,//same
672 672 $scope.vocabTermTxt = e.data.vocabTermTxt,
673 673 $scope.vocabLanguage = e.data.language,
674   - $rootScope.vocabTermTxtArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt });
  674 + $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt });
675 675  
676 676 for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
677 677  
678 678  
679   - $rootScope.vocabTermTxtArray[i].vocabTermTxt = new jinqJs()
680   - .from($rootScope.vocabTermTxtArray[i].vocabTermTxt)
  679 + $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs()
  680 + .from($rootScope.vocabTermDataArray[i].vocabTermTxt)
681 681 .distinct('_TermText', '_ActualTermNumber')
682 682 .orderBy([{ field: '_TermText', sort: 'asc' }])
683 683 .select('_ActualTermNumber', '_TermText', '_cdId');
684   - // alert("After" + $rootScope.vocabTermTxtArray.length);
685   - console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermTxtArray[i].vocabTermTxt[0]._TermText);
  684 +
  685 + console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText);
686 686  
687 687 }
688   -
689   - // alert("After" + $rootScope.vocabTermTxtArray[0].vocabTermTxt);
690   -
691   - //$scope.VocabTermTxt = new jinqJs()
692   - // .from($scope.vocabTermTxt)
693   - // .distinct('_TermText', '_ActualTermNumber')
694   - // .orderBy([{ field: '_TermText', sort: 'asc' }])
695   - // .select('_ActualTermNumber', '_TermText', '_cdId');
696   -
697 688 console.log('JlinqActivity , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
698 689  
699 690 if ($scope.runningSearchWorkers != null || $scope.runningSearchWorkers != undefined) {
... ... @@ -2830,13 +2821,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2830 2821  
2831 2822 var Annotation;
2832 2823 $scope.ActualTermNo = actualTermNo;
2833   - for (var j = 0; j <= $rootScope.vocabTermTxtArray.length - 1; j++) {
  2824 + for (var j = 0; j <= $rootScope.vocabTermDataArray.length - 1; j++) {
2834 2825  
2835   - if ($rootScope.vocabTermTxtArray[j].language == language) {
  2826 + if ($rootScope.vocabTermDataArray[j].language == language) {
2836 2827  
2837   - if ($rootScope.vocabTermTxtArray[j].VocabTermData != null || $rootScope.vocabTermTxtArray[j].VocabTermData != undefined) {
  2828 + if ($rootScope.vocabTermDataArray[j].VocabTermData != null || $rootScope.vocabTermDataArray[j].VocabTermData != undefined) {
2838 2829 $scope.matchedActualTermData = new jinqJs()
2839   - .from($rootScope.vocabTermTxtArray[j].VocabTermData.VocabTerms.Term)
  2830 + .from($rootScope.vocabTermDataArray[j].VocabTermData.VocabTerms.Term)
2840 2831 .where('_ActualTermNumber == ' + actualTermNo)
2841 2832 .select();
2842 2833  
... ... @@ -2935,9 +2926,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2935 2926  
2936 2927  
2937 2928 $.each(BodyRegionDictionary, function (index, value) {
2938   - //debugger;
2939   - // alert(' $.each(BodyRegionDictionary1')
2940   -
  2929 +
2941 2930 if (value.bodyRegionId == '3') {
2942 2931  
2943 2932 var BR_SixTBData = new jinqJs()
... ... @@ -2961,7 +2950,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2961 2950 // alert(' $.each(BodyRegionDictionary3. bodyRegionRight: ' + bodyRegionRight + ', bodyRegionBottom: ' + bodyRegionBottom)
2962 2951 if (TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) {
2963 2952 //var transNumber = parseInt(document.getElementById("txtTransparencyChange").value);
2964   - // debugger;
  2953 +
2965 2954 $scope.layerNumber = parseInt(txtlayerNumber.value);
2966 2955  
2967 2956 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
... ... @@ -5063,7 +5052,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5063 5052 $scope.transparencyCanvasHeight = tCanvasHeight;
5064 5053 $scope.transparencyCanvasWidth = tCanvasWidth;
5065 5054  
5066   - // debugger;
  5055 +
5067 5056 //create temp cavas to retain the original anavs data for use in transparency change as
5068 5057 //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
5069 5058 if (document.getElementById('tempCanvas') != null) {
... ...