c80_estate 0.1.0.12 → 0.1.0.13

data/app/helpers/c80_estate/app_helper.rb

@@ -1,6 +1,8 @@
 module C80Estate
   module AppHelper
 
+    include AreasHelper
+
     def render_table_prop_busy_coef(atype_id: nil)
       # Rails.logger.debug "<render_table_prop_busy_coef> atype_id = #{atype_id}"
 
@@ -60,5 +62,42 @@ module C80Estate
       render :partial => 'c80_estate/shared/form_upload_areas_excel'
     end
 
+    def render_show_area(area)
+
+      slug = 'stroitelnye-materialy'
+      @page = Page.where(:slug => slug).first
+
+      @item = area #strh_item_get(@sub_cat.id,params[:item_id]) #Item.find(params[:item_id])
+      @sub_cat = area.atype #Strsubcat.where(:slug => params[:sub_cat_slug]).first
+
+      # puts "<SiteController.stroitelnye_materialy_item> @item = #{@item}"
+      # {"id"=>5, "item_id"=>5, "item_title"=>"Кирпич длинного формата Alt Berlin GS стандарт качества Qbricks",
+      # "is_main"=>0, "is_hit"=>1, "is_sale"=>0, "strsubcat_id"=>1, "strsubcat_slug"=>"kirpich",
+      # "vendor_id"=>-1,
+      # "prop_18"=>"93,98", "prop_19"=>"0", "prop_20"=>"51", "prop_21"=>"0",
+      # "prop_23"=>"290 x 90 x 52 мм", "prop_24"=>"Германия", "prop_25"=>"1000",
+      # "prop_26"=>"0,10", "prop_27"=>"F300", "prop_28"=>"2,9", "prop_29"=>"чёрный",
+      # "prop_30"=>"пустотелый", "prop_31"=>"пластичное формование", "prop_32"=>"шероховатая",
+      # "prop_33"=>"2,50", "prop_34"=>"450", "prop_35"=>"длинный, ригельный", "prop_36"=>"Не указан",
+      # "prop_37"=>"PR12010-1", "prop_38"=>"NF"}
+
+      # @vparams[:body_class] += ' stroitelnye_materialy_item'
+
+      # add_breadcrumb 'Строительные материалы', '/stroitelnye-materialy', :title => 'Строительные материалы'
+      # add_breadcrumb @sub_cat.title, apph_my_url_strsubcat(@sub_cat), :title => @sub_cat.title
+      # add_breadcrumb @item["item_title"]
+
+      @vparams = {}
+      # @vparams[:page_slug] = 'stroitelnye-materialy' # помогаем слайдеру страницы найти соответствующие картинки
+      # @vparams[:sub_cat_slug] = params[:sub_cat_slug]
+      # @vparams[:c80_order_form_subj] = "#{root_url}stroitelnye-materialy/#{params[:sub_cat_slug]}/#{params[:item_id]}"
+      # @vparams[:c80_order_form_comment_text] = "Заявка на '#{@item["item_title"]}'. Кол-во: "
+
+      # найдём галереи товара
+      @vparams[:galleries] = @item.aphotos #Gallery.where_item(params[:item_id])
+
+      render :partial => 'c80_estate/shared/areas/single_area_on_page'
+    end
+
   end
 end

data/app/helpers/c80_estate/areas_helper.rb

@@ -0,0 +1,109 @@
+module C80Estate
+  module AreasHelper
+
+    # выдать html строку, содержащую список характеристик площади
+    def smiph_render_all_props(area)
+
+      result = ''
+
+      # area.item_props.each do |prop|
+      #   title = prop.prop_name.title
+      #   value = prop.value
+      #   uom = prop.prop_name.uom.title
+      #   result += "<li><span class='ptitle bold'>#{title}</span>: <span class='pvalue'>#{value}</span> <span class='puom'>#{uom}</span></li>"
+      # end
+
+      result += "<li><span class='ptitle bold'>Объект недвижимости</span>: <span class='pvalue'>#{area.property.title}</span></li>"
+      result += "<li><span class='ptitle bold'>Объём площади</span>: <span class='pvalue'>#{area.square_value}</span> <span class='puom'>м.кв.</span></li>"
+      result += "<li><span class='ptitle bold'><abbr title='За м.кв. в месяц'>Цена</abbr></span>: <span class='pvalue'>#{area.price_value} </span> <span class='puom'>руб</span></li>"
+
+      area.atype.prop_names.each do |atype_propname|
+          title = atype_propname.title
+          if atype_propname.id == 1 || atype_propname.id == 9
+            next
+          end
+          # value = prop.value
+          value = '-'
+          uom = ''
+          if atype_propname.uom.present?
+            uom = atype_propname.uom.title
+          end
+          aip = ItemProp.where(:area_id => area.id).where(:prop_name_id => atype_propname.id)#.first.value
+          if aip.count > 0
+            value = aip.first.value
+          end
+          result += "<li><span class='ptitle bold'>#{title}</span>: <span class='pvalue'>#{value}</span> <span class='puom'>#{uom}</span></li>"
+      end
+
+      result += "<li><span class='pvalue label label-info'>#{area.atype.title}</span></li>"
+      result = "<ul>#{result}</ul>"
+      result.html_safe
+
+    end
+
+    # выдать html строку, содержащую список характеристик площади в виде таблицы
+    def smiph_render_common_props(area)
+
+      result = ''
+      index = 0
+
+      area_item_props = [
+          { title: 'ID площади', value: area.id },
+          { title: 'Название', value: area.title },
+          { title: 'Адрес', value: area.property.address },
+          { title: 'Кто создал', value: area.owner.email },
+          { title: 'Время создания', value: area.created_at.strftime('%Y/%m/%d %H:%M:%S') },
+          { title: 'Время последнего изменения', value: area.updated_at.strftime('%Y/%m/%d %H:%M:%S') },
+          { title: 'Кто последний раз вносил изменения', value: area.last_updater },
+          { title: 'Ответственный', value: area.assigned_person_title }
+      ]
+
+      area_item_props.each do |prop|
+        title = prop[:title]
+        value = prop[:value]
+        result += "<tr class='p#{index % 2}'><td><span class='ptitle medium'>#{title}</span></td> <td><span class='pvalue'>#{value}</span></td></tr>"
+        index += 1
+      end
+
+      result = "<table>#{result}</table>"
+      result.html_safe
+
+    end
+
+    # рендер фотографий при просмотре товара (http://td-forbiz.ru/stroitelnye-materialy/kirpich/1)
+    def lh_render_gallery4(area_photos)
+
+      render :partial => "c80_estate/shared/areas/gallery4",
+             :locals => {
+                 frames: area_photos
+             }
+
+    end
+
+    def smiph_render_vendor_logo(area)
+
+      res = ''
+
+      # begin
+
+        # vid = item_as_hash["vendor_id"]
+        property = area.property
+
+        if property.plogos.count > 0
+          arr = []
+          property.plogos.limit(1).each do |pph|
+            arr << "<a href='#' class='no-clickable no-outline' title='#{property.title}'><img src='#{ property.logo_path }' alt='#{property.title}'/></a>"
+          end
+          res = arr.join('').html_safe
+        end
+
+      # rescue => e
+      #   Rails.logger.debug "<smiph_render_vendor_logo> [ERROR] rescue: #{e}"
+      # end
+
+      res.html_safe
+
+    end
+
+  end
+end

data/app/models/c80_estate/area.rb

@@ -228,6 +228,10 @@ module C80Estate
       res
     end
 
+    def last_updater
+      sevents.last.auser.email
+    end
+
     def price_value
       res = '-'
       p = item_props.where(:prop_name_id => 1)
@@ -246,6 +250,14 @@ module C80Estate
       res
     end
 
+    def main_image_url
+      url = 'no_thumb.png'
+      if aphotos.count > 0
+        url = aphotos.first.image.thumb512
+      end
+      url
+    end
+
     ransacker :item_prop_price_val,
               formatter: proc { |price_range| # 10,156
                 results = C80Estate::Area.where_price_range(price_range).map(&:id)

data/app/uploaders/c80_estate/aphoto_uploader.rb

@@ -5,11 +5,11 @@ module C80Estate
     process :resize_to_limit => [1024, 1024]
 
     version :thumb512 do
-      process :resize_to_limit => [512, 512]
+      process :resize_to_fill => [621, 377]
     end
 
     version :thumb256 do
-      process :resize_to_limit => [256, 256]
+      process :resize_to_fill => [310, 188]
     end
 
     def store_dir

data/app/views/admin/areas/_show_area.html.erb

@@ -0,0 +1 @@
+<%= render_show_area(area) %>

data/app/views/c80_estate/shared/areas/_gallery4.html.erb

@@ -0,0 +1,52 @@
+<%  # рендер фотографий при просмотре товара из строительных материалов (http://td-forbiz.ru/stroitelnye-materialy/kirpich/1) %>
+
+<script>
+    var small_frames_slidesToShow = 3;
+    var small_frames_dots = false;
+</script>
+
+<div id="gallery3_wrapper">
+  <div id="gallery3">
+    <% frames.each do |frame| %>
+
+        <div class="col-md-12 col-sm-12 col-xs-12 frame">
+
+          <div class="img-holder col-md-12 col-sm-12 col-xs-12">
+            <%= link_to image_tag("",
+                                  :alt=>"frame.title",
+                                  :data => {
+                                          :lazy => image_path(frame.image.thumb256)
+                                  }
+                        ), frame.image.url, :title => "frame.title"
+            %>
+          </div>
+
+          <div class="name hidden"><%#frame.title %></div>
+
+        </div>
+    <% end %>
+  </div>
+</div>
+
+<div class="col-md-12 col-sm-12 col-xs-12" id="gallery3_nav_wrapper">
+  <div id="gallery3_nav">
+    <% frames.each do |frame| %>
+
+        <div class="frame">
+
+          <div class="img-holder">
+            <%= image_tag("",
+                          :alt=>"frame.title",
+                          :data => {
+                                  :lazy => image_path(frame.image.thumb256)
+                          }
+                )
+            %>
+            <div class="name hidden"><%# frame.title %></div>
+          </div>
+
+        </div>
+    <% end %>
+  </div>
+  <a id='goto_gallery' href="#" title="Посмотреть все">Изображений: <%= frames.count %></a>
+</div>

data/app/views/c80_estate/shared/areas/_single_area_on_page.html.erb

@@ -0,0 +1,53 @@
+<%
+   item_title = @item.title
+%>
+
+<h4 class="bold">Общая информация</h4>
+
+<div class="clearfix">
+  <div id="div_main_show_area" class="clearfix">
+    <%= link_to image_tag('w227x182px.gif',
+                          :alt=>item_title,
+                          :data => {:original => image_path(@item.main_image_url)},
+                          :class => 'lazy'),
+                image_path(@item.main_image_url),
+                :title => item_title,
+                :class => 'lazy-image-wrapper no-outline' %>
+    <div id="main_props">
+      <%= smiph_render_all_props(@item) %>
+
+      <div id="div_vendor_logo">
+        <%= smiph_render_vendor_logo(@item) %>
+      </div>
+
+    </div>
+  </div>
+  <div id="gallery_block"><%= lh_render_gallery4(@vparams[:galleries]) %></div>
+</div>
+
+<div id="price_info hidden" class="clearfix">
+  <%# smiph_render_price_props(@item,@sub_cat.id) %>
+</div>
+
+<div id="div_button_order" class="hidden">
+  <%# link_to "Заказать","#",
+              # :class => 'button-red no-clickable no-outline bold c80_order_invoking_btn',
+              # :data => {
+              #         subj_id: @vparams[:c80_order_form_subj],
+              #         comment_text: @vparams[:c80_order_form_comment_text]
+              # }
+  %>
+</div>
+
+<div id="div_desc">
+  <%= @item.desc.html_safe if @item.desc.present? %>
+</div>
+
+<div id="div_common_props" class="clearfix">
+  <h4 class="bold">Техническая информация</h4>
+  <%= smiph_render_common_props(@item) %>
+</div>
+
+<div id="related_items" class="hidden">
+  <%# smiph_render_related_items(@item) %>
+</div>

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = "0.1.0.12"
+  VERSION = "0.1.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.12
+  version: 0.1.0.13
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,10 +77,16 @@ files:
 - app/admin/c80_estate/role_types.rb
 - app/admin/c80_estate/sevents.rb
 - app/admin/c80_estate/uoms.rb
+- app/assets/images/no_thumb.png
 - app/assets/images/property_default_logo.png
-- app/assets/javascript/c80_estate/backend/admin/areas.js
-- app/assets/javascript/c80_estate/backend/admin/pstats.js
-- app/assets/javascript/c80_estate/backend/admin/sevents.js
+- app/assets/images/w227x182px.gif
+- app/assets/images/w621x377.gif
+- app/assets/javascript/c80_estate/backend/admin/shared/areas/_area_show_common.js
+- app/assets/javascript/c80_estate/backend/admin/shared/areas/area_show.js
+- app/assets/javascript/c80_estate/backend/admin/shared/areas/gallery3.js
+- app/assets/javascript/c80_estate/backend/admin/src/areas.js
+- app/assets/javascript/c80_estate/backend/admin/src/pstats.js
+- app/assets/javascript/c80_estate/backend/admin/src/sevents.js
 - app/assets/javascript/c80_estate/backend/init.js
 - app/assets/javascript/c80_estate/backend/init_selectpicker.js
 - app/assets/javascript/c80_estate/lib/Chart.bundle.js
@@ -88,6 +94,7 @@ files:
 - app/assets/javascript/c80_estate/lib/google_charts_loader.js
 - app/assets/javascript/c80_estate/lib/jalert.js
 - app/assets/javascript/c80_estate/lib/jquery.canvasjs.min.js
+- app/assets/javascript/c80_estate/lib/jquery.magnific-popup.js
 - app/assets/javascript/c80_estate_active_admin.js.coffee
 - app/assets/stylesheets/c80_estate/backend/admin_areas.scss
 - app/assets/stylesheets/c80_estate/backend/admin_prop_names.scss
@@ -96,16 +103,35 @@ files:
 - app/assets/stylesheets/c80_estate/backend/admin_sevents.scss
 - app/assets/stylesheets/c80_estate/backend/admin_users.scss
 - app/assets/stylesheets/c80_estate/backend/common.scss
+- app/assets/stylesheets/c80_estate/backend/common/minor_fix.scss
+- app/assets/stylesheets/c80_estate/backend/common/panel.scss
 - app/assets/stylesheets/c80_estate/backend/dashboard/atype_in_list.scss
 - app/assets/stylesheets/c80_estate/backend/dashboard/common.scss
 - app/assets/stylesheets/c80_estate/backend/dashboard/prop_in_list.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/gallery3.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_button_order.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_comments.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_common_props.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_desc.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_main.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_price_info.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_related_items.scss
+- app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_vendor_logo.scss
+- app/assets/stylesheets/c80_estate/backend/shared/index_adds_like_sevents.scss
 - app/assets/stylesheets/c80_estate/lib/bootstrap-slider.scss
+- app/assets/stylesheets/c80_estate/lib/magnific-popup-custom.scss
+- app/assets/stylesheets/c80_estate/lib/magnific-popup.scss
 - app/assets/stylesheets/c80_estate/lib/mixins.scss
+- app/assets/stylesheets/c80_estate/lib/slick-carousel-custom.scss
+- app/assets/stylesheets/c80_estate/lib/slick-theme.scss
+- app/assets/stylesheets/c80_estate/lib/slick.scss
 - app/assets/stylesheets/c80_estate_active_admin.scss
 - app/controllers/c80_estate/ajax_areas_controller.rb
 - app/controllers/c80_estate/ajax_controller.rb
 - app/controllers/c80_estate/ajax_view_controller.rb
 - app/helpers/c80_estate/app_helper.rb
+- app/helpers/c80_estate/areas_helper.rb
 - app/models/c80_estate/aphoto.rb
 - app/models/c80_estate/area.rb
 - app/models/c80_estate/astatus.rb
@@ -127,6 +153,7 @@ files:
 - app/uploaders/c80_estate/atphoto_uploader.rb
 - app/uploaders/c80_estate/plogo_uploader.rb
 - app/uploaders/c80_estate/pphoto_uploader.rb
+- app/views/admin/areas/_show_area.html.erb
 - app/views/admin/dashboard/_atype_in_list.html.erb
 - app/views/admin/dashboard/_prop_in_list.html.erb
 - app/views/c80_estate/ajax_areas/exel_import.html.erb
@@ -136,6 +163,8 @@ files:
 - app/views/c80_estate/shared/_form_upload_areas_excel.erb
 - app/views/c80_estate/shared/_table_properties_coef_busy.html.erb
 - app/views/c80_estate/shared/_table_properties_coef_busy_sq.html.erb
+- app/views/c80_estate/shared/areas/_gallery4.html.erb
+- app/views/c80_estate/shared/areas/_single_area_on_page.html.erb
 - bin/console
 - bin/setup
 - c80_estate.gemspec