605: Add user origin to school dashboard, fix relationships

app/controllers/admin/projects_controller.rb

@@ -5,7 +5,7 @@ class ProjectsController < Admin::ApplicationController
     before_action :set_host_for_local_storage
 
     def scoped_resource
-      resource_class.internal_projects
+      action_name == 'index' ? resource_class.internal_projects : resource_class.all
     end
 
     def destroy_image

app/dashboards/class_student_dashboard.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'administrate/base_dashboard'
+
+class ClassStudentDashboard < Administrate::BaseDashboard
+  # ATTRIBUTE_TYPES
+  # a hash that describes the type of each of the model's fields.
+  #
+  # Each different type represents an Administrate::Field object,
+  # which determines how the attribute is displayed
+  # on pages throughout the dashboard.
+  ATTRIBUTE_TYPES = {
+    school_class: Field::HasOne,
+    student_id: Field::String,
+    created_at: Field::DateTime,
+    updated_at: Field::DateTime
+  }.freeze
+
+  # COLLECTION_ATTRIBUTES
+  # an array of attributes that will be displayed on the model's index page.
+  #
+  # By default, it's limited to four items to reduce clutter on index pages.
+  # Feel free to add, remove, or rearrange items.
+  COLLECTION_ATTRIBUTES = %i[
+    student_id
+    created_at
+    updated_at
+  ].freeze
+
+  # SHOW_PAGE_ATTRIBUTES
+  # an array of attributes that will be displayed on the model's show page.
+  SHOW_PAGE_ATTRIBUTES = %i[
+    student_id_changed
+    created_at
+    updated_at
+  ].freeze
+
+  # FORM_ATTRIBUTES
+  # an array of attributes that will be displayed
+  # on the model's form (`new` and `edit`) pages.
+  FORM_ATTRIBUTES = %i[].freeze
+
+  # COLLECTION_FILTERS
+  # a hash that defines filters that can be used while searching via the search
+  # field of the dashboard.
+  #
+  # For example to add an option to search for open resources by typing "open:"
+  # in the search field:
+  #
+  #   COLLECTION_FILTERS = {
+  #     open: ->(resources) { resources.where(open: true) }
+  #   }.freeze
+  COLLECTION_FILTERS = {}.freeze
+
+  # Overwrite this method to customize how school classes are displayed
+  # across all pages of the admin dashboard.
+  #
+  # def display_resource(school_class)
+  #   "SchoolClass ##{school_class.id}"
+  # end
+end

app/dashboards/class_teacher_dashboard.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'administrate/base_dashboard'
+
+class ClassTeacherDashboard < Administrate::BaseDashboard
+  # ATTRIBUTE_TYPES
+  # a hash that describes the type of each of the model's fields.
+  #
+  # Each different type represents an Administrate::Field object,
+  # which determines how the attribute is displayed
+  # on pages throughout the dashboard.
+  ATTRIBUTE_TYPES = {
+    school_class: Field::HasOne,
+    teacher_id: Field::String,
+    created_at: Field::DateTime,
+    updated_at: Field::DateTime
+  }.freeze
+
+  # COLLECTION_ATTRIBUTES
+  # an array of attributes that will be displayed on the model's index page.
+  #
+  # By default, it's limited to four items to reduce clutter on index pages.
+  # Feel free to add, remove, or rearrange items.
+  COLLECTION_ATTRIBUTES = %i[
+    teacher_id
+    created_at
+    updated_at
+  ].freeze
+
+  # SHOW_PAGE_ATTRIBUTES
+  # an array of attributes that will be displayed on the model's show page.
+  SHOW_PAGE_ATTRIBUTES = %i[
+    teacher_id
+    created_at
+    updated_at
+  ].freeze
+
+  # FORM_ATTRIBUTES
+  # an array of attributes that will be displayed
+  # on the model's form (`new` and `edit`) pages.
+  FORM_ATTRIBUTES = %i[].freeze
+
+  # COLLECTION_FILTERS
+  # a hash that defines filters that can be used while searching via the search
+  # field of the dashboard.
+  #
+  # For example to add an option to search for open resources by typing "open:"
+  # in the search field:
+  #
+  #   COLLECTION_FILTERS = {
+  #     open: ->(resources) { resources.where(open: true) }
+  #   }.freeze
+  COLLECTION_FILTERS = {}.freeze
+
+  # Overwrite this method to customize how school classes are displayed
+  # across all pages of the admin dashboard.
+  #
+  # def display_resource(class_teacher)
+  #   class_teacher.teacher.name
+  # end
+end

app/dashboards/lesson_dashboard.rb

@@ -14,7 +14,7 @@ class LessonDashboard < Administrate::BaseDashboard
     school_class: Field::BelongsTo,
     parent: Field::BelongsTo,
     copies: Field::HasMany,
-    projects: Field::HasMany,
+    project: Field::HasOne,
     id: Field::String,
     copied_from_id: Field::String,
     user_id: Field::String,
@@ -33,9 +33,8 @@ class LessonDashboard < Administrate::BaseDashboard
   # By default, it's limited to four items to reduce clutter on index pages.
   # Feel free to add, remove, or rearrange items.
   COLLECTION_ATTRIBUTES = %i[
-    school
+    name
     school_class
-    parent
     copies
   ].freeze
 
@@ -44,9 +43,9 @@ class LessonDashboard < Administrate::BaseDashboard
   SHOW_PAGE_ATTRIBUTES = %i[
     school
     school_class
+    project
     parent
     copies
-    projects
     id
     copied_from_id
     user_id
@@ -62,20 +61,7 @@ class LessonDashboard < Administrate::BaseDashboard
   # FORM_ATTRIBUTES
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
-  FORM_ATTRIBUTES = %i[
-    school
-    school_class
-    parent
-    copies
-    projects
-    copied_from_id
-    user_id
-    name
-    description
-    visibility
-    due_date
-    archived_at
-  ].freeze
+  FORM_ATTRIBUTES = %i[].freeze
 
   # COLLECTION_FILTERS
   # a hash that defines filters that can be used while searching via the search
@@ -92,7 +78,7 @@ class LessonDashboard < Administrate::BaseDashboard
   # Overwrite this method to customize how lessons are displayed
   # across all pages of the admin dashboard.
   #
-  # def display_resource(lesson)
-  #   "Lesson ##{lesson.id}"
-  # end
+  def display_resource(lesson)
+    lesson.name
+  end
 end

app/dashboards/school_class_dashboard.rb

@@ -11,10 +11,10 @@ class SchoolClassDashboard < Administrate::BaseDashboard
   # on pages throughout the dashboard.
   ATTRIBUTE_TYPES = {
     school: Field::BelongsTo,
-    members: Field::HasMany,
+    teachers: Field::HasMany,
+    students: Field::HasMany,
     lessons: Field::HasMany,
     id: Field::String,
-    teacher_id: Field::String,
     name: Field::String,
     created_at: Field::DateTime,
     updated_at: Field::DateTime
@@ -26,33 +26,27 @@ class SchoolClassDashboard < Administrate::BaseDashboard
   # By default, it's limited to four items to reduce clutter on index pages.
   # Feel free to add, remove, or rearrange items.
   COLLECTION_ATTRIBUTES = %i[
-    school
-    members
+    name
     lessons
-    id
   ].freeze
 
   # SHOW_PAGE_ATTRIBUTES
   # an array of attributes that will be displayed on the model's show page.
   SHOW_PAGE_ATTRIBUTES = %i[
     school
-    members
     lessons
-    id
-    teacher_id
+    teachers
+    students
     name
+    id
     created_at
     updated_at
   ].freeze
 
   # FORM_ATTRIBUTES
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
-  FORM_ATTRIBUTES = %i[
-    school
-    teacher_id
-    name
-  ].freeze
+  FORM_ATTRIBUTES = %i[].freeze
 
   # COLLECTION_FILTERS
   # a hash that defines filters that can be used while searching via the search
@@ -69,7 +63,7 @@ class SchoolClassDashboard < Administrate::BaseDashboard
   # Overwrite this method to customize how school classes are displayed
   # across all pages of the admin dashboard.
   #
-  # def display_resource(school_class)
-  #   "SchoolClass ##{school_class.id}"
-  # end
+  def display_resource(school_class)
+    school_class.name
+  end
 end

app/dashboards/school_dashboard.rb

@@ -29,7 +29,8 @@ class SchoolDashboard < Administrate::BaseDashboard
     verified_at: Field::DateTime,
     rejected_at: Field::DateTime,
     created_at: Field::DateTime,
-    updated_at: Field::DateTime
+    updated_at: Field::DateTime,
+    user_origin: EnumField
   }.freeze
 
   # COLLECTION_ATTRIBUTES
@@ -39,6 +40,7 @@ class SchoolDashboard < Administrate::BaseDashboard
   # Feel free to add, remove, or rearrange items.
   COLLECTION_ATTRIBUTES = %i[
     name
+    user_origin
     reference
     country_code
     created_at
@@ -50,6 +52,7 @@ class SchoolDashboard < Administrate::BaseDashboard
   # an array of attributes that will be displayed on the model's show page.
   SHOW_PAGE_ATTRIBUTES = %i[
     name
+    user_origin
     creator
     creator_role
     creator_department

app/fields/enum_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class EnumField < Administrate::Field::Select
+  def to_s
+    # Use Rails' i18n for enums
+    return if data.blank?
+
+    I18n.t(
+      "activerecord.attributes.#{resource.class.model_name.i18n_key}.#{attribute}_values.#{data}",
+      default: data.humanize
+    )
+  end
+end

app/views/fields/enum_field/_form.html.erb

@@ -0,0 +1,6 @@
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute %>
+</div>

app/views/fields/enum_field/_index.html.erb

@@ -0,0 +1 @@
+<%= field.to_s %>

app/views/fields/enum_field/_show.html.erb

@@ -0,0 +1 @@
+<%= field.to_s %>

config/locales/admin/en.yml

@@ -20,3 +20,9 @@ en:
       reopen_school:
         success: "Successfully reopened."
         error: "There was an error reopening the school"
+  activerecord:
+    attributes:
+      school:
+        user_origin_values:
+          for_education: "Code Editor for Education"
+          experience_cs: "Experience CS"