c80_estate 0.1.0.3 → 0.1.0.4

data/app/models/c80_estate/sevent.rb

@@ -7,6 +7,7 @@ module C80Estate
     belongs_to :auser, :polymorphic => true
     has_many :pstats, :dependent => :destroy
 
+    # нужен только при заполнении из rake db:seed:85_fill_sevents
     after_create :generate_pstat
 
 =begin
@@ -358,7 +359,7 @@ module C80Estate
       "%dд %dч %dмин % dс" % [dd,hh,mm,ss]
     end
 
-    def self._parse_for_js_graph(sevents)
+    def self._parse_for_js_graph_google(sevents)
       # res = [
       #     ['Year', 'Sales', 'Expenses'],
       #     ['2013',  1000,      400],
@@ -377,8 +378,71 @@ module C80Estate
       res
     end
 
+    def self._parse_for_js_graph_graphjs(sevents)
+
+
+      # res = {
+      #     labels: ['2016/12/22',...]
+      #     points: [12,13,...]
+      # }
+
+      res = {
+          labels:[],
+          points:[]
+      }
+      sevents.each do |sevent|
+        label = sevent.created_at.strftime('%Y/%m/%d')
+        v = 1
+        if sevent.astatus.tag == 'free'
+          v = 0
+        end
+        res[:labels] << label
+        res[:points] << v
+        Rails.logger.debug "<Sevent.parse_for_js_graph> label = #{label}, point = #{v}"
+      end
+      res
+
+
+    end
+
+    def self._parse_for_js_graph(sevents)
+
+      # res: [
+      #     {
+      #         year
+      #         month
+      #         day
+      #         val
+      #     }
+      # ]
+
+      res = []
+
+      sevents.each do |sevent|
+
+        v = 1
+        if sevent.astatus.tag == 'free'
+          v = 0
+        end
+
+        res << {
+            year: sevent.created_at.strftime('%Y'),
+            month: sevent.created_at.strftime('%m').to_i-1,
+            day: sevent.created_at.strftime('%d'),
+            val: v
+        }
+
+      end
+
+      Rails.logger.debug "<Sevent.parse_for_js_graph> res = #{res}"
+      res
+
+    end
+
     protected
 
+    # раскомментировать перед исполнением rake db:seed:85_fill_sevents
+    # после - закомментить обратно
     def generate_pstat
 
       # pparams = {

data/app/uploaders/c80_estate/plogo_uploader.rb

@@ -0,0 +1,25 @@
+module C80Estate
+  class PlogoUploader < BaseFileUploader
+
+    # ограничение оригинальной картинки
+    process :resize_to_limit => [1024, 1024]
+
+    version :thumb512 do
+      process :resize_to_limit => [512, 512]
+    end
+
+    version :thumb256 do
+      process :resize_to_limit => [256, 256]
+    end
+
+    version :thumb128 do
+      process :resize_to_limit => [128, 128]
+    end
+
+    def store_dir
+      "uploads/properties/logos/#{model.id}"
+    end
+
+  end
+
+end

data/app/views/admin/dashboard/_atype_in_list.html.erb

@@ -0,0 +1,3 @@
+<a class ='atype_in_list' href="/admin/pstats?utf8=✓&q%5Batype_id_eq%5D=<%= atype.id %>&commit=Фильтровать&order=id_asc">
+  <%= atype.title %>
+</a>

data/app/views/admin/dashboard/_prop_in_list.html.erb

@@ -0,0 +1,10 @@
+<div class="prop_in_list">
+  <%# link_to image_tag(image_path(prop.logo_path)), "/admin/properties/#{prop.id}" %>
+  <!--<a href="/admin/properties/<%= prop.id %>">-->
+  <a href="/admin/pstats?utf8=✓&q%5Bproperty_id_eq%5D=<%= prop.id %>&commit=Фильтровать&order=id_asc">
+    <span></span><img src="<%= image_path(prop.logo_path) %>">
+  </a>
+  <div class="text_content">
+    <h4><%= link_to prop.title, "/admin/pstats?utf8=✓&q%5Bproperty_id_eq%5D=#{prop.id}&commit=Фильтровать&order=id_asc" %></h4>
+  </div>
+</div>

data/app/views/c80_estate/ajax_view/table_properties_coef_busy.js.erb

@@ -0,0 +1,3 @@
+var $cc = $("#ajax_div");
+var html_str = "<%= j render_table_prop_busy_coef(atype_id: @atype_id) %>";
+$cc.html(html_str);

data/app/views/c80_estate/ajax_view/table_properties_coef_busy_sq.js.erb

@@ -0,0 +1,3 @@
+var $cc = $("#ajax_div2");
+var html_str = "<%= j render_table_prop_busy_coef_sq(atype_id: @atype_id) %>";
+$cc.html(html_str);

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

@@ -0,0 +1,25 @@
+<table border="0" cellspacing="0" cellpadding="0" id="index_table_sevents" class="index_table index" paginator="true">
+  <thead>
+  <tr>
+    <th class="col col-prop">Объект</th>
+    <th class="col col-coef">Занятость</th>
+    <th class="col col-all">Площадей</th>
+    <th class="col col-free">Свободно</th>
+    <th class="col col-busy">Занято</th>
+  </tr>
+  </thead>
+  <tbody>
+
+  <% list.each do |obj| %>
+  <%# Rails.logger.debug "#{obj}" %>
+    <tr>
+      <td><%= obj[:title] %></td>
+      <td><%= obj[:busy_coef] %></td>
+      <% obj[:props].each_key do |key| %>
+        <td><%= obj[:props][key] %></td>
+      <% end %>
+    </tr>
+  <% end %>
+
+  </tbody>
+</table>

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

@@ -0,0 +1,25 @@
+<table border="0" cellspacing="0" cellpadding="0" id="index_table_sevents" class="index_table index" paginator="true">
+  <thead>
+  <tr>
+    <th class="col col-prop">Объект</th>
+    <th class="col col-coef">Занятость в м.кв.</th>
+    <th class="col col-all">Всего м.кв.</th>
+    <th class="col col-free">Свободно</th>
+    <th class="col col-busy">Занято</th>
+  </tr>
+  </thead>
+  <tbody>
+
+  <% list.each do |obj| %>
+  <%# Rails.logger.debug "#{obj}" %>
+    <tr>
+      <td><%= obj[:title] %></td>
+      <td><%= obj[:busy_coef] %></td>
+      <% obj[:props].each_key do |key| %>
+        <td><%= obj[:props][key] %></td>
+      <% end %>
+    </tr>
+  <% end %>
+
+  </tbody>
+</table>

data/config/routes.rb

@@ -2,4 +2,8 @@ C80Estate::Engine.routes.draw do
   match '/estate/get_atype_propnames', :to => 'ajax#get_atype_propnames', :via => :post
   match '/estate/areas_ecoef', :to => 'ajax#areas_ecoef', :via => :post
   match '/estate/properties_busy_coef', :to => 'ajax#properties_busy_coef', :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
+
 end

data/db/migrate/20160630012728_create_c80_estate_plogos.rb

@@ -0,0 +1,9 @@
+class CreateC80EstatePlogos < ActiveRecord::Migration
+  def change
+    create_table :c80_estate_plogos, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :image
+      t.references :property, index: true
+      t.timestamps null: false
+    end
+  end
+end

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = "0.1.0.3"
+  VERSION = "0.1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3
+  version: 0.1.0.4
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,28 +68,37 @@ files:
 - app/admin/c80_estate/areas.rb
 - app/admin/c80_estate/astatuses.rb
 - app/admin/c80_estate/atypes.rb
+- app/admin/c80_estate/dashboard.rb
 - app/admin/c80_estate/prop_names.rb
 - app/admin/c80_estate/properties.rb
 - app/admin/c80_estate/pstats.rb
 - app/admin/c80_estate/role_types.rb
 - app/admin/c80_estate/sevents.rb
 - app/admin/c80_estate/uoms.rb
+- app/assets/images/property_default_logo.png
 - app/assets/javascript/c80_estate/backend/admin/areas.js
 - app/assets/javascript/c80_estate/backend/admin/pstats.js
 - app/assets/javascript/c80_estate/backend/admin/sevents.js
 - app/assets/javascript/c80_estate/backend/init.js
 - app/assets/javascript/c80_estate/backend/init_selectpicker.js
+- app/assets/javascript/c80_estate/lib/Chart.bundle.js
 - app/assets/javascript/c80_estate/lib/google_charts_loader.js
 - app/assets/javascript/c80_estate/lib/jalert.js
+- app/assets/javascript/c80_estate/lib/jquery.canvasjs.min.js
 - app/assets/javascript/c80_estate_active_admin.js.coffee
 - app/assets/stylesheets/c80_estate/backend/admin_areas.scss
 - app/assets/stylesheets/c80_estate/backend/admin_pstats.scss
 - app/assets/stylesheets/c80_estate/backend/admin_sevents.scss
 - app/assets/stylesheets/c80_estate/backend/admin_users.scss
 - app/assets/stylesheets/c80_estate/backend/common.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/prop_in_list.scss
 - app/assets/stylesheets/c80_estate/lib/mixins.scss
 - app/assets/stylesheets/c80_estate_active_admin.scss
 - app/controllers/c80_estate/ajax_controller.rb
+- app/controllers/c80_estate/ajax_view_controller.rb
+- app/helpers/c80_estate/app_helper.rb
 - app/models/c80_estate/aphoto.rb
 - app/models/c80_estate/area.rb
 - app/models/c80_estate/astatus.rb
@@ -98,6 +107,7 @@ files:
 - app/models/c80_estate/comment.rb
 - app/models/c80_estate/item_prop.rb
 - app/models/c80_estate/owner.rb
+- app/models/c80_estate/plogo.rb
 - app/models/c80_estate/pphoto.rb
 - app/models/c80_estate/prop_name.rb
 - app/models/c80_estate/property.rb
@@ -108,7 +118,14 @@ files:
 - app/models/c80_estate/uom.rb
 - app/uploaders/c80_estate/aphoto_uploader.rb
 - app/uploaders/c80_estate/atphoto_uploader.rb
+- app/uploaders/c80_estate/plogo_uploader.rb
 - app/uploaders/c80_estate/pphoto_uploader.rb
+- app/views/admin/dashboard/_atype_in_list.html.erb
+- app/views/admin/dashboard/_prop_in_list.html.erb
+- 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/_table_properties_coef_busy.html.erb
+- app/views/c80_estate/shared/_table_properties_coef_busy_sq.html.erb
 - bin/console
 - bin/setup
 - c80_estate.gemspec
@@ -124,6 +141,7 @@ files:
 - db/migrate/20160629100505_create_c80_atypes.rb
 - db/migrate/20160629205151_create_c80_estate_atphotos.rb
 - db/migrate/20160630012727_create_c80_estate_pphotos.rb
+- db/migrate/20160630012728_create_c80_estate_plogos.rb
 - db/migrate/20160630013636_create_join_table_areas_astatuses.rb
 - db/migrate/20160630013737_create_join_table_atypes_prop_names.rb
 - db/migrate/20160704050000_create_c80_estate_role_types.rb