Skip to content

M
mytime
Commit 510338a4 authored by Prayas Jain's avatar Prayas Jain
Browse files
Options

Fixed Css Issues in My Projects Screen

parent 4eb98a78
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @ 510338a4
......@@ -664,16 +664,16 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
enableRowSelection: true,
rowEditWaitInterval: 0,
columnDefs: [
{ name: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:80 },
{ name: 'employeeName', displayName: 'Emp Name',width:'*', enableSorting: false, enableColumnMenu: false ,enableFiltering:true,sort: {
{ name: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:70 },
{ name: 'employeeName', displayName: 'Emp Name',width:100, enableSorting: false, enableColumnMenu: false ,enableFiltering:true,sort: {
direction: uiGridConstants.ASC,
priority: 0,
} },
{ field: 'onBehalfOf', displayName: 'On Behalf Of', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:160,
{ field: 'onBehalfOf', displayName: 'On Behalf Of', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:120,
cellTemplate:onBehalfOfCellTemplate
},
{
name: 'resourceRole', displayName:'Role', enableColumnMenu: false,width:"120", enableSorting: false,enableFiltering:false,
name: 'resourceRole', displayName:'Role', enableColumnMenu: false,width:100, enableSorting: false,enableFiltering:false,
cellTemplate:'<div class="ui-grid-cell-contents" ng-if="!row.entity.editrow">{{COL_FIELD}}</div><div ng-if="row.entity.editrow" class="grid-Dropdown"><md-select ng-model="MODEL_COL_FIELD" id="empRole">'
+'<md-optgroup label="employee role"><md-option ng-value="empRole" ng-repeat="empRole in col.colDef.editDropdownOptionsArray">{{empRole}}</md-option>'
+'</md-optgroup></md-select></div>',
......@@ -682,9 +682,9 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
'Lead' ]
},
{ field: 'designation',width:"*", displayName: 'Designation', enableColumnMenu: false, enableSorting: false,enableFiltering:false },
{ field: 'designation',width:'*', displayName: 'Designation', enableColumnMenu: false, enableSorting: false,enableFiltering:false },
{
name: 'billableStatus', displayName: 'Billability ', enableColumnMenu: false, enableSorting: false ,enableFiltering:false,
name: 'billableStatus', displayName: 'Billability ', enableColumnMenu: false, enableSorting: false ,enableFiltering:false,width:'*',
cellTemplate: '<div class="ui-grid-cell-contents" ng-if="!row.entity.editrow">{{COL_FIELD}}</div><div ng-if="row.entity.editrow" class="grid-Dropdown"><md-select ng-model="MODEL_COL_FIELD" name="empBillableStatus" append-to-body="true">'
+ '<md-optgroup label="billable statuses "><md-option ng-value="billableStatus " ng-repeat="billableStatus in col.colDef.editDropdownOptionsArray">{{billableStatus}}</md-option>'
+'</md-optgroup></md-select></div>',editDropdownOptionsArray: [
......@@ -694,9 +694,9 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
'Reserved' ,
'Trainee' ]
},
{ name: 'billingStartDate',width:"*", displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:160,
{ name: 'billingStartDate',width:"*", displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:120,
cellTemplate: '<div class="ui-grid-cell-contents" ng-if="!row.entity.editrow">{{COL_FIELD | date:"dd-MMM-yyyy"}}</div><div ng-if="row.entity.editrow"><md-datepicker ng-model="MODEL_COL_FIELD" md-placeholder="Select Date" id="newBillingStartDate" name="newBillingStartDate" md-min-date="grid.appScope.minBillingStartDate" md-max-date="grid.appScope.maxBillingStartDate"></md-datepicker></div>'},
{ field: 'billingEndDate',width:"*", displayName: 'End Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:160,
{ field: 'billingEndDate',width:"*", displayName: 'End Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:120,
cellTemplate: '<div class="ui-grid-cell-contents" ng-if="!row.entity.editrow">{{COL_FIELD | date:"dd-MMM-yyyy"}}</div><div ng-if="row.entity.editrow"><md-datepicker ng-model="MODEL_COL_FIELD" md-placeholder="Select Date" id="endDate" name="endDate" md-min-date="row.entity.billingStartDate" md-max-date="grid.appScope.maxBillingEndDate"></md-datepicker></div>'},
{name : 'Actions',width:140, displayName: 'Actions',cellTemplate: getCellTemplate1, enableColumnMenu: false, enableSorting: false,enableFiltering: false}
]
......
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