diff --git a/frontend/app/map/toolbox/toolbox.html b/frontend/app/map/toolbox/toolbox.html index 9ac45b83..175b9be5 100644 --- a/frontend/app/map/toolbox/toolbox.html +++ b/frontend/app/map/toolbox/toolbox.html @@ -39,11 +39,14 @@
diff --git a/frontend/app/map/toolbox/toolbox.js b/frontend/app/map/toolbox/toolbox.js index 31bac185..a86836c1 100644 --- a/frontend/app/map/toolbox/toolbox.js +++ b/frontend/app/map/toolbox/toolbox.js @@ -1,7 +1,7 @@ import fm from '../../app'; import $ from 'jquery'; -fm.app.factory("fmMapToolbox", function($compile, fmTable, fmFilter) { +fm.app.factory("fmMapToolbox", function($compile, fmFilter) { return function(map) { var scope = map.socket.$new(); @@ -32,10 +32,6 @@ fm.app.factory("fmMapToolbox", function($compile, fmTable, fmFilter) { scope.editObjectTypes = map.typesUi.editTypes.bind(map.typesUi); - scope.showTable = function() { - fmTable.showTable(map.socket.padId); - }; - scope.importFile = function() { map.importUi.openImportDialog(); }; diff --git a/frontend/app/table/table.css b/frontend/app/table/table.css deleted file mode 100644 index 31840261..00000000 --- a/frontend/app/table/table.css +++ /dev/null @@ -1,7 +0,0 @@ -table th.sort-none,table th.sort-up { - cursor: s-resize; -} - -table th.sort-down { - cursor: n-resize; -} \ No newline at end of file diff --git a/frontend/app/table/table.html b/frontend/app/table/table.html deleted file mode 100644 index 1b1539df..00000000 --- a/frontend/app/table/table.html +++ /dev/null @@ -1,44 +0,0 @@ -Name | -Position | -{{field.name}} | -
---|---|---|
{{marker.name}} | -{{marker.lat}},{{marker.lon}} | -- |
Name | -Distance | -Time | -{{field.name}} | -
---|---|---|---|
{{line.name}} | -{{line.distance | fmRound:2}} km | -{{line.time | fmFormatTime}} h {{line.mode | fmRoutingMode}} | -- |
Name | +<% + if(type.type == "marker") { +%> +Position | +<% + } else { +%> +Distance | +Time | +<% + } + + for(let field of type.fields) { +%> +<%=field.name%> | +<% + } +%> +
---|---|---|---|---|
<%=object.name%> | +<% + if(type.type == "marker") { +%> +<%=object.lat%>,<%=object.lon%> | +<% + } else { +%> +<%=format.round(object.distance, 2)%> km | +<% if(object.time != null) { %><%=format.formatTime(object.time)%> h <%=format.routingMode(object.mode)%><% } %> | +<% + } + + for(let field of type.fields) { +%> +<%-format.formatField(field, object.data[field.name])%> | +<% + } +%> +