- Timestamp:
- 02/06/13 16:33:31 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.1-expresso2/prototype/modules/calendar/js/activity.helpers.js
r7680 r7869 222 222 } 223 223 */ 224 UI.dialogs.addActivity.find('select[name="activityStatus"], input[name="allDay"]').removeAttr('disabled'); 225 canDiscardActivityDialog = true; 226 227 UI.dialogs.addActivity.children().find('form.form-addactivity').submit(); 228 UI.dialogs.addActivity.dialog("close"); 224 225 //Código o qual será chamado para o salvamento da Atividade. 226 var handler_save = function (objsToSave){ 227 UI.dialogs.addActivity.find('select[name="activityStatus"], input[name="allDay"]').removeAttr('disabled'); 228 canDiscardActivityDialog = true; 229 230 var activity_tst = DataLayer.form( UI.dialogs.addActivity.children().find('form') ); 231 if(objsToSave) 232 objsToSave[objsToSave.length] = activity_tst; 233 234 else 235 objsToSave = activity_tst; 236 DataLayer.put('schedulable', objsToSave); 237 238 UI.dialogs.addActivity.dialog("close"); 239 } 240 241 //Verifica se o grupo da atividade mudou 242 if (group.id != UI.dialogs.addActivity.children().find('form select[name="group"] :selected').val() && typeof group.id != 'undefined') { 243 //Janela de dialogo 244 $.Zebra_Dialog('Você alterou o grupo da atividade, deseja alterar também o grupo das tarefas pertencentes à essa atividade?', { 245 'type': 'question', 246 'overlay_opacity': '0.5', 247 'modal': true, 248 'buttons': ['Não Alterar', 'Alterar'], 249 'onClose': function(clicked) { 250 if(clicked == 'Não Alterar') { 251 252 handler_save(); 253 }else{ 254 var objsToSave = []; 255 //percorre as tarefas da atividade para verificar se o grupo mudou 256 for(var t in objActivity.tasks){ 257 if(typeof objActivity.tasks[t].group != 'undefined') 258 if (objActivity.tasks[t].group != UI.dialogs.addActivity.children().find('form select[name="group"] :selected').val()){ 259 objActivity.tasks[t].group = UI.dialogs.addActivity.children().find('form select[name="group"] :selected').val(); 260 objsToSave[objsToSave.length] = {'calendar' : objActivity.tasks[t].group, 'id': t}; 261 } 262 } 263 handler_save(objsToSave); 264 265 } 266 267 } 268 }); 269 270 271 } else { 272 handler_save(); 273 } 229 274 230 275 }).end() … … 259 304 ['=', 'type', '2'], 260 305 ['>=','startTime', $.now()], 261 ['in', 'calendar', 262 [$('div.new-activity-win.active select[name="groupFilter"]').val()] 263 ] 306 ['in', 'calendar', [$('div.new-activity-win.active select[name="groupFilter"]').val()]] 264 307 ], criteria: {filterTasks: true, deepness: 2} 265 308 }; … … 412 455 updateActivity = false; 413 456 414 var objActivity = DataLayer.get('schedulable:activity', UI.dialogs.addActivity.find('input[name="idActivity"]').val()); 457 var idTask = UI.dialogs.addActivity.find('input[name="idActivity"]').val(); 458 459 getSchedulable( idTask ); 460 461 var objActivity = DataLayer.get('schedulable:activity', idTask ); 415 462 var blkAddTask = UI.dialogs.addActivity.find('#group_addactivity_details8'); 416 463 var blkAuto = UI.dialogs.addActivity.find('#group_addactivity_details1'); … … 671 718 text: false 672 719 }).click(function () { 673 var task = DataLayer.get('schedulable:task', $(this).parents('li').find('input[name="idtask[]"]').val()); 674 taskDetails(task, true, '',true, null, true); 720 var idTask = $(this).parents('li').find('input[name="idtask[]"]').val() 721 getSchedulable(idTask); 722 var task = DataLayer.get('schedulable:task', idTask); 723 taskDetails(task, true, '',true, null, true); 675 724 }) 676 725 .addClass('tiny disable ui-button-disabled ui-state-disabled')
Note: See TracChangeset
for help on using the changeset viewer.