c80_estate 0.1.0.9 → 0.1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557d89464d2f0e0c81468e06bb4ecd5de9e18cf4
-  data.tar.gz: e3b7a1cee868213682dd2733f93e3dbff12c0274
+  metadata.gz: 92db0eea3e78217e967bdfecb4b213e0cf85c354
+  data.tar.gz: 5a5abb3d09dce79ea8bd7ee064e71b70c14cd30e
 SHA512:
-  metadata.gz: 4a97a9f531a70748a06eb1f2c22eb6b7c5f0d0a296d0e44a8c4f077d25405a38971f8da7781d74b082c294da3369e68f0310de5ca37879fc80217bec3c568a7f
-  data.tar.gz: bf0e24cd2c983f4970fa72d61d4db99c379cc2a0c76fa1a8d1fc3626d31ac1eeb22593811e23107c714592dd08218490f8600ed09e46f23cc51526064c68eec1
+  metadata.gz: 510854ede032d5d38f084423f800060275eaa1de4c018304380e11e86016e4385904a8ab70c24a783019720f5dfb41320be22702f7ed9100f08f9394b72b7c0b
+  data.tar.gz: b9de54cec83c69cfc02b90e7245cce71f774987405ced9d734e2fe4ab06366b0a3b8043308a4d2aa0aa2dc5cc33ebe457a44c9c09838e25007672b7217dbae5a

data/app/admin/c80_estate/admin_user.rb

@@ -20,7 +20,10 @@ ActiveAdmin.register AdminUser do
   end
 
   # menu :if => proc {current_admin_user.email == "tz007@mail.ru"}
-  menu label: 'Пользователи', :if => proc { current_admin_user.can_view_users? }
+  menu label: 'Пользователи',
+       :if => proc { current_admin_user.can_view_users? },
+       :priority => 9
+
   index do
     selectable_column
     id_column

data/app/admin/c80_estate/areas.rb

@@ -2,7 +2,7 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
 
   # scope_to :current_admin_user, association_method: :sites_list
 
-  menu :label => "Площади"
+  menu :label => 'Площади', priority: 3
 
   permit_params :title,
                 :desc,
@@ -88,28 +88,30 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
          :as => :string,
          :label => 'Площадь (м.кв.)',
          :input_html => {data: {
-             provide: 'slider',
+             # provide: 'slider',
              slider_ticks: C80Estate::ItemProp.all_uniq_values(9).to_json, #'[0, 1, 2, 3]',
              slider_labels: C80Estate::ItemProp.all_uniq_values(9).to_json, #'["none", short", "medium","long"]',
-             slider_min: C80Estate::ItemProp.all_uniq_values(9).last,
-             slider_max: C80Estate::ItemProp.all_uniq_values(9).first,
+             slider_min: C80Estate::ItemProp.all_uniq_values(9).sort.first,
+             slider_max: C80Estate::ItemProp.all_uniq_values(9).sort.last,
              slider_step: 1,
              slider_value: 0,
-             slider_range: true
+             slider_range: true,
+             slider_tooltip: 'hide'
          }}
 
   filter :item_prop_price_val_in,
          :as => :string,
          :label => 'Цена (руб/м.кв в месяц)',
          :input_html => {data: {
-             provide: 'slider',
+             #provide: 'slider',
              slider_ticks: C80Estate::ItemProp.all_uniq_values(1).to_json, #'[0, 1, 2, 3]',
              slider_labels: C80Estate::ItemProp.all_uniq_values(1).to_json, #'["none", short", "medium","long"]',
-             slider_min: C80Estate::ItemProp.all_uniq_values(1).last,
-             slider_max: C80Estate::ItemProp.all_uniq_values(1).first,
+             slider_min: C80Estate::ItemProp.all_uniq_values(1).sort.first,
+             slider_max: C80Estate::ItemProp.all_uniq_values(1).sort.last,
              slider_step: 1,
              slider_value: 0,
-             slider_range: true
+             slider_range: true,
+             slider_tooltip: 'hide'
          }}
 
   filter :item_prop_oenter_in,
@@ -139,26 +141,34 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
 
   index do
     selectable_column
-    column :title
+    column :title do |area|
+      link_to area.title, "/admin/areas/#{area.id}", title: I18n.t("active_admin.view")
+    end
     column :atype do |area|
       area.atype_title
     end
+    column 'Цена' do |area|
+      "#{area.price_value} руб"
+    end
+    column 'Метраж' do |area|
+      "#{area.square_value} м<sup>2</sup>".html_safe
+    end
     column :property do |area|
       "<div class='image_vertical properties_index_logo'>
-      <span></span><img src='#{image_path(area.property.logo_path)}'>
-      </div><span class='properties_index_logo_title'>#{area.property_title}</span>".html_safe
+      <span></span><a href='/admin/areas?utf8=✓&q%5Bproperty_id_eq%5D=#{area.property.id}&commit=Фильтровать&order=id_asc'><img src='#{image_path(area.property.logo_path)}'>
+      </div><span class='properties_index_logo_title'>#{area.property_title}</span></a>".html_safe
 
     end
     column :astatuses do |area|
       "<span class='status_#{area.astatus_tag}'>#{area.astatus_title}</span>".html_safe
     end
     column :assigned_person do |area|
-      area.assigned_person_title
+      area.property.assigned_person_title
     end
     # actions
-    column '' do |area|
-      link_to I18n.t("active_admin.view"), "/admin/areas/#{area.id}", class: 'member_link'
-    end
+    # column '' do |area|
+    #   link_to I18n.t("active_admin.view"), "/admin/areas/#{area.id}", class: 'member_link'
+    # end
     column '' do |area|
       if current_admin_user.can_edit_area?(area)
         link_to I18n.t("active_admin.edit"), "/admin/areas/#{area.id}/edit", class: 'member_link'
@@ -172,10 +182,10 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' 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 :assigned_person,
-              :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
-              :collection => AdminUser.all.map { |u| ["#{u.email}", u.id] }
-      f.input :assigned_person_type, :input_html => {:value => "AdminUser"}, as: :hidden
+      # f.input :assigned_person,
+      #         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
+      #         :collection => AdminUser.all.map { |u| ["#{u.email}", u.id] }
+      # f.input :assigned_person_type, :input_html => {:value => "AdminUser"}, as: :hidden
       f.input :astatuses,
               :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px', :multiple => false}
       f.input :desc, :as => :ckeditor

data/app/admin/c80_estate/astatuses.rb

@@ -1,6 +1,7 @@
 # ПОДкатегории строительных материалов
 ActiveAdmin.register C80Estate::Astatus, :as => 'Astatus' do
 
+  menu :label => "Настройки", :priority => 3#, :if => :foo
   menu :label => "Статусы", :parent => "Настройки", :if => proc { current_admin_user.can_view_settings? }
 
   permit_params :title

data/app/admin/c80_estate/comments.rb

@@ -1,6 +1,8 @@
 ActiveAdmin.register ActiveAdmin::Comment, :as => 'Comment' do
 
-  menu label: 'Комментарии', :if => proc { current_admin_user.can_view_comments? }
+  menu label: 'Комментарии',
+       :if => proc { current_admin_user.can_view_comments? },
+       :priority => 12
 
   batch_action :destroy, false
 

data/app/admin/c80_estate/dashboard.rb

@@ -8,14 +8,14 @@ ActiveAdmin.register_page "Dashboard" do
 
       column do
 
-        panel 'Объекты недвижимости', class:'clearfix' do
+        panel 'Объекты недвижимости', class: 'clearfix' do
           # para "Объекты недвижимости", class: 'title'
           C80Estate::Property.all.each do |prop|
             render partial: 'prop_in_list', locals: {prop: prop}
           end
         end
 
-        panel 'Типы площадей', class:'clearfix' do
+        panel 'Типы площадей', class: 'clearfix' do
           # para 'Типы площадей', class: 'title'
           C80Estate::Atype.all.each do |atype|
             render partial: 'atype_in_list', locals: {atype: atype}
@@ -25,16 +25,26 @@ ActiveAdmin.register_page "Dashboard" do
       end
 
       column do
-        panel 'Рейтинг занятости', class:'clearfix' do
+        panel 'Рейтинг занятости', class: 'clearfix' do
           render_table_prop_busy_coef
         end
-        panel 'Рейтинг занятости в м.кв.', class:'clearfix' do
+        panel 'Рейтинг занятости в м.кв.', class: 'clearfix' do
           render_table_prop_busy_coef_sq
         end
       end
 
     end
 
+    section '', if: -> { current_admin_user.email == 'tz007@mail.ru' } do
+      columns do
+        column do
+          panel 'Admin Features', class: 'clearfix' do
+            render_upload_areas_excel_form
+          end
+        end
+      end
+    end
+
     # div class: "blank_slate_container", id: "dashboard_default_message" do
     #   span class: "blank_slate" do
     #     span I18n.t("active_admin.dashboard_welcome.welcome")

data/app/admin/c80_estate/properties.rb

@@ -2,7 +2,7 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
 
   # scope_to :current_admin_user, association_method: :sites_list
 
-  menu :label => "Объекты недвижимости"
+  menu :label => "Объекты недвижимости", priority: 2
 
   permit_params :title,
                 :desc,

data/app/admin/c80_estate/pstats.rb

@@ -2,6 +2,7 @@ ActiveAdmin.register C80Estate::Pstat, as: 'Pstat' do
 
   # scope_to :current_admin_user, association_method: :sites_list
 
+  menu label: 'Статистика', priority: 6
   menu :label => "Объекты", :parent => 'Статистика', if: proc{ current_admin_user.can_view_statistics? }
 
   config.sort_order = 'id_asc'

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

@@ -417,32 +417,193 @@ var fEdit = function () {
     fLoadingShow();
 };
 
+//var $slider_square;
+//var $slider_price;
+
 var fAreasIndex = function () {
 
-    //var $input_square_min = $('<input type="text" class="min_text_input"/>')
-    //    .appendTo($("#q_item_prop_square_val_in").parent());
-    //
-    //var $input_square_max = $('<input type="text" class="max_text_input"/>')
-    //    .appendTo($("#q_item_prop_square_val_in").parent());
+    var csss_input_square = '#q_item_prop_square_val_in';
+    var csss_input_price = '#q_item_prop_price_val_in';
+
+    var $original_input_square;
+    var $original_input_price;
+
+    var square_min;
+    var square_max;
+    var price_min;
+    var price_max;
+
+    var $slider_square;
+    var $slider_price;
+
+    var _fInit = function () {
+
+        $original_input_square = $(csss_input_square);
+        $original_input_price = $(csss_input_price);
+
+        _fTranslateScopes();
+        _fInitSliders();
+
+        // считываем get параметры
+        var rex_square = /item_prop_square_val_in\]=(\d{1,5}),(\d{1,5})/;
+        var rex_price = /item_prop_square_val_in\]=(\d{1,5}),(\d{1,5})/;
+        var url = unescape(window.location.href);
+
+        var match_square = url.match(rex_square);
+        var match_price = url.match(rex_price);
+
+        var min, max, p;
+
+        if (match_square != null) {
+            min = Number(match_square[1]);
+            max = Number(match_square[2]);
+            if (min > max) {
+                p = min;
+                min = max;
+                max = p;
+            }
+            $slider_square.setValue([min, max]);
+        }
+
+        if (match_price != null) {
+            min = Number(match_price[1]);
+            max = Number(match_price[2]);
+            if (min > max) {
+                p = min;
+                min = max;
+                max = p;
+            }
+            $slider_price.setValue([min, max]);
+        }
+
+        //console.log("<_fMakeMinMaxInputs> square = " + param_item_prop_square_val_in + "; price = " + param_item_prop_price_val_in);
+
+        // подставляем начальные значения
+    };
+
+    var _fTranslateScopes = function () {
+        // переведём scope надписи
+
+        var $li, $a, $a_span;
+
+        $li = $('li.scope.all');
+        $a = $li.find(".table_tools_button");
+        $a_span = $a.find('span');
+        $a.html('Все <span class="count">' + $a_span.text() + '</span>');
+
+        $li = $('li.scope.free');
+        $a = $li.find(".table_tools_button");
+        $a_span = $a.find('span');
+        $a.html('Свободные <span class="count">' + $a_span.text() + '</span>');
+
+        $li = $('li.scope.busy');
+        $a = $li.find(".table_tools_button");
+        $a_span = $a.find('span');
+        $a.html('Занятые <span class="count">' + $a_span.text() + '</span>');
+    };
+
+    var _fInitSliders = function () {
+
+        //$slider_square = $original_input_square.bootstrapSlider();
+        //$slider_price = $original_input_price.bootstrapSlider();
+        $slider_square = new Slider(csss_input_square);
+        $slider_price = new Slider(csss_input_price);
+
+        //console.log($original_input_square);
+        //console.log($original_input_price);
+        square_min = $original_input_square.data('slider-min');
+        square_max = $original_input_square.data('slider-max');
+        price_min = $original_input_price.data('slider-min');
+        price_max = $original_input_price.data('slider-max');
 
-    // переведём scope надписи
+        _fMakeMinMaxInputs($original_input_square, $slider_square, [square_min,square_max] );
+        _fMakeMinMaxInputs($original_input_price, $slider_price, [price_min, price_max]);
 
-    var $li, $a, $a_span;
+    };
 
-    $li = $('li.scope.all');
-    $a = $li.find(".table_tools_button");
-    $a_span = $a.find('span');
-    $a.html('Все <span class="count">' + $a_span.text() + '</span>');
+    var _fMakeMinMaxInputs = function ($input, $slider, minmax) {
+        //console.log("<func_normalize_val> minmax = " + minmax);
+
+        // перед этим элементом вставим наши инпуты
+        var $trg = $input.parent().find('div.slider');
+
+        // пофиксим отступ для красоты
+        $input.parent().find('.label').css('margin-bottom','-5px');
+
+        // вставляемые инпуты
+        var $input_min = $('<input type="number" class="min_text_input" placeholder="от"/>');
+        var $input_max = $('<input type="number" class="max_text_input" placeholder="до"/>');
+        $trg.before($input_min);
+        $trg.before($input_max);
+
+        /*взаимодействуя со слайдером - будут меняться значения в текстовых полях*/
+
+        var func_on_change_slider = function () {
+            //console.log("<func_on_change_slider> " + this.value); // #=> 12,333
+            var va = this.value.split(',');
+            var min = va[0];
+            var max = va[1];
+            $input_min.val(min);
+            $input_max.val(max);
+            //$input_min.data('normalized-value',min);
+            //$input_max.data('normalized-value',max);
+        };
+        $input.on('change', func_on_change_slider);
+        $input.change();
+
+        /*взаимодействуя с текстовыми полями - будет меняться слайдер*/
+
+        var func_normalize_val = function (val) {
+            //console.log("<func_normalize_val> val = " + val);
+            //console.log("<func_normalize_val> minmax[0] = " + minmax[0]);
+            //console.log("<func_normalize_val> minmax[1] = " + minmax[1]);
+
+            var v = val;
+            if (v < $input.data('slider-min')) {
+                v = $input.data('slider-min');
+            }
+            if (v > $input.data('slider-max')) {
+                v = $input.data('slider-max');
+            }
+            return Number(v);
+        };
+
+        var func_invalidate_slider = function () {
+
+            //$trg.bootstrapSlider('setValue',[
+            //    $input_min.data('normalized-value'),
+            //    $input_max.data('normalized-value')
+            //]);
+
+            var arr = [
+                func_normalize_val($input_min.val()),
+                func_normalize_val($input_max.val())
+            ];
+            //console.log("<func_invalidate_slider> " + arr);
+            $slider.setValue(arr);
+
+        };
+
+        var func_onblur_min = function () {
+            //console.log(this.value);
+            var v = func_normalize_val(this.value);
+            //$input_min.data('normalized-value',v);
+            func_invalidate_slider();
+        };
+
+        var func_onblur_max = function () {
+            //console.log(this.value);
+            var v = func_normalize_val(this.value);
+            //$input_max.data('normalized-value',v);
+            func_invalidate_slider();
+        };
+
+        $input_min.on('blur', func_onblur_min);
+        $input_max.on('blur', func_onblur_max);
 
-    $li = $('li.scope.free');
-    $a = $li.find(".table_tools_button");
-    $a_span = $a.find('span');
-    $a.html('Свободные <span class="count">' + $a_span.text() + '</span>');
+    };
 
-    $li = $('li.scope.busy');
-    $a = $li.find(".table_tools_button");
-    $a_span = $a.find('span');
-    $a.html('Занятые <span class="count">' + $a_span.text() + '</span>');
+    _fInit();
 
 };
 

data/app/assets/javascript/c80_estate/backend/admin/pstats.js

@@ -30,14 +30,14 @@ var fPstatsIndex = function () {
 
     var $div_area_text_stats_sq,
         $ul_props_sq;              // здесь выводим текстовые свойства занятости в метрах
-
-
-    var $div_graph;             // в этом div живет график занятости
-    var $div_graph2,             // в этом div живет график занятости
-        $div_graph2canvas;
-
-    var $div_graph3,             // в этом div живет график занятости в метрах
-        $div_graph3canvas;
+    
+    // тут живут круговые графики
+    var $div_graph_radial;
+    var $div_graph_radial_sq;
+    
+    // тут живут динамические графики
+    var $div_graph_dynamic,
+        $div_graph_dynamic_sq;
 
     var $ajax_div, $ajax_div2;
 
@@ -66,19 +66,22 @@ var fPstatsIndex = function () {
             $ul_props = $("<ul><li id='title'></li><li id='born_date'></li><li id='atype_filter'></li><li id='all_areas_count'></li><li id='free_areas_count'></li><li id='busy_areas_count'></li></ul>");
             $div_area_text_stats.append($ul_props);
 
+        $div_graph_radial = $("<div id='graph_radial'></div>").appendTo($div_index_adds);
+
         $div_busy_coef_sq = $("<div id='coef_sq'></div>").appendTo($div_index_adds);
-        $p_busy_coef_sq = $("<p class='val'></p>").appendTo($div_busy_coef_sq);
-        $p_busy_coef_mess_sq = $("<p class='title'><abbr class='abbr_busy_coef_sq' title='TITLE'>Занятость (в м.кв.)</abbr></p>").appendTo($div_busy_coef_sq);
-        $p_busy_coef_comment_sq = $("<p class='comment'></p>").appendTo($div_busy_coef_sq);
+            $p_busy_coef_sq = $("<p class='val'></p>").appendTo($div_busy_coef_sq);
+            $p_busy_coef_mess_sq = $("<p class='title'><abbr class='abbr_busy_coef_sq' title='TITLE'>Занятость (в м.кв.)</abbr></p>").appendTo($div_busy_coef_sq);
+            $p_busy_coef_comment_sq = $("<p class='comment'></p>").appendTo($div_busy_coef_sq);
 
         $div_area_text_stats_sq = $("<div id='text_stats_sq'></div>").appendTo($div_index_adds);
-        $ul_props_sq = $("<ul><li id='all_areas_count_sq'></li><li id='free_areas_count_sq'></li><li id='busy_areas_count_sq'></li></ul>");
-        $div_area_text_stats_sq.append($ul_props_sq);
+            $ul_props_sq = $("<ul><li id='all_areas_count_sq'></li><li id='free_areas_count_sq'></li><li id='busy_areas_count_sq'></li></ul>");
+            $div_area_text_stats_sq.append($ul_props_sq);
 
-        //$div_graph = $("<div id='graph'></div>").appendTo($div_index_adds);
-        $div_graph2 = $("<div id='graph2'></div>").appendTo($div_index_adds);
+        $div_graph_radial_sq = $("<div id='graph_radial_sq'></div>").appendTo($div_index_adds);
 
-        $div_graph3 = $("<div id='graph3'></div>").appendTo($div_index_adds);
+        $div_graph_dynamic = $("<div id='graph2'></div>").appendTo($div_index_adds);
+
+        $div_graph_dynamic_sq = $("<div id='graph3'></div>").appendTo($div_index_adds);
 
         $main_content.prepend($ajax_div2);
         $main_content.prepend($ajax_div);
@@ -88,6 +91,7 @@ var fPstatsIndex = function () {
         $main_content.css('opacity', '1.0');
     };
 
+    // запросим коэф-ты и данные для построения графиков
     var fRequestCoefs = function () {
 
         var atype_id = $select_atype.val();
@@ -144,12 +148,20 @@ var fPstatsIndex = function () {
 
                 }
 
-                if (data["graph"] != undefined || data["graph_dynamic"] != undefined) {
-                    fDrawChart(data["graph"], data["graph_dynamic"]);
+                if (data["graph_radial"] != undefined) {
+                    fDrawChartRadial(data["graph_radial"]);
+                }
+
+                if (data["graph_dynamic"] != undefined) {
+                    fDrawChartRadialSq(data["graph_dynamic"]);
                 }
 
                 if (data["graph_dynamic_sq"] != undefined) {
-                    fDrawChartSq(data["graph_dynamic_sq"]);
+                    fDrawChartDynamicSq(data["graph_dynamic_sq"]);
+                }
+
+                if (data["graph_radial_sq"] != undefined) {
+                    fDrawChartRadialSq(data["graph_radial_sq"]);
                 }
 
                 $h2_page_title.text(data["title"]);
@@ -165,6 +177,8 @@ var fPstatsIndex = function () {
         //fPreloaderShow();
     };
 
+    // запросим таблицы объектов
+    // результат придёт в виде js и таблицы вставятся сами
     var fRequestCharts = function () {
 
         var atype_id = $select_atype.val();
@@ -195,141 +209,67 @@ var fPstatsIndex = function () {
         fRequestCharts();
     };
 
-    var fDrawChart = function (data_array_rows_radial, data_array_rows_dynamic) {
-
-        google.charts.load('current', {'packages': ['corechart']});
-        google.charts.setOnLoadCallback(drawChart);
-
-        function drawChart() {
-
-            var data, options, chart;
-
-            if (data_array_rows_radial != undefined) {
-                //data = google.visualization.arrayToDataTable(data_array_rows_radial);
-                //
-                //options = {
-                //    title: ''
-                //};
+    // рисуем динамический график занятости
+    var fDrawChartDynamic = function (data_array_rows_dynamic) {
 
-                //chart = new google.visualization.PieChart(document.getElementById('graph'));
-                //
-                //chart.draw(data, options);
-            }
-
-            if (data_array_rows_dynamic != undefined && false) {
-                //data_array = [
-                //    ['Director (Year)',  'Rotten Tomatoes', 'IMDB'],
-                //    ['Alfred Hitchcock (1935)', 8.4,         7.9],
-                //    ['Ralph Thomas (1959)',     6.9,         6.5],
-                //    ['Don Sharp (1978)',        6.5,         6.4],
-                //    ['James Hawes (2008)',      4.4,         6.2]
-                //]
-
-                //var data = google.visualization.arrayToDataTable(data_array_rows_dynamic);
-
-                data = new google.visualization.DataTable();
-                data.addColumn('date', ''); // Implicit domain column.
-                data.addColumn('number', ''); // Implicit data column.
-                //data.addColumn({type:'number', role:'interval'});
-                //data.addColumn({type:'number', role:'interval'});
-                //data.addColumn('number', 'Expenses');
-
-                var i, iob, yearValue, monthValue, dayValue;
-                for (i = 0; i < data_array_rows_dynamic.length; i++) {
-                    iob = data_array_rows_dynamic[i];
-                    yearValue = iob[0].substr(0, 4);
-                    monthValue = iob[0].substr(5, 2) - 1;
-                    dayValue = iob[0].substr(8, 2);
-                    console.log(iob + " => " + yearValue + "/" + monthValue + "/" + dayValue); // + ": " + data_array_rows_dynamic[i][0]
-                    data_array_rows_dynamic[i][0] = new Date(parseInt(yearValue), parseInt(monthValue), parseInt(dayValue));
-                }
-
-                data.addRows(data_array_rows_dynamic);
-
-                options = {
-                    title: 'Занятость',
-                    vAxis: {title: '', ticks: [0, 1]},
-                    ignoreBounds: true,
-                    isStacked: false
-                };
-
-                chart = new google.visualization.SteppedAreaChart(document.getElementById('graph2'));
-
-                chart.draw(data, options);
-            }
-
-            if (data_array_rows_dynamic) {
-
-
-                var dataPoints = [];
-                //[
-                //    {x: new Date(2012,0), y: 8.3} ,
-                //    {x: new Date(2012,1), y: 8.3} ,
-                //    {x: new Date(2012,2), y: 8.2} ,
-                //    {x: new Date(2012,3), y: 8.1} ,
-                //    {x: new Date(2012,4), y: 8.2} ,
-                //    {x: new Date(2012,5), y: 8.2} ,
-                //    {x: new Date(2012,6), y: 8.2} ,
-                //    {x: new Date(2012,7), y: 8.1} ,
-                //    {x: new Date(2012,8), y: 7.8} ,
-                //    {x: new Date(2012,9), y: 7.9} ,
-                //    {x: new Date(2012,10), y:7.8} ,
-                //    {x: new Date(2012,11), y:7.8} ,
-                //    {x: new Date(2013,0), y:7.9} ,
-                //    {x: new Date(2013,1), y:7.7} ,
-                //    {x: new Date(2013,2), y:7.6} ,
-                //    {x: new Date(2013,3), y:7.5}
-                //]
-
-                var i, iob;
-                for (i = 0; i < data_array_rows_dynamic.length; i ++) {
-                    iob = data_array_rows_dynamic[i];
-                    dataPoints.push({
-                        x: new Date(iob["year"], iob["month"], iob["day"]),
-                        y: iob["val"]
-                    })
-                }
-
-                var chart = new CanvasJS.Chart("graph2",
-                    {
-                        title:{
-                            text: "Занятость"
-                        },
-                        animationEnabled: true,
-                        axisY:{
-                            includeZero: false,
-                            interval: 10,
-                            valueFormatString: ""
-                        },
-                        data: [
-                            {
-                                type: "stepArea",
-                                toolTipContent: "{x}: {y}%",
-                                markerSize: 5,
-                                dataPoints: dataPoints
-                            }
-
-                        ]
-                    });
-
-                $('#graph2').css('opacity','1.0').css('display','block');
-                chart.render();
-            }
+        var dataPoints = [];
+        //[
+        //    {x: new Date(2012,0), y: 8.3} ,
+        //    {x: new Date(2012,1), y: 8.3} ,
+        //    {x: new Date(2012,2), y: 8.2} ,
+        //    {x: new Date(2012,3), y: 8.1} ,
+        //    {x: new Date(2012,4), y: 8.2} ,
+        //    {x: new Date(2012,5), y: 8.2} ,
+        //    {x: new Date(2012,6), y: 8.2} ,
+        //    {x: new Date(2012,7), y: 8.1} ,
+        //    {x: new Date(2012,8), y: 7.8} ,
+        //    {x: new Date(2012,9), y: 7.9} ,
+        //    {x: new Date(2012,10), y:7.8} ,
+        //    {x: new Date(2012,11), y:7.8} ,
+        //    {x: new Date(2013,0), y:7.9} ,
+        //    {x: new Date(2013,1), y:7.7} ,
+        //    {x: new Date(2013,2), y:7.6} ,
+        //    {x: new Date(2013,3), y:7.5}
+        //]
 
+        var i, iob;
+        for (i = 0; i < data_array_rows_dynamic.length; i ++) {
+            iob = data_array_rows_dynamic[i];
+            dataPoints.push({
+                x: new Date(iob["year"], iob["month"], iob["day"]),
+                y: iob["val"]
+            })
         }
 
-        if (data_array_rows_radial != undefined) {
-            $('#graph').css('opacity', '1.0').css('display', 'block');
-        }
+        var chart = new CanvasJS.Chart("graph2",
+            {
+                title:{
+                    text: "Занятость"
+                },
+                animationEnabled: true,
+                axisY:{
+                    includeZero: false,
+                    interval: 10,
+                    valueFormatString: ""
+                },
+                data: [
+                    {
+                        type: "stepArea",
+                        toolTipContent: "{x}: {y}%",
+                        markerSize: 5,
+                        dataPoints: dataPoints
+                    }
 
-        if (data_array_rows_dynamic != undefined) {
-            $('#graph2').css('opacity', '1.0').css('display', 'block');
-        }
+                ]
+            });
 
+        $div_graph_dynamic.css('opacity','1.0').css('display','block');
+        chart.render();
+    
     };
 
-    var fDrawChartSq = function (data) {
-
+    // рисуем динамический график занятости в м.кв.
+    var fDrawChartDynamicSq = function (data) {
 
         var dataPoints = [];
         //[
@@ -382,11 +322,79 @@ var fPstatsIndex = function () {
                 ]
             });
 
-        $('#graph3').css('opacity','1.0').css('display','block');
+        $div_graph_dynamic_sq.css('opacity','1.0').css('display','block');
         chart.render();
 
     };
 
+    var fDrawChartRadial = function (data) {
+
+        //  data:
+        //  [
+        //    {  y: 6, legendText:"Свободно", label: "Площадей свободно" },
+        //    {  y: 4, legendText:"Занято", label: "Площадей занято" }
+        //  ]
+
+        var chart = new CanvasJS.Chart("graph_radial",
+            {
+                animationEnabled: true,
+                legend:{
+                    verticalAlign: "center",
+                    horizontalAlign: "",
+                    fontSize: 0,
+                    fontFamily: "Open Sans"
+                },
+                theme: "theme",
+                data: [
+                    {
+                        type: "pie",
+                        indexLabelFontFamily: "Open Sans",
+                        indexLabelFontSize: 14,
+                        indexLabel: "{label}: {y}",
+                        startAngle:-10,
+                        showInLegend: true,
+                        toolTipContent:"{legendText} {y}",
+                        dataPoints: data
+                    }
+                ]
+            });
+        chart.render();
+    };
+
+    var fDrawChartRadialSq = function (data) {
+
+        //  data:
+        //  [
+        //    {  y: 6, legendText:"", label: "Метров свободно" },
+        //    {  y: 4, legendText:"", label: "Метров занято" }
+        //  ]
+
+        var chart = new CanvasJS.Chart("graph_radial_sq",
+            {
+                animationEnabled: true,
+                legend:{
+                    verticalAlign: "center",
+                    horizontalAlign: "",
+                    fontSize: 0,
+                    fontFamily: "Open Sans"
+                },
+                theme: "theme",
+                data: [
+                    {
+                        type: "pie",
+                        indexLabelFontFamily: "Open Sans",
+                        indexLabelFontSize: 14,
+                        indexLabel: "{label}: {y}",
+                        startAngle:-10,
+                        showInLegend: true,
+                        toolTipContent:"{legendText} {y}",
+                        dataPoints: data
+                    }
+                ]
+            });
+        chart.render();
+    };
+
     fInit();
 
 };