Changeset 5652 for trunk/prototype/modules/calendar
- Timestamp:
- 03/07/12 00:06:34 (13 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r5641 r5652 42 42 $schedulable = Controller::read( array( 'concept' => 'schedulable' , 'id' => $participant['schedulable'] ) , array('startTime' , 'endTime' ) ); 43 43 44 45 /* 46 if(!is_numeric($params['startTime']) ) 47 $params['startTime'] = strtotime( $params['startTime'] . ' ' .$params['timezone']).'000'; 48 49 if (!is_numeric($params['endTime'])){ 50 $params['endTime'] = strtotime( $params['endTime'] . ' ' .$params['timezone']).'000'; 51 52 if($params['allDay']) 53 $params['endTime'] = $params['endTime'] + 86400000; 54 */ 55 56 ob_start(); 57 print_r($params); 58 print_r($schedulable); 59 60 $output = ob_get_clean(); 61 file_put_contents( "/tmp/acoutinho.log", $output , FILE_APPEND); 62 63 64 44 65 $params['schedulable'] = $participant['schedulable']; 45 $params['rangeStart'] = gmdate( 'd-m-Y' , strtotime('- '.$params['time'].' '.self::codeAlarmUnit($params['unit']) , (int)($schedulable['startTime'] / 1000)));46 $params['rangeEnd'] = gmdate( 'd-m-Y' ,(int)($schedulable['endTime'] / 1000));66 $params['rangeStart'] = strtotime('- '.$params['time'].' '.self::codeAlarmUnit($params['unit']) , (int)($schedulable['startTime'] / 1000)).'000'; 67 $params['rangeEnd'] = $schedulable['endTime']; 47 68 } 48 69 -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r5641 r5652 605 605 receiveNotification : attend.receiveNotification, 606 606 alarms : $.map(attend.alarms || [], function( alarm ){ 607 return DataLayer.get('alarm', alarm); 607 //TODO - Atualizar cach cliente em conceito aninhados de camada 2 608 var alarmEvent = DataLayer.get('alarm', alarm) 609 return !!alarmEvent ? alarmEvent: (null); 608 610 }) 609 611 }; -
trunk/prototype/modules/calendar/templates/alarms_add_itemlist.ejs
r5514 r5652 10 10 <input type="text" name="alarmTime[]" class="number input-small" value="<%= data.alarm.defaultAlarms[i].time %>"/> 11 11 <select name="alarmUnit[]"> 12 <option value="m" <%= data.alarm.defaultAlarms[i].unit=='m' ? 'selected="selected"':'' %>>Minutos</option> 13 <option value="h" <%= data.alarm.defaultAlarms[i].unit=='h' ? 'selected="selected"':'' %>>Horas</option> 12 14 <option value="d" <%= data.alarm.defaultAlarms[i].unit=='d' ? 'selected="selected"':'' %>>Dias</option> 13 <option value="h" <%= data.alarm.defaultAlarms[i].unit=='h' ? 'selected="selected"':'' %>>Horas</option>14 <option value="m" <%= data.alarm.defaultAlarms[i].unit=='m' ? 'selected="selected"':'' %>>Minutos</option>15 15 </select> 16 16 <input type="hidden" name="alarmId[]" value="" /> … … 30 30 <input type="text" class="number input-small" name="alarmTime[]" /> 31 31 <select name="alarmUnit[]"> 32 <option value="m">Minutos</option> 33 <option value="h">Horas</option> 32 34 <option value="d">Dias</option> 33 <option value="h">Horas</option>34 <option value="m">Minutos</option>35 35 </select> 36 36 <input type="hidden" name="alarmId[]" value="" /> -
trunk/prototype/modules/calendar/templates/event_add.ejs
r5642 r5652 137 137 <input type="hidden" name="isDefaultAlarm[]" value="<%=data.event.useAlarmDefault ? 1 : 0%>" /> 138 138 <label> antes de cada evento.</label> 139 <a class="button remove small"></a>139 <a class="button remove tiny"></a> 140 140 </li> 141 141 <% }
Note: See TracChangeset
for help on using the changeset viewer.