wco_models 3.1.0.133 → 3.1.0.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e95dc229ad1424fb5712f08008e7c36011c34d1185ea68ab62d427d2165459'
-  data.tar.gz: a315d6d0595e141555526012f89a0e9548c0a61f5107441b29ba0f8161414b28
+  metadata.gz: f667b2e3aff979297adf77e14f569164761f083784e88e6dc76735d002488f3f
+  data.tar.gz: 5cff89fae12fb7c9f8da0bd042b17d425eda08ed5c68f7b6dea78b147b082541
 SHA512:
-  metadata.gz: 0fc514ec8dffd6b0be83fd5362f512828bfe0b0bd7f199f51c1f6221a5114049c45b12334e59d4277c4f0e21ea73d0d48d7e58b33259aa2caca4218daf04ba62
-  data.tar.gz: f8f51784b26e0230d815dd68de3230ed5329eb94754c9c6a23b084e6b1c3dcdd973d4909781b5cf9ed65b7f2180a452e9a9828a365a9bce378d4ef1fa055266a
+  metadata.gz: aa88ab71277a00ded9d9e864f8e44591d6ca1617fc70d04855f7d56709949652a116ff481fa279d0375ff7382a687e86b58bf99b92c2b3d1a9fca1e7f222a13c
+  data.tar.gz: ce29ae70f121832939b6109cb86a8a5a35a5a694f56506c75580e5d64cc787b12f34ee53c9e1c551eda3d083ab36808a5397ac672489503a343a98ad8fe7fcc2

data/app/assets/stylesheets/wco/galleries.scss

@@ -24,12 +24,12 @@ div.galleries-show {
 }
 
 
-// .row-thumbs .item {
-//   margin-bottom: 1em;
-//   img {
-//     margin-top: 10px;
-//   }
-// }
+.row-thumbs {
+  .items {
+    flex-wrap: wrap;
+    align-items: flex-start;
+  }
+}
 
 .row-large .item {
   // border: 1px solid red;

data/app/assets/stylesheets/wco/photos.scss

@@ -34,6 +34,7 @@ img.thumb {
 .photos--meta-manager {
   display: flex;
   justify-content: space-between;
+  align-items: flex-start;
 
   .right-hand {
     text-align: right;

data/app/assets/stylesheets/wco/utils.scss

@@ -123,6 +123,30 @@ textarea.monospace {
 }
 
 /* H */
+
+
+.h-20px {
+  min-height: 20px;
+}
+.h-30px {
+  min-height: 30px;
+}
+.h-50px {
+  min-height: 50px;
+}
+
+.h-300px {
+  min-height: 300px;
+}
+
+.h-400px {
+  min-height: 400px;
+}
+
+.h-500px {
+  min-height: 500px;
+}
+
 .header {
   display: flex;
 
@@ -135,10 +159,11 @@ textarea.monospace {
   }
 }
 
-.h-500px {
-  min-height: 500px;
+.hide, .hidden {
+  display: none;
 }
 
+
 /* M */
 
 .maxwidth {
@@ -149,7 +174,11 @@ textarea.monospace {
 .mini {
   font-size: 0.75em;
 }
-
+.mini-inputs {
+  input[type='number'] {
+    width: 4em;
+  }
+}
 /* P */
 
 .padded {
@@ -159,6 +188,11 @@ textarea.monospace {
   width: calc( 100% - 1em );
 }
 
+/* S */
+.spacer-small {
+  height: 20px;
+}
+
 /* T */
 
 .title {
@@ -167,6 +201,21 @@ textarea.monospace {
 
 /* W */
 
+.w-20px {
+  width: 20px;
+}
+.w-30px {
+  width: 30px;
+}
+.w-50px {
+  width: 50px;
+}
+.w-150px {
+  width: 150px;
+}
+.w-200px {
+  width: 200px;
+}
 .w-300px {
   width: 300px;
 }

data/app/controllers/wco/galleries_controller.rb

@@ -1,7 +1,7 @@
 
 class Wco::GalleriesController < Wco::ApplicationController
 
-  # before_action :set_lists
+  before_action :set_lists, only: %i| show |
   before_action :set_gallery, only: %w| destroy edit j_show show update update_ordering |
 
   # Alphabetized! : )
@@ -142,5 +142,9 @@ class Wco::GalleriesController < Wco::ApplicationController
     @page_description = @gallery.subhead
   end
 
+  def set_lists
+    @galleries_list = Wco::Gallery.list
+  end
+
 end
 

data/app/controllers/wco/photos_controller.rb

@@ -8,16 +8,18 @@ class Wco::PhotosController < Wco::ApplicationController
   ## Alphabetized : )
 
   def destroy
-    @photo = Wco::Photo.unscoped.find params[:id]
-    authorize! :destroy, @photo
-    @photo.gallery.touch if @photo.gallery
-    @photo.is_trash = true
-    flag = @photo.save
-    if flag
-      flash[:notice] = "Success"
-    else
-      flash[:alert] = "No luck: #{@photo.errors.messages}"
+    authorize! :destroy, Wco::Photo
+    if params[:id]
+      @photos = [ Wco::Photo.unscoped.find( params[:id] ) ]
+    elsif params[:ids]
+      @photos = Wco::Photo.where( :id.in => params[:ids] )
     end
+    outs = []
+    @photos.map do |photo|
+      photo.gallery.touch if photo.gallery
+      outs.push photo.delete
+    end
+    flash_notice "Outcomes: #{outs}"
     redirect_to request.referrer || root_path
   end
 
@@ -60,6 +62,19 @@ class Wco::PhotosController < Wco::ApplicationController
     end
   end
 
+  def move
+    authorize! :move, Wco::Photo
+    photos  = Wco::Photo.where({ :id.in => params[:ids] })
+
+    flag = photos.update_all({ gallery_id: params[:gallery_id] })
+    if flag
+      flash_notice 'ok'
+    else
+      flash_alert 'not ok'
+    end
+    redirect_to request.referrer
+  end
+
   def new
     authorize! :new, Wco::Photo
     @photo = Wco::Photo.new

data/app/helpers/wco/application_helper.rb

@@ -29,9 +29,11 @@ module Wco::ApplicationHelper
     return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P %Z')
   end
 
-  def pp_amount a
+  def pp_amount a, config = { precision: 2 }
     return '-' if !a
-    "$ #{'%.2f' % a}"
+    return '-' if a.class == String
+    return number_to_currency a, precision: config[:precision]
+    # "$#{'%.2f' % a}"
   end
   def pp_money a; pp_amount a; end
   def pp_currency a; pp_amount a; end

data/app/models/wco/gallery.rb

@@ -40,7 +40,9 @@ class Wco::Gallery
 
   def self.list conditions = {}
     out = self.unscoped.where( conditions ).order_by( :created_at => :desc )
-    [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
+    [['', nil]] + out.map do |item|
+      [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ]
+    end
   end
 
   has_many :photos,    class_name: '::Wco::Photo', order: { weight: :asc }

data/app/models/wco/profile.rb

@@ -10,6 +10,7 @@ class Wco::Profile
   validates :email, presence: true, uniqueness: true
 
   field :per_page, type: :integer, default: 25
+  field :show_n_thumbs, type: :integer, default: 8
 
   belongs_to :leadset,          class_name: 'Wco::Leadset', inverse_of: :profile,         optional: true
   has_many :newsitems, class_name: 'Wco::Newsitem'

data/app/views/wco/_main_footer.haml

@@ -27,11 +27,7 @@
               = pp_time Time.now
 
         .col-sm-4
-          = form_for @current_profile, url: wco.profile_path(@current_profile), as: :profile do |f|
-            .flex-row
-              = f.label :per_page
-              = f.select :per_page, options_for_select([ 10, 25, 50, 100, 250, 500, 1000], selected: @current_profile.per_page)
-              = f.submit 'Go'
+          = render '/wco/profiles/form_extra', profile: @current_profile
           = link_to 'RTEditor', wco.application_tinymce_path, target: :_blank
 
     .c

data/app/views/wco/_main_header.haml

@@ -10,9 +10,12 @@
     .flex-row
       %ul
         %li= link_to 'ROOT', '/'
-        %li= link_to '/email',   '/email'
-        %li= link_to '/hosting', '/hosting'
-        %li= link_to '/trading', '/trading'
+        - if defined? wco_email
+          %li= link_to '/email',   '/email'
+        - if defined? wco_hosting
+          %li= link_to '/hosting', '/hosting'
+        - if defined? iro
+          %li= link_to '/trading', '/trading'
 
       %ul
         %li= render '/wco/invoices/header'

data/app/views/wco/application/_debug.haml

@@ -0,0 +1,3 @@
+
+%ul
+  %li <b>params:</b> #{params.permit!.to_h}

data/app/views/wco/galleries/_index.haml

@@ -4,7 +4,6 @@
 -# _vp_ 2022-09-25 :: Small styling revision
 -#
 
-- n_thumbs  ||= 8
 - galleries ||= @galleries
 
 .galleries--index.maxwidth
@@ -29,7 +28,7 @@
                 No Photos
               - else
                 .d-flex.flex-wrap.photos-thumbs
-                  - g.photos.limit( n_thumbs ).each do |photo|
+                  - g.photos.limit( @current_profile.show_n_thumbs ).each do |photo|
                     = link_to image_tag(photo.photo.url(:thumb), :alt => ''), gallery_path(g.slug)
 
       - if galleries.respond_to? :total_pages

data/app/views/wco/galleries/show.haml

@@ -21,17 +21,36 @@
           = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
 
   .row-thumbs
-    %p.collapse-expand#rowThumbs Thumbs
+    %i.fa.fa-expand.collapse-expand#rowMovableThumbs Movable Thumbs
     .orderable-items{ data: { id: @gallery.id.to_s, slug: @gallery.slug, token: form_authenticity_token } }
-      .flex-row.items
-        - @photos.each do |photo|
-          .itemW
-            %a.mvLeft <
-            %a.mvRight >
-            .item{ data: { id: photo.id.to_s } }
-              = render 'wco/photos/meta_manager', photo: photo
-              = image_tag photo.photo.url( :thumb )
-      = button_tag 'Save ordering', class: 'save-ordering'
+      = form_tag wco.move_photos_path, { method: :post } do
+        .d-flex
+          = select_tag :gallery_id, options_for_select(@galleries_list), class: 'select2'
+          = submit_tag 'Move', data: { confirm: 'Are you sure?' }
+        .d-flex.items
+          - @photos.each do |photo|
+            .itemW
+              = check_box_tag 'ids[]', photo.id
+              .item{ data: { id: photo.id.to_s } }
+                = image_tag photo.photo.url( :thumb )
+
+  .row-thumbs
+    %i.fa.fa-expand.collapse-expand#rowOrderableThumbs Orderable, Deletable Thumbs
+    .orderable-items{ data: { id: @gallery.id.to_s, slug: @gallery.slug, token: form_authenticity_token } }
+      = form_tag wco.delete_photos_path, { method: :delete } do
+        = submit_tag 'Delete', data: { confirm: 'Are you sure?' }
+        = button_tag 'Save ordering', class: 'save-ordering'
+        .d-flex.items
+          - @photos.each do |photo|
+            .itemW
+              %a.mvLeft <
+              %a.mvRight >
+              .item{ data: { id: photo.id.to_s } }
+                = check_box_tag 'ids[]', photo.id
+                = render 'wco/photos/meta_manager', photo: photo
+                = image_tag photo.photo.url( :thumb )
+
+
 
   .row-large
     %p.collapse-expand#rowLarge Large

data/app/views/wco/profiles/_form_extra.haml

@@ -0,0 +1,12 @@
+
+
+= form_for @current_profile, url: wco.profile_path(@current_profile), as: :profile do |f|
+  .mini-inputs
+    .flex-row
+      = f.label :per_page
+      = f.select :per_page, options_for_select([ 10, 25, 50, 100, 250, 500, 1000], selected: @current_profile.per_page)
+    .d-flex
+      %label show_n_thumbs
+      = f.number_field :show_n_thumbs
+    .actions
+      = f.submit 'Go'

data/config/routes.rb

@@ -44,6 +44,9 @@ Wco::Engine.routes.draw do
   resources :profiles
   post 'publishers/:id/do-run', to: 'publishers#do_run', as: :run_publisher
   resources :publishers
+
+  post   'photos/move',   to: 'photos#move',    as: :move_photos
+  delete 'photos/delete', to: 'photos#destroy', as: :delete_photos
   resources :photos
 
   get 'reports/deleted', to: 'reports#index', as: :deleted_reports, defaults: { deleted: true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.133
+  version: 3.1.0.135
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -571,6 +571,7 @@ files:
 - app/views/wco/products/new.haml
 - app/views/wco/products/show.haml
 - app/views/wco/products/show.jbuilder
+- app/views/wco/profiles/_form_extra.haml
 - app/views/wco/publishers/_form.haml
 - app/views/wco/publishers/_header.haml
 - app/views/wco/publishers/edit.haml