c80_estate 0.1.0.3 → 0.1.0.4

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

@@ -12,7 +12,7 @@ body.admin_pstats {
       transition: opacity .2s ease-in;
 
       div#index_adds {
-        height: calc(183px + 15px);
+        height: calc(483px + 15px);
         min-height: calc(183px + 15px);
         margin-bottom: 0;
 
@@ -24,7 +24,7 @@ body.admin_pstats {
           height: 183px;
 
           &#coef {
-            width: 200px;
+            width: 25%;
             text-align: center;
 
             p {
@@ -39,8 +39,25 @@ body.admin_pstats {
             }
           }
 
-          &#text_stats {
-            width: 400px;
+          &#coef_sq {
+            width: calc(25% - 30px);
+            margin-left: 30px;
+            text-align: center;
+
+            p {
+              width: 100%;
+
+              &.val {
+                margin-top: 15px;
+                margin-bottom: 0;
+                font-size: 40px;
+              }
+
+            }
+          }
+
+          &#text_stats, &#text_stats_sq {
+            width: calc(25% - 30px);
             margin-left: 30px;
 
             ul {
@@ -54,7 +71,7 @@ body.admin_pstats {
           }
 
           &#graph {
-            width: calc(100% - 200px - 400px - 30px - 30px);
+            width: calc(100% - 200px - 200px - 30px - 30px);
             /*width: 100%;*/
             /*height: 200px;*/
             /*margin-top: 15px;*/
@@ -73,7 +90,32 @@ body.admin_pstats {
 
           &#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;
@@ -84,6 +126,10 @@ body.admin_pstats {
             -o-transition: opacity .2s ease-in;
             transition: opacity .2s ease-in;
 
+            #graph3canvas {
+              width: 100%;
+            }
+
           }
 
         }
@@ -126,6 +172,10 @@ body.admin_pstats {
       display: none !important;
     }
 
+    #collection_selection {
+      display: none !important;
+    }
+
   }
 
 }

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

@@ -69,6 +69,11 @@ body.admin_sevents {
             -ms-transition: opacity .2s ease-in;
             -o-transition: opacity .2s ease-in;
             transition: opacity .2s ease-in;
+
+            #graph_canvas {
+              width: 100%;
+            }
+
           }
 
         }

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

@@ -0,0 +1,29 @@
+a.atype_in_list {
+  display: block;
+  float: left;
+  min-width: 150px;
+  margin-right: 30px;
+  border: 2px solid #ededed;
+  border-radius: 3px;
+  line-height: 44px;
+  padding: 0 20px;
+  margin-bottom: 10px;
+
+  text-align: center;
+  white-space: nowrap;
+  text-decoration: none;
+  font-weight: bold;
+  color: #288feb;
+  font-size: 15px;
+
+  &:hover { color: #2990ed; background-color: #e4e4e4; text-decoration: none;}
+  &:active { color: #18558c; }
+  &:focus { color: #164f82; }
+
+  -webkit-transition: all .2s ease-in;
+  -moz-transition: all .2s ease-in;
+  -ms-transition: all .2s ease-in;
+  -o-transition: all .2s ease-in;
+  transition: all .2s ease-in;
+
+}

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

@@ -0,0 +1,43 @@
+body.admin_dashboard {
+
+  p.title {
+    font-size: 17px;
+  }
+
+  .columns {
+    margin-bottom: 30px;
+  }
+
+  .panel {
+    -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+
+    > h3 {
+      background-color: #5e7188 !important;
+      background-image: none !important;
+      text-shadow: none !important;
+      border: none !important;
+      box-shadow: none !important;
+      line-height: 30px !important;;
+      margin-bottom: 0.5em;
+      color: #ffffff !important;
+      padding: 5px 10px 3px 10px;
+    }
+
+    .panel_contents {
+      padding: 10px 0 !important;
+      border-bottom: none !important;
+    }
+
+    table {
+      th {
+        background-color: #ffffff !important;
+        border-bottom: 1px solid #cecece !important;
+        line-height: 5px !important;
+        background-image: none !important;
+        color: #288feb !important;
+      }
+    }
+  }
+
+}

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

@@ -0,0 +1,52 @@
+div.prop_in_list {
+  float: left;
+  width: 200px;
+  height: 214px;
+  margin-right: 30px;
+  margin-bottom: 15px;
+  border: 2px solid #ededed;
+  border-radius: 3px;
+
+  > a {
+    width: 100px;
+    height: 100px;
+    display: block;
+    position: relative;
+    margin: 0 46px;
+    top: 35px;
+    text-align: center;         /*!*/
+    white-space: nowrap;        /*!*/
+
+    span {
+      display: inline-block;      /*!*/
+      vertical-align: middle;     /*!*/
+      height: 100%;               /*!*/
+    }
+
+    img {
+      max-width: 100%;
+      vertical-align: middle;     /*!*/
+    }
+
+  }
+
+  .text_content {
+    margin-top: 45px;
+    padding: 0 35px;
+    text-align: center;
+
+    h4 {
+      > a {
+        font-weight: bold;
+        color: #288feb;
+        text-decoration: none;
+        font-size: 15px;
+        &:hover { color: #1c62a1; }
+        &:active { color: #18558c; }
+        &:focus { color: #164f82; }
+      }
+    }
+
+  }
+
+}

data/app/controllers/c80_estate/ajax_view_controller.rb

@@ -0,0 +1,23 @@
+module C80Estate
+  class AjaxViewController < ActionController::Base
+
+    def table_properties_coef_busy
+
+      @atype_id = request.params[:atype_id] == "" ? nil:request.params[:atype_id]
+
+      respond_to do |format|
+        format.js
+      end
+    end
+
+    def table_properties_coef_busy_sq
+
+      @atype_id = request.params[:atype_id] == "" ? nil:request.params[:atype_id]
+
+      respond_to do |format|
+        format.js
+      end
+    end
+
+  end
+end

data/app/helpers/c80_estate/app_helper.rb

@@ -0,0 +1,55 @@
+module C80Estate
+  module AppHelper
+
+    def render_table_prop_busy_coef(atype_id: nil)
+      # Rails.logger.debug "<render_table_prop_busy_coef> atype_id = #{atype_id}"
+
+      props = Property.all
+      list = []
+
+      props.all.each do |prop|
+        pp = Pstat.busy_coef(prop_id: prop.id, atype_id: atype_id)
+        # Rails.logger.debug "<render_table_prop_busy_coef> pp = #{pp}"
+        busy_coef = pp[:busy_coef]
+        props = pp[:raw_props]
+        list << {
+            title: prop.title,
+            busy_coef: busy_coef,
+            props: props
+        }
+        # Rails.logger.debug "<render_table_prop_busy_coef> #{prop.title}"
+      end
+
+      render :partial => 'c80_estate/shared/table_properties_coef_busy',
+             :locals => {
+                 list: list
+             }
+    end
+
+    def render_table_prop_busy_coef_sq(atype_id: nil)
+      Rails.logger.debug "<render_table_prop_busy_coef_sq> atype_id = #{atype_id}"
+
+      props = Property.all
+      list = []
+
+      props.all.each do |prop|
+        pp = Pstat.busy_coef(prop_id: prop.id, atype_id: atype_id)
+        # Rails.logger.debug "<render_table_prop_busy_coef> pp = #{pp}"
+        busy_coef_sq = pp[:busy_coef_sq]
+        props = pp[:raw_props_sq]
+        list << {
+            title: prop.title,
+            busy_coef: busy_coef_sq,
+            props: props
+        }
+        # Rails.logger.debug "<render_table_prop_busy_coef> #{prop.title}"
+      end
+
+      render :partial => 'c80_estate/shared/table_properties_coef_busy_sq',
+             :locals => {
+                 list: list
+             }
+    end
+
+  end
+end

data/app/models/c80_estate/area.rb

@@ -14,14 +14,14 @@ module C80Estate
                                   !attributes[:prop_name_id].present?
                                   },
                                   :allow_destroy => true
-    has_many :aphotos, :dependent => :destroy   # одна или несколько фоток
+    has_many :aphotos, :dependent => :destroy # одна или несколько фоток
     accepts_nested_attributes_for :aphotos,
                                   :reject_if => lambda { |attributes|
                                     !attributes.present?
                                   },
                                   :allow_destroy => true
-    has_many :comments, :dependent => :destroy   # площадь можно прокомментировать
-    has_and_belongs_to_many :astatuses,         # единственный статус: либо занята, либо свободна
+    has_many :comments, :dependent => :destroy # площадь можно прокомментировать
+    has_and_belongs_to_many :astatuses, # единственный статус: либо занята, либо свободна
                             :join_table => 'c80_estate_areas_astatuses'
 
     has_many :sevents, :dependent => :destroy
@@ -34,21 +34,46 @@ module C80Estate
     end
 
     def self.free_areas
-      self.joins(:astatuses).where(:c80_estate_astatuses => { tag: 'free'})
+      self.joins(:astatuses).where(:c80_estate_astatuses => {tag: 'free'})
     end
 
     # посчитает кол-во свободных метров
     def self.free_areas_sq
-      1
+      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
+      end
+      sum
     end
 
     def self.busy_areas
-      self.joins(:astatuses).where(:c80_estate_astatuses => { tag: 'busy'})
+      self.joins(:astatuses).where(:c80_estate_astatuses => {tag: 'busy'})
     end
 
     # посчитает кол-во занятых метров
     def self.busy_areas_sq
-      1
+      sum = 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
+        end
+      end
+      sum
+    end
+
+    def self.all_areas_sq
+      sum = 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
+        end
+      end
+      sum
     end
 
     def atype_title
@@ -110,14 +135,14 @@ module C80Estate
         Rails.logger.debug "<Area.create_initial_sevent> aga: self.astatuses.first.title = #{self.astatuses.first.title}"
 
         s = Sevent.create!({
-                           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_type: 'AdminUser',
-                           created_at: self.created_at
-                       })
+                               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_type: 'AdminUser',
+                               created_at: self.created_at
+                           })
 
         # см [*]
         # if last_known_sevent == ''

data/app/models/c80_estate/plogo.rb

@@ -0,0 +1,6 @@
+module C80Estate
+  class Plogo < ActiveRecord::Base
+    belongs_to :property
+    mount_uploader :image, PlogoUploader
+  end
+end

data/app/models/c80_estate/pphoto.rb

@@ -1,5 +1,6 @@
 module C80Estate
   class Pphoto < ActiveRecord::Base
+    belongs_to :property
     mount_uploader :image, PphotoUploader
   end
 end

data/app/models/c80_estate/property.rb

@@ -10,6 +10,12 @@ module C80Estate
                                     !attributes.present?
                                   },
                                   :allow_destroy => true
+    has_many :plogos, :dependent => :destroy   # одна или несколько фоток
+    accepts_nested_attributes_for :plogos,
+                                  :reject_if => lambda { |attributes|
+                                    !attributes.present?
+                                  },
+                                  :allow_destroy => true
     has_many :areas, :dependent => :destroy
     has_many :comments, :dependent => :destroy
     has_many :sevents, :dependent => :destroy
@@ -23,5 +29,13 @@ module C80Estate
       res
     end
 
+    def logo_path
+      url = 'property_default_logo.png'
+      if plogos.count > 0
+        url = plogos.first.image.thumb256
+      end
+      url
+    end
+
   end
 end