mirror of
				https://github.com/node-red/node-red.git
				synced 2025-03-01 10:36:34 +00:00 
			
		
		
		
	Change inject node to use tick boxes for days of week instead of select.
This commit is contained in:
		| @@ -1,142 +1,165 @@ | ||||
| <!-- | ||||
|   Copyright 2013 IBM Corp. | ||||
|  | ||||
|   Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|   you may not use this file except in compliance with the License. | ||||
|   You may obtain a copy of the License at | ||||
|  | ||||
|   http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|   Unless required by applicable law or agreed to in writing, software | ||||
|   distributed under the License is distributed on an "AS IS" BASIS, | ||||
|   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|   See the License for the specific language governing permissions and | ||||
|   limitations under the License. | ||||
| --> | ||||
|  | ||||
| <script type="text/x-red" data-template-name="inject"> | ||||
|     <div class="form-row node-input-payload"> | ||||
| <!-- | ||||
|   Copyright 2013,2015 IBM Corp. | ||||
|  | ||||
|   Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|   you may not use this file except in compliance with the License. | ||||
|   You may obtain a copy of the License at | ||||
|  | ||||
|   http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|   Unless required by applicable law or agreed to in writing, software | ||||
|   distributed under the License is distributed on an "AS IS" BASIS, | ||||
|   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|   See the License for the specific language governing permissions and | ||||
|   limitations under the License. | ||||
| --> | ||||
|  | ||||
| <script type="text/x-red" data-template-name="inject"> | ||||
|     <div class="form-row node-input-payload"> | ||||
|         <label for="node-input-payloadType"><i class="fa fa-envelope"></i> Payload</label> | ||||
|         <select id="node-input-payloadType" style="width:125px !important"> | ||||
|           <option value="date">timestamp</option> | ||||
|           <option value="none">blank</option> | ||||
|           <option value="string">string</option> | ||||
|         </select> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row" id="node-input-row-payload"> | ||||
|         <label for="node-input-payload"></label> | ||||
|         <input type="text" id="node-input-payload" placeholder="payload"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row"> | ||||
|         <select id="node-input-payloadType" style="width:73%"> | ||||
|           <option value="date">timestamp</option> | ||||
|           <option value="string">string</option> | ||||
|           <option value="none">blank</option> | ||||
|         </select> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row" id="node-input-row-payload"> | ||||
|         <label for="node-input-payload"></label> | ||||
|         <input type="text" id="node-input-payload" placeholder="payload" style="width:70%"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row"> | ||||
|         <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label> | ||||
|         <input type="text" id="node-input-topic" placeholder="topic"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row"> | ||||
|         <input type="text" id="node-input-topic" placeholder="topic" style="width: 70%x"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row"> | ||||
|         <label for=""><i class="fa fa-repeat"></i> Repeat</label> | ||||
|         <select id="inject-time-type-select"  style="width: 288px"><option value="none">none</option><option value="interval">interval</option><option value="interval-time">interval between times</option><option value="time">at a specific time</option></select> | ||||
|         <input type="hidden" id="node-input-repeat" placeholder="payload"> | ||||
|         <input type="hidden" id="node-input-crontab" placeholder="payload"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row inject-time-row hidden" id="inject-time-row-interval"> | ||||
|         every <input id="inject-time-interval-count" class="inject-time-count" value="1"></input> | ||||
|               <select style="width: 100px" id="inject-time-interval-units"><option value="s">seconds</option><option value="m">minutes</option><option value="h">hours</option></select><br/> | ||||
|         <!-- on <select disabled id="inject-time-interval-days" class="inject-time-days"></select> --> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row inject-time-row hidden" id="inject-time-row-interval-time"> | ||||
|         at every <select style="width: 90px" id="inject-time-interval-time-units" class="inject-time-int-count" value="1"> | ||||
|             <option value="1">1</option> | ||||
|             <option value="2">2</option> | ||||
|             <option value="3">3</option> | ||||
|             <option value="4">4</option> | ||||
|             <option value="5">5</option> | ||||
|             <option value="6">6</option> | ||||
|             <option value="10">10</option> | ||||
|             <option value="12">12</option> | ||||
|             <option value="15">15</option> | ||||
|             <option value="20">20</option> | ||||
|             <option value="30">30</option> | ||||
|         <select id="inject-time-type-select" style="width: 73%"><option value="none">none</option><option value="interval">interval</option><option value="interval-time">interval between times</option><option value="time">at a specific time</option></select> | ||||
|         <input type="hidden" id="node-input-repeat" placeholder="payload"> | ||||
|         <input type="hidden" id="node-input-crontab" placeholder="payload"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row inject-time-row hidden" id="inject-time-row-interval"> | ||||
|         every <input id="inject-time-interval-count" class="inject-time-count" value="1"></input> | ||||
|               <select style="width: 100px" id="inject-time-interval-units"><option value="s">seconds</option><option value="m">minutes</option><option value="h">hours</option></select><br/> | ||||
|         <!-- on <select disabled id="inject-time-interval-days" class="inject-time-days"></select> --> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row inject-time-row hidden" id="inject-time-row-interval-time"> | ||||
|         at every <select style="width: 90px" id="inject-time-interval-time-units" class="inject-time-int-count" value="1"> | ||||
|             <option value="1">1</option> | ||||
|             <option value="2">2</option> | ||||
|             <option value="3">3</option> | ||||
|             <option value="4">4</option> | ||||
|             <option value="5">5</option> | ||||
|             <option value="6">6</option> | ||||
|             <option value="10">10</option> | ||||
|             <option value="12">12</option> | ||||
|             <option value="15">15</option> | ||||
|             <option value="20">20</option> | ||||
|             <option value="30">30</option> | ||||
|             <option value="0">60</option> | ||||
|         </select> minutes<br/> | ||||
|         between <select id="inject-time-interval-time-start" class="inject-time-times"></select> | ||||
|         and <select id="inject-time-interval-time-end" class="inject-time-times"></select><br/> | ||||
|         on <select id="inject-time-interval-time-days" class="inject-time-days"></select> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row inject-time-row hidden" id="inject-time-row-time"> | ||||
|         at <input id="inject-time-time" value="12:00"></input><br/> | ||||
|         on <select id="inject-time-time-days" class="inject-time-days"></select> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row" id="node-once"> | ||||
|         <label> </label> | ||||
|         <input type="checkbox" id="node-input-once" style="display: inline-block; width: auto; vertical-align: top;"> | ||||
|         <label for="node-input-once" style="width: 70%;">Fire once at start ?</label> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row"> | ||||
|         </select> minutes<br/> | ||||
|         between <select id="inject-time-interval-time-start" class="inject-time-times"></select> | ||||
|         and <select id="inject-time-interval-time-end" class="inject-time-times"></select><br/> | ||||
|         <!-- on <select id="inject-time-interval-time-days" class="inject-time-days"></select> --> | ||||
|         <div id="inject-time-interval-time-days" class="inject-time-days"> | ||||
|             <table  style="width:100% !important"><tr><td valign="top">on </td><td valign="top"> | ||||
|             <label><input type='checkbox' class="cb1" value='1'/> Monday</label> | ||||
|             <label><input type='checkbox' class="cb1" value='2'/> Tuesday</label> | ||||
|             <label><input type='checkbox' class="cb1" value='3'/> Wednesday</label> | ||||
|             <label><input type='checkbox' class="cb1" value='4'/> Thursday</label> | ||||
|             <label><input type='checkbox' class="cb1" value='5'/> Friday</label> | ||||
|             <label><input type='checkbox' class="cb1" value='6'/> Saturday</label> | ||||
|             <label><input type='checkbox' class="cb1" value='0'/> Sunday</label> | ||||
|             <!-- <div><input type='checkbox' id="cb1selectall" value='*'/> Everyday</div> --> | ||||
|             </td></tr></table> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row inject-time-row hidden" id="inject-time-row-time"> | ||||
|         at <input id="inject-time-time" value="12:00"></input><br/> | ||||
|         <!-- on <select id="inject-time-time-days" class="inject-time-days"></select> --> | ||||
|         <div id="inject-time-time-days" class="inject-time-days"> | ||||
|             <table  style="width:100% !important"><tr><td valign="top">on </td><td valign="top"> | ||||
|             <label><input type='checkbox' class="cb2" value='1'/> Monday</label> | ||||
|             <label><input type='checkbox' class="cb2" value='2'/> Tuesday</label> | ||||
|             <label><input type='checkbox' class="cb2" value='3'/> Wednesday</label> | ||||
|             <label><input type='checkbox' class="cb2" value='4'/> Thursday</label> | ||||
|             <label><input type='checkbox' class="cb2" value='5'/> Friday</label> | ||||
|             <label><input type='checkbox' class="cb2" value='6'/> Saturday</label> | ||||
|             <label><input type='checkbox' class="cb2" value='0'/> Sunday</label> | ||||
|             </td></tr></table> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row" id="node-once"> | ||||
|         <label> </label> | ||||
|         <input type="checkbox" id="node-input-once" style="display: inline-block; width: auto; vertical-align: top;"> | ||||
|         <label for="node-input-once" style="width: 70%;">Fire once at start ?</label> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-row"> | ||||
|         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label> | ||||
|         <input type="text" id="node-input-name" placeholder="name"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-tips"><b>Note:</b> "interval between times" and "at a specific time" will use cron.<br/>See info box for details.</div> | ||||
| </script> | ||||
| <style> | ||||
|     .inject-time-row { | ||||
|         padding-left: 110px; | ||||
|     } | ||||
|     .inject-time-row select { | ||||
|         margin: 3px 0; | ||||
|     } | ||||
|     .inject-time-days { | ||||
|         width: 262px; | ||||
|     } | ||||
|     .inject-time-times { | ||||
|         width: 90px; | ||||
|     } | ||||
|     .inject-time-row > .ui-spinner { | ||||
|         height: 28px; | ||||
|         margin: 3px 0; | ||||
|         border-color: rgb(204, 204, 204); | ||||
|     } | ||||
|     #inject-time-time { | ||||
|         margin-top: 3px; | ||||
|         width: 75px; | ||||
|     } | ||||
|     .inject-time-count { | ||||
|         width: 40px !important; | ||||
|     } | ||||
| </style> | ||||
| <script type="text/x-red" data-help-name="inject"> | ||||
|     <p>Pressing the button on the left side of the node allows a message on a topic to be injected into the flow. This is mainly for test purposes.</p> | ||||
|     <p>If no payload is specified the payload is set to the current time in millisecs since 1970. This allows subsequent functions to perform time based actions.</p> | ||||
|     <p>The repeat function does what it says on the tin and continuously sends the payload every x seconds.</p> | ||||
|     <p>The Fire once at start option actually waits 50mS before firing to give other nodes a chance to instantiate properly.</p> | ||||
|         <input type="text" id="node-input-name" placeholder="name"> | ||||
|     </div> | ||||
|  | ||||
|     <div class="form-tips"><b>Note:</b> "interval between times" and "at a specific time" will use cron.<br/>See info box for details.</div> | ||||
| </script> | ||||
| <style> | ||||
|     .inject-time-row { | ||||
|         padding-left: 110px; | ||||
|     } | ||||
|     .inject-time-row select { | ||||
|         margin: 3px 0; | ||||
|     } | ||||
|     //.inject-time-days { | ||||
|     //    width: 262px; | ||||
|     //} | ||||
|     .inject-time-times { | ||||
|         width: 90px; | ||||
|     } | ||||
|     .inject-time-row > .ui-spinner { | ||||
|         height: 28px; | ||||
|         margin: 3px 0; | ||||
|         border-color: rgb(204, 204, 204); | ||||
|     } | ||||
|     #inject-time-time { | ||||
|         margin-top: 3px; | ||||
|         width: 75px; | ||||
|     } | ||||
|     .inject-time-count { | ||||
|         width: 40px !important; | ||||
|     } | ||||
| </style> | ||||
| <script type="text/x-red" data-help-name="inject"> | ||||
|     <p>Pressing the button on the left side of the node allows a message on a topic to be injected into the flow. This is mainly for test purposes.</p> | ||||
|     <p>If no payload is specified the payload is set to the current time in millisecs since 1970. This allows subsequent functions to perform time based actions.</p> | ||||
|     <p>The repeat function does what it says on the tin and continuously sends the payload every x seconds.</p> | ||||
|     <p>The Fire once at start option actually waits 50mS before firing to give other nodes a chance to instantiate properly.</p> | ||||
|     <p><b>Note: </b>"Interval between times" and "at a specific time" will use cron. This means that 20 minutes will be at the next hour, 20 minutes past and 40 minutes past - not in 20 minutes time. | ||||
|     If you want every 20 minutes from now - use the basic "interval" option.</p> | ||||
| </script> | ||||
|  | ||||
| <script type="text/javascript"> | ||||
|     RED.nodes.registerType('inject',{ | ||||
|         category: 'input', | ||||
|         color:"#a6bbcf", | ||||
|         defaults: { | ||||
|             name: {value:""}, | ||||
|             topic: {value:""}, | ||||
|             payload: {value:""}, | ||||
|             payloadType: {value:"date"}, | ||||
|             repeat: {value:""}, | ||||
|             crontab: {value:""}, | ||||
|             once: {value:false} | ||||
|         }, | ||||
|         inputs:0, | ||||
|         outputs:1, | ||||
|         icon: "inject.png", | ||||
|         label: function() { | ||||
| </script> | ||||
|  | ||||
| <script type="text/javascript"> | ||||
|     RED.nodes.registerType('inject',{ | ||||
|         category: 'input', | ||||
|         color:"#a6bbcf", | ||||
|         defaults: { | ||||
|             name: {value:""}, | ||||
|             topic: {value:""}, | ||||
|             payload: {value:""}, | ||||
|             payloadType: {value:"date"}, | ||||
|             repeat: {value:""}, | ||||
|             crontab: {value:""}, | ||||
|             once: {value:false} | ||||
|         }, | ||||
|         inputs:0, | ||||
|         outputs:1, | ||||
|         icon: "inject.png", | ||||
|         label: function() { | ||||
|             if (this.payloadType === "string") { | ||||
|                 if ((this.topic !== "") && ((this.topic.length + this.payload.length) <= 32)) { | ||||
|                     return this.name||this.topic + ":" + this.payload; | ||||
| @@ -144,118 +167,135 @@ | ||||
|                 else if (this.payload.length < 24) { | ||||
|                     return this.name||this.payload; | ||||
|                 } | ||||
|             } | ||||
|             } | ||||
|             if ((this.topic.length < 24) && (this.topic.length > 0)) { | ||||
|                 return this.name||this.topic; | ||||
|             } | ||||
|             else { return this.name||(this.payloadType==="date"?"timestamp":null)||"inject"; } | ||||
|         }, | ||||
|         labelStyle: function() { | ||||
|             return this.name?"node_label_italic":""; | ||||
|         }, | ||||
|         oneditprepare: function() { | ||||
|             $("#inject-time-type-select").change(function() { | ||||
|                 $("#node-input-crontab").val(''); | ||||
|                 var id = $("#inject-time-type-select option:selected").val(); | ||||
|                 $(".inject-time-row").hide(); | ||||
|                 $("#inject-time-row-"+id).show(); | ||||
|                 if ((id == "none") || (id == "interval")) { | ||||
|                     $("#node-once").show(); | ||||
|                 } | ||||
|                 else { | ||||
|                     $("#node-once").hide(); | ||||
|                     $("#node-input-once").prop('checked', false); | ||||
|                 } | ||||
|             }); | ||||
|  | ||||
|             var days = [ | ||||
|                 {v:"*",t:"every day"}, | ||||
|                 {v:"1-5",t:"Mondays to Fridays"}, | ||||
|                 {v:"0,6",t:"Saturdays and Sundays"}, | ||||
|                 {v:"1",t:"Mondays"}, | ||||
|                 {v:"2",t:"Tuesdays"}, | ||||
|                 {v:"3",t:"Wednesdays"}, | ||||
|                 {v:"4",t:"Thursdays"}, | ||||
|                 {v:"5",t:"Fridays"}, | ||||
|                 {v:"6",t:"Saturdays"}, | ||||
|                 {v:"0",t:"Sundays"} | ||||
|             ]; | ||||
|  | ||||
|             $(".inject-time-days").each(function() { | ||||
|                 for (var d in days) { | ||||
|                     $(this).append($("<option></option>").val(days[d].v).text(days[d].t)); | ||||
|                 } | ||||
|             }); | ||||
|  | ||||
|             $(".inject-time-times").each(function() { | ||||
|                 for (var i=0;i<24;i++) { | ||||
|                     var l = (i<10?"0":"")+i+":00"; | ||||
|                     $(this).append($("<option></option>").val(i).text(l)); | ||||
|                 } | ||||
|             }); | ||||
|  | ||||
|             $(".inject-time-count").spinner({ | ||||
|                 //max:60, | ||||
|                 min:1 | ||||
|             }); | ||||
|  | ||||
|             $("#inject-time-interval-units").change(function() { | ||||
|                 var units = $("#inject-time-interval-units option:selected").val(); | ||||
|                 //$("#inject-time-interval-days").prop("disabled",(units == "s")?"disabled":false); | ||||
|                 //$(".inject-time-count").spinner("option","max",(units == "h")?24:60); | ||||
|             }); | ||||
|  | ||||
|             $.widget( "ui.injecttimespinner", $.ui.spinner, { | ||||
|                 options: { | ||||
|                     // seconds | ||||
|                     step: 60 * 1000, | ||||
|                     // hours | ||||
|                     page: 60 | ||||
|                 }, | ||||
|                 _parse: function( value ) { | ||||
|                     if ( typeof value === "string" ) { | ||||
|                         // already a timestamp | ||||
|                         if ( Number( value ) == value ) { | ||||
|                             return Number( value ); | ||||
|                         } | ||||
|                         var p = value.split(":"); | ||||
|                         var offset = new Date().getTimezoneOffset(); | ||||
|                         return (((Number(p[0])+1)*60)+Number(p[1])+offset)*60*1000; | ||||
|                     } | ||||
|                     return value; | ||||
|                 }, | ||||
|                 _format: function( value ) { | ||||
|                     var d = new Date(value); | ||||
|                     var h = d.getHours(); | ||||
|                     var m = d.getMinutes(); | ||||
|         }, | ||||
|         labelStyle: function() { | ||||
|             return this.name?"node_label_italic":""; | ||||
|         }, | ||||
|         oneditprepare: function() { | ||||
|             $("#inject-time-type-select").change(function() { | ||||
|                 $("#node-input-crontab").val(''); | ||||
|                 var id = $("#inject-time-type-select option:selected").val(); | ||||
|                 $(".inject-time-row").hide(); | ||||
|                 $("#inject-time-row-"+id).show(); | ||||
|                 if ((id == "none") || (id == "interval")) { | ||||
|                     $("#node-once").show(); | ||||
|                 } | ||||
|                 else { | ||||
|                     $("#node-once").hide(); | ||||
|                     $("#node-input-once").prop('checked', false); | ||||
|                 } | ||||
|             }); | ||||
|  | ||||
|             //$("#cb1selectall").click(function () { | ||||
|             //    $('.cb1').attr('checked', this.checked); | ||||
|             //}); | ||||
|             //$(".cb1").click(function(){ | ||||
|             //    if($(".cb1:checked").length == 7) { | ||||
|             //        $("#cb1selectall").attr("checked", "checked"); | ||||
|             //    } else { | ||||
|             //        $("#cb1selectall").removeAttr("checked"); | ||||
|             //    } | ||||
|             //}); | ||||
|  | ||||
|             //var days = [ | ||||
|             //    {v:"*",t:"every day"}, | ||||
|             //    {v:"1-5",t:"Mondays to Fridays"}, | ||||
|             //    {v:"0,6",t:"Saturdays and Sundays"}, | ||||
|             //    {v:"1",t:"Mondays"}, | ||||
|             //    {v:"2",t:"Tuesdays"}, | ||||
|             //    {v:"3",t:"Wednesdays"}, | ||||
|             //    {v:"4",t:"Thursdays"}, | ||||
|             //    {v:"5",t:"Fridays"}, | ||||
|             //    {v:"6",t:"Saturdays"}, | ||||
|             //    {v:"0",t:"Sundays"} | ||||
|             //]; | ||||
|  | ||||
|             //$(".inject-time-days").each(function() { | ||||
|             //    for (var d in days) { | ||||
|             //        $(this).append($("<option></option>").val(days[d].v).text(days[d].t)); | ||||
|             //    } | ||||
|             //}); | ||||
|  | ||||
|             $(".inject-time-times").each(function() { | ||||
|                 for (var i=0;i<24;i++) { | ||||
|                     var l = (i<10?"0":"")+i+":00"; | ||||
|                     $(this).append($("<option></option>").val(i).text(l)); | ||||
|                 } | ||||
|             }); | ||||
|  | ||||
|             $(".inject-time-count").spinner({ | ||||
|                 //max:60, | ||||
|                 min:1 | ||||
|             }); | ||||
|  | ||||
|             $("#inject-time-interval-units").change(function() { | ||||
|                 var units = $("#inject-time-interval-units option:selected").val(); | ||||
|                 //$("#inject-time-interval-days").prop("disabled",(units == "s")?"disabled":false); | ||||
|                 //$(".inject-time-count").spinner("option","max",(units == "h")?24:60); | ||||
|             }); | ||||
|  | ||||
|             $.widget( "ui.injecttimespinner", $.ui.spinner, { | ||||
|                 options: { | ||||
|                     // seconds | ||||
|                     step: 60 * 1000, | ||||
|                     // hours | ||||
|                     page: 60 | ||||
|                 }, | ||||
|                 _parse: function( value ) { | ||||
|                     if ( typeof value === "string" ) { | ||||
|                         // already a timestamp | ||||
|                         if ( Number( value ) == value ) { | ||||
|                             return Number( value ); | ||||
|                         } | ||||
|                         var p = value.split(":"); | ||||
|                         var offset = new Date().getTimezoneOffset(); | ||||
|                         return (((Number(p[0])+1)*60)+Number(p[1])+offset)*60*1000; | ||||
|                     } | ||||
|                     return value; | ||||
|                 }, | ||||
|                 _format: function( value ) { | ||||
|                     var d = new Date(value); | ||||
|                     var h = d.getHours(); | ||||
|                     var m = d.getMinutes(); | ||||
|                     return ((h < 10)?"0":"")+h+":"+((m < 10)?"0":"")+m; | ||||
|                 } | ||||
|             }); | ||||
|  | ||||
|             $("#inject-time-time").injecttimespinner(); | ||||
|  | ||||
|             var repeattype = "none"; | ||||
|             if (this.repeat != "" && this.repeat != 0) { | ||||
|                 repeattype = "interval"; | ||||
|                 var r = "s"; | ||||
|                 var c = this.repeat; | ||||
|                 if (this.repeat % 60 === 0) { r = "m"; c = c/60; } | ||||
|                 } | ||||
|             }); | ||||
|  | ||||
|             $("#inject-time-time").injecttimespinner(); | ||||
|  | ||||
|             var repeattype = "none"; | ||||
|             if (this.repeat != "" && this.repeat != 0) { | ||||
|                 repeattype = "interval"; | ||||
|                 var r = "s"; | ||||
|                 var c = this.repeat; | ||||
|                 if (this.repeat % 60 === 0) { r = "m"; c = c/60; } | ||||
|                 if (this.repeat % 1440 === 0) { r = "h"; c = c/60; } | ||||
|                 $("#inject-time-interval-count").val(c); | ||||
|                 $("#inject-time-interval-units").val(r); | ||||
|                 //$("#inject-time-interval-units option").filter(function() {return $(this).val() == "s";}).attr('selected',true); | ||||
|                 $("#inject-time-interval-days").prop("disabled","disabled"); | ||||
|             } else if (this.crontab) { | ||||
|                 var cronparts = this.crontab.split(" "); | ||||
|                 var days = cronparts[4]; | ||||
|                 if (!isNaN(cronparts[0]) && !isNaN(cronparts[1])) { | ||||
|                     repeattype = "time"; | ||||
|                     // Fixed time | ||||
|                     var time = cronparts[1]+":"+cronparts[0]; | ||||
|                     $("#inject-time-time").val(time); | ||||
|                     $("#inject-time-type-select option").filter(function() {return $(this).val() == "s";}).attr('selected',true); | ||||
|                     $("#inject-time-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true); | ||||
|                 } | ||||
|                 $("#inject-time-interval-count").val(c); | ||||
|                 $("#inject-time-interval-units").val(r); | ||||
|                 //$("#inject-time-interval-units option").filter(function() {return $(this).val() == "s";}).attr('selected',true); | ||||
|                 $("#inject-time-interval-days").prop("disabled","disabled"); | ||||
|             } else if (this.crontab) { | ||||
|                 var cronparts = this.crontab.split(" "); | ||||
|                 var days = cronparts[4]; | ||||
|                 if (!isNaN(cronparts[0]) && !isNaN(cronparts[1])) { | ||||
|                     repeattype = "time"; | ||||
|                     // Fixed time | ||||
|                     var time = cronparts[1]+":"+cronparts[0]; | ||||
|                     $("#inject-time-time").val(time); | ||||
|                     $("#inject-time-type-select option").filter(function() {return $(this).val() == "s";}).attr('selected',true); | ||||
|                     //$("#inject-time-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true); | ||||
|                     if (days == "*") { days = "1,2,3,4,5,6,0"; } | ||||
|                     var daya = days.split(","); | ||||
|                     for(var i = 0; i < daya.length; i++) { | ||||
|                         $("#inject-time-time-days [value=" + daya[i] + "]").attr("checked", "checked"); | ||||
|                     } | ||||
|  | ||||
|               } | ||||
|                 //else if (cronparts[0] == "0") { | ||||
|                 //    // interval - hours | ||||
|                 //    var hours = cronparts[1].slice(2); | ||||
| @@ -274,20 +314,26 @@ | ||||
|                 //    $("#inject-time-interval-units option").filter(function() {return $(this).val() == "m";}).attr('selected',true); | ||||
|                 //} | ||||
|                 else { | ||||
|                     repeattype = "interval-time"; | ||||
|                     // interval - time period | ||||
|                     var minutes = cronparts[0].slice(2); | ||||
|                     repeattype = "interval-time"; | ||||
|                     // interval - time period | ||||
|                     var minutes = cronparts[0].slice(2); | ||||
|                     if (minutes === "") { minutes = "0"; } | ||||
|                     $("#inject-time-interval-time-units").val(minutes); | ||||
|                     $("#inject-time-interval-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true); | ||||
|                     var time = cronparts[1]; | ||||
|                     var timeparts = time.split(","); | ||||
|                     var start; | ||||
|                     var end; | ||||
|                     if (timeparts.length == 1) { | ||||
|                         // 0 or 0-10 | ||||
|                         var hours = timeparts[0].split("-"); | ||||
|                         if (hours.length == 1) { | ||||
|                     $("#inject-time-interval-time-units").val(minutes); | ||||
|                     //$("#inject-time-interval-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true); | ||||
|                     if (days == "*") { days = "1,2,3,4,5,6,0"; } | ||||
|                     var daya = days.split(","); | ||||
|                     for(var i = 0; i < daya.length; i++) { | ||||
|                         $("#inject-time-interval-time-days [value=" + daya[i] + "]").attr("checked", "checked"); | ||||
|                     } | ||||
|  | ||||
|                     var time = cronparts[1]; | ||||
|                     var timeparts = time.split(","); | ||||
|                     var start; | ||||
|                     var end; | ||||
|                     if (timeparts.length == 1) { | ||||
|                         // 0 or 0-10 | ||||
|                         var hours = timeparts[0].split("-"); | ||||
|                         if (hours.length == 1) { | ||||
|                             if (hours[0] === "") { | ||||
|                                 start = "0"; | ||||
|                                 end = "0"; | ||||
| @@ -296,150 +342,160 @@ | ||||
|                                 start = hours[0]; | ||||
|                                 end = Number(hours[0])+1; | ||||
|                             } | ||||
|                         } else { | ||||
|                             start = hours[0]; | ||||
|                             end = (Number(hours[1])+1)%24; | ||||
|                         } | ||||
|                     } else { | ||||
|                         // 23,0 or 17-23,0-10 or 23,0-2 or 17-23,0 | ||||
|                         var startparts = timeparts[0].split("-"); | ||||
|                         start = startparts[0]; | ||||
|  | ||||
|                         var endparts = timeparts[1].split("-"); | ||||
|                         if (endparts.length == 1) { | ||||
|                             end = Number(endparts[0])+1; | ||||
|                         } else { | ||||
|                             end = Number(endparts[1])+1; | ||||
|                         } | ||||
|                     } | ||||
|                     $("#inject-time-interval-time-start option").filter(function() {return $(this).val() == start;}).attr('selected',true); | ||||
|                     $("#inject-time-interval-time-end option").filter(function() {return $(this).val() == end;}).attr('selected',true); | ||||
|  | ||||
|                 } | ||||
|             } else { | ||||
|                 $("#inject-time-type-select option").filter(function() {return $(this).val() == "none";}).attr('selected',true); | ||||
|             } | ||||
|  | ||||
|             $(".inject-time-row").hide(); | ||||
|             $("#inject-time-type-select option").filter(function() {return $(this).val() == repeattype;}).attr('selected',true); | ||||
|             $("#inject-time-row-"+repeattype).show(); | ||||
|  | ||||
|             if (this.payloadType == null) { | ||||
|                 if (this.payload == "") { | ||||
|                     this.payloadType = "date"; | ||||
|                 } else { | ||||
|                     this.payloadType = "string"; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             $("#node-input-payloadType").change(function() { | ||||
|                 var id = $("#node-input-payloadType option:selected").val(); | ||||
|                         } else { | ||||
|                             start = hours[0]; | ||||
|                             end = (Number(hours[1])+1)%24; | ||||
|                         } | ||||
|                     } else { | ||||
|                         // 23,0 or 17-23,0-10 or 23,0-2 or 17-23,0 | ||||
|                         var startparts = timeparts[0].split("-"); | ||||
|                         start = startparts[0]; | ||||
|  | ||||
|                         var endparts = timeparts[1].split("-"); | ||||
|                         if (endparts.length == 1) { | ||||
|                             end = Number(endparts[0])+1; | ||||
|                         } else { | ||||
|                             end = Number(endparts[1])+1; | ||||
|                         } | ||||
|                     } | ||||
|                     $("#inject-time-interval-time-start option").filter(function() {return $(this).val() == start;}).attr('selected',true); | ||||
|                     $("#inject-time-interval-time-end option").filter(function() {return $(this).val() == end;}).attr('selected',true); | ||||
|  | ||||
|                 } | ||||
|             } else { | ||||
|                 $("#inject-time-type-select option").filter(function() {return $(this).val() == "none";}).attr('selected',true); | ||||
|             } | ||||
|  | ||||
|             $(".inject-time-row").hide(); | ||||
|             $("#inject-time-type-select option").filter(function() {return $(this).val() == repeattype;}).attr('selected',true); | ||||
|             $("#inject-time-row-"+repeattype).show(); | ||||
|  | ||||
|             if (this.payloadType == null) { | ||||
|                 if (this.payload == "") { | ||||
|                     this.payloadType = "date"; | ||||
|                 } else { | ||||
|                     this.payloadType = "string"; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             $("#node-input-payloadType").change(function() { | ||||
|                 var id = $("#node-input-payloadType option:selected").val(); | ||||
|                 if (id === "string") { | ||||
|                     $("#node-input-row-payload").show(); | ||||
|                 } else { | ||||
|                     $("#node-input-row-payload").hide(); | ||||
|                 } | ||||
|             }); | ||||
|             $("#node-input-payloadType").val(this.payloadType); | ||||
|             $("#node-input-payloadType").change(); | ||||
|             $("#inject-time-type-select").change(); | ||||
|  | ||||
|         }, | ||||
|         oneditsave: function() { | ||||
|             var repeat = ""; | ||||
|             var crontab = ""; | ||||
|             var type = $("#inject-time-type-select option:selected").val(); | ||||
|             if (type == "none") { | ||||
|                 // nothing | ||||
|             } else if (type == "interval") { | ||||
|                 var count = $("#inject-time-interval-count").val(); | ||||
|                 var units = $("#inject-time-interval-units option:selected").val(); | ||||
|                 var days = $("#inject-time-interval-days option:selected").val(); | ||||
|                 if (units == "s") { | ||||
|                     repeat = count; | ||||
|                 } else { | ||||
|                     if (units == "m") { | ||||
|                         //crontab = "*/"+count+" * * * "+days; | ||||
|                         repeat = count * 60; | ||||
|                     } else if (units == "h") { | ||||
|                         //crontab = "0 */"+count+" * * "+days; | ||||
|                     $("#node-input-row-payload").show(); | ||||
|                 } else { | ||||
|                     $("#node-input-row-payload").hide(); | ||||
|                 } | ||||
|             }); | ||||
|             $("#node-input-payloadType").val(this.payloadType); | ||||
|             $("#node-input-payloadType").change(); | ||||
|             $("#inject-time-type-select").change(); | ||||
|  | ||||
|         }, | ||||
|         oneditsave: function() { | ||||
|             var repeat = ""; | ||||
|             var crontab = ""; | ||||
|             var type = $("#inject-time-type-select option:selected").val(); | ||||
|             if (type == "none") { | ||||
|                 // nothing | ||||
|             } else if (type == "interval") { | ||||
|                 var count = $("#inject-time-interval-count").val(); | ||||
|                 var units = $("#inject-time-interval-units option:selected").val(); | ||||
|                 //var days = $("#inject-time-interval-days option:selected").val(); | ||||
|                 if (units == "s") { | ||||
|                     repeat = count; | ||||
|                 } else { | ||||
|                     if (units == "m") { | ||||
|                         //crontab = "*/"+count+" * * * "+days; | ||||
|                         repeat = count * 60; | ||||
|                     } else if (units == "h") { | ||||
|                         //crontab = "0 */"+count+" * * "+days; | ||||
|                         repeat = count * 60 * 60; | ||||
|                     } | ||||
|                 } | ||||
|             } else if (type == "interval-time") { | ||||
|                 var count = $("#inject-time-interval-time-units").val(); | ||||
|                 var startTime = Number($("#inject-time-interval-time-start option:selected").val()); | ||||
|                 var endTime = Number($("#inject-time-interval-time-end option:selected").val()); | ||||
|                 var days = $("#inject-time-interval-time-days option:selected").val(); | ||||
|                 var timerange = "*"; | ||||
|                 if (startTime == endTime) { | ||||
|                     //TODO: invalid | ||||
|                     repeat = ""; | ||||
|                     crontab = ""; | ||||
|                 } else if (endTime == 0) { | ||||
|                     timerange = startTime+"-23"; | ||||
|                 } else if (startTime+1 < endTime) { | ||||
|                     timerange = startTime+"-"+(endTime-1); | ||||
|                 } else if (startTime+1 == endTime) { | ||||
|                     timerange = startTime; | ||||
|                 } else { | ||||
|                     var startpart = ""; | ||||
|                     var endpart = ""; | ||||
|                     if (startTime == 23) { | ||||
|                         startpart = "23"; | ||||
|                     } else { | ||||
|                         startpart = startTime+"-23"; | ||||
|                     } | ||||
|                     if (endTime == 1) { | ||||
|                         endpart = "0"; | ||||
|                     } else { | ||||
|                         endpart = "0-"+(endTime-1); | ||||
|                     } | ||||
|                     timerange = startpart+","+endpart; | ||||
|                 } | ||||
|                 repeat = ""; | ||||
|                     } | ||||
|                 } | ||||
|             } else if (type == "interval-time") { | ||||
|                 var count = $("#inject-time-interval-time-units").val(); | ||||
|                 var startTime = Number($("#inject-time-interval-time-start option:selected").val()); | ||||
|                 var endTime = Number($("#inject-time-interval-time-end option:selected").val()); | ||||
|                 //var days = $("#inject-time-interval-time-days option:selected").val(); | ||||
|                 var days = $('.cb1:checked').map(function(_, el) { | ||||
|                     return $(el).val() | ||||
|                 }).get(); | ||||
|                 if (days.length == 7) { days="*"; } | ||||
|                 else { days = days.join(","); } | ||||
|                 var timerange = ""; | ||||
|                 if (startTime == endTime) { | ||||
|                     //TODO: invalid | ||||
|                     repeat = ""; | ||||
|                     crontab = ""; | ||||
|                 } else if (endTime == 0) { | ||||
|                     timerange = startTime+"-23"; | ||||
|                 } else if (startTime+1 < endTime) { | ||||
|                     timerange = startTime+"-"+(endTime-1); | ||||
|                 } else if (startTime+1 == endTime) { | ||||
|                     timerange = startTime; | ||||
|                 } else { | ||||
|                     var startpart = ""; | ||||
|                     var endpart = ""; | ||||
|                     if (startTime == 23) { | ||||
|                         startpart = "23"; | ||||
|                     } else { | ||||
|                         startpart = startTime+"-23"; | ||||
|                     } | ||||
|                     if (endTime == 1) { | ||||
|                         endpart = "0"; | ||||
|                     } else { | ||||
|                         endpart = "0-"+(endTime-1); | ||||
|                     } | ||||
|                     timerange = startpart+","+endpart; | ||||
|                 } | ||||
|                 repeat = ""; | ||||
|                 if (count === "0") { | ||||
|                     crontab = count+" "+timerange+" * * "+days; | ||||
|                 } | ||||
|                 else { | ||||
|                     crontab = "*/"+count+" "+timerange+" * * "+days; | ||||
|                 } | ||||
|             } else if (type == "time") { | ||||
|                 var time = $("#inject-time-time").val(); | ||||
|                 var days = $("#inject-time-time-days option:selected").val(); | ||||
|                 var parts = time.split(":"); | ||||
|                 repeat = ""; | ||||
|                 crontab = parts[1]+" "+parts[0]+" * * "+days; | ||||
|             } | ||||
|  | ||||
|             $("#node-input-repeat").val(repeat); | ||||
|             $("#node-input-crontab").val(crontab); | ||||
|  | ||||
|         }, | ||||
|         button: { | ||||
|             onclick: function() { | ||||
|                 var label = (this.name||this.payload).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">"); | ||||
|             } else if (type == "time") { | ||||
|                 var time = $("#inject-time-time").val(); | ||||
|                 //var days = $("#inject-time-time-days option:selected").val(); | ||||
|                 var days = $('.cb2:checked').map(function(_, el) { | ||||
|                     return $(el).val() | ||||
|                 }).get(); | ||||
|                 if (days.length == 7) { days="*"; } | ||||
|                 else { days = days.join(","); } | ||||
|                 var parts = time.split(":"); | ||||
|                 repeat = ""; | ||||
|                 crontab = parts[1]+" "+parts[0]+" * * "+days; | ||||
|             } | ||||
|  | ||||
|             $("#node-input-repeat").val(repeat); | ||||
|             $("#node-input-crontab").val(crontab); | ||||
|  | ||||
|         }, | ||||
|         button: { | ||||
|             onclick: function() { | ||||
|                 var label = (this.name||this.payload).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">"); | ||||
|                 if (this.payloadType === "date") { label = "timestamp"; } | ||||
|                 if (this.payloadType === "none") { label = "blank"; } | ||||
|                 d3.xhr("inject/"+this.id).post(function(err,resp) { | ||||
|                         if (err) { | ||||
|                             if (err.status == 404) { | ||||
|                                 RED.notify("<strong>Error</strong>: inject node not deployed","error"); | ||||
|                             } else if (err.status == 500) { | ||||
|                                 RED.notify("<strong>Error</strong>: inject failed, see log for details.","error"); | ||||
|                             } else if (err.status == 0) { | ||||
|                                 RED.notify("<strong>Error</strong>: no response from server","error"); | ||||
|                             } else { | ||||
|                                 RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error"); | ||||
|                             } | ||||
|                         } else if (resp.status == 200) { | ||||
|                             RED.notify("Successfully injected: "+label,"success"); | ||||
|                         } else { | ||||
|                             RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error"); | ||||
|                         } | ||||
|                 }); | ||||
|             } | ||||
|         } | ||||
|     }); | ||||
|  | ||||
| </script> | ||||
|                 d3.xhr("inject/"+this.id).post(function(err,resp) { | ||||
|                         if (err) { | ||||
|                             if (err.status == 404) { | ||||
|                                 RED.notify("<strong>Error</strong>: inject node not deployed","error"); | ||||
|                             } else if (err.status == 500) { | ||||
|                                 RED.notify("<strong>Error</strong>: inject failed, see log for details.","error"); | ||||
|                             } else if (err.status == 0) { | ||||
|                                 RED.notify("<strong>Error</strong>: no response from server","error"); | ||||
|                             } else { | ||||
|                                 RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error"); | ||||
|                             } | ||||
|                         } else if (resp.status == 200) { | ||||
|                             RED.notify("Successfully injected: "+label,"success"); | ||||
|                         } else { | ||||
|                             RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error"); | ||||
|                         } | ||||
|                 }); | ||||
|             } | ||||
|         } | ||||
|     }); | ||||
|  | ||||
| </script> | ||||
|   | ||||
| @@ -15,6 +15,7 @@ | ||||
|  **/ | ||||
|  | ||||
| module.exports = function(RED) { | ||||
|     "use strict"; | ||||
|     var cron = require("cron"); | ||||
|  | ||||
|     function InjectNode(n) { | ||||
| @@ -54,7 +55,7 @@ module.exports = function(RED) { | ||||
|  | ||||
|         this.on("input",function(msg) { | ||||
|             var msg = {topic:this.topic}; | ||||
|             if ( (this.payloadType == null && this.payload == "") || this.payloadType == "date") { | ||||
|             if ( (this.payloadType == null && this.payload === "") || this.payloadType === "date") { | ||||
|                 msg.payload = Date.now(); | ||||
|             } else if (this.payloadType == null || this.payloadType === "string") { | ||||
|                 msg.payload = this.payload; | ||||
|   | ||||
| @@ -42,7 +42,7 @@ body { | ||||
|     display: none; | ||||
| } | ||||
| #dropTarget div { | ||||
|     display: table-cell;  | ||||
|     display: table-cell; | ||||
|     vertical-align: middle; | ||||
|     text-align: center; | ||||
|     font-size: 40px; | ||||
| @@ -292,7 +292,7 @@ li.open #btn-sidemenu { | ||||
|     padding: 5px; | ||||
|     overflow-y: auto; | ||||
|     box-sizing:border-box; | ||||
|     -moz-box-sizing: border-box;     | ||||
|     -moz-box-sizing: border-box; | ||||
| } | ||||
| .palette-spinner { | ||||
|     padding-top: 40px; | ||||
| @@ -310,7 +310,7 @@ li.open #btn-sidemenu { | ||||
|     padding: 3px; | ||||
|     border-top: 1px solid #999; | ||||
|     box-sizing:border-box; | ||||
|     -moz-box-sizing: border-box;     | ||||
|     -moz-box-sizing: border-box; | ||||
| } | ||||
| #palette-search i.fa-search { | ||||
|     position: absolute; | ||||
| @@ -339,9 +339,9 @@ li.open #btn-sidemenu { | ||||
|     margin: 0px; | ||||
|     height: 30px; | ||||
|     box-sizing:border-box; | ||||
|     -moz-box-sizing: border-box;     | ||||
|      | ||||
|     -moz-box-sizing: border-box; | ||||
| } | ||||
|  | ||||
| #palette-search input:focus { | ||||
|     border: none; | ||||
|     box-shadow: none; | ||||
| @@ -412,7 +412,7 @@ li.open #btn-sidemenu { | ||||
|    top:8px; | ||||
|    left: -5px; | ||||
|    box-sizing: border-box; | ||||
|     -moz-box-sizing: border-box;     | ||||
|     -moz-box-sizing: border-box; | ||||
|    background:#d9d9d9; | ||||
|    border-radius: 3px; | ||||
|    width: 10px; | ||||
| @@ -431,7 +431,7 @@ li.open #btn-sidemenu { | ||||
| #sidebar { | ||||
|     background: #fff; | ||||
|     box-sizing: border-box; | ||||
|     -moz-box-sizing: border-box;     | ||||
|     -moz-box-sizing: border-box; | ||||
| } | ||||
| #sidebar.closing { | ||||
|     background: #eee; | ||||
| @@ -760,6 +760,16 @@ g.link_unknown path.link_line { | ||||
| .form-row input { | ||||
|     width:70%; | ||||
| } | ||||
| .form-row label .cb1 { | ||||
|     display: inline !important; | ||||
|     width: auto !important; | ||||
|     vertical-align: top !important; | ||||
| } | ||||
| .form-row label .cb2 { | ||||
|     display: inline !important; | ||||
|     width: auto !important; | ||||
|     vertical-align: top !important; | ||||
| } | ||||
|  | ||||
| input.input-append-left { | ||||
|     border-top-right-radius: 0px; | ||||
| @@ -1019,7 +1029,7 @@ ul.red-ui-tabs li { | ||||
| } | ||||
|  | ||||
| ul.red-ui-tabs li a.red-ui-tab-label { | ||||
|     display: block;  | ||||
|     display: block; | ||||
|     padding: 3px 16px; | ||||
|     color: #666; | ||||
| } | ||||
| @@ -1224,7 +1234,7 @@ i.spinner { | ||||
| #header ul.dropdown-menu li.disabled a { | ||||
|     color: #666; | ||||
| } | ||||
|      | ||||
|  | ||||
| /* Deploy menu customisations */ | ||||
| #header ul#btn-deploy-options-submenu { | ||||
|     width: 300px !important; | ||||
| @@ -1241,5 +1251,3 @@ i.spinner { | ||||
| #header ul#btn-deploy-options-submenu li a > i.fa { | ||||
|     display: none !important; | ||||
| } | ||||
|  | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user