c80_estate 0.1.0.23 → 0.1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d6434e1377535f34963ca6e84233a7987abcc2
-  data.tar.gz: da6acc1bc02c04026baf613091e5dbecd8512bbb
+  metadata.gz: ef2fd40a5a56b010a8f348b3fee51344c9ac6afe
+  data.tar.gz: 0522badb1eabaf838438ea71bfdfc7b26993d3f5
 SHA512:
-  metadata.gz: 3e6a6b3111937749e24fd15d9236e2908276fa42cabd92b572ac673ff4a4f79d6513003440cb51336888e4857f78cf8d280e70e24085d0f5b9d161d10d3b63a8
-  data.tar.gz: 40c33263fe9e036a93fc78420348892ef68617d046d7518ab21d1a30a1719390f33ef3d4042703c1659b55bf7e4961f792afa23404efd728b1bf001adab47fe1
+  metadata.gz: 853424edb0f2f40dca3c37bc2e3c0b67ec89e508fa99b4d2fcb8f16abe36c8956bb0d834e3d9061724eb10c86c368de4ee800252b168d163b2e2d986754bf6f8
+  data.tar.gz: 43c176bfccb484be8307983ce4181aae81a167d145db3ecfc7878f69dc6cca03e917c4351a61ab8c8e2ac628ec8df73100c78835805c09b8994bdc01b770ffa1

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

@@ -11,7 +11,7 @@ var fAreasShow_initRichShowPage = function () {
     //$b.click(function (e) {
     //    if (orderForm) {
     //        orderForm.afterShowForm = function () {
-                $("textarea#mess_comment").focus();
+                //$("textarea#mess_comment").focus();
                 //
                 //var $t = $("textarea#mess_comment");
                 //$t.data('toggle', 'tooltip');
@@ -35,17 +35,7 @@ var fAreasShow_initRichShowPage = function () {
 
 };
 
-var fAreasShow = function () {
-
-    // элементы html страницы
-    var $main_content;          // правая сторона, там живёт таблица
-    //var $select_area;           // фильтр area
-    //var $select_atype;          // фильтр atype
-    //var $select_property;       // фильтр property
-    //var $select_auser;          // фильтр auser
-    //var $input_start_date;      // фильтр "дата начала периода"
-    //var $input_end_date;        // фильтр "дата конца периода"
-    //var $h2_page_title;         // заголовок страницы
+var fAreasShow_go = function () {
 
     // компонент "над таблицей"
     var $div_index_adds;
@@ -60,16 +50,6 @@ var fAreasShow = function () {
 
     var fBuild = function () {
 
-        // зафиксируем html элементы
-        $main_content = $('#main_content');
-        //$select_area = $("#q_area_id");
-        //$select_atype = $("#q_atype_id");
-        //$select_property = $("#q_property_id");
-        //$select_auser = $("#q_auser_id");
-        //$input_start_date = $("#q_created_at_gteq");
-        //$input_end_date = $("#q_created_at_lteq");
-        //$h2_page_title = $("h2#page_title");
-
         // построим компонент "над таблицей"
         $div_index_adds = $("<div class='index_adds_like_sevents'></div>");
 
@@ -350,3 +330,15 @@ var fAreasShow = function () {
     fInit();
 
 };
+
+var fAreasShow = function () {
+
+    // зафиксируем html элементы
+    $main_content = $('#main_content');
+
+    $.ajax({
+        url: '/estate/can_view_statistics_area',
+        type: 'POST',
+        dataType:'script'
+    })
+};

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

@@ -34,15 +34,7 @@ var fPropertiesShow_initRichShowPage = function () {
 
 };
 
-var fPropertiesShow = function () {
-
-    // элементы html страницы
-    var $main_content;          // правая сторона, там живёт таблица
-    //var $select_atype;          // фильтр atype
-    //var $select_property;       // фильтр property
-    //var $input_start_date;      // фильтр "дата начала периода"
-    //var $input_end_date;        // фильтр "дата конца периода"
-    //var $h2_page_title;         // заголовок страницы
+var fPropertiesShow_go = function () {
 
     // компонент "над таблицей"
     var $div_index_adds;
@@ -77,15 +69,6 @@ var fPropertiesShow = function () {
 
     var fBuild = function () {
 
-        // зафиксируем html элементы
-        $main_content = $('#main_content');
-        //$select_atype = $("#q_atype_id");
-        //$select_property = $("#q_property_id");
-        //$input_start_date = $("#q_created_at_gteq");
-        //$input_end_date = $("#q_created_at_lteq");
-        //$h2_page_title = $("h2#page_title");
-        //
-
         $ajax_div = $("<div id='ajax_div'></div>");
         $ajax_div2 = $("<div id='ajax_div2'></div>");
 
@@ -122,8 +105,8 @@ var fPropertiesShow = function () {
         $main_content.prepend($ajax_div);
         $main_content.prepend($div_index_adds);
 
-        $(".comments").before($('<h4 style="padding-top:15px;">Статистика</h4>'));
-        $(".comments").before($div_index_adds);
+        $(".comments").before($('<h4 style="padding-top:15px;">Статистика</h4>'))
+                      .before($div_index_adds);
 
         // теперь покажем
         $main_content.css('opacity', '1.0');
@@ -478,3 +461,15 @@ var fPropertiesShow = function () {
     fInit();
 
 };
+
+var fPropertiesShow = function () {
+
+    // зафиксируем html элементы
+    $main_content = $('#main_content');
+
+    $.ajax({
+        url: '/estate/can_view_statistics',
+        type: 'POST',
+        dataType:'script'
+    })
+};

data/app/assets/javascript/c80_estate/backend/init.js

@@ -3,6 +3,8 @@
 //
 //};
 
+var $main_content;
+
 var fLoadingShow = function () {
     $("body").append($('<div id="loading"></div>'));
 };

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

@@ -12,4 +12,48 @@ div.properties_index_logo {
 }
 
 span.properties_index_logo_title {
+}
+
+body.admin_properties {
+
+  button {
+    span.fa.fa-chevron-right {
+      position: relative;
+      &:after {
+        display: block !important;
+        position: absolute !important;
+        top: -16px !important;
+        left: 0 !important;
+        width: 20px !important;
+        height: 20px !important;
+        font-family: FontAwesome !important;
+        content: "\f078" !important;
+        color: #288feb !important;
+      }
+      &:before {
+        display: none !important;
+      }
+    }
+
+    &.collapsed {
+      span.fa.fa-chevron-right {
+        position: relative;
+        &:after {
+          display: block !important;
+          position: absolute !important;
+          top: -16px !important;
+          left: 0 !important;
+          width: 20px !important;
+          height: 20px !important;
+          font-family: FontAwesome !important;
+          content: "\f054" !important;
+          color: #288feb !important;
+        }
+        &:before {
+          display: none !important;
+        }
+      }
+    }
+  }
+
 }

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

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

data/app/controllers/c80_estate/ajax_controller.rb

@@ -52,5 +52,27 @@ module C80Estate
 
     end
 
+    def can_view_statistics_property
+
+      @res = current_admin_user.can_view_statistics?
+
+      respond_to do |format|
+        format.js
+        # format.json
+      end
+
+    end
+
+    def can_view_statistics_area
+
+      @res = current_admin_user.can_view_statistics?
+
+      respond_to do |format|
+        format.js
+        # format.json
+      end
+
+    end
+
   end
 end

data/app/helpers/c80_estate/app_helper.rb

@@ -7,16 +7,17 @@ module C80Estate
     def render_table_prop_busy_coef(atype_id: nil)
       # Rails.logger.debug "<render_table_prop_busy_coef> atype_id = #{atype_id}"
 
-      props = Property.all
+      props = Property.sorted_chart
       if props.count > 0
         list = []
 
-        props.all.each do |prop|
+        props.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 << {
+              id: prop.id,
               title: prop.title,
               busy_coef: busy_coef,
               props: props
@@ -34,17 +35,18 @@ module C80Estate
     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
+      props = Property.sorted_chart
 
       if props.count > 0
         list = []
 
-        props.all.each do |prop|
+        props.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 << {
+              id: prop.id,
               title: prop.title,
               busy_coef: busy_coef_sq,
               props: props

data/app/models/c80_estate/property.rb

@@ -21,6 +21,17 @@ module C80Estate
     has_many :sevents, :dependent => :destroy
     has_many :pstats, :dependent => :destroy
 
+    # scope :sort_chart, -> {order(:ord => :asc)}
+
+    def self.sorted_chart
+      self.all.sort_by(&:busy_koef).reverse!
+    end
+
+    def busy_koef
+      pp = Pstat.busy_coef(prop_id: self.id, atype_id: nil)
+      pp[:busy_coef].to_f
+    end
+
     # этот метод для ActiveRecordCollection of Properties
     def self.areas_count
       ac = 0

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

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

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

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

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

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

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

@@ -10,15 +10,15 @@
   </thead>
   <tbody>
 
-  <% list.each do |obj| %>
+  <% list.each do |prop| %>
       <%# Rails.logger.debug "#{obj}" %>
       <tr>
-        <td><%= obj[:title] %></td>
-        <td><%= obj[:busy_coef] %></td>
+        <td><%= "<a href='/admin/properties/#{prop[:id]}'>#{prop[:title]}</a>".html_safe %></td>
+        <td><%= prop[:busy_coef] %></td>
 
-        <% if obj[:props].present? %>
-            <% obj[:props].each_key do |key| %>
-                <td><%= obj[:props][key] %></td>
+        <% if prop[:props].present? %>
+            <% prop[:props].each_key do |key| %>
+                <td><%= prop[:props][key] %></td>
             <% end %>
         <% end %>
 

data/config/routes.rb

@@ -2,6 +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/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/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/lib/c80_estate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.23
+  version: 0.1.0.24
 platform: ruby
 authors:
 - C80609A
@@ -117,6 +117,7 @@ files:
 - app/assets/stylesheets/c80_estate/backend/dashboard/prop_in_list.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
 - app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_button_order.scss
 - app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_comments.scss
 - app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_common_props.scss
@@ -166,6 +167,8 @@ 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_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
 - app/views/c80_estate/ajax_areas/exel_import.js.erb
 - app/views/c80_estate/ajax_view/table_properties_coef_busy.js.erb