Skip to content

M
mytime
Commit 1a6bf527 authored by NISUM's avatar NISUM
Browse files
Options

New_Enhacements

parent 9a8d3141
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 47 deletions
src/main/java/com/nisum/myteam/model/vo/EmployeeDashboardVO.java
View file @ 1a6bf527
...@@ -39,6 +39,7 @@ public class EmployeeDashboardVO { ...@@ -39,6 +39,7 @@ public class EmployeeDashboardVO {
private String mobileNumber; private String mobileNumber;
private String functionalGroup; private String functionalGroup;
private String empStatus; private String empStatus;
private String empSubStatus;
private String employmentType; private String employmentType;
private String domain; private String domain;
@DateTimeFormat(iso = ISO.DATE) @DateTimeFormat(iso = ISO.DATE)
......
src/main/webapp/WEB-INF/controllers/AttendanceReportController.js
View file @ 1a6bf527
...@@ -29,11 +29,11 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory ...@@ -29,11 +29,11 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
exporterMenuExcel:false, exporterMenuExcel:false,
exporterMenuCsv:false, exporterMenuCsv:false,
exporterCsvFilename: 'AbsentDetails.csv', exporterCsvFilename: 'AbsentDetails.csv',
exporterExcelFilename:'AbsentDetails', exporterExcelFilename:'Attendance Report',
exporterPdfDefaultStyle: {fontSize: 9}, exporterPdfDefaultStyle: {fontSize: 9},
exporterPdfTableStyle: {margin: [30, 30, 30, 30]}, exporterPdfTableStyle: {margin: [30, 30, 30, 30]},
exporterPdfTableHeaderStyle: {fontSize: 10, bold: true, italics: true, color: 'red'}, exporterPdfTableHeaderStyle: {fontSize: 10, bold: true, italics: true, color: 'red'},
exporterPdfHeader: { text: "Absent Details", style: 'headerStyle' }, exporterPdfHeader: { text: "Attendance Details", style: 'headerStyle' },
exporterPdfFooter: function ( currentPage, pageCount ) { exporterPdfFooter: function ( currentPage, pageCount ) {
return { text: currentPage.toString() + ' of ' + pageCount.toString(), style: 'footerStyle' }; return { text: currentPage.toString() + ' of ' + pageCount.toString(), style: 'footerStyle' };
}, },
......
src/main/webapp/WEB-INF/controllers/DashboardController.js
View file @ 1a6bf527
...@@ -31,28 +31,45 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export ...@@ -31,28 +31,45 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
columnDefs : [ columnDefs : [
{field : 'employeeId',displayName: 'Emp ID', enableColumnMenu: false, enableSorting: false,enableFiltering:true, width:100,cellTemplate: getEmpDetTemplate}, {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 : 'employeeName',displayName: 'Employee Name ', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:200},
{field : 'designation',displayName: 'Designation ', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:150}, {field : 'domain',displayName: 'Domain', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'role',displayName: 'Role', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:150}, {field : 'account',displayName: 'Client', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'baseTechnology',displayName: 'Skill ', enableColumnMenu: false, enableSorting: false,enableFiltering:false,width:200}, {field : 'projectName',displayName: 'Project', enableColumnMenu: false, enableSorting: false,enableFiltering:false,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 : 'functionalGroup',displayName: 'Functional Org', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'domain',displayName: 'Domain', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:100}, {field : 'emailId',displayName: 'Email Id', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'employmentType',displayName: 'Employment Type', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:150}, {field : 'empStatus',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:80},
{field : 'empStatus',displayName: 'Employment Status', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:150}, {field : 'empSubStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:120,cellClass:function(grid,row,col){
{field : 'account',displayName: 'Account', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:150},
{field : 'projectName',displayName: 'Project', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:200}, if(grid.getCellValue(row,col)==='Maternity Leave') {
return 'blue';
}
if(grid.getCellValue(row,col)==='Onsite Travel') {
return 'green';
}
else if(grid.getCellValue(row,col)==='Long Leave') {
return 'orange';
}
else if(grid.getCellValue(row,col)==='Resigned') {
return 'red';
}
}}
/*{field : 'projectAssigned',displayName: 'Allocated ', enableColumnMenu: false, enableSorting: true,enableFiltering:true,cellTemplate: getCellActiveTemplate,filterHeaderTemplate: '<div class="ui-grid-filter-container" ng-repeat="colFilter in col.filters"><div my-custom-dropdown></div></div>', /*{field : 'projectAssigned',displayName: 'Allocated ', enableColumnMenu: false, enableSorting: true,enableFiltering:true,cellTemplate: getCellActiveTemplate,filterHeaderTemplate: '<div class="ui-grid-filter-container" ng-repeat="colFilter in col.filters"><div my-custom-dropdown></div></div>',
filter: { filter: {
term: 1, term: 1,
options: [ {id: 1, value: 'male'}, {id: 2, value: 'female'}] // custom attribute that goes with custom directive above options: [ {id: 1, value: 'male'}, {id: 2, value: 'female'}] // custom attribute that goes with custom directive above
}, "Billable","Shadow","Bench","NA" }, "Billable","Shadow","Bench","NA"
cellFilter: 'mapGender'},*/ cellFilter: 'mapGender'},*/
{ field: 'billableStatus',displayName: 'Allocation Status', // { field: 'billableStatus',displayName: 'Allocation Status',
filterHeaderTemplate: '<div class="ui-grid-filter-container" ng-repeat="colFilter in col.filters"><div my-custom-dropdown></div></div>', // filterHeaderTemplate: '<div class="ui-grid-filter-container" ng-repeat="colFilter in col.filters"><div my-custom-dropdown></div></div>',
filter: { // filter: {
term: '', // term: '',
options: [ {id: 'Billable', value: 'Billable'}, {id: 'Shadow', value: 'Shadow'},{id: 'NA', value: 'NA'},{id: 'Bench', value: 'Bench'},{id: 'Reserved', value: 'Reserved'},{id: 'UA', value: 'Unassigned'},{id: '', value: 'All'}] // custom attribute that goes with custom directive above // options: [ {id: 'Billable', value: 'Billable'}, {id: 'Shadow', value: 'Shadow'},{id: 'NA', value: 'NA'},{id: 'Bench', value: 'Bench'},{id: 'Reserved', value: 'Reserved'},{id: 'UA', value: 'Unassigned'},{id: '', value: 'All'}] // custom attribute that goes with custom directive above
}, // },
cellFilter: 'mapGender' ,width:150} // cellFilter: 'mapGender' ,width:150}
// {name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate, enableColumnMenu: false, enableSorting: false, enableFiltering:false,width:130} // {name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate, enableColumnMenu: false, enableSorting: false, enableFiltering:false,width:130}
], ],
enableGridMenu: true, enableGridMenu: true,
...@@ -60,11 +77,11 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export ...@@ -60,11 +77,11 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
exporterMenuExcel:false, exporterMenuExcel:false,
exporterMenuCsv:false, exporterMenuCsv:false,
exporterCsvFilename: 'AbsentDetails.csv', exporterCsvFilename: 'AbsentDetails.csv',
exporterExcelFilename:'AbsentDetails', exporterExcelFilename:'Employee Details',
exporterPdfDefaultStyle: {fontSize: 9}, exporterPdfDefaultStyle: {fontSize: 9},
exporterPdfTableStyle: {margin: [30, 30, 30, 30]}, exporterPdfTableStyle: {margin: [30, 30, 30, 30]},
exporterPdfTableHeaderStyle: {fontSize: 10, bold: true, italics: true, color: 'red'}, exporterPdfTableHeaderStyle: {fontSize: 10, bold: true, italics: true, color: 'red'},
exporterPdfHeader: { text: "Absent Details", style: 'headerStyle' }, exporterPdfHeader: { text: "Employee Details", style: 'headerStyle' },
exporterPdfFooter: function ( currentPage, pageCount ) { exporterPdfFooter: function ( currentPage, pageCount ) {
return { text: currentPage.toString() + ' of ' + pageCount.toString(), style: 'footerStyle' }; return { text: currentPage.toString() + ' of ' + pageCount.toString(), style: 'footerStyle' };
}, },
...@@ -297,8 +314,8 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export ...@@ -297,8 +314,8 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
}else { }else {
$scope.showOrHideBD="Show"; $scope.showOrHideBD="Show";
} }
}; };
} }
function showAlert(message) { function showAlert(message) {
$mdDialog.show($mdDialog.alert().parent( $mdDialog.show($mdDialog.alert().parent(
...@@ -330,3 +347,4 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export ...@@ -330,3 +347,4 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
template: '<select class="form-control" ng-model="colFilter.term" ng-options="option.id as option.value for option in colFilter.options"></select>' template: '<select class="form-control" ng-model="colFilter.term" ng-options="option.id as option.value for option in colFilter.options"></select>'
}; };
}); });
\ No newline at end of file
src/main/webapp/WEB-INF/controllers/MyProjectAllocations.js
View file @ 1a6bf527
...@@ -14,9 +14,9 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m ...@@ -14,9 +14,9 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
$scope.employees = []; $scope.employees = [];
$scope.projects = []; $scope.projects = [];
var getCellTemplate = '<div class="ui-grid-cell-contents"><a href="#" ng-click="grid.appScope.getRowData(row,\'View\')">{{COL_FIELD}}</a></div>'; var getCellTemplate = '<div class="ui-grid-cell-contents"><a href="#" ng-click="grid.appScope.getRowData(row,\'View\')">{{COL_FIELD}}</a></div>';
var getCellActiveTemplate='<div ng-show="COL_FIELD==true"><p class="col-lg-12">Active</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">In Active</p></div>';
//var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-2x" aria-hidden="true" style="font-size:1.5em;colormargin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'Update\')">{{COL_FIELD}}</i></i></p>'; //var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-2x" aria-hidden="true" style="font-size:1.5em;colormargin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'Update\')">{{COL_FIELD}}</i></i></p>';
// var getCellActiveTemplate='<div >COL_FIELD<p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>'; // var getCellActiveTemplate='<div >COL_FIELD<p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>';
$scope.gridOptions = { $scope.gridOptions = {
paginationPageSizes : [ 10, 20, 30, 40, 50, 100], paginationPageSizes : [ 10, 20, 30, 40, 50, 100],
...@@ -32,7 +32,7 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m ...@@ -32,7 +32,7 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
{field : 'projectStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false}, {field : 'projectStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
{field : 'projectEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false}, {field : 'projectEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
{field : 'shift',displayName: 'Shift', enableColumnMenu: false, enableSorting: false,enableFiltering:false}, {field : 'shift',displayName: 'Shift', enableColumnMenu: false, enableSorting: false,enableFiltering:false},
{field : 'status',displayName: 'Active', enableColumnMenu: false,enableSorting: false,enableFiltering:false} {field : 'status',displayName: 'Status', enableColumnMenu: false,cellTemplate:getCellActiveTemplate,enableSorting: false,enableFiltering:false}
] ]
}; };
$scope.gridOptions.data = $scope.records; $scope.gridOptions.data = $scope.records;
......
src/main/webapp/WEB-INF/css/custom-theme.css
View file @ 1a6bf527
...@@ -317,8 +317,9 @@ i.fa.fa-refresh:hover { ...@@ -317,8 +317,9 @@ i.fa.fa-refresh:hover {
position: inherit; position: inherit;
} }
#footer .navbar-inverse .copyrights { #footer .navbar-inverse .copyrights {
background: #fff; /* background: #fff;
width: 215px; width: 215px; */
padding-right: 0px;
} }
#footer .navbar-inverse .copyrights:after { #footer .navbar-inverse .copyrights:after {
content: ""; content: "";
...@@ -326,17 +327,18 @@ i.fa.fa-refresh:hover { ...@@ -326,17 +327,18 @@ i.fa.fa-refresh:hover {
border-bottom: 50px solid #fff; border-bottom: 50px solid #fff;
position: absolute; position: absolute;
right: -50px; right: -50px;
top: 0; top: 0;
display:none;
} }
#footer .footer { #footer .footer {
line-height: 50px; /* line-height: 50px; */
} }
#footer .footer p { #footer .footer p {
font-size: 13px; font-size: 12px;
margin: 0; margin: 15px 0 0;
} }
#footer .footer .img { #footer .footer .img {
margin: 6px -10px 0 0; margin: 6px 0 0 0;
} }
#footer .navbar-inverse .copyrights + div { #footer .navbar-inverse .copyrights + div {
padding-right: 0; padding-right: 0;
...@@ -546,4 +548,30 @@ top: 22px; ...@@ -546,4 +548,30 @@ top: 22px;
background-color:green !important; background-color:green !important;
color:white; color:white;
font-weight:bold; font-weight:bold;
}
.manage-accounts .ui-grid-viewport {
height: 400px !important;
}
.autoComplete-dropdown {
border-color: #ececec;
border-width: 1px;
cursor: pointer;
max-height: 206px;
overflow-y: auto;
position: absolute;
top: 35px;
z-index: 99;
width: 180px;
}
/* .project-allocation .ui-grid-canvas .ui-grid-row, .manage-accounts .ui-grid-canvas .ui-grid-row {
} */
.project-allocation .ui-grid-canvas .ui-grid-row div div:nth-child(3), .manage-accounts .ui-grid-canvas .ui-grid-row div div:nth-child(3){
border-bottom: solid 1px #e5e5e5;
line-height: normal;
overflow: auto;
padding: 5px 0;
}
.project-allocation .ui-grid-canvas .ui-grid-row div div:nth-child(3) div:first-child, .manage-accounts .ui-grid-canvas .ui-grid-row div div:nth-child(3) div:first-child{
padding-top: 5px;
} }
\ No newline at end of file
src/main/webapp/WEB-INF/templates/accounts.html
View file @ 1a6bf527
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="row col-lg-12"> <div class="row col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid"> class="myGrid manage-accounts">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
</div> </div>
......
src/main/webapp/WEB-INF/templates/attendanceReport.html
View file @ 1a6bf527
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div> <div class="row col-lg-12" style="height: 15px;"></div>
</div> </div>
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-selection ui-grid-exporter <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter
class="myGrid" style="width:99%;height:330px;"> class="myGrid" style="width:99%;height:330px;">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
......
src/main/webapp/WEB-INF/templates/dashboard.html
View file @ 1a6bf527
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-selection ui-grid-exporter <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter
class="myGrid"> class="myGrid">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
......
src/main/webapp/WEB-INF/templates/domains.html
View file @ 1a6bf527
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</div> </div>
<div class="row col-lg-12" style="margin-left: 0px; margin-top: 10px"> <div class="row col-lg-12" style="margin-left: 0px; margin-top: 10px">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid" style="width: 99%; height: 370px; margin-left: 0px;"> class="myGrid" style="width: 99%">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
</div> </div>
......
src/main/webapp/WEB-INF/templates/employees.html
View file @ 1a6bf527
...@@ -16,28 +16,28 @@ ...@@ -16,28 +16,28 @@
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"> <div class="form-group">
<div class="form-inline"> <div class="form-inline">
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12"> <div class="col-lg-2 col-md-2 col-sm-6 col-xs-12">
<input type="text" ng-model="searchId" id="searchId" <input type="text" ng-model="searchId" id="searchId"
placeholder="Employee ID/Name/Email ID" class="form-control" min-length="5" ng-keyup="autoComplete(searchId);" ng-blur="hideUlComponent()"/> placeholder="Employee ID/Name/Email ID" class="form-control" min-length="5" ng-keyup="autoComplete(searchId);" ng-blur="hideUlComponent()"/>
<ul class="list-group autoComplete-dropdown" ng-model="hidethis" ng-hide="hidethis"> <ul class="list-group autoComplete-dropdown" ng-model="hidethis" ng-hide="hidethis">
<li class="list-group-item" ng-repeat="employeeData in filterEmployees" ng-click="fillTextbox(employeeData);">{{employeeData}}</li> <li class="list-group-item" ng-repeat="employeeData in filterEmployees" ng-click="fillTextbox(employeeData);">{{employeeData}}</li>
</ul> </ul>
</div> </div>
<div class="col-lg-3 col-md-3"> <div class="col-lg-4 col-md-4">
<label class="" for="fromDate">From Date: <md-datepicker <label class="" for="fromDate">From Date: <md-datepicker
ng-model="fromDate" md-placeholder="Enter date" ng-model="fromDate" md-placeholder="Enter date"
md-min-date="minDate" md-max-date="maxDate" md-min-date="minDate" md-max-date="maxDate"
onkeydown="return false" onkeydown="return false"
ng-change="validateDates(fromDate, 'FromDate')"></md-datepicker></label> ng-change="validateDates(fromDate, 'FromDate')"></md-datepicker></label>
</div> </div>
<div class="col-lg-3 col-md-3"> <div class="col-lg-4 col-md-4">
<label class="" for="toDate">To Date: <md-datepicker <label class="" for="toDate">To Date: <md-datepicker
ng-model="toDate" md-placeholder="Enter date" ng-model="toDate" md-placeholder="Enter date"
md-min-date="minDate" md-max-date="maxDate" md-min-date="minDate" md-max-date="maxDate"
onkeydown="return false" onkeydown="return false"
ng-change="validateDates(toDate, 'ToDate')"></md-datepicker></label> ng-change="validateDates(toDate, 'ToDate')"></md-datepicker></label>
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2 col-md-2">
<label class="" for="submitBtn"><md-button <label class="" for="submitBtn"><md-button
class="md-raised md-primary" class="md-raised md-primary"
ng-click="getEmployeeData('click');"> <i ng-click="getEmployeeData('click');"> <i
......
src/main/webapp/WEB-INF/templates/exportData.html
View file @ 1a6bf527
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<div class="form-group"> <div class="form-group">
<div class="form-inline col-lg-12" <div class="form-inline col-lg-12"
style="margin-left: 22%; margin-top: 5%;"> style="margin-left: 22%; margin-top: 5%;">
<div class="form-group col-lg-4"> <div class="form-group col-lg-3">
<a class="btn btn-primary" href='javascript:;'> Choose File... <a class="md-raised md-primary md-button" href='javascript:;'> Choose File...
<input type="file" file-model="file" <input type="file" file-model="file"
style="position: absolute; z-index: 2; top: 0; left: 0; filter: alpha(opacity = 0); -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); opacity: 0; background-color: transparent; color: transparent;" style="position: absolute; z-index: 2; top: 0; left: 0; filter: alpha(opacity = 0); -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); opacity: 0; background-color: transparent; color: transparent;"
name="file_source" name="file_source"
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</a> &nbsp; <span class='label label-info' id="upload-file-info"></span> </a> &nbsp; <span class='label label-info' id="upload-file-info"></span>
</div> </div>
<div class="form-group col-lg-1"></div> <div class="form-group col-lg-1"></div>
<div class="form-group col-lg-1"> <div class="form-group col-lg-2">
<label class="" for="submitBtn"><md-button <label class="" for="submitBtn"><md-button
class="md-raised md-primary" class="md-raised md-primary"
ng-click="uploadFiles()"> <i ng-click="uploadFiles()"> <i
......
src/main/webapp/WEB-INF/templates/footer.html
View file @ 1a6bf527
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<nav class="navbar navbar-fixed-bottom navbar-inverse" <nav class="navbar navbar-fixed-bottom navbar-inverse"
role="navigation"> role="navigation">
<div class="footer"> <div class="footer">
<div class="col-lg-1 col-xs-3 copyrights"> <div class="col-lg-2 col-xs-2 copyrights">
<p>&copy Nisum Consulting Ltd 2018</p> <p>&copy Nisum Consulting Ltd 2018</p>
</div> </div>
<div class="col-lg-10 col-xs-9"> <div class="col-lg-10 col-xs-10">
<img class="img img-rounded right" alt="nisum" src="images/nisum-small.png"/> <img class="img img-rounded right" alt="nisum" src="images/nisum-small.png"/>
</div> </div>
</div> </div>
......
src/main/webapp/WEB-INF/templates/myProjectAllocations.html
View file @ 1a6bf527
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
<div class="col-lg-12"> <div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid grid-full-view"> class="myGrid grid-full-view project-allocation">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
</div> </div>
......
src/main/webapp/WEB-INF/templates/newRoleTemplate.html
View file @ 1a6bf527
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<tr ng-show="empStatus == 'Active'"> <tr ng-show="empStatus == 'Active'">
<td colspan="4"><b>Select Sub Status :</b></td> <td colspan="4"><b>Select Sub Status :</b></td>
<td colspan="8"><md-select ng-model="empSubStatus" name ="empSubStatus" <td colspan="8"><md-select ng-model="empSubStatus" name ="empSubStatus"
ng-model ="empSubStatus" placeholder ="Select a Status Type" id="empSubStatus"> ng-model ="empSubStatus" placeholder ="Select a Sub Status Type" id="empSubStatus">
<md-optgroup label="Sub Status Type"> <md-optgroup label="Sub Status Type">
<md-option ng-value ="None">None</md-option> <md-option ng-value ="None">None</md-option>
<md-option ng-value="status" ng-repeat="status in empSubStatuses">{{status}}</md-option> <md-option ng-value="status" ng-repeat="status in empSubStatuses">{{status}}</md-option>
......
src/main/webapp/WEB-INF/templates/shiftdetails.html
View file @ 1a6bf527
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-selection ui-grid-exporter <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter
class="myGrid"> class="myGrid">
<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