diff --git a/400-SOURCECODE/AIAHTML5.Web/Web.config b/400-SOURCECODE/AIAHTML5.Web/Web.config
index 81b5072..58cc88d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/Web.config
+++ b/400-SOURCECODE/AIAHTML5.Web/Web.config
@@ -18,7 +18,7 @@
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 2edf433..f359fd9 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -96,7 +96,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.dragdivtop = 0;
$scope.IsSearchVisible = false;
-
+ $scope.shapesize = 1;
$scope.dragdivposition = {
"left": $scope.dragdivleft,
"top": $scope.dragdivtop
@@ -5648,7 +5648,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var canvasElement = document.getElementById("canvas");
var ctx = canvasElement.getContext("2d");
-
+ var canvasElement1 = document.getElementById("canvasPaint");
+ var ctx1 = canvasElement1.getContext("2d");
/* if ($rootScope.shapeType == "FreeStylePaint") {
var canvasPaint_zIndex = $('#canvasPaint').css("z-index");
@@ -5669,6 +5670,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
case "cursor":
// ctx.clearRect(0, 0, 2277, 3248);
ctx.beginPath();
+ ctx1.beginPath();
break;
@@ -5812,7 +5814,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
break;
case "Circle":
- // alert($rootScope.shapestyleFillColor);
+ // alert($rootScope.shapestyleborderWidth);
$rootScope.resetCircle = $rootScope.ObjectIndex++;
$('#canvas').addLayer({
layer: true,
@@ -6308,7 +6310,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
$scope.OnPaintBrushCanvasMouseDown = function (event) {
+ switch ($rootScope.shapeType) {
+
+ case "FreeStylePaint":
+
+ debugger;
+ $('#canvasPaint').sketch({ defaultSize: 1 });
+ //if ($("#amount-2").val() == '') {
+ // $('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
+ //}
+ //else {
+
+ // var a = $("#amount-2").val();
+ // $scope.shapesize = parseInt(a);
+ // // alert(JSON.stringify({ defaultSize: $scope.shapesize }));
+ // $('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
+ //}
+
+
+ break;
+
+ }
}
$scope.OnPaintBrushCanvasMouseUp = function (event) {
@@ -6316,19 +6339,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
// var canvasElement1 = document.getElementById("canvasPaint");
// var ctx1 = canvasElement1.getContext("2d");
- switch($rootScope.shapeType)
- {
- case "FreeStylePaint":
-
- $('#canvasPaint').sketch({ defaultSize: 1 });
+ //switch($rootScope.shapeType)
+ //{
+
+ // case "FreeStylePaint":
+
+ // debugger;
+
+ // if ($("#amount-2").val() == '')
+ // {
+ // $('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
+ // }
+ // else
+ // {
+
+ // var a = $("#amount-2").val();
+ // $scope.shapesize = parseInt(a);
+ // alert(JSON.stringify({ defaultSize: $scope.shapesize }));
+ // $('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
+
+ // }
+
- break;
+ // break;
-
- }
+ //}
}
+
+
$(document).keydown(function (event) {
@@ -6900,12 +6940,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//8.remove current layer canavses
$scope.flushCanvas();
+
//9.
$timeout(function () {
$rootScope.isHighLight = false;
-
- //removing speechbubble
$('#sppeachBubble').css('display', 'none');
$("#dot").css("display", "none");
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index e63a75e..10aba74 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -175,6 +175,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$(".btn-annotation-rectangle").addClass("activebtncolor");
}
$rootScope.paintBrush = function () {
+
+ $('.btnCursor').addClass('activebtncolor');
$rootScope.switchCanvasToPaintCanvas();
$rootScope.shapeType = "FreeStylePaint";
@@ -261,19 +263,33 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$rootScope.shapestyleborderStyles = "solid";
$rootScope.shapestyle = function (id) {
+ document.getElementById('modelbackground').style.display = "none";
+
$rootScope.shapestyleOpacity = $("#" + id).css('opacity');
$rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
$rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
$rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
var intPart = pixelSeparation.split("p");
-
+
$rootScope.shapestyleborderWidth = intPart[0];
- $rootScope.shapestyleborderStyles = "solid";
+ $rootScope.shapestyleborderStyles = "solid";
+
+ $('#editshapestyle').modal('hide');
+ }
+
+ $rootScope.enableAnnotationToolBar = function () {
+
+ document.getElementById('modelbackground').style.display = "block";
+ $("#editshapestyle").modal('show');
- $('#editshapestyle').modal('hide');
}
+ $rootScope.disableAnnotationToolBar = function () {
+
+ document.getElementById('modelbackground').style.display = "none";
+
+ }
//----End-------------
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
deleted file mode 100644
index d34535d..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
+++ /dev/null
@@ -1,545 +0,0 @@
-'use strict';
-
-AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout",
- function ($rootScope, Modules, $log, $location, $timeout) {
-
- //$scope.pageToOpen = {
- // name: 'MainMenu'
- //};
- $rootScope.pageToOpen = 'app/widget/MainMenu.html';
- $rootScope.currentBodyViewId;
- $rootScope.currentActiveModuleTitle = 'Welcome to A.D.A.M. Interactive Anatomy';//Modules[0].Name;
- $rootScope.currentActiveViewTitle;
- $rootScope.cuurentActiveModuleId;
- $rootScope.openModules = [];
- $rootScope.openViews = [];
- $rootScope.currentSlug;
- $rootScope.jsPanelTitle;
- $rootScope.ViewTitle;
- $rootScope.isLoading = false;
- $rootScope.isAnnotationWindowOpen = false;
- $rootScope.isDrawingToolSelected = false;
- $rootScope.isIdetifyClicked = true;
- $rootScope.paint = false;
- $rootScope.clickX = new Array();
- $rootScope.clickY = new Array();
- $rootScope.clickDrag = new Array();
- $rootScope.isLineDrawSelecyed = false;
- $rootScope.isAnnotationWindowClose = false;
- $rootScope.lastX;
- $rootScope.lastY;
- $rootScope.CommonData;
- $rootScope.shapeType;
- $rootScope.globalSetting = {
- ethnicity: 'W',
- modesty: 'Y',
- };
- $rootScope.formsetting = {
- ethnicity: null,
- modesty: null
- };
-
- $rootScope.isModestyOn;
- $rootScope.isModestyOff;
- $rootScope.SetSettingActiveTab;
-
- //jspanel functionality..
-
- $rootScope.openParent = function (slug) {
- // debugger;
- var openViews = $rootScope.openViews;
- if (openViews.length > 0) {
- $rootScope.openViews.splice(openViews.length - 1);
- }
- if (openViews.length > 0) {
- var lastOpenMoudle = $rootScope.openViews[openViews.length - 1];
- }
- $('#daImagePanel').remove();
- $location.url('/' + slug);
-
- $rootScope.$broadcast('jsPanelCloseEvent', true);
- }
-
- //called on jsanel minimize
- $rootScope.setState = function (state, title) {
-
-
- var alreadyOpenThisView = new jinqJs()
- .from($rootScope.openViews)
- .where("body-views == " + title)
- .select();
- var k = 0;
- if (alreadyOpenThisView != null) {
- for (var i = 0; i < $rootScope.openViews.length; i++) {
- k++;
- if ($rootScope.openViews[i].body-views == title) {
- $rootScope.openViews.splice((k - 1), 1);
-
- $rootScope.openViews.push(
- {
- "module": $rootScope.currentActiveModuleTitle, "body-views": title, "state": state, "BodyViewId": $rootScope.currentBodyViewId,
- "slug": $rootScope.currentSlug
- }
- );
- }
- }
- }
- if (state == 'max') {
- $('#daBodyview').css('width', '100%')
- }
- }
-
- $rootScope.DrawLine = function () {
- //$rootScope.isIdetifyClicked = false;
- //$rootScope.isDrawingToolSelected = true;
- //$rootScope.isLineDrawSelecyed = true;
- $rootScope.shapeType = "Line";
- // alert($rootScope.shapeType);
-
-
- }
-
- $rootScope.ClearIframe = function () {
- if ($('#daImagePanel') != null)
- $('#daImagePanel').remove();
-
- $rootScope.hideScrollbar();
- }
-
- //ends
-
- $rootScope.hideScrollbar = function () {
- $(".sidebar").mCustomScrollbar({
- autoHideScrollbar: true,
- //theme:"rounded"
- });
- }
-
- //annotation tool custom events
- $rootScope.ShowAnnotationWindow = function () {
- $rootScope.isAnnotationWindowOpen = true;
- $(".annotationTollbar").css("display", "block");
- $rootScope.$broadcast('annotationToolEvent', true);
-
- }
-
- $rootScope.CloseAnnotationTool = function () {
- console.log('close')
- $(".annotationTollbar").css("display", "none");
- $rootScope.isAnnotationWindowClose = true;
- }
-
- $rootScope.OnIdentifyClick = function () {
- $rootScope.isIdetifyClicked = true;
- $rootScope.isDrawingToolSelected = false;
- }
-
- //----Annotation Toolbar: Jcanvas-----
-
- $rootScope.DrawLine = function (e) {
- $rootScope.switchCanvas();
- $rootScope.shapeType = "Line";
-<<<<<<< HEAD
-
-
- $('.btnCursor').removeClass('activebtncolor');
- $(".btn-annotation").removeClass("activebtncolor");
- $(".btn-annotation-line").addClass("activebtncolor");
-
-
-=======
-
-
- $('.btnCursor').removeClass('activebtncolor');
- $(".btn-annotation").removeClass("activebtncolor");
- $(".btn-annotation-line").addClass("activebtncolor");
-
-
->>>>>>> 914a4ac836533cab3ea430e240a2036b112c6482
- }
-
-
- $rootScope.DrawPin = function (e) {
- $rootScope.switchCanvas();
- $rootScope.shapeType = "Pin";
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 914a4ac836533cab3ea430e240a2036b112c6482
- $('.btnCursor').removeClass('activebtncolor');
- $(".btn-annotation").removeClass("activebtncolor");
- $(".btn-annotation-pin").addClass("activebtncolor");
- }
-
- $rootScope.Cursor = function () {
- $rootScope.switchCanvas();
- $rootScope.shapeType = "cursor";
-
- $(".btn-annotation").removeClass("activebtncolor");
- // $("#" + e.currentTarget.id).removeClass("activebtncolor");
- $('.btnCursor').addClass('activebtncolor');
- }
-
- $rootScope.DrawRectangle = function (e) {
- $rootScope.switchCanvas();
- $rootScope.shapeType = "Rectangle";
- $('.btnCursor').removeClass('activebtncolor');
- $(".btn-annotation").removeClass("activebtncolor");
- $(".btn-annotation-rectangle").addClass("activebtncolor");
- }
- $rootScope.paintBrush = function () {
- $rootScope.switchCanvas();
- $rootScope.shapeType = "brush";
-
- }
-
- $rootScope.DrawCircle = function (e) {
- $rootScope.switchCanvas();
- $rootScope.shapeType = "Circle";
- $('.btnCursor').removeClass('activebtncolor');
- $(".btn-annotation").removeClass("activebtncolor");
- $(".btn-annotation-circle").addClass("activebtncolor");
- }
-
- $rootScope.DrawArrow = function (e) {
- $rootScope.switchCanvas();
- $rootScope.shapeType = "Arrow";
- $('.btnCursor').removeClass('activebtncolor');
- $(".btn-annotation").removeClass("activebtncolor");
- $(".btn-annotation-arrow").addClass("activebtncolor");
- }
- $rootScope.DrawText = function () {
-<<<<<<< HEAD
- $rootScope.switchCanvas();
-
- $rootScope.shapeType = "TextArea";
- $('.btnCursor').removeClass('activebtncolor');
- $(".btn-annotation").removeClass("activebtncolor");
- $(".btn-annotation-Text").addClass("activebtncolor");
-=======
-
- $("#myModal").modal("toggle");
- $rootScope.shapeType = "TextArea";
- // $('.btnCursor').removeClass('activebtncolor');
- // $(".btn-annotation").removeClass("activebtncolor");
- // $(".btn-annotation-Text").addClass("activebtncolor");
->>>>>>> 914a4ac836533cab3ea430e240a2036b112c6482
- //$('.btnCursor').removeClass('activebtncolor');
- //$(".btn-annotation").removeClass("activebtncolor");
- //$("#" + e.currentTarget.id).addClass("activebtncolor");
- }
-
- $rootScope.DrawPolygon = function () {
- $rootScope.shapeType = "DrawPolygon";
-
- }
-
-
- $rootScope.OpacityModal = function () {
-
-
- }
- $rootScope.switchCanvas = function () {
- var x = $('#canvasPaint').css("z-index");
-
- var y = $('#canvas').css("z-index");
- if (x > y) {
- y = parseInt(x) + 1;
- } else {
- y = parseInt(y) + 1;
- }
- $('#canvas').css("z-index", y);
- }
- $rootScope.EraseDrawing = function () {
- document.getElementById('paintCanvas').getContext('2d').setTransform(1, 0, 0, 1, 0, 0);
- document.getElementById('paintCanvas').getContext('2d').clearRect(0, 0, document.getElementById('paintCanvas').getContext('2d').canvas.width, document.getElementById('paintCanvas').getContext('2d').canvas.height);
-
- }
- //----End-------------
-
- $rootScope.AddClick=function (x, y, dragging) {
- $rootScope.clickX.push(x);
- $rootScope.clickY.push(y);
- $rootScope.clickDrag.push(dragging);
- }
-
- $rootScope.Redraw = function () {
- var context = document.getElementById('paintCanvas').getContext('2d');
-
- context.clearRect(0, 0, context.canvas.width, context.canvas.height); // Clears the canvas
-
- context.strokeStyle = "#FFFFFF";
- context.lineJoin = "round";
- context.lineWidth = 5;
-
-
- for (var i = 0; i < $rootScope.clickX.length; i++) {
- context.beginPath();
- if ($rootScope.clickDrag[i] && i) {
- context.moveTo($rootScope.clickX[i - 1], $rootScope.clickY[i - 1]);
- } else {
- context.moveTo($rootScope.clickX[i] - 1, $rootScope.clickY[i]);
- }
- context.lineTo($rootScope.clickX[i], $rootScope.clickY[i]);
- context.closePath();
- context.stroke();
- }
- }
-
- $rootScope.PaintCanvasMousedownListener = function (canvasContext,x,y) {
- if ($rootScope.isLineDrawSelecyed == true) {
-
- canvasContext.lineWidth = 0.1;
- //$scope.paintCanvasContext.lineJoin = 'round';
- //$scope.paintCanvasContext.lineCap = 'round';
- canvasContext.strokeStyle = 'red';
-
-
- canvasContext.beginPath();
-
- //var canvasOffset = $("#myCanvas").offset();
- //var offsetX = canvasOffset.left;
- //var offsetY = canvasOffset.top;
- canvasContext.moveTo(x, y);
- }
-
- }
-
- $rootScope.PaintCanvasMouseupListener = function (canvasContext) {
- if ($scope.isLineDrawSelecyed == true) {
-
- }
- }
-
- $rootScope.PaintCanvasMousemoveListener = function (canvasContext,x,y) {
- if ($rootScope.isLineDrawSelecyed == true) {
- console.log('hm moving')
- canvasContext.lineTo(x, y);
- canvasContext.stroke();
- }
- }
-
- $rootScope.Draw = function (x, y, isDown,context) {
- if (isDown) {
- context.beginPath();
- context.strokeStyle = '#000000';
- context.lineWidth = 1//$('#selWidth').val();
- context.lineJoin = "round";
- context.moveTo($rootScope.lastX, $rootScope.lastY);
- context.lineTo(x, y);
- context.closePath();
- context.stroke();
- }
- $rootScope.lastX = x; $rootScope.lastY = y;
- }
-
-
-
-
- //list manager function
-
- //list manager function
-
- $rootScope.ShowListManager = function () {
- console.log('ShowListManager')
-
- $rootScope.isLoading = true;
- $('#spinner').css('visibility', 'visible');
-
- $('#listManager').css('display', 'block');
- $("#listManager").css("visibility", "visible");
- $('#listManager').draggable();
-
-
- $rootScope.islistManagerEventAlredayDispachted = true;
-
- $rootScope.$broadcast('listManagerEvent', true);
- }
-
- $rootScope.CloseListManager = function () {
- console.log('close')
- $rootScope.isListManagerSelected = false;
- $('#listManager').css('display', 'none');
- $("#listManager").css("visibility", "hidden");
- // $rootScope.isAnnotationWindowClose = true;
- // if('#termList')
- if ($('#termList option').length > 0) {
- //$('#termList option') = null;
- //$('#termList').innerHTML='';
- $('#termList')
- .find('option')
- .remove()
- .end()
- if ($('#termList option').length > 0) {
-
- }
- }
-
-
- }
-
- function fillListManagerTerms() {
-
- var len = $rootScope.openModules.length;
- var openViewLen = $rootScope.openViews.length;
-
- var currentOpenModuleId = $rootScope.openModules[len - 1].ModuleId;
- var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
- if (currentOpenModuleId == 1) {
-
- }
-
- }
-
- //setrtings
- $rootScope.SetSettingActiveTab = function (tabToSet) {
- $rootScope.SettingsTab = tabToSet;
- };
-
- $rootScope.loadsettings = function () {
-
- //1. For now we are by default opening DA settings tab
- $rootScope.SettingsTab = 3;
-
- //2.
- var curentEthnicity = localStorage.getItem("globalEthnicity");
- if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {
- $rootScope.globalSetting.ethnicity = curentEthnicity;
- }
- else {
- localStorage.setItem("globalEthnicity", $rootScope.globalSetting.ethnicity);
- }
-
- var curentmodesty = localStorage.getItem("globalmodesty");
- if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {
- $rootScope.globalSetting.modesty = curentmodesty
- }
- else {
- localStorage.setItem("globalmodesty", $rootScope.globalSetting.modesty);
- }
-
- //3.
- $rootScope.setModestySettings($rootScope.globalSetting.modesty);
-
- //4.
- $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
-
-
- };
-
- $rootScope.setModestySettings = function (currentmodsetting) {
-
- if (currentmodsetting == 'Y') {
- $rootScope.isModestyOn = true;
- $rootScope.isModestyOff = false;
- }
- else {
- $rootScope.isModestyOn = false;
- $rootScope.isModestyOff = true;
- }
- }
-
- $rootScope.setEthncitySettings = function (currentEthncitysetting) {
-
- // this code is used for maintaing the currently selected Ethencity.
- if (currentEthncitysetting == 'L') {
- $("#btnEthnicA").addClass("skindefault");
- if ($("#btnEthnicB").hasClass("skindefault")) { $("#btnEthnicB").removeClass("skindefault"); }
- if ($("#btnEthnicL").hasClass("skindefault")) { $("#btnEthnicL").removeClass("skindefault"); }
- if ($("#btnEthnicW").hasClass("skindefault")) { $("#btnEthnicW").removeClass("skindefault"); }
- }
- if (currentEthncitysetting == 'B') {
- $("#btnEthnicB").addClass("skindefault");
- if ($("#btnEthnicL").hasClass("skindefault")) { $("#btnEthnicL").removeClass("skindefault"); }
- if ($("#btnEthnicW").hasClass("skindefault")) { $("#btnEthnicW").removeClass("skindefault"); }
- if ($("#btnEthnicA").hasClass("skindefault")) { $("#btnEthnicA").removeClass("skindefault"); }
- }
- if (currentEthncitysetting == 'A') {
- $("#btnEthnicL").addClass("skindefault");
- if ($("#btnEthnicB").hasClass("skindefault")) { $("#btnEthnicB").removeClass("skindefault"); }
- if ($("#btnEthnicW").hasClass("skindefault")) { $("#btnEthnicW").removeClass("skindefault"); }
- if ($("#btnEthnicA").hasClass("skindefault")) { $("#btnEthnicA").removeClass("skindefault"); }
- }
- if (currentEthncitysetting == 'W') {
- $("#btnEthnicW").addClass("skindefault");
- if ($("#btnEthnicB").hasClass("skindefault")) { $("#btnEthnicB").removeClass("skindefault"); }
- if ($("#btnEthnicL").hasClass("skindefault")) { $("#btnEthnicL").removeClass("skindefault"); }
- if ($("#btnEthnicA").hasClass("skindefault")) { $("#btnEthnicA").removeClass("skindefault"); }
- }
- }
-
- $rootScope.ChangeEthnicity = function (formsetting, skintone) {
- formsetting.ethnicity = skintone;
- $rootScope.setEthncitySettings(formsetting.ethnicity);
-
- }
-
- $rootScope.ChangeModesty = function (formsetting, modestyValue) {
- formsetting.modesty = modestyValue;
- $rootScope.setModestySettings(formsetting.modesty);
-
- }
-
- $rootScope.CloseSetting = function () {
-
- $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
- $rootScope.setModestySettings($rootScope.globalSetting.modesty);
- $('#modal-settings').modal('hide');
- }
-
- $rootScope.UpdateAndCloseSetting = function (setting) {
-
- $rootScope.UpdateSetting(setting);
- $('#modal-settings').modal('hide');
-
- };
-
- $rootScope.UpdateSetting = function (setting) {
-
- //1.
- if (typeof (setting.ethnicity) !== "undefined" && setting.ethnicity !== null) {
- $rootScope.globalSetting.ethnicity = setting.ethnicity;
- $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
- }
- if (typeof (setting.modesty) !== "undefined" && setting.modesty !== null) {
- $rootScope.globalSetting.modesty = setting.modesty;
- $rootScope.setModestySettings($rootScope.globalSetting.modesty);
- }
-
- //2.
- localStorage.setItem("globalEthnicity", $rootScope.globalSetting.ethnicity);
-
- //3.
- localStorage.setItem("globalmodesty", $rootScope.globalSetting.modesty);
-
- //4.
- $rootScope.reloadChildController();
-
- };
-
- $rootScope.reloadChildController = function () {
-
- var len = $rootScope.openModules.length;
-
- var currentOpenModuleId = $rootScope.openModules[len - 1].ModuleId;
-
- //checking is DA module is opend.
- if (currentOpenModuleId == 1) {
-
- //Check that what current bodyview is open
- if ($rootScope.openViews.length > 0) {
- var openViewLen = $rootScope.openViews.length;
- var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
- $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId });
- }
- else {
- $rootScope.$broadcast('reloadDAControllerEvent', true);
-
- }
- }
- };
-
-
- }]
-);
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 790a659..06bfc0c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -423,7 +423,7 @@
-
+
+
+
@@ -783,7 +785,7 @@
-
+
@@ -791,9 +793,6 @@
-
-
-
-
-
-
-
-
+