diff --git a/150-DOCUMENTATION/AIA-Timelines-V1.12.xlsx b/150-DOCUMENTATION/AIA-Timelines-V1.12.xlsx new file mode 100644 index 0000000..7b5ab7c --- /dev/null +++ b/150-DOCUMENTATION/AIA-Timelines-V1.12.xlsx diff --git a/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 33(30-March-17).xlsx b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 33(30-March-17).xlsx index 94f19b1..d711c2e 100644 --- a/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 33(30-March-17).xlsx +++ b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 33(30-March-17).xlsx diff --git a/150-DOCUMENTATION/Audit/MatrixCollectionNov-Dec-Jan-AIA.xlsx b/150-DOCUMENTATION/Audit/MatrixCollectionNov-Dec-Jan-AIA.xlsx index 014aada..8ac5a32 100644 --- a/150-DOCUMENTATION/Audit/MatrixCollectionNov-Dec-Jan-AIA.xlsx +++ b/150-DOCUMENTATION/Audit/MatrixCollectionNov-Dec-Jan-AIA.xlsx diff --git a/400-SOURCECODE/AIAHTML5.API/Web.config b/400-SOURCECODE/AIAHTML5.API/Web.config index 21e9e01..a3f2c58 100644 --- a/400-SOURCECODE/AIAHTML5.API/Web.config +++ b/400-SOURCECODE/AIAHTML5.API/Web.config @@ -40,8 +40,8 @@ - - + + diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config index 92603bf..a3f2c58 100644 --- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config +++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config @@ -39,9 +39,9 @@ - - - + + + diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb index 77b7823..6afcfb5 100644 --- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb +++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 5a13c38..4ce7ab5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -921,15 +921,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo .where('_ViewOrientationId == ' + viewOrientationId) .select(); + + + //remove existing body view + var canDiv = document.getElementById('canvasDiv'); + var canDivChildCount = canDiv.childElementCount; + if (canDivChildCount > 0) { + canDiv.innerHTML = ''; + } + if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) { $scope.ColoredImageSRC = null; $scope.ColoredImageSRC = []; - //remove existing body view - var canDiv = document.getElementById('canvasDiv'); - var canDivChildCount = canDiv.childElementCount; - if (canDivChildCount > 0) { - canDiv.innerHTML = ''; - } + // $scope.flushCanvas(); } else { @@ -8407,20 +8411,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - $rootScope.mouseMoveToolTip = function (toolTipTopPosition, toolTipLeftPosition, toolTipWidth, toolTipText) { - - $("#cursor-block").addClass("custom-tooltip-annotation-toolbar"); - $(".custom-tooltip-annotation-toolbar").css({ "display": "block", "top": toolTipTopPosition + "px", "width": toolTipWidth + "px", "left": toolTipLeftPosition + "px" }); - $("#cursor-block").html(toolTipText); - } - - $rootScope.mouseOutToolTip = function () { - - $(".custom-tooltip-annotation-toolbar").css('display', 'none'); - $("#cursor-block").removeClass("custom-tooltip-annotation-toolbar"); - $("#cursor-block").html(); - - } $scope.OnSearchBtnClick = function (e) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index adcec64..b0ff5d0 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -136,6 +136,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.isVisibleLogin = false; localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); + $('#dvUserModulesInfo').modal('show'); var userType = result.userType + ''; @@ -413,9 +414,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.$on("$locationChangeSuccess", function () { - $rootScope.isLeftMenuActive = function (moduleUrl) { - - return moduleUrl === $location.path(); + $rootScope.HightLightModuleSelection = function (moduleUrl) { + var currentRoute = $location.path().substring(1); + return moduleUrl === currentRoute ? 'active' : ''; } if (($location.url() == "/da-body-view")) { @@ -875,6 +876,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.switchCanvas(); } + else if ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)") + { + // we are switching canvas from paint to draw to prevent paint because it does not take transparent color and we need control default black color for the case where user has unchecked fill option from Edit Shape Style window + + $rootScope.switchCanvas(); + } else { $rootScope.switchCanvasToPaintCanvas(); @@ -3488,13 +3495,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic AdminService.SendAdminAccessRequestMail(userInfo) .then(function (result) { if (result == AdminConstants.MAIL_SENT) { - $("#adminModal").fadeOut(); - $("#adminModal").modal('hide'); - $("adminAccessTextArea").text(''); - - $rootScope.errorMassage = AdminConstants.MAIL_SENT; + $rootScope.errorMassage = AdminConstants.MAIL_SENT_SUCCESS_MESSAGE; $("#messageModal").modal('show'); } + $("#adminModal").fadeOut(); + $("#adminModal").modal('hide'); + $('[name="adminAccessTextArea"]').val(''); }, function (error) { console.log(' Error in sending mail to admin support = ' + error.statusText); @@ -3508,5 +3514,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $("#adminModal").modal('hide'); $("adminAccessTextArea").text(''); } + + + $rootScope.addToolTip = function (toolTipTopPosition, toolTipLeftPosition, toolTipWidth, toolTipText) { + + $("#cursor-block").addClass("custom-tooltip-annotation-toolbar"); + $(".custom-tooltip-annotation-toolbar").css({ "display": "block", "top": toolTipTopPosition + "px", "width": toolTipWidth + "px", "left": toolTipLeftPosition + "px" }); + $("#cursor-block").html(toolTipText); + } + + $rootScope.removeToolTipOnMouseOut = function () { + + $(".custom-tooltip-annotation-toolbar").css('display', 'none'); + $("#cursor-block").removeClass("custom-tooltip-annotation-toolbar"); + $("#cursor-block").html(); + + } }] ); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index f4a4f10..938c41e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -312,7 +312,9 @@ AIA.constant("LoginMessageConstants", { }) AIA.constant("AdminConstants", { "ERROR_IN_SENDING_MAIL": "Some internal error occured.", - "MAIL_SENT": "Mail sent." + "MAIL_SENT": "Mail sent.", + "MAIL_NOT_SENT": "Mail not sent.", + "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon." }) AIA.constant("UserTypeConstants", { "SUPER_ADMIN": "Super Admin", diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html index 7e4b22c..ae2be0c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html @@ -3,7 +3,7 @@
-

{{currentActiveModuleTitle}}

+

@@ -26,7 +26,7 @@ diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 4caeee1..ec400cd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -629,24 +629,24 @@
- - - - + + + +
- - - - + + + +
-
+
-
+
@@ -656,23 +656,23 @@
- - + + -   +  
-
+
-
-
@@ -681,7 +681,7 @@
-
+
@@ -1215,6 +1215,83 @@
+ + +