Skip to content

Commit dd17de0

Browse files
committed
🐛The version is not displayed under Docker environment
1 parent a2992bd commit dd17de0

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

helper/scoreSheetPDFLine2-2022.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ async function drawRun(doc, config, scoringRun) {
141141
}
142142

143143
// System version
144-
pdf.drawText(doc, 742, 573, `RoboCupJunior CMS v${process.env.npm_package_version}`, 6, 'black');
144+
pdf.drawText(doc, 742, 573, `RoboCupJunior CMS v${process.env.cms_version}`, 6, 'black');
145145

146146
let x = 440;
147147
let y = 35;

helper/scoreSheetPDFMaze2-2022.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ function drawRun(doc, config, scoringRun) {
174174
);
175175

176176
// System version
177-
pdf.drawText(doc, 742, 573, `RoboCupJunior CMS v${process.env.npm_package_version}`, 6, 'black');
177+
pdf.drawText(doc, 742, 573, `RoboCupJunior CMS v${process.env.cms_version}`, 6, 'black');
178178

179179
const cells = [];
180180
for (const cell of scoringRun.map.cells) {

server.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@ const fs = require("fs");
99
const http = require('http');
1010

1111
env('process.env');
12-
12+
//Load package json
13+
const packageJson = require('./package.json');
14+
process.env.cms_version = packageJson.version;
15+
process.env.cms_copyright = packageJson.copyright;
16+
logger.info(`#######################################`);
17+
logger.info(` Welcome to RoboCupJunior CMS v${process.env.cms_version}`);
18+
logger.info(`#######################################`);
19+
1320
function isExistFile(file) {
1421
try {
1522
fs.statSync(file);

views/includes/footer.pug

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ footer.footer(style="text-align:center;background-color: #A51931;")
22
.row
33
.col-6.footer-text(style="margin-top:0.2rem;text-align:left;font-size:min(1vw, 25px);")
44
i.far.fa-copyright(aria-hidden='true')
5-
|  #{process.env.npm_package_copyright} - 
5+
|  #{process.env.cms_copyright} - 
66
i.fas.fa-code-branch(aria-hidden="true")
7-
|   v#{process.env.npm_package_version}
7+
|   v#{process.env.cms_version}
88
.col-6(style="text-align:right;font-size:min(1.5rem, 25px);")
99
i.fas.fa-language(aria-hidden='true' onclick="location.href='/locales'" ng-cloak)  {{'language_name' | translate}}  

0 commit comments

Comments
 (0)