From b5f0180cd668d6290d7d5bcdac0cc249f0e4ddae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim.daubenschuetz@gmail.com>
Date: Tue, 26 May 2015 14:05:34 +0200
Subject: [PATCH] Orderable Resource not a requirement for table anymore

---
 .DS_Store                                        | Bin 0 -> 6148 bytes
 js/.DS_Store                                     | Bin 0 -> 6148 bytes
 js/components/.DS_Store                          | Bin 0 -> 6148 bytes
 js/components/ascribe_table/.DS_Store            | Bin 0 -> 6148 bytes
 js/components/ascribe_table/table_header.js      |   6 +++---
 js/components/ascribe_table/table_header_item.js |  10 +++++-----
 .../ascribe_table/table_item_subtable.js         |  15 ++-------------
 7 files changed, 10 insertions(+), 21 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 js/.DS_Store
 create mode 100644 js/components/.DS_Store
 create mode 100644 js/components/ascribe_table/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..36dd3e247a289deecc66728285e3a7ea7d7717b6
GIT binary patch
literal 6148
zcmeHK%}T>S5Z<j-Q@un~5WMVF=)w9+Z?V>+P^h$sN=-<hD<vsSYLQaN*~jqzJw)HZ
zNAMB6IkUSKrF!uoQf9*JH#@tNFyF#XhB3xVUBAGX%^0&l5i>a$z7bqU9g&Rja6nL-
zd9BC;`^{^&<j8Jv{6_}x>@w_(#a=INe?GrBSzUeMnThP=)U=hGnZ?JRn>ndAqh2*}
zlWtscJ4b3J{lGJJ#Z8(Y_CXZ2hPLa~WYBBa3%gO6xH1enpF)r8GW4TfDe8uPd|cJ<
zt4lv=HtfYpCpd@DiW>$s8B0&LWO8BU@M+jf{r<*wAukH+YlFP#7q^Oev0W$*2KK9E
zEw60u>>suVmsi&}w|Dmsk5BppI3|rUuVFYo4=pl?0b+m{7;6U1HE7L_b(WMIF+dFb
zh5@`E1Sq0oFx9B84j5Dm0GI{060otCz!+iBF_>zE6%ejN0d*)hEe6-&;1_0}V=&dI
z!x=Zt2RC2lrbFTC>+pV|wlnT%q>&gP2EH;dp{F+1|Gl64|F1zbBL;|pv0{K{%hhrT
zQZlu5Bsr|L0`wFV1^1;Ihaq67QVe^s6fc1)0lz>4&@q^51P=)P2q+q8AO`-Ffp_vr
BUR(eG

literal 0
HcmV?d00001

diff --git a/js/.DS_Store b/js/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8f65424352bd69f2c70480fcd4428c0396c70faa
GIT binary patch
literal 6148
zcmeHK%}N6?5Kd~<ZN03hAb81D=)w9+Z)>ebp-@porS7^54b<Jz-CCp+_UvQ${~n_6
z;3N15-keEdQK~l)DKla6O(vNv`2v|8#uzVm{32sEW6T0Y%;cc^MsOZ=NHWI50YPDp
zh=nWwO;|j%njHU;0ld3BJB6D&W3A8k=XK+j*Ni-vfAd;R87E6iFFZ4r9iN!Aa``E2
z_H_QZ)`+^b#7#PJ*=--Hk@N%4*i|=aeAv5D)EwBZw<m*c-Jacw!o-zf(Eb#9v@b(H
z>XxHU=*LGjz2Cm{lSbX1tG0u42(7wduqR{b$)-#$tQ@wwJ>ToCZWIfmxU$?Yh+b*E
zR1h1*QonD%TGqni+UCwdtABZQeRF$v|M2*vZ-gTWC^H%c{qw*ggBTzNh=Gw}z&v}_
z)JUC*4nqtO1HZulz7GNv(J`26R8I$VsssScf?EmLSW94xFz6UeHNp%C*P(zql$#QR
z>u~T3v(7P?YSiJ3o8p6;FLP6&aP@WAU#R7bI~u7c28e;L42<cajro83=lcI^5RHfd
zVql~g;Mq#8Qida$+&XkP%(Vja1QZ3=r5XnzV5n3KYcUnigDL^PKm*V*m}&$M2>l2s
L8mJ=%{*-}tJttr#

literal 0
HcmV?d00001

diff --git a/js/components/.DS_Store b/js/components/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a817a720381c8c59c4e07b04f0dfaa5d3526c674
GIT binary patch
literal 6148
zcmeHK&1%~~5T141MouWGq=i5)dky#y_b>RSy6!PxaIpzVaJ7}d3qmrM921N|=R8J}
z{=7$M-=UAtN9e6HyBibZ<W@>CGh*hO9nGxRZ(&yh0HQUC8UQ{3c&LPx8k#$V-jl9K
z#YF@nD$b!nK@0;ZAY94j!2ieq?cF2XtsFkWcxnF>BoM1<K2k}hFzdG(B|0zm_kW7Y
zM)kqNO|Q1KO^^S0>$E$}rrjbeCV49yADfYmV&(i!SPXCc_gR)K{806DJRSH?-ezeL
z>NFnTDn04zG|Hx}Y?4O#N!QNT*HJMX_)k0I_zX)sVH)>zu9Z%7aqiXV8Th-i*~^1Q
zT{d1kpV#HA`MOz`2aV=@?*H<<XM3;S93GA47oRS#K7aZ8?fSdj7eQ2z>{wXX9}ABi
zW`G%B2G)cDci?&3YqB0*1~b46{5=Nfe2}Pwfy2_GIXcjo767q|VI$~MFF`fZVc@W|
zh;LAYEk(4Y!nGK}mSbGHyue{;(Uya7&4+Mb7Oq1P=Ic1WH0dA$i)@(zW?-3t4LkJd
z{(pCW|G!+sBW8dZSStoZwcTyEa7pfNU0EF6wG#CMDhcJ478fPxn5!6b=_=kuHG*+T
X4r1W2w1^QD{t+-Vuwe%NDFc51NIqci

literal 0
HcmV?d00001

diff --git a/js/components/ascribe_table/.DS_Store b/js/components/ascribe_table/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/js/components/ascribe_table/table_header.js b/js/components/ascribe_table/table_header.js
index 564f7725..a4e68879 100644
--- a/js/components/ascribe_table/table_header.js
+++ b/js/components/ascribe_table/table_header.js
@@ -12,9 +12,9 @@ let TableHeader = React.createClass({
     propTypes: {
         columnList: React.PropTypes.arrayOf(React.PropTypes.instanceOf(TableColumnContentModel)),
         itemList: React.PropTypes.array.isRequired,
-        changeOrder: React.PropTypes.func.isRequired,
-        orderAsc: React.PropTypes.bool.isRequired,
-        orderBy: React.PropTypes.string.isRequired
+        changeOrder: React.PropTypes.func,
+        orderAsc: React.PropTypes.bool,
+        orderBy: React.PropTypes.string
     },
 
     render() {
diff --git a/js/components/ascribe_table/table_header_item.js b/js/components/ascribe_table/table_header_item.js
index fef82f34..dce2261e 100644
--- a/js/components/ascribe_table/table_header_item.js
+++ b/js/components/ascribe_table/table_header_item.js
@@ -8,10 +8,10 @@ let TableHeaderItem = React.createClass({
         columnClasses: React.PropTypes.string.isRequired,
         displayName: React.PropTypes.string.isRequired,
         columnName: React.PropTypes.string.isRequired,
-        canBeOrdered: React.PropTypes.bool.isRequired,
-        changeOrder: React.PropTypes.func.isRequired,
-        orderAsc: React.PropTypes.bool.isRequired,
-        orderBy: React.PropTypes.string.isRequired
+        canBeOrdered: React.PropTypes.bool,
+        changeOrder: React.PropTypes.func,
+        orderAsc: React.PropTypes.bool,
+        orderBy: React.PropTypes.string
     },
 
     changeOrder() {
@@ -19,7 +19,7 @@ let TableHeaderItem = React.createClass({
     },
 
     render() {
-        if(this.props.canBeOrdered) {
+        if(this.props.canBeOrdered && this.props.changeOrder && this.props.orderAsc != null && this.props.orderBy) {
             if(this.props.columnName === this.props.orderBy) {
                 return (
                     <div 
diff --git a/js/components/ascribe_table/table_item_subtable.js b/js/components/ascribe_table/table_item_subtable.js
index 0b0fd2ac..70f8fbee 100644
--- a/js/components/ascribe_table/table_item_subtable.js
+++ b/js/components/ascribe_table/table_item_subtable.js
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import TableColumnContentModel from '../../models/table_column_content_model';
+import TableColumnMixin from '../../mixins/table_column_mixin';
 
 import EditionListStore from '../../stores/edition_list_store';
 import EditionListActions from '../../actions/edition_list_actions';
@@ -15,6 +16,7 @@ import TableItemSubtableButton from './table_item_subtable_button';
 
 
 let TableItemSubtable = React.createClass({
+    mixins: [TableColumnMixin],
     propTypes: {
         columnList: React.PropTypes.arrayOf(React.PropTypes.instanceOf(TableColumnContentModel)),
         columnContent: React.PropTypes.object
@@ -48,19 +50,6 @@ let TableItemSubtable = React.createClass({
         }
     },
 
-    calcColumnClasses(list, i) {
-        let bootstrapClasses = ['col-xs-', 'col-sm-', 'col-md-', 'col-lg-'];
-        
-        let listOfRowValues = list.map((column) => column.rowWidth );
-        let numOfColumns = GeneralUtils.sumNumList(listOfRowValues);
-
-        if(numOfColumns > 10) {
-            throw new Error('Bootstrap has only 12 columns to assign. You defined ' + numOfColumns + '. Change this in the columnMap you\'re passing to the table.')
-        } else {
-            return bootstrapClasses.join( listOfRowValues[i] + ' ') + listOfRowValues[i];
-        }
-    },
-
     render() {
 
         let calcColumnElementContent = () => {