Commit 6e12196a authored by rammula-nisum-com's avatar rammula-nisum-com Committed by rbonthala-nisum-com

changes made as for the comments on story MT_78 and MT_82 (#41)

parent 39fbe9d0
...@@ -36,3 +36,9 @@ spring.mail.properties.mail.smtp.starttls.required=true ...@@ -36,3 +36,9 @@ spring.mail.properties.mail.smtp.starttls.required=true
#Spring boot favicon related #Spring boot favicon related
spring.mvc.favicon.enabled = false spring.mvc.favicon.enabled = false
#MS SQL configuration
myTime.data.mssqldb.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
myTime.data.mssqldb.url=jdbc:sqlserver://10.3.45.105:1433;databaseName=smartiSCC
myTime.data.mssqldb.username=sa
myTime.data.mssqldb.password=nisum@123
\ No newline at end of file
...@@ -2,14 +2,7 @@ myApp.controller("domainController", ...@@ -2,14 +2,7 @@ myApp.controller("domainController",
function($scope, myFactory, exportUiGridService, $mdDialog,$http, appConfig, $timeout, $window, $mdSelect) { function($scope, myFactory, exportUiGridService, $mdDialog,$http, appConfig, $timeout, $window, $mdSelect) {
$scope.records = []; $scope.records = [];
$scope.empSearchId = ""; $scope.empSearchId = "";
$scope.parentData = { $scope.parentData = {};
"domainId" : "",
"domainName" : "",
"account" : "",
"deliveryManagers" : "",
"status" : "",
"action" : ""
};
$window.addEventListener('click', function(e) { $window.addEventListener('click', function(e) {
if (e.target.type !== 'search') { if (e.target.type !== 'search') {
...@@ -148,7 +141,7 @@ myApp.controller("domainController", ...@@ -148,7 +141,7 @@ myApp.controller("domainController",
templateUrl : 'templates/newDomain.html', templateUrl : 'templates/newDomain.html',
parent : angular parent : angular
.element(document.body), .element(document.body),
clickOutsideToClose : true, clickOutsideToClose : false,
locals : { locals : {
dataToPass : userData, dataToPass : userData,
gridOptionsData : $scope.gridOptions.data, gridOptionsData : $scope.gridOptions.data,
...@@ -338,7 +331,7 @@ myApp.controller("domainController", ...@@ -338,7 +331,7 @@ myApp.controller("domainController",
$scope.alertMsg = "Please select a Account"; $scope.alertMsg = "Please select a Account";
document.getElementById('account').focus(); document.getElementById('account').focus();
}else if(domainName == undefined){ }else if(domainName == undefined){
$scope.alertMsg = "Please enter a DomainName"; $scope.alertMsg = "Please enter a Domain Name";
document.getElementById('domainName').focus(); document.getElementById('domainName').focus();
}else if(deliveryManagers == undefined){ }else if(deliveryManagers == undefined){
$scope.alertMsg = "Please select a deliveryManagers"; $scope.alertMsg = "Please select a deliveryManagers";
...@@ -354,14 +347,14 @@ myApp.controller("domainController", ...@@ -354,14 +347,14 @@ myApp.controller("domainController",
} }
}else{ }else{
$scope.alertMsg = ""; $scope.alertMsg = "";
var AccountName1 = $scope.account.accountName; var AccountName = $scope.account.accountName;
var domainName1 = $scope.domainName; var domainName = $scope.domainName;
var deliveryManagers1 = $scope.deliveryHeads(); var deliveryManagers1 = $scope.deliveryHeads();
if(AccountName == undefined){ if(AccountName == undefined){
$scope.alertMsg = "Please select a Account"; $scope.alertMsg = "Please select a Account";
document.getElementById('account').focus(); document.getElementById('account').focus();
}else if(domainName == "" || undefined) { }else if(domainName == "" || undefined) {
$scope.alertMsg = "Please enter a DomainName"; $scope.alertMsg = "Please enter a Domain Name";
document.getElementById('domainName').focus(); document.getElementById('domainName').focus();
}else if(deliveryManagers.length <= 0){ }else if(deliveryManagers.length <= 0){
$scope.alertMsg = "Please select a deliveryManagers"; $scope.alertMsg = "Please select a deliveryManagers";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment