From 525402832d623861eef3474efa912f355e3d4de2 Mon Sep 17 00:00:00 2001 From: "damian.przygodzki" Date: Fri, 20 Jan 2017 15:34:33 +0100 Subject: [PATCH] #189 included rows (wip) #2 --- src/actions/MenuActions.js | 6 +- src/assets/css/font-meta.css | 9 +++ src/assets/css/fonts/meta.eot | Bin 11344 -> 11836 bytes src/assets/css/fonts/meta.svg | 3 + src/assets/css/fonts/meta.ttf | Bin 11192 -> 11684 bytes src/assets/css/fonts/meta.woff | Bin 7420 -> 7744 bytes src/assets/css/styles.css | 1 - src/assets/css/table.css | 5 ++ src/components/table/Table.js | 17 ++--- src/components/table/TableHeader.js | 3 + src/components/table/TableItem.js | 35 +++------- src/components/table/TableItemWrapper.js | 78 +++++++++++++++++------ 12 files changed, 98 insertions(+), 59 deletions(-) diff --git a/src/actions/MenuActions.js b/src/actions/MenuActions.js index 7e0114194..d6979b542 100644 --- a/src/actions/MenuActions.js +++ b/src/actions/MenuActions.js @@ -117,11 +117,11 @@ export function getWindowBreadcrumb(id){ // UTILITIES -export function flattenLastElem(node) { +export function flattenLastElem(node, prop = "children") { let result = []; - if(!!node.children){ - node.children.map(child => { + if(!!node[prop]){ + node[prop].map(child => { const flat = flattenLastElem(child); if(typeof flat === "object"){ diff --git a/src/assets/css/font-meta.css b/src/assets/css/font-meta.css index 384fa3257..be7adb07c 100644 --- a/src/assets/css/font-meta.css +++ b/src/assets/css/font-meta.css @@ -179,3 +179,12 @@ .meta-icon-collapse:before { content: "\55"; } +.meta-icon-package:before { + content: "\56"; +} +.meta-icon-palette:before { + content: "\57"; +} +.meta-icon-product:before { + content: "\58"; +} diff --git a/src/assets/css/fonts/meta.eot b/src/assets/css/fonts/meta.eot index f938321c419588631a46633b0b52fe7ce35b3385..25ef0e1eb8633a9ada5fe043f2e3ef52f8ae2baf 100644 GIT binary patch delta 1023 zcmYjQOK1~e5dQw`b`yT2r~(RffQ_~_ckT5OwWqgF2| zC{hH$vR?F}f}jXWMDSE0ir~Rl5%B>c=s`rhcu???IGe`D?9M+k-~Y|*{6Di(-IKe8 zjwQgg*o2VeMQ?_iFbAY_%eMltaR8wWUF+6kKLm;oP81sxsduN20j~J~yVq}xWXol6 zwAVviPygVF1ABi3t^)i`C>|YZg)@g)vz+O@at8 zKl!Lco?@bs$a3Wnb?~uo>?Q0fCJ( zzQ1`F*BR{O+CuTj+Bvrx<~BC7`o(7JieU1Ed%GHpZ7_m~;HrADmen>i#6vND0nz#H z&;d_lsPw&gZezpk7KzxWg)y}$mPrH?qAwU+3A;~G@-hahBf(cj!5Ipm2438$;sW81 zopIr35aOZTY2O7O4cD~K!Gu!vdE%U{`ZWmPV$~N2zmFlLk%I*crE|2}Gu8E69Gbmd zRa|k+KA~>0AE{xQ-p^{Ez?QN&)9-Fx_`tQOcAz&iJQB-Vy@#y+^xtSOoy+}=j%50d T_U3GFTMMHBZEN!W_mlhvT5#1* delta 485 zcmYjNO(;ZB6#njecV5FxSt!JqVUlNNjL;+sS@_u)*^mWIkNH7^DHf(kSlHpYlPEQ1 zC5uUHkc7m7Vj)YhwX%`rIFDC!yZ1ZiJLi1&yZ3DHaX{&<29ABY(!f*cWKeG#D;%C9 z%C`f+(beA3i4YXZ=k$xBK=8%24oD7w9mKThL^cbVYBSVpjm4AE`~qDCcmQy3jYhO^ zZhP^7u(Q&I9-cO4s4pI$8qsbm&X)lBp7Q8~Hk-gQuBhHfdD)~k5jk + + + diff --git a/src/assets/css/fonts/meta.ttf b/src/assets/css/fonts/meta.ttf index 3729c56d787d4304f7088c97761dc6821c27b81e..1dbd455c177308de5c19dff6fcc61b754b1273e4 100644 GIT binary patch delta 1032 zcmYLIO>7fK6#iy+vrb9#;|AMdX^B8j)e zK-!Bf6`=^J5@NZ)g&!dyMFN>3RYjtz%Y{Q|6SYWy6h(p)LcR1*q+T4}Iws7{o0;!> zKRa*c%`Zo8ev<VcxB>MZm`tsC|JN5&SIb!{Ld;9t^0+Dce?rt;GF2Zq8V%s}u>5VbWKRPkuLc{D1FtK==%3-I-3AqZ_85eowk( zl6X3u%9(=73FN$yh}QH}cDCl2aFuX@@X5(c(tP&jWgWmf4wF;ntc7!UNc!!BU-kzIgq&mYL%=1PtLa+{G-!XpHM5vK#zm^4&=9jPau@ih7PH&< zg8er?B)X^Fe|@z1UQDjv|y>1 zJB&#)Z(?gq2^UNQ7l?T z0;*b6)g@Ie8LU_^h7-fojY5K2Aur2@K@<_j%Q^~?BTS~$WVxI~J?hv$>@|GYN@o#Q zx)j$tX%}6*=<{~9#X~N|$Nk_*+l delta 559 zcmX|7K}b|l6g}_#=P){`i^4??j)*wU=#-g=3l#*LanYzySx_;&^gFZoUkBz3D(XZc z?lgT73W5Z!S`304Yf%)Do0cslXwjyXo7Q^1^XYxwd*__{?|Jv$cTY|pl_3Ds;{_~C zrqd6y3(r@&fvy9p(ah-GG;#=$uaLJ++`rX3arX2xARd!XO}o07{S|u!$SAd=ye<_l zF6e|VkMVHcS(?4pv=awZAJDc}u=Pyc=nX&jjJv;3u*+KYNX6vq6xs`}w-^~$hrSuP zjjoIzc3=GaSqktUaF5x31+syXt1P)_9%U}|f2 diff --git a/src/assets/css/fonts/meta.woff b/src/assets/css/fonts/meta.woff index 9a1e75ca504fa5a72acc22d0ac89d14b3e205bfa..965f7d7d163f0e80cd4bd1b49c4913ca997c3dbe 100644 GIT binary patch delta 7579 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 { + changeListen = (listenOnKeys) => { this.setState(Object.assign({}, this.state, { - listenOnKeys: true - })) - } - - changeListenOnFalse = () => { - this.setState(Object.assign({}, this.state, { - listenOnKeys: false + listenOnKeys: !!listenOnKeys })) } @@ -417,6 +411,7 @@ class Table extends Component { const key = keys[i]; const index = keyProperty ? keyProperty : "rowId"; const included = item[key].includedDocuments; + ret.push( -1} onDoubleClick={() => onDoubleClick && onDoubleClick(item[key][index])} - onMouseDown={(e) => this.handleClick(e, item[key][index])} + handleClick={(e) => this.handleClick(e, item[key][index])} onContextMenu={(e) => this.handleRightClick(e, item[key][index])} - changeListenOnTrue={() => this.changeListenOnTrue()} - changeListenOnFalse={() => this.changeListenOnFalse()} + changeListenOnTrue={() => this.changeListen(true)} + changeListenOnFalse={() => this.changeListen(false)} newRow={i === keys.length-1 ? newRow : false} /> ); diff --git a/src/components/table/TableHeader.js b/src/components/table/TableHeader.js index 9e07710bb..d28eeefd4 100644 --- a/src/components/table/TableHeader.js +++ b/src/components/table/TableHeader.js @@ -55,6 +55,9 @@ class TableHeader extends Component { const {cols, mainTable} = this.props; return ( + {this.renderCols(cols, mainTable)} ) diff --git a/src/components/table/TableItem.js b/src/components/table/TableItem.js index fcd219126..eea44c694 100644 --- a/src/components/table/TableItem.js +++ b/src/components/table/TableItem.js @@ -127,9 +127,10 @@ class TableItem extends Component { const { isSelected, fields, selectedProducts, onContextMenu, rowId, cols, onMouseDown, onDoubleClick, included, tabid, type, docId, - tabIndex, mainTable, entity, readonly + tabIndex, mainTable, entity, readonly, indent } = this.props; + const huType = findRowByPropName(fields, "HU_UnitType").value; return ( + + {huType == "LU" && } + {huType == "TU" && } + {huType == "V" && } + {this.renderCells(cols, fields)} ); } } -// {included && included.map((item, index) => -// -// )} - TableItem.propTypes = { dispatch: PropTypes.func.isRequired }; diff --git a/src/components/table/TableItemWrapper.js b/src/components/table/TableItemWrapper.js index 8d19ae36a..482748a05 100644 --- a/src/components/table/TableItemWrapper.js +++ b/src/components/table/TableItemWrapper.js @@ -1,10 +1,44 @@ import React, { Component, PropTypes } from 'react'; import TableItem from './TableItem'; +import update from 'react-addons-update'; + +import {flattenLastElem} from '../../actions/MenuActions'; class TableItemWrapper extends Component { constructor(props){ super(props); + + this.state = { + rows: [] + } + } + + componentDidMount(){ + const {item} = this.props; + this.setState(Object.assign({}, this.state, { + rows: this.mapIncluded(item) + })) + } + + mapIncluded = (node, indent) => { + let ind = indent ? indent : 0; + let result = []; + + const nodeCopy = Object.assign({}, node, { + indent: ind + }); + + result = result.concat([nodeCopy]); + + if(node.includedDocuments){ + node.includedDocuments.map(item => { + result = result.concat(this.mapIncluded(item, ind + 1)) + }) + } + + return result; } + render() { const { included, item, entity, tabid, cols, type, docId, isSelected, onDoubleClick, @@ -12,27 +46,33 @@ class TableItemWrapper extends Component { newRow, tabIndex, readonly, mainTable } = this.props; + const {rows} = this.state; + return ( - onDoubleClick && onDoubleClick()} - onMouseDown={(e) => handleClick && handleClick(e)} - onContextMenu={(e) => handleRightClick && handleRightClick(e)} - changeListenOnTrue={() => changeListenOnTrue && changeListenOnTrue()} - changeListenOnFalse={() => changeListenOnFalse && changeListenOnFalse()} - newRow={newRow} - /> + {rows.map((item, index) => + onDoubleClick && onDoubleClick()} + onMouseDown={(e) => handleClick && handleClick(e)} + onContextMenu={(e) => handleRightClick && handleRightClick(e)} + changeListenOnTrue={() => changeListenOnTrue && changeListenOnTrue()} + changeListenOnFalse={() => changeListenOnFalse && changeListenOnFalse()} + newRow={newRow} + isSelected={isSelected} + key={index} + indent={item.indent} + /> + )} ); }