ADAM / AIAHTML5

Commit a076bcf920e38ec3dc6fbe70e6eb2ad7be60aa0e

Authored by Amrita Vishnoi
2 parents 420a99e2 005e31fb

Merge branch 'bugs' into Develop

Inline Side-by-side
Showing 5 changed files with 229 additions and 79 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @a076bcf
... ... @@ -40,7 +40,7 @@ function ($scope, $rootScope, pages, log,Modules,$http,$compile) {
40 40 .select();
41 41 for (var i = 0; i < $scope.countLeftlist; i++) {
42 42 console.log($scope.listCurriculumBuilder.slideshows.slideshow[i]._label);
43   - alert($scope.listCurriculumBuilder.slideshows.slideshow[i]._label);
  43 + //alert($scope.listCurriculumBuilder.slideshows.slideshow[i]._label);
44 44 var $el = $('<li class="list-group-item" data-toggle="modal" data-target="#myModal-1" ng-click="loadSlideShowXmldata()"><a href="#"><i class="fa fa-check"></i>' + $scope.listCurriculumBuilder.slideshows.slideshow[i]._label + '</a></li>').appendTo('#leftBodyViewList');
45 45 $compile($el)($scope);
46 46 }
... ... @@ -56,7 +56,7 @@ function ($scope, $rootScope, pages, log,Modules,$http,$compile) {
56 56  
57 57 $scope.loadSlideShowXmldata = function (e) {
58 58  
59   - alert(e);
  59 + // alert(e);
60 60 $http({ method: 'GET', url: 'content/data/json/cb/SlideShow/AIA_Curriculum_Builder_Guide.sldshw' }).success(function (data) {
61 61  
62 62 $scope.dataPopup = data;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @a076bcf
... ... @@ -2631,77 +2631,87 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2631 2631  
2632 2632 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:9000;" id="bord">'
2633 2633 + '</div>';
2634   - $('#canvasDiv').append(sppechBubbleDotHTML);
2635 2634  
2636   - if ($scope.MultiLanguageAnnationArray.length > 0) {
2637   - for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
2638   - var MultipleLanguage = $scope.MultiLanguageAnnationArray[i];
2639   - $("#sppeachBubble").append("<p style='margin-bottom:2px;'>" + MultipleLanguage + "</p>");
2640   - }
2641   - }
2642   - else {
2643   - console.log('MultiLanguageAnnationArray.length is :' + $scope.MultiLanguageAnnationArray.length)
  2635 + //Issue #7286 :Undefined annotation should not appear
  2636 + for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
  2637 + var MultipleLanguage = $scope.MultiLanguageAnnationArray[i];
2644 2638 }
2645   - if ($scope.longestAnnotation != null || $scope.longestAnnotation != undefined) {
2646   - if ($scope.longestAnnotation.length <= 10) {
2647   -
2648 2639  
2649   - $("#sppeachBubble").css("width", "100px");
  2640 + if (MultipleLanguage == undefined) {
  2641 + console.log("No text is found");
  2642 + } else {
  2643 + $('#canvasDiv').append(sppechBubbleDotHTML);
2650 2644  
  2645 + if ($scope.MultiLanguageAnnationArray.length > 0) {
  2646 + for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
  2647 + var MultipleLanguage = $scope.MultiLanguageAnnationArray[i];
  2648 + $("#sppeachBubble").append("<p style='margin-bottom:2px;'>" + MultipleLanguage + "</p>");
  2649 + }
  2650 + }
  2651 + else {
  2652 + console.log('MultiLanguageAnnationArray.length is :' + $scope.MultiLanguageAnnationArray.length)
2651 2653 }
  2654 + if ($scope.longestAnnotation != null || $scope.longestAnnotation != undefined) {
  2655 + if ($scope.longestAnnotation.length <= 10) {
2652 2656  
2653   - else if ($scope.longestAnnotation.length > 10 && $scope.longestAnnotation.length <= 17) {
2654 2657  
  2658 + $("#sppeachBubble").css("width", "100px");
2655 2659  
  2660 + }
2656 2661  
2657   - $("#sppeachBubble").css("width", "140px");
  2662 + else if ($scope.longestAnnotation.length > 10 && $scope.longestAnnotation.length <= 17) {
2658 2663  
2659   - }
2660   - else if ($scope.longestAnnotation.length > 17 && $scope.longestAnnotation.length <= 26) {
2661 2664  
2662 2665  
2663   - $("#sppeachBubble").css("width", "195px");
  2666 + $("#sppeachBubble").css("width", "140px");
2664 2667  
2665   - }
2666   - else if ($scope.longestAnnotation.length > 26 && $scope.longestAnnotation.length <= 34) {
  2668 + }
  2669 + else if ($scope.longestAnnotation.length > 17 && $scope.longestAnnotation.length <= 26) {
2667 2670  
2668   - $("#sppeachBubble").css("width", "248px");
2669 2671  
2670   - }
2671   - else if ($scope.longestAnnotation.length > 34 && $scope.longestAnnotation.length <= 44) {
  2672 + $("#sppeachBubble").css("width", "195px");
2672 2673  
  2674 + }
  2675 + else if ($scope.longestAnnotation.length > 26 && $scope.longestAnnotation.length <= 34) {
2673 2676  
2674   - $("#sppeachBubble").css("width", "300px");
2675   - }
  2677 + $("#sppeachBubble").css("width", "248px");
2676 2678  
2677   - else if ($scope.longestAnnotation.length > 44 && $scope.longestAnnotation.length <= 54) {
  2679 + }
  2680 + else if ($scope.longestAnnotation.length > 34 && $scope.longestAnnotation.length <= 44) {
2678 2681  
2679   - $("#sppeachBubble").css("width", "370px");
2680 2682  
2681   - }
  2683 + $("#sppeachBubble").css("width", "300px");
  2684 + }
2682 2685  
2683   - else if ($scope.longestAnnotation.length > 54 && $scope.longestAnnotation.length <= 69) {
  2686 + else if ($scope.longestAnnotation.length > 44 && $scope.longestAnnotation.length <= 54) {
2684 2687  
  2688 + $("#sppeachBubble").css("width", "370px");
2685 2689  
2686   - $("#sppeachBubble").css("width", "450px");
  2690 + }
2687 2691  
2688   - }
  2692 + else if ($scope.longestAnnotation.length > 54 && $scope.longestAnnotation.length <= 69) {
2689 2693  
2690   - else if ($scope.longestAnnotation.length > 69 && $scope.longestAnnotation.length <= 75) {
2691 2694  
  2695 + $("#sppeachBubble").css("width", "450px");
2692 2696  
2693   - $("#sppeachBubble").css("width", "510px");
  2697 + }
2694 2698  
2695   - }
  2699 + else if ($scope.longestAnnotation.length > 69 && $scope.longestAnnotation.length <= 75) {
2696 2700  
2697   - else {
2698 2701  
  2702 + $("#sppeachBubble").css("width", "510px");
2699 2703  
2700   - $("#sppeachBubble").css("width", ($scope.longestAnnotation.length) + "%");
  2704 + }
2701 2705  
  2706 + else {
2702 2707  
2703   - }
2704 2708  
  2709 + $("#sppeachBubble").css("width", ($scope.longestAnnotation.length) + "%");
  2710 +
  2711 +
  2712 + }
  2713 +
  2714 + }
2705 2715 }
2706 2716 var Globe = [];
2707 2717 Globe.push({ currentX: x, currentY: y });
... ... @@ -3189,44 +3199,54 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3189 3199  
3190 3200 $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
3191 3201 var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size: 12px;background-color:#fff;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
3192   - $("#canvasDiv").append(sppechBubbleHTML);
3193   -
  3202 + //Issue #7286 :Undefined annotation should not appear
3194 3203 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
3195 3204 var annotation = $scope.MultiLanguageAnnationArray[i];
3196   -
3197   - $("#" + id).append("<p style='margin-bottom:2px;'>" + annotation + "</p>");
3198 3205 }
3199 3206  
3200   - if ($scope.longestAnnotation.length <= 10) {
3201   - $("#" + id).css("width", "100px");
3202   - }
  3207 + if (annotation == undefined) {
  3208 + console.log("No text found");
  3209 + } else {
3203 3210  
3204   - else if ($scope.longestAnnotation.length > 10 && $scope.longestAnnotation.length <= 17) {
3205   - $("#" + id).css("width", "140px");
3206   - }
3207   - else if ($scope.longestAnnotation.length > 17 && $scope.longestAnnotation.length <= 26) {
3208   - $("#" + id).css("width", "195px");
  3211 + $("#canvasDiv").append(sppechBubbleHTML);
3209 3212  
3210   - }
3211   - else if ($scope.longestAnnotation.length > 26 && $scope.longestAnnotation.length <= 34) {
3212   - $("#" + id).css("width", "248px");
3213   - }
3214   - else if ($scope.longestAnnotation.length > 34 && $scope.longestAnnotation.length <= 44) {
3215   - $("#" + id).css("width", "300px");
3216   - }
  3213 + for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
  3214 + var annotation = $scope.MultiLanguageAnnationArray[i];
3217 3215  
3218   - else if ($scope.longestAnnotation.length > 44 && $scope.longestAnnotation.length <= 54) {
3219   - $("#" + id).css("width", "370px");
3220   - }
3221   - else if ($scope.longestAnnotation.length > 54 && $scope.longestAnnotation.length <= 69) {
3222   - $("#" + id).css("width", "450px");
3223   - }
3224   - else if ($scope.longestAnnotation.length > 69 && $scope.longestAnnotation.length <= 75) {
3225   - $("#" + id).css("width", "510px");
  3216 + $("#" + id).append("<p style='margin-bottom:2px;'>" + annotation + "</p>");
  3217 + }
3226 3218  
3227   - }
3228   - else {
3229   - $("#" + id).css("width", ($scope.longestAnnotation.length) + "%");
  3219 + if ($scope.longestAnnotation.length <= 10) {
  3220 + $("#" + id).css("width", "100px");
  3221 + }
  3222 +
  3223 + else if ($scope.longestAnnotation.length > 10 && $scope.longestAnnotation.length <= 17) {
  3224 + $("#" + id).css("width", "140px");
  3225 + }
  3226 + else if ($scope.longestAnnotation.length > 17 && $scope.longestAnnotation.length <= 26) {
  3227 + $("#" + id).css("width", "195px");
  3228 +
  3229 + }
  3230 + else if ($scope.longestAnnotation.length > 26 && $scope.longestAnnotation.length <= 34) {
  3231 + $("#" + id).css("width", "248px");
  3232 + }
  3233 + else if ($scope.longestAnnotation.length > 34 && $scope.longestAnnotation.length <= 44) {
  3234 + $("#" + id).css("width", "300px");
  3235 + }
  3236 +
  3237 + else if ($scope.longestAnnotation.length > 44 && $scope.longestAnnotation.length <= 54) {
  3238 + $("#" + id).css("width", "370px");
  3239 + }
  3240 + else if ($scope.longestAnnotation.length > 54 && $scope.longestAnnotation.length <= 69) {
  3241 + $("#" + id).css("width", "450px");
  3242 + }
  3243 + else if ($scope.longestAnnotation.length > 69 && $scope.longestAnnotation.length <= 75) {
  3244 + $("#" + id).css("width", "510px");
  3245 +
  3246 + }
  3247 + else {
  3248 + $("#" + id).css("width", ($scope.longestAnnotation.length) + "%");
  3249 + }
3230 3250 }
3231 3251 }
3232 3252  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @a076bcf
... ... @@ -264,6 +264,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
264 264 $rootScope.shapestyle = function (id) {
265 265  
266 266 document.getElementById('modelbackground').style.display = "none";
  267 + document.getElementById('modeleditstyle').style.display = "none";
267 268  
268 269 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
269 270 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
... ... @@ -275,19 +276,21 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
275 276 $rootScope.shapestyleborderWidth = intPart[0];
276 277 $rootScope.shapestyleborderStyles = "solid";
277 278  
278   - $('#editshapestyle').modal('hide');
  279 + // $('#editshapestyle').modal('hide');
279 280 }
280 281  
281 282 $rootScope.enableAnnotationToolBar = function () {
282 283  
283 284 document.getElementById('modelbackground').style.display = "block";
284   - $("#editshapestyle").modal('show');
  285 + // $("#editshapestyle").modal('show');
  286 + document.getElementById('modeleditstyle').style.display = "block";
285 287  
286 288 }
287 289  
288 290 $rootScope.disableAnnotationToolBar = function () {
289 291  
290 292 document.getElementById('modelbackground').style.display = "none";
  293 + document.getElementById('modeleditstyle').style.display = "none";
291 294  
292 295 }
293 296  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @a076bcf
... ... @@ -662,7 +662,131 @@
662 662  
663 663  
664 664 <!--Edit Shape Modal-->
665   - <div class="modal fade" id="editshapestyle" tabindex="-1" role="dialog" aria-labelledby="myModalLabel33" style="z-index:1000000000;width:302px;margin-left:auto;margin-right:auto;overflow:hidden;height:460px;">
  665 +
  666 +
  667 + <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:40%;top:70px;">
  668 + <div class="modal-content">
  669 + <div class="modal-header annotation-modal-header">
  670 + <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
  671 + </div>
  672 + <div class="modal-body">
  673 + <div class="marginTopBtm10">
  674 + <div class="well well-sm no-margin-btm">
  675 + <div class="row">
  676 + <div class="col-sm-12">
  677 + <div class="checkbox no-margin">
  678 + <label>
  679 + <input id="fill-option" type="checkbox" checked onclick="enableDisableFillOption()"> Fill Option
  680 + </label>
  681 + </div>
  682 + </div>
  683 + <div class="col-sm-6 enableDisableOpacity">
  684 + <div class="radio">
  685 + <label>
  686 + <input type="radio" name="filloption" id="filloption1" value="filloption1">
  687 + <span class="">Texture</span>
  688 + <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
  689 + </label>
  690 + </div>
  691 + <div class="radio">
  692 + <label>
  693 + <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
  694 +
  695 +
  696 + <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
  697 + <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
  698 + <input type="text" class="form-control outerBackgroundColor" data-control="saturation" style="display:none;" value="#0088cc">
  699 + </div>
  700 +
  701 +
  702 + </label>
  703 + </div>
  704 + </div>
  705 + <div class="col-sm-6 no-padding marginTop10 enableDisableOpacity">
  706 + <div class="row">
  707 + <label class="pull-left" style="font-weight:normal;">Scale</label>
  708 + <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;">
  709 + <div id="slider-range-min-3"></div>
  710 + </div>
  711 + </div>
  712 +
  713 + <div class="row">
  714 + <label class="pull-left" style="font-weight:normal;">Opacity</label>
  715 + <div id="edit-slider-4" class="pull-left" style="width:53%; margin-left:3%; margin-top:2%;">
  716 + <div id="slider-range-min-4"></div>
  717 + </div>
  718 + </div>
  719 +
  720 + <div class="clearfix"></div>
  721 +
  722 +
  723 + </div>
  724 + </div>
  725 +
  726 + </div>
  727 + </div>
  728 + <div class="marginTopBtm10">
  729 + <div class="well well-sm no-margin-btm">
  730 + <div class="row">
  731 + <div class="col-sm-12">
  732 + <div class="checkbox no-margin">
  733 + <label>
  734 + <input id="Outline-Option" onclick="enableDisableOutline()" type="checkbox" checked> Outline Option
  735 + </label>
  736 + </div>
  737 + </div>
  738 + <div class="col-sm-6 setEnableDisableForEditShapeStyle">
  739 + <label class="marginTop5">
  740 + <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
  741 + <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
  742 +
  743 + <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc">
  744 + </div>
  745 +
  746 +
  747 + </label>
  748 + </div>
  749 +
  750 + <div class="col-sm-6 setEnableDisableForEditShapeStyle">
  751 + <div class="form-horizontal">
  752 + <div class="form-group">
  753 + <label class="col-sm-3 control-label" style=" font-weight:normal; padding-top:9px;">Size</label>
  754 + <div class="col-sm-9 marginTop5">
  755 + <select id="borderWidthCanvasElement" class="form-control input-sm">
  756 + <option value="1">1</option>
  757 + <option value="2">2</option>
  758 + <option value="3">3</option>
  759 + <option value="4">4</option>
  760 + <option value="5">5</option>
  761 + </select>
  762 + </div>
  763 + </div>
  764 + </div>
  765 + </div>
  766 +
  767 + </div>
  768 + </div>
  769 + </div>
  770 +
  771 + <div class="marginTopBtm10">
  772 + <div class="well well-sm no-margin-btm">
  773 + <img id="imgOpacity" class="img-rounded img-responsive imgopacity" alt="..." src="content/images/blank-shape.jpg">
  774 + </div>
  775 + </div>
  776 + </div>
  777 + <div class="modal-footer">
  778 + <button type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')">
  779 + OK
  780 + </button>
  781 + <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
  782 + </div>
  783 + </div>
  784 + </div>
  785 +
  786 +
  787 +
  788 +
  789 + <!--<div class="modal fade" id="editshapestyle" tabindex="-1" role="dialog" aria-labelledby="myModalLabel33" style="z-index:1000000000;width:302px;margin-left:auto;margin-right:auto;overflow:hidden;height:460px;">
666 790 <div class="modal-dialog modal-sm" role="document">
667 791 <div class="modal-content">
668 792 <div class="modal-header annotation-modal-header">
... ... @@ -698,9 +822,7 @@
698 822 </div>
699 823  
700 824  
701   - <!--<span class="">Color</span> <img src="img/color-picker.png" alt="" class="color-picker">-->
702   - <!--<span class="demo2" data-control="hue" style="font-weight:normal;">Color</span>-->
703   - <!--<img src="img/color-picker.png" alt="" class="color-picker">-->
  825 +
704 826 </label>
705 827 </div>
706 828 </div>
... ... @@ -709,7 +831,7 @@
709 831 <label class="pull-left" style="font-weight:normal;">Scale</label>
710 832 <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;">
711 833 <div id="slider-range-min-3"></div>
712   - <!--<p>Your slider has a value of <span id="slider-value"></span></p>-->
  834 +
713 835 </div>
714 836 </div>
715 837  
... ... @@ -741,14 +863,12 @@
741 863 <div class="col-sm-6 setEnableDisableForEditShapeStyle">
742 864 <label class="marginTop5">
743 865 <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
744   - <!--<span class="demo " data-control="hue" style="float:left;">&nbsp;</span>-->
745 866 <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
746 867  
747 868 <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc">
748 869 </div>
749 870  
750 871  
751   - <!--<img src="img/color-picker.png" alt="" class="color-picker">-->
752 872 </label>
753 873 </div>
754 874  
... ... @@ -787,7 +907,7 @@
787 907 </div>
788 908 </div>
789 909 </div>
790   - </div>
  910 + </div>-->
791 911  
792 912 <script>
793 913 function enableDisableFillOption()
... ... @@ -977,6 +1097,7 @@
977 1097 $(function () {
978 1098 $(".modal").draggable();
979 1099 $(".annotationTollbar").draggable();
  1100 + $(".modeleditstyle").draggable();
980 1101 });
981 1102 </script>
982 1103  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @a076bcf
... ... @@ -842,4 +842,10 @@ cursor:pointer;
842 842 height:100%;
843 843  
844 844 filter: Alpha(opacity=50); / IE8 and earlier /
  845 +}
  846 +
  847 +
  848 +.modeleditstyle
  849 + {
  850 + display:none;
845 851 }
846 852 \ No newline at end of file
... ...