Skip to content

M
mytime
Commit 5d8f2b68 authored by Prayas Jain's avatar Prayas Jain
Browse files
Options

Updated_Css

parent 413e9de8
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 21 deletions
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @ 5d8f2b68
......@@ -441,6 +441,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
var today = new Date();
$scope.addTab = function () {
$scope.alertMsg ="";
if(! (new Date(dataToPass.projectEndDate) > today) ){
$mdDialog.show($mdDialog.alert({
skipHide: true,
......@@ -640,7 +641,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
'Lead' ]
},
{ field: 'designation', resourceRole: 'Designation', enableColumnMenu: false, enableSorting: false,enableFiltering:false },
{ field: 'designation', displayName: 'Designation', enableColumnMenu: false, enableSorting: false,enableFiltering:false },
{
name: 'billableStatus', displayName: 'Billability ', enableColumnMenu: false, enableSorting: false ,enableFiltering:false,
cellTemplate: '<div 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">'
......@@ -652,10 +653,10 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
'Reserved' ,
'Trainee' ]
},
{ field: 'billingStartDate', displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false, width:160,
cellTemplate: '<div 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="Plase select Date " id="newBillingStartDate " md-min-date="minDate "md-max-date="maxDate " name="newBillingStartDate"></md-datepicker></div>'},
{ name: 'billingStartDate', displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false, width:160,
cellTemplate: '<div 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-datepicker></div>'},
{ field: 'billingEndDate', displayName: 'End Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false, width:160,
cellTemplate: '<div 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" id="endDate " name="endDate">{{MODEL_COL_FIELD}}</md-datepicker></div>'},
cellTemplate: '<div 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-datepicker></div>'},
{name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate1, enableColumnMenu: false, enableSorting: false, width:100,enableFiltering: false}
]
};
......@@ -716,10 +717,8 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
$scope.edit = function (rowd) {
var row = rowd.entity;
var index = $scope.gridOptions.data.indexOf(row);
if($scope.previousRow){
$scope.rowCompare(rowd);
}
......@@ -762,11 +761,11 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
for(var i=0; i<allRows.length; i++) {
var newIndex = $scope.gridOptions.data.indexOf(allRows[i].entity)
if(newIndex == $scope.previousRowIndex){
allRows[i].entity.resourceRole = $scope.previousRow.resourceRole;
allRows[i].entity.billableStatus = $scope.previousRow.billableStatus;
allRows[i].entity.billingStartDate = $scope.previousRow.billingStartDate;
allRows[i].entity.billingEndDate = $scope.previousRow.billingEndDate
$scope.previousRow = angular.copy(row.entity);
allRows[i].entity.resourceRole = $scope.previousRow.resourceRole;
allRows[i].entity.billableStatus = $scope.previousRow.billableStatus;
allRows[i].entity.billingStartDate = $scope.previousRow.billingStartDate;
allRows[i].entity.billingEndDate = $scope.previousRow.billingEndDate;
$scope.previousRow = angular.copy(row.entity);
}
}
......@@ -1492,12 +1491,10 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
ok: 'ok',
cancel: 'cancel'
})).then(function () {
$scope.alertMsg = "";
$mdDialog.hide('Cancelled');
})
}
else {
$scope.alertMsg = "";
$mdDialog.hide('Cancelled');
}
}
......
src/main/webapp/WEB-INF/css/custom-theme.css
View file @ 5d8f2b68
......@@ -636,9 +636,9 @@ cursor: pointer;
.grid-Dropdown md-select {
margin : 0px;
}
.icon-disable {
background-color: green;
.employees-login {
height: calc(100vh - 254px) !important;
}
.iconenable {
background-color: red;
.import-data {
height: calc(100vh - 100px) !important;
}
\ No newline at end of file
src/main/webapp/WEB-INF/templates/employees.html
View file @ 5d8f2b68
......@@ -54,7 +54,7 @@
<div class="form-group">
<div class="form-inline col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="grid">
class="grid employees-login">
<div class="watermark" ng-show="!gridOptions.data.length">Search
by Employee ID/Name/Email ID</div>
</div>
......
src/main/webapp/WEB-INF/templates/exportData.html
View file @ 5d8f2b68
<div class="md-padding" id="popupContainer" ng-controller="exportDataController">
<div class="md-padding import-data" id="popupContainer" ng-controller="exportDataController">
<div class="container-fluid mainDivHeaderClass">
<div class="row">
<div class="col-lg-12">
......
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @ 5d8f2b68
......@@ -49,7 +49,7 @@
<div id="gridTest" class="grid-half-view" ui-grid="gridOptions " ui-grid-edit ui-grid-pagination style="width:99%;height:230px;margin-left:10px; ">
<div class="watermark " ng-show="!gridOptions.data.length ">No data available</div>
</div>
<div role="alert">
<div ng-if ='templateTitle == "View"' role="alert">
<span style="color: red; ">{{alertMsg}}</span>
</div>
</div>
......@@ -173,7 +173,7 @@
</tr>
</table>
<div role="alert">
<div ng-if ='templateTitle == "Add"' role="alert">
<span style="color: red; ">{{alertMsg}}</span>
</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