diff --git a/src/components/modules/ExportTools/defs/def-Episode.json b/src/components/modules/ExportTools/defs/def-Episode.json index 3438c49..2a20cc5 100644 --- a/src/components/modules/ExportTools/defs/def-Episode.json +++ b/src/components/modules/ExportTools/defs/def-Episode.json @@ -136,7 +136,8 @@ "Duration", "Added", "Updated", - "Poster url" + "Poster url", + "Deleted" ], "level3": [ @@ -275,6 +276,12 @@ "key": "viewCount", "call": 1, "type": "string" + }, + "Deleted": + { + "key": "$.deletedAt", + "call": 1, + "type": "datetime" } } } diff --git a/src/components/modules/ExportTools/defs/def-Levels.json b/src/components/modules/ExportTools/defs/def-Levels.json index 3e68af0..eca3a6f 100644 --- a/src/components/modules/ExportTools/defs/def-Levels.json +++ b/src/components/modules/ExportTools/defs/def-Levels.json @@ -24,8 +24,6 @@ "levels": { "Level 1": "level1", "Level 2": "level2", - "Level 3": "level3", - "Level 4": "level4", "devTommy": "devtommy" }, "LevelCount": { diff --git a/src/components/modules/ExportTools/scripts/et.js b/src/components/modules/ExportTools/scripts/et.js index 47e8da1..e81bd17 100644 --- a/src/components/modules/ExportTools/scripts/et.js +++ b/src/components/modules/ExportTools/scripts/et.js @@ -641,8 +641,8 @@ const excel2 = new class Excel { } break; case "datetime": - val = JSONPath({path: String(lookup), json: data}); - if ( typeof val !== 'undefined' && val ) + val = JSONPath({path: String(lookup), json: data}); + if ( typeof val !== 'undefined' && val && val != '') { // Create a new JavaScript Date object based on the timestamp // multiplied by 1000 so that the argument is in milliseconds, not seconds. @@ -658,7 +658,7 @@ const excel2 = new class Excel { } else { - val = null + val = wtconfig.get('ET.NotAvail', 'N/A') } break; default: