rrule_form 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf30ec8c9745d204e257047c7e846ea570d79fccb5f18ac43f32cdb9675c7b8a
-  data.tar.gz: 8ba35beec8be23eb8b1fca990076f28ad97692d1bff0b24ac9de6306f2ce584d
+  metadata.gz: d6e44b398b3745126a3b90ac25168e2e72159d0745a14cafd7895d073ce66b5c
+  data.tar.gz: '08587ef3e571304e3d88b67c972a64c783d49d1e1a6bb7340c4670164d5e9759'
 SHA512:
-  metadata.gz: ab82d07a8d374f00e4242e37556ce106d2c0115c9b61419499fad3c58bb2611c6a4b1b66cfc6944ecb51fe23ec1e7e9528af5a718a0f0a21b5f45d40e7ee2b62
-  data.tar.gz: 03e76a17ccc26ebb0443895fd396360bf942e37b2d1fef8d653341262b165ff0ce81d8bcffe58445c680f779d9f9ac85bc7a1ce6e128d87dd1d737dd69ab7b38
+  metadata.gz: 938c8deebe3b9a61b28e1637fcf0bd29f0ef0cc7d69275eee5932da91572095c3f2da8a630a638ab086fe88c6339ad06eba91f86993722019368043d3c28617c
+  data.tar.gz: 45c7a1aba37e64cae59e81144c639ee7ec5f3c227f90f230a4a8427f51b760b1675b4c3f244415e308d70512208908e17f6d56a96d4e9c7987ed5bca54a8a01c

data/app/views/rrule/_rrule_form.html.erb

@@ -119,7 +119,12 @@
               </div>
               <div id="until-rules" style="display:none;">
                  <p>Until</p>
-                 <p> <label for="count-select"><input type="radio" name="end-select" value="count" id="count-select" checked="checked"/> How many times does this transaction occur?
+                 <p>
+                   <label for="forever-select">
+                     <input type="radio" name="end-select" value="never" id="count-select"/> Forever
+                   </label>
+                 </p>
+                 <p> <label for="count-select"><input type="radio" name="end-select" value="count" checked="checked" id="count-select"/> How many times does this transaction occur?
                     <input autocomplete="off" type="number" name="count" min="1" max="50" value="1" step="1"/> Time(s)</label>
                  </p>
                  <p><label for="until-select"><input type="radio" name="end-select" value="until" id="until-select" /> Specific Date (aka until)

data/lib/rrule_form/version.rb

@@ -1,3 +1,3 @@
 module RruleForm
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/vendor/assets/javascripts/rrule-gui.js

@@ -41,7 +41,6 @@ RruleForm = {
                 }
                 recur[temp[0]] = temp[1];
             }
-            console.log(recur);
 
             // See if the recurring rule has enough valid parts
             if (recur.FREQ && recur.DTSTART && (recur.COUNT || recur.UNTIL)) {
@@ -375,11 +374,6 @@ RruleForm = {
         // Produce RRULE state to feed to rrule.js
         rruleObj = "";
 
-        // Check to be sure there is a count value or until date selected
-        if (recurringRule.count == "" && recurringRule.until == "") {
-            // No end in sight, make it default to 1 occurence
-            recurringRule.count = "1";
-        }
         for (var key in recurringRule) {
             if (recurringRule.hasOwnProperty(key)) {
                 if (recurringRule[key] != '') {
@@ -821,6 +815,11 @@ RruleForm = {
                         recurringRule.count = '';
                         // Set until variable
                         recurringRule.until = $('#end-date-hidden').val();
+                    } else if ($(this).val() == 'never') {
+                        // Set count and until as null for never rule
+
+                        recurringRule.count = ''
+                        recurringRule.until = ''
                     }
                 } else {
                     //disable the inputs not selected.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrule_form
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ravi-ture
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails