Changeset 6393 for trunk/prototype/modules/calendar

Timestamp:

06/02/12 17:33:39 (12 years ago)

Author:

acoutinho

Message:

Ticket #2831 - Implementação ao suporte a repetição de eventos

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (1 diff)
• js/helpers.js (modified) (2 diffs)
• templates/alarms_add_itemlist.ejs (modified) (1 diff)
• templates/event_add.ejs (modified) (1 diff)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -261 +261 @@
             Controller::begin(array('service' => 'PostgreSQL'));
 
-            foreach ($result as $id => $res)
-                Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,occurrence)VALUES('" . $id . "','" . implode("'),('" . $id . "', '", $res) . "')");
-
+            foreach ($result as $id => $res){
+                
+                $ocurrences = array_unique($res);
+                Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,occurrence)VALUES('" . $id . "','" . implode("'),('" . $id . "', '", $ocurrences) . "')");
+            }
             $data = array();
 

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

@@ -1411 +1411 @@
 
         if(!!data.result && data.result != "[]"){
-            var newAttach = jQuery.parseJSON(data.result);
+            var newAttach = (attch = jQuery.parseJSON(data.result)) ? attch : jQuery.parseJSON(data.result[0].activeElement.childNodes[0].data);
             $('.attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>');
             currentUpload.removeClass('on-complete').parents('p')
@@ -1421 +1421 @@
 });
 $('.attachments-list .button').button();
-                        
+
+if(!!window.FormData)                   
 $('#fileupload').bind('fileuploadstart', function () {
     var widget = $(this),

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

@@ -6 +6 @@
                                 <option value="alert" <%= data.alarm.defaultAlarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option>
                                 <option value="mail" <%= data.alarm.defaultAlarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option>
-                                <option value="sms" <%= data.alarm.defaultAlarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>
+                                <!--<option value="sms" <%= data.alarm.defaultAlarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>-->
                         </select>
                         <input type="text" name="alarmTime[]" class="number input-small" value="<%= data.alarm.defaultAlarms[i].time %>"/>

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

@@ -9 +9 @@
                                 <input type="hidden" class="id-event" name="idEvent" value="<%= data.event.id %>"/>
                         <% } %>
-                        <% if( data.event.calendar ){ %>
+                        <% if( data.event.id && data.event.calendar ){ %>
                                 <input type="hidden" class="last-calendar" name="lastCalendar" value="<%= data.event.calendar %>"/>
                         <% } %>