Commit c9aeb2c5 authored by Prayas Jain's avatar Prayas Jain

Upadted Mail Template body and grid alignment

parent bbf76717
...@@ -2,16 +2,16 @@ server.port=8080 ...@@ -2,16 +2,16 @@ server.port=8080
server.context-path=/myTeam/ server.context-path=/myTeam/
#Production configuration #Production configuration
#spring.data.mongodb.host=10.3.45.11 spring.data.mongodb.host=10.3.45.11
#spring.data.mongodb.port=27017 spring.data.mongodb.port=27017
#spring.data.mongodb.database=mytimedb spring.data.mongodb.database=mytimedb
#spring.data.mongodb.username=mytime spring.data.mongodb.username=mytime
#spring.data.mongodb.password=nisum@123 spring.data.mongodb.password=nisum@123
#Local Database configuration #Local Database configuration
spring.data.mongodb.host=localhost #spring.data.mongodb.host=localhost
spring.data.mongodb.port=27017 #spring.data.mongodb.port=27017
spring.data.mongodb.database=myTeamDB #spring.data.mongodb.database=mytime
quartz.enabled=true quartz.enabled=true
cron.expression=0 45 10/3 1/1 * ? * cron.expression=0 45 10/3 1/1 * ? *
...@@ -51,11 +51,11 @@ email.leave.notification.subject=Employee Leave Email Notification ...@@ -51,11 +51,11 @@ email.leave.notification.subject=Employee Leave Email Notification
#0 * * * * ?===>for every minute #0 * * * * ?===>for every minute
email.leave.notification.shift1.cron=00 00 16 * * 1-5 email.leave.notification.shift1.cron=00 30 23 * * 1-5
email.leave.notification.shift2.cron=00 00 18 * * 1-5 email.leave.notification.shift2.cron=00 30 23 * * 1-5
email.leave.notification.shift3.cron=00 00 02 * * 2-6 email.leave.notification.shift3.cron=00 30 23 * * 2-6
email.leave.notification.shift4.cron=00 30 11 * * 1-5 email.leave.notification.shift4.cron=00 30 23 * * 1-5
email.leave.notification.shift5.cron=00 30 15 * * 1-5 email.leave.notification.shift5.cron=00 30 23 * * 1-5
#spring.thymeleaf.suffix=/WEB-INF/thymeleaf/templates/ #spring.thymeleaf.suffix=/WEB-INF/thymeleaf/templates/
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="line-height: 25px; padding: 15px 20px 20px 20px">As per the Biometric login records, we are unable to find your login time. We conclude that you are on leave for the day. <br /><br />Please apply the leave request for the same in <b>Ultipro.</b></td> <td style="line-height: 25px; padding: 15px 20px 20px 20px">As per the Biometric login records, you haven't logged in any of the Shifts. We conclude that you are on leave for the day. <br /><br />Please apply the leave request for the same in <b>Ultipro.</b></td>
</tr> </tr>
<tr> <tr>
<td style="height: 25px">&nbsp;</td> <td style="height: 25px">&nbsp;</td>
......
...@@ -4,17 +4,17 @@ myApp.directive('hcPieChart', function () { ...@@ -4,17 +4,17 @@ 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/getBillabilityDetailsByMonth','line',element," Billability Monthly Trends"); getEmployeeDetails(scope,element[0].baseURI+'reports/getBarChartReport?byType=FunctionalGroup','column',element,"Billability By Functional Group");
//getEmployeeDetails(scope,element[0].baseURI+'reports/billabilityByFunctionalGroup','column',element,"Billability By Functional Group"); //getEmployeeDetails(scope,element[0].baseURI+'reports/billabilityByFunctionalGroup','column',element,"Billability By Functional Group");
//getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByAccount','column',element,"Billability By Account"); //getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByAccount','column',element,"Billability By Account");
scope.clickMe= function() { scope.clickMe= function() {
scope.gridOptions.data = []; scope.gridOptions.data = [];
scope.gridOptions.enablePaginationControls = false; scope.gridOptions.enablePaginationControls = false;
if(scope.reportId == 3){ if(scope.reportId == 1){
getEmployeeDetails(scope,element[0].baseURI+'reports/getBarChartReport?byType=Account','column',element,"Billability By Account");
}else if(scope.reportId == 2){
getEmployeeDetails(scope,element[0].baseURI+'reports/getBarChartReport?byType=FunctionalGroup','column',element,"Billability By Functional Group"); getEmployeeDetails(scope,element[0].baseURI+'reports/getBarChartReport?byType=FunctionalGroup','column',element,"Billability By Functional Group");
}else if(scope.reportId == 1){ }else if(scope.reportId == 2){
getEmployeeDetails(scope,element[0].baseURI+'reports/getBarChartReport?byType=Account','column',element,"Billability By Account");
}else if(scope.reportId == 3){
getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByMonth','line',element," Billability Monthly Trends"); getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByMonth','line',element," Billability Monthly Trends");
} }
} }
...@@ -27,7 +27,7 @@ myApp.directive('hcPieChart', function () { ...@@ -27,7 +27,7 @@ myApp.directive('hcPieChart', function () {
$scope.empSearchId = ""; $scope.empSearchId = "";
$scope.reportId = "1" $scope.reportId = "1"
$scope.reports = $scope.reportId; $scope.reports = $scope.reportId;
$scope.reports=[ {Name:"Billability Monthly Trends",Id:"1"},{Name:"Billability By Functional Group",Id:"2"},{Name:"Billability By Account",Id:"3"}]; $scope.reports=[{Name:"Billability By Functional Group",Id:"1"},{Name:"Billability By Account",Id:"2"},{Name:"Billability Monthly Trends",Id:"3"}];
$scope.employees = []; $scope.employees = [];
......
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