c80_estate 0.1.0.34 → 0.1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 832f4348a9023325a7bbb127efb6c10234eb27b8
-  data.tar.gz: a716de7341084ea34df0bf2d2b71f7e70c6fd723
+  metadata.gz: a63ef92bdfb5688fb9a777edb2f0fe55a1853b60
+  data.tar.gz: 0e6a05f89a444b4bb1c1bf0ccb0426519f152310
 SHA512:
-  metadata.gz: 273b0fd67f31a3b0d1fa0f5e8ce3ccab77996ceb10546154149cf31fa9ceb27677c8b2c5fd262bc3494dee098a1527309e3c637df71c645492e0624d29e21667
-  data.tar.gz: 8b3c499e0e165c338bde6113941723e4477a934cabb5be9b28035dd2100ccd0d53876f3f3dde10aa81b8c025d8396ab37fefe59e18c4043a9377ce289d71bbb5
+  metadata.gz: 719fa3098fdf9b9b50fbea6ee3ef9ef1bee4d006e6a147e09d9c81132acfc2c9750890916684dcad83914d263dce79e04af487bd34f4da7aa7eea6cec6c36c47
+  data.tar.gz: 42254bee3a70f7aae32832c2115a04b5d07f8d15d6a86dc3a65596e8f7fed264f7f5ba60f233b46405c38a7aec221fb94892be32915e6940d79b4318239010ad

data/app/admin/c80_estate/areas.rb

@@ -13,6 +13,8 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
                 :owner_type,
                 :assigned_person_id,
                 :assigned_person_type,
+                :last_updater_id,
+                :last_updater_type,
                 :atype_id,
                 :property_id,
                 :astatus_ids => [],
@@ -244,6 +246,8 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
         f.input :owner_id, :input_html => {:value => current_admin_user.id}, as: :hidden
         f.input :owner_type, :input_html => {:value => "AdminUser"}, as: :hidden
       end
+      f.input :last_updater_id, :input_html => {:value => current_admin_user.id}, as: :hidden
+      f.input :last_updater_type, :input_html => {:value => "AdminUser"}, as: :hidden
 
     end
 

data/app/admin/c80_estate/dashboard.rb

@@ -35,6 +35,18 @@ ActiveAdmin.register_page "Dashboard" do
 
     end
 
+    if current_admin_user.can_view_statistics?
+      section '' do
+        columns do
+          column do
+            panel "10 последних событий изменения статуса площадей (<a class='white_link' href='/admin/sevents'>Просмотреть все</a>)".html_safe do
+              render_table_last_sevents
+            end
+          end
+        end
+      end
+    end
+
     # section '', if: -> { current_admin_user.email == 'tz007@mail.ru' } do
     #   columns do
     #     column do

data/app/admin/c80_estate/sevents.rb

@@ -54,7 +54,8 @@ ActiveAdmin.register C80Estate::Sevent, as: 'Sevent' do
     end
     column :created_at
     column :property do |sevent|
-      sevent.property_title
+      # sevent.property_title
+      link_to sevent.property.title, "/admin/properties/#{sevent.property.id}"
     end
     actions
   end

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

@@ -14,7 +14,9 @@ div.properties_index_logo {
 span.properties_index_logo_title {
 }
 
-body.admin_properties {
+body.admin_properties,
+body.admin_areas // т.к. подобную кнопку я теперь стал рисовать и на странице просмотра площади
+{
 
   button {
     span.fa.fa-chevron-right {

data/app/assets/stylesheets/c80_estate/backend/common/collapse.scss

@@ -19,7 +19,7 @@
     text-align: left;
     font-weight: bold;
     color: #43474f;
-    background-color: transparent;
+    background-color: rgba(109, 155, 161, 0.06);
     outline: 0;
     font-size: 20px !important;
     text-shadow: none !important;

data/app/assets/stylesheets/c80_estate/backend/common/panel.scss

@@ -23,7 +23,7 @@
     th {
       background-color: #ffffff !important;
       border-bottom: 1px solid #cecece !important;
-      line-height: 5px !important;
+      line-height: 15px !important;
       background-image: none !important;
       color: #288feb !important;
     }

data/app/assets/stylesheets/c80_estate/backend/common/text_styling/span_time_date.scss

@@ -0,0 +1,13 @@
+span {
+
+  &.span_time {
+    color: #b7c3ca;
+    font-weight: bold;
+  }
+
+  &.span_date {
+    color: #808080;
+    font-weight: bold;
+  }
+
+}

data/app/assets/stylesheets/c80_estate/backend/common/text_styling/white_link.scss

@@ -0,0 +1,26 @@
+a.white_link {
+  color: #ddd !important;
+  text-decoration: underline !important;
+
+  -webkit-transition: opacity .2s ease-out;
+  -moz-transition: opacity .2s ease-out;
+  -ms-transition: opacity .2s ease-out;
+  -o-transition: opacity .2s ease-out;
+  transition: opacity .2s ease-out;
+
+  &:hover {
+    color: #ffd7a7 !important;
+    text-decoration: underline !important;
+  }
+  &:focus {
+    color: #a3ff96 !important;
+  }
+  &:active {
+    color: #7affe4 !important;
+  }
+}
+
+// в dashboard в заголовке панели это встречается
+h3 a.white_link {
+  font-size: 12px;
+}

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

@@ -14,15 +14,4 @@ body.admin_dashboard {
     }
   }
 
-  table.index_table {
-    a {
-      text-decoration: none !important;
-      color: #323537 !important;
-      &:hover {
-        text-decoration: underline !important;
-        color: #124068 !important;
-      }
-    }
-  }
-
 }

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

@@ -0,0 +1,28 @@
+body.admin_dashboard {
+
+  table.index_table {
+
+    a {
+
+      // обычные ссылки без стилизации
+      text-decoration: none !important;
+      color: #323537 !important;
+      &:hover {
+        text-decoration: underline !important;
+        color: #124068 !important;
+      }
+
+      // чтобы стилизовать - надо явно указывать класс
+      &.link {
+        text-decoration: underline !important;
+        color: #3e7de5 !important;
+        &:hover {
+          text-decoration: underline !important;
+          color: #4498ff !important;
+        }
+      }
+    }
+
+  }
+
+}

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

@@ -0,0 +1,13 @@
+body.admin_dashboard {
+
+  #table_last_sevents {
+    thead {
+      tr {
+        th {
+          color: #424C58 !important;
+        }
+      }
+    }
+  }
+
+}

data/app/helpers/c80_estate/app_helper.rb

@@ -164,5 +164,37 @@ module C80Estate
       render :partial => 'c80_estate/shared/properties/single_property_on_page'
     end
 
+    def render_table_last_sevents(property = nil, area = nil, limit = nil)
+      # Rails.logger.debug "[TRACE] <AppHelper.render_table_last_sevents> current_admin_user.can_view_statistics? = #{current_admin_user.can_view_statistics?}"
+
+      # сначал выберем из базы
+
+      sevents_list = Sevent.all
+
+      if property.present?
+        sevents_list = sevents_list.where(:property_id => property.id)
+      end
+
+      if area.present?
+        sevents_list = sevents_list.where(:area_id => area.id)
+      end
+
+      lim = 10
+
+      if limit.present?
+        lim = limit
+      end
+
+      sevents_list = sevents_list.limit(lim).created_at_desc
+
+      # теперь нарисуем
+
+      render :partial => 'c80_estate/shared/table_last_sevents',
+             :locals => {
+                 sevents_list: sevents_list
+             }
+
+    end
+
   end
 end

data/app/helpers/c80_estate/areas_helper.rb

@@ -58,7 +58,7 @@ module C80Estate
           { 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.last_updater_title },
           { title: 'Ответственный', value: area.assigned_person_title }
       ]
 

data/app/models/c80_estate/area.rb

@@ -4,6 +4,7 @@ module C80Estate
     belongs_to :atype
     belongs_to :owner, :polymorphic => true
     belongs_to :assigned_person, :polymorphic => true
+    belongs_to :last_updater, :polymorphic => true
     has_many :item_props, :dependent => :destroy
     accepts_nested_attributes_for :item_props,
                                   :reject_if => lambda { |attributes|
@@ -312,8 +313,10 @@ module C80Estate
       res
     end
 
-    def last_updater
-      sevents.last.auser.email
+    def last_updater_title
+      if last_updater.present?
+        last_updater.email
+      end
     end
 
     # выдать цену за м.кв. в месяц
@@ -443,13 +446,13 @@ module C80Estate
 
     protected
 
-    # при создании площади генерится начальное событие
+    # после создания площади генерится начальное событие
     def create_initial_sevent
-      Rails.logger.debug "<Area.create_initial_sevent> self.astatuses.count = #{self.astatuses.count}"
+      # Rails.logger.debug "<Area.create_initial_sevent> self.astatuses.count = #{self.astatuses.count}"
 
       # [**]
       if self.astatuses.count > 0
-        Rails.logger.debug "<Area.create_initial_sevent> aga: self.astatuses.first.title = #{self.astatuses.first.title}"
+        # Rails.logger.debug "<Area.create_initial_sevent> aga: self.astatuses.first.title = #{self.astatuses.first.title}"
 
         s = Sevent.create!({
                                area_id: self.id,
@@ -477,6 +480,7 @@ module C80Estate
 
     end
 
+    # после обновления данных площади генерится Sevent событие
     def check_and_generate_sevent
 
       # находим последнее известное событие
@@ -491,13 +495,13 @@ module C80Estate
       Rails.logger.debug "<Area.check_and_generate_sevent> last_known_sevent = #{last_known_sevent}, self.astatuses.first.tag = #{self.astatuses.first.tag}"
 
       if last_known_sevent != self.astatuses.first.tag
-        Rails.logger.debug "<Area.check_and_generate_sevent> aga"
+        Rails.logger.debug "<Area.check_and_generate_sevent> [STATUS_CHANGED] self.last_updater_id = #{self.last_updater_id}"
         sparams = {
             area_id: self.id,
             atype_id: self.atype_id,
             property_id: self.property_id,
             astatus_id: self.astatus_id,
-            auser_id: self.owner_id, # инициатор события - редактор Площади
+            auser_id: self.last_updater_id, # инициатор события - редактор Площади
             auser_type: 'AdminUser'
         }
 

data/app/models/c80_estate/owner.rb

@@ -35,9 +35,10 @@ module C80Estate
           # эта взаимосвязь трактуется, как "площадь, назначенная сотруднику"
           has_many :assigned_areas, :as => :assigned_person, :class_name => 'C80Estate::Area', :dependent => :nullify
 
-          # эта взаимосвязь трактуется, как "площадь, назначенная сотруднику"
+          # эта взаимосвязь трактуется, как "объект, назначенная сотруднику"
           has_many :assigned_properties, :as => :assigned_person, :class_name => 'C80Estate::Property', :dependent => :nullify
 
+          # эта взаимосвязь трактуется как "Пользователь, создавая\меняя\удаяя площади, генерит Sevent события"
           has_many :sevents, :as => :auser, :class_name => 'C80Estate::Sevent', :dependent => :nullify
 
           after_create :create_role
@@ -86,7 +87,6 @@ module C80Estate
             # true
           end
 
-
           def can_edit_property?(property)
             r1 = roles.where(role_type: 1)
             # mark_is_owner = property.owner.id == id

data/app/models/c80_estate/sevent.rb

@@ -10,19 +10,8 @@ module C80Estate
     # нужен только при заполнении из rake db:seed:85_fill_sevents
     after_create :generate_pstat
 
-=begin
-    def self.all_areas
-      self.all
-    end
-
-    def self.free_areas
-      self.joins(:astatuses).where(:c80_estate_astatuses => { tag: 'free'})
-    end
-
-    def self.busy_areas
-      self.joins(:astatuses).where(:c80_estate_astatuses => { tag: 'busy'})
-    end
-=end
+    scope :created_at_asc, -> {order(:created_at => :asc)}
+    scope :created_at_desc, -> {order(:created_at => :desc)}
 
     def self.ecoef(area_id: nil, prop_id: nil, atype_id: nil, start_date: nil, end_date: nil)
       # start_date: строка вида 2015-12-12

data/app/views/c80_estate/shared/_table_last_sevents.html.erb

@@ -0,0 +1,25 @@
+<%# AppHelper.render_table_last_sevents %>
+
+<table border="0" cellspacing="0" cellpadding="0" id="table_last_sevents" class="index_table index sortable">
+  <thead>
+  <tr>
+    <th><abbr title="Показано время события изменения статуса">Время</abbr></th>
+    <th><abbr title="Площадь, чей статус был изменён">Площадь</abbr></th>
+    <th><abbr title="Статус, который приобрела площадь">Статус</abbr></th>
+    <th><abbr title="Показан актуальный тип площади ПОСЛЕ события изменения статуса">Тип площади</abbr></th>
+    <th><abbr title="Пользователь, который изменил статус площади">Инициатор</abbr></th>
+    <th><abbr title="Объект недвижимости, которому принадлежит площадь">Объект</abbr></th>
+  </tr>
+  </thead>
+  <% sevents_list.each do |sevent| %>
+      <tr>
+        <%# Rails.logger.debug "[TRACE] <_table_last_sevents.html.erb> #{sevent}" %>
+        <td><%= "<span class='span_date'>#{sevent.created_at.strftime('%d/%b/%Y')}</span> <span class='span_time'>#{sevent.created_at.strftime('%H:%M:%S')}</span> ".html_safe %></td>
+        <td><%= link_to sevent.area_title, "/admin/areas/#{sevent.area.id}", class:'link' %></td>
+        <td><%= sevent.astatus_title %></td>
+        <td><%= sevent.atype.title %></td>
+        <td><%= sevent.auser_title %></td>
+        <td><%= link_to sevent.property.title, "/admin/properties/#{sevent.property.id}", class:'link' %></td>
+      </tr>
+  <% end %>
+</table>

data/app/views/c80_estate/shared/_table_properties_coef_busy_sq.html.erb

@@ -1,3 +1,4 @@
+<%# AppHelper::render_table_prop_busy_coef_sq %>
 <table border="0" cellspacing="0" cellpadding="0" id="table_properties_coef_busy_sq" class="sortable index_table index" paginator="true">
   <thead>
   <tr>

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

@@ -48,6 +48,18 @@
   <%= smiph_render_common_props(@item) %>
 </div>
 
+<% if current_admin_user.can_view_statistics? %>
+    <div id="div_all_sevents_table" class="wrap_collapse">
+      <button type="button" class="btn" data-toggle="collapse" data-target="#iid2">
+        <span class="fa fa-chevron-right"></span>
+        Все события изменения статуса (<%= @item.sevents.count %>)
+      </button>
+      <div class="collapse" id="iid2">
+        <%= render_table_last_sevents(nil, @item, 99999) %>
+      </div>
+    </div>
+<% end %>
+
 <div id="related_items" class="hidden">
   <%# smiph_render_related_items(@item) %>
 </div>

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

@@ -49,6 +49,18 @@
     </div>
 <% end %>
 
+<% if current_admin_user.can_view_statistics? %>
+    <div id="div_all_sevents_table" class="wrap_collapse">
+      <button type="button" class="btn" data-toggle="collapse" data-target="#iid2">
+        <span class="fa fa-chevron-right"></span>
+        Все события изменения статусов всех площадей объекта (<%= @item.sevents.count %>)
+      </button>
+      <div class="collapse" id="iid2">
+        <%= render_table_last_sevents(@item, nil, 99999) %>
+      </div>
+    </div>
+<% end %>
+
 <div id="related_items" class="hidden">
   <%# smiph_render_related_items(@item) %>
 </div>

data/db/migrate/20160810064747_add_last_editor_to_c80_estate_areas.rb

@@ -0,0 +1,6 @@
+class AddLastEditorToC80EstateAreas < ActiveRecord::Migration
+  def change
+    add_reference :c80_estate_areas, :last_updater, index: true
+    add_column :c80_estate_areas, :last_updater_type, :string
+  end
+end

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = '0.1.0.34'
+  VERSION = '0.1.0.35'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.34
+  version: 0.1.0.35
 platform: ruby
 authors:
 - C80609A
@@ -115,12 +115,16 @@ files:
 - app/assets/stylesheets/c80_estate/backend/admin_users.scss
 - app/assets/stylesheets/c80_estate/backend/common.scss
 - app/assets/stylesheets/c80_estate/backend/common/collapse.scss
-- app/assets/stylesheets/c80_estate/backend/common/free_busy.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/common/text_styling/free_busy.scss
+- app/assets/stylesheets/c80_estate/backend/common/text_styling/span_time_date.scss
+- app/assets/stylesheets/c80_estate/backend/common/text_styling/white_link.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/index_table.scss
 - app/assets/stylesheets/c80_estate/backend/dashboard/prop_in_list.scss
+- app/assets/stylesheets/c80_estate/backend/dashboard/table_last_sevents.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_all_areas_table.scss
@@ -181,6 +185,7 @@ files:
 - app/views/c80_estate/ajax_view/table_properties_coef_busy.js.erb
 - app/views/c80_estate/ajax_view/table_properties_coef_busy_sq.js.erb
 - app/views/c80_estate/shared/_form_upload_areas_excel.erb
+- app/views/c80_estate/shared/_table_last_sevents.html.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
@@ -210,6 +215,7 @@ files:
 - 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/migrate/20160810064747_add_last_editor_to_c80_estate_areas.rb
 - db/seeds/50_fill_uoms.rb.example
 - db/seeds/55_fill_prop_names.rb.example
 - db/seeds/60_fill_atypes.rb.example