c80_estate 0.1.0.24 → 0.1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef2fd40a5a56b010a8f348b3fee51344c9ac6afe
-  data.tar.gz: 0522badb1eabaf838438ea71bfdfc7b26993d3f5
+  metadata.gz: 2e29a80c9e9d8c27a7da34b90c97de9d558f0327
+  data.tar.gz: 0246a85e677bf616ad4deb1a1c6f5eee56841a72
 SHA512:
-  metadata.gz: 853424edb0f2f40dca3c37bc2e3c0b67ec89e508fa99b4d2fcb8f16abe36c8956bb0d834e3d9061724eb10c86c368de4ee800252b168d163b2e2d986754bf6f8
-  data.tar.gz: 43c176bfccb484be8307983ce4181aae81a167d145db3ecfc7878f69dc6cca03e917c4351a61ab8c8e2ac628ec8df73100c78835805c09b8994bdc01b770ffa1
+  metadata.gz: ad1794c07078d601fb84a63be77ceaf91604a0160179691e754e5b43618d5262a744609bb170c334f0108bc6d1a4131f8a2330791c67095d063a9553a9673776
+  data.tar.gz: 6bfd0423c236c32a734aba586d85812e38b420cc86da26ddb7774514a1884ca4a6cf3fb3c601fdcd4389f1225d83ce973a09783aa1bd8a36b129645b3d05a3f5

data/app/admin/c80_estate/areas.rb

@@ -148,13 +148,13 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
       area.atype_title
     end
     column '<abbr title="За м.кв. в месяц">Цена м.кв.</abbr>'.html_safe do |area|
-      "#{area.price_value} руб"
+      "#{area.price_value.to_s(:rounded, :precision => 2)} руб"
     end
     column '<abbr title="Стоимость всей площади в месяц. Число PxS, где P - цена за м.кв. в месяц, S - метраж площади в м.кв.">Цена площади</abbr>'.html_safe do |area|
-      "#{area.power_price_value} руб"
+      "#{area.power_price_value.to_s(:rounded, :precision => 2)} руб"
     end
     column 'Метраж' do |area|
-      "#{area.square_value} м<sup>2</sup>".html_safe
+      "#{area.square_value.to_s(:rounded, :precision => 2)} м<sup>2</sup>".html_safe
     end
     column :property do |area|
       "<div class='image_vertical properties_index_logo'>
@@ -184,7 +184,9 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
     f.inputs 'Свойства' do
       f.input :title
       f.input :atype, :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'}
-      f.input :property, :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'}
+      f.input :property,
+              :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
+              :collection => C80Estate::Property.where(:assigned_person_id => current_admin_user.id).map { |p| ["#{p.title}", p.id] }
       # f.input :assigned_person,
       #         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
       #         :collection => AdminUser.all.map { |u| ["#{u.email}", u.id] }

data/app/admin/c80_estate/pstats.rb

@@ -29,8 +29,12 @@ ActiveAdmin.register C80Estate::Pstat, as: 'Pstat' do
     end
     column :free_areas
     column :busy_areas
-    column :coef_busy
-    column :coef_busy_sq
+    column :coef_busy do |pst|
+      pst.coef_busy.to_s(:rounded, :precision => 2)
+    end
+    column :coef_busy_sq do |pst|
+      pst.coef_busy_sq(:rounded, :precision => 2)
+    end
     column :created_at
     actions
   end

data/app/assets/javascript/c80_estate/backend/admin/shared/areas/area_show.js

@@ -102,12 +102,7 @@ var fAreasShow_go = function () {
             type: 'POST',
             dataType: 'json',
             data: {
-                area_id: area_id//,
-                //atype_id: atype_id,
-                //property_id: property_id,
-                //auser_id: auser_id,
-                //start_date: start_date,
-                //end_date: end_date
+                area_id: area_id
             }
         }).done(function (data, result) {
             if (result == 'success') {
@@ -331,6 +326,18 @@ var fAreasShow_go = function () {
 
 };
 
+var fAreasShow_initActionItems = function (area_id) {
+
+    var html_str = "";
+    html_str += "<span class='action_item'><a href='/admin/areas/{ID}/edit'>Изменить</a></span>";
+    html_str += "<span class='action_item'><a class='has_many_remove' data-confirm='Вы уверены, что хотите удалить это?' rel='nofollow' data-method='delete' href='/admin/areas/{ID}'>Удалить</a></span>";
+    html_str = html_str.split("{ID}").join(area_id);
+
+    $("div.action_items").html($("<div></div>"))
+                         .append($(html_str))
+                         .css('opacity','1');
+};
+
 var fAreasShow = function () {
 
     // зафиксируем html элементы
@@ -340,5 +347,22 @@ var fAreasShow = function () {
         url: '/estate/can_view_statistics_area',
         type: 'POST',
         dataType:'script'
-    })
+    });
+
+    var area_id = -1;
+    var url = unescape(window.location.href);
+    var match_res = url.match(/areas\/(\d{1,9})/);
+    if (match_res != null) {
+        area_id = Number(match_res[1]);
+    }
+
+    $.ajax({
+        url: '/estate/can_edit_area',
+        type: 'POST',
+        data: {
+            area_id: area_id
+        },
+        dataType:'script'
+    });
+
 };

data/app/assets/javascript/c80_estate/backend/admin/shared/properties/property_show.js

@@ -468,7 +468,7 @@ var fPropertiesShow = function () {
     $main_content = $('#main_content');
 
     $.ajax({
-        url: '/estate/can_view_statistics',
+        url: '/estate/can_view_statistics_property',
         type: 'POST',
         dataType:'script'
     })

data/app/assets/javascript/c80_estate/backend/admin/src/sevents.js

@@ -58,6 +58,9 @@ var fSeventsIndex = function () {
         $div_index_adds.append($div_area_text_stats);
         $div_index_adds.append($div_graph);
 
+        var $h = $('<h4 class="sub_h4">Последние события</h4>');
+        $div_index_adds.append($h);
+
         $main_content.prepend($div_index_adds);
 
         // теперь покажем

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

@@ -60,8 +60,13 @@ body.admin_areas {
 
     form fieldset > ol > li.boolean {
       height: auto;
-      &#item_is_main_input {padding-bottom: 20px;padding-top: 0;}
-      &#item_is_sale_input {padding-bottom: 0;}
+      &#item_is_main_input {
+        padding-bottom: 20px;
+        padding-top: 0;
+      }
+      &#item_is_sale_input {
+        padding-bottom: 0;
+      }
       label {
         font-weight: bold;
         color: #5E6469;
@@ -76,7 +81,9 @@ body.admin_areas {
     // спрячем артефакт
     li#area_galleries_input {
       fieldset.choices {
-        legend.label { display:none; }
+        legend.label {
+          display: none;
+        }
       }
     }
 
@@ -102,7 +109,9 @@ body.admin_areas {
     .fieldset_item_props {
       background-color: white !important;
       box-shadow: none !important;
-      legend { display: none !important; }
+      legend {
+        display: none !important;
+      }
     }
 
   }
@@ -155,6 +164,21 @@ body.admin_areas {
 
   &.show {
 
+    #title_bar .action_items {
+      opacity: 0;
+
+      span.action_item > a {
+        &.has_many_remove {
+          border: 1px solid #ED4F32 !important;
+          margin-left: 10px;
+          &:hover {
+            background-color: #ED4F32 !important;
+            color: white !important;
+          }
+        }
+      }
+    }
+
     div#main_content {
       opacity: 0;
 

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

@@ -47,6 +47,16 @@ body.admin_sevents {
       display: none !important;
     }
 
+    h4.sub_h4 {
+      clear: both;
+      font-size: 18px;
+      padding-top: 10px;
+      padding-bottom: 0;
+      height: 23px;
+      display: block;
+      float: left;
+    }
+
   }
 
 }

data/app/controllers/c80_estate/ajax_controller.rb

@@ -74,5 +74,22 @@ module C80Estate
 
     end
 
+    def can_edit_area
+
+      area_id = request.params[:area_id] == "" ? nil:request.params[:area_id]
+      @res = false
+
+      if area_id != ''
+        @area = Area.find(area_id)
+        @res = current_admin_user.can_edit_area?(@area)
+      end
+
+      respond_to do |format|
+        format.js
+        # format.json
+      end
+
+    end
+
   end
 end

data/app/helpers/c80_estate/areas_helper.rb

@@ -121,21 +121,21 @@ module C80Estate
           {
               title: 'Метраж',
               abbr: 'Объем площади',
-              value: area.square_value,
+              value: area.square_value.to_s(:rounded, precision: 2),
               uom: 'м.кв.',
               css:''
           },
           {
               title: 'Цена',
               abbr: 'За метр квадратный в месяц',
-              value: area.price_value,
+              value: area.price_value.to_s(:rounded, precision: 2),
               uom: 'руб',
               css:''
           },
           {
               title: 'Цена площади',
               abbr: 'Стоимость всей площади в месяц. Число PxS, где P - цена за м.кв. в месяц, S - метраж площади в м.кв.',
-              value: area.power_price_value,
+              value: area.power_price_value.to_s(:rounded, precision: 2),
               uom: 'руб',
               css:''
           },

data/app/models/c80_estate/area.rb

@@ -43,12 +43,14 @@ module C80Estate
 
     # посчитает кол-во свободных метров
     def self.free_areas_sq
-      sum = 0
+      Rails.logger.debug "<Area.free_areas_sq>"
+      sum = 0.0
       self.free_areas.each do |area|
         # 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
+        sum += area_prop_square
       end
+      Rails.logger.debug "<Area.free_areas_sq> sum = #{sum}"
       sum
     end
 
@@ -58,22 +60,22 @@ module C80Estate
 
     # посчитает кол-во занятых метров
     def self.busy_areas_sq
-      sum = 0
+      sum = 0.0
       self.busy_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
+          sum += area_prop_square.first.value.to_f
         end
       end
       sum
     end
 
     def self.all_areas_sq
-      sum = 0
+      sum = 0.0
       self.all.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
+          sum += area_prop_square.first.value.to_f
         end
       end
       sum
@@ -82,15 +84,15 @@ module C80Estate
     def self.where_price_range(range)
       self.joins(:item_props)
           .where(c80_estate_item_props: {prop_name_id: 1})
-          .where('c80_estate_item_props.value > ?', range.split(',')[0].to_i-1)
-          .where('c80_estate_item_props.value < ?', range.split(',')[1].to_i+1)
+          .where('c80_estate_item_props.value > ?', range.split(',')[0].to_f-1)
+          .where('c80_estate_item_props.value < ?', range.split(',')[1].to_f+1)
     end
 
     def self.where_square_range(range)
       C80Estate::Area.joins(:item_props)
           .where(c80_estate_item_props: {prop_name_id: 9})
-          .where('c80_estate_item_props.value > ?', range.split(',')[0].to_i-1)
-          .where('c80_estate_item_props.value < ?', range.split(',')[1].to_i+1)
+          .where('c80_estate_item_props.value > ?', range.split(',')[0].to_f-1)
+          .where('c80_estate_item_props.value < ?', range.split(',')[1].to_f+1)
     end
 
     def self.where_oenter(v)
@@ -167,7 +169,7 @@ module C80Estate
                                        })
 
         C80Estate::ItemProp.create!([
-                                        {value: row['price'].to_i, area_id: area.id, prop_name_id: 1},
+                                        {value: row['price'].to_f, area_id: area.id, prop_name_id: 1},
                                         {value: row['square'].to_f, area_id: area.id, prop_name_id: 9},
                                     ])
 
@@ -238,9 +240,9 @@ module C80Estate
     end
 
     def assigned_person_title
-      res = "-"
-      if assigned_person.present?
-        res = assigned_person.email
+      res = '-'
+      if property.assigned_person.present?
+        res = property.assigned_person.email
       end
       res
     end
@@ -258,20 +260,21 @@ module C80Estate
     end
 
     def price_value
-      res = 0
+      res = 0.0
       p = item_props.where(:prop_name_id => 1)
       if p.count > 0
-        res = p.first.value.to_i
+        res = p.first.value.to_f
       end
       res
     end
 
     def square_value
-      res = 0
+      res = 0.0
       p = item_props.where(:prop_name_id => 9)
       if p.count > 0
         res = p.first.value.to_f
       end
+      Rails.logger.debug "<Area.square_value> res = #{res}"
       res
     end
 
@@ -355,21 +358,17 @@ module C80Estate
                                created_at: self.created_at
                            })
 
-        # см [*]
-        # if last_known_sevent == ''
-        #   pparams[:created_at] = self.created_at
-        # end
-        #
-        # pparams = {
-        #     atype_id: nil,
-        #     property_id: self.property_id,
-        #     sevent_id: s.id
-        # }
+        pparams = {
+            atype_id: nil,
+            property_id: self.property_id,
+            sevent_id: s.id,
+            created_at: self.created_at
+        }
 
         # генерим запись с общими данными
         # связываем её с Sevent
         # чтобы можно было удалить как dependent => destroy
-        # Pstat.create!(pparams)
+        Pstat.create!(pparams)
 
       end
 

data/app/models/c80_estate/owner.rb

@@ -98,9 +98,11 @@ module C80Estate
             # true
           end
 
+          # если да, то будет видна кнопка "создать area"
           def can_create_areas?
             r1 = roles.where(role_type: 1)
-            r1.count > 0
+            r3 = roles.where(role_type: 3)
+            r1.count > 0 || r3.count > 0
             # true
           end
 

data/app/models/c80_estate/property.rb

@@ -3,7 +3,7 @@ module C80Estate
     belongs_to :atype
     belongs_to :owner, :polymorphic => true
     belongs_to :assigned_person, :polymorphic => true
-    has_many :item_props, :dependent => :destroy
+    # has_many :item_props, :dependent => :destroy
     has_many :pphotos, :dependent => :destroy   # одна или несколько фоток
     accepts_nested_attributes_for :pphotos,
                                   :reject_if => lambda { |attributes|
@@ -62,7 +62,7 @@ module C80Estate
     # end
 
     def average_price
-      price_sum = 0
+      price_sum = 0.0
       areas.all.each do |area|
         price_sum += area.price_value
       end
@@ -70,7 +70,7 @@ module C80Estate
       if areas.all.count != 0
         price_sum*1.0 / areas.all.count
       else
-        0
+        0.0
       end
 
     end
@@ -78,7 +78,7 @@ module C80Estate
     def average_price_busy
 
       busy_areas_count = 0
-      price_sum = 0
+      price_sum = 0.0
 
       areas.all.each do |area|
         if area.is_busy?
@@ -90,7 +90,7 @@ module C80Estate
       if busy_areas_count != 0
         price_sum*1.0 / busy_areas_count
       else
-        0
+        0.0
       end
 
     end
@@ -135,7 +135,7 @@ module C80Estate
     end
 
     def square_value
-      sum = 0
+      sum = 0.0
       areas.all.each do |area|
         sum += area.square_value
       end
@@ -143,7 +143,7 @@ module C80Estate
     end
 
     def power_price_value
-      sum = 0
+      sum = 0.0
       areas.all.each do |area|
         sum += area.power_price_value
       end

data/app/models/c80_estate/pstat.rb

@@ -103,8 +103,11 @@ module C80Estate
 
         # Занятость в метрах
 
-        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
+        # 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
+        tt = _calc_free_busy_areas_sq(pstats)
+        free_areas_atnow_sq = tt[:free_areas_atnow_sq]
+        busy_areas_atnow_sq = tt[:busy_areas_atnow_sq]
 
         # защищаемся от деления на ноль
         if busy_areas_atnow_sq + free_areas_atnow_sq == 0
@@ -767,8 +770,8 @@ module C80Estate
     end
 
     def self._calc_free_busy_areas(pstats)
-      sum_free_areas = 0
-      sum_busy_areas = 0
+      sum_free_areas = 0.0
+      sum_busy_areas = 0.0
       all_props = Property.all
       all_props.each do |prop|
         ppstats = pstats.where(:property_id => prop.id).ordered_by_created_at.last
@@ -783,5 +786,29 @@ module C80Estate
       }
     end
 
+    def self._calc_free_busy_areas_sq(pstats)
+
+      sum_free_areas_sq = 0.0
+      sum_busy_areas_sq = 0.0
+      all_props = Property.all
+
+      all_props.each do |prop|
+        ppstats = pstats.where(:property_id => prop.id).ordered_by_created_at.last
+        if ppstats.present?
+          Rails.logger.debug "\t\t ppstats.free_areas_sq = #{ppstats.free_areas_sq}"
+          Rails.logger.debug "\t\t ppstats.busy_areas_sq = #{ppstats.busy_areas_sq}"
+          sum_free_areas_sq += ppstats.free_areas_sq
+          sum_busy_areas_sq += ppstats.busy_areas_sq
+        end
+      end
+
+      Rails.logger.debug "<_calc_free_busy_areas_sq> sum_free_areas_sq = #{sum_free_areas_sq}, sum_busy_areas_sq = #{sum_busy_areas_sq}"
+
+      {
+          free_areas_atnow_sq: sum_free_areas_sq,
+          busy_areas_atnow_sq: sum_busy_areas_sq
+      }
+    end
+
   end
 end

data/app/models/c80_estate/sevent.rb

@@ -93,7 +93,7 @@ module C80Estate
 
         result[:average_value] = sprintf "%.2f%", summ/k*100
         result[:comment] = "<abbr title='Период рассчёта эффективности: с момента самого первого известного события до текущего дня'>C #{Time.at(self.first.created_at).strftime('%Y/%m/%d')} по #{Time.now.year}/#{sprintf "%02d", Time.now.month}/#{sprintf "%02d", Time.now.day}</abbr>"
-        result[:abbr] = 'Среднее значение для всех площадей за весь период'
+        result[:abbr] = 'Среднее значение коэф-та эффективности для всех площадей за весь период. Эффективность - это число b/N, где b - кол-во дней которые площадь была занята (за указанный период), N - всего дней в указанном периоде'
         result[:title] = 'Статистика - Все площади'
         result[:props] = [
             {tag:'all_areas_count', val: "Площадей всего: #{Area.all.count}"},
@@ -185,8 +185,8 @@ module C80Estate
 
         result[:average_value] = sprintf "%.2f%", result[area_id][:ecoef]*100
         result[:comment] = "<abbr title='Период рассчёта коэф-та эффективности'>C #{used_start_date_str} по #{used_end_date_str}</abbr>"
-        result[:abbr] = 'Коэф-т эффективности площади за указанный период'
-        result[:title] = "Статистика - #{area.title}"
+        result[:abbr] = 'Коэф-т эффективности площади за указанный период. Эффективность - это число b/N, где b - кол-во дней которые площадь была занята (за указанный период), N - всего дней в указанном периоде'
+        result[:title] = "Статистика - площадь '#{area.title}'"
         result[:graph] = _parse_for_js_graph(sevents)
 
         if mark_whole
@@ -196,9 +196,9 @@ module C80Estate
         end
 
         result[:props] = [
-            { tag: 'title', val: "#{area.title}" },
+            { tag: 'title', val: "Площадь: #{area.title}" },
             { tag: 'atype', val: "Тип: #{area.atype_title}" },
-            # { tag: 'born_date', val: "Дата создания: #{area.created_at.in_time_zone('Moscow')}" },
+            { tag: 'born_date', val: "Дата создания: #{area.created_at.in_time_zone('Moscow').strftime('%Y/%m/%d')}" },
             { tag: 'busy_time', val: "<abbr title='В указанный период'>Времени занята</abbr>: #{time_duration(t[:time_busy])}" },
             { tag: 'free_time', val: "<abbr title='В указанный период'>Времени свободна</abbr>: #{time_duration(t[:time_free])}" },
             { tag: 'all_time', val: "<abbr title='В указанный период'>Времени всего</abbr>: #{time_duration(t[:time_busy] + t[:time_free])}" },

data/app/views/c80_estate/ajax/can_edit_area.js.erb

@@ -0,0 +1,5 @@
+<% if @res %>
+    fAreasShow_initActionItems(<%= @area.id %>);
+<% else %>
+//    $main_content.css('opacity', '1.0');
+<% end %>

data/config/routes.rb

@@ -4,6 +4,7 @@ C80Estate::Engine.routes.draw do
   match '/estate/properties_busy_coef', :to => 'ajax#properties_busy_coef', :via => :post
   match '/estate/can_view_statistics_property', :to => 'ajax#can_view_statistics_property', :via => :post
   match '/estate/can_view_statistics_area', :to => 'ajax#can_view_statistics_area', :via => :post
+  match '/estate/can_edit_area', :to => 'ajax#can_edit_area', :via => :post
 
   match '/estate/table_properties_coef_busy', :to => 'ajax_view#table_properties_coef_busy', :via => :post
   match '/estate/table_properties_coef_busy_sq', :to => 'ajax_view#table_properties_coef_busy_sq', :via => :post

data/db/migrate/20160803093131_change_c80_estate_pstats_column_types.rb

@@ -0,0 +1,15 @@
+class ChangeC80EstatePstatsColumnTypes < ActiveRecord::Migration
+  def up
+    change_column :c80_estate_pstats, :coef_busy, :float
+    change_column :c80_estate_pstats, :free_areas_sq, :float
+    change_column :c80_estate_pstats, :busy_areas_sq, :float
+    change_column :c80_estate_pstats, :coef_busy_sq, :float
+  end
+
+  def down
+    change_column :c80_estate_pstats, :coef_busy, :integer
+    change_column :c80_estate_pstats, :free_areas_sq, :integer
+    change_column :c80_estate_pstats, :busy_areas_sq, :integer
+    change_column :c80_estate_pstats, :coef_busy_sq, :integer
+  end
+end

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = '0.1.0.24'
+  VERSION = '0.1.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.24
+  version: 0.1.0.25
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - 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/can_edit_area.js.erb
 - app/views/c80_estate/ajax/can_view_statistics_area.js.erb
 - app/views/c80_estate/ajax/can_view_statistics_property.js.erb
 - app/views/c80_estate/ajax_areas/exel_import.html.erb
@@ -202,6 +203,7 @@ files:
 - db/migrate/20160704063131_create_c80_estate_roles.rb
 - db/migrate/20160713043333_create_c80_estate_sevents.rb
 - db/migrate/20160717094647_create_c80_estate_pstats.rb
+- db/migrate/20160803093131_change_c80_estate_pstats_column_types.rb
 - db/seeds/50_fill_uoms.rb.example
 - db/seeds/55_fill_prop_names.rb.example
 - db/seeds/60_fill_atypes.rb.example