Merge branch 'QA' into Develop

Nikita Kulshreshtha
2 parents c6296f1e 9dc05e92
Showing 7 changed files with 60 additions and 14 deletions
150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx
150-DOCUMENTATION/001-CONFIGURATION/MongoConfig
150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 39(30-Aug-17).xlsx
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+1. downlaod and install mongoDB from "https://www.mongodb.com/download-center#community".
+2. create a folder mongoadmin somewhere in your D:\
+3. create 3 folders within this folder with the following names:
+ conf
+ data
+ log
+ 4. Place mongod.conf file in conf folder. Contents of file are below.
+ 
+            storage:
+			 dbPath: "d:/mongoadmin/data"
+			 journal:
+			  enabled: true
+
+			systemLog:
+			 destination: file
+			 path: "d:/mongoadmin/log/mongod.log"
+
+			net:
+			 http:
+			  enabled: true
+5. run command to install mongodb as windows service and in that command give the mongod.conf file's path as a parameter.
+     'mongod.exe --config "d:\mongoadmin\conf\mongod.conf" --install'
+mong	 if you do not install mongodb as a service, then you need to run mongod.exe everytime you want to have mongodb running
+6. after executing the above command, you can run the following command to start MongoDB service 
+  "net start MongoDB"
+  to execute all the above commands, you need to open command with "run as administrator"
+
+-------------
+@TO DUMP DATABASE
+mongodump -d <dataabseNme> -o <target diectory>
+
+@TO RESTORE DB
+mongorestore --db <database_name>  <path_to_bson_file>
+
+
+--------
+@Install MongoBooster
+and add DB name in create connection Default Database tab.
 \ No newline at end of file
@@ -280,9 +280,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 $scope.imageWidth = this.width;
                 $scope.imageHeight = this.height;
-                $('#aaBodyView').css("height", $(window).outerHeight());
+                //$('#aaBodyView').css("height", $(window).outerHeight());
-                $('#aaBodyView').css("width", $(window).outerWidth());
+                //$('#aaBodyView').css("width", $(window).outerWidth());
                 $timeout(function () {
                     $compile(aaViewElement.contents())($scope);
@@ -352,7 +352,7 @@ AIA.constant(&quot;UserTypeConstants&quot;, {
 AIA.constant("AIAConstants", {
-   "NO_BODY_SYSTEM_AVAILABLE" : "No body system available in this layer.",
+   "NO_BODY_SYSTEM_AVAILABLE" : "This body system is not available on this layer.",
 })
@@ -128,15 +128,22 @@
                     </div>
                     &nbsp;
                     <!-- Single button -->
-                    <div class="btn-group" style="vertical-align:top;">
-                        <button type="button" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <i class="fa fa-arrow-circle-right"></i>
+                    <div class="btn-group pull-left" style="vertical-align:top;">
+
+                        <button type="button" style="padding: 5px 10px 4px 10px !important;border: none;" class="btn btn-success btn-sm" onclick="onSearchAA()" onblur="hideSearchList()">
+                            <!--<img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">-->
+                            <i class="fa fa-caret-down" style="font-size:20px;"></i>
                         </button>
-                        <ul class="dropdown-menu">
-                            <li><a href="#">1<sup>st</sup> &amp; 2<sup>nd</sup> Intercostal Spaces</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="#">All</a></li>
-                        </ul>
+
+
+                        <!--<button type="button" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <i class="fa fa-arrow-circle-right"></i>
+        </button>-->
+                        <!--<ul class="dropdown-menu">
+            <li><a href="#">1<sup>st</sup> &amp; 2<sup>nd</sup> Intercostal Spaces</a></li>
+            <li role="separator" class="divider"></li>
+            <li><a href="#">All</a></li>
+        </ul>-->
                     </div>
                     <!--<div class="btn-group">
                         <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="navigatorMan">
@@ -278,10 +278,11 @@
                         </div>
                     </div>
-                    <div class="btn-group">
+                    <div class="btn-group" style="vertical-align:top;">
-                        <button type="button" id="btnDATermSearch" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-success btn-sm" ng-mousedown="OnSearchBtnClick($event)">
-                            <img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">
+                        <button type="button" id="btnDATermSearch" style="padding: 5px 10px 4px 10px !important;border: none;" class="btn btn-success btn-sm" onclick="OnSearch()" ng-blur="HideSearch()">
+                            <!--<img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">-->
+                            <i class="fa fa-caret-down" style="font-size:20px;"></i>
                         </button>
                     </div>
                     <div class="btn-group open" id="da-body-nav">