Merge branch 'Develop' into QA

Amrita Vishnoi
2 parents 40c3ba91 483e8f2e
Showing 6 changed files with 27 additions and 1 deletions
150-DOCUMENTATION/Audit/Estimation/17April.csv
150-DOCUMENTATION/Audit/Sprints/JFM/AIA-Health Dev.xlsx
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+#,Project,Tracker,Status,Priority,Subject,Assignee,Due date,Story Points
+17030,AIA HTML5,Bug,Closed,Low,"File > Export Image > Remove the "">"" sign from the border.",Monika Sharma,04/11/2017,1.00
+17009,AIA HTML5,Bug,Closed,Blocker,Application get freeze if move the pop-up towards bottom.,Monika Sharma,04/11/2017,1.00
+17008,AIA HTML5,Bug,Closed,High,IE 11 > Module available information pop-up window move from top to bottom only.,Monika Sharma,04/11/2017,2.00
+16801,AIA HTML5,Bug,Rejected,Medium,Unable to see the available module pop-up window when login to the application.,Monika Sharma,04/06/2017,""
+16732,AIA HTML5,Bug,Ready for QA,High,DA > Annotation Toolbar > Cursor get stuck with draw tools.,Ayush Jain,04/12/2017,2.00
+16731,AIA HTML5,Bug,Closed,High,CA > Error message appears in the below mention case.,Monika Sharma,04/12/2017,2.00
+16728,AIA HTML5,Bug,Closed,Medium,CI Detail Page > Minimize and Maximize buttons are missing.,Monika Sharma,04/05/2017,1.00
+16725,AIA HTML5,Bug,Closed,Medium,Forgot Password> Incorrect mail is sent to users,Monika Sharma,04/06/2017,1.00
+16723,AIA HTML5,Bug,Closed,Low,Annotation Toolbar's UI changed in the below mention case.,Monika Sharma,04/04/2017,1.00
+16713,AIA HTML5,Bug,Ready for QA,High,DA > Black box is appear when change the layer.,Nikita Kulshreshtha,04/13/2017,3.00
+16709,AIA HTML5,Bug,Ready for QA,Critical,DA > Body parts disappears when change the layer from slider.,Nikita Kulshreshtha,04/14/2017,3.00
+16661,AIA HTML5,Bug,Closed,Medium,"File > Clinical Animation > Disable Export Image, Print Active Viewer and Print Preview on clinical animations page.",Monika Sharma,04/06/2017,1.00
+16651,AIA HTML5,Bug,Ready for QA,High,Mozilla Firefox > Blank page is display if open any module.,Utkarsh Singh,04/05/2017,1.00
+16635,AIA HTML5,User Story,Ready for QA,High,Globalization integration in AIA,Ayush Jain,04/11/2017,4.00
+15623,AIA HTML5,Bug,Closed,Medium,DA > Annotation Toolbar > Black color of paint is dispaly in the below mention steps.,Monika Sharma,04/07/2017,2.00
+15368,AIA HTML5,Bug,Closed,Medium,DA > Annotation Toolbar > Annotation toolbar became disable in DA page,Monika Sharma,04/06/2017,3.00
+15361,AIA HTML5,Bug,Closed,High,DA > Settings > Unable to select skin tone when refresh the DA Body View Page.,Monika Sharma,04/06/2017,3.00
+15281,AIA HTML5,User Story,Needs Clarification,Medium,"In first phase of release, disable menu which are not implemented as yet",Ravi Vishwakarma,03/10/2017,1.00
+11546,AIA HTML5,Bug,Ready for QA,Medium,DA> List Manager> Footer of List Manager's popup doesn't load on Firefox,Nikita Kulshreshtha,"",""
+6144,AIA HTML5,User Story,Ready for QA,High,Framework for authentication and authorization across the application,Ravi Vishwakarma,03/16/2017,10.00
@@ -37,7 +37,7 @@
     <add key="SMTPAddress" value="10.100.12.13" />
     <add key="SMTPPort" value="25" />
     <add key="EnableSSL" value="false" />
-    <add key="Site_Url" value ="http://34.207.39.107/"/>
+    <add key="Site_Url" value ="http://qa.beta.interactiveanatomy.com/"/>
     <add key ="HostAddress" value="10.100.12.13" />
     <add key="isUserAuthenticated" value="false"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
@@ -130,6 +130,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                      else {
                          if (result.loginId != undefined || result.loginId != "" || result.loginId != null) {
  
+                             if ($("#messageModal").length > 0){
+                                 
+                                 $("#messageModal").modal('hide');
+                         }
                              $rootScope.userData = result;
                              $rootScope.userModules = result.modules;
                              $rootScope.isVisibleLogin = false;
@@ -144,6 +148,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                              else
                                  $rootScope.haveRoleAdmin = true;
                          }
+                         
                      }
                  }
              },