- Timestamp:
- 08/07/12 12:06:34 (12 years ago)
- Location:
- sandbox/2.4.2-expresso1/prototype/modules/calendar
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css
r6946 r6954 144 144 font-size: 150%; 145 145 font-weight: bold; 146 width: 64%;146 width: 100%; 147 147 height: 150%; 148 148 } … … 591 591 /*Atividades*/ 592 592 593 .div-addactivity #calendar_addactivity_details5 .button-files-upload { margin: 0 0 0 5px; }594 .div-addactivity #calendar_addactivity_details1 .h1{ width: 100%;}595 .div-addactivity #calendar_addactivity_details2 textarea { width: 635px; }596 593 .div-addactivity{ width: 734px;} 597 .div-addactivity #calendar_addactivity_details1 .time-previsao { width: 40px; } 598 .div-addactivity #calendar_addactivity_details1 .date-previsao{ width: 80px; } 599 600 .div-addactivity #calendar_addactivity_details1 .start-time{ width: 40px; } 601 .div-addactivity #calendar_addaActivity_details1 .start-date{ width: 80px; } 602 .div-addactivity #calendar_addactivity_details1 .end-time{ width: 40px; } 603 .div-addactivity #calendar_addactivity_details1 .end-date{ width: 80px; } 604 .div-addactivity #calendar_addactivity_details1 .previsao-termino { margin: 0 0 0 50px; } 605 .div-addactivity #calendar_addactivity_details1 .subitem { margin: 5px; display: block;} 606 .div-addactivity #calendar_addactivity_details1 .subitem .span_done{ margin: 0 30px;} 607 .div-addactivity #calendar_addactivity_details1 .calendar_addevent_details_lnk_timezone { margin: 0 0 0 20px;} 608 .div-addactivity #calendar_addactivity_details1 .subitem .done { width: 45px;} 594 .div-addactivity #group_addactivity_details1 .h1{ width: 100%;} 595 .div-addactivity #group_addactivity_details2 textarea { width: 635px; } 596 .div-addactivity #group_addactivity_details1 .time-previsao { width: 40px; } 597 .div-addactivity #group_addactivity_details1 .date-previsao{ width: 80px; } 598 599 .div-addactivity #group_addactivity_details1 .start-time{ width: 40px; } 600 .div-addactivity #group_addactivity_details1 .start-date{ width: 80px; } 601 .div-addactivity #group_addactivity_details1 .end-time{ width: 40px; } 602 .div-addactivity #group_addactivity_details1 .end-date{ width: 80px; } 603 .div-addactivity #group_addactivity_details1 .previsao-termino { margin: 0 0 0 50px; } 604 .div-addactivity #group_addactivity_details1 .subitem { margin: 5px; display: block;} 605 .div-addactivity #group_addactivity_details1 .subitem .span_done{ margin: 0 30px;} 606 .div-addactivity #group_addactivity_details1 .calendar_addevent_details_lnk_timezone { margin: 0 0 0 20px;} 607 .div-addactivity #group_addactivity_details1 .subitem .done { width: 45px;} 608 609 .div-addactivity #group_addactivity_details1 .subitem .span_done.noAction{background-image: url("../img/gray.png"); background-repeat: no-repeat; } 610 .div-addactivity #group_addactivity_details1 .subitem .span_done.inProcess{background-image: url("../img/yellow.png"); background-repeat: no-repeat;} 611 .div-addactivity #group_addactivity_details1 .subitem .span_done.finished{background-image: url("../img/green.png"); background-repeat: no-repeat;} 612 .div-addactivity #group_addactivity_details1 .subitem .span_done.canceled{background-image: url("../img/red.png"); background-repeat: no-repeat;} 613 .div-addactivity #group_addactivity_details1 .subitem .span_done label{position: relative; left: 28px;} 614 615 .div-addactivity #group_addactivity_details5.tab-level2{margin-top: 2px;} 616 .div-addactivity #group_addactivity_details5 .button-files-upload { margin: 0 0 0 5px; } 609 617 610 618 .div-addactivity #group_addactivity_details6 .parent {width: 680px; min-height: 268px; float: left;} -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js
r6951 r6954 19 19 var dueDate = new Date; 20 20 var percentage = 0; 21 22 21 22 var allDay = true; 23 23 24 24 var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat; … … 52 52 if(i == 'length') 53 53 continue; 54 54 55 var statusActivity = tasks[i].status ; 55 56 stTime = Date.parseExact( tasks[i].startDate + " "+$.trim( tasks[i].startHour) , formatString); 56 57 enTime = Date.parseExact( tasks[i].endDate + " "+$.trim( tasks[i].endHour), formatString ); … … 67 68 percentage += parseInt((100 / tasks.length)) * ( parseInt(tasks[i].percentage) / 100); 68 69 } 69 70 71 todoStatus('addActivity', (statusActivity != undefined) ? statusActivity : 1); 72 73 UI.dialogs.addActivity.find('select[name="activityStatus"] option[value="'+statusActivity+'"]').attr('selected','selected'); 74 70 75 dueDate = dueDate.compareTo(endDate) == -1 ? endDate : dueDate; 71 76 … … 355 360 /*Seleciona a agenda padrão para visualização/edição de um evento*/ 356 361 if(objActivity.id) 357 UI.dialogs.addActivity.find(' option[value="'+objActivity.group+'"]').attr('selected','selected').trigger('change');362 UI.dialogs.addActivity.find('select[name="group"] option[value="'+objActivity.group+'"]').attr('selected','selected').trigger('change'); 358 363 359 364 UI.dialogs.addActivity.find('.button').button(); … … 363 368 } 364 369 }); 370 371 todoStatus('addActivity', (objActivity.activityStatus != undefined) ? objActivity.activityStatus : 1); 365 372 366 373 // ==== validation events ==== … … 487 494 dueTime: old_item.find('[name="taskDueTime"]').val(), 488 495 allDay: old_item.find('[name="taskAllDay"]').val(), 489 percentage: old_item.find('[name="taskPercentage"]').val() 496 percentage: old_item.find('[name="taskPercentage"]').val(), 497 status: old_item.find('[name="taskStatus"]').val() 490 498 }; 491 499 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js
r6951 r6954 831 831 dueTime: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.due)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat), 832 832 allDay: !!parseInt( objEvent.allDay ), 833 percentage: (objEvent.percentage) ? objEvent.percentage : '0' 833 percentage: (objEvent.percentage) ? objEvent.percentage : '0', 834 status: objEvent.status 834 835 } 835 836 }); … … 885 886 due: (form.dueDate == '' )? 0 : Date.parseExact(form.dueDate + " "+$.trim(form.dueHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'), 886 887 allDay: ( !!form.allDay ? 1 : 0 ), 887 status: form. taskStatus,888 status: form.activityStatus, 888 889 id: form.idActivity, 889 890 type: !!form.type ? form.type : 2, … … 946 947 startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(task.startTime)), task.timezone, task.calendar, obj.DayLigth, 'startTime'), User.preferences.hourFormat), 947 948 endDate: new Date( parseInt(task.endTime) - (!!parseInt(task.allDay) ? 86400000 : 0) ).setTimezoneOffset( Timezone.timezone( task.timezone ) ).toString( User.preferences.dateFormat ), 948 endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(task.endTime)), task.timezone, obj.calendar, obj.DayLigth, 'endTime'), User.preferences.hourFormat) 949 endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(task.endTime)), task.timezone, obj.calendar, obj.DayLigth, 'endTime'), User.preferences.hourFormat), 950 status: task.status, 951 percentage: task.percentage 949 952 } 950 953 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js
r6951 r6954 86 86 return false; 87 87 } 88 function taskStatus(status){ 88 89 function todoStatus(view, status){ 89 90 if (status == "1"){ 90 UI.dialogs .addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('noAction');91 UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('noAction'); 91 92 }else if (status == "2"){ 92 UI.dialogs .addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('inProcess');93 UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('inProcess'); 93 94 }else if (status == "3"){ 94 UI.dialogs .addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('finished');95 UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('finished'); 95 96 }else if (status == "4"){ 96 UI.dialogs .addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('canceled');97 UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('canceled'); 97 98 } 98 99 } … … 374 375 }); 375 376 376 if (objTask.taskStatus == "1" || objTask.taskStatus == undefined){ 377 taskStatus(1); 378 }else if (objTask.taskStatus == "2"){ 379 taskStatus(2); 380 }else if (objTask.taskStatus == "3"){ 381 taskStatus(3); 382 }else if (objTask.taskStatus == "4"){ 383 taskStatus(4); 384 } 377 todoStatus('addTask', (objTask.taskStatus != undefined) ? objTask.taskStatus : 1); 385 378 386 //Conclu ão das Tarefas379 //Conclusão das Tarefas 387 380 var conclusionTask = function(e){ 388 381 var percentageTask = UI.dialogs.addTask.find('input[name="percentage"]'); … … 396 389 if(percentageValue <= 0){ 397 390 statusTask.find('option.taskStatus-noAction').attr('selected', 'selected'); 398 t askStatus(1);391 todoStatus('addTask', 1); 399 392 }else if(percentageValue == 100){ 400 393 statusTask.find('option.taskStatus-finished').attr('selected', 'selected'); 401 t askStatus(3);394 todoStatus('addTask', 3); 402 395 }else{ 403 396 statusTask.find('option.taskStatus-inProcess').attr('selected', 'selected'); 404 t askStatus(2);397 todoStatus('addTask', 2); 405 398 } 406 399 setTimeout(function(){ … … 415 408 var statusSelected = $('select[name=taskStatus] option:selected').val(); 416 409 var percentageTask = UI.dialogs.addTask.find('input[name="percentage"]'); 410 417 411 if (statusSelected == "1"){ 418 412 percentageTask.val(0); 419 taskStatus(1);420 413 }else if(statusSelected == "2"){ 421 414 percentageTask.val(percentageTask.val() != 0 ? (percentageTask.val() == 100 ? 99: percentageTask.val()) : 1); 422 taskStatus(2);423 415 }else if(statusSelected == "3"){ 424 416 percentageTask.val(100); 425 taskStatus(3);426 417 }else if(statusSelected == "4"){ 427 418 percentageTask.val(percentageTask.val() != 100 ? percentageTask.val() : 99); 428 taskStatus(4);429 419 } 420 todoStatus('addTask', statusSelected); 430 421 }); 431 422 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs
r6945 r6954 64 64 <option <%= (data.activity.priority == '3') ? 'selected="selected"' : '' %> value="3">Baixa</option> 65 65 </select> 66 <span class="span_done">< img src="../prototype/modules/calendar/img/empty-status.png"/> Completo<span>66 <span class="span_done"><label>Completo</label></span> 67 67 </div> 68 68 </fieldset> -
sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_search_itemlist.ejs
r6945 r6954 10 10 <input type="hidden" name="taskDueTime" value="<%=data[i]['dueTime']%>" /> 11 11 <input type="hidden" name="taskAllDay" value="<%=data[i]['allDay']%>" /> 12 <input type="hidden" name="taskStatus" value="<%=data[i]['status']%>" /> 12 13 <input type="hidden" name="taskPercentage" value="<%=data[i]['percentage']%>" /> 13 14 <label class="description"><%=data[i]['startDate']%> - <%=data[i]['description']%></label>
Note: See TracChangeset
for help on using the changeset viewer.