Skip to content

M
mytime
Commit 0f9ac83f authored by NISUM's avatar NISUM
Browse files
Options

Enhanced project details and alignment issues

parent fe3343fe
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 12 deletions
src/main/webapp/WEB-INF/controllers/DashboardController.js
View file @ 0f9ac83f
......@@ -31,13 +31,11 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
columnDefs : [
{field : 'employeeId',displayName: 'Emp ID', enableColumnMenu: false, enableSorting: false,enableFiltering:true, width:100,cellTemplate: getEmpDetTemplate},
{field : 'employeeName',displayName: 'Employee Name ', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:200},
{field : 'domain',displayName: 'Domain', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:100},
{field : 'account',displayName: 'Client', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:100},
{field : 'projectName',displayName: 'Project', enableColumnMenu: false, enableSorting: false,enableFiltering:true,width:150},
{field : 'startDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
{field : 'endDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
{field : 'functionalGroup',displayName: 'Functional Org', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'emailId',displayName: 'Email Id', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'account',displayName: 'Client', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'domain',displayName: 'Domain', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'projectName',displayName: 'Project', enableColumnMenu: false, enableSorting: false,enableFiltering:false,width:150},
{field : 'startDate',displayName: 'Billing Start Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
{field : 'endDate',displayName: 'Billing End Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
{field : 'empStatus',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:80},
{field : 'empSubStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:120,cellClass:function(grid,row,col){
......@@ -53,7 +51,11 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
else if(grid.getCellValue(row,col)==='Resigned') {
return 'red';
}
}}
}},
{field : 'functionalGroup',displayName: 'Functional Org', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'emailId',displayName: 'Email Id', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
......
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @ 0f9ac83f
......@@ -621,6 +621,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
{ field: 'designation', displayName: 'Designation ', enableColumnMenu: false, enableSorting: false,enableFiltering:false },
// { field: 'active', displayName: 'Status ', enableColumnMenu: false, enableSorting: false, cellTemplate: getCellActiveTemplate },
{ field: 'billableStatus', displayName: 'Billability ', enableColumnMenu: false, enableSorting: false ,enableFiltering:false},
{ field: 'endDate', displayName: 'Billability End Date ', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false},
{name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate1, enableColumnMenu: false, enableSorting: false, width:100,enableFiltering: false}
]
};
......
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @ 0f9ac83f
......@@ -9,7 +9,7 @@
</md-button>
</div>
</md-toolbar>
<section layout="row" style="background-color: #fafafa;padding-top: 40px;" layout-sm="column" layout-align="end end" layout-wrap>
<section layout="row" style="background-color: #fafafa;padding-top: 10px;" layout-sm="column" layout-align="end end" layout-wrap>
<md-button class="md-raised " class="pull-right" data-ng-click="addTab()" style="width:120px;background: cadetblue;color:white; " ng-show="!isSecondTab">Add</md-button>
</section>
<md-content style="height:1100px !important">
......@@ -17,7 +17,7 @@
<md-tab label="Team Details ">
<md-content class="md-padding ">
<md-dialog-content>
<div class="md-dialog-content ">
<div class="md-dialog-content " style="padding:0px">
<div class="form-group ">
<div class="row col-lg-12 " style="margin-left: 0px; ">
<div class="row col-lg-12 col-xs-12 ">
......@@ -25,6 +25,12 @@
<p>
<b>Project Name:</b> {{projectName}}
</p>
<p>
<b>Project Start Date:</b>
</p>
<p>
<b>Project End Date:</b>
</p>
</div>
<div class="col-xs-6 text-right ">
<p>
......@@ -164,8 +170,8 @@
</tr>
</table>
<div role="alert ">
<span class="error " style="color: red; ">{{alertMsg}}</span>
<div role="alert">
<span class="alert alert alert-danger" style="color: red; ">{{alertMsg}}</span>
</div>
</div>
</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