diff --git a/ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js b/ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js
new file mode 100644
index 0000000..d69abe8
--- /dev/null
+++ b/ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js
@@ -0,0 +1,806 @@
+//$j('#form_resultado').submit(function(event) {event.preventDefault()});
+
+// variaveis usadas pelo modulo Frontend/Process.js
+var PAGE_URL_BASE = 'diario';
+var API_URL_BASE  = 'diarioApi';
+
+var RESOURCE_NAME  = 'matricula';
+var RESOURCES_NAME = 'matriculas';
+
+var POST_LABEL   = '';
+var DELETE_LABEL = '';
+
+var SEARCH_ORIENTATION = '';
+
+// funcoes usados pelo modulo Frontend/Process.js
+var onClickSelectAllEvent = false;
+var onClickActionEvent    = false;
+var onClickDeleteEvent    = false;
+
+//url builders
+
+var deleteResourceUrlBuilder = {
+  buildUrl : function(urlBase, resourceName, additionalVars) {
+
+    var vars = {
+      resource : resourceName,
+      oper : 'delete',
+      instituicao_id : $j('#ref_cod_instituicao').val(),
+      escola_id : $j('#ref_cod_escola').val(),
+      curso_id : $j('#ref_cod_curso').val(),
+      serie_id : $j('#ref_ref_cod_serie').val(),
+      turma_id : $j('#ref_cod_turma').val(),
+      ano_escolar : $j('#ano').val(),
+      etapa : $j('#etapa').val()
+    };
+
+    return resourceUrlBuilder.buildUrl(urlBase, $j.extend(vars, additionalVars));
+  }
+};
+
+
+var postResourceUrlBuilder = {
+  buildUrl : function(urlBase, resourceName, additionalVars) {
+
+    var vars = {
+      resource : resourceName,
+      oper : 'post',
+      instituicao_id : $j('#ref_cod_instituicao').val(),
+      escola_id : $j('#ref_cod_escola').val(),
+      curso_id : $j('#ref_cod_curso').val(),
+      serie_id : $j('#ref_ref_cod_serie').val(),
+      turma_id : $j('#ref_cod_turma').val(),
+      ano_escolar : $j('#ano').val(),
+      componente_curricular_id : $j('#ref_cod_componente_curricular').val(),
+      etapa : $j('#etapa').val(),
+      matricula_id : $j('#etapa').val()
+    };
+
+    return resourceUrlBuilder.buildUrl(urlBase, $j.extend(vars, additionalVars));
+
+  }
+};
+
+
+var getResourceUrlBuilder = {
+  buildUrl : function(urlBase, resourceName, additionalVars) {
+
+    var vars = {
+      resource : resourceName,
+      oper : 'get',
+      instituicao_id : $j('#ref_cod_instituicao').val(),
+      escola_id : $j('#ref_cod_escola').val(),
+      curso_id : $j('#ref_cod_curso').val(),
+      serie_id : $j('#ref_ref_cod_serie').val(),
+      turma_id : $j('#ref_cod_turma').val(),
+      ano_escolar : $j('#ano').val(),
+      componente_curricular_id : $j('#ref_cod_componente_curricular').val(),
+      etapa : $j('#etapa').val(),
+      matricula_id : $j('#ref_cod_matricula').val()
+    };
+
+    return resourceUrlBuilder.buildUrl(urlBase, $j.extend(vars, additionalVars));
+
+  }
+};
+
+
+function changeResource($resourceElement, postFunction, deleteFunction) {
+  if ($j.trim($resourceElement.val())  == '')
+    deleteFunction($resourceElement);
+  else
+    postFunction($resourceElement);
+};
+
+
+function setDefaultFaltaIfEmpty(matricula_id, componente_curricular_id) {
+  var $element = $j('#falta-matricula-' + matricula_id + '-cc-' + componente_curricular_id);
+  if ($j.trim($element.val()) == '') {
+    $element.val(0);
+    $element.change();
+  }
+}
+
+
+var changeNota = function(event) {
+  var $element = $j(this);
+  setDefaultFaltaIfEmpty($element.data('matricula_id'), $element.data('componente_curricular_id'));
+  changeResource($element, postNota, deleteNota);
+};
+
+
+var changeNotaExame = function(event) {
+  var $element = $j(this);
+  setDefaultFaltaIfEmpty($element.data('matricula_id'), $element.data('componente_curricular_id'));
+  changeResource($element, postNotaExame, deleteNotaExame);
+};
+
+
+var changeFalta = function(event) {
+  $element = $j(this);
+  changeResource($element, postFalta, deleteFalta);
+
+  // se presenca geral, muda o valor em todas faltas da mesma matricula
+  if ($tableSearchDetails.data('details').tipo_presenca == 'geral') {
+    var $fieldsFaltaMatricula = $element.closest('table').find('.falta-matricula-' + $element
+                                                               .data('matricula_id') + '-cc')
+                                                               .not($element);
+
+    $fieldsFaltaMatricula.val($element.val());
+    $fieldsFaltaMatricula.data('old_value', $element.val());
+  }
+};
+
+
+var changeParecer = function(event) {
+  var $element = $j(this);
+  setDefaultFaltaIfEmpty($element.data('matricula_id'), $element.data('componente_curricular_id'));
+  changeResource($element, postParecer, deleteParecer);
+
+  // se parecer geral, muda o valor em todos pareceres da mesma matricula
+  var parecerGeral = $j.inArray($tableSearchDetails.data('details').tipo_parecer_descritivo,
+                                ['etapa_geral', 'anual_geral']) > -1;
+
+  if (parecerGeral) {
+    var $fieldsParecerMatricula = $element.closest('table').find('.parecer-matricula-' + $element
+                                                                 .data('matricula_id') + '-cc')
+                                                                 .not($element);
+
+    $fieldsParecerMatricula.val($element.val());
+    $fieldsParecerMatricula.data('old_value', $element.val());
+  }
+};
+
+
+function afterChangeResource($resourceElement) {
+  $resourceElement.removeAttr('disabled').siblings('img').remove();
+
+  var resourceElementTabIndex    = $resourceElement.attr('tabindex');
+  var focusedElementTabIndex = $j('.tabable:focus').first().attr('tabindex');
+  var lastElementTabIndex        = $resourceElement.closest('form').find('.tabable').last().attr('tabindex');
+
+  // percorre os proximos elementos enquanto não chegar no ultimo
+  for(var nextTabIndex = resourceElementTabIndex + 1; nextTabIndex < lastElementTabIndex + 1; nextTabIndex++) {
+    //var $nextElement = $j($resourceElement.closest('form').find('.tabable:[tabindex="'+nextTabIndex+'"]')).first();
+    var $nextElement = $j($resourceElement.closest('form').find('.tabable[tabindex="'+nextTabIndex+'"]')).first();
+
+    // seta foco no proximo elemento, caso este seja visivel e o elemento alterado ainda esteja focado
+    if($nextElement.is(':visible')) {
+      if(resourceElementTabIndex == focusedElementTabIndex)
+        $nextElement.focus();
+
+      break;
+    }
+  }
+}
+
+function postNota($notaFieldElement) {
+
+  $notaFieldElement.val($notaFieldElement.val().replace(',', '.'));
+
+  if (validatesIfValueIsNumeric($notaFieldElement.val(), $notaFieldElement.attr('id')) &&
+      validatesIfNumericValueIsInRange($notaFieldElement.val(), $notaFieldElement.attr('id'), 0, 10) &&
+      validatesIfValueIsInSet($notaFieldElement.val(), $notaFieldElement.attr('id'), $tableSearchDetails.data('details').opcoes_notas)) {
+
+    beforeChangeResource($notaFieldElement);
+
+    var additionalVars = {
+      matricula_id             : $notaFieldElement.data('matricula_id'),
+      componente_curricular_id : $notaFieldElement.data('componente_curricular_id')
+    };
+
+    var options = {
+      url : postResourceUrlBuilder.buildUrl(API_URL_BASE, 'nota', additionalVars),
+      dataType : 'json',
+      data : {att_value : $notaFieldElement.val()},
+      success : function(dataResponse) {
+        afterChangeResource($notaFieldElement);
+        handleChange(dataResponse);
+      }
+    };
+
+    $notaFieldElement.data('old_value', $notaFieldElement.val());
+    postResource(options, handleErrorOnPostResource);
+  }
+}
+
+
+function postNotaExame($notaExameFieldElement) {
+
+  $notaExameFieldElement.val($notaExameFieldElement.val().replace(',', '.'));
+
+  if (validatesIfValueIsNumeric($notaExameFieldElement.val(), $notaExameFieldElement.attr('id')) &&
+      validatesIfNumericValueIsInRange($notaExameFieldElement.val(), $notaExameFieldElement.attr('id'), 0, 10) &&
+      validatesIfValueIsInSet($notaExameFieldElement.val(), $notaExameFieldElement.attr('id'), $tableSearchDetails.data('details').opcoes_notas)) {
+
+    beforeChangeResource($notaExameFieldElement);
+
+    var additionalVars = {
+      matricula_id             : $notaExameFieldElement.data('matricula_id'),
+      componente_curricular_id : $notaExameFieldElement.data('componente_curricular_id'),
+      etapa : 'Rc'
+    };
+
+    var options = {
+      url : postResourceUrlBuilder.buildUrl(API_URL_BASE, 'nota_exame', additionalVars),
+      dataType : 'json',
+      data : {att_value : $notaExameFieldElement.val()},
+      success : function(dataResponse) {
+        afterChangeResource($notaExameFieldElement);
+        handleChange(dataResponse);
+      }
+    };
+
+    $notaExameFieldElement.data('old_value', $notaExameFieldElement.val());
+    postResource(options, handleErrorOnPostResource);
+  }
+}
+
+
+function postFalta($faltaFieldElement) {
+  $faltaFieldElement.val($faltaFieldElement.val().replace(',', '.'));
+
+  //falta é persistida como inteiro
+  if ($j.isNumeric($faltaFieldElement.val()))
+    $faltaFieldElement.val(parseInt($faltaFieldElement.val()).toString());
+
+  if (validatesIfValueIsNumeric($faltaFieldElement.val(), $faltaFieldElement.attr('id')) &&
+      validatesIfNumericValueIsInRange($faltaFieldElement.val(), $faltaFieldElement.attr('id'), 0, 100)) {
+
+    beforeChangeResource($faltaFieldElement);
+
+    var additionalVars = {
+      matricula_id             : $faltaFieldElement.data('matricula_id'),
+      componente_curricular_id : $faltaFieldElement.data('componente_curricular_id')
+    };
+
+    var options = {
+      url : postResourceUrlBuilder.buildUrl(API_URL_BASE, 'falta', additionalVars),
+      dataType : 'json',
+      data : {att_value : $faltaFieldElement.val()},
+      success : function(dataResponse) {
+        afterChangeResource($faltaFieldElement);
+        handleChange(dataResponse);
+      }
+    };
+
+    $faltaFieldElement.data('old_value', $faltaFieldElement.val());
+    postResource(options, handleErrorOnPostResource);
+  }
+}
+
+
+function getEtapaParecer() {
+  if ($tableSearchDetails.data('details').tipo_parecer_descritivo.split('_')[0] == 'anual')
+    var etapaParecer = 'An';
+  else
+    var etapaParecer = $j('#etapa').val();
+
+  return etapaParecer;
+}
+
+
+function postParecer($parecerFieldElement) {
+  var additionalVars = {
+    matricula_id             : $parecerFieldElement.data('matricula_id'),
+    componente_curricular_id : $parecerFieldElement.data('componente_curricular_id'),
+    etapa : getEtapaParecer()
+  };
+
+  var options = {
+    url : postResourceUrlBuilder.buildUrl(API_URL_BASE, 'parecer', additionalVars),
+    dataType : 'json',
+    data : {att_value : $parecerFieldElement.val()},
+    success : function(dataResponse) {
+      afterChangeResource($parecerFieldElement);
+      handleChange(dataResponse);
+    }
+  };
+
+  $parecerFieldElement.data('old_value', $parecerFieldElement.val());
+  postResource(options, handleErrorOnPostResource);
+}
+
+
+function confirmDelete(resourceName) {
+  return confirm(safeUtf8Decode('Confirma exclusão ' + resourceName.replace('_',' ') + '?'));
+}
+
+
+function deleteResource(resourceName, $resourceElement, options, handleErrorOnDeleteResource) {
+  if (confirmDelete(resourceName)) {
+    beforeChangeResource($resourceElement);
+    $resourceElement.data('old_value', '');
+    $j.ajax(options).error(handleErrorOnDeleteResource);
+  }
+  else
+  {
+    afterChangeResource($resourceElement);
+    $resourceElement.val($resourceElement.data('old_value'));
+  }
+}
+
+
+function deleteNota($notaFieldElement) {
+  var resourceName = 'nota';
+
+  var additionalVars = {
+    instituicao_id : $j('#ref_cod_instituicao').val(),
+    escola_id : $j('#ref_cod_escola').val(),
+    curso_id : $j('#ref_cod_curso').val(),
+    serie_id : $j('#ref_ref_cod_serie').val(),
+    turma_id : $j('#ref_cod_turma').val(),
+    ano_escolar : $j('#ano').val(),
+    componente_curricular_id : $notaFieldElement.data('componente_curricular_id'),
+    etapa : $j('#etapa').val(),
+    matricula_id : $notaFieldElement.data('matricula_id')
+   };
+
+  var options = {
+    url : deleteResourceUrlBuilder.buildUrl(API_URL_BASE, resourceName, additionalVars),
+    dataType : 'json',
+    success : function(dataResponse) {
+      afterChangeResource($notaFieldElement);
+      handleChange(dataResponse);
+    }
+  };
+
+  deleteResource(resourceName, $notaFieldElement, options, handleErrorOnDeleteResource);
+};
+
+
+function deleteNotaExame($notaExameFieldElement) {
+  var resourceName = 'nota_exame';
+
+  var additionalVars = {
+    componente_curricular_id : $notaExameFieldElement.data('componente_curricular_id'),
+    etapa : 'Rc',
+    matricula_id : $notaExameFieldElement.data('matricula_id')
+   };
+
+  var options = {
+    url : deleteResourceUrlBuilder.buildUrl(API_URL_BASE, resourceName, additionalVars),
+    dataType : 'json',
+    success : function(dataResponse) {
+      afterChangeResource($notaExameFieldElement);
+      handleChange(dataResponse);
+    }
+  };
+
+  deleteResource(resourceName, $notaExameFieldElement, options, handleErrorOnDeleteResource);
+};
+
+
+function deleteFalta($faltaFieldElement) {
+
+  //excluir falta se nota, nota exame e parecer (não existirem ou) estiverem sem valor
+  var matriculaId = $faltaFieldElement.data('matricula_id');
+  var ccId = $faltaFieldElement.data('componente_curricular_id');
+
+  var $notaField = $j('#nota-matricula-'+ matriculaId + '-cc-' + ccId);
+  var $notaExameField = $j('#nota-exame-matricula-'+ matriculaId + '-cc-' + ccId);
+  var $parecerField = $j('#parecer-matricula-'+ matriculaId + '-cc-' + ccId);
+
+  if(($notaField.length < 1 || $notaField.val() == '') &&
+     ($notaExameField.length < 1 || $notaExameField.val() == '') &&
+     ($parecerField.length < 1 || $j.trim($parecerField.val()) == '')
+    ) {
+    var resourceName = 'falta';
+
+    var additionalVars = {
+      componente_curricular_id : $faltaFieldElement.data('componente_curricular_id'),
+      matricula_id : $faltaFieldElement.data('matricula_id')
+     };
+
+    var options = {
+      url : deleteResourceUrlBuilder.buildUrl(API_URL_BASE, resourceName, additionalVars),
+      dataType : 'json',
+      success : function(dataResponse) {
+        afterChangeResource($faltaFieldElement);
+        handleChange(dataResponse);
+      }
+    };
+
+    deleteResource(resourceName, $faltaFieldElement, options, handleErrorOnDeleteResource);
+  }
+  else{
+
+    $faltaFieldElement.val($faltaFieldElement.data('old_value'));
+
+    handleMessages([{type : 'error', msg : safeUtf8Decode('Falta não pode ser removida após ter lançado notas ou parecer descritivo, tente definir como 0 (zero).')}], $faltaFieldElement.attr('id'));
+  }
+}
+
+
+function deleteParecer($parecerFieldElement) {
+  var resourceName = 'parecer';
+
+  var additionalVars = {
+    componente_curricular_id : $parecerFieldElement.data('componente_curricular_id'),
+    matricula_id             : $parecerFieldElement.data('matricula_id'),
+    etapa                    : getEtapaParecer()
+   };
+
+  var options = {
+    url : deleteResourceUrlBuilder.buildUrl(API_URL_BASE, resourceName, additionalVars),
+    dataType : 'json',
+    success : function(dataResponse) {
+      afterChangeResource($parecerFieldElement);
+      handleChange(dataResponse);
+    }
+  };
+
+  deleteResource(resourceName, $parecerFieldElement, options, handleErrorOnDeleteResource);
+}
+
+
+//callback handlers
+
+function handleChange(dataResponse) {
+  var targetId = dataResponse.resource + '-matricula-' + dataResponse.matricula_id +
+                 '-cc-' + dataResponse.componente_curricular_id;
+
+  handleMessages(dataResponse.msgs, targetId);
+  updateResourceRow(dataResponse);
+}
+
+
+function setTableSearchDetails($tableSearchDetails, dataDetails) {
+  var componenteCurricularSelected = ($j('#ref_cod_componente_curricular').val() != '');
+
+  $j('<caption />').html('<strong>Lan&#231;amento de notas por turma</strong>').appendTo($tableSearchDetails);
+
+  //set headers table
+  var $linha = $j('<tr />');
+
+  if (componenteCurricularSelected)
+    $j('<th />').html('Componente curricular').appendTo($linha);
+
+  $j('<th />').html('Etapa').appendTo($linha);
+  $j('<th />').html('Turma').appendTo($linha);
+  $j('<th />').html(safeUtf8Decode('Série')).appendTo($linha);
+  $j('<th />').html('Ano').appendTo($linha);
+  $j('<th />').html('Escola').appendTo($linha);
+  $j('<th />').html('Regra avalia&#231;&#227;o').appendTo($linha);
+  $j('<th />').html('Tipo nota').appendTo($linha);
+  $j('<th />').html('Tipo presen&#231;a').appendTo($linha);
+  $j('<th />').html('Tipo parecer').appendTo($linha);
+
+  $linha.appendTo($tableSearchDetails);
+
+  var $linha = $j('<tr />').addClass('cellColor');
+
+  if (componenteCurricularSelected)
+    $j('<td />').html(safeToUpperCase($j('#ref_cod_componente_curricular').children("[selected='selected']").html())).appendTo($linha);
+
+  $j('<td />').html(safeToUpperCase($j('#etapa').children("[selected='selected']").html())).appendTo($linha);
+  $j('<td />').html(safeToUpperCase($j('#ref_cod_turma').children("[selected='selected']").html())).appendTo($linha);
+  $j('<td />').html(safeToUpperCase($j('#ref_ref_cod_serie').children("[selected='selected']").html())).appendTo($linha);
+  $j('<td />').html($j('#ano').val()).appendTo($linha);
+
+  //field escola pode ser diferente de select caso usuario comum
+  var $htmlEscolaField = $j('#ref_cod_escola').children("[selected='selected']").html() ||
+                         $j('#tr_nm_escola span:last').html();
+
+  $j('<td />').html(safeToUpperCase($htmlEscolaField)).appendTo($linha);
+  $j('<td />').html(dataDetails.id + ' - ' +safeToUpperCase(dataDetails.nome)).appendTo($linha);
+
+  //corrige acentuação
+  var tipoNota = dataDetails.tipo_nota.replace('_', ' ');
+  if (tipoNota == 'numerica')
+    tipoNota = 'numérica';
+  $j('<td />').html(safeToUpperCase(safeUtf8Decode(tipoNota))).appendTo($linha);
+
+  $j('<td />').html(safeToUpperCase(dataDetails.tipo_presenca.replace('_', ' '))).appendTo($linha);
+  $j('<td />').html(safeToUpperCase(dataDetails.tipo_parecer_descritivo.replace('_', ' '))).appendTo($linha);
+
+  $linha.appendTo($tableSearchDetails);
+  $tableSearchDetails.show();
+
+  //dataDetails.opcoes_notas = safeSortArray(dataDetails.opcoes_notas);
+  $tableSearchDetails.data('details', dataDetails);
+}
+
+var nextTabIndex = 1;
+
+function setNextTabIndex($element) {
+  $element.attr('tabindex', nextTabIndex);
+  $element.addClass('tabable');
+  nextTabIndex += 1;
+}
+
+function handleSearch($resultTable, dataResponse) {
+  var componenteCurricularSelected = ($j('#ref_cod_componente_curricular').val() != '');
+
+  // resets next tabindex
+  var nextTabIndex = 1;
+
+  //set headers
+  var $linha = $j('<tr />');
+  $j('<th />').html(safeUtf8Decode('Matrícula')).appendTo($linha);
+  $j('<th />').attr('colspan', componenteCurricularSelected ? 0 : 4).html('Aluno').appendTo($linha);
+
+  if (componenteCurricularSelected)
+    updateComponenteCurricularHeaders($linha, $j('<th />'));
+
+  $linha.appendTo($resultTable);
+
+  //set (result) rows
+  $j.each(dataResponse.matriculas, function(index, value) {
+    var $linha = $j('<tr />').addClass(componenteCurricularSelected ? '' : 'strong');
+
+    $j('<td />').html(value.matricula_id).addClass('center').appendTo($linha);
+    $j('<td />').html(value.aluno_id + ' - ' +safeToUpperCase(value.nome))
+                .attr('colspan', componenteCurricularSelected ? 0 : 4)
+                .appendTo($linha);
+
+    if (componenteCurricularSelected && value.componentes_curriculares.length > 0)
+      updateComponenteCurricular($linha, value.matricula_id, value.componentes_curriculares[0]);
+
+    $linha.fadeIn('slow').appendTo($resultTable);
+    $linha.appendTo($resultTable);
+
+    if (! componenteCurricularSelected)
+      updateComponenteCurriculares($resultTable, value.matricula_id, value.componentes_curriculares);
+  });
+
+  // seta colspan [th, td].aluno quando exibe nota exame
+  if ($tableSearchDetails.data('details').tipo_nota != 'nenhum' &&
+      $tableSearchDetails.data('details').quantidade_etapas == $j('#etapa').val()) {
+    $resultTable.find('[colspan]').attr('colspan', componenteCurricularSelected ? 1 : 5);
+  }
+
+  $resultTable.find('tr:even').addClass('even');
+
+  //set onchange events
+  var $notaFields = $resultTable.find('.nota-matricula-cc');
+  var $notaExameFields = $resultTable.find('.nota-exame-matricula-cc');
+  var $faltaFields = $resultTable.find('.falta-matricula-cc');
+  var $parecerFields = $resultTable.find('.parecer-matricula-cc');
+  $notaFields.on('change', changeNota);
+  $notaExameFields.on('change', changeNotaExame);
+  $faltaFields.on('change', changeFalta);
+  $parecerFields.on('change', changeParecer);
+
+  $resultTable.addClass('styled').find('.tabable:first').focus();
+}
+
+function _notaField(matriculaId, componenteCurricularId, klass, id, value) {
+  if($tableSearchDetails.data('details').tipo_nota == 'conceitual') {
+    var opcoesNotas = $tableSearchDetails.data('details').opcoes_notas;
+
+    var $notaField = $j('<select />')
+                     .addClass(klass)
+                     .attr('id', id)
+                     .data('matricula_id', matriculaId)
+                     .data('componente_curricular_id', componenteCurricularId);
+
+    // adiciona opcoes notas ao select
+    var $option = $j('<option />').appendTo($notaField);
+    for(key in opcoesNotas) {
+      var $option = $j('<option />').val(key).html(opcoesNotas[key]);
+
+      if (value == key)
+        $option.attr('selected', 'selected');
+
+      $option.appendTo($notaField);
+    }
+  }
+  else {
+    var $notaField = $j('<input />').addClass(klass)
+                                    .attr('id', id)
+                                    .attr('maxlength', '4')
+                                    .attr('size', '4')
+                                    .val(value)
+                                    .data('matricula_id', matriculaId)
+                                    .data('componente_curricular_id', componenteCurricularId);
+  }
+
+  $notaField.data('old_value', value);
+  setNextTabIndex($notaField);
+
+  return $j('<td />').html($notaField).addClass('center');
+}
+
+
+function notaField(matriculaId, componenteCurricularId, value) {
+  return _notaField(matriculaId,
+                    componenteCurricularId,
+                    'nota-matricula-cc',
+                    'nota-matricula-' + matriculaId + '-cc-' + componenteCurricularId,
+                    value);
+}
+
+
+function notaExameField(matriculaId, componenteCurricularId, value) {
+  return _notaField(matriculaId,
+                    componenteCurricularId,
+                    'nota-exame-matricula-cc',
+                    'nota-exame-matricula-' + matriculaId + '-cc-' + componenteCurricularId,
+                    value);
+}
+
+
+function faltaField(matriculaId, componenteCurricularId, value) {
+  var $faltaField = $j('<input />').addClass('falta-matricula-cc')
+                                   .addClass('falta-matricula-' + matriculaId + '-cc')
+                                   .attr('id', 'falta-matricula-' + matriculaId + '-cc-' + componenteCurricularId)
+                                   .attr('maxlength', '4')
+                                   .attr('size', '4')
+                                   .val(value)
+                                   .data('old_value', value)
+                                   .data('matricula_id', matriculaId)
+                                   .data('componente_curricular_id', componenteCurricularId);
+
+  setNextTabIndex($faltaField);
+  return $j('<td />').html($faltaField).addClass('center');
+}
+
+function parecerField(matriculaId, componenteCurricularId, value) {
+  var $parecerField = $j('<textarea />').attr('cols', '40')
+                                        .attr('rows', '5')
+                                        .addClass('parecer-matricula-cc')
+                                        .addClass('parecer-matricula-' + matriculaId + '-cc')
+                                        .attr('id', 'parecer-matricula-' + matriculaId + '-cc-' + componenteCurricularId)
+                                        .val(value)
+                                        .data('old_value', value)
+                                        .data('matricula_id', matriculaId)
+                                        .data('componente_curricular_id', componenteCurricularId);
+
+  setNextTabIndex($parecerField);
+  return $j('<td />').addClass('center').html($parecerField);
+}
+
+function updateComponenteCurricular($targetElement, matriculaId, cc) {
+  var useNota                = $tableSearchDetails.data('details').tipo_nota != 'nenhum';
+  var useParecer             = $tableSearchDetails.data('details').tipo_parecer_descritivo != 'nenhum';
+
+  var $situacaoTd = $j('<td />').addClass('situacao-matricula-cc')
+                                .attr('id', 'situacao-matricula-' + matriculaId + '-cc-' + cc.id)
+                                .data('matricula_id', matriculaId)
+                                .data('componente_curricular_id', cc.id)
+                                .addClass('center')
+                                .html(cc.situacao)
+                                .appendTo($targetElement);
+
+  colorizeSituacaoTd($situacaoTd, cc.situacao);
+
+  if(useNota) {
+    notaField(matriculaId, cc.id, cc.nota_atual).appendTo($targetElement);
+
+    // mostra nota exame caso estiver selecionado a ultima etapa
+    if ($tableSearchDetails.data('details').quantidade_etapas == $j('#etapa').val()) {
+      var $fieldNotaExame = notaExameField(matriculaId, cc.id, cc.nota_exame);
+
+      if (cc.nota_exame == '' && safeToLowerCase(cc.situacao) != 'em exame')
+        $fieldNotaExame.children().hide();
+
+      $fieldNotaExame.appendTo($targetElement);
+    }
+
+  }
+
+  faltaField(matriculaId, cc.id, cc.falta_atual).appendTo($targetElement);
+
+  if (useParecer)
+    parecerField(matriculaId, cc.id, cc.parecer_atual).appendTo($targetElement);
+}
+
+function updateComponenteCurricularHeaders($targetElement, $tagElement) {
+  var useNota                = $tableSearchDetails.data('details').tipo_nota != 'nenhum';
+  var useParecer             = $tableSearchDetails.data('details').tipo_parecer_descritivo != 'nenhum';
+
+  $tagElement.clone().addClass('center').html(safeUtf8Decode('Situação')).appendTo($targetElement);
+
+  if (useNota) {
+    $tagElement.clone().addClass('center').html('Nota').appendTo($targetElement);
+
+    if ($tableSearchDetails.data('details').quantidade_etapas == $j('#etapa').val())
+      $tagElement.clone().addClass('center').html('Nota exame').appendTo($targetElement);
+  }
+
+  $tagElement.clone().addClass('center').html('Falta').appendTo($targetElement);
+
+  if (useParecer)
+    $tagElement.clone().addClass('center').html('Parecer descritivo').appendTo($targetElement);
+}
+
+function updateComponenteCurriculares($targetElement, matriculaId, componentesCurriculares) {
+  var useNota                = $tableSearchDetails.data('details').tipo_nota != 'nenhum';
+  var useParecer             = $tableSearchDetails.data('details').tipo_parecer_descritivo != 'nenhum';
+
+  var $ccHeader = $j('<tr />').addClass('strong');
+
+  $j('<td />').addClass('center').html('Componente curricular').appendTo($ccHeader);
+  updateComponenteCurricularHeaders($ccHeader, $j('<td />'));
+
+  $ccHeader.appendTo($targetElement);
+
+  $j.each(componentesCurriculares, function(index, cc) {
+    var $ccRow = $j('<tr />');
+
+    $j('<td />').addClass('center').html(cc.nome).appendTo($ccRow);
+    updateComponenteCurricular($ccRow, matriculaId, cc);
+
+    $ccRow.appendTo($targetElement);
+  });
+}
+
+
+function updateResourceRow(dataResponse) {
+  var matriculaId     = dataResponse.matricula_id;
+  var ccId            = dataResponse.componente_curricular_id;
+
+  var $situacaoField  = $j('#situacao-matricula-' + matriculaId + '-cc-' + ccId);
+  var $fieldNotaExame = $j('#nota-exame-matricula-' + matriculaId + '-cc-' + ccId);
+
+  $situacaoField.html(dataResponse.situacao);
+  colorizeSituacaoTd($situacaoField.closest('td'), dataResponse.situacao);
+
+  if (! $fieldNotaExame.is(':visible') &&
+     ($fieldNotaExame.val() != '' || safeToLowerCase(dataResponse.situacao) == 'em exame')) {
+
+    $fieldNotaExame.show();
+    $fieldNotaExame.focus();
+  }
+  else if($fieldNotaExame.val() == '' && safeToLowerCase(dataResponse.situacao) != 'em exame')
+    $fieldNotaExame.hide();
+}
+
+function colorizeSituacaoTd(tdElement, situacao) {
+  if (safeToLowerCase(situacao) == 'retido')
+    $j(tdElement).addClass('error');
+  else
+    $j(tdElement).removeClass('error');
+}
+
+function canSearch(){
+
+  if ($j('#ref_cod_matricula').val() == '' &&  $j('#ref_cod_componente_curricular').val() == '') {
+    alert(safeUtf8Decode('Selecione um Componente curricular e/ou uma Matrícula'));
+    return false;
+  }
+
+  return true;
+}
+
+function selectNextOption($selectElement){
+  var $nextOption = $selectElement.find('option:selected').next('option');
+
+  if ($nextOption.val() != undefined) {
+    $selectElement.val($nextOption.val());
+
+    clearSearchResult();
+    $j('#botao_busca').click();
+  }
+
+  else {
+    alert(safeUtf8Decode('Você chegou na ultima opção.'));
+    showSearchForm();
+  }
+}
+
+function nextComponenteCurricular(){
+  selectNextOption($j('#ref_cod_componente_curricular'));
+}
+
+function nextMatricula(){
+  selectNextOption($j('#ref_cod_matricula'));
+}
+
+function showNextSelectionButton() {
+  var $ccField        = $j('#ref_cod_componente_curricular');
+  var $matriculaField = $j('#ref_cod_matricula');
+
+  if ($ccField.val() != '') {
+    $j("<a href='#'>Proximo componente curricular</a>").bind('click', nextComponenteCurricular)
+                                .attr('style', 'text-decoration: underline')
+                                .appendTo($navActions);
+  }
+
+  if ($matriculaField.val() != '') {
+    $j("<a href='#'>Proxima matricula</a>").bind('click', nextMatricula)
+                                .attr('style', 'text-decoration: underline')
+                                .appendTo($navActions);
+  }
+}
diff --git a/ieducar/modules/Avaliacao/Assets/Javascripts/Promocao.js b/ieducar/modules/Avaliacao/Assets/Javascripts/Promocao.js
new file mode 100644
index 0000000..ccbce5f
--- /dev/null
+++ b/ieducar/modules/Avaliacao/Assets/Javascripts/Promocao.js
@@ -0,0 +1,121 @@
+// variaveis usadas pelo modulo Frontend/Process.js
+
+processOptions.validatesResourcesAfterSearch = false;
+
+// #DEPRECADO, migrar para novo padrao processOptions
+var PAGE_URL_BASE      = 'promocao';
+var API_URL_BASE       = 'promocaoApi';
+var RESOURCE_NAME      = 'promocao';
+var RESOURCES_NAME     = 'quantidade_matriculas';
+var POST_LABEL         = '';
+var DELETE_LABEL       = '';
+var SEARCH_ORIENTATION = '';
+
+// funcoes usados pelo modulo Frontend/Process.js
+var onClickSelectAllEvent = false;
+var onClickActionEvent    = false;
+var onClickDeleteEvent    = false;
+
+//url builders
+
+var setTableSearchDetails = function(){ }
+
+var postPromocaoMatricula = function(){
+  var $proximoMatriculaIdField = $j('#proximo-matricula-id');
+  $proximoMatriculaIdField.data('initial_matricula_id', $proximoMatriculaIdField.val())
+
+  if (validatesIfValueIsNumeric($proximoMatriculaIdField.val())) {
+    var options = {
+      url : postResourceUrlBuilder.buildUrl(API_URL_BASE, 'promocao', {matricula_id : $proximoMatriculaIdField.val()}),
+      dataType : 'json',
+      data : {
+        instituicao_id : $j('#instituicao_id').val(),
+        ano_escolar : $j('#ano_escolar').val(),
+      },
+      success : handlePostPromocaoMatricula
+    };
+
+    postResource(options);
+  }
+}
+
+
+var deleteOldComponentesCurriculares = function() {
+  var options = {
+    url : deleteResourceUrlBuilder.buildUrl(API_URL_BASE, 'old_componentes_curriculares', {ano_escolar : $j('#ano_escolar').val()}),
+    dataType : 'json',
+    data : {},
+    success : handleDelete
+  };
+
+  deleteResource(options);
+}
+
+
+//callback handlers
+
+function handlePostPromocaoMatricula(dataResponse){
+  handleMessages(dataResponse.msgs);
+
+  var $proximoMatriculaIdField = $j('#proximo-matricula-id');
+  $proximoMatriculaIdField.val(dataResponse.result.proximo_matricula_id);
+
+  if($j('#continuar-processo').is(':checked') &&
+     $j.isNumeric($proximoMatriculaIdField.val()) &&
+     $proximoMatriculaIdField.data('initial_matricula_id') != $proximoMatriculaIdField.val()){
+    $j('#promover-matricula').click();
+  }
+  else if(($j('#continuar-processo').is(':checked') &&
+         $proximoMatriculaIdField.data('initial_matricula_id') == $proximoMatriculaIdField.val()) ||
+         ! $j.isNumeric($proximoMatriculaIdField.val())){
+    alert('Processo finalizado');
+  }
+}
+
+
+function handleDelete(dataResponse){
+  handleMessages(dataResponse.msgs);
+}
+
+function handleSearch($resultTable, dataResponse) {
+  var $text = $j('<p />').html('Quantidade de matrículas em andamento: ' +
+                              dataResponse.quantidade_matriculas + '<br />');
+
+  $j('<input />').attr('type', 'checkbox').attr('id', 'continuar-processo').attr('name', 'continuar-processo').appendTo($text);
+  $j('<span />').html('Continuar processo <br />').appendTo($text);
+
+  $j('<span />').html('proxima matricula:').appendTo($text);
+  $j('<input />').attr('type', 'text').attr('name', 'proximo-matricula-id').attr('id', 'proximo-matricula-id').val('0').appendTo($text);
+
+  $j('<br />').appendTo($text);
+
+  $j('<a />').attr('id', 'promover-matricula')
+            .attr('href', '#')
+            .html('Iniciar processo')
+            .attr('style', 'text-decoration:underline')
+            .bind('click', postPromocaoMatricula)
+            .appendTo($text);
+
+  $j('<span />').html(' ').appendTo($text);
+
+  $j('<a />').attr('id', 'delete-old-componentes-curriculares')
+            .attr('href', '#')
+            .html('Limpar antigos componentes curriculares')
+            .attr('style', 'text-decoration:underline')
+            .bind('click', deleteOldComponentesCurriculares)
+            .appendTo($text);
+
+  $j('<span />').html(' ').appendTo($text);
+
+  $j('<a />').attr('id', 'clear-messages')
+            .attr('href', '#')
+            .html('Limpar mensagens')
+            .attr('style', 'text-decoration:underline')
+            .bind('click', function(){
+              $j('#feedback-messages').children().remove();
+              $j('#feedback-messages-success').children().remove();
+            })
+            .appendTo($text);
+
+  $j('<td />').html($text).appendTo($j('<tr />').appendTo($resultTable));
+}
\ No newline at end of file
diff --git a/ieducar/modules/Avaliacao/Fixups/CleanComponentesCurriculares.php b/ieducar/modules/Avaliacao/Fixups/CleanComponentesCurriculares.php
new file mode 100644
index 0000000..6865200
--- /dev/null
+++ b/ieducar/modules/Avaliacao/Fixups/CleanComponentesCurriculares.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * i-Educar - Sistema de gestão escolar
+ *
+ * Copyright (C) 2006  Prefeitura Municipal de Itajaí
+ *                     <ctima@itajai.sc.gov.br>
+ *
+ * Este programa é software livre; você pode redistribuí-lo e/ou modificá-lo
+ * sob os termos da Licença Pública Geral GNU conforme publicada pela Free
+ * Software Foundation; tanto a versão 2 da Licença, como (a seu critério)
+ * qualquer versão posterior.
+ *
+ * Este programa é distribuí­do na expectativa de que seja útil, porém, SEM
+ * NENHUMA GARANTIA; nem mesmo a garantia implí­cita de COMERCIABILIDADE OU
+ * ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. Consulte a Licença Pública Geral
+ * do GNU para mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral do GNU junto
+ * com este programa; se não, escreva para a Free Software Foundation, Inc., no
+ * endereço 59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * @author    Lucas D'Avila <lucasdavila@portabilis.com.br>
+ * @category  i-Educar
+ * @license   @@license@@
+ * @package   Portabilis
+ * @since     Arquivo disponível desde a versão 1.1.0
+ * @version   $Id$
+ */
+
+require_once 'lib/Portabilis/Utils/Database.php';
+
+/**
+ * CleanComponentesCurriculares class.
+ *
+ * @author    Lucas D'Avila <lucasdavila@portabilis.com.br>
+ * @category  i-Educar
+ * @license   @@license@@
+ * @package   Portabilis
+ * @since     Classe disponível desde a versão 1.1.0
+ * @version   @@package_version@@
+ */
+
+/* Ao desvincular componente curriculares, as notas, medias e faltas lançadas para estes continuam na base de dados
+  impedindo que o aluno seja promovido, caso todas notas ou faltas destes componentes não tenham sido lançadas.
+  para impedir isto, é removido as notas, medias e faltas lançadas para os componentes removidos.
+*/
+
+class CleanComponentesCurriculares {
+
+  public static function destroyOldResources($anoEscolar) {
+    self::destroyOldNotas($anoEscolar);
+    self::destroyOldNotasMedias($anoEscolar);
+    self::destroyOldFaltas($anoEscolar);
+  }
+
+  protected static function destroyOldNotas($anoEscolar) {
+    $sql = "delete from modules.nota_componente_curricular where id in (
+              select ncc.id from modules.nota_componente_curricular as ncc,
+                     modules.nota_aluno as na,
+                     pmieducar.matricula as m,
+                     pmieducar.matricula_turma as mt
+
+              where ncc.nota_aluno_id = na.id and
+                    m.cod_matricula = na.matricula_id and
+                    m.cod_matricula = mt.ref_cod_matricula and
+                    m.ativo = 1 and
+                    mt.ativo = m.ativo and
+                    m.ano = $1 and
+                    --m.aprovado = 3 and
+
+                    CASE WHEN (select 1 from modules.componente_curricular_turma
+                               WHERE componente_curricular_turma.turma_id = mt.ref_cod_turma AND
+                               componente_curricular_turma.escola_id = m.ref_ref_cod_escola limit 1) = 1 THEN
+
+                      ncc.componente_curricular_id not in (select cct.componente_curricular_id from modules.componente_curricular_turma as cct where
+                                                           cct.turma_id = mt.ref_cod_turma)
+
+
+                    ELSE
+                      ncc.componente_curricular_id not in (select ccs.ref_cod_disciplina from pmieducar.escola_serie_disciplina as ccs where
+                                                           ccs.ref_ref_cod_serie = m.ref_ref_cod_serie and
+                                                           ccs.ref_ref_cod_escola = m.ref_ref_cod_escola and ccs.ativo = 1)
+                    END
+            );";
+
+    self::fetchPreparedQuery($sql, array('params' => $anoEscolar));
+  }
+
+  protected static function destroyOldNotasMedias($anoEscolar) {
+    $sql = "delete from modules.nota_componente_curricular_media where nota_aluno_id||componente_curricular_id in (
+              select nccm.nota_aluno_id|| nccm.componente_curricular_id from modules.nota_componente_curricular_media as nccm,
+                     modules.nota_aluno as na,
+                     pmieducar.matricula as m,
+                     pmieducar.matricula_turma as mt
+
+              where nccm.nota_aluno_id = na.id and
+                    m.cod_matricula = na.matricula_id and
+                    m.cod_matricula = mt.ref_cod_matricula and
+                    m.ativo = 1 and
+                    mt.ativo = m.ativo and
+                    m.ano = $1 and
+                    --m.aprovado = 3 and
+
+                    CASE WHEN (select 1 from modules.componente_curricular_turma
+                               WHERE componente_curricular_turma.turma_id = mt.ref_cod_turma AND
+                               componente_curricular_turma.escola_id = m.ref_ref_cod_escola limit 1) = 1 THEN
+
+                      nccm.componente_curricular_id not in (select cct.componente_curricular_id from modules.componente_curricular_turma as cct where
+                                                           cct.turma_id = mt.ref_cod_turma)
+
+
+                    ELSE
+                      nccm.componente_curricular_id not in (select ccs.ref_cod_disciplina from pmieducar.escola_serie_disciplina as ccs where
+                                                           ccs.ref_ref_cod_serie = m.ref_ref_cod_serie and
+                                                           ccs.ref_ref_cod_escola = m.ref_ref_cod_escola and ccs.ativo = 1)
+                    END
+            );";
+
+    self::fetchPreparedQuery($sql, array('params' => $anoEscolar));
+  }
+
+  protected static function destroyOldFaltas($anoEscolar) {
+    $sql = "delete from modules.falta_componente_curricular where id in (
+              select fcc.id from modules.falta_componente_curricular as fcc,
+                     modules.falta_aluno as fa,
+                     pmieducar.matricula as m,
+                     pmieducar.matricula_turma as mt
+
+              where fcc.falta_aluno_id = fa.id and
+                    m.cod_matricula = fa.matricula_id and
+                    m.cod_matricula = mt.ref_cod_matricula and
+                    m.ativo = 1 and
+                    mt.ativo = m.ativo and
+                    m.ano = $1 and
+                    --m.aprovado = 3 and
+
+                    CASE WHEN (select 1 from modules.componente_curricular_turma
+                               WHERE componente_curricular_turma.turma_id = mt.ref_cod_turma AND
+                               componente_curricular_turma.escola_id = m.ref_ref_cod_escola limit 1) = 1 THEN
+
+                      fcc.componente_curricular_id not in (select cct.componente_curricular_id from modules.componente_curricular_turma as cct where
+                                                           cct.turma_id = mt.ref_cod_turma)
+
+                    ELSE
+                      fcc.componente_curricular_id not in (select ccs.ref_cod_disciplina from pmieducar.escola_serie_disciplina as ccs where
+                                                           ccs.ref_ref_cod_serie = m.ref_ref_cod_serie and
+                                                           ccs.ref_ref_cod_escola = m.ref_ref_cod_escola and ccs.ativo = 1)
+                    END
+
+                    );";
+    self::fetchPreparedQuery($sql, array('params' => $anoEscolar));
+  }
+
+  // wrappers for Portabilis*Utils*
+
+  protected static function fetchPreparedQuery($sql, $options = array()) {
+    return Portabilis_Utils_Database::fetchPreparedQuery($sql, $options);
+  }
+
+}
+?>
\ No newline at end of file
--
libgit2 0.21.2