c80_estate 0.1.0.14 → 0.1.0.15

data/app/assets/stylesheets/c80_estate/backend/admin_pstats.scss

@@ -11,138 +11,6 @@ body.admin_pstats {
       -o-transition: opacity .2s ease-in;
       transition: opacity .2s ease-in;
 
-      div#index_adds {
-        height: calc(483px + 15px);
-        min-height: calc(183px + 15px);
-        margin-bottom: 0;
-
-        > div {
-          float: left;
-          padding: 10px;
-          border-radius: 2px;
-          border: 2px solid #f1f1f1;
-          height: 183px;
-
-          &#coef {
-            width: 33%;
-            text-align: center;
-            margin-bottom: 15px;
-
-            p {
-              width: 100%;
-
-              &.val {
-                margin-top: 15px;
-                margin-bottom: 0;
-                font-size: 40px;
-              }
-
-            }
-          }
-
-          &#coef_sq {
-            width: 33%;
-            text-align: center;
-
-            p {
-              width: 100%;
-
-              &.val {
-                margin-top: 15px;
-                margin-bottom: 0;
-                font-size: 40px;
-              }
-
-            }
-          }
-
-          &#text_stats, &#text_stats_sq {
-            width: calc(33% - 30px);
-            margin-left: 30px;
-            margin-bottom: 15px;
-
-            ul {
-              padding: 0 5px;
-              list-style: none;
-              #title {
-                font-weight: bold;
-              }
-            }
-
-          }
-
-          &#graph_radial {
-            width: calc(33% - 30px);
-            margin-left: 30px;
-            margin-bottom: 15px;
-            padding: 0;
-
-            -webkit-transition: opacity .2s ease-in;
-            -moz-transition: opacity .2s ease-in;
-            -ms-transition: opacity .2s ease-in;
-            -o-transition: opacity .2s ease-in;
-            transition: opacity .2s ease-in;
-          }
-
-          &#graph_radial_sq {
-            width: calc(33% - 30px);
-            margin-left: 30px;
-            padding: 0;
-
-            -webkit-transition: opacity .2s ease-in;
-            -moz-transition: opacity .2s ease-in;
-            -ms-transition: opacity .2s ease-in;
-            -o-transition: opacity .2s ease-in;
-            transition: opacity .2s ease-in;
-          }
-
-          &#graph2 {
-            width: 100%;
-            height: 198px;
-
-            margin-top: 15px;
-            margin-bottom: 15px;
-            padding: 0;
-            display: none;
-            opacity: 0;
-
-            -webkit-transition: opacity .2s ease-in;
-            -moz-transition: opacity .2s ease-in;
-            -ms-transition: opacity .2s ease-in;
-            -o-transition: opacity .2s ease-in;
-            transition: opacity .2s ease-in;
-
-            #graph2canvas {
-              width: 100%;
-            }
-
-          }
-
-          &#graph3 {
-            width: 100%;
-            height: 198px;
-
-            margin-top: 15px;
-            margin-bottom: 15px;
-            padding: 0;
-            display: none;
-            opacity: 0;
-
-            -webkit-transition: opacity .2s ease-in;
-            -moz-transition: opacity .2s ease-in;
-            -ms-transition: opacity .2s ease-in;
-            -o-transition: opacity .2s ease-in;
-            transition: opacity .2s ease-in;
-
-            #graph3canvas {
-              width: 100%;
-            }
-
-          }
-
-        }
-      }
-
     }
 
     .batch_actions_selector {

data/app/assets/stylesheets/c80_estate/backend/dashboard/prop_in_list.scss

@@ -32,7 +32,7 @@ div.prop_in_list {
 
   .text_content {
     margin-top: 45px;
-    padding: 0 35px;
+    padding: 0 7px;
     text-align: center;
 
     h4 {

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_comments.scss

@@ -1,4 +1,6 @@
-div.comments.c80_estate_area {
+div.comments.c80_estate_area,
+div.comments.c80_estate_property,
+{
   clear: both;
 
   form.active_admin_comment {

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_main.scss

@@ -3,7 +3,9 @@ $gallery_wrapper_margin_left: 45px;
 $gallery_frame_width: 310px;
 $gallery_frame_height: 188px;
 
-body.admin_areas.show {
+body.admin_areas.show,
+body.admin_properties.show,
+{
 
   h4 {
     background-color: transparent !important;
@@ -22,7 +24,7 @@ body.admin_areas.show {
 
 div#div_main_show_area {
   width: 1085px;
-  border-right: 1px solid #C2C2C2;
+  /*border-right: 1px solid #C2C2C2;*/
   float: left;
 
   a {

data/app/assets/stylesheets/c80_estate/backend/shared/index_adds_like_pstats.scss

@@ -0,0 +1,131 @@
+div.index_adds_like_pstats {
+  height: calc(483px + 15px);
+  min-height: calc(183px + 15px);
+  margin-bottom: 0;
+
+  > div {
+    float: left;
+    padding: 10px;
+    border-radius: 2px;
+    border: 2px solid #f1f1f1;
+    height: 183px;
+
+    &#coef {
+      width: 33%;
+      text-align: center;
+      margin-bottom: 15px;
+
+      p {
+        width: 100%;
+
+        &.val {
+          margin-top: 15px;
+          margin-bottom: 0;
+          font-size: 40px;
+        }
+
+      }
+    }
+
+    &#coef_sq {
+      width: 33%;
+      text-align: center;
+
+      p {
+        width: 100%;
+
+        &.val {
+          margin-top: 15px;
+          margin-bottom: 0;
+          font-size: 40px;
+        }
+
+      }
+    }
+
+    &#text_stats, &#text_stats_sq {
+      width: calc(33% - 30px);
+      margin-left: 30px;
+      margin-bottom: 15px;
+
+      ul {
+        padding: 0 5px;
+        list-style: none;
+        #title {
+          font-weight: bold;
+        }
+      }
+
+    }
+
+    &#graph_radial {
+      width: calc(33% - 30px);
+      margin-left: 30px;
+      margin-bottom: 15px;
+      padding: 0;
+
+      -webkit-transition: opacity .2s ease-in;
+      -moz-transition: opacity .2s ease-in;
+      -ms-transition: opacity .2s ease-in;
+      -o-transition: opacity .2s ease-in;
+      transition: opacity .2s ease-in;
+    }
+
+    &#graph_radial_sq {
+      width: calc(33% - 30px);
+      margin-left: 30px;
+      padding: 0;
+
+      -webkit-transition: opacity .2s ease-in;
+      -moz-transition: opacity .2s ease-in;
+      -ms-transition: opacity .2s ease-in;
+      -o-transition: opacity .2s ease-in;
+      transition: opacity .2s ease-in;
+    }
+
+    &#graph2 {
+      width: 100%;
+      height: 350px;
+
+      margin-top: 15px;
+      margin-bottom: 15px;
+      padding: 0;
+      display: none;
+      opacity: 0;
+
+      -webkit-transition: opacity .2s ease-in;
+      -moz-transition: opacity .2s ease-in;
+      -ms-transition: opacity .2s ease-in;
+      -o-transition: opacity .2s ease-in;
+      transition: opacity .2s ease-in;
+
+      #graph2canvas {
+        width: 100%;
+      }
+
+    }
+
+    &#graph3 {
+      width: 100%;
+      height: 350px;
+
+      margin-top: 15px;
+      margin-bottom: 15px;
+      padding: 0;
+      display: none;
+      opacity: 0;
+
+      -webkit-transition: opacity .2s ease-in;
+      -moz-transition: opacity .2s ease-in;
+      -ms-transition: opacity .2s ease-in;
+      -o-transition: opacity .2s ease-in;
+      transition: opacity .2s ease-in;
+
+      #graph3canvas {
+        width: 100%;
+      }
+
+    }
+
+  }
+}

data/app/helpers/c80_estate/app_helper.rb

@@ -2,6 +2,7 @@ module C80Estate
   module AppHelper
 
     include AreasHelper
+    include PropertiesHelper
 
     def render_table_prop_busy_coef(atype_id: nil)
       # Rails.logger.debug "<render_table_prop_busy_coef> atype_id = #{atype_id}"
@@ -99,5 +100,42 @@ module C80Estate
       render :partial => 'c80_estate/shared/areas/single_area_on_page'
     end
 
+    def render_show_property(property)
+
+      slug = 'stroitelnye-materialy'
+      @page = Page.where(:slug => slug).first
+
+      @item = property #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.pphotos #Gallery.where_item(params[:item_id])
+
+      render :partial => 'c80_estate/shared/properties/single_property_on_page'
+    end
+
   end
 end

data/app/helpers/c80_estate/properties_helper.rb

@@ -0,0 +1,67 @@
+module C80Estate
+  module PropertiesHelper
+
+    def smiph_render_property_props(property)
+
+      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'>#{property.square_value}</span> <span class='puom'>м.кв.</span></li>"
+      result += "<li><span class='ptitle bold'>Доход при 100% занятости</span>: <span class='pvalue'>#{property.power_price_value}</span> <span class='puom'>руб</span></li>"
+      result += "<li><span class='ptitle bold'>Всего площадей</span>: <span class='pvalue'>#{property.areas.all.count}</span></li>"
+      result += "<li><span class='ptitle bold'>Свободно площадей</span>: <span class='pvalue'>#{property.areas.free_areas.count}</span></li>"
+      result += "<li><span class='ptitle bold'>Занято площадей</span>: <span class='pvalue'>#{property.areas.busy_areas.count}</span></li>"
+      result += "<li><span class='ptitle bold'>Свободно метров</span>: <span class='pvalue'>#{property.areas.free_areas_sq}</span> <span class='puom'>м.кв.</span></li>"
+      result += "<li><span class='ptitle bold'>Занято метров</span>: <span class='pvalue'>#{property.areas.busy_areas_sq}</span> <span class='puom'>м.кв.</span></li>"
+      result += "<li><span style='font-weight:bold;'>Площади объекта по типам:</span></li><ul>"
+
+      Atype.all.each do |atype|
+        aa = Area.where_atype(atype.id)
+        c = aa.count
+        cb = aa.busy_areas.count
+        result +=
+            "<li><span class='ptitle bold'>#{atype.title}</span>: <span class='pvalue'>#{c}</span>
+              <abbr title='Занятых'><span class='puom'>(#{cb})</span></abbr></li>"
+      end
+
+      result = "<ul>#{result}</ul></ul>"
+      result.html_safe
+
+    end
+
+    def ph_render_tech_props(property)
+
+      result = ''
+      index = 0
+
+      area_item_props = [
+          { title: 'ID объекта', value: property.id },
+          { title: 'Название', value: property.title },
+          { title: 'Адрес', value: property.address },
+          { title: 'Кто создал', value: property.owner.email },
+          { title: 'Время создания', value: property.created_at.strftime('%Y/%m/%d %H:%M:%S') },
+          { title: 'Время последнего изменения', value: property.updated_at.strftime('%Y/%m/%d %H:%M:%S') },
+          { title: 'Кто последний раз вносил изменения', value: property.last_updater },
+          { title: 'Ответственный', value: property.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
+
+  end
+end

data/app/models/c80_estate/area.rb

@@ -41,10 +41,9 @@ module C80Estate
     def self.free_areas_sq
       sum = 0
       self.free_areas.each do |area|
-        area_prop_square = area.item_props.where(:prop_name_id => 9)
-        if area_prop_square.present?
-          sum += area_prop_square.first.value.to_i
-        end
+        # area_prop_square = area.item_props.where(:prop_name_id => 9)
+        area_prop_square = area.square_value
+        sum += area_prop_square.first.value.to_i
       end
       sum
     end
@@ -172,6 +171,10 @@ module C80Estate
 
     end
 
+    def self.where_atype(atype_id)
+      self.where(:atype_id => atype_id)
+    end
+
     def atype_title
       res = "-"
       if atype.present?
@@ -233,23 +236,27 @@ module C80Estate
     end
 
     def price_value
-      res = '-'
+      res = 0
       p = item_props.where(:prop_name_id => 1)
       if p.count > 0
-        res = p.first.value
+        res = p.first.value.to_i
       end
       res
     end
 
     def square_value
-      res = '-'
+      res = 0
       p = item_props.where(:prop_name_id => 9)
       if p.count > 0
-        res = p.first.value
+        res = p.first.value.to_f
       end
       res
     end
 
+    def power_price_value
+      price_value * 1.0 * square_value
+    end
+
     def main_image_url
       url = 'no_thumb.png'
       if aphotos.count > 0