Commit d956888e authored by Prayas Jain's avatar Prayas Jain

Updated_UPDATE_TEAMMATE_AND_UI

parent fc54bb12
...@@ -3,7 +3,8 @@ myApp.directive('hcPieChart', function () { ...@@ -3,7 +3,8 @@ myApp.directive('hcPieChart', function () {
restrict: 'E', restrict: 'E',
template: '<div></div>', template: '<div></div>',
link: function (scope, element) { link: function (scope, element) {
getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByAccount','column',element,"Billability By Account"); getEmployeeDetails(scope,element[0].baseURI+'reports/getEmployeesByFunctionalGroup','pie',element,"Employees Overview Report");
//getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByAccount','column',element,"Billability By Account");
scope.clickMe= function() { scope.clickMe= function() {
if(scope.reportId == 1){ if(scope.reportId == 1){
getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByAccount','column',element," Billability By Account"); getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByAccount','column',element," Billability By Account");
...@@ -20,9 +21,10 @@ myApp.directive('hcPieChart', function () { ...@@ -20,9 +21,10 @@ myApp.directive('hcPieChart', function () {
$scope.name = []; $scope.name = [];
$scope.records = []; $scope.records = [];
$scope.empSearchId = ""; $scope.empSearchId = "";
$scope.reportId = "1" //$scope.reportId = "1"
$scope.reportId = "2"
$scope.reports = $scope.reportId; $scope.reports = $scope.reportId;
$scope.reports=[ {Name:"Billability Report",Id:"1"},{Name:"Employees By Functional Group",Id:"2"},{Name:"Billability Monthly Trends",Id:"3"}]; $scope.reports=[ /*{Name:"Billability Report",Id:"1"},*/{Name:"Employees By Functional Group",Id:"2"},{Name:"Billability Monthly Trends",Id:"3"}];
$scope.employees = []; $scope.employees = [];
......
...@@ -599,6 +599,9 @@ cursor: pointer; ...@@ -599,6 +599,9 @@ cursor: pointer;
.update-Teammate>h4 { .update-Teammate>h4 {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding-bottom : 5px; padding-bottom : 5px;
}
.update-teammate-dropdown md-select {
margin : -6px 0 0 0;
} }
.panel-default>.panel-heading { .panel-default>.panel-heading {
color: #fff; color: #fff;
...@@ -608,5 +611,13 @@ cursor: pointer; ...@@ -608,5 +611,13 @@ cursor: pointer;
} }
.update-Teammate .form-inline { .update-Teammate .form-inline {
margin-bottom : 15px; margin-bottom : 15px;
} }
.billable-table {
margin-top : 10px;
}
.billable-table .table {
margin : 0px;
}
.grid-Dropdown md-select {
margin : 0px;
}
\ No newline at end of file
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</div> </div>
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-edit ui-grid-pagination
style="width:99%;height:230px;margin-left:10px;"> style="width:99%;height:230px;margin-left:10px;">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
......
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