Skip to content

Commit

Permalink
Merge pull request #3199 from sap-labs-france/master-qa
Browse files Browse the repository at this point in the history
Merge master-qa
  • Loading branch information
LucasBrazi06 authored Jun 19, 2022
2 parents 9c44d2f + 372ff76 commit ca56681
Show file tree
Hide file tree
Showing 27 changed files with 348 additions and 348 deletions.
106 changes: 65 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ev-dashboard",
"description": "Dashboard for Electric Vehicle charging station",
"homepage": "https://github.com/sap-labs-france/ev-dashboard",
"version": "2.6.8",
"version": "2.6.9",
"engines": {
"npm": "8.x.x."
},
Expand Down Expand Up @@ -88,7 +88,8 @@
"bootstrap-material-design": "^4.1.3",
"bootstrap-notify": "^3.1.3",
"bootstrap-select": "^1.13.18",
"chart.js": "^3.7.0",
"bufferutil": "^4.0.6",
"chart.js": "^3.8.0",
"chartjs-adapter-moment": "^1.0.0",
"chartjs-plugin-datalabels": "^2.0.0",
"file-saver": "^2.0.5",
Expand All @@ -102,15 +103,16 @@
"ng2-file-upload": "^1.4.0",
"ngx-captcha": "^9.0.1",
"ngx-csv-parser": "0.0.7",
"ngx-daterangepicker-material": "^5.0.2",
"ngx-daterangepicker-material": "5.0.1",
"ngx-google-places-autocomplete": "^2.0.5",
"ngx-moment": "^5.0.0",
"popper.js": "^1.16.1",
"rxjs": "^6.6.7",
"tldts": "^5.7.80",
"ts-jest": "^27.1.4",
"tslib": "^2.4.0",
"zone.js": "~0.11.5"
"utf-8-validate": "^5.0.9",
"zone.js": "~0.11.6"
},
"optionalDependencies": {
"bufferutil": "^4.0.6",
Expand All @@ -128,7 +130,7 @@
"@types/bootstrap": "^5.1.12",
"@types/chart.js": "^2.9.37",
"@types/convict": "^6.0.2",
"@types/expect-puppeteer": "^4.4.7",
"@types/expect-puppeteer": "^5.0.0",
"@types/file-saver": "^2.0.5",
"@types/jest": "^27.4.1",
"@types/jest-environment-puppeteer": "^5.0.2",
Expand Down Expand Up @@ -158,7 +160,7 @@
"puppeteer": "^14.3.0",
"rimraf": "^3.0.2",
"rosie": "^2.1.0",
"ts-node": "~10.8.0",
"ts-node": "~10.8.1",
"ts-node-dev": "^2.0.0",
"typescript": "~4.1.6",
"webpack": "^4.46.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ export class AuthenticationLoginComponent implements OnInit, OnDestroy {
if (this.subDomain) {
// Retrieve tenant's logo
this.centralServerService.getTenantLogoBySubdomain(this.subDomain).subscribe((tenantLogo: string) => {
console.log(tenantLogo);
if (tenantLogo) {
this.tenantLogo = tenantLogo;
}
Expand Down
1 change: 0 additions & 1 deletion src/app/pages/assets/asset/main/asset-main.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ export class AssetMainComponent implements OnInit, OnChanges {
.afterClosed().subscribe((result) => {
if (!Utils.isEmptyArray(result) && result[0].objectRef) {
const siteArea = result[0].objectRef as SiteArea;
console.log(siteArea);
this.siteArea.setValue(siteArea.name);
this.siteAreaID.setValue(siteArea.id);
this.selectedSiteArea = siteArea;
Expand Down
Loading

0 comments on commit ca56681

Please sign in to comment.