Changeset 6346 for trunk

Timestamp:

05/29/12 23:23:50 (12 years ago)

Author:

acoutinho

Message:

Ticket #2813 - Implementação da repetição inconsistente

Location:

trunk/prototype

Files:

• modules/calendar/js/calendar.codecs.js (modified) (1 diff)
• modules/calendar/js/helpers.js (modified) (4 diffs)
• modules/calendar/templates/event_repeat.ejs (modified) (3 diffs)
• services/iCal.php (modified) (2 diffs)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -747 +747 @@
     patati['bymonthday'] = patati['byyearday'] = patati['byday'] = '';
         
-    patati['interval'] = patati['endTime'] = patati['count'] = patati['startTime'] = 0;
+    patati['interval'] = 1 ,
+    
+    patati['endTime'] = patati['count'] = patati['startTime'] = 0;
         
     if( form.frequency === 'none' )

trunk/prototype/modules/calendar/js/helpers.js

@@ -62 +62 @@
         if (!eventInterval.length)
             return 'Por favor, informe o intervalo';
-        else if (parseInt(eventInterval,10) < 0 || parseInt(eventInterval,10).toString() == "NaN")
+        else if (parseInt(eventInterval,10) < 1 || parseInt(eventInterval,10).toString() == "NaN")
             return 'Por favor informe um valor válido para o intervalo';
     }    
@@ -492 +492 @@
                 case "daily":
                     $(".event-repeat-container:last").find(".repeat-in").find(".interval").html("Dia(s)")
-                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "0" );
+                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "1" );
                     $(".frequency option[value='daily']").attr('selected', 'selected');
                     break;
                 case "weekly":
                     $(".event-repeat-container:last").find(".repeat-in").find(".interval").html("Semana(s)")
-                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "0" );
+                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "1" );
                     $(".frequency option[value='weekly']").attr('selected', 'selected');
                                             
@@ -513 +513 @@
                 case "monthly":
                     $(".event-repeat-container:last").find(".repeat-in").find(".interval").html("Mes(s)")
-                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "0" );
+                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "1" );
                     $(".frequency option[value='monthly']").attr('selected', 'selected')
                     $(".event-repeat-monthly:last").removeClass("hidden").find("input[type=radio][name=repeatmonthyType]").click(function(){
@@ -528 +528 @@
                 case "yearly":
                     $(".event-repeat-container:last").find(".repeat-in").find(".interval").html("Ano(s)")
-                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "0" );
+                    .end().find(".eventInterval").val( objEvent.repeat['interval'] || "1" );
                     $(".frequency option[value='yearly']").attr('selected', 'selected')
                     break;      

trunk/prototype/modules/calendar/templates/event_repeat.ejs

@@ -19 +19 @@
         <p class="input-group event-repeat-monthly hidden frequency-option"> 
                 <label>Mensalmente por </label>
-                <input type="radio" name="repeatmonthyType" value="0">
+                <input type="radio" name="repeatmonthyType" value="1">
                 <label for="repeatmonthyType">dia do mês</label>
 
@@ -70 +70 @@
                             <option value="occurrences">Termina Após n Ocorrencias</option>
                         </select>
-                                                <input type="text" name="end" class="date customDateEnd hidden">
+                        <input type="text" name="end" class="date customDateEnd hidden">
                         <input type="text" name="occurrences" class="tiny number occurrencesEnd hidden">
                         <label name="occurrences" class="hidden">Ocorrências</label>
@@ -78 +78 @@
                 <span class="input-group">
                         <label>Tendo intervalo de</label>
-                        <input type="text" name="" class="tiny number eventInterval" value="0">
+                        <input type="text" name="" class="tiny number eventInterval" value="1">
                         <label class="interval"></label>
                 </span>

trunk/prototype/services/iCal.php

@@ -34 +34 @@
             switch ($v['type']) {
                 case EVENT_ID:
-
                     $vevent = $ical->newComponent('vevent');
 
@@ -63 +62 @@
                                     $repeat['until'] = $time->format(DATE_RFC822);
                                 } else if ($ir == 'count')
+                                    $repeat[$ir] = $rv;
+                                else if ($ir == 'interval')
                                     $repeat[$ir] = $rv;
                                 else if ($ir !== 'schedulable' && $ir !== 'id' && $ir !== 'startTime')