Changes in / [61a8e52:5f22008]

Files:

• build/deb/Doxyfile_template (added)
• build/deb/conffiles (added)
• build/deb/control (added)
• build/deb/copyright (added)
• build/deb/crontab (added)
• build/deb/make_packet.php (added)
• build/deb/postinst (added)
• web/core.php (modified) (1 diff)
• web/css/comm.js (modified) (2 diffs)
• web/include/models/ldo/doclist.php (modified) (2 diffs)
• web/js/doc_journal.js (modified) (3 diffs)
• web/skins/default/basic.css (modified) (1 diff)
• web/vitrina.php (modified) (1 diff)

web/core.php

@@ -192 +192 @@
         if(isset($_REQUEST[$varname]))  return $_REQUEST[$varname];
         return $def;
+}
+
+/// Проверяет был ли получен запрос через ajax
+/// @return boolean
+function isAjaxRequest()
+{
+        return isset($_SERVER['HTTP_X_REQUESTED_WITH'])
+                && !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
+                && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest';
 }
 

web/css/comm.js

@@ -379 +379 @@
     httpRequest.onreadystatechange = function() { popupReqWin(httpRequest,popup); };
     httpRequest.open('GET', url, true);
+        httpRequest.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
     httpRequest.send(null);
     return false;
@@ -405 +406 @@
                 //popup.innerHTML="Обработка...";
         }
-        else popup.innerHTML="state "+httpRequest.readyState;
 }
 

web/include/models/ldo/doclist.php

@@ -88 +88 @@
         }
         return $filter;
+    }
+
+
+        /**
+         * Сформировать order из запроса
+         * @return string
+         */
+        protected function getOrder()
+        {
+                $orderFields = [
+                        'sum' => '`doc_list`.`sum`',
+                        'date' => '`doc_list`.`date`',
+                        'asc' => 'ASC',
+                        'desc' => 'DESC'
+                ];
+                if(!empty($this->options['order'])) {
+                        foreach (json_decode($this->options['order'], true) as $item) {
+                                if(!empty($orderFields[$item['field']]) && !empty($orderFields[$item['order']])) {
+                                        $orders[] = $orderFields[$item['field']] . ' ' . $orderFields[$item['order']];
+                                }
+                        }
+                }
+                if(!empty($orders)) {
+                        return 'ORDER BY '.implode(', ', $orders);
+                }
+                return 'ORDER by `doc_list`.`date` DESC';
     }
 
@@ -203 +229 @@
             $sql_join
             WHERE 1 $sql_filter
-            ORDER by `doc_list`.`date` DESC
+            {$this->getOrder()}
             LIMIT $start,{$this->limit}";
         $result = array();

web/js/doc_journal.js

@@ -132 +132 @@
     var httpRequest = new XMLHttpRequest();
 
+    let sortableFields = [];
+    let fieldsWithCnt = [
+        {
+            attributes: {
+                width: 55
+            },
+            html: 'a.№'
+        },
+            {
+                    attributes: {
+                            width: 20
+                    },
+                    html: ''
+            },
+            {
+                    attributes: {
+                            width: 20
+                    },
+                    html: ''
+            },
+            {
+                    html: 'Тип'
+            },
+            {
+                    html: 'Участник 1'
+            },
+            {
+                    html: 'Участник 2'
+            },
+            {
+                    html: 'Кол-во'
+            },
+            {
+                    html: 'Цена'
+            },
+            {
+                    attributes: {
+                        class: 'js-order-filter'
+                    },
+            field: 'sum',
+            order: 'asc',
+                    html: 'Сумма'
+            },
+            {
+                    attributes: {
+                            class: 'js-order-filter'
+                    },
+                    field: 'date',
+                    order: 'asc',
+                    html: 'Дата'
+            },
+            {
+                    html: 'Автор'
+            },
+            {
+                    html: 'id'
+            },
+    ];
+
+        let fields = [
+                {
+                        attributes: {
+                                width: 55
+                        },
+                        html: 'a.№'
+                },
+                {
+                        attributes: {
+                                width: 20
+                        },
+                        html: ''
+                },
+                {
+                        attributes: {
+                                width: 20
+                        },
+                        html: ''
+                },
+                {
+                        html: 'Тип'
+                },
+                {
+                        html: 'Участник 1'
+                },
+                {
+                        html: 'Участник 2'
+                },
+                {
+                        attributes: {
+                                class: 'js-order-filter'
+                        },
+                        field: 'sum',
+                        order: 'asc',
+                        html: 'Сумма'
+                },
+                {
+                        attributes: {
+                                class: 'js-order-filter'
+                        },
+                        field: 'date',
+                        order: 'asc',
+                        html: 'Дата'
+                },
+                {
+                        html: 'Автор'
+                },
+                {
+                        html: 'id'
+                },
+        ];
+
+
     var deffer_timer;
     var docj_list_body = document.getElementById('docj_list_body');
@@ -218 +330 @@
         if (okfilter_id.value != '0')
             filter_request += '&doclist[ok]=' + encodeURIComponent(okfilter_id.value);
+
+        if(sortableFields) {
+            let orderQuery = [];
+            sortableFields.forEach(function(item){
+               if(item.hasOwnProperty('order') && item.hasOwnProperty('field')) {
+                   orderQuery.push({
+                       'field': item.field,
+                       'order': item.order
+                   });
+               }
+            });
+                filter_request += '&doclist[order]=' + encodeURIComponent(JSON.stringify(orderQuery));
+        }
     }
 
@@ -558 +683 @@
     }
 
+    function buldHeaderFields(data) {
+        let tr = document.createElement("tr");
+        data.forEach(function (item, i) {
+                let th = document.createElement("th");
+                th.innerText = item.html;
+                if(item.hasOwnProperty('attributes')) {
+                    if(item.attributes.hasOwnProperty('class')){
+                            th.classList = item.attributes.class ? item.attributes.class : '';
+                }
+            }
+                if(item.hasOwnProperty('order')) {
+                        th.style = 'background: url(/img/i_orderarrows.png) 100% '
+                    +(item.order === 'asc' ? '' : '10')
+                    +'0% no-repeat transparent; background-color: #6488DC; cursor: pointer';
+                }
+                if(item.hasOwnProperty('field')) {
+                        th.dataset.field = item.field;
+                }
+                th.dataset.fieldId = i;
+                tr.appendChild(th);
+        });
+            return tr.innerHTML;
+    }
+
+
     function initTableHead() {
         var head = document.getElementById('doc_list_head');
         if (show_count_column) {
-            head.innerHTML = "<tr><th width='55'>a.№</th><th width='20'>&nbsp;</th><th width='20'>&nbsp;</th><th>Тип</th><th>Участник 1</th><th>Участник 2</th><th>Кол-во</th><th>Цена</th><th>Сумма</th><th>Дата</th><th>Автор</th><th width='45'>id</th></tr>";
+            head.innerHTML = buldHeaderFields(fieldsWithCnt);
         }
         else {
-            head.innerHTML = "<tr><th width='55'>a.№</th><th width='20'>&nbsp;</th><th width='20'>&nbsp;</th><th>Тип</th><th>Участник 1</th><th>Участник 2</th><th>Сумма</th><th>Дата</th><th>Автор</th><th width='45'>id</th></tr>";
-        }
+            head.innerHTML = buldHeaderFields(fields);
+        }
+            let orderFilter = function(e) {
+            let data = show_count_column ? fieldsWithCnt : fields;
+            let self = this;
+                    sortableFields = sortableFields.filter(function(val){
+                            return val.field !== data[self.dataset.fieldId].field;
+                    });
+                    sortableFields.unshift({
+                            field: data[this.dataset.fieldId].field,
+                            order: data[this.dataset.fieldId].order === 'asc' ? 'desc' : 'asc',
+            });
+                    data[this.dataset.fieldId].order = data[this.dataset.fieldId].order === 'asc' ? 'desc' : 'asc';
+                    beginDefferedRequest();
+            };
+            document.querySelectorAll("th.js-order-filter").forEach(box => { box.addEventListener('click', orderFilter, false); });
     }
 

web/skins/default/basic.css

@@ -193 +193 @@
 div.notify
 {
-    width: 97%;
     BORDER: #999900 1px solid;
     FONT-SIZE: 14px;

web/vitrina.php

@@ -194 +194 @@
                 }
             } else {
-                if (getenv("HTTP_REFERER")) {
-                    redirect(getenv("HTTP_REFERER"));
-                }
-                $tmpl->msg("Товар добавлен в корзину!", "info", "<a class='urllink' href='/vitrina.php?mode=basket'>Ваша корзина</a>");
+                    if(isAjaxRequest()) {
+                            $tmpl->msg("Товар добавлен в корзину!", "info", "<a class='urllink' href='/vitrina.php?mode=basket'>Ваша корзина</a>");
+                    } else {
+                            if (getenv("HTTP_REFERER")) {
+                                    redirect(getenv("HTTP_REFERER"));
+                            }
+                    }
             }
         } else {