Skip to content

Commit 29daf68

Browse files
committed
Defect DS-469 fixed
1 parent 40b3306 commit 29daf68

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

angular.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,13 @@
7474
"maximumError": "40mb"
7575
}
7676
]
77+
},
78+
"development": {
79+
"optimization": false,
80+
"sourceMap": true
7781
}
78-
}
82+
},
83+
"defaultConfiguration": "development"
7984
},
8085
"serve": {
8186
"builder": "@angular-devkit/build-angular:dev-server",
@@ -87,6 +92,9 @@
8792
"configurations": {
8893
"production": {
8994
"browserTarget": "odp-ui-appcenter:build:production"
95+
},
96+
"development": {
97+
"browserTarget": "odp-ui-appcenter:build:development"
9098
}
9199
}
92100
},

src/app/utils/view-control/view-date/view-date.component.ts

+10-6
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,22 @@ export class ViewDateComponent implements OnInit {
2424
this.dateString = this.appService.getUTCString(this.value.rawData, this.value.tzInfo)
2525
this.timezone = this.value.tzInfo;
2626
}
27-
if (this.definition.value && this.definition.value.rawData) {
27+
else if (this.definition.value && this.definition.value.rawData) {
2828
this.dateString = this.appService.getUTCString(this.definition.value.rawData, this.definition.value.tzInfo)
2929
this.timezone = this.definition.value.tzInfo;
3030
}
31-
if (this.value && this.definition.type === 'Date') {
32-
this.dateString = this.appService.getUTCString(this.value, this.definition?.properties?.defaultTimezone)
33-
this.timezone = this.definition?.properties?.defaultTimezone;
34-
}
35-
if (this.definition.value && this.definition.type === 'Date') {
31+
// if (this.value && this.definition.type === 'Date') {
32+
// this.dateString = this.appService.getUTCString(this.value, this.definition?.properties?.defaultTimezone)
33+
// this.timezone = this.definition?.properties?.defaultTimezone;
34+
// }
35+
else if (this.definition.value && this.definition.type === 'Date') {
3636
this.dateString = this.appService.getUTCString(this.definition.value, this.definition?.properties?.defaultTimezone)
3737
this.timezone = this.definition?.properties?.defaultTimezone;
3838
}
39+
else if(!this.definition.value){
40+
this.dateString = null
41+
this.timezone = null
42+
}
3943
}
4044

4145

0 commit comments

Comments
 (0)