ADAM / AIAHTML5

Commit b19c0c5f78395c00954f3d65855582c9c5c07787

Authored by Birendra
1 parent 74673955

fixed few bug on ipad device

Inline Side-by-side
Showing 10 changed files with 291 additions and 175 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @b19c0c5
... ... @@ -695,15 +695,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
695 695 }
696 696  
697 697 if (selectimg === true) {
698   - //$scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
699   -
700   - //var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
701   - // + '<div class="thumbnail" ><a href="#">'
702   - // + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
703   - // + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
704   -
705   - //$compile($el)($scope);
706   -
707 698 ailistviewdata.push(
708 699 {
709 700 "_id": value._id,
... ... @@ -841,15 +832,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
841 832 }
842 833 }
843 834 if (selectimg === true) {
844   - //$scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
845   -
846   - //var $el = $('<div id="' + value._id + '" ng-disabled="' + $scope.IsDisable + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
847   - // + '<div class="thumbnail" ><a href="#">'
848   - // + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
849   - // + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
850   -
851   - //$compile($el)($scope);
852   -
853 835 ailistviewdata.push(
854 836 {
855 837 "_id": value._id,
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @b19c0c5
... ... @@ -356,7 +356,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
356 356 $scope.selectedCIListViewData = $scope.GetCIwindowStoreData(windowviewid, 'IllustrationData');
357 357  
358 358 $('#grid-view').empty();
359   - var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}" title = "{{value._Title}}" class="GridViewDataDivHeight" data-ng-click="openView($event)">'
  359 + var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}" title = "{{value._Title}}" data-ng-click="openView($event)">'
360 360 + '<div class="thumbnail" ><a href="#">'
361 361 + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
362 362 + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @b19c0c5
... ... @@ -471,6 +471,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
471 471 }
472 472  
473 473 function convertfile(file) {
  474 + //add extension
  475 + myfileName += '.json';
474 476 var x2js = new X2JS();
475 477 var curriculumobject = x2js.xml_str2json(file.target.result);
476 478 var isIncompatible= $scope.checkCompatibility(curriculumobject);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @b19c0c5
... ... @@ -1328,16 +1328,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1328 1328 value: sliderValue,
1329 1329 range: "min",
1330 1330 orientation: "horizontal",
1331   - // change: function (event, ui) {
1332   - // var targetid = event.target.id;
1333   - // var windviewid = targetid.split('_')[1];
1334   - // var scope = angular.element(document.getElementById("daViewDA_" + windviewid)).scope();
1335   - // scope.$apply(function () {
1336   - // scope.onTransparencyChange(event, ui);
1337   - // });
1338   - // }
1339   - // ,
1340   - stop: function (event, ui) {
  1331 + slide: function (event, ui) {
  1332 + var $ua = navigator.userAgent;
  1333 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  1334 + var targetid = event.target.id;
  1335 + var len= (targetid).split("_").length;
  1336 + var windviewid = (targetid).split("_")[len-1];
  1337 + var scope = angular.element(document.getElementById("daViewDA_" + windviewid)).scope();
  1338 + scope.$apply(function () {
  1339 + scope.onTransparencyChange(event, ui);
  1340 + });
  1341 + }
  1342 + } ,
  1343 + change: function (event, ui) {
1341 1344 var targetid = event.target.id;
1342 1345 var len= (targetid).split("_").length;
1343 1346 var windviewid = (targetid).split("_")[len-1];
... ... @@ -1346,6 +1349,16 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1346 1349 scope.onTransparencyChange(event, ui);
1347 1350 });
1348 1351 }
  1352 + // ,
  1353 + // stop: function (event, ui) {
  1354 + // var targetid = event.target.id;
  1355 + // var len= (targetid).split("_").length;
  1356 + // var windviewid = (targetid).split("_")[len-1];
  1357 + // var scope = angular.element(document.getElementById("daViewDA_" + windviewid)).scope();
  1358 + // scope.$apply(function () {
  1359 + // scope.onTransparencyChange(event, ui);
  1360 + // });
  1361 + // }
1349 1362 })
1350 1363 .slider("pips", {
1351 1364 rest: "label",
... ... @@ -1505,75 +1518,75 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1505 1518 $("#" + $scope.jsPanelID).css("width", "100%");
1506 1519 $("#layerChangeSlider").css("pointer-events", "auto");
1507 1520 // on identity mode click
1508   - $("#btnZoom").removeAttr("onclick");
1509   - $("#btnZoom").on("touchstart", function () {
1510   - if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
1511   - $(".btn-annotation").removeClass("activebtncolor");
1512   - //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
1513   - $('.com').remove();
1514   - $('#bord').remove();
1515   - console.log('OnZoom is called outside ');
1516   - var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
1517   - scope.$apply(function () {
1518   - scope.enableZoom();
1519   - });
1520   - });
  1521 + // $("#btnZoom").removeAttr("onclick");
  1522 + // $("#btnZoom").on("touchstart", function () {
  1523 + // if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
  1524 + // $(".btn-annotation").removeClass("activebtncolor");
  1525 + // //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
  1526 + // $('.com').remove();
  1527 + // $('#bord').remove();
  1528 + // console.log('OnZoom is called outside ');
  1529 + // var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  1530 + // scope.$apply(function () {
  1531 + // scope.enableZoom();
  1532 + // });
  1533 + // });
1521 1534 // on transparency mode click
1522   - $("#btnTranparency").removeAttr("onclick");
1523   - $("#btnTranparency").on("touchstart", function () {
1524   - console.log('OnEnableExtract is called outside ');
1525   - var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
1526   - scope.$apply(function () {
1527   - scope.createTransparencyBox('true');
1528   - });
1529   - });
  1535 + // $("#btnTranparency").removeAttr("onclick");
  1536 + // $("#btnTranparency").on("touchstart", function () {
  1537 + // console.log('OnEnableExtract is called outside ');
  1538 + // var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  1539 + // scope.$apply(function () {
  1540 + // scope.createTransparencyBox('true');
  1541 + // });
  1542 + // });
1530 1543 // on normal mode click
1531   - $("#btnNormalMode").removeAttr("onclick");
1532   - $("#btnNormalMode").on("touchstart", function () {
1533   - console.log('OnEnableNormalMode is called outside ');
1534   - $("#btnTranparency").removeClass("disabled");
1535   - var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
1536   - scope.$apply(function () {
1537   - scope.enableNormalMode();
1538   - });
1539   - });
  1544 + // $("#btnNormalMode").removeAttr("onclick");
  1545 + // $("#btnNormalMode").on("touchstart", function () {
  1546 + // console.log('OnEnableNormalMode is called outside ');
  1547 + // $("#btnTranparency").removeClass("disabled");
  1548 + // var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  1549 + // scope.$apply(function () {
  1550 + // scope.enableNormalMode();
  1551 + // });
  1552 + // });
1540 1553 // on extract mode click
1541   - $("#btnExtract").removeAttr("onclick");
1542   - $("#btnExtract").on("touchstart", function () {
1543   - console.log('OnEnableExtract is called outside ');
1544   - var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
1545   - scope.$apply(function () {
1546   - scope.enableExtract('true');
1547   - });
1548   - });
  1554 + // $("#btnExtract").removeAttr("onclick");
  1555 + // $("#btnExtract").on("touchstart", function () {
  1556 + // console.log('OnEnableExtract is called outside ');
  1557 + // var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  1558 + // scope.$apply(function () {
  1559 + // scope.enableExtract('true');
  1560 + // });
  1561 + // });
1549 1562 // on highlight mode click
1550   - $("#btnHighLight").removeAttr("onclick");
1551   - $("#btnHighLight").on("touchstart", function () {
1552   - console.log('OnEnableHighlight is called outside ');
1553   - var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
1554   - scope.$apply(function () {
1555   - scope.enableHighlight();
1556   - });
1557   - });
  1563 + // $("#btnHighLight").removeAttr("onclick");
  1564 + // $("#btnHighLight").on("touchstart", function () {
  1565 + // console.log('OnEnableHighlight is called outside ');
  1566 + // var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  1567 + // scope.$apply(function () {
  1568 + // scope.enableHighlight();
  1569 + // });
  1570 + // });
1558 1571 // on show/hide mode click
1559   - $("#btnStrutureBox").removeAttr("onclick");
1560   - $("#btnStrutureBox").on("touchstart", function () {
1561   - console.log('OnBodySystem chnaged is called outside ');
1562   - var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
1563   - scope.$apply(function () {
1564   - scope.enableShowHideStructureBox();
1565   - });
1566   - });
1567   - }
1568   -
1569   - $("#" + $scope.jsPanelID).resize(function (event) {
1570   - var len= (event.currentTarget.id).split("_").length;
1571   - var windowviewid = (event.currentTarget.id).split("_")[len-1];
1572   - var CanvasDivLeftPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivLeftPosition');
1573   - var CanvasDivTopPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivTopPosition');
1574   - $('#canvasDivDA_' + windowviewid).scrollLeft(CanvasDivLeftPosition);
1575   - $('#canvasDivDA_' + windowviewid).scrollTop(CanvasDivTopPosition);
1576   - });
  1572 + // $("#btnStrutureBox").removeAttr("onclick");
  1573 + // $("#btnStrutureBox").on("touchstart", function () {
  1574 + // console.log('OnBodySystem chnaged is called outside ');
  1575 + // var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  1576 + // scope.$apply(function () {
  1577 + // scope.enableShowHideStructureBox();
  1578 + // });
  1579 + // });
  1580 + }
  1581 +
  1582 + // $("#" + $scope.jsPanelID).resize(function (event) {
  1583 + // var len= (event.currentTarget.id).split("_").length;
  1584 + // var windowviewid = (event.currentTarget.id).split("_")[len-1];
  1585 + // var CanvasDivLeftPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivLeftPosition');
  1586 + // var CanvasDivTopPosition=$scope.GetwindowStoreData(windowviewid,'CanvasDivTopPosition');
  1587 + // $('#canvasDivDA_' + windowviewid).scrollLeft(CanvasDivLeftPosition);
  1588 + // $('#canvasDivDA_' + windowviewid).scrollTop(CanvasDivTopPosition);
  1589 + // });
1577 1590  
1578 1591 })
1579 1592  
... ... @@ -5984,8 +5997,20 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5984 5997 'border': '1px dotted #000'
5985 5998 });
5986 5999  
5987   - var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
5988   -
  6000 + var $ua = navigator.userAgent;
  6001 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  6002 + if(e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel'){
  6003 + // var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
  6004 + var touch = e.touches[0] || e.changedTouches[0];
  6005 + var currentMousePosition = $scope.getMousePos(touch.pageX,touch.pageY,windowviewid);
  6006 + }
  6007 + }
  6008 + else
  6009 + {
  6010 + var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
  6011 + }
  6012 +
  6013 +
5989 6014 $scope.TBDrawStartX = currentMousePosition.x;
5990 6015 $scope.TBDrawStartY = currentMousePosition.y;
5991 6016  
... ... @@ -6044,7 +6069,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6044 6069 $scope.verticalScrollPosition = canvasDiv.scrollTop;
6045 6070 $scope.horizontlScrollPosition = canvasDiv.scrollLeft;
6046 6071  
6047   - var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
  6072 + var $ua = navigator.userAgent;
  6073 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  6074 + if(e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel'){
  6075 + // var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
  6076 + var touch = e.touches[0] || e.changedTouches[0];
  6077 + var currentMousePosition = $scope.getMousePos(touch.pageX,touch.pageY,windowviewid);
  6078 + }
  6079 + }
  6080 + else
  6081 + {
  6082 + var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
  6083 + }
  6084 +
6048 6085 var move_x = currentMousePosition.x + $scope.horizontlScrollPosition;
6049 6086 var move_y = currentMousePosition.y + $scope.verticalScrollPosition;
6050 6087 var width = 0;
... ... @@ -6131,8 +6168,18 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6131 6168 $scope.SetwindowStoreData(windowviewid, 'currentLayerNumber', parseInt($('#txtLayerNumberDA_' + windowviewid).val()));
6132 6169  
6133 6170 $('.rectangle').remove();
6134   -
6135   - var currentMousePosition = $scope.getMousePos(e.pageX, e.pageY, windowviewid);
  6171 + var $ua = navigator.userAgent;
  6172 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  6173 + if(e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel'){
  6174 + // var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
  6175 + var touch = e.touches[0] || e.changedTouches[0];
  6176 + var currentMousePosition = $scope.getMousePos(touch.pageX,touch.pageY,windowviewid);
  6177 + }
  6178 + }
  6179 + else
  6180 + {
  6181 + var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
  6182 + }
6136 6183 var canavsDivScrollPos = $scope.getCanavsDivScrollPosition(windowviewid);
6137 6184 var TransparencyEndX = currentMousePosition.x + canavsDivScrollPos.horizontlScrollPosition;
6138 6185 var TransparencyBoxEndY = currentMousePosition.y + canavsDivScrollPos.verticalScrollPosition;
... ... @@ -6150,7 +6197,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6150 6197 $('#btnTranparency_' + windowviewid).removeClass(' btn-primary');
6151 6198 $('#btnTranparency_' + windowviewid).addClass('btn-black');
6152 6199  
6153   - } else {
  6200 + }
  6201 + else
  6202 + {
6154 6203  
6155 6204 if (previewRectangleWidth == 0 && previewRectangleHeight == 0) {
6156 6205  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @b19c0c5
... ... @@ -1736,7 +1736,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1736 1736 // it watch the session on perticular time interval during idle time period
1737 1737 // config set in AIA.js -: KeepaliveProvider.interval(10);
1738 1738 //we will use it to recieve request from databse if user logout from admin activity
1739   - console.log('ping user session');
  1739 + // console.log('ping user session');
1740 1740 $rootScope.CheckUserSession('update');
1741 1741 });
1742 1742  
... ... @@ -8042,20 +8042,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8042 8042 $rootScope.StoreImageName(fileName);
8043 8043  
8044 8044 if( $rootScope.UserImageExportData.length>0)
8045   - {
  8045 + {
  8046 + var dataURL = canvas.toDataURL("image/jpeg");
  8047 + var blob = dataURItoBlob(dataURL);
  8048 + console.log(blob);
  8049 + saveAs(blob, fileName);
  8050 + $("#exportlogo").remove();
  8051 + $("#filename").val("");
  8052 +
8046 8053 var imageInfo=$rootScope.UserImageExportData[0];
8047 8054  
8048 8055 AuthenticationService.UserLicenseExportImage(imageInfo)
8049 8056 .then(
8050 8057 function (result) {
8051 8058  
8052   - var dataURL = canvas.toDataURL("image/jpeg");
8053   - var blob = dataURItoBlob(dataURL);
8054   - console.log(blob);
8055   - saveAs(blob, fileName);
8056   - $("#exportlogo").remove();
8057   - $("#filename").val("");
8058   -
8059 8059 if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
8060 8060 for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
8061 8061 $scope.updatedWindowListForSaveCB={
... ... @@ -8149,6 +8149,76 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8149 8149 $(".export-image").css("display", "none");
8150 8150  
8151 8151 };
  8152 +
  8153 + $rootScope.SaveOpenImagefile = function () {
  8154 + // select one module from multiple
  8155 + var PanelElement= $scope.GetPanelElement($rootScope.panelNameWithCb);
  8156 +
  8157 + var canvasDiv = PanelElement.canvasDivElement;
  8158 + if (canvasDiv == null || canvasDiv == undefined) return;
  8159 + var canvasDivId = canvasDiv.id;
  8160 + $("#" + canvasDivId).append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
  8161 + html2canvas($("#" + canvasDivId), {
  8162 + onrendered: function (canvas) {
  8163 + var fileName = document.getElementById("filename_open").value + '.jpg';
  8164 + if (typeof (fileName) == "undefined" || fileName == ".jpg")
  8165 + fileName = "Untitled.jpg"
  8166 +
  8167 + //store image to export
  8168 + $rootScope.StoreImageName(fileName);
  8169 +
  8170 + if( $rootScope.UserImageExportData.length>0)
  8171 + {
  8172 + var dataURL = canvas.toDataURL("image/jpeg");
  8173 + // open image in new tab
  8174 + var html = '<title>' + document.getElementById("filename_open").value + '</title>'+
  8175 + '<div id="img"><img src="' + dataURL + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
  8176 + var w = window.open();
  8177 + $(w.document.body).html(html);
  8178 +
  8179 + //save image file
  8180 + var blob = dataURItoBlob(dataURL);
  8181 + console.log(blob);
  8182 + saveAs(blob, fileName);
  8183 + $("#exportlogo").remove();
  8184 + $("#filename_open").val("");
  8185 +
  8186 + var imageInfo=$rootScope.UserImageExportData[0];
  8187 +
  8188 + AuthenticationService.UserLicenseExportImage(imageInfo)
  8189 + .then(
  8190 + function (result) {
  8191 +
  8192 + localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
  8193 + if(result!=null && result!="ADMIN" )
  8194 + {
  8195 + var userid= $rootScope.userData.Id;
  8196 + // set already export image count
  8197 + $scope.UpdateUserExportImageData(userid,'CountExportImage',result.CountExportedImage);
  8198 +
  8199 + // set Image limit
  8200 + $scope.UpdateUserExportImageData(userid,'ExptImageLimit',result.ExptImageLimit);
  8201 +
  8202 + // set is enable for export image
  8203 + $scope.UpdateUserExportImageData(userid,'isExportImage',result.isExportImage);
  8204 +
  8205 +
  8206 + }
  8207 +
  8208 + }),
  8209 + function (error) {
  8210 + console.log(' Error in export Image to databse = ' + error.statusText);
  8211 + $rootScope.errorMessage = error;
  8212 + $("#messageModal").modal('show');
  8213 + }
  8214 +
  8215 + }
  8216 +
  8217 + }
  8218 + });
  8219 + $(".export-image-ipad").css("display", "none");
  8220 +
  8221 + };
8152 8222  
8153 8223 }]
8154 8224 )
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @b19c0c5
... ... @@ -893,14 +893,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
893 893 value: zoomLevel,
894 894 range: "min",
895 895 orientation: "vertical",
896   - // slide: function (event, ui) {
897   - // if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
898   - // var targetid = event.target.id;
899   - // var len= (targetid).split("_").length;
900   - // var windviewid = (targetid).split("_")[len-1];
901   - // changeThumbnailSize(event, ui.value, windviewid);
902   - // }
903   - // } ,
  896 + slide: function (event, ui) {
  897 + // work on touch screen device
  898 + var $ua = navigator.userAgent;
  899 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  900 + var targetid = event.target.id;
  901 + var len= (targetid).split("_").length;
  902 + var windviewid = (targetid).split("_")[len-1];
  903 + changeThumbnailSize(event, ui.value, windviewid);
  904 + }
  905 + } ,
904 906 change: function (event, ui) {
905 907 var targetid = event.target.id;
906 908 var len= (targetid).split("_").length;
... ... @@ -3310,38 +3312,38 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3310 3312 $("#ImagePanel").css("width", "100%");
3311 3313  
3312 3314 //hide pin button clicked
3313   - $("#hidePinBtn").removeAttr("onclick");
3314   - $("#hidePinBtn").on("touchstart", function () {
3315   - var rootScope = angular.element(document.getElementById("aaBodyView")).scope();
3316   - rootScope.$apply(function () {
3317   - rootScope.hidePins(event);
3318   - });
3319   - });
  3315 + // $("#hidePinBtn").removeAttr("onclick");
  3316 + // $("#hidePinBtn").on("touchstart", function () {
  3317 + // var rootScope = angular.element(document.getElementById("aaBodyView")).scope();
  3318 + // rootScope.$apply(function () {
  3319 + // rootScope.hidePins(event);
  3320 + // });
  3321 + // });
3320 3322 //selected pin button clicked
3321   - $("#selectedPin").removeAttr("onclick");
3322   - $("#selectedPin").on("touchstart", function () {
3323   - console.log('showSelectedPins is called')
3324   - var scope = angular.element(document.getElementById("aaBodyView")).scope();
3325   - scope.$apply(function () {
3326   - scope.showSelectedPins(event);
3327   - });
3328   - });
3329   - //all pin button clicked
3330   - $("#allPinBtn").removeAttr("onclick");
3331   - $("#allPinBtn").on("touchstart", function () {
3332   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
3333   - scope.$apply(function () {
3334   - scope.showAllPinsAfterHide(event);
3335   - });
3336   - });
3337   - //comment-box button clicked
3338   - $("#comment-box").removeAttr("onclick");
3339   - $("#comment-box").on("touchstart", function () {
3340   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
3341   - scope.$apply(function () {
3342   - scope.ShowHideAnnotation(event);
3343   - });
3344   - });
  3323 + // $("#selectedPin").removeAttr("onclick");
  3324 + // $("#selectedPin").on("touchstart", function () {
  3325 + // console.log('showSelectedPins is called')
  3326 + // var scope = angular.element(document.getElementById("aaBodyView")).scope();
  3327 + // scope.$apply(function () {
  3328 + // scope.showSelectedPins(event);
  3329 + // });
  3330 + // });
  3331 + // //all pin button clicked
  3332 + // $("#allPinBtn").removeAttr("onclick");
  3333 + // $("#allPinBtn").on("touchstart", function () {
  3334 + // var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  3335 + // scope.$apply(function () {
  3336 + // scope.showAllPinsAfterHide(event);
  3337 + // });
  3338 + // });
  3339 + // //comment-box button clicked
  3340 + // $("#comment-box").removeAttr("onclick");
  3341 + // $("#comment-box").on("touchstart", function () {
  3342 + // var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  3343 + // scope.$apply(function () {
  3344 + // scope.ShowHideAnnotation(event);
  3345 + // });
  3346 + // });
3345 3347  
3346 3348 }
3347 3349  
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
  View file @b19c0c5
... ... @@ -75,7 +75,7 @@
75 75 }
76 76 })
77 77 .success(function (data, status, headers, config) {
78   - console.log('success')
  78 + //console.log('success')
79 79 deferred.resolve(data);
80 80 }).error(function (data, status, headers, config) {
81 81 console.log('error')
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @b19c0c5
... ... @@ -49,7 +49,7 @@
49 49 <li class="navbarItem"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li>
50 50 </ul>
51 51 <ul class="nav navbar-nav navbar-right">
52   - <li class="navbarItem" style="pointer-events:none ;"><a href="#">{{userName}}</a></li>
  52 + <li id="userNameoption" class="navbarItem" style="pointer-events:none ;"><a href="#">{{userName}}</a></li>
53 53 <li class="hidden-xs marginR5 logOut" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li>
54 54 </ul>
55 55 <div id="imaginary_container" style="visibility:hidden">
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @b19c0c5
... ... @@ -625,7 +625,7 @@
625 625 <div class="annotationbar">
626 626 <div class="modal-content">
627 627 <div class="modal-header annotation-modal-header">
628   - <button type="button" class="close" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
  628 + <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
629 629 <h4 class="modal-title" id="myModalLabel">Annotation</h4>
630 630 </div>
631 631 <div class="modal-body" id="AnnotaionPopupDiv">
... ... @@ -1200,7 +1200,7 @@
1200 1200 <div class="form-group">
1201 1201 <label for="filename">Filename:</label>
1202 1202 <div class="input-group">
1203   - <input type="text" class="form-control" id="filename" placeholder="" ng-model="filename">
  1203 + <input type="text" class="form-control" id="filename" placeholder="enter name" ng-model="filename">
1204 1204 <div class="input-group-addon">.jpg</div>
1205 1205 </div>
1206 1206 </div>
... ... @@ -1211,7 +1211,7 @@
1211 1211 <div class="modal-footer">
1212 1212 <div class="row">
1213 1213 <input type="file" id="file1" style="display:none">
1214   - <div class="col-sm-12"><button id="btnSaveEI" ng-click="SaveImagefile()" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
  1214 + <div class="col-sm-12"><button id="btnSaveEI" ng-click="SaveImagefile()" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div>
1215 1215 </div>
1216 1216 </div>
1217 1217  
... ... @@ -1220,18 +1220,18 @@
1220 1220 </div>
1221 1221 <div class="modal fade export-image-ipad ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
1222 1222 style="z-index: 1200002;">
1223   - <div class="modal-dialog modal-sm" role="document">
  1223 + <div class="modal-dialog modal-sm" role="document" style="width:400px">
1224 1224 <div class="modal-content">
1225 1225 <div class="modal-header annotation-modal-header ui-draggable-handle">
1226 1226 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
1227 1227 <h4 class="modal-title" id="">Download Export Image</h4>
1228 1228 </div>
1229   - <div class="modal-body">
  1229 + <div class="modal-body" style="width: 400px; height: 100px; overflow-x: auto;">
1230 1230 <div class="row paddTopbtm15">
1231 1231 <div class="col-sm-12">
1232 1232 <div class="form-group">
1233   - <label for="filename">Exported image open in next Teb. Please download it</label>
1234   -
  1233 + <label for="filename">Exported image open in new Teb. Please download it</label>
  1234 + <input type="text" class="form-control" id="filename_open" placeholder="enter name" ng-model="filename_open">
1235 1235 </div>
1236 1236 </div>
1237 1237 </div>
... ... @@ -1240,8 +1240,8 @@
1240 1240 <div class="modal-footer">
1241 1241 <div class="row">
1242 1242 <input type="file" id="file1" style="display:none">
1243   - <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->
1244   - <div class="col-sm-12"><button id="btnPrintPreview" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
  1243 + <!-- <div class="col-sm-12"><button id="btnPrintPreview" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> -->
  1244 + <div class="col-sm-12"><button ng-click="SaveOpenImagefile()" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div>
1245 1245 </div>
1246 1246 </div>
1247 1247  
... ... @@ -1383,7 +1383,7 @@
1383 1383 <div class="modal-content">
1384 1384 <div class="modal-header ui-draggable-handle " style="background-color: #ec6798; border-color: #007ab3;cursor:default; padding:5px">
1385 1385 <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="font-size: 30px;"><span aria-hidden="true">&times;</span></button>
1386   - <h4 style="color:#fff; float: left;">AIA Message</h4>
  1386 + <h4 style="color:#fff; float: left;">Alert!</h4>
1387 1387 </div>
1388 1388 <div class="modal-body" style=" height: 160px; overflow-x: auto;">
1389 1389 <div class="panel-body">
... ... @@ -1406,7 +1406,7 @@
1406 1406 <div class="modal-content">
1407 1407 <div class="modal-header ui-draggable-handle " style="background-color: #ec6798; border-color: #007ab3;cursor:default; padding:5px">
1408 1408 <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="font-size: 30px;"><span aria-hidden="true">&times;</span></button>
1409   - <h4 style="color:#fff; float: left;">AIA Message</h4>
  1409 + <h4 style="color:#fff; float: left;">Alert!</h4>
1410 1410 </div>
1411 1411 <div class="modal-body" style=" height: 160px; overflow-x: auto;">
1412 1412 <div class="panel-body">
... ... @@ -2111,21 +2111,21 @@
2111 2111 <!-- Export Image Save Click-->
2112 2112 <script>
2113 2113 $(function () {
2114   - $("#btnPrintPreview").click(function () {
2115   - $("#canvasDiv").append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
2116   - html2canvas($("#canvasDiv"), {
2117   - onrendered: function (canvas) {
2118   - var imgsrc = canvas.toDataURL("image/png");
2119   - console.log(imgsrc);
2120   - var html = '<div id="img"><img src="' + imgsrc + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
2121   - var w = window.open();
2122   - $(w.document.body).html(html);
2123   - $("#filename").val("");
2124   - $("#exportlogo").remove();
2125   - }
2126   - });
2127   -
2128   - });
  2114 + // $("#btnPrintPreview").click(function () {
  2115 + // $("#canvasDiv").append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
  2116 + // html2canvas($("#canvasDiv"), {
  2117 + // onrendered: function (canvas) {
  2118 + // var imgsrc = canvas.toDataURL("image/png");
  2119 + // console.log(imgsrc);
  2120 + // var html = '<div id="img"><img src="' + imgsrc + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
  2121 + // var w = window.open();
  2122 + // $(w.document.body).html(html);
  2123 + // $("#filename").val("");
  2124 + // $("#exportlogo").remove();
  2125 + // }
  2126 + // });
  2127 +
  2128 + // });
2129 2129  
2130 2130 });
2131 2131 function dataURItoBlob(dataURI) {
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css
  View file @b19c0c5
... ... @@ -6046,3 +6046,14 @@ button.close {
6046 6046 display: none !important;
6047 6047 }
6048 6048 }
  6049 +/* update css for top menu for devices */
  6050 +@media (min-width: 480px) and (max-width: 900px) {
  6051 + #userNameoption {
  6052 + display: none !important;
  6053 + }
  6054 +}
  6055 +@media (min-width: 901px) {
  6056 + #userNameoption {
  6057 + display: block !important;
  6058 + }
  6059 +}
... ...