c80_estate 0.1.0.14 → 0.1.0.15

data/app/models/c80_estate/property.rb

@@ -37,5 +37,33 @@ module C80Estate
       url
     end
 
+    def main_image_url
+      url = 'no_thumb.png'
+      if pphotos.count > 0
+        url = pphotos.first.image.thumb512
+      end
+      url
+    end
+
+    def last_updater
+      pstats.last.sevent.auser.email
+    end
+
+    def square_value
+      sum = 0
+      areas.all.each do |area|
+        sum += area.square_value
+      end
+      sum
+    end
+
+    def power_price_value
+      sum = 0
+      areas.all.each do |area|
+        sum += area.power_price_value
+      end
+      sum
+    end
+
   end
 end

data/app/models/c80_estate/pstat.rb

@@ -89,7 +89,12 @@ module C80Estate
         result[:raw_props][:all_areas_count] = free_areas_atnow + busy_areas_atnow
         result[:raw_props][:free_areas_count] = free_areas_atnow
         result[:raw_props][:busy_areas_atnow] = busy_areas_atnow
-        result[:graph_dynamic] = _parse_for_js_dynamic_graph_canvasjs(pstats.ordered_by_created_at)
+        # result[:graph_dynamic] = _parse_for_js_dynamic_graph_canvasjs(pstats.ordered_by_created_at)
+        result[:graph_dynamic] = _parse_for_js_dynamic_graph_highstock(
+            pstats.ordered_by_created_at,
+            tcut[:used_start_date],
+            tcut[:used_end_date]
+        )
         result[:graph_radial] = _parse_for_js_radial_graph(free_areas_atnow, busy_areas_atnow)
 
         # Rails.logger.debug "<Pstat.busy_coef> busy_areas_count = #{ busy_areas_count }"
@@ -120,7 +125,11 @@ module C80Estate
         result[:raw_props_sq][:all_areas_count_sq] = free_areas_atnow_sq + busy_areas_atnow_sq
         result[:raw_props_sq][:free_areas_count_sq] = free_areas_atnow_sq
         result[:raw_props_sq][:busy_areas_atnow_sq] = busy_areas_atnow_sq
-        result[:graph_dynamic_sq] = _parse_for_js_dynamic_graph3_canvasjs(pstats.where(:atype_id => nil).ordered_by_created_at)
+        result[:graph_dynamic_sq] = _parse_for_js_dynamic_graph_highstock_sq(
+            pstats.where(:atype_id => nil).ordered_by_created_at,
+            tcut[:used_start_date],
+            tcut[:used_end_date]
+        )
         result[:graph_radial_sq] = _parse_for_js_radial_graph_sq(free_areas_atnow_sq, busy_areas_atnow_sq)
 
         # common
@@ -207,11 +216,21 @@ module C80Estate
             if atype_id.nil?
               free_areas_atnow = pstats.where(:atype_id => nil).last.free_areas
               busy_areas_atnow = pstats.where(:atype_id => nil).last.busy_areas
-              graph_data = _parse_for_js_dynamic_graph_canvasjs(pstats.where(:atype_id => nil).ordered_by_created_at)
+              # graph_data = _parse_for_js_dynamic_graph_canvasjs(pstats.where(:atype_id => nil).ordered_by_created_at)
+              graph_data = _parse_for_js_dynamic_graph_highstock(
+                  pstats.where(:atype_id => nil).ordered_by_created_at,
+                  used_start_date,
+                  used_end_date
+              )
             else
               free_areas_atnow = pstats.last.free_areas
               busy_areas_atnow = pstats.last.busy_areas
-              graph_data = _parse_for_js_dynamic_graph_canvasjs(pstats.ordered_by_created_at)
+              # graph_data = _parse_for_js_dynamic_graph_canvasjs(pstats.ordered_by_created_at)
+              graph_data = _parse_for_js_dynamic_graph_highstock(
+                  pstats.ordered_by_created_at,
+                  used_start_date,
+                  used_end_date
+              )
             end
 
             # Rails.logger.debug("\t\t atype_id = #{atype_id}")
@@ -241,11 +260,17 @@ module C80Estate
             if atype_id.nil?
               free_areas_atnow_sq = pstats.where(:atype_id => nil).last.free_areas_sq
               busy_areas_atnow_sq = pstats.where(:atype_id => nil).last.busy_areas_sq
-              graph_data_sq = _parse_for_js_dynamic_graph3_canvasjs(pstats.where(:atype_id => nil).ordered_by_created_at)
+              graph_data_sq = _parse_for_js_dynamic_graph_highstock_sq(pstats.where(:atype_id => nil).ordered_by_created_at,
+                                                                       used_start_date,
+                                                                       used_end_date
+              )
             else
               free_areas_atnow_sq = pstats.last.free_areas_sq
               busy_areas_atnow_sq = pstats.last.busy_areas_sq
-              graph_data_sq = _parse_for_js_dynamic_graph3_canvasjs(pstats.ordered_by_created_at)
+              graph_data_sq = _parse_for_js_dynamic_graph_highstock_sq(pstats.ordered_by_created_at,
+                                                                       used_start_date,
+                                                                       used_end_date
+              )
             end
 
             # защищаемся от деления на ноль
@@ -381,7 +406,12 @@ module C80Estate
         result[:busy_coef] = sprintf "%.2f%", bcoef
         result[:comment] = "<abbr title='Период рассчёта занятости'>C #{used_start_date_str} по #{used_end_date_str}</abbr>"
         result[:abbr] = 'Занятость объекта в конце указанного периода: число b/N, где b - кол-во свободных, N - всего площадей'
-        result[:graph_dynamic] = _parse_for_js_dynamic_graph_canvasjs(pstats.ordered_by_created_at)
+        # result[:graph_dynamic] = _parse_for_js_dynamic_graph_canvasjs(pstats.ordered_by_created_at)
+        result[:graph_dynamic] = _parse_for_js_dynamic_graph_highstock(
+            pstats.ordered_by_created_at,
+            used_start_date,
+            used_end_date
+        )
         result[:graph_radial] = _parse_for_js_radial_graph(free_areas_atnow, busy_areas_atnow)
 
         result[:raw_props] = {}
@@ -393,7 +423,10 @@ module C80Estate
 
         free_areas_atnow_sq = pstats.last.free_areas_sq
         busy_areas_atnow_sq = pstats.last.busy_areas_sq
-        graph_data_sq = _parse_for_js_dynamic_graph3_canvasjs(pstats.ordered_by_created_at)
+        graph_data_sq = _parse_for_js_dynamic_graph_highstock_sq(pstats.ordered_by_created_at,
+                                                                 used_start_date,
+                                                                 used_end_date
+        )
 
         # защищаемся от деления на ноль
         if busy_areas_atnow_sq + free_areas_atnow_sq == 0
@@ -473,11 +506,11 @@ module C80Estate
 
           self.free_areas = self.property.areas.free_areas.count
           self.busy_areas = self.property.areas.busy_areas.count
-          self.coef_busy = self.busy_areas*1.0 / (self.free_areas + self.busy_areas) * 100.0
+          self.coef_busy = (self.free_areas + self.busy_areas == 0) ? 0 : self.busy_areas*1.0 / (self.free_areas + self.busy_areas) * 100.0
 
           self.free_areas_sq = self.property.areas.free_areas_sq
           self.busy_areas_sq = self.property.areas.busy_areas_sq
-          self.coef_busy_sq = self.busy_areas_sq*1.0 / (self.free_areas_sq + self.busy_areas_sq) * 100.0
+          self.coef_busy_sq = (self.free_areas_sq + self.busy_areas_sq == 0) ? 0 : self.busy_areas_sq*1.0 / (self.free_areas_sq + self.busy_areas_sq) * 100.0
 
           # здесь считаем коэф-ты для 'atype related записей'
         else
@@ -586,6 +619,7 @@ module C80Estate
 
     end
 
+=begin
     def self._parse_for_js_dynamic_graph_canvasjs(pstats)
       # res: [
       #     {
@@ -612,6 +646,57 @@ module C80Estate
       Rails.logger.debug "<Pstat.parse_for_js_graph> res = #{res}"
       res
     end
+=end
+
+    def self._parse_for_js_dynamic_graph_highstock(pstats, start_date, end_date)
+      res = []
+      res << [start_date.to_i*1000,pstats.first.coef_busy]
+
+      pstats.each do |pstat|
+
+        res << [
+            pstat.created_at.to_i*1000,
+            pstat.coef_busy
+        ]
+
+        # Rails.logger.debug "#{res.last[0]}"
+
+      end
+
+      res << [end_date.to_i*1000,pstats.last.coef_busy]
+      # Rails.logger.debug "#{end_date.to_i*1000}"
+
+      # Rails.logger.debug "<Pstat.parse_for_js_graph> pstat.last.created_at = #{pstats.last.created_at}, #{end_date}"
+      # res.sort! { |a,b| a[0] <=> b[0] }
+      res
+
+    end
+
+    def self._parse_for_js_dynamic_graph_highstock_sq(pstats, start_date, end_date)
+      res = []
+      res << [start_date.to_i*1000,pstats.first.coef_busy_sq]
+
+      pstats.each do |pstat|
+
+        res << [
+            pstat.created_at.to_i*1000,
+            pstat.coef_busy_sq
+        ]
+
+        # Rails.logger.debug "#{res.last[0]}"
+
+      end
+
+      res << [end_date.to_i*1000,pstats.last.coef_busy_sq]
+      # Rails.logger.debug "#{end_date.to_i*1000}"
+
+      # Rails.logger.debug "<Pstat.parse_for_js_graph> pstat.last.created_at = #{pstats.last.created_at}, #{end_date}"
+      # res.sort! { |a,b| a[0] <=> b[0] }
+      res
+
+    end
+
+=begin
 
     def self._parse_for_js_dynamic_graph3_canvasjs(pstats)
       # res: [
@@ -636,6 +721,7 @@ module C80Estate
       end
       res
     end
+=end
 
     def self._calc_time_cut(first_created_at, time_now, start_date, end_date)
 

data/app/uploaders/c80_estate/pphoto_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/properties/_show_property.html.erb

@@ -0,0 +1 @@
+<%= render_show_property(property) %>

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

@@ -22,7 +22,7 @@
 
     </div>
   </div>
-  <div id="gallery_block"><%= lh_render_gallery4(@vparams[:galleries]) %></div>
+  <div id="gallery_block" class="hidden"><%= lh_render_gallery4(@vparams[:galleries]) %></div>
 </div>
 
 <div id="price_info hidden" class="clearfix">

data/app/views/c80_estate/shared/properties/_single_property_on_page.html.erb

@@ -0,0 +1,38 @@
+<%
+   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_property_props(@item) %>
+
+      <div id="div_vendor_logo">
+        <%# smiph_render_vendor_logo(@item) %>
+      </div>
+
+    </div>
+  </div>
+</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>
+  <%= ph_render_tech_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.14"
+  VERSION = "0.1.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.14
+  version: 0.1.0.15
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,9 @@ files:
 - 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/shared/properties/property_show.js
 - app/assets/javascript/c80_estate/backend/admin/src/areas.js
+- app/assets/javascript/c80_estate/backend/admin/src/properties.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
@@ -92,6 +94,7 @@ files:
 - app/assets/javascript/c80_estate/lib/Chart.bundle.js
 - app/assets/javascript/c80_estate/lib/bootstrap-slider.js
 - app/assets/javascript/c80_estate/lib/google_charts_loader.js
+- app/assets/javascript/c80_estate/lib/highstock.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
@@ -118,6 +121,7 @@ files:
 - 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_pstats.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
@@ -132,6 +136,7 @@ files:
 - app/controllers/c80_estate/ajax_view_controller.rb
 - app/helpers/c80_estate/app_helper.rb
 - app/helpers/c80_estate/areas_helper.rb
+- app/helpers/c80_estate/properties_helper.rb
 - app/models/c80_estate/aphoto.rb
 - app/models/c80_estate/area.rb
 - app/models/c80_estate/astatus.rb
@@ -156,6 +161,7 @@ files:
 - 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/admin/properties/_show_property.html.erb
 - app/views/c80_estate/ajax_areas/exel_import.html.erb
 - app/views/c80_estate/ajax_areas/exel_import.js.erb
 - app/views/c80_estate/ajax_view/table_properties_coef_busy.js.erb
@@ -165,6 +171,7 @@ files:
 - 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
+- app/views/c80_estate/shared/properties/_single_property_on_page.html.erb
 - bin/console
 - bin/setup
 - c80_estate.gemspec