Skip to content

Commit

Permalink
Merge pull request #56 from shikshalokam/SB-29619
Browse files Browse the repository at this point in the history 
Sb 29619
  • Loading branch information
@aks30
aks30 authored Apr 22, 2022
2 parents 3250c1d + 4a9fb67 commit 1197783
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
28 changes: 14 additions & 14 deletions helper/common_handler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3614,15 +3614,15 @@ exports.improvementProjectPdfGeneration = async function (responseData) {
let i = 0;
for (const file of files) {

fs.unlink(path.join(imgPath, file), err => {
if (err) throw err;
});
// fs.unlink(path.join(imgPath, file), err => {
// if (err) throw err;
// });

if (i == files.length) {
fs.unlink('../../' + currentTempFolder, err => {
if (err) throw err;
// fs.unlink('../../' + currentTempFolder, err => {
// if (err) throw err;

});
// });
console.log("path.dirname(filename).split(path.sep).pop()", path.dirname(file).split(path.sep).pop());

}
Expand All @@ -3631,7 +3631,7 @@ exports.improvementProjectPdfGeneration = async function (responseData) {

}
});
rimraf(imgPath, function () { console.log("done"); });
// rimraf(imgPath, function () { console.log("done"); });

return resolve({
status: filesHelper.status_success,
Expand Down Expand Up @@ -3766,15 +3766,15 @@ exports.improvementProjectTaskPdfGeneration = async function (responseData) {
let i = 0;
for (const file of files) {

fs.unlink(path.join(imgPath, file), err => {
if (err) throw err;
});
// fs.unlink(path.join(imgPath, file), err => {
// if (err) throw err;
// });

if (i == files.length) {
fs.unlink('../../' + currentTempFolder, err => {
if (err) throw err;
// fs.unlink('../../' + currentTempFolder, err => {
// if (err) throw err;

});
// });
console.log("path.dirname(filename).split(path.sep).pop()", path.dirname(file).split(path.sep).pop());

}
Expand All @@ -3783,7 +3783,7 @@ exports.improvementProjectTaskPdfGeneration = async function (responseData) {

}
});
rimraf(imgPath, function () { console.log("done"); });
// rimraf(imgPath, function () { console.log("done"); });

return resolve({
status: filesHelper.status_success,
Expand Down
14 changes: 7 additions & 7 deletions views/improvementProjectTaskTemplate.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

<div style="font-size: 18px;padding-left:15px">
<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Project Title</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -83,7 +83,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Program Name</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -92,7 +92,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Objective</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -101,7 +101,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Duration</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -110,7 +110,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Project Status</b></p>
</div>
<div style="width:60%; float:left;">
Expand Down Expand Up @@ -143,7 +143,7 @@
</div>

<div class="row" style="margin-top:10px">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Categories</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -154,7 +154,7 @@

<hr class="borderColor">

<div style="margin-top:50px !important;font-size: 18px">
<div style="margin-top:50px !important;font-size: 18px;width:100%">
<% if (data.response.tasks && data.response.tasks.length > 0) { %>
<% for (let i = 0; i< data.response.tasks.length; i++) { %>
<h3> Task </h3>
Expand Down
18 changes: 9 additions & 9 deletions views/improvementProjectTemplate.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<div style="font-size: 18px;padding-left:15px">

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Project Title</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -84,7 +84,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Program Name</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -93,7 +93,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Objective</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -102,7 +102,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Duration</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -111,7 +111,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Project Status</b></p>
</div>
<div style="width:60%; float:left;">
Expand Down Expand Up @@ -143,7 +143,7 @@
</div>

<div class="row" style="margin-top:10px">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Categories</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -152,7 +152,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Total Tasks</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -161,7 +161,7 @@
</div>

<div class="row">
<div style="width:30%; float:left;">
<div style="width:40%; float:left;">
<p><b>Total Subtasks</b></p>
</div>
<div style="width:60%; float:left;">
Expand All @@ -172,7 +172,7 @@

<hr class="borderColor">

<div style="margin-top:50px !important;font-size: 18px">
<div style="margin-top:50px !important;font-size: 18px;width:100%">
<% if (data.response.tasks && data.response.tasks.length > 0) { %>
<% for (let i = 0; i< data.response.tasks.length; i++) { %>
<h3> Task </h3>
Expand Down

0 comments on commit 1197783

Please sign in to comment.