effective_memberships 0.4.10 → 0.4.13

data/app/views/effective/applicants/stamp.html.haml

@@ -1,28 +1,27 @@
 = render 'layout' do
   = render 'effective/applicants/content', resource: resource
 
-  .card
-    .card-body
-      %p Should your application be approved, you are eligible to receive a Professional Stamp.
+  = card do
+    %p Should your application be approved, you are eligible to receive a Professional Stamp.
 
-      %p Please confirm your name as it should appear on any Professional Stamp.
+    %p Please confirm your name as it should appear on any Professional Stamp.
 
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.fields_for(:stamps, f.object.stamp) do |fs|
-          = fs.hidden_field :applicant_id
-          = fs.hidden_field :applicant_type
+      = f.fields_for(:stamps, f.object.stamp) do |fs|
+        = fs.hidden_field :applicant_id
+        = fs.hidden_field :applicant_type
 
-          = fs.hidden_field :user_id
-          = fs.hidden_field :user_type
+        = fs.hidden_field :user_id
+        = fs.hidden_field :user_type
 
-          = fs.hidden_field :price
-          = fs.hidden_field :tax_exempt
-          = fs.hidden_field :qb_item_name
+        = fs.hidden_field :price
+        = fs.hidden_field :tax_exempt
+        = fs.hidden_field :qb_item_name
 
-          = render 'effective/stamps/fields', f: fs
+        = render 'effective/stamps/fields', f: fs
 
-        %p Stamps will be processed after approval of this application.
+      %p Stamps will be processed after approval of this application.
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/app/views/effective/applicants/start.html.haml

@@ -1,11 +1,10 @@
 = render 'layout' do
   = render 'effective/applicants/content', resource: resource
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
-        = f.save 'Save and Continue'
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+      = f.save 'Save and Continue'
 
   -# .card
   -#   .card-body

data/app/views/effective/applicants/submitted.html.haml

@@ -12,16 +12,15 @@
       = render 'effective/applicants/missing_info', applicant: resource
 
   - unless resource.approved?
-    .card
-      .card-body
-        %p
-          Your application must still be approved.
-          We will send
-          %strong= resource.user.email
-          an email notifying you of the application's approval status.
-
-  .card
-    .card-body= render 'effective/applicants/summary', applicant: resource
+    = card do
+      %p
+        Your application must still be approved.
+        We will send
+        %strong= resource.user.email
+        an email notifying you of the application's approval status.
+
+  = card do
+    = render 'effective/applicants/summary', applicant: resource
 
   - if resource.min_applicant_references.to_i > 0 || resource.applicant_references.present?
     = card do

data/app/views/effective/applicants/transcripts.html.haml

@@ -0,0 +1,13 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  = card do
+    .mb-2= render('transcripts_requirements', applicant: resource)
+
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = f.check_box :declare_will_send_transcripts,
+        label: "Yes, I will request my transcripts be sent directly from the insitiution to the registrar.", required: true
+
+      = f.save 'Save and Continue'

data/app/views/effective/fee_payments/_declarations.html.haml

@@ -1,16 +1,9 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= fee_payment.wizard_step_title(:declarations)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
-
-    %table.table.table-sm
-      %tbody
-        %tr
-          %td= icon('check')
-          %td Yes, I hereby certify that I have read and will adhere to the Code of Ethics
-        %tr
-          %td= icon('check')
-          %td Yes, I hereby certify that the statements and information contained herein are correct
+= wizard_card(fee_payment) do
+  %table.table.table-sm
+    %tbody
+      %tr
+        %td= icon('check')
+        %td Yes, I hereby certify that I have read and will adhere to the Code of Ethics
+      %tr
+        %td= icon('check')
+        %td Yes, I hereby certify that the statements and information contained herein are correct

data/app/views/effective/fee_payments/_demographics.html.haml

@@ -1,9 +1,2 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= fee_payment.wizard_step_title(:demographics)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
-
-    = render 'users/demographics', parent: fee_payment, user: fee_payment.user
+= wizard_card(fee_payment)
+  = render 'users/demographics', parent: fee_payment, user: fee_payment.user

data/app/views/effective/fee_payments/_fee_payment.html.haml

@@ -1,3 +1,4 @@
 .effective-fee-payment
   - fee_payment.render_steps.each do |partial|
-    = render "effective/fee_payments/#{partial}", fee_payment: fee_payment, resource: fee_payment, step: partial
+    - fee_payment.render_step = partial
+    = render "effective/fee_payments/#{partial}", fee_payment: fee_payment

data/app/views/effective/fee_payments/_organization.html.haml

@@ -1,9 +1,2 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= fee_payment.wizard_step_title(:organization)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:organization)) if edit_effective_wizard?
-
-    = render 'organizations/demographics', parent: fee_payment, organization: fee_payment.organization
+= wizard_card(fee_payment)
+  = render 'organizations/demographics', parent: fee_payment, organization: fee_payment.organization

data/app/views/effective/fee_payments/billing.html.haml

@@ -3,12 +3,11 @@
 
   - raise('expected owner to respond to billing_address') unless resource.owner.respond_to?(:billing_address)
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.fields_for(f.object.owner_symbol, f.object.owner) do |fo|
-          = effective_address_fields(fo, :billing)
+      = f.fields_for(f.object.owner_symbol, f.object.owner) do |fo|
+        = effective_address_fields(fo, :billing)
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/app/views/effective/fee_payments/checkout.html.haml

@@ -1,6 +1,5 @@
 = render 'layout' do
   = render 'effective/fee_payments/content', resource: resource
 
-  .card
-    .card-body
-      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))
+  = card do
+    = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))

data/app/views/effective/fee_payments/declarations.html.haml

@@ -6,15 +6,14 @@
   - resource.declare_code_of_ethics = completed
   - resource.declare_truth = completed
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.check_box :declare_code_of_ethics,
-          label: 'Yes, I hereby certify that I have read and will adhere to the Code of Ethics'
+      = f.check_box :declare_code_of_ethics,
+        label: 'Yes, I hereby certify that I have read and will adhere to the Code of Ethics'
 
-        = f.check_box :declare_truth,
-          label: 'Yes, I hereby certify that the statements and information contained herein are correct'
+      = f.check_box :declare_truth,
+        label: 'Yes, I hereby certify that the statements and information contained herein are correct'
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/app/views/effective/fee_payments/demographics.html.haml

@@ -1,12 +1,11 @@
 = render 'layout' do
   = render 'effective/fee_payments/content', resource: resource
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.fields_for(:user, f.object.user) do |fu|
-          = render 'users/fields_demographics', f: fu, user: f.object.user, parent: resource
+      = f.fields_for(:user, f.object.user) do |fu|
+        = render 'users/fields_demographics', f: fu, user: f.object.user, parent: resource
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/app/views/effective/fee_payments/organization.html.haml

@@ -1,18 +1,17 @@
 = render 'layout' do
   = render 'effective/fee_payments/content', resource: resource
 
-  .card
-    .card-body
-      - datatable = EffectiveResources.best('EffectiveRepresentativesDatatable').new(self, organization: resource.organization)
+  = card do
+    - datatable = EffectiveResources.best('EffectiveRepresentativesDatatable').new(self, organization: resource.organization)
 
-      %h2 Representatives
-      = render_datatable(datatable, inline: true, simple: true)
+    %h2 Representatives
+    = render_datatable(datatable, inline: true, simple: true)
 
-      %h2 Organization Info
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+    %h2 Organization Info
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.fields_for(:organization, f.object.organization) do |fo|
-          = render 'organizations/fields_demographics', f: fo, organization: f.object.organization, parent: resource
+      = f.fields_for(:organization, f.object.organization) do |fo|
+        = render 'organizations/fields_demographics', f: fo, organization: f.object.organization, parent: resource
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/app/views/effective/fee_payments/start.html.haml

@@ -1,37 +1,36 @@
 = render 'layout' do
   = render 'effective/fee_payments/content', resource: resource
 
-  .card
-    .card-body
-      - outstanding_owners = current_user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
+  = card do
+    - outstanding_owners = current_user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
 
-      - if outstanding_owners.blank?
-        %p You have no fees due at this time.
-        = link_to 'Home', root_path, class: 'btn btn-primary'
+    - if outstanding_owners.blank?
+      %p You have no fees due at this time.
+      = link_to 'Home', root_path, class: 'btn btn-primary'
 
-      - else
-        %p You have the following fees due at this time:
+    - else
+      %p You have the following fees due at this time:
 
-        - outstanding_owners.each do |owner|
-          %h3= owner
-          = render_purchasables(owner.outstanding_fee_payment_fees)
+      - outstanding_owners.each do |owner|
+        %h3= owner
+        = render_purchasables(owner.outstanding_fee_payment_fees)
 
-        = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-          = f.hidden_field :id
-          = f.hidden_field :user_type
-          = f.hidden_field :user_id
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+        = f.hidden_field :user_type
+        = f.hidden_field :user_id
 
-          - if outstanding_owners.length == 1
-            - resource.organization = outstanding_owners.first if outstanding_owners.first.kind_of?(EffectiveMemberships.Organization)
+        - if outstanding_owners.length == 1
+          - resource.organization = outstanding_owners.first if outstanding_owners.first.kind_of?(EffectiveMemberships.Organization)
 
-            %p Continue with fee payment for #{resource.owner}.
+          %p Continue with fee payment for #{resource.owner}.
 
-            = f.hidden_field :organization_id
+          = f.hidden_field :organization_id
 
-          - if outstanding_owners.length > 1
-            %p You have multiple memberships that require a fee payment. They must be purchased separately.
-            %p Please select an individual or organization to continue:
+        - if outstanding_owners.length > 1
+          %p You have multiple memberships that require a fee payment. They must be purchased separately.
+          %p Please select an individual or organization to continue:
 
-            = f.select :organization_id, effective_memberships_select_fee_payment_organization(resource)
+          = f.select :organization_id, effective_memberships_select_fee_payment_organization(resource)
 
-          = f.save 'Save and Continue'
+        = f.save 'Save and Continue'

data/app/views/effective/fee_payments/submitted.html.haml

@@ -9,8 +9,8 @@
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
-  .card
-    .card-body= render 'effective/fee_payments/summary', fee_payment: resource
+  = card do
+    = render 'effective/fee_payments/summary', fee_payment: resource
 
   .mb-4
     = collapse('Show fee payment...', card_class: 'my-2') do

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -25,6 +25,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :min_applicant_experiences_months
       t.integer :min_applicant_references
       t.integer :min_applicant_endorsements
+      t.integer :min_applicant_equivalences
       t.integer :min_applicant_courses
       t.integer :min_applicant_files
 
@@ -208,6 +209,11 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :applicant_experiences_months
       t.text :applicant_experiences_details
 
+      # Transcripts
+      t.date :transcripts_received_on
+      t.string :transcripts_status
+      t.text :transcripts_details
+
       # Additional Information
       t.text :additional_information
 
@@ -325,6 +331,24 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     add_index :applicant_endorsements, :applicant_id
     add_index :applicant_endorsements, :token
 
+    # Applicant Equivalences
+    create_table :applicant_equivalences do |t|
+      t.integer :applicant_id
+      t.string :applicant_type
+
+      t.string :name
+
+      t.date :start_on
+      t.date :end_on
+
+      t.text :notes
+
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    add_index :applicant_equivalences, :applicant_id
+
     # Applicant Courses
     create_table :applicant_course_areas do |t|
       t.string :title

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.10'
+  VERSION = '0.4.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,6 +290,7 @@ files:
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_endorsements_datatable.rb
+- app/datatables/effective_applicant_equivalences_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb
 - app/datatables/effective_applicant_references_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
@@ -314,6 +315,7 @@ files:
 - app/models/effective/applicant_course_name.rb
 - app/models/effective/applicant_education.rb
 - app/models/effective/applicant_endorsement.rb
+- app/models/effective/applicant_equivalence.rb
 - app/models/effective/applicant_experience.rb
 - app/models/effective/applicant_reference.rb
 - app/models/effective/applicant_review.rb
@@ -340,6 +342,7 @@ files:
 - app/views/admin/applicants/_form_decline.html.haml
 - app/views/admin/applicants/_form_missing_info.html.haml
 - app/views/admin/applicants/_form_process.html.haml
+- app/views/admin/applicants/_form_transcripts.html.haml
 - app/views/admin/applicants/_status.html.haml
 - app/views/admin/categories/_form.html.haml
 - app/views/admin/categories/_form_applicant.html.haml
@@ -393,6 +396,7 @@ files:
 - app/views/effective/applicants/_demographics.html.haml
 - app/views/effective/applicants/_education.html.haml
 - app/views/effective/applicants/_endorsements.html.haml
+- app/views/effective/applicants/_equivalences.html.haml
 - app/views/effective/applicants/_experience.html.haml
 - app/views/effective/applicants/_files.html.haml
 - app/views/effective/applicants/_layout.html.haml
@@ -404,6 +408,8 @@ files:
 - app/views/effective/applicants/_select_organization.html.haml
 - app/views/effective/applicants/_stamp.html.haml
 - app/views/effective/applicants/_summary.html.haml
+- app/views/effective/applicants/_transcripts.html.haml
+- app/views/effective/applicants/_transcripts_requirements.html.haml
 - app/views/effective/applicants/billing.html.haml
 - app/views/effective/applicants/checkout.html.haml
 - app/views/effective/applicants/course_amounts.html.haml
@@ -411,6 +417,7 @@ files:
 - app/views/effective/applicants/demographics.html.haml
 - app/views/effective/applicants/education.html.haml
 - app/views/effective/applicants/endorsements.html.haml
+- app/views/effective/applicants/equivalences.html.haml
 - app/views/effective/applicants/experience.html.haml
 - app/views/effective/applicants/files.html.haml
 - app/views/effective/applicants/organization.html.haml
@@ -420,6 +427,7 @@ files:
 - app/views/effective/applicants/start.html.haml
 - app/views/effective/applicants/submitted.html.haml
 - app/views/effective/applicants/summary.html.haml
+- app/views/effective/applicants/transcripts.html.haml
 - app/views/effective/fee_payments/_content.html.haml
 - app/views/effective/fee_payments/_dashboard.html.haml
 - app/views/effective/fee_payments/_declarations.html.haml