Skip to content

Commit

Permalink
Merge pull request #137 from NandiniAV/cbrelease-4.0.1
Browse files Browse the repository at this point in the history
Cbrelease 4.0.1
  • Loading branch information
christyfernandes authored Jun 21, 2022
2 parents e4b5882 + 8b5b308 commit 04c34e8
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 12 deletions.
40 changes: 31 additions & 9 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"assets": ["src/favicon.ico", "src/favicon.png", "src/mdo-assets"],
"assets": [
"src/favicon.ico",
"src/favicon.png",
"src/mdo-assets"
],
"stylePreprocessorOptions": {
"includePaths": ["src/styles"]
"includePaths": [
"src/styles"
]
},
"styles": [
{
Expand Down Expand Up @@ -246,16 +252,27 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": ["src/favicon.ico", "src/mdo-assets"],
"styles": ["src/styles.scss"],
"assets": [
"src/favicon.ico",
"src/mdo-assets"
],
"styles": [
"src/styles.scss"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
"exclude": ["**/node_modules/**"]
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
Expand Down Expand Up @@ -296,8 +313,13 @@
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["project/ws/app/tsconfig.lib.json", "project/ws/app/tsconfig.spec.json"],
"exclude": ["**/node_modules/**"]
"tsConfig": [
"project/ws/app/tsconfig.lib.json",
"project/ws/app/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
Expand All @@ -312,4 +334,4 @@
"cli": {
"analytics": false
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@project-sunbird/telemetry-sdk": "0.0.26",
"@sunbird-cb/collection": "1.0.13",
"@sunbird-cb/design-system": "0.0.1",
"@sunbird-cb/rain-dashboards": "^0.2.2",
"@sunbird-cb/rain-dashboards": "^0.2.3",
"@sunbird-cb/resolver": "^1.0.0",
"@sunbird-cb/utils": "^1.0.12",
"@types/file-saver": "^2.0.1",
Expand Down Expand Up @@ -136,4 +136,4 @@
"typescript-tslint-plugin": "^0.5.4",
"webpack-bundle-analyzer": "^4.4.0"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
const minutes = obj.duration % 60
const duration = (hours === 0) ? ((minutes === 0) ? '---' : `${minutes} minutes`) : (minutes === 0) ? (hours === 1) ?
`${hours} hour` : `${hours} hours` : (hours === 1) ? `${hours} hour ${minutes} minutes` :
`${hours} hours ${minutes} minutes`
`${hours} hours ${minutes} minutes`
const creatordata = obj.creatorDetails !== undefined ? obj.creatorDetails : []
const str = creatordata && creatordata.length > 0 ? creatordata.replace(/\\/g, '') : []
const creatorDetails = str && str.length > 0 ? JSON.parse(str) : creatordata
Expand Down

0 comments on commit 04c34e8

Please sign in to comment.