c80_estate 0.1.0.3 → 0.1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347ae43df7eb3ed899e9ae21f3a85648fff17baa
-  data.tar.gz: 38e409296f4dd3fb71867a38918da9c68823b678
+  metadata.gz: 874477f69a0669398c5c3ecffeb2749cb5083cde
+  data.tar.gz: 9b447c9a40b61e65e2750b23de3a75558e23af6f
 SHA512:
-  metadata.gz: 858bcd250a2e8c33bbd56e5b28aa8c3849e9843392868a3433b53498cd3574dd7d5faccbd014f917816f6a918fc951e3533b02d0bebcaa4dc93c2fdacae44a22
-  data.tar.gz: 01a4d0cf2c9c6edf973f25c782ecbd1d09405592e206d8ee5dff257c86b22a010332947f266f1119c3d391ab211785bac73671530ebbec93a63c67ae19225ef3
+  metadata.gz: 67de432c20fcc77bc29dcb3ae67360974e382f5f0ed1986ce09f5e9be10359142e7797c56610ee8f1bb6a55f359f6be283a5d5e8e7219f0a7497eeae8b39af8a
+  data.tar.gz: 29ba6d1171311bca2b3abbdf56985da00dda295e45b36384d69b8f944a799d704981f5cb3a627f9ae423afe97504f5819a61f8eacfebcde643000d8f544fa162

data/app/admin/c80_estate/dashboard.rb

@@ -0,0 +1,65 @@
+ActiveAdmin.register_page "Dashboard" do
+
+  menu priority: 1, label: proc { I18n.t("active_admin.dashboard") }
+
+  content title: proc { I18n.t("active_admin.dashboard") } do
+
+    columns do
+
+      column 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
+          # para 'Типы площадей', class: 'title'
+          C80Estate::Atype.all.each do |atype|
+            render partial: 'atype_in_list', locals: {atype: atype}
+          end
+        end
+
+      end
+
+      column do
+        panel 'Рейтинг занятости', class:'clearfix' do
+          render_table_prop_busy_coef
+        end
+        panel 'Рейтинг занятости в м.кв.', class:'clearfix' do
+          render_table_prop_busy_coef_sq
+        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")
+    #     small I18n.t("active_admin.dashboard_welcome.call_to_action")
+    #   end
+    # end
+
+    # Here is an example of a simple dashboard with columns and panels.
+    #
+    # columns do
+    #   column do
+    #     panel "Recent Posts" do
+    #       ul do
+    #         Post.recent(5).map do |post|
+    #           li link_to(post.title, admin_post_path(post))
+    #         end
+    #       end
+    #     end
+    #   end
+
+    #   column do
+    #     panel "Info" do
+    #       para "Welcome to ActiveAdmin."
+    #     end
+    #   end
+    # end
+  end # content
+end

data/app/admin/c80_estate/properties.rb

@@ -13,7 +13,9 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
                 :owner_id,
                 :owner_type,
                 :assigned_person_id,
-                :assigned_person_type
+                :assigned_person_type,
+                :pphotos_attributes => [:id,:image,:_destroy],
+                :plogos_attributes => [:id,:image,:_destroy]
 
   config.sort_order = 'id_asc'
 
@@ -62,6 +64,12 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
                  :hint => image_tag(gp.object.image.thumb512)
       end
 
+      f.has_many :plogos, :allow_destroy => true do |gp|
+        gp.input :image,
+                 :as => :file,
+                 :hint => image_tag(gp.object.image.thumb128)
+      end
+
     end
 
     f.actions

data/app/admin/c80_estate/sevents.rb

@@ -13,24 +13,24 @@ ActiveAdmin.register C80Estate::Sevent, as: 'Sevent' do
 
   config.sort_order = 'id_asc'
 
-  # filter :property_id,
-  #        :as => :select,
-  #        :collection => -> { C80Estate::Property.all.map { |p| ["#{p.title}", p.id] } },
-  #        :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+  filter :property_id,
+         :as => :select,
+         :collection => -> { C80Estate::Property.all.map { |p| ["#{p.title}", p.id] } },
+         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
   filter :area_id,
          :as => :select,
          :collection => -> { C80Estate::Area.all.map { |a|
            ["#{a.property.title}: #{a.title}", a.id]
          } },
          :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
-  # filter :atype_id,
-  #        :as => :select,
-  #        :collection => -> { C80Estate::Atype.all.map { |p| ["#{p.title}", p.id] } },
-  #        :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
-  # filter :auser_id,
-  #        :as => :select,
-  #        :collection => -> { AdminUser.all.map { |u| ["#{u.email}", u.id] } },
-  #        :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+  filter :atype_id,
+         :as => :select,
+         :collection => -> { C80Estate::Atype.all.map { |p| ["#{p.title}", p.id] } },
+         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+  filter :auser_id,
+         :as => :select,
+         :collection => -> { AdminUser.all.map { |u| ["#{u.email}", u.id] } },
+         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
   filter :created_at
   # filter :updated_at
 
@@ -46,6 +46,12 @@ ActiveAdmin.register C80Estate::Sevent, as: 'Sevent' do
     column :astatus do |sevent|
       sevent.astatus_title
     end
+    column :atype do |sevent|
+      sevent.atype.title
+    end
+    column :auser do |sevent|
+      sevent.auser_title
+    end
     column :created_at
     column :property do |sevent|
       sevent.property_title

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

@@ -12,14 +12,34 @@ var fPstatsIndex = function () {
 
     // компонент "над таблицей"
     var $div_index_adds;
-    var $div_busy_coef;
-    var $p_busy_coef;           // здесь выводим число - коэф-т эффективности
-    var $p_ecoef_mess;          // здесь вешаем hint на подпись "эффективность"
-    var $p_ecoef_comment;       // здесь выводим комментарий
-    var $div_area_text_stats;
-    var $ul_props;              // здесь выводим текстовые свойства
-    var $div_graph;             // в этом div живет график
-    var $div_graph2;             // в этом div живет график
+
+    // блок ЗАНЯТОСТЬ
+    var $div_busy_coef,
+        $p_busy_coef,               // здесь выводим число - занятость
+        $p_busy_coef_mess,          // здесь вешаем hint на подпись "занятость"
+        $p_busy_coef_comment;       // здесь выводим комментарий
+
+    // блок ЗАНЯТОСТЬ (В М.КВ)
+    var $div_busy_coef_sq,
+        $p_busy_coef_sq,                // здесь выводим число - занятость в м.кв
+        $p_busy_coef_mess_sq,          // здесь вешаем hint на подпись "занятость в м"
+        $p_busy_coef_comment_sq;       // здесь выводим комментарий
+
+    var $div_area_text_stats,
+        $ul_props;              // здесь выводим текстовые свойства
+
+    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 $ajax_div, $ajax_div2;
 
     var fBuild = function () {
 
@@ -31,37 +51,44 @@ var fPstatsIndex = function () {
         $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>");
+
         // построим компонент "над таблицей"
         $div_index_adds = $("<div id='index_adds'></div>");
 
-        $div_busy_coef = $("<div id='coef'></div>");
-        $p_busy_coef = $("<p class='val'></p>");
-        $p_ecoef_mess = $("<p class='title'><abbr class='abbr_ecoef' title='TITLE'>Занятость</abbr></p>");
-        $p_ecoef_comment = $("<p class='comment'></p>");
+        $div_busy_coef = $("<div id='coef'></div>").appendTo($div_index_adds);
+            $p_busy_coef = $("<p class='val'></p>").appendTo($div_busy_coef);
+            $p_busy_coef_mess = $("<p class='title'><abbr class='abbr_busy_coef' title='TITLE'>Занятость</abbr></p>").appendTo($div_busy_coef);
+            $p_busy_coef_comment = $("<p class='comment'></p>").appendTo($div_busy_coef);
+        
+        $div_area_text_stats = $("<div id='text_stats'></div>").appendTo($div_index_adds);
+            $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_busy_coef.append($p_busy_coef);
-        $div_busy_coef.append($p_ecoef_mess);
-        $div_busy_coef.append($p_ecoef_comment);
+        $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);
 
-        $div_area_text_stats = $("<div id='text_stats'></div>");
-        $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_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);
 
-        $div_graph = $("<div id='graph'></div>");
-        $div_graph2 = $("<div id='graph2'></div>");
+        //$div_graph = $("<div id='graph'></div>").appendTo($div_index_adds);
+        $div_graph2 = $("<div id='graph2'></div>").appendTo($div_index_adds);
 
-        $div_index_adds.append($div_busy_coef);
-        $div_index_adds.append($div_area_text_stats);
-        $div_index_adds.append($div_graph);
-        $div_index_adds.append($div_graph2);
+        $div_graph3 = $("<div id='graph3'></div>").appendTo($div_index_adds);
 
+        $main_content.prepend($ajax_div2);
+        $main_content.prepend($ajax_div);
         $main_content.prepend($div_index_adds);
 
         // теперь покажем
         $main_content.css('opacity', '1.0');
     };
 
-    var fRequest = function () {
+    var fRequestCoefs = function () {
 
         var atype_id = $select_atype.val();
         var property_id = $select_property.val();
@@ -80,15 +107,21 @@ var fPstatsIndex = function () {
             }
         }).done(function (data, result) {
             if (result == 'success') {
+
                 console.log(data);
 
+                var i, iob, itag, ival, $ili;
+
                 $p_busy_coef.text(data["busy_coef"]);
-                $p_ecoef_comment.html(data["comment"]);
-                $p_ecoef_mess.find('.abbr_ecoef').attr('title', data["abbr"]);
+                $p_busy_coef_comment.html(data["comment"]);
+                $p_busy_coef_mess.find('.abbr_busy_coef').attr('title', data["abbr"]);
+
+                $p_busy_coef_sq.text(data["busy_coef_sq"]);
+                $p_busy_coef_comment_sq.html(data["comment_sq"]);
+                $p_busy_coef_mess_sq.find('.abbr_busy_coef').attr('title', data["abbr_sq"]);
 
                 if (data["props"] != undefined) {
 
-                    var i, iob, itag, ival, $ili;
                     for (i = 0; i < data["props"].length; i++) {
                         iob = data["props"][i];
                         itag = iob["tag"];
@@ -99,10 +132,26 @@ var fPstatsIndex = function () {
 
                 }
 
-                if (data["graph"] != undefined) {
+                if (data["props_sq"] != undefined) {
+
+                    for (i = 0; i < data["props_sq"].length; i++) {
+                        iob = data["props_sq"][i];
+                        itag = iob["tag"];
+                        ival = iob["val"];
+                        $ili = $ul_props_sq.find("#" + itag);
+                        $ili.html(ival);
+                    }
+
+                }
+
+                if (data["graph"] != undefined || data["graph_dynamic"] != undefined) {
                     fDrawChart(data["graph"], data["graph_dynamic"]);
                 }
 
+                if (data["graph_dynamic_sq"] != undefined) {
+                    fDrawChartSq(data["graph_dynamic_sq"]);
+                }
+
                 $h2_page_title.text(data["title"]);
                 $h2_page_title.css('opacity', '1.0');
                 $(document).attr('title', data["title"]);
@@ -116,9 +165,34 @@ var fPstatsIndex = function () {
         //fPreloaderShow();
     };
 
+    var fRequestCharts = function () {
+
+        var atype_id = $select_atype.val();
+
+        $.ajax({
+            url:'/estate/table_properties_coef_busy',
+            type:'POST',
+            data:{atype_id: atype_id},
+            dataType:'script'
+        }).done(function (data, result) {
+            //alert(result);
+        });
+
+        $.ajax({
+            url:'/estate/table_properties_coef_busy_sq',
+            type:'POST',
+            data:{atype_id: atype_id},
+            dataType:'script'
+        }).done(function (data, result) {
+            //alert(result);
+        });
+
+    };
+
     var fInit = function () {
         fBuild();
-        fRequest();
+        fRequestCoefs();
+        fRequestCharts();
     };
 
     var fDrawChart = function (data_array_rows_radial, data_array_rows_dynamic) {
@@ -131,18 +205,18 @@ var fPstatsIndex = function () {
             var data, options, chart;
 
             if (data_array_rows_radial != undefined) {
-                data = google.visualization.arrayToDataTable(data_array_rows_radial);
-
-                options = {
-                    title: ''
-                };
-
-                chart = new google.visualization.PieChart(document.getElementById('graph'));
-
-                chart.draw(data, options);
+                //data = google.visualization.arrayToDataTable(data_array_rows_radial);
+                //
+                //options = {
+                //    title: ''
+                //};
+
+                //chart = new google.visualization.PieChart(document.getElementById('graph'));
+                //
+                //chart.draw(data, options);
             }
 
-            if (data_array_rows_dynamic != undefined) {
+            if (data_array_rows_dynamic != undefined && false) {
                 //data_array = [
                 //    ['Director (Year)',  'Rotten Tomatoes', 'IMDB'],
                 //    ['Alfred Hitchcock (1935)', 8.4,         7.9],
@@ -184,6 +258,64 @@ var fPstatsIndex = function () {
                 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();
+            }
+
         }
 
         if (data_array_rows_radial != undefined) {
@@ -196,6 +328,65 @@ var fPstatsIndex = function () {
 
     };
 
+    var fDrawChartSq = function (data) {
+
+
+        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.length; i ++) {
+            iob = data[i];
+            dataPoints.push({
+                x: new Date(iob["year"], iob["month"], iob["day"]),
+                y: iob["val"]
+            })
+        }
+
+        var chart = new CanvasJS.Chart("graph3",
+            {
+                title:{
+                    text: "Занятость в м.кв."
+                },
+                animationEnabled: true,
+                axisY:{
+                    includeZero: false,
+                    interval: 10,
+                    valueFormatString: ""
+                },
+                data: [
+                    {
+                        type: "stepArea",
+                        toolTipContent: "{x}: {y}%",
+                        markerSize: 5,
+                        dataPoints: dataPoints
+                    }
+
+                ]
+            });
+
+        $('#graph3').css('opacity','1.0').css('display','block');
+        chart.render();
+
+    };
+
     fInit();
 
 };