Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mytime
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Narendar Vakiti
mytime
Commits
6e12196a
Commit
6e12196a
authored
Jul 23, 2018
by
rammula-nisum-com
Committed by
rbonthala-nisum-com
Jul 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes made as for the comments on story MT_78 and MT_82 (#41)
parent
39fbe9d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
13 deletions
+12
-13
application.properties
src/main/resources/application.properties
+6
-0
DomainController.js
src/main/webapp/WEB-INF/controllers/DomainController.js
+6
-13
No files found.
src/main/resources/application.properties
View file @
6e12196a
...
...
@@ -36,3 +36,9 @@ spring.mail.properties.mail.smtp.starttls.required=true
#Spring boot favicon related
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
src/main/webapp/WEB-INF/controllers/DomainController.js
View file @
6e12196a
...
...
@@ -2,14 +2,7 @@ myApp.controller("domainController",
function
(
$scope
,
myFactory
,
exportUiGridService
,
$mdDialog
,
$http
,
appConfig
,
$timeout
,
$window
,
$mdSelect
)
{
$scope
.
records
=
[];
$scope
.
empSearchId
=
""
;
$scope
.
parentData
=
{
"domainId"
:
""
,
"domainName"
:
""
,
"account"
:
""
,
"deliveryManagers"
:
""
,
"status"
:
""
,
"action"
:
""
};
$scope
.
parentData
=
{};
$window
.
addEventListener
(
'click'
,
function
(
e
)
{
if
(
e
.
target
.
type
!==
'search'
)
{
...
...
@@ -148,7 +141,7 @@ myApp.controller("domainController",
templateUrl
:
'templates/newDomain.html'
,
parent
:
angular
.
element
(
document
.
body
),
clickOutsideToClose
:
tru
e
,
clickOutsideToClose
:
fals
e
,
locals
:
{
dataToPass
:
userData
,
gridOptionsData
:
$scope
.
gridOptions
.
data
,
...
...
@@ -338,7 +331,7 @@ myApp.controller("domainController",
$scope
.
alertMsg
=
"Please select a Account"
;
document
.
getElementById
(
'account'
).
focus
();
}
else
if
(
domainName
==
undefined
){
$scope
.
alertMsg
=
"Please enter a DomainName"
;
$scope
.
alertMsg
=
"Please enter a Domain
Name"
;
document
.
getElementById
(
'domainName'
).
focus
();
}
else
if
(
deliveryManagers
==
undefined
){
$scope
.
alertMsg
=
"Please select a deliveryManagers"
;
...
...
@@ -354,14 +347,14 @@ myApp.controller("domainController",
}
}
else
{
$scope
.
alertMsg
=
""
;
var
AccountName
1
=
$scope
.
account
.
accountName
;
var
domainName
1
=
$scope
.
domainName
;
var
AccountName
=
$scope
.
account
.
accountName
;
var
domainName
=
$scope
.
domainName
;
var
deliveryManagers1
=
$scope
.
deliveryHeads
();
if
(
AccountName
==
undefined
){
$scope
.
alertMsg
=
"Please select a Account"
;
document
.
getElementById
(
'account'
).
focus
();
}
else
if
(
domainName
==
""
||
undefined
)
{
$scope
.
alertMsg
=
"Please enter a DomainName"
;
$scope
.
alertMsg
=
"Please enter a Domain
Name"
;
document
.
getElementById
(
'domainName'
).
focus
();
}
else
if
(
deliveryManagers
.
length
<=
0
){
$scope
.
alertMsg
=
"Please select a deliveryManagers"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment