Permite duplicar um registro já criado e ajusta envios de etapas anteriores.

.github/workflows/tests.yml

@@ -9,10 +9,12 @@ on:
 
 jobs:
   default:
-
+    
     name: Unit and Integration
-
-    runs-on: self-hosted
+
+    if: '! github.event.pull_request.draft'
+
+    runs-on: ubuntu-latest
 
     env:
       RAILS_ENV: test

Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 ruby '2.4.10'
 
 gem 'active_model_serializers', '0.9.3'
-gem 'activerecord-connections', git: 'https://github.com/ricardohsd/activerecord-connections.git'
-gem 'activerecord-tableless', '2.0.0'
+gem 'activerecord-connections', git: 'https://github.com/portabilis/activerecord-connections.git'
+gem "activerecord-tablefree", "~> 3.0"
 gem 'audited', git: 'https://github.com/portabilis/audited.git'
 gem 'aws-sdk-s3', '~>1.83.0'
 gem 'backbone-nested-attributes', '0.3.0', git: 'https://github.com/samuelsimoes/backbone-nested-attributes.git'
@@ -23,45 +23,47 @@ gem 'devise', '>= 4.7.1'
 gem 'discard', '1.0.0'
 gem 'ejs', '1.1.1'
 gem 'enumerate_it', '1.3.1'
-gem 'foreigner', '1.6.1'
 gem 'handlebars_assets', '0.23.2'
-gem 'has_scope', '0.5.1'
+gem 'has_scope', '0.7.2'
 gem 'honeybadger', '4.5.6'
-gem 'i18n_alchemy', '0.2.1', git: 'https://github.com/giustin/i18n_alchemy.git', branch: 'master', tag: 'v0.2.1'
+gem 'i18n_alchemy', '0.3.1'
 gem 'jbuilder', '2.9.1'
 gem 'js-routes', '1.4.9'
 gem 'kaminari', '>= 1.2.1'
 gem 'less-rails', '3.0.0'
+gem 'loofah', '2.18.0'
 gem 'mask_validator', '0.2.1'
 gem 'momentjs-rails', '>= 2.9.0'
 gem 'non-stupid-digest-assets', '1.0.9'
-gem 'pg', '0.17.1'
+gem 'pg', '~> 0.18.0'
 gem 'pg_query', '1.2.0'
 gem 'postgres-copy', '1.0.0'
-gem 'prawn', '2.1.2', git: 'https://github.com/portabilis/prawn.git', branch: 'master', tag: 'v2.1.2'
+gem 'prawn', '2.1.2', git: 'https://github.com/portabilis/prawn.git', branch: 'master'
 gem 'prawn-table', '0.2.2'
 gem 'puma', '5.6.4'
 gem 'pundit', '0.3.0'
 gem 'rack-cors', '>= 1.0.4 ', require: 'rack/cors'
 gem 'rack-protection', '1.5.5'
-gem 'rails', '4.2.11.1'
+gem 'rails', '5.0.7.2'
 gem 'rake', '>= 12.3.3'
 gem 'redis', '3.3.5'
 gem 'redis-session-store', '0.11.1'
-gem 'responders', '2.1.0'
+gem 'responders', '2.4.1'
 gem 'rest-client', '2.0.2'
-gem 'route_translator', git: 'https://github.com/enriclluelles/route_translator.git', tag: 'v4.1.0'
+gem 'route_translator', git: 'https://github.com/enriclluelles/route_translator.git', tag: 'v5.10.0'
 gem 'rubyzip', '>= 1.3.0', require: 'zip'
 gem 'sd_notify', '0.1.1'
 gem 'sidekiq', '5.2.5'
 gem 'sidekiq-unique-jobs', '6.0.22'
 gem 'simple_form', '4.0.0'
 gem 'therubyracer', '0.12.3'
-gem 'twitter-bootstrap-rails', '3.2.0'
+gem 'twitter-bootstrap-rails', '3.2.2'
 gem 'uglifier', '4.1.20'
 gem 'uri_validator', '0.2.0'
 gem 'validates_timeliness', '3.0.14'
 gem 'webpacker', '~> 4.x'
+gem 'scenic', '~> 1.7'
+gem 'tilt', '2.1.0'
 
 instance_eval File.read('Gemfile.plugins') if File.exist?('Gemfile.plugins')
 
@@ -70,11 +72,12 @@ group :development do
   gem 'meta_request', '0.7.2'
   gem 'pry-byebug', '3.4.2'
   gem 'pry-remote', '0.1.8'
-  gem 'quiet_assets', '1.1.0'
   gem 'rubocop', '0.59.2', require: false
   gem 'spring', '2.0.2'
   gem 'spring-commands-rspec', '1.0.4'
-  gem 'letter_opener_web', '~> 1.0'
+  gem 'letter_opener_web', '~> 1.3.4'
+  gem 'listen', '~> 3.0.5'
+  gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :test do
@@ -85,9 +88,11 @@ group :test do
   gem 'factory_girl_rails', '4.5.0'
   gem 'faker', '1.9.1'
   gem 'gherkin', '2.12.2'
+  gem 'nokogiri', '1.9.1'
   gem 'pdf-inspector', '1.2.1', require: 'pdf/inspector'
   gem 'pry', '0.10.3'
-  gem 'rspec-rails', '3.4.0'
+  gem 'rails-controller-testing', '~> 1.0.5'
+  gem 'rspec-rails', '3.5.2'
   gem 'rspec-retry', '0.6.2 '
   gem 'rspec-sidekiq', '3.0.3'
   gem 'rspec-wait', '0.0.9'
@@ -101,5 +106,5 @@ group :test do
 end
 
 group :test, :development do
-  gem 'bullet', '4.14.10'
+  gem 'bullet', '6.1.5'
 end

Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

app/assets/javascripts/fetch_students_in_recovery.js

@@ -1,8 +1,21 @@
+let $loadingClone = $('#page-loading').clone(true).appendTo('body');
+
 function fetchStudentsInRecovery(classroom, discipline, exam_rule, step_id, recorded_at, success_callback) {
-  if (_.isEmpty(step_id) || _.isEmpty(moment(recorded_at, 'MM-DD-YYYY')._i) || exam_rule.recovery_type === 0) {
+  let date = moment(recorded_at, 'DD/MM/YYYY', true);
+  if (_.isEmpty(step_id) || _.isEmpty(date._i) || !date.isValid() || exam_rule.recovery_type === 0) {
     return;
   }
 
+  $loadingClone.removeClass('hidden');
+
+  success_callback = (function() {
+    let cached_function = success_callback;
+    return function() {
+      cached_function.apply(this, arguments);
+      $loadingClone.addClass('hidden');
+    };
+  })();
+
   $.ajax({
     url: Routes.in_recovery_students_pt_br_path({
       classroom_id: classroom,
@@ -26,5 +39,6 @@ function loadDecimalMasks() {
 }
 
 function handleFetchStudentsInRecoveryError() {
+  $loadingClone.addClass('hidden');
   flashMessages.error('Ocorreu um erro ao buscar os alunos.');
 }

app/assets/javascripts/summernote.js

@@ -0,0 +1,68 @@
+function createSummerNote(element, options = {}) {
+  $(element).summernote({
+    lang: 'pt-BR',
+    toolbar: options.toolbar || [],
+    disableDragAndDrop : true,
+    callbacks : {
+      onPaste : function (event) {
+        var thisNote = $(this);
+        var updatePastedText = function(someNote){
+          var original = someNote.summernote('code');
+          var cleaned = CleanPastedHTML(original);
+
+          someNote.summernote('code', cleaned);
+        };
+
+        setTimeout(function () {
+          updatePastedText(thisNote);
+        }, 10);
+      }
+    }
+  });
+
+  if (options.disabled) {
+    $(element).each(function(index, el) {
+      $(el).summernote('disable');
+    })
+  }
+}
+
+function CleanPastedHTML(input) {
+  var stringStripper = /(\n|\r| class=(")?Mso[a-zA-Z]+(")?)/g;
+  var output = input.replace(stringStripper, ' ');
+  var commentSripper = new RegExp('<!--(.*?)-->','g');
+  var output = output.replace(commentSripper, '');
+  var tagStripper = new RegExp('<(/)*(meta|link|span|\\?xml:|st1:|o:|font)(.*?)>','gi');
+  output = output.replace(tagStripper, '');
+  var badTags = getTags(output)
+  for (var i=0; i< badTags.length; i++) {
+    tagStripper = new RegExp('<'+badTags[i]+'.*?'+badTags[i]+'(.*?)>', 'gi');
+    output = output.replace(tagStripper, '');
+  }
+  var badAttributes = ['style', 'start', 'class'];
+  for (var i=0; i< badAttributes.length; i++) {
+    var attributeStripper = new RegExp(' ' + badAttributes[i] + '="(.*?)"','gi');
+    output = output.replace(attributeStripper, '');
+  }
+
+  return output;
+}
+
+function getTags(htmlString){
+  var tmpTag = document.createElement("div");
+  tmpTag.innerHTML = htmlString;
+
+  var all = tmpTag.getElementsByTagName("*");
+  var goodTags = ['DIV', 'P', 'B', 'I', 'U', 'BR'];
+  var tags = [];
+
+  for (var i = 0, max = all.length; i < max; i++) {
+    var tagname = all[i].tagName;
+
+    if (tags.indexOf(tagname) == -1 && !goodTags.includes(tagname)) {
+      tags.push(tagname);
+    }
+  }
+
+  return tags
+}

app/assets/javascripts/templates/transfer_notes/current_notes_row.jst.ejs

@@ -4,25 +4,23 @@
   </td>
 
   <td>
-    <% if(id > 0){ %>
-      <%= note %>
-    <% } else {%>
     <div class="control-group string required transfer_note_daily_note_students_note">
       <div class="controls input">
         <input class="form-control string required decimal" type="decimal" name="transfer_note[daily_note_students_attributes][<%= element_id %>][note]" id="transfer_note_daily_note_students_attributes_<%= element_id %>_note" value="<%= note %>">
       </div>
     </div>
+
     <input type="hidden" name="transfer_note[daily_note_students_attributes][<%= element_id %>][id]"
-        id="transfer_note_daily_note_students_attributes_<%= element_id %>_id" value="<%= id %>">
+      id="transfer_note_daily_note_students_attributes_<%= element_id %>_id" value="<%= id %>">
 
     <input type="hidden" name="transfer_note[daily_note_students_attributes][<%= element_id %>][student_id]"
-        id="transfer_note_daily_note_students_attributes_<%= element_id %>_student_id" value="<%= student.id %>">
+      id="transfer_note_daily_note_students_attributes_<%= element_id %>_student_id" value="<%= student.id %>">
 
     <input type="hidden" name="transfer_note[daily_note_students_attributes][<%= element_id %>][daily_note_id]"
-        id="transfer_note_daily_note_students_attributes_<%= element_id %>_daily_note_id" value="<%= daily_note_id %>">
+      id="transfer_note_daily_note_students_attributes_<%= element_id %>_daily_note_id" value="<%= daily_note_id %>">
 
     <input type="hidden" name="transfer_note[daily_note_students_attributes][<%= element_id %>][active]"
-        id="transfer_note_daily_note_students_attributes_<%= element_id %>_active" value="<%= true %>">
-    <% } %>
+      id="transfer_note_daily_note_students_attributes_<%= element_id %>_active" value="<%= true %>">
+
   </td>
 </tr>

app/assets/javascripts/views/complementary_exams/form.js

@@ -78,7 +78,8 @@ $(function () {
             discipline: discipline_id,
             show_inactive: false,
             with_recovery_note_in_step: with_recovery_note_in_step,
-            score_type: 'numeric'
+            score_type: 'numeric',
+            status_attending: true
           },
           format: 'json'
         }),

app/assets/javascripts/views/daily_frequencies/edit_multiple.js

@@ -51,7 +51,7 @@ $(function () {
     }
   };
 
-  $('a, button').on('click', function(e) {
+  $('a:not(.no-confirm), button:not(.no-confirm)').on('click', function(e) {
     if (!showConfirmation) {
       return true;
     }
@@ -62,7 +62,7 @@ $(function () {
     modalOptions = Object.assign(modalOptions, {
       callback: function(result) {
         if (result) {
-          $('input[type=submit]').click();
+          $('input[type=submit].new-save-style').click();
         } else {
           e.target.click();
         }
@@ -86,3 +86,35 @@ $(function () {
 
   $('.alert-success, .alert-danger').fadeTo(700, 0.1).fadeTo(700, 1.0);
 });
+
+$(document).ready(function () {
+  $("label.checkbox-frequency:not(.checkbox-batch) input[type=checkbox]").click(function() {
+    let el = $(this);
+
+    el.closest('div').find('.hidden-justified').prop('disabled', true).val(null);
+
+    switch (el.data('status')) {
+      case 'present':
+        el.data('status', 'absent');
+        el.prop('indeterminate', false);
+        el.prop('checked', true);
+        el.closest('label').removeClass('justified');
+        break;
+
+      case 'justified':
+        el.data('status', 'present');
+        el.prop('indeterminate', true);
+        el.prop('checked', false);
+        el.closest('label').addClass('justified');
+        el.closest('div').find('.hidden-justified').prop('disabled', false).val(-1);
+        break;
+
+      case 'absent':
+      default:
+        el.data('status', 'justified');
+        el.prop('indeterminate', false);
+        el.prop('checked', false);
+        el.closest('label').removeClass('justified');
+    }
+  });
+});