Commit de3e0a59 authored by Prayas Jain's avatar Prayas Jain

REFACTORED SHIFT_PROJECTS

parent 4a18b135
...@@ -123,7 +123,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export ...@@ -123,7 +123,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
$scope.getEmployeesDashBoardData = function(){ $scope.getEmployeesDashBoardData = function(){
$http({ $http({
method : "GET", method : "GET",
url : appConfig.appUri + "projectTeam/getEmployeesDashBoard" url : appConfig.appUri + "/getEmployeesDashBoard"
}).then(function mySuccess(response) { }).then(function mySuccess(response) {
//alert("response"+response); //alert("response"+response);
// alert("response"+response.data); // alert("response"+response.data);
......
...@@ -65,7 +65,7 @@ myApp.controller("projectMyTeamController",function($scope, myFactory, $mdDialog ...@@ -65,7 +65,7 @@ myApp.controller("projectMyTeamController",function($scope, myFactory, $mdDialog
$scope.getMyTeamDetails = function(){ $scope.getMyTeamDetails = function(){
$http({ $http({
method : "GET", method : "GET",
url : appConfig.appUri + "projectTeam/resources/active?employeeId="+myFactory.getEmpId() url : appConfig.appUri + "resources/active?employeeId="+myFactory.getEmpId()
}).then(function mySuccess(response) { }).then(function mySuccess(response) {
$scope.gridOptions.data = response.data; $scope.gridOptions.data = response.data;
}, function myError(response) { }, function myError(response) {
...@@ -389,7 +389,7 @@ myApp.controller("projectMyTeamController",function($scope, myFactory, $mdDialog ...@@ -389,7 +389,7 @@ myApp.controller("projectMyTeamController",function($scope, myFactory, $mdDialog
var requestMethod = ""; var requestMethod = "";
var loginEmpId = myFactory.getEmpId(); var loginEmpId = myFactory.getEmpId();
if(action == "Assign"){ if(action == "Assign"){
urlRequest = appConfig.appUri+ "projectTeam/resources?loginEmpId="+loginEmpId; urlRequest = appConfig.appUri+ "resources?loginEmpId="+loginEmpId;
requestMethod = 'POST'; requestMethod = 'POST';
}else if(action == "Update"){ }else if(action == "Update"){
urlRequest = appConfig.appUri+ "employees/"+loginEmpId; urlRequest = appConfig.appUri+ "employees/"+loginEmpId;
......
...@@ -82,7 +82,7 @@ myApp.controller("shiftDetailsController",function($scope, myFactory,exportUiGri ...@@ -82,7 +82,7 @@ myApp.controller("shiftDetailsController",function($scope, myFactory,exportUiGri
$scope.selectedshiftValue=shiftV; $scope.selectedshiftValue=shiftV;
$http({ $http({
method : "GET", method : "GET",
url : appConfig.appUri + "projectTeam/resources/"+shiftV url : appConfig.appUri + "resources/shifts/"+shiftV
}).then(function mySuccess(response) { }).then(function mySuccess(response) {
$scope.gridOptions.data = response.data; $scope.gridOptions.data = response.data;
$scope.shiftCount=response.data.length; $scope.shiftCount=response.data.length;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
/* ===== Common Styles ===== */ /* ===== Common Styles ===== */
body { body {
background: #ffffff; background: #ffffff;
overflow: hidden; /* overflow: hidden; */
} }
.left { .left {
float: left; float: left;
...@@ -166,7 +166,7 @@ i.fa.fa-refresh:hover { ...@@ -166,7 +166,7 @@ i.fa.fa-refresh:hover {
list-style: none; list-style: none;
} }
#sidebar-wrapper .sidebar-nav li ul.manageGroup { #sidebar-wrapper .sidebar-nav li ul.manageGroup {
height: 250px; height: 165px;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
transition: height 0.5s ease-out; transition: height 0.5s ease-out;
......
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