FGS Database Features

Gemfile

@@ -45,6 +45,9 @@ gem 'exifr', '~> 1.3', '>= 1.3.9'
 
 gem "aws-sdk-s3", require: false
 
+# Vessel for webcrawling
+gem "ferrum"
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]

Gemfile.lock

@@ -106,6 +106,11 @@ GEM
     erubi (1.10.0)
     execjs (2.8.1)
     exifr (1.3.9)
+    ferrum (0.15)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (~> 0.7)
     ffi (1.15.4)
     globalid (1.0.0)
       activesupport (>= 5.0)
@@ -234,6 +239,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webrick (1.8.2)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -254,6 +260,7 @@ DEPENDENCIES
   byebug
   capybara (>= 3.26)
   exifr (~> 1.3, >= 1.3.9)
+  ferrum
   image_processing (~> 1.12, >= 1.12.2)
   jbuilder (~> 2.7)
   listen (~> 3.3)

app/assets/stylesheets/application.scss

@@ -26,6 +26,19 @@ img.flipped {
   transform: scaleX(-1);
 }
 
+.GradeableImages {
+  .ImageThumbnail {
+    cursor: pointer;
+  }
+  .ImageFill {
+    width: 100%;
+    height: 100%;
+  }
+  .ImageFullscreen {
+    width: 100%;
+  }
+}
+
 
 // Style overrides
 body {
@@ -72,3 +85,6 @@ body {
     text-decoration: none;
   }
 }
+.list-unstyled {
+  margin-bottom: 0;
+}

app/controllers/grading_controller.rb

@@ -1,5 +1,7 @@
 class GradingController < ApplicationController
 
+  skip_before_action :verify_authenticity_token, only: [:grade]
+
   def index
     @user_grading_set = current_user.user_grading_set_for(params[:grading_set_id])
     if !@user_grading_set.image_complete?
@@ -34,15 +36,7 @@ def grade
       )
     end
     @user_grading_set_image.flipped = params[:flipped] == '1'
-    @user_grading_set_image.grading_data = params.permit(grading_data: [
-      :photo_quality,
-      :is_everted,
-      :tf_grade,
-      :ti_grade,
-      :ts_grade,
-      :upper_lid_tt_grade,
-      :lower_lid_tt_grade
-    ])['grading_data']
+    @user_grading_set_image.grading_data = JSON.parse(params[:grading_data])
     @user_grading_set_image.save!
     flash.notice = "#{@user_grading_set.grading_set.name} image grade saved!"
     redirect_to action: 'index', grading_set_id: params[:grading_set_id]

app/controllers/grading_sets_controller.rb

@@ -51,9 +51,11 @@ def create
   end
 
   def data
-    @grading_set = GradingSet.find params[:id]
+    # @grading_set = GradingSet.find params[:id]
     stream_csv_response filename: 'report.csv',
-      enumerator: @grading_set.csv_enumerator
+      enumerator: UserGradingSetImage.data_csv_enumerator({
+        grading_sets: {id: params[:id]}
+      })
   end
 
   def destroy
@@ -96,16 +98,12 @@ def removeuser
   end
 
   def removeimage
-    @grading_set = GradingSet.find params[:id]
-    @image = Image.find params[:image_id]
-    @grading_set_image = GradingSetImage.where({
-      image: @image,
-      grading_set: @grading_set
-    }).first
+    @grading_set_image = GradingSetImage.find params[:grading_set_image_id]
+    name = @grading_set_image.gradeable.name
     if @grading_set_image && @grading_set_image.destroy
-      flash.notice = "#{@image.filename} removed from grading set"
+      flash.notice = "#{name} removed from grading set"
     else
-      flash.alert = "Unable to remove #{@image.filename} from grading set"
+      flash.alert = "Unable to remove #{name} from grading set"
     end
     redirect_to action: 'show'
   end

app/controllers/home_controller.rb

@@ -5,11 +5,12 @@ class HomeController < ApplicationController
   skip_before_action :require_login
 
   def index
-    if current_user
-      @user_grading_sets = current_user.user_grading_sets
-        .order('created_at desc')
-        .limit(3)
-    end
+    redirect_to controller: 'dashboard'
+    # if current_user
+    #   @user_grading_sets = current_user.user_grading_sets
+    #     .order('created_at desc')
+    #     .limit(3)
+    # end
   end
 
 end

app/controllers/image_sets_controller.rb

@@ -0,0 +1,112 @@
+class ImageSetsController < ApplicationController
+  include CsvStreamable
+
+  before_action :require_image_viewer, only: [:index, :show]
+  before_action :require_admin, only: [:addtogradingset]
+
+  skip_before_action :verify_authenticity_token, only: [:addtogradingset, :gradingdata, :metadata]
+
+  def index
+    @pagesize = 50
+    @limit = (params[:limit] || @pagesize).to_i
+    @offset = (params[:offset] || 0).to_i
+    @image_sets = search_image_sets
+      .includes(:image_set_images, :grading_sets)
+      .limit(@limit).offset(@offset)
+    @image_sets_count = search_image_sets.count
+    @image_sources = ImageSource.active.order('name desc')
+    @metadata_keys = ImageSet.all_metadata_keys
+    respond_to do |format|
+      format.html 
+      format.json { render json: {images: @images} }
+    end
+
+  end
+
+  def show
+    @image_set = ImageSet.find params[:id]
+  end
+
+  def new
+
+  end
+
+  def update
+
+  end
+
+  def create
+
+  end
+
+  def destroy
+
+  end
+
+  def set_images
+
+  end
+
+  def download
+
+  end
+
+  def metadata
+    stream_csv_response filename: 'metadata.csv',
+      enumerator: ImageSet.csv_metadata_enumerator(search_image_set_ids)
+  end
+
+
+  def addtogradingset
+    @grading_set = GradingSet.find params[:grading_set_id]
+    unless @grading_set
+      return redirect_to({ action: 'index' }, flash: { error: "No such grading set" })
+    end
+    if params[:image_set_id_all] == 'all'
+      @image_set_ids = search_image_sets.select(:id).map(&:id)
+      @count = GradingSetImage.upsert_all(@image_set_ids.map {|image_set_id|
+        {
+          gradeable_id: image_set_id, 
+          gradeable_type: 'ImageSet', 
+          grading_set_id: @grading_set.id,
+          created_at: Time.zone.now,
+          updated_at: Time.zone.now
+        }
+      }, unique_by: [:grading_set_id, :gradeable_id], returning: [:id]).count
+    else
+      @count = GradingSetImage.upsert_all(params[:image_set_ids].map {|image_set_id|
+        {
+          gradeable_id: image_set_id, 
+          gradeable_type: 'ImageSet', 
+          grading_set_id: @grading_set.id,
+          created_at: Time.zone.now,
+          updated_at: Time.zone.now
+        }
+      }, unique_by: [:grading_set_id, :gradeable_id], returning: [:id]).count
+    end
+    return redirect_to({ action: 'index' }, flash: {
+      success: "Successfully added #{@count} image sets to #{@grading_set.name}"
+    })
+  end
+
+  def gradingdata
+    stream_csv_response filename: 'image_set_gradingdata.csv',
+      enumerator: UserGradingSetImage.data_csv_enumerator({
+        image_sets: params
+      })
+  end
+
+  private
+
+    def image_set_params
+      params.require(:image_set).permit(:name, :image_source_id, :metadata)
+    end
+
+    def search_image_sets
+      ImageSet.search(params)
+    end
+
+    def search_image_set_ids
+      search_image_sets.select(:id).map(&:id)
+    end
+end

app/controllers/image_sources_controller.rb

@@ -76,7 +76,12 @@ def image_urls
   private
 
     def image_source_params
-      params.require(:image_source).permit(:name, :active)
+      params.require(:image_source).permit(
+        :name, 
+        :active,
+        :create_image_sets,
+        :create_image_sets_metadata_field
+      )
     end
 
     def metadata_params

app/controllers/images_controller.rb

@@ -6,16 +6,16 @@ class ImagesController < ApplicationController
   before_action :require_admin, only: [:addtogradingset]
 
   skip_before_action :verify_authenticity_token, 
-    only: [:addtogradingset, :metadata, :exif_data]
+    only: [:addtogradingset, :metadata, :exif_data, :gradingdata]
 
   skip_forgery_protection only: [:index]
 
   def index
     @pagesize = 50
     @limit = (params[:limit] || @pagesize).to_i
     @offset = (params[:offset] || 0).to_i
-    @images = search_images.limit(@limit).offset(@offset)
-    @images_count = search_images.count
+    @images = Image.search(params).limit(@limit).offset(@offset)
+    @images_count = Image.search(params).count
     @image_sources = ImageSource.active.order('name desc')
     @metadata_keys = Image.all_metadata_keys
     respond_to do |format|
@@ -61,24 +61,26 @@ def addtogradingset
       return redirect_to({ action: 'index' }, flash: { error: "No such grading set" })
     end
     if params[:image_id_all] == 'all'
-      @image_ids = search_images.select(:id).map(&:id)
+      @image_ids = Image.search(params).select(:id).map(&:id)
       @count = GradingSetImage.upsert_all(@image_ids.map {|image_id|
         {
-          image_id: image_id, 
+          gradeable_id: image_id, 
+          gradeable_type: 'Image', 
           grading_set_id: @grading_set.id,
           created_at: Time.zone.now,
           updated_at: Time.zone.now
         }
-      }, unique_by: [:grading_set_id, :image_id], returning: [:id]).count
+      }, unique_by: [:grading_set_id, :gradeable_id], returning: [:id]).count
     else
       @count = GradingSetImage.upsert_all(params[:image_ids].map {|image_id|
         {
-          image_id: image_id, 
+          gradeable_id: image_id, 
+          gradeable_type: 'Image', 
           grading_set_id: @grading_set.id,
           created_at: Time.zone.now,
           updated_at: Time.zone.now
         }
-      }, unique_by: [:grading_set_id, :image_id], returning: [:id]).count
+      }, unique_by: [:grading_set_id, :gradeable_id], returning: [:id]).count
     end
     return redirect_to({ action: 'index' }, flash: {
       success: "Successfully added #{@count} images to #{@grading_set.name}"
@@ -87,19 +89,26 @@ def addtogradingset
 
   def metadata
     stream_csv_response filename: 'metadata.csv',
-      enumerator: Image.csv_metadata_enumerator(search_image_ids)
+      enumerator: Image.csv_metadata_enumerator(search_image_ids(params))
   end
 
   def exif_data
     stream_csv_response filename: 'exif_data.csv',
-      enumerator: Image.csv_exif_data_enumerator(search_image_ids)
+      enumerator: Image.csv_exif_data_enumerator(search_image_ids(params))
   end
 
   def download
     @image_sources = ImageSource.active.order("name desc").all
     @image_source_id = params[:image_source_id]
   end
 
+  def gradingdata
+    stream_csv_response filename: 'image_gradingdata.csv',
+      enumerator: UserGradingSetImage.data_csv_enumerator({
+        images: params
+      })
+  end
+
   # def update
   #   @image = Image.find params[:id]
   #   respond_to do |format|
@@ -122,44 +131,8 @@ def new_image_params
       )
     end
 
-    def search_images
-      wheres = ["1=1"]
-      wheres_params = {}
-      joins = []
-      unless params[:metadata_key].blank?
-        safe_key = params[:metadata_key].gsub("'", "") # remove single quotes
-        wheres << "images.metadata->>'#{safe_key}' like :metadata_value"
-        wheres_params[:metadata_value] = "%#{params[:metadata_value]}%"
-      end
-      unless params[:image_ids].blank?
-        wheres << 'images.id in (:image_ids)'
-        wheres_params[:image_ids] = params[:image_ids]
-      end
-      unless params[:filename].blank?
-        wheres << 'filename ilike :filename'
-        wheres_params[:filename] = "%#{params[:filename]}%"
-      end
-      unless params[:image_source_id].blank?
-        wheres << 'image_source_id = :image_source_id'
-        wheres_params[:image_source_id] = params[:image_source_id]
-      end
-      unless params[:image_source].blank?
-        joins << :image_source
-        wheres << 'image_sources.name ilike :image_source'
-        wheres_params[:image_source] = "%#{params[:image_source]}%"
-      end
-      unless params[:grading_set].blank?
-        joins << :grading_sets
-        wheres << 'grading_sets.name ilike :grading_set'
-        wheres_params[:grading_set] = "%#{params[:grading_set]}%"
-      end
-      Image.active.joins(joins)
-        .order("images.filename asc")
-        .where(wheres.join(" and "), wheres_params)
-    end
-
-    def search_image_ids
-      search_images.select(:id).map(&:id)
+    def search_image_ids(params)
+      Image.search(params).select(:id).map(&:id)
     end
 
 end