effective_learndash 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 103df8a3518f06fe9afa329c85eb3f47dda27a3ef01c8218c906b16f521723e6
-  data.tar.gz: ed6e70df974e0d7d8fff36b6ae570d81c1ec4589c984ceee507fa4f4aa1351e4
+  metadata.gz: bbd7d00a9c8c0dd7715549afd145caf8f920a442ab76b6653e5606f1911abe4b
+  data.tar.gz: 583bfa80479b118ef76b83bb3c55566fdfc4124a5d9390b20de20202f06606e7
 SHA512:
-  metadata.gz: ceba9cfb798598e0b6b2d1917bb792307bb174ab8e476d284dbaf7cd7e6a61a34ac1c8b122de719d9e2af59a14f53b99343e170a90f6c2e6da2525f09a13cd09
-  data.tar.gz: 415ba6c5929423c5ad028603dadbb63a81e8b721e41a4f734c098475022eb72425ab9364de18a736d540cc8a2d6f82f7bf4ec4d55668861d9838e808a37eda5b
+  metadata.gz: 4b50cdb0c0621f8096fd69ca90a0ca83319164949f9254219b04b7334f7238f4dffb8ccd914f559ff01dd7fb4d1cd6799c05a7b1b8441d78fbdd676fe32ee9c8
+  data.tar.gz: a57c4396de6504918637c50afd9591ce77636680b8e658a40feceac09da92c0ce9b5e45d97f28e6ddbc582b20ab763e83ffd9963c977313bc6703566ff99bcd2

data/app/datatables/admin/effective_learndash_enrollments_datatable.rb

@@ -19,6 +19,7 @@ module Admin
       col :learndash_course
 
       col :progress_status
+      col :admin_completed, visible: false
 
       col :last_step, visible: false
       col :steps_completed, visible: false

data/app/datatables/effective_learndash_available_courses_datatable.rb

@@ -9,9 +9,7 @@ class EffectiveLearndashAvailableCoursesDatatable < Effective::Datatable
     end
 
     actions_col show: false do |learndash_course|
-      if current_user.learndash_enrollment(course: learndash_course).present?
-        'Registered. Please access from the home dashboard or applicant wizard.'
-      elsif learndash_course.can_register?
+      if learndash_course.can_register?
         dropdown_link_to('Register', effective_learndash.new_learndash_course_course_registration_path(learndash_course))
       end
     end

data/app/models/effective/learndash_enrollment.rb

@@ -8,12 +8,11 @@ module Effective
 
     log_changes(to: :learndash_course, except: [:last_synced_at]) if respond_to?(:log_changes)
 
-    # Only admin can mark finished
-    # Finished is treated as an admin override for completed?
-    PROGRESS_STATUSES = ['not-started', 'in-progress', 'completed', 'finished']
+    PROGRESS_STATUSES = ['not-started', 'in-progress', 'completed']
 
     effective_resource do
       last_synced_at      :string
+      admin_completed     :boolean
 
       # Wordpress
       progress_status     :string
@@ -28,7 +27,7 @@ module Effective
       timestamps
     end
 
-    scope :completed, -> { where(progress_status: ['completed', 'finished']) }
+    scope :completed, -> { where(progress_status: 'completed').or(where(admin_completed: true)) }
     scope :in_progress, -> { where(progress_status: 'in-progress') }
     scope :not_started, -> { where(progress_status: 'not-started') }
 
@@ -63,35 +62,27 @@ module Effective
       progress_status == 'in-progress'
     end
 
-    # Admin override to completed
-    def finished?
-      progress_status == 'finished'
-    end
-
     # Checked to see if the course is done throughout
     def completed?
-      progress_status == 'completed' || finished?
+      progress_status == 'completed' || admin_completed?
     end
 
     def completed_on
-      date_completed || (created_at if finished?)
+      date_completed
     end
 
-    def mark_as_finished!
-      update!(progress_status: 'finished')
-    end
+    # This is an admin action only
+    def mark_as_completed!
+      self.date_started ||= Time.zone.now
+      self.date_completed ||= Time.zone.now
 
-    # Guess old status
-    def unfinish!
-      if date_completed.present?
-        assign_attributes(progress_status: 'completed')
-      elsif date_started.present?
-        assign_attributes(progress_status: 'in-progress')
-      else
-        assign_attributes(progress_status: 'not-started')
-      end
+      update!(progress_status: 'completed', admin_completed: true)
+    end
 
-      save!
+    # This is an admin action only
+    def uncomplete!
+      assign_attributes(date_started: nil, date_completed: nil, progress_status: nil, admin_completed: false)
+      refresh!
     end
 
     def refresh!(force: false)
@@ -113,11 +104,19 @@ module Effective
         last_step: data[:last_step],
         steps_completed: data[:steps_completed],
         steps_total: data[:steps_total],
-        date_started: Time.use_zone('UTC') { Time.zone.parse(data[:date_started]) },
-        date_completed: (Time.use_zone('UTC') { Time.zone.parse(data[:date_completed]) } if data[:date_completed].present?)
       )
 
-      assign_attributes(progress_status: data[:progress_status]) unless finished?
+      if (date = data[:date_started]).present?
+        assign_attributes(date_started: Time.use_zone('UTC') { Time.zone.parse(date) })
+      end
+
+      if (date = data[:date_completed]).present?
+        assign_attributes(date_completed: Time.use_zone('UTC') { Time.zone.parse(date) })
+      end
+
+      unless completed?
+        assign_attributes(progress_status: data[:progress_status])
+      end
 
       true
     end

data/app/views/admin/learndash_courses/_form.html.haml

@@ -8,7 +8,7 @@
       %p Click the New button from the below table to enroll a user into this course.
       %p Enrolling a user here will enroll them on the LearnDash site.
       %p Alternately, if this course is available for registration, the enrollment will be created upon registration purchase.
-      %p Marking the course finished will allow them to proceed without completing the course on the Learndash LMS.
+      %p Marking the course completed here will allow them to proceed without completing the course on the Learndash LMS.
 
       - datatable = Admin::EffectiveLearndashEnrollmentsDatatable.new(learndash_course: learndash_course)
       = render_datatable(datatable, inline: true)
@@ -21,6 +21,6 @@
     = tab 'Wizard' do
       = render '/admin/learndash_courses/form_course_registration_content', learndash_course: learndash_course
 
-    - if learndash_course.respond_to?(:log_changes_datatable)
+    - if learndash_course.respond_to?(:logs_datatable)
       = tab "Logs" do
-        = render_inline_datatable(learndash_course.log_changes_datatable)
+        = render_inline_datatable(learndash_course.log_s_datatable)

data/app/views/admin/learndash_users/_learndash_user.html.haml

@@ -24,7 +24,7 @@
 %p 
   Click the New button from the below table to manually enroll this user into a new course.
   %br
-  %small.text-muted Marking the course finished will allow them to proceed without completing the course on the Learndash LMS.
+  %small.text-muted Marking the course completed here will allow them to proceed without completing the course on the Learndash LMS.
 
 - datatable = Admin::EffectiveLearndashEnrollmentsDatatable.new(learndash_user: learndash_user)
 = render_datatable(datatable, inline: true)

data/app/views/effective/learndash/_dashboard.html.haml

@@ -33,5 +33,6 @@
 - available = EffectiveResources.best('EffectiveLearndashAvailableCoursesDatatable').new(self)
 
 - if available.present? && authorized_registration
-  %p The following courses are available for registration:
-  = render_datatable(available, simple: true)
+  .mt-4
+    %p The following courses are available for registration:
+    = render_datatable(available, simple: true)

data/config/routes.rb

@@ -23,8 +23,8 @@ EffectiveLearndash::Engine.routes.draw do
 
     resources :learndash_enrollments, only: [:index, :new, :create, :update] do
       post :refresh, on: :member
-      post :mark_as_finished, on: :member
-      post :unfinish, on: :member
+      post :mark_as_completed, on: :member
+      post :uncomplete, on: :member
     end
 
     resources :learndash_courses, only: [:index, :edit, :update] do

data/db/migrate/101_create_effective_learndash.rb

@@ -48,6 +48,7 @@ class CreateEffectiveLearndash < ActiveRecord::Migration[6.0]
       t.integer :learndash_user_id
 
       t.datetime :last_synced_at
+      t.boolean :admin_completed, default: false
 
       # Wordpress
       t.string :progress_status

data/lib/effective_learndash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLearndash
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_learndash
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails