Merge pull request #549 from salimkanoun/dev

Dev
salimkanoun · May 7, 2021 · d454865 · d454865
2 parents bab327a + 9cf3d4d
commit d454865
Show file tree

Hide file tree

Showing 6 changed files with 1,322 additions and 1,170 deletions.
diff --git a/BackEnd/model/monitoring/Orthanc_Monitoring.js b/BackEnd/model/monitoring/Orthanc_Monitoring.js
@@ -89,8 +89,9 @@ class Orthanc_Monitoring extends EventEmitter {
         this.done = changes.Done
     }
 
+
+    MONITORING_SERVICE_CDBURNER = "CdBurner"
 }
 
-const MONITORING_SERVICE_CDBURNER = "CdBurner"
 
 module.exports = Orthanc_Monitoring
diff --git a/BackEnd/model/monitoring/cdburner/CdBurner.js b/BackEnd/model/monitoring/cdburner/CdBurner.js
@@ -3,10 +3,9 @@ var JSZip = require("jszip")
 const path = require('path');
 const Queue = require('promise-queue')
 const tmpPromise = require('tmp-promise')
-const {withFile} = require('tmp-promise')
 
 const Options = require('../../Options')
-const orthanc_Monitoring = require('../Orthanc_Monitoring')
+const Orthanc_Monitoring = require('../Orthanc_Monitoring')
 const moment = require('moment')
 const recursive = require("recursive-readdir");
 const { OTJSForbiddenException } = require('../../../Exceptions/OTJSErrors');
@@ -75,7 +74,7 @@ class CdBurner {
         //Create listener
         this.__makeListener()
         //Start monitoring service
-        this.monitoring.startMonitoringService(orthanc_Monitoring.MONITORING_SERVICE_CDBURNER)
+        this.monitoring.startMonitoringService(Orthanc_Monitoring.MONITORING_SERVICE_CDBURNER)
     }
 
     /**
@@ -120,7 +119,7 @@ class CdBurner {
         this.monitoringStarted = false
         await Options.setBurnerStarted(false)
         this.__removeListener()
-        this.monitoring.stopMonitoringService(orthanc_Monitoring.MONITORING_SERVICE_CDBURNER)
+        this.monitoring.stopMonitoringService(Orthanc_Monitoring.MONITORING_SERVICE_CDBURNER)
     }
 
     /**

diff --git a/BackEnd/package-lock.json b/BackEnd/package-lock.json