Update schedules.js to set startDate to midnight for new schedules; remove startDate for Nixie controllers. tagyoureit/nodejs-poolController#1094

Refactor Config.ts for cleaner code and ensure directory creation is recursive.

Author: tagyoureit

scripts/config/schedules.js

@@ -34,7 +34,7 @@
                     pnl[0].dataBind({
                         id: -1, startTime: 480, endTime: 1020,
                         scheduleType: st.val, startTimeType: tt.val, endTimeType: tt.val, circuit: 0, display: 0,
-                        heatSetpoint: 78, coolSetpoint: 100, heatSource: 0, scheduleDays: 127, startDate: new Date().toISOString()
+                        heatSetpoint: 78, coolSetpoint: 100, heatSource: 0, scheduleDays: 127, startDate: (function() { var today = new Date(); today.setHours(0, 0, 0, 0); return today.toISOString(); })()
 
                     });
                     pnl.find('div.picAccordian:first')[0].expanded(true);
@@ -239,6 +239,12 @@
                     delete v.startTimeMult;
                     delete v.startTimeOffsetHours;
                     delete v.startTimeOffsetMins;
+                    
+                    // Remove startDate for Nixie controllers
+                    if (ct === 'nixie') {
+                        delete v.startDate;
+                    }
+                    
                     console.log(v);
                     $.putApiService('/config/schedule', v, 'Saving Schedule...', function (data, status, xhr) {
                         console.log({ data: data, status: status, xhr: xhr });
@@ -283,7 +289,12 @@
             var schedType = $.extend(true,
                 { name: 'repeat', desc: 'Repeats', startDate: false, startTime: true, endTime: true, days: 'multi' },
                 o.scheduleTypes.find(elem => scheduleType === elem.val));
-            schedType.startDate ? el.find('div.picPickList[data-bind=startDate]').show()[0].required(true) : el.find('div.picPickList[data-bind=startDate]').hide()[0].required(false);
+            
+            // Check controller type for start date visibility
+            let ct = $('body').attr('data-controllertype');
+            let shouldShowStartDate = schedType.startDate && ct !== 'nixie';
+            
+            shouldShowStartDate ? el.find('div.picPickList[data-bind=startDate]').show()[0].required(true) : el.find('div.picPickList[data-bind=startDate]').hide()[0].required(false);
             schedType.startTime ? el.find('div.schedule-time.start-time').show().find('div.picValueSpinner[data-bind=startTime]')[0].required(true) : el.find('div.schedule-time.start-time').hide().find('div.picValueSpinner[data-bind=startTime]')[0].required(false);
             schedType.endTime ? el.find('div.schedule-time.end-time').show().find('div.picValueSpinner[data-bind=endTime]')[0].required(true) : el.find('div.schedule-time.end-time').hide().find('div.picValueSpinner[data-bind=endTime]')[0].required(false);
             el.find('div.pnl-scheduleDays').each(function () {

server/config/Config.ts

@@ -13,7 +13,7 @@ class Config {
             this._cfg = fs.existsSync(this.cfgPath) ? JSON.parse(fs.readFileSync(this.cfgPath, "utf8")) : {};
             const def = JSON.parse(fs.readFileSync(path.join(process.cwd(), "/defaultConfig.json"), "utf8").trim());
             const packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), "/package.json"), "utf8").trim());
-            this._cfg = extend(true, {}, def, this._cfg, { appVersion: {installed: packageJson.version }});
+            this._cfg = extend(true, {}, def, this._cfg, { appVersion: { installed: packageJson.version } });
             this._isInitialized = true;
             this.getEnvVariables();
             this.update();
@@ -46,7 +46,7 @@ class Config {
             }
             section = arr[arr.length - 1];
         }
-        if (JSON.stringify(c[section]) === JSON.stringify(val)){
+        if (JSON.stringify(c[section]) === JSON.stringify(val)) {
             logger.silly(`setSection: Config section and val are identical.  Not updating.`)
         }
         else {
@@ -55,7 +55,7 @@ class Config {
         }
     }
 
-    public getSection(section?: string, opts?: any) : any {
+    public getSection(section?: string, opts?: any): any {
         if (typeof (section) === 'undefined') return this._cfg;
         var c: any = this._cfg;
         if (section.indexOf('.') !== -1) {
@@ -79,23 +79,20 @@ class Config {
         this.ensurePath(baseDir + '/data/outQueues/');
     }
     private ensurePath(dir: string) {
-        if (!fs.existsSync(dir)) {
-            fs.mkdir(dir, (err) => {
-                // Logger will not be initialized by the time we reach here so we must
-                // simply log these to the console.
-                if (err) console.log(`Error creating directory: ${dir} - ${err}`);
-            });
-        }
+        fs.mkdir(dir, { recursive: true }, (err) => {
+            if (err) console.log(`Error creating directory: ${dir} - ${err}`);
+        });
     }
-    private getEnvVariables(){
+    
+    private getEnvVariables() {
         // set docker env variables to config.json, if they are set
         let env = process.env;
         if (typeof env.POOL_HTTP_IP !== 'undefined' && env.POOL_HTTP_IP !== this._cfg.web.services.ip) {
             this._cfg.web.services.ip = env.POOL_HTTP_IP;
         }
-        if (typeof env.POOL_HTTP_PORT !== 'undefined' && parseInt(env.POOL_HTTP_PORT,10) !== this._cfg.web.services.port) {
-            this._cfg.web.services.port = parseInt(env.POOL_HTTP_PORT,10);
+        if (typeof env.POOL_HTTP_PORT !== 'undefined' && parseInt(env.POOL_HTTP_PORT, 10) !== this._cfg.web.services.port) {
+            this._cfg.web.services.port = parseInt(env.POOL_HTTP_PORT, 10);
         }
     }
 }
-export var config:Config = new Config();
+export var config: Config = new Config();