-
-
-
-
-
-
-
-
- 요구사항 리스트
@@ -68,9 +18,28 @@상세 보기는 리스트 클릭+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -100,71 +69,9 @@
//
- product name
-
- `;
-
- for(let i = 0; i < menu.length; i++){
-
- data += `
- Atlassian RMS
+ Atlassian RMS
@@ -60,10 +60,10 @@
@@ -76,65 +76,73 @@
-
+
-
+
-
-
-
- `;
-
- }
-
- main.html(data);
-
- }
-
- $.fn.jsonMenu = function(action, items, options){
- $(this).addClass("json-menu")
- if(action == "add"){
- menu.body.push(items);
- draw($(this));
- } else if(action == "set"){
- menu = items;
- draw($(this));
- }
- return this;
- }
- })( jQuery );
-
$(function () {
- $.ajax( "/auth-user/api/arms/pdversion/getChildNode.do?c_id=1")
- .done(function(json) {
- console.log(json);
- $("#versionAccordion").jsonMenu("set", json,{speed:5000});
- })
- .fail(function(jqXHR) {
- console.log( "error" );
- })
- .always(function(jqXHR) {
- console.log( "finished" );
- });
-
});
Index: arms/js/reqStatus.js
===================================================================
diff -u -r69fe57ca5defa495d913766c6824be673e88f7ef -rb73ae58f87cab79d76fe0a5a8b5671a2b1a735fc
--- arms/js/reqStatus.js (.../reqStatus.js) (revision 69fe57ca5defa495d913766c6824be673e88f7ef)
+++ arms/js/reqStatus.js (.../reqStatus.js) (revision b73ae58f87cab79d76fe0a5a8b5671a2b1a735fc)
@@ -1,174 +1,323 @@
-const data = [
- [
- "aRMS Product",
- "REQ-Auth-13",
- "JIRA-Dev-Backend v.1.3.1",
- "ISSUE-DEV-01",
- "TEST-REQ-01",
- "Resolved",
- ],
- [
- "aRMS Product",
- "REQ-Auth-13",
- "JIRA-Dev-Backend v.11.9.15",
- "ISSUE-DEV-16",
- "TEST-REQ-01",
- "Closed",
- ],
- [
- "aRMS Product",
- "REQ-Auth-13",
- "JIRA-Design-Front v.12.93.1",
- "ISSUE-DES-193",
- "TEST-REQ-01",
- "Open",
- ],
- [
- "aRMS Product",
- "REQ-Auth-13",
- "JIRA-Oper-DB v.1.3.1",
- "ISSUE-DB-163",
- "TEST-REQ-01",
- "Progress",
- ],
- [
- "aRMS Product",
- "REQ-Auth-13",
- "JIRA-Oper-SYS v.0.3.0",
- "ISSUE-SYS-213",
- "TEST-REQ-01",
- "Progress",
- ],
- [
- "aRMS Product",
- "REQ-Auth-13",
- "JIRA-Oper-SYS v.3.9.11",
- "ISSUE-SYS-863",
- "TEST-REQ-01",
- "Progress",
- ],
- [
- "aRMS Product",
- "REQ-Auth-13",
- "JIRA-Oper-SYS v.15.3.1",
- "ISSUE-DO-10",
- "TEST-REQ-01",
- "Progress",
- ],
+////////////////////////////////////////////////////////////////////////////////////////
+//Document Ready
+////////////////////////////////////////////////////////////////////////////////////////
+var selectedJsTreeId; // 요구사항 아이디
+var reqStatusDataTable;
- [
- "aRMS Product",
- "REQ-Auth-19",
- "JIRA-Dev-Backend v.1.3.9",
- "ISSUE-DEV-101",
- "TEST-REQ-13",
- "Resolved",
- ],
- [
- "aRMS Product",
- "REQ-Auth-19",
- "JIRA-Dev-Backend v.1.2.91",
- "ISSUE-DEV-136",
- "TEST-REQ-13",
- "Closed",
- ],
- [
- "aRMS Product",
- "REQ-Auth-19",
- "JIRA-Design-Front v.4.9.1",
- "ISSUE-DES-143",
- "TEST-REQ-13",
- "Open",
- ],
- [
- "aRMS Product",
- "REQ-Auth-19",
- "JIRA-Oper-DB v.61.3.1",
- "ISSUE-DB-763",
- "TEST-REQ-13",
- "Progress",
- ],
- [
- "aRMS Product",
- "REQ-Auth-19",
- "JIRA-Oper-SYS v.1.39.10",
- "ISSUE-SYS-913",
- "TEST-REQ-13",
- "Progress",
- ],
- [
- "aRMS Product",
- "REQ-Auth-21",
- "JIRA-Oper-SYS v.14.3.1",
- "ISSUE-SYS-263",
- "TEST-REQ-313",
- "Progress",
- ],
- [
- "aRMS Product",
- "REQ-Auth-21",
- "JIRA-Oper-SYS v.1.9.1",
- "ISSUE-DO-40",
- "TEST-REQ-313",
- "Progress",
- ],
-];
-const tableOptions = {
- destroy: true,
- processing: true,
- responsive: true,
- select: true,
- columns: [
- {
- name: "first",
+$(function () {
+
+ //좌측 메뉴
+ setSideMenu(
+ "sidebar_menu_requirement",
+ "sidebar_menu_requirement_status",
+ "requirement-elements-collapse"
+ );
+
+ //제품(서비스) 셀렉트 박스 이니시에이터
+ makePdServiceSelectBox();
+ //버전 멀티 셀렉트 박스 이니시에이터
+ makeVersionMultiSelectBox();
+
+});
+
+////////////////////////////////////////////////////////////////////////////////////////
+//제품 서비스 셀렉트 박스
+////////////////////////////////////////////////////////////////////////////////////////
+function makePdServiceSelectBox(){
+ //제품 서비스 셀렉트 박스 이니시에이터
+ $(".chzn-select").each(function(){
+ $(this).select2($(this).data());
+ });
+
+ //제품 서비스 셀렉트 박스 데이터 바인딩
+ $.ajax({
+ url: "/auth-user/api/arms/pdService/getPdServiceMonitor.do",
+ type: "GET",
+ contentType: "application/json;charset=UTF-8",
+ dataType : "json",
+ progress: true
+ }).done(function(data) {
+
+ for(var k in data){
+ var obj = data[k];
+ var newOption = new Option(obj.c_title, obj.c_id, false, false);
+ $('#country').append(newOption).trigger('change');
+ }
+ }).fail(function(e) {
+ }).always(function() {
+ });
+
+} // end makePdServiceSelectBox()
+
+$('#country').on("select2:open", function () {
+ //슬림스크롤
+ makeSlimScroll(".select2-results__options");
+});
+
+// --- select2 ( 제품(서비스) 검색 및 선택 ) 이벤트 --- //
+$('#country').on('select2:select', function (e) {
+ // 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도
+ // 디폴트는 base version 을 선택하게 하고 ( select all )
+//~> 이벤트 연계 함수 :: Version 표시 jsTree 빌드
+ bind_VersionData_By_PdService();
+
+ common_dataTableLoad($('#country').val());
+
+});
+
+
+
+////////////////////////////////////////////////////////////////////////////////////////
+//버전 멀티 셀렉트 박스
+////////////////////////////////////////////////////////////////////////////////////////
+function makeVersionMultiSelectBox(){
+ //버전 선택 셀렉트 박스 이니시에이터
+ $('.multiple-select').multipleSelect();
+}
+
+function bind_VersionData_By_PdService(){
+ $(".multiple-select option").remove();
+ $.ajax({
+ url: "/auth-user/api/arms/pdServiceVersion/getVersion.do?c_id=" + $('#country').val(),
+ type: "GET",
+ contentType: "application/json;charset=UTF-8",
+ dataType : "json",
+ progress: true
+ }).done(function(data) {
+
+ for(var k in data){
+ var obj = data[k];
+ var $opt = $('', {
+ value: obj.c_id,
+ text: obj.c_title,
+ })
+
+ //$('#multiVersion').append($opt);
+ //$('#editMultiVersion').append($opt);
+ $('.multiple-select').append($opt);
+ }
+
+ if(data.length > 0){
+ console.log("display 재설정.");
+ }
+ //$('#multiVersion').multipleSelect('refresh');
+ //$('#editMultiVersion').multipleSelect('refresh');
+ $('.multiple-select').multipleSelect('refresh');
+
+ }).fail(function(e) {
+ }).always(function() {
+ });
+}
+
+////////////////////////////////////////////////////////////////////////////////////////
+//슬림스크롤
+////////////////////////////////////////////////////////////////////////////////////////
+function makeSlimScroll(targetElement) {
+ $(targetElement).slimScroll({
+ height: '200px',
+ railVisible: true,
+ railColor: '#222',
+ railOpacity: 0.3,
+ wheelStep: 10,
+ allowPageScroll: false,
+ disableFadeOut: false
+ });
+}
+
+////////////////////////////////////////////////////////////////////////////////////////
+//데이터 테이블
+////////////////////////////////////////////////////////////////////////////////////////
+// -------------------- 데이터 테이블을 만드는 템플릿으로 쓰기에 적당하게 리팩토링 함. ------------------ //
+function common_dataTableLoad(selectId) {
+
+ var jQueryElementID = "#reqStatusTable";
+ var reg = /[\{\}\[\]\/?.,;:|\)*~`!^\-_+<>@\#$%&\\\=\(\'\"]/gi;
+ var jQueryElementStr = jQueryElementID.replace(reg,'');
+ console.log("jQueryElementStr ======== " + jQueryElementStr );
+ var serviceNameForURL = "reqStatus";
+ var endPointUrl = "/T_ARMS_REQSTATUS_" + selectId + "/getStatusMonitor.do";
+ // 데이터 테이블 컬럼 및 열그룹 구성
+ var columnList = [
+ { name: "c_pdservice_link",
+ title: "제품(서비스) 아이디",
+ data: "c_pdservice_link",
+ visible: false
+ },
+ { name: "c_pdservice_name",
title: "제품(서비스)",
+ data: "c_pdservice_name",
+ visible: true
},
- {
- name: "second",
- title: "요구사항",
+
+ { name: "c_version_link",
+ title: "제품(서비스) 버전 아이디",
+ data: "c_version_link",
+ visible: false
},
- {
+ { name: "c_version_name",
+ title: "Version",
+ data: "c_version_name",
+ visible: true
+ },
+
+ { name: "c_jira_project_link",
+ title: "지라 프로젝트 아이디",
+ data: "c_jira_project_link",
+ visible: false
+ },
+ { name: "c_jira_project_name",
title: "JIRA Project",
+ data: "c_jira_project_name",
+ visible: true
},
- {
- title: "Issue",
+
+ { name: "c_jira_version_link",
+ title: "지라 프로젝트 버전 아이디",
+ data: "c_jira_version_link",
+ visible: false
},
+ { name: "c_jira_version_name",
+ title: "JIRA Version",
+ data: "c_jira_version_name",
+ visible: true
+ },
+
+ { name: "c_req_link",
+ title: "요구사항 아이디",
+ data: "c_req_link",
+ visible: false
+ },
+ { name: "c_req_name",
+ title: "요구사항",
+ data: "c_req_name",
+ visible: true
+ },
+
+ { name: "c_jira_req_issue_key",
+ title: "JIRA 이슈",
+ data: "c_jira_req_issue_key",
+ visible: true
+ },
+ { name: "c_jira_req_issue_id",
+ title: "JIRA 이슈 아이디",
+ data: "c_jira_req_issue_id",
+ visible: false
+ },
+
{
- name: "third",
- title: "QA",
+ name: "c_jira_req_issue_id",
+ title: "SubTask",
+ data: "c_jira_req_subtaskissue",
+ render: function ( data, type, row ) {
+ if ( isEmpty(data) || data == "[]" ) {
+ return 'no data';
+ }
+ return "Data Check";
+ },
+ className: "dt-body-center",
+ visible: true
},
{
- title: "Status - Test",
+ name: "c_jira_req_linkingissue",
+ title: "LinkTask",
+ data: "c_jira_req_linkingissue",
+ render: function ( data, type, row ) {
+ if ( isEmpty(data) || data == "[]" ) {
+ return 'no data';
+ }
+ return "Data Check";
+ },
+ className: "dt-body-center",
+ visible: true
},
- ],
- data,
- rowsGroup: [
- // Always the array (!) of the column-selectors in specified order to which rows groupping is applied
- // (column-selector could be any of specified in https://datatables.net/reference/type/column-selector)
- "first:name",
- "second:name",
- "third:name",
- 0,
- 2,
- ],
-};
-// --- 사이드 메뉴 -- //
-$(function () {
- setSideMenu(
- "sidebar_menu_requirement",
- "sidebar_menu_requirement_status",
- "requirement-elements-collapse"
- );
- setTable("", [], tableOptions);
- jsTreeBuild("#pdServiceTree", "reqspec");
-});
-// --- jstree 설정 -- //
-function jsTreeClick(selectedNodeID) {
- console.log(selectedNodeID);
+ ];
+ var rowsGroupList = [
+ "c_pdservice_name:name",
+ "c_version_name:name",
+ "c_jira_project_name:name",
+ "c_jira_version_name:name"
+ ];
+ var columnDefList = [];
+ var selectList = {};
+ var orderList = [[ 1, 'asc' ]];
+ console.log("defaultType_dataTableLoad selectId -> " + selectId);
+ console.log("dataTableBuild :: jQueryElementID -> " + jQueryElementID + ", serviceNameForURL -> " + serviceNameForURL);
+ console.log("dataTableBuild :: columnList -> " + columnList + ", rowsGroupList -> " + rowsGroupList);
+
+ console.log("dataTableBuild :: href: " + $(location).attr("href"));
+ console.log("dataTableBuild :: protocol: " + $(location).attr("protocol"));
+ console.log("dataTableBuild :: host: " + $(location).attr("host"));
+ console.log("dataTableBuild :: pathname: " + $(location).attr("pathname"));
+ console.log("dataTableBuild :: search: " + $(location).attr("search"));
+ console.log("dataTableBuild :: hostname: " + $(location).attr("hostname"));
+ console.log("dataTableBuild :: port: " + $(location).attr("port"));
+
+ var authCheckURL = "/auth-user";
+
+ var tempDataTable = $(jQueryElementID).DataTable({
+ ajax: {
+ url: authCheckURL + "/api/arms/" + serviceNameForURL + endPointUrl,
+ dataSrc: ''
+ },
+ destroy: true,
+ processing: true,
+ responsive: false,
+ columns: columnList,
+ rowsGroup: rowsGroupList,
+ columnDefs: columnDefList,
+ select: selectList,
+ order: orderList,
+ drawCallback: function() {
+ console.log("dataTableBuild :: drawCallback");
+ if ($.isFunction(dataTableCallBack )) {
+ dataTableCallBack();
+ }
+ }
+ });
+
+ reqStatusDataTable = tempDataTable;
+
+ $(jQueryElementID + " tbody").on("click", "tr", function () {
+
+ if ($(this).hasClass("selected")) {
+ $(this).removeClass("selected");
+ } else {
+ tempDataTable.$("tr.selected").removeClass("selected");
+ $(this).addClass("selected");
+ }
+
+ var selectedData = tempDataTable.row(this).data();
+ selectedData.selectedIndex = $(this).closest('tr').index();
+
+ var info = tempDataTable.page.info();
+ console.log( 'Showing page: '+info.page+' of '+info.pages );
+ selectedData.selectedPage = info.page;
+
+ dataTableClick(selectedData);
+ });
+
+ // ----- 데이터 테이블 빌드 이후 스타일 구성 ------ //
+ //datatable 좌상단 datarow combobox style
+ $(".dataTables_length").find("select:eq(0)").addClass("darkBack");
+ $(".dataTables_length").find("select:eq(0)").css("min-height", "30px");
+ //min-height: 30px;
+
+ // ----- 데이터 테이블 빌드 이후 별도 스타일 구성 ------ //
+ //datatable 좌상단 datarow combobox style
+ $("body").find("[aria-controls='" + jQueryElementStr + "']").css("width", "100px");
+ $("select[name=" + jQueryElementStr + "]").css("width", "50px");
+
+ return tempDataTable;
}
+// -------------------- 데이터 테이블을 만드는 템플릿으로 쓰기에 적당하게 리팩토링 함. ------------------ //
-// 요구사항 상세 보기 클릭 이벤트
-$("#selectView").click(function () {
- location.href = "reqServiceListView.html";
-});
+// 데이터 테이블 구성 이후 꼭 구현해야 할 메소드 : 열 클릭시 이벤트
+function dataTableClick(selectedData) {
+ console.log(selectedData);
+}
+
+// 데이터 테이블 데이터 렌더링 이후 콜백 함수.
+function dataTableCallBack(){
+
+}
\ No newline at end of file
Index: arms/reqAdd.html
===================================================================
diff -u -r6e2ee8557565a935ac203d0a8da794f99c478ab7 -rb73ae58f87cab79d76fe0a5a8b5671a2b1a735fc
--- arms/reqAdd.html (.../reqAdd.html) (revision 6e2ee8557565a935ac203d0a8da794f99c478ab7)
+++ arms/reqAdd.html (.../reqAdd.html) (revision b73ae58f87cab79d76fe0a5a8b5671a2b1a735fc)
@@ -314,6 +314,7 @@
+
Index: arms/reqStatus.html
===================================================================
diff -u -r1e90e7235816d1ab00f2b6b16dd4029b931ab8db -rb73ae58f87cab79d76fe0a5a8b5671a2b1a735fc
--- arms/reqStatus.html (.../reqStatus.html) (revision 1e90e7235816d1ab00f2b6b16dd4029b931ab8db)
+++ arms/reqStatus.html (.../reqStatus.html) (revision b73ae58f87cab79d76fe0a5a8b5671a2b1a735fc)
@@ -2,7 +2,7 @@
-
-
-
- ${menu[i].c_type}
-
-
+
+
+
+
+
+
+
+
+
@@ -153,6 +161,7 @@
+
@@ -168,6 +177,10 @@
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
Index: reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/arms_dataTables.rowsGroup.js
===================================================================
diff -u
--- reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/arms_dataTables.rowsGroup.js (revision 0)
+++ reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/arms_dataTables.rowsGroup.js (revision b73ae58f87cab79d76fe0a5a8b5671a2b1a735fc)
@@ -0,0 +1,319 @@
+/*! RowsGroup for DataTables v2.0.0
+ * 2015-2016 Alexey Shildyakov ashl1future@gmail.com
+ * 2016 Tibor Wekerle
+ */
+
+/**
+ * @summary RowsGroup
+ * @description Group rows by specified columns
+ * @version 2.0.0
+ * @file dataTables.rowsGroup.js
+ * @author Alexey Shildyakov (ashl1future@gmail.com)
+ * @contact ashl1future@gmail.com
+ * @copyright Alexey Shildyakov
+ *
+ * License MIT - http://datatables.net/license/mit
+ *
+ * This feature plug-in for DataTables automatically merges columns cells
+ * based on it's values equality. It supports multi-column row grouping
+ * in according to the requested order with dependency from each previous
+ * requested columns. Now it supports ordering and searching.
+ * Please see the example.html for details.
+ *
+ * Rows grouping in DataTables can be enabled by using any one of the following
+ * options:
+ *
+ * * Setting the `rowsGroup` parameter in the DataTables initialisation
+ * to array which containes columns selectors
+ * (https://datatables.net/reference/type/column-selector) used for grouping. i.e.
+ * rowsGroup = [1, 'columnName:name', ]
+ * * Setting the `rowsGroup` parameter in the DataTables defaults
+ * (thus causing all tables to have this feature) - i.e.
+ * `$.fn.dataTable.defaults.RowsGroup = [0]`.
+ * * Creating a new instance: `new $.fn.dataTable.RowsGroup( table, columnsForGrouping );`
+ * where `table` is a DataTable's API instance and `columnsForGrouping` is the array
+ * described above.
+ *
+ * For more detailed information please see:
+ *
+ */
+
+(function( factory ) {
+ "use strict";
+
+ if ( typeof define === 'function' && define.amd ) {
+ // AMD
+ define( ['jquery'], function ( $ ) {
+ return factory( $, window, document );
+ } );
+ }
+ else if ( typeof exports === 'object' ) {
+ // CommonJS
+ module.exports = function (root, $) {
+ if ( ! root ) {
+ root = window;
+ }
+
+ if ( ! $ ) {
+ $ = typeof window !== 'undefined' ?
+ require('jquery') :
+ require('jquery')( root );
+ }
+
+ return factory( $, root, root.document );
+ };
+ }
+ else {
+ // Browser
+ factory( jQuery, window, document );
+ }
+}
+(function($, window, document){
+
+ ShowedDataSelectorModifier = {
+ order: 'current',
+ page: 'current',
+ search: 'applied',
+ }
+
+ GroupedColumnsOrderDir = 'asc';
+
+
+ /*
+ * columnsForGrouping: array of DTAPI:cell-selector for columns for which rows grouping is applied
+ */
+ var RowsGroup = function ( dt, columnsForGrouping )
+ {
+ this.table = dt.table();
+ this.columnsForGrouping = columnsForGrouping;
+ // set to True when new reorder is applied by RowsGroup to prevent order() looping
+ this.orderOverrideNow = false;
+ this.mergeCellsNeeded = false; // merge after init
+ this.order = []
+
+ var self = this;
+ dt.on('order.dt.rowsGroup', function ( e, settings) {
+ if (!self.orderOverrideNow) {
+ self.orderOverrideNow = true;
+ self._updateOrderAndDraw()
+ } else {
+ self.orderOverrideNow = false;
+ }
+ })
+
+ dt.on('preDraw.dt.rowsGroup', function ( e, settings) {
+ if (self.mergeCellsNeeded) {
+ self.mergeCellsNeeded = false;
+ self._mergeCells()
+ }
+ })
+
+ dt.on('column-visibility.dt.rowsGroup', function ( e, settings) {
+ self.mergeCellsNeeded = true;
+ })
+
+ dt.on('search.dt.rowsGroup', function ( e, settings) {
+ // This might to increase the time to redraw while searching on tables
+ // with huge shown columns
+ self.mergeCellsNeeded = true;
+ })
+
+ dt.on('page.dt.rowsGroup', function ( e, settings) {
+ self.mergeCellsNeeded = true;
+ })
+
+ dt.on('length.dt.rowsGroup', function ( e, settings) {
+ self.mergeCellsNeeded = true;
+ })
+
+ dt.on('xhr.dt.rowsGroup', function ( e, settings) {
+ self.mergeCellsNeeded = true;
+ })
+
+ dt.on('destroy.dt.rowsGroup', function ( e ) {
+ dt.off('.rowsGroup');
+ })
+
+ this._updateOrderAndDraw();
+
+ /* Events sequence while Add row (also through Editor)
+ * addRow() function
+ * draw() function
+ * preDraw() event
+ * mergeCells() - point 1
+ * Appended new row breaks visible elements because the mergeCells() on previous step doesn't apllied to already processing data
+ * order() event
+ * _updateOrderAndDraw()
+ * preDraw() event
+ * mergeCells()
+ * Appended new row now has properly visibility as on current level it has already applied changes from first mergeCells() call (point 1)
+ * draw() event
+ */
+ };
+
+
+ RowsGroup.prototype = {
+ setMergeCells: function(){
+ this.mergeCellsNeeded = true;
+ },
+
+ mergeCells: function()
+ {
+ this.setMergeCells();
+ this.table.draw();
+ },
+
+ _getOrderWithGroupColumns: function (order, groupedColumnsOrderDir)
+ {
+ if (groupedColumnsOrderDir === undefined)
+ groupedColumnsOrderDir = GroupedColumnsOrderDir
+
+ var self = this;
+ var groupedColumnsIndexes = this.columnsForGrouping.map(function(columnSelector){
+ return self.table.column(columnSelector).index()
+ })
+ var groupedColumnsKnownOrder = order.filter(function(columnOrder){
+ return groupedColumnsIndexes.indexOf(columnOrder[0]) >= 0
+ })
+ var nongroupedColumnsOrder = order.filter(function(columnOrder){
+ return groupedColumnsIndexes.indexOf(columnOrder[0]) < 0
+ })
+ var groupedColumnsKnownOrderIndexes = groupedColumnsKnownOrder.map(function(columnOrder){
+ return columnOrder[0]
+ })
+ var groupedColumnsOrder = groupedColumnsIndexes.map(function(iColumn){
+ var iInOrderIndexes = groupedColumnsKnownOrderIndexes.indexOf(iColumn)
+ if (iInOrderIndexes >= 0)
+ return [iColumn, groupedColumnsKnownOrder[iInOrderIndexes][1]]
+ else
+ return [iColumn, groupedColumnsOrderDir]
+ })
+
+ groupedColumnsOrder.push.apply(groupedColumnsOrder, nongroupedColumnsOrder)
+ return groupedColumnsOrder;
+ },
+
+ // Workaround: the DT reset ordering to 'asc' from multi-ordering if user order on one column (without shift)
+ // but because we always has multi-ordering due to grouped rows this happens every time
+ _getInjectedMonoSelectWorkaround: function(order)
+ {
+ if (order.length === 1) {
+ // got mono order - workaround here
+ var orderingColumn = order[0][0]
+ var previousOrder = this.order.map(function(val){
+ return val[0]
+ })
+ var iColumn = previousOrder.indexOf(orderingColumn);
+ if (iColumn >= 0) {
+ // assume change the direction, because we already has that in previos order
+ return [[orderingColumn, this._toogleDirection(this.order[iColumn][1])]]
+ } // else This is the new ordering column. Proceed as is.
+ } // else got milti order - work normal
+ return order;
+ },
+
+ _mergeCells: function()
+ {
+ var columnsIndexes = this.table.columns(this.columnsForGrouping, ShowedDataSelectorModifier).indexes().toArray()
+ var showedRowsCount = this.table.rows(ShowedDataSelectorModifier)[0].length
+ this._mergeColumn(0, showedRowsCount - 1, columnsIndexes)
+ },
+
+ // the index is relative to the showed data
+ // (selector-modifier = {order: 'current', page: 'current', search: 'applied'}) index
+ _mergeColumn: function(iStartRow, iFinishRow, columnsIndexes)
+ {
+ var columnsIndexesCopy = columnsIndexes.slice()
+ currentColumn = columnsIndexesCopy.shift()
+ currentColumn = this.table.column(currentColumn, ShowedDataSelectorModifier)
+
+ var columnNodes = currentColumn.nodes()
+ var columnValues = currentColumn.data()
+
+ var newSequenceRow = iStartRow,
+ iRow;
+ for (iRow = iStartRow + 1; iRow <= iFinishRow; ++iRow) {
+
+ if (columnValues[iRow] === columnValues[newSequenceRow]) {
+ $(columnNodes[iRow]).hide()
+ } else {
+ $(columnNodes[newSequenceRow]).show()
+ $(columnNodes[newSequenceRow]).attr('rowspan', (iRow-1) - newSequenceRow + 1)
+
+ if (columnsIndexesCopy.length > 0)
+ this._mergeColumn(newSequenceRow, (iRow-1), columnsIndexesCopy)
+
+ newSequenceRow = iRow;
+ }
+
+ }
+ $(columnNodes[newSequenceRow]).show()
+ $(columnNodes[newSequenceRow]).attr('rowspan', (iRow-1)- newSequenceRow + 1)
+ if (columnsIndexesCopy.length > 0)
+ this._mergeColumn(newSequenceRow, (iRow-1), columnsIndexesCopy)
+ },
+
+ _toogleDirection: function(dir)
+ {
+ return dir == 'asc'? 'desc': 'asc';
+ },
+
+ _updateOrderAndDraw: function()
+ {
+ this.mergeCellsNeeded = true;
+
+ var currentOrder = this.table.order();
+ currentOrder = this._getInjectedMonoSelectWorkaround(currentOrder);
+ this.order = this._getOrderWithGroupColumns(currentOrder)
+ this.table.order($.extend(true, Array(), this.order))
+ this.table.draw()
+ },
+ };
+
+
+ $.fn.dataTable.RowsGroup = RowsGroup;
+ $.fn.DataTable.RowsGroup = RowsGroup;
+
+// Automatic initialisation listener
+ $(document).on( 'init.dt.rowsGroup', function ( e, settings ) {
+ if ( e.namespace !== 'dt' ) {
+ return;
+ }
+
+ var api = new $.fn.dataTable.Api( settings );
+
+ if ( settings.oInit.rowsGroup ||
+ $.fn.dataTable.defaults.rowsGroup )
+ {
+ options = settings.oInit.rowsGroup?
+ settings.oInit.rowsGroup:
+ $.fn.dataTable.defaults.rowsGroup;
+ var rowsGroup = new RowsGroup( api, options );
+ $.fn.dataTable.Api.register( 'rowsgroup.update()', function () {
+ rowsGroup.mergeCells();
+ return this;
+ } );
+ $.fn.dataTable.Api.register( 'rowsgroup.updateNextDraw()', function () {
+ rowsGroup.setMergeCells();
+ return this;
+ } );
+ }
+ } );
+
+}));
+
+/*
+
+TODO: Provide function which determines the all s and s with "rowspan" html-attribute is parent (groupped) for the specified or . To use in selections, editing or hover styles.
+
+TODO: Feature
+Use saved order direction for grouped columns
+ Split the columns into grouped and ungrouped.
+
+ user = grouped+ungrouped
+ grouped = grouped
+ saved = grouped+ungrouped
+
+ For grouped uses following order: user -> saved (because 'saved' include 'grouped' after first initialisation). This should be done with saving order like for 'groupedColumns'
+ For ungrouped: uses only 'user' input ordering
+*/
\ No newline at end of file
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+