c80_estate 0.1.0.12 → 0.1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23619d274bb8b181d601d3e4971b7f4824a0ec2a
-  data.tar.gz: 632b048299c1fde7112c87ac049d4ae97c4cae6f
+  metadata.gz: 77472f255a97d04363af1c40e5dc234ff97a1517
+  data.tar.gz: 8789d9c154ac9528dbe95543dd3aca8aaaf9c4d8
 SHA512:
-  metadata.gz: 772efd690c58e216e61e8f0a8a351fae63537b38e16682ae06e60a05daac5e7a653edba2614d49f0db124216b3a9bcf515e6f70455bfe7149dbe4469c4cb4849
-  data.tar.gz: 7d9d78a02857e664d9ce86188bd666ce70af0be5823654101d930df40ef6d9ade3d56c4ae3a57bcc6253e26dc4ed80f6c13332f4c740dcce93976a77d06f59a7
+  metadata.gz: 8aa9a64a80525510c33ff37be067bd5e2e2b47537e574278935802bee47a41a892a7325ad99f5cd911f0984113b8f0c38e25d38c9e5d1344ed3e4c413538d5b0
+  data.tar.gz: aede3e18db66699aa00b06fbaaba3f2cf3c8e8a88b7be91c8ca7e46e33dc6538966c56b652d316969c13acc144bd38ca513480c8c26a2e13d2e690acc9f0246c

data/app/admin/c80_estate/areas.rb

@@ -215,4 +215,9 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
     f.actions
   end
 
+  show do
+    render partial: 'show_area', locals: { area:resource }
+    active_admin_comments
+  end
+
 end

data/app/admin/c80_estate/dashboard.rb

@@ -8,7 +8,7 @@ ActiveAdmin.register_page "Dashboard" do
 
       column do
 
-        panel 'Объекты недвижимости', class: 'clearfix' do
+        panel 'Объекты недвижимости', class: 'clearfix proplist' do
           # para "Объекты недвижимости", class: 'title'
           C80Estate::Property.all.each do |prop|
             render partial: 'prop_in_list', locals: {prop: prop}

data/app/admin/c80_estate/sevents.rb

@@ -11,7 +11,7 @@ ActiveAdmin.register C80Estate::Sevent, as: 'Sevent' do
                 :auser_id,
                 :auser_type
 
-  config.sort_order = 'id_asc'
+  config.sort_order = 'created_at_desc'
 
   filter :property_id,
          :as => :select,
@@ -41,7 +41,7 @@ ActiveAdmin.register C80Estate::Sevent, as: 'Sevent' do
   index do
     selectable_column
     column :area do |sevent|
-      sevent.area_title
+      link_to sevent.area_title, "/admin/areas/#{sevent.area.id}", target: '_blank'
     end
     column :astatus do |sevent|
       sevent.astatus_title

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

@@ -0,0 +1,21 @@
+// запускаем механизм просмотра картинки товара
+var fItemImageMagnificPopupStart = function () {
+    $("div#div_main_show_area").magnificPopup({
+        delegate: 'a.lazy-image-wrapper',
+        fixedContentPos: false,
+        removalDelay: 300,
+        mainClass: 'mfp-fade',
+        type: 'image'
+    });
+};
+
+var fItemGalleryPhotosMagnificPopupStart = function() {
+    $("div#gallery3").magnificPopup({
+        delegate: 'a',
+        fixedContentPos: false,
+        removalDelay: 300,
+        mainClass: 'mfp-fade',
+        type: 'image',
+        gallery: {enabled:true}
+    });
+}

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

@@ -0,0 +1,352 @@
+"use strict";
+
+var fAreasShow_initRichShowPage = function () {
+
+    //fCommon();
+    fItemImageMagnificPopupStart();
+    fItemGalleryPhotosMagnificPopupStart();
+
+    // если нужна кнопка "заказать"
+    //var $b = $('.c80_order_invoking_btn');
+    //$b.click(function (e) {
+    //    if (orderForm) {
+    //        orderForm.afterShowForm = function () {
+                $("textarea#mess_comment").focus();
+                //
+                //var $t = $("textarea#mess_comment");
+                //$t.data('toggle', 'tooltip');
+                //$t.data('palacement', 'right');
+                //$t.data('title', 'Укажите желаемое количество.');
+                //$t.tooltip();
+                //
+                //var $f = $('#form_order');
+                //
+                //var $b = $f.find('.btn');
+                //$b.removeClass('btn');
+                //$b.removeClass('btn-primary');
+                //$b.addClass('red_button');
+                //$b.attr('style','line-height: 34px;font-size: 16px;color: white; text-transform: uppercase; border-radius: 4px !important;');
+                //
+                //var $c = $f.find('.actions');
+                //$c.css('margin-top','15px');
+            //};
+        //}
+    //});
+
+};
+
+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 $div_index_adds;
+    var $div_ecoef;
+    var $p_ecoef_val;           // здесь выводим число - коэф-т эффективности
+    var $p_ecoef_mess;          // здесь вешаем hint на подпись "эффективность"
+    var $p_ecoef_comment;       // здесь выводим комментарий
+    var $div_area_text_stats;
+    var $ul_props;
+    var $div_graph;
+    var $div_graph_canvas;
+
+    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>");
+
+        $div_ecoef = $("<div id='ecoef'></div>");
+        $p_ecoef_val = $("<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_ecoef.append($p_ecoef_val);
+        $div_ecoef.append($p_ecoef_mess);
+        $div_ecoef.append($p_ecoef_comment);
+
+        $div_area_text_stats = $("<div id='text_stats'></div>");
+        $ul_props = $("<ul><li id='title'></li><li id='atype'></li><li id='born_date' class='hidden'></li><li id='busy_time'></li><li id='free_time'></li><li id='all_time'></li><li id='assigned_person_title'></li><li id='property_title'></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 = $("<div id='graph'></div>");
+        $div_graph_canvas = $("<canvas id='graph_canvas' height='50'></canvas>").appendTo($div_graph);
+
+        $div_index_adds.append($div_ecoef);
+        $div_index_adds.append($div_area_text_stats);
+        $div_index_adds.append($div_graph);
+
+        $(".comments").before($('<h4 style="padding-top:15px;">Статистика</h4>'));
+        $(".comments").before($div_index_adds);
+
+        // теперь покажем
+        $main_content.css('opacity', '1.0');
+    };
+
+    var fRequest = function () {
+
+        //var area_id = $select_area.val();
+        //var atype_id = $select_atype.val();
+        //var property_id = $select_property.val();
+        //var auser_id = $select_auser.val();
+        //var start_date = $input_start_date.val();
+        //var end_date = $input_end_date.val();
+        //
+
+        var area_id = -1;
+        var url = unescape(window.location.href);
+        var match_res = url.match(/areas\/(\d{1,9})/);
+        if (match_res != null) {
+            area_id = Number(match_res[1]);
+        }
+
+        $.ajax({
+            url: '/estate/areas_ecoef',
+            type: 'POST',
+            dataType: 'json',
+            data: {
+                area_id: area_id//,
+                //atype_id: atype_id,
+                //property_id: property_id,
+                //auser_id: auser_id,
+                //start_date: start_date,
+                //end_date: end_date
+            }
+        }).done(function (data, result) {
+            if (result == 'success') {
+                console.log(data);
+
+                $p_ecoef_val.text(data["average_value"]);
+                $p_ecoef_comment.html(data["comment"]);
+                $p_ecoef_mess.find('.abbr_ecoef').attr('title', data["abbr"]);
+
+                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"];
+                        ival = iob["val"];
+                        $ili = $ul_props.find("#" + itag);
+                        $ili.html(ival);
+                    }
+
+                }
+
+                if (data["graph"] != undefined) {
+                    fDrawChart(data["graph"]);
+                }
+
+                //$h2_page_title.text(data["title"]);
+                //$h2_page_title.css('opacity', '1.0');
+                //$(document).attr('title', data["title"]);
+
+            } else {
+                alert('fail: /estate/areas_ecoef');
+            }
+            //fPreloaderHide();
+        });
+
+        //fPreloaderShow();
+    };
+
+    var fInit = function () {
+        fBuild();
+        fRequest();
+        fAreasShow_initRichShowPage();
+    };
+
+    var fDrawChart_google = function (data_array_rows) {
+        //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]
+        //]
+
+        google.charts.load('current', {'packages': ['corechart']});
+        google.charts.setOnLoadCallback(drawChart);
+        function drawChart() {
+
+            //var data = google.visualization.arrayToDataTable(data_array_rows);
+
+            var 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.length; i++) {
+                iob = data_array_rows[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[i][0]
+                data_array_rows[i][0] = new Date(parseInt(yearValue),parseInt(monthValue),parseInt(dayValue));
+            }
+
+            data.addRows(data_array_rows);
+
+            var options = {
+                title: 'График занята/свободна',
+                vAxis: { title: '', ticks: [0,1] },
+                ignoreBounds: true,
+                isStacked: false
+            };
+
+            var chart = new google.visualization.SteppedAreaChart(document.getElementById('graph'));
+
+            chart.draw(data, options);
+        }
+
+        $('#graph').css('opacity','1.0').css('display','block');
+
+    };
+
+    var fDrawChart_chart_js = function (data) {
+
+        if (data != undefined) {
+            var ctx = $("#graph_canvas");
+
+            var chartInstance = new Chart(ctx, {
+                type: 'bar',
+                data: {
+                    labels: data["labels"],
+                    datasets: [
+                        {
+                            label: "График занята/свободна",
+                            backgroundColor: [
+                                'rgba(255, 99, 132, 0.2)',
+                                'rgba(54, 162, 235, 0.2)',
+                                'rgba(255, 206, 86, 0.2)',
+                                'rgba(75, 192, 192, 0.2)',
+                                'rgba(153, 102, 255, 0.2)',
+                                'rgba(255, 159, 64, 0.2)'
+                            ],
+                            borderColor: [
+                                'rgba(255,99,132,1)',
+                                'rgba(54, 162, 235, 1)',
+                                'rgba(255, 206, 86, 1)',
+                                'rgba(75, 192, 192, 1)',
+                                'rgba(153, 102, 255, 1)',
+                                'rgba(255, 159, 64, 1)'
+                            ],
+                            borderWidth: 1,
+                            barPercentage: 1.0,
+                            categoryPercentage: 0,
+                            data: data["points"]
+                        }
+                    ]
+                },
+                options: {
+                    scales: {
+                        xAxes: [{
+                            type: 'time',
+                            time: {
+                                displayFormats: {
+                                    quarter: 'YYYY/MM/DD'
+                                }
+                            }
+                        }]
+                    }
+                }
+            });
+
+            $('#graph').css('opacity','1.0');
+
+        }
+
+    };
+
+    var fDrawChart = function (data) {
+        if (data != undefined && $('#graph').length) {
+
+            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("graph",
+                {
+                    title:{
+                        text: "График занята/свободна"
+                    },
+                    animationEnabled: true,
+                    axisY:{
+                        includeZero: false,
+                        interval: 1,
+                        valueFormatString: ""
+                    },
+                    toolTip:{
+                        contentFormatter: function ( e ) {
+                            var res = "Свободна";
+                            if (e.entries[0].dataPoint.y == 1) {
+                                res = "Занята"
+                            }
+                            return res;
+                        }
+                    },
+                    data: [
+                        {
+                            type: "stepLine",
+                            //toolTipContent: "{x}: {y}%",
+                            markerSize: 5,
+                            dataPoints: dataPoints
+                        }
+
+                    ]
+                });
+
+            $('#graph').css('opacity','1.0').css('display','block');
+            chart.render();
+
+        }
+    };
+
+    fInit();
+
+};

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

@@ -0,0 +1,42 @@
+//
+$(document).ready(function(){
+
+    var $carousel_div = $('#gallery3');
+
+    $carousel_div.slick({
+        slidesToShow: 1,
+        slidesToScroll: 1,
+        autoplay: false,
+        fade:true,
+        arrows:true,
+        speed: 200,
+        dots:false,
+        infinite: true,
+        asNavFor: '#gallery3_nav'
+    });
+
+    $('#gallery3_nav').slick({
+        slidesToShow: small_frames_slidesToShow,
+        slidesToScroll: 1,
+        asNavFor: '#gallery3',
+        dots: small_frames_dots,
+        //centerMode: true,
+        arrows:false,
+        focusOnSelect: true
+    });
+
+    setTimeout(function() {
+        var $b = $("#gallery3_nav").find(".img-holder");
+        //console.log($b);
+        $b.bind({
+            mouseenter: function() {
+                $(this).addClass("plusOpacity");
+            },
+            mouseleave: function() {
+                $(this).removeClass("plusOpacity");
+            }
+        })
+    },100);
+
+
+});