Changeset 7602

Timestamp:

12/04/12 10:32:30 (11 years ago)

Author:

acoutinho

Message:

Ticket #3215 - Problema com salvamento de um evento com repetição mensal

Location:

trunk/prototype/modules/calendar

Files:

• js/helpers.js (modified) (2 diffs)
• templates/event_repeat.ejs (modified) (1 diff)

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

@@ -601 +601 @@
                     $(".event-repeat-container:last").find(".repeat-in").find(".interval").html("Semana(s)")
                     .end().find(".eventInterval").val( objEvent.repeat['interval'] || "1" );
+                    
                     $(".frequency option[value='weekly']").attr('selected', 'selected');
                                             
@@ -617 +618 @@
                     $(".event-repeat-container:last").find(".repeat-in").find(".interval").html("Mes(s)")
                     .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(){
-                        if($("input[type=radio][name=repeatmonthyType]:checked").val() == "1")
-                            $(".event-repeat-weekly:last").removeClass("hidden");
-                        else
-                            $(".event-repeat-weekly:last").addClass("hidden");
+                                if($("input[type=radio][name=repeatmonthyType]:checked").val() == "1")
+                                    $(".event-repeat-weekly:last").removeClass("hidden");
+                                else
+                                    $(".event-repeat-weekly:last").addClass("hidden");
                     });
+                    
+                                            
+                        if( objEvent.repeat && objEvent.repeat.bymonthday != ''){
+
+                                $("input[type=radio][name=repeatmonthyType][value=0]").attr('checked', 'checked');
+
+                        }else if(objEvent.repeat){
+
+                                $("input[type=radio][name=repeatmonthyType][value=1]").attr('checked', 'checked');
+
+                                var days = objEvent.repeat.byday.split(',');
+
+                                $.each(days, function(i, e){
+                                        $(".event-repeat-weekly:last").find('input[name="repeatweekly[]"][value="'+e+'"]').attr('checked', 'checked');
+                                });
+
+                        }
+
+
                     if($("input[type=radio][name=repeatmonthyType]:checked").val() == "1")
-                        $(".event-repeat-weekly:last").removeClass("hidden");
+                                $(".event-repeat-weekly:last").removeClass("hidden");
                     else
-                        $(".event-repeat-weekly:last").addClass("hidden");
+                                $(".event-repeat-weekly:last").addClass("hidden");
                     break;
                 case "yearly":

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="1">
+                <input type="radio" name="repeatmonthyType" value="0">
                 <label for="repeatmonthyType">dia do mês</label>