Willy-nilly fixes

.gitattributes

@@ -0,0 +1,2 @@
+# Treat devbox.lock as binary to prevent it from showing in diffs
+devbox.lock binary

README.md

@@ -15,6 +15,40 @@ Check out our demo at https://osem.copyleft.dev
 ## Installation
 Please refer to our [installation guide](INSTALL.md).
 
+## DEBUG MAIL ISSUES
+
+If you're experiencing email delivery problems, use these commands to diagnose SMTP configuration issues.
+For these tests, it supposes that you have a valid .env.production file in your home directory.
+
+### Show current mail configuration
+```bash
+bundle exec rake mail:config
+```
+
+### Test SMTP connection and send test email
+```bash
+[email protected] bundle exec rake mail:test
+```
+
+The test command will:
+- Display your SMTP settings (with passwords hidden)
+- Show detailed SMTP protocol conversation for debugging
+- Attempt to send a test email
+- Provide troubleshooting hints if delivery fails
+
+**Common issues:**
+- Authentication method mismatch (try `OSEM_SMTP_AUTHENTICATION=login` instead of `plain`)
+- SSL certificate verification (try `OSEM_SMTP_OPENSSL_VERIFY_MODE=none` for testing)
+
+### Using with devbox
+
+If you're using [devbox](https://www.jetpack.io/devbox/docs/quickstart/) for development, prefix commands with `devbox run`:
+
+```bash
+devbox run bundle exec rake mail:config
+devbox run [email protected] bundle exec rake mail:test
+```
+
 ## How to contribute to OSEM
 Please refer to our [contributing guide](CONTRIBUTING.md).
 

app/assets/javascripts/application.js

@@ -45,6 +45,7 @@
 //= require selectize
 //= require bootstrap-select
 //= require osem-survey
+//= require osem-bulk-email
 
 $(document).ready(function() {
     $('a[disabled=disabled]').click(function(event){

app/assets/javascripts/osem-bulk-email.js

@@ -0,0 +1,143 @@
+$(document).ready(function() {
+  // Bulk Email Recipient Management
+
+  // Select All button
+  $('#select-all-btn').click(function() {
+    $('.recipient-checkbox').prop('checked', true);
+    updateRecipientCount();
+  });
+
+  // Deselect All button
+  $('#deselect-all-btn').click(function() {
+    $('.recipient-checkbox').prop('checked', false);
+    updateRecipientCount();
+  });
+
+  // Remove Selected button
+  $('#remove-selected-btn').click(function() {
+    $('.recipient-checkbox:checked').each(function() {
+      $(this).closest('.recipient-item').slideUp(300, function() {
+        $(this).remove();
+        updateRecipientCount();
+      });
+    });
+  });
+
+  // Update count when individual checkboxes are changed
+  $(document).on('change', '.recipient-checkbox', function() {
+    updateRecipientCount();
+  });
+
+  // Update recipient count display
+  function updateRecipientCount() {
+    var checkedCount = $('.recipient-checkbox:checked').length;
+    var totalCount = $('.recipient-checkbox').length;
+    $('#recipient-count').text(totalCount);
+
+    // Update the next button state
+    if (checkedCount === 0) {
+      $('#next-compose-btn').prop('disabled', true).text('Select Recipients First');
+    } else {
+      $('#next-compose-btn').prop('disabled', false).text('Next: Compose Email (' + checkedCount + ' selected)');
+    }
+  }
+
+  // Initialize count on page load
+  if ($('.recipient-checkbox').length > 0) {
+    updateRecipientCount();
+  }
+
+  // Form validation for recipients step
+  $('#recipients-form').submit(function(e) {
+    var checkedCount = $('.recipient-checkbox:checked').length;
+    if (checkedCount === 0) {
+      e.preventDefault();
+      alert('Please select at least one recipient before proceeding.');
+      return false;
+    }
+  });
+
+  // Dynamic recipient filtering (if needed for future enhancement)
+  $('#filter-recipients-input').on('keyup', function() {
+    var value = $(this).val().toLowerCase();
+    $('.recipient-item').filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
+    });
+  });
+
+  // Preview email functionality
+  $('#preview-email-btn').click(function() {
+    var subject = $('#subject').val();
+    var body = $('#body').val();
+
+    if (subject.trim() === '' || body.trim() === '') {
+      alert('Please enter both subject and body before previewing.');
+      return;
+    }
+
+    // Create preview modal (assuming Bootstrap modal)
+    var modalHtml = '<div class="modal fade" id="email-preview-modal" tabindex="-1">' +
+                    '<div class="modal-dialog modal-lg">' +
+                    '<div class="modal-content">' +
+                    '<div class="modal-header">' +
+                    '<button type="button" class="close" data-dismiss="modal">&times;</button>' +
+                    '<h4 class="modal-title">Email Preview</h4>' +
+                    '</div>' +
+                    '<div class="modal-body">' +
+                    '<p><strong>Subject:</strong> ' + subject + '</p>' +
+                    '<hr>' +
+                    '<div style="white-space: pre-wrap;">' + body + '</div>' +
+                    '</div>' +
+                    '<div class="modal-footer">' +
+                    '<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>' +
+                    '</div>' +
+                    '</div>' +
+                    '</div>' +
+                    '</div>';
+
+    $('body').append(modalHtml);
+    $('#email-preview-modal').modal('show').on('hidden.bs.modal', function() {
+      $(this).remove();
+    });
+  });
+
+  // Character counter for email body
+  $('#body').on('input', function() {
+    var length = $(this).val().length;
+    var counter = $('#char-counter');
+    if (counter.length === 0) {
+      $(this).after('<small id="char-counter" class="text-muted">Characters: 0</small>');
+      counter = $('#char-counter');
+    }
+    counter.text('Characters: ' + length);
+  });
+
+  // Auto-save draft functionality (localStorage)
+  var draftKey = 'bulk-email-draft-' + window.location.pathname;
+
+  // Load draft on page load
+  if (localStorage.getItem(draftKey)) {
+    var draft = JSON.parse(localStorage.getItem(draftKey));
+    if (draft.subject) $('#subject').val(draft.subject);
+    if (draft.body) $('#body').val(draft.body);
+
+    if (draft.subject || draft.body) {
+      $('<div class="alert alert-info">').text('Draft restored from previous session.').insertBefore('form');
+    }
+  }
+
+  // Save draft as user types
+  $('#subject, #body').on('input', function() {
+    var draft = {
+      subject: $('#subject').val(),
+      body: $('#body').val(),
+      timestamp: new Date().toISOString()
+    };
+    localStorage.setItem(draftKey, JSON.stringify(draft));
+  });
+
+  // Clear draft on successful send
+  $('form[action*="send_bulk"]').submit(function() {
+    localStorage.removeItem(draftKey);
+  });
+});

app/controllers/admin/emails_controller.rb

@@ -22,8 +22,195 @@ def index
       @settings = @conference.email_settings
     end
 
+    def bulk
+      authorize! :index, @conference.email_settings
+      @step = params[:step] || 'filter'
+
+      case @step
+      when 'filter'
+        @registrations = @conference.registrations.includes(:user, :qanswers)
+        @questions = @conference.questions.includes(:qanswers)
+      when 'recipients'
+        @selected_recipients = filtered_recipients(params[:filter_type], params[:search_term])
+        @filter_type = params[:filter_type]
+        @search_term = params[:search_term]
+      when 'compose'
+        if params[:bulk_session_token]
+          @bulk_session = BulkEmailSession.active.find_by(token: params[:bulk_session_token])
+          if @bulk_session && !@bulk_session.expired?
+            @recipient_emails = @bulk_session.recipient_emails
+            @filter_type = @bulk_session.filter_type
+            @search_term = @bulk_session.search_term
+          else
+            redirect_to bulk_admin_conference_emails_path(@conference.short_title, step: 'filter'),
+                        alert: 'Bulk email session expired. Please start again.'
+            return
+          end
+        else
+          # Fallback to old method for backward compatibility
+          @recipient_emails = params[:recipient_emails] || []
+          @filter_type = params[:filter_type]
+          @search_term = params[:search_term]
+        end
+      end
+    end
+
+    def recipients
+      authorize! :index, @conference.email_settings
+
+      recipients = filtered_recipients(params[:filter_type], params[:search_term])
+
+      render json: {
+        recipients: recipients.map do |user|
+          {
+            id:    user.id,
+            name:  user.name,
+            email: user.email
+          }
+        end,
+        count:      recipients.count
+      }
+    end
+
+    def create_bulk_session
+      authorize! :index, @conference.email_settings
+
+      recipient_emails = params[:recipient_emails] || []
+      filter_type = params[:filter_type]
+      search_term = params[:search_term]
+
+      if recipient_emails.empty?
+        redirect_to bulk_admin_conference_emails_path(@conference.short_title, step: 'recipients',
+                                                      filter_type: filter_type, search_term: search_term),
+                    alert: 'No recipients selected.'
+        return
+      end
+
+      # Clean up any expired sessions
+      BulkEmailSession.cleanup_expired!
+
+      # Create new session
+      @bulk_session = BulkEmailSession.create!(
+        recipient_emails: recipient_emails,
+        filter_type: filter_type,
+        search_term: search_term
+      )
+
+      redirect_to bulk_admin_conference_emails_path(@conference.short_title, step: 'compose',
+                                                    bulk_session_token: @bulk_session.token)
+    end
+
+    def send_bulk
+      authorize! :index, @conference.email_settings
+
+      subject = params[:subject]
+      body = params[:body]
+
+      # Get recipient emails from either bulk session or direct params
+      if params[:bulk_session_token]
+        bulk_session = BulkEmailSession.active.find_by(token: params[:bulk_session_token])
+        if bulk_session && !bulk_session.expired?
+          recipient_emails = bulk_session.recipient_emails
+        else
+          redirect_to bulk_admin_conference_emails_path(@conference.short_title, step: 'filter'),
+                      alert: 'Bulk email session expired. Please start again.'
+          return
+        end
+      else
+        recipient_emails = params[:recipient_emails] || []
+      end
+
+      if subject.blank? || body.blank?
+        redirect_to bulk_admin_conference_emails_path(@conference.short_title, step: 'compose'),
+                    alert: 'Subject and body are required.'
+        return
+      end
+
+      if recipient_emails.empty?
+        redirect_to bulk_admin_conference_emails_path(@conference.short_title, step: 'recipients'),
+                    alert: 'No recipients selected.'
+        return
+      end
+
+      recipients = User.where(email: recipient_emails)
+
+      recipients.each do |user|
+        Mailbot.bulk_mail(@conference, user, subject, body).deliver_later
+        Rails.logger.info "Bulk email queued - Subject: '#{subject}' - Recipient: #{user.email}"
+      end
+
+      # Clean up the bulk session after use
+      bulk_session&.destroy
+
+      redirect_to admin_conference_emails_path(@conference.short_title),
+                  notice: "Bulk email sent to #{recipients.count} recipients."
+    end
+
     private
 
+    def filtered_recipients(filter_type, search_term = nil)
+      base_users = get_base_user_set(filter_type)
+      apply_search_filter(base_users, search_term)
+    end
+
+    def get_base_user_set(filter_type)
+      registrations = @conference.registrations.includes(:user, :qanswers)
+
+      case filter_type
+      when 'no_questions_answered'
+        users_with_no_answers(registrations)
+      when 'some_questions_answered'
+        users_with_some_answers(registrations)
+      when 'all_questions_answered'
+        users_with_all_answers(registrations)
+      when 'all_registered'
+        registrations.map(&:user)
+      when 'not_registered'
+        User.where.not(id: registrations.map(&:user_id))
+      when 'all_users'
+        User.all
+      else
+        []
+      end
+    end
+
+    def users_with_no_answers(registrations)
+      registrations.select { |r| r.qanswers.empty? }.map(&:user)
+    end
+
+    def users_with_some_answers(registrations)
+      total_questions = @conference.questions.count
+      registrations.select { |r| r.qanswers.any? && r.qanswers.count < total_questions }.map(&:user)
+    end
+
+    def users_with_all_answers(registrations)
+      total_questions = @conference.questions.count
+      registrations.select { |r| r.qanswers.count >= total_questions }.map(&:user)
+    end
+
+    def apply_search_filter(base_users, search_term)
+      return base_users if search_term.blank?
+
+      if base_users.respond_to?(:where)
+        base_users.where('name ILIKE ? OR email ILIKE ?', "%#{search_term}%", "%#{search_term}%")
+      else
+        search_in_memory(base_users, search_term)
+      end
+    end
+
+    def search_in_memory(users, search_term)
+      lower_term = search_term.downcase
+      users.select { |u| user_matches_search?(u, lower_term) }
+    end
+
+    def user_matches_search?(user, search_term)
+      user.name&.downcase&.include?(search_term) || user.email&.downcase&.include?(search_term)
+    end
+
+    def bulk_email_params
+      params.permit(:subject, :body, :filter_type)
+    end
+
     def email_params
       params.require(:email_settings).permit(:send_on_registration,
                                              :send_on_accepted, :send_on_rejected, :send_on_confirmed_without_registration,