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
ade1a202
Commit
ade1a202
authored
Jun 17, 2019
by
Prayas Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added delete functionality
parent
c1fa3b8d
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
911 additions
and
897 deletions
+911
-897
ResourceService.java
...n/java/com/nisum/myteam/service/impl/ResourceService.java
+909
-892
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+1
-4
projectTeamDetails.html
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
+1
-1
No files found.
src/main/java/com/nisum/myteam/service/impl/ResourceService.java
View file @
ade1a202
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
ade1a202
...
...
@@ -392,7 +392,6 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
}
else
if
(
$scope
.
result
==
"Error"
)
{
showAlert
(
'Something went wrong while deleting the role.'
)
}
}
function
AddProjectController
(
$scope
,
$mdDialog
,
dataToPass
,
gridOptionsData
,
managers
,
$window
,
$mdSelect
)
{
...
...
@@ -1465,7 +1464,6 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
}
else
{
updateTeamRecord
(
record
,
action
,
row
);
$scope
.
myForm
.
$setPristine
();
}
}
...
...
@@ -1616,8 +1614,6 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
//Startdate: $scope.startDate,
Enddate
:
$scope
.
endDate
}
console
.
log
(
$scope
.
previousData
)
console
.
log
(
$scope
.
currentData
)
var
predata
=
JSON
.
stringify
(
$scope
.
previousData
);
var
curdata
=
JSON
.
stringify
(
$scope
.
currentData
);
if
(
predata
==
curdata
)
{
...
...
@@ -1839,6 +1835,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
row
.
resourceRole
=
$scope
.
parentData
.
role
;
row
.
billableStatus
=
$scope
.
parentData
.
billableStatus
;
}
$scope
.
previousRow
=
angular
.
copy
(
row
);
}
},
function
myError
(
response
){
...
...
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @
ade1a202
...
...
@@ -40,7 +40,7 @@
</div>
<div
class=
"form-group col-lg-9 col-md-9 col-sm-9 col-xs-12"
></div>
<div
class=
"row col-lg-12"
style=
"margin-left: 0px;"
>
<div
class=
"row col-lg-12
no-padding
"
style=
"margin-left: 0px;"
>
<input
type=
"radio"
ng-model=
"status"
value=
"Active"
ng-click=
"getTeamMates()"
>
Active
<input
type=
"radio"
ng-model=
"status"
value=
"InActive"
ng-click=
"getTeamMates()"
>
Inactive
<input
type=
"radio"
ng-model=
"status"
value=
"Proposed"
ng-click=
"getTeamMates()"
>
Proposed
...
...
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