-
Pagination
-
+
+
+
+
+ Pagination
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/components/request/fact-request-builder.ts b/src/app/components/request/fact-request-builder.ts
index 1e38abd..366b0f2 100644
--- a/src/app/components/request/fact-request-builder.ts
+++ b/src/app/components/request/fact-request-builder.ts
@@ -32,6 +32,11 @@ import {FactRequest} from '../../models/fact/factRequest';
encapsulation: ViewEncapsulation.None,
templateUrl: './fact-request-builder.html',
styles: [`
+
+ form{
+ margin: 30px 0 0;
+ }
+
ul.alt-list{padding:0; margin:10px 0}
ul.alt-list li {
list-style-type: none;
diff --git a/src/app/components/tree/tree-builder.html b/src/app/components/tree/tree-builder.html
deleted file mode 100644
index a914dcc..0000000
--- a/src/app/components/tree/tree-builder.html
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
-
-
- Aggregate Request
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Functions
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Flat number or JSON object
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{activeNode?.label}}
-
-
-
Definition
-
- Values
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/components/tree/tree-builder.ts b/src/app/components/tree/tree-builder.ts
deleted file mode 100644
index c21ea0d..0000000
--- a/src/app/components/tree/tree-builder.ts
+++ /dev/null
@@ -1,592 +0,0 @@
-import {Cube} from "../../models/cube";
-import {Observable} from "rxjs/Rx";
-
-import {
- ChangeDetectionStrategy, ViewEncapsulation,
- Component, Input, Attribute as MetadataAttribute, ElementRef,
- AfterViewInit, ViewChild
-} from '@angular/core';
-import {Inject, NgZone, ChangeDetectorRef} from '@angular/core';
-
-
-import {ExpressionTree} from "../../models/expressionTree";
-import {State, getTree} from "../../reducers/index";
-import {Store} from "@ngrx/store";
-import {ExpressionNode} from "../../models/expressionNode";
-import {AggregateNode} from "../../models/aggregate/aggregateNode";
-import {ApiCubesService} from "../../services/api-cubes";
-import {TreeExecution} from "../../services/tree-execution";
-import {FuncNode, FuncType} from '../../models/func/funcNode'
-import * as _ from 'lodash';
-
-import * as d3 from 'd3';
-import {ValueNode} from "../../models/value/valueNode";
-import {Value} from "../../models/value/val";
-import * as $ from 'jquery';
-import {ReplaceAction} from "../../actions/tree";
-import {AggregateRequest} from "../../models/aggregate/aggregateRequest";
-import {HierarchyPointNode} from "d3-hierarchy";
-/*
- * We're loading this component asynchronously
- * We are using some magic with es6-promise-loader that will wrap the module with a Promise
- * see https://github.com/gdi2290/es6-promise-loader for more info
- */
-
-console.log('`Tree Builder` component loaded asynchronously');
-
-@Component({
- selector: 'bc-tree-builder',
- changeDetection: ChangeDetectionStrategy.OnPush, // ⇐⇐⇐
- encapsulation: ViewEncapsulation.None,
- templateUrl: './tree-builder.html',
- styles: [`
- .node {
- cursor: pointer;
- }
-
- .overlay{
- background-color:#EEE;
- }
-
- .nodeSymbol{
- fill:white;
- font-weight:bold;
-
- }
-
- .node circle {
- fill: #fff;
- stroke: steelblue;
- stroke-width: 2px;
- }
-
- .node text {
- font-size:10px;
- font-family:sans-serif;
- }
-
- .link {
- fill: none;
- stroke: #ccc;
- stroke-width: 2px;
- }
-
- .templink {
- fill: none;
- stroke: indigo;
- stroke-width: 3px;
- }
-
- .ghostCircle.show{
- display:block;
- }
-
- .ghostCircle, .activeDrag .ghostCircle{
- display: none;
- }
-
- .expanded-indicator{
- cursor: pointer;
- }
-
- #drawingCanvas svg{
- width:100%;
- height: 600px;
- }
-
- a.action-anchor{
- cursor:pointer;
- margin: auto 10px ;
-
- }
-
- .md-tab-label{
- min-width:100%!important;
-
- }
-
- md-toolbar-row [md-mini-fab]{
- margin:2px;
-
- }
-
- .md-tab-body-wrapper{
-
- max-height:700px;
- overflow-y:auto!important;
-
- }
-
- span.node-key {
- cursor: pointer;
- }
-
- md-toolbar.md-primary {
- color: rgba(0, 0, 0, 0.87);
-}
- `]
-})
-export class TreeBuilder implements AfterViewInit {
-
- @Input() expressionTree: Observable
;
- expressionTreeInstance: ExpressionTree;
- length: number;
- @ViewChild('drawingCanvas') drawingCanvas;
- @ViewChild('jsonModal') jsonModal: any;
-
- constructor(@Inject(ElementRef) elementRef: ElementRef,
- @MetadataAttribute('width') width: number,
- @MetadataAttribute('height') height: number,
- private store: Store,
- private rudolfCubesService: ApiCubesService,
- private treeExecution: TreeExecution, private zone: NgZone, private ref: ChangeDetectorRef) {
-
- this.width = width;
- this.height = height;
- this.expressionTree = store.let(getTree);
-
- setInterval(() => {
- // the following is required, otherwise the view will not be updated
- this.ref.markForCheck();
- }, 5000);
- }
-
-
- _cube: Cube;
-
- public get cube() {
- return this._cube;
- }
-
- @Input()
-
- public set cube(value: Cube) {
- let that = this;
- that._cube = value;
- }
-
- width: number;
- height: number;
-
- // size of the diagram
- @Input()
- viewerWidth: number;// $(document).width();
- @Input()
-
- viewerHeight: number;// $(document).height();
- root:any;
-
-
- aggregates = [];
- duration = 750;
-
-
- ngAfterViewInit() {
-
- window.setTimeout(() => {
- /* this.baseSvg = d3.select(this.drawingCanvas.nativeElement).append("svg").attr("width", this.viewerWidth)
- .attr("height", this.viewerHeight)
- .call(this.zoomListener);*/
- let that = this;
- this.expressionTree.subscribe(function (expressionTree_) {
- let expressionTree = new ExpressionTree().deserialize(JSON.parse(JSON.stringify(expressionTree_)));
-
- if (that.tree && that.expressionTreeInstance.root == expressionTree.root) {
- that.expressionTreeInstance = expressionTree;
- // that.update(expressionTree.root);
- }
- else {
- that.expressionTreeInstance = new ExpressionTree().deserialize(JSON.parse(JSON.stringify(expressionTree_)));
-
- //that.baseSvg.html("");
-
- that.init();
-
- }
-
-
- });
- });
-
-
- }
-
- tree: any;
-
- activeNode: any;
-
-
- treemap: any;
-
- g:any;
-
- init() {
-
-
-
- let treeData = this.expressionTreeInstance.root;
- let margin = {top: 20, right: 90, bottom: 30, left: 90},
- width = 1000 - margin.left - margin.right,
- height = 500 - margin.top - margin.bottom;
-
-// append the svg object to the body of the page
-// appends a 'group' element to 'svg'
-// moves the 'group' element to the top left margin
- d3.select(this.drawingCanvas.nativeElement).html("");
- let svg = d3.select(this.drawingCanvas.nativeElement).append("svg")
- .attr("width", width + margin.right + margin.left)
- .attr("height", height + margin.top + margin.bottom);
-
- this.g = svg
-
- .append("g")
- .attr("transform", "translate("
- + margin.left + "," + margin.top + ")");
-
-
-
- svg.append("rect")
- .attr("width", width)
- .attr("height", height)
- .style("fill", "none")
- .style("pointer-events", "all")
- .call(d3.zoom()
- .scaleExtent([1 / 2, 4])
- .on("zoom", zoomed));
-
- let that = this;
-
- function zoomed() {
- let transform = d3.event.transform;
- that.g.attr("transform", function() {
- return transform.translate(margin.left,margin.top).toString();
- });
- }
-
-
-// declares a tree layout and assigns the size
- this.treemap = d3.tree().size([height, width]);
-
-// Assigns parent, children, height, depth
- this.root = d3.hierarchy(treeData, function (d) {
- return d.children;
- });
- this.root.x0 = height / 2;
- this.root.y0 = 0;
-
-// Collapse after the second level
- if (this.root.children)
- this.root.children.forEach(collapse);
-
- this.activeNode = this.root;
-
- this.update(this.root);
-
-// Collapse the node and all it's children
- function collapse(d) {
- if (d.children) {
- d._children = d.children;
- d._children.forEach(collapse);
- d.children = null
- }
- }
-
-
-
-
- }
- update(source) {
-
-
-
- // Assigns the x and y position for the nodes
- let treeData = this.treemap(this.root);
-
- // Compute the new tree layout.
- let nodes = treeData.descendants(),
- links = treeData.descendants().slice(1);
-
- // Normalize for fixed-depth.
- nodes.forEach(function (d) {
- d.y = d.depth * 180
- });
-
- // ****************** Nodes section ***************************
-
- // Update the nodes...
- let node = this.g.selectAll('g.node')
- .data(nodes, function (d: HierarchyPointNode) {
- return d.id ;
- });
-
- // Enter any new modes at the parent's previous position.
- let nodeEnter = node.enter().append('g')
- .attr('class', 'node')
- .attr("transform", function (d) {
- return "translate(" + source.y0 + "," + source.x0 + ")";
- })
- .on('click', click);
-
- // Add Circle for the nodes
- nodeEnter.append('circle')
- .attr('class', 'node')
- .attr('r', 1e-6)
- .style("fill", function (d: HierarchyPointNode) {
- return d.children ? "lightsteelblue" : "#fff";
- });
-
-
- nodeEnter.append("text")
- .attr("x", function (d) {
- return d.children ? -15 : 15;
- })
- .attr("dy", ".35em")
- .attr('class', 'nodeText')
- .attr("text-anchor", function (d:HierarchyPointNode) {
- return d.children ? "end" : "start";
- })
- .text(function (d: HierarchyPointNode) {
- return d.data.label;
- });
-
- // UPDATE
- let nodeUpdate = nodeEnter.merge(node);
-
- // Transition to the proper position for the node
- nodeUpdate.transition()
- .duration(this.duration)
- .attr("transform", function (d) {
- return "translate(" + d.y + "," + d.x + ")";
- });
-
- // Update the node attributes and style
- nodeUpdate.select('circle.node')
- .attr('r', 10)
- .style("fill", function (d) {
- return d._children ? "lightsteelblue" : "#fff";
- })
- .attr('cursor', 'pointer');
-
-
- // Remove any exiting nodes
- let nodeExit = node.exit().transition()
- .duration(this.duration)
- .attr("transform", function (d:HierarchyPointNode) {
- return "translate(" + source.y + "," + source.x + ")";
- })
- .remove();
-
- // On exit reduce the node circles size to 0
- nodeExit.select('circle')
- .attr('r', 1e-6);
-
- // On exit reduce the opacity of text labels
- nodeExit.select('text')
- .style('fill-opacity', 1e-6);
-
- // ****************** links section ***************************
-
- // Update the links...
- let link = this.g.selectAll('path.link')
- .data(links, function (d: HierarchyPointNode) {
- return d.data.id;
- });
-
- // Enter any new links at the parent's previous position.
- let linkEnter = link.enter().insert('path', "g")
- .attr("class", "link")
- .attr('d', function (d) {
- let o = {x: source.x0, y: source.y0};
- return diagonal(o, o)
- });
-
- // UPDATE
- let linkUpdate = linkEnter.merge(link);
-
- // Transition back to the parent element position
- linkUpdate.transition()
- .duration(this.duration)
- .attr('d', function (d) {
- return diagonal(d, d.parent)
- });
-
- // Remove any exiting links
- let linkExit = link.exit().transition()
- .duration(this.duration)
- .attr('d', function (d) {
- let o = {x: source.x, y: source.y};
- return diagonal(o, o)
- })
- .remove();
-
- // Store the old positions for transition.
- nodes.forEach(function (d: HierarchyPointNode) {
- d.data.x0 = d.x;
- d.data.y0 = d.y;
- });
-
- // Creates a curved (diagonal) path from parent to the child nodes
- function diagonal(s, d) {
-
- let path = `M ${s.y} ${s.x}
- C ${(s.y + d.y) / 2} ${s.x},
- ${(s.y + d.y) / 2} ${d.x},
- ${d.y} ${d.x}`;
-
- return path
- }
-
- // Toggle children on click.
- function click(d) {
- if (d.children) {
- d._children = d.children;
- d.children = null;
- } else {
- d.children = d._children;
- d._children = null;
- }
- this.update(d);
- }
- }
- removeNode() {
-
- if (!this.activeNode)return;
- if (!this.activeNode == this.root) return;
-
-
- if (this.activeNode.parent) {
- let parent: ExpressionNode = this.activeNode.parent;
-
- let index = this.activeNode.parent.children.indexOf(this.activeNode);
- if (index > -1) {
- this.activeNode.parent.children.splice(index, 1);
- }
-
- parent.executed = false;
-
-
- this.activeNode = parent;
- }
-
- this.store.dispatch(new ReplaceAction(this.expressionTreeInstance));
-
- }
-
-
- newCustomValue: any;
-
- addValueChild() {
- if (!this.activeNode)return;
-
- let valueNode = new ValueNode;
- let val = new Value();
- val.cells = [{value: this.newCustomValue}];
-
- valueNode.element = val;
-
-
- if (this.activeNode instanceof FuncNode) {
- this.activeNode.children.push(valueNode);
-
- }
- else {
- this.activeNode.parent.children.push(valueNode);
- }
-
- this.activeNode.executed = false;
-
- this.store.dispatch(new ReplaceAction(this.expressionTreeInstance));
-
-
- }
-
- execute() {
-
-
- this.treeExecution.execute(this.expressionTreeInstance, this.activeNode).subscribe(() => {
- this.ref.markForCheck();
-
- });
-
-
- }
-
-
- public funcType = FuncType;
-
- addFuncChild(funcType: FuncType) {
- if (!this.activeNode)return;
- let funcNode = new FuncNode(funcType);
-
- if (this.activeNode instanceof FuncNode) {
- this.activeNode.children.push(funcNode);
-
- }
- else {
- this.activeNode.parent.children.push(funcNode);
- }
-
- this.store.dispatch(new ReplaceAction(this.expressionTreeInstance));
-
-
- }
-
- clearAll() {
- this.root.children = [];
- this.update(this.root);
- this.store.dispatch(new ReplaceAction(this.expressionTreeInstance));
-
- }
-
- @ViewChild('childModal') public childModal: any;
-
- public showChildModal(): void {
- this.editableExpressionTreeInstance = JSON.stringify(this.expressionTreeInstance);
- this.childModal.show();
- }
-
-
- public showSerializationModal(): void {
- this.editableExpressionTreeInstance = JSON.stringify(this.expressionTreeInstance);
- this.jsonModal.show();
- }
-
-
- public saveSerializationModal(): void {
-
- this.jsonModal.hide();
- let tree = new ExpressionTree().deserialize(JSON.parse(this.editableExpressionTreeInstance));
-
- this.store.dispatch(new ReplaceAction(tree));
-
- }
-
-
- public buildAggregateRequestNode(): void {
-
- if (!this.activeNode)return;
- this.newAggregateRequest.cube = this.cube;
- let aggregateNode = new AggregateNode();
- aggregateNode.element = this.newAggregateRequest;
-
- if (this.activeNode.data instanceof FuncNode) {
- this.activeNode.data.children.push(aggregateNode);
-
- }
- else {
- this.activeNode.data.parent.children.push(aggregateNode);
- }
-
- this.activeNode.data.executed = false;
-
- this.store.dispatch(new ReplaceAction(this.expressionTreeInstance));
-
- this.newAggregateRequest = new AggregateRequest;
- }
-
- editableExpressionTreeInstance: string;
-
-
- newAggregateRequest = new AggregateRequest;
-
-}
diff --git a/src/app/components/tree/visualization.html b/src/app/components/tree/visualization.html
deleted file mode 100644
index 49059a6..0000000
--- a/src/app/components/tree/visualization.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/app/components/tree/visualization.ts b/src/app/components/tree/visualization.ts
deleted file mode 100644
index 422184c..0000000
--- a/src/app/components/tree/visualization.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Created by larjo on 29/7/2016.
- */
-import {Observable} from "rxjs/Rx";
-
-
-import {
- ChangeDetectionStrategy, ViewEncapsulation,
- Component, Input, ElementRef,
- AfterViewInit, ViewChild
-} from '@angular/core';
-import {Inject, NgZone, ChangeDetectorRef} from '@angular/core';
-import * as d3 from 'd3';
-import {ExpressionTree} from "../../models/expressionTree";
-import {Store} from "@ngrx/store";
-import {ExpressionNode} from "../../models/expressionNode";
-
-import {getTree, TreesState} from "../../reducers/tree/trees";
-import * as $ from 'jquery'
-/*
- * We're loading this component asynchronously
- * We are using some magic with es6-promise-loader that will wrap the module with a Promise
- * see https://github.com/gdi2290/es6-promise-loader for more info
- */
-
-console.log('`Tree Builder` component loaded asynchronously');
-
-@Component({
- moduleId: 'visualization',
- selector: 'visualization',
- changeDetection: ChangeDetectionStrategy.OnPush, // ⇐⇐⇐
- encapsulation: ViewEncapsulation.None,
- templateUrl: './visualization.html',
-
-})
-export class TreeVisualization implements AfterViewInit {
- ngAfterViewInit(): any {
-
- let that = this;
- that.width = $(that.vizCanvas.nativeElement).width() - that.margin.left - that.margin.right;
- that.height = 400 - that.margin.top - that.margin.bottom;
-
-
- this.expressionTree.subscribe(function (expressionTree) {
-
-
-
- that.expressionTreeInstance = expressionTree;
-
-
- that.init(expressionTree.root);
-
- });
-
-
-
- }
-
- protected baseSvg;
-
- @ViewChild('vizCanvas') vizCanvas;
-
- constructor(@Inject(ElementRef) elementRef:ElementRef,
- private store:Store,
- private ref: ChangeDetectorRef) {
-
-
- this.vizCanvas = elementRef;
- this.expressionTree = store.let(getTree);
-
- setInterval(() => {
-
- // the following is required, otherwise the view will not be updated
- this.ref.markForCheck();
- }, 1000);
- }
-
-
- width;
- height;
-
- margin = {top: 20, right: 20, bottom: 70, left: 40};
-
-
- public init(root: ExpressionNode){
-
- }
-
-
- @Input() expressionTree: Observable;
- expressionTreeInstance: ExpressionTree;
- _root: ExpressionNode;
-
- public get root(){
- return this._root;
- }
- @Input()
- public set root(value){
- this._root = value;
- if(value)this.init(value);
- }
-}
diff --git a/src/app/components/tree/visualizations/barchart.ts b/src/app/components/tree/visualizations/barchart.ts
deleted file mode 100644
index 5b32c69..0000000
--- a/src/app/components/tree/visualizations/barchart.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import {Observable} from "rxjs/Rx";
-import * as _ from 'lodash';
-import {
- ChangeDetectionStrategy, ViewEncapsulation,
- Component, Input, ElementRef, ViewChild
-} from '@angular/core';
-import {Inject, ChangeDetectorRef} from '@angular/core';
-import * as d3 from 'd3';
-import {ExpressionTree} from "../../../models/expressionTree";
-import {Store} from "@ngrx/store";
-import {ExpressionNode} from "../../../models/expressionNode";
-import {TreeVisualization} from "../visualization";
-import {TreesState} from "../../../reducers/tree/trees";
-declare let $: JQueryStatic;
-
-/**
- * Created by larjo on 25/8/2016.
- */
-
-@Component({
- moduleId: 'visualizaation',
- selector: 'barchart',
- changeDetection: ChangeDetectionStrategy.OnPush, // ⇐⇐⇐
- encapsulation: ViewEncapsulation.None,
- templateUrl: '../visualization.html',
- styles: [`
-
-
- .bar:hover {
- stroke: indigo;
- }
-
- .axis {
- font: 10px sans-serif;
- }
-
- .axis path,
- .axis line {
- fill: none;
- stroke: #000;
- shape-rendering: crispEdges;
- }
-
- .x.axis path {
- display: none;
- }
-
- `]
-})
-export class BarChartVisualization extends TreeVisualization {
- xAxis;
- yAxis;
-
-
- @ViewChild('vizCanvas') vizCanvas;
-
- private generateBarChart(data: any, tuple) {
- let colors = d3.scaleOrdinal(d3.schemeCategory20);
- let that = this;
- let baseSvg = d3.select(that.vizCanvas.nativeElement).append("svg")
- .attr("width", that.width + that.margin.left + that.margin.right)
- .attr("height", that.height + that.margin.top + that.margin.bottom)
- .append("g")
- .attr("transform", "translate(" + that.margin.left + "," + that.margin.top + ")");
- that.x = d3.scaleBand()
- .rangeRound([0, that.width])
- .padding(.1);
-
- that.y = d3.scaleLinear()
- .range([that.height, 0]);
-
- that.xAxis = d3.axisBottom(that.x);
-
-
- that.yAxis = d3.axisLeft(that.y)
-
- .ticks(20, ".0s");
-
- that.x.domain(data.attributes);
-
-
- that.x.domain(data.cells.map(function (d:any) {
- return d[data.attributes[0]]
- }));
- that.y.domain([0, d3.max(data.cells, function (d) {
- return d[data.aggregates[0]];
-
- })]);
- baseSvg.html("");
- baseSvg.append("g")
- .attr("class", "x axis")
- .attr("transform", "translate(0," + that.height + ")")
- .call(that.xAxis)
- .selectAll("text")
- .attr("y", 0)
- .attr("x", 9)
- .attr("dy", ".35em")
- .attr("transform", "rotate(90)")
- .style("text-anchor", "start");
-
- baseSvg.append("g")
- .attr("class", "y axis")
- .call(that.yAxis)
- .append("text")
- .attr("transform", "rotate(-90)")
- .attr("y", 6)
- .attr("dy", ".31em")
- .style("text-anchor", "end")
- .text(data.aggregates[0]);
-
- baseSvg.selectAll(".bar")
- .data(data.cells)
- .enter().append("rect")
- .attr("class", "bar")
- .attr("fill", function (d, i) {
- return colors(i.toString())
- })
- .attr("x", function (d:ExpressionNode) {
- return that.x(d[data.attributes[0]]);
- })
- .attr("width", that.x.rangeBand())
- .attr("y", function (d:ExpressionNode) {
- return that.y(d[data.aggregates[0]]);
- })
- .attr("height", function (d:ExpressionNode) {
- return that.height - that.y(d[data.aggregates[0]]);
- });
-
-
- if (tuple) {
- baseSvg.append("text")
- .attr("x", (that.width / 2))
- .attr("y", 0 - (that.margin.top / 2))
- .attr("text-anchor", "middle")
- .style("font-size", "16px")
- .style("text-decoration", "underline")
- .text(JSON.stringify(tuple));
- }
-
-
- }
-
- init(root: ExpressionNode) {
-
-
- let that = this;
- let data = root.value;
- if (!data) return;
- d3.select(that.vizCanvas.nativeElement).html("");
-
-
- let dimensions = _.difference(_.uniq(_.flatten(_.map(data.cells, function (cell) {
- return _.keys(cell);
- }))), data.aggregates);
-
- if (dimensions.length > 1) {
- let restDimensions = _.slice(dimensions, 1);
- let tuples = _.uniqWith(_.map(data.cells, function (cell) {
- return _.pick(cell, restDimensions)
- }), _.isEqual);
-
- _.each(tuples, function (tuple) {
- let subset = _.clone(data);
- subset.cells = _.map(_.filter(data.cells, function (cell) {
- return _.isEqual(_.pick(cell, restDimensions), tuple)
- }), function (cell) {
- return _.pick(cell, _.union(_.slice(dimensions, 0, 1), data.aggregates))
- });
- that.generateBarChart(subset, tuple);
-
- });
-
- }
- else {
- this.generateBarChart(data, null);
- }
-
-
-
- }
-
- @Input() expressionTree: Observable;
-
- x;
- y;
-
- public get root() {
- return this._root;
- }
-
- @Input()
- public set root(value) {
- this._root = value;
- if (value)this.init(value);
- }
-
-
- constructor(@Inject(ElementRef) elementRef: ElementRef,
- store: Store,
- ref: ChangeDetectorRef) {
-
- super(elementRef, store, ref);
-
- }
-
-
-}
diff --git a/src/app/components/user-guide.ts b/src/app/components/user-guide.ts
index f528e73..097800e 100644
--- a/src/app/components/user-guide.ts
+++ b/src/app/components/user-guide.ts
@@ -15,7 +15,7 @@ import {ChangeDetectionStrategy, Component} from '@angular/core';
-
+
diff --git a/src/app/containers/app.ts b/src/app/containers/app.ts
index dc01706..e7c5da7 100644
--- a/src/app/containers/app.ts
+++ b/src/app/containers/app.ts
@@ -1,5 +1,5 @@
import 'rxjs/add/operator/let';
-import {Component, ChangeDetectionStrategy} from '@angular/core';
+import {Component, ChangeDetectionStrategy, NgModule} from '@angular/core';
import {
Router,
@@ -10,7 +10,6 @@ import {
NavigationError
} from '@angular/router';
import {Http} from '@angular/http';
-import {HttpInterceptorService} from "ng-http-interceptor";
@@ -28,6 +27,7 @@ import {HttpInterceptorService} from "ng-http-interceptor";
`
})
+
export class AppComponent {
diff --git a/src/app/containers/collection-page.ts b/src/app/containers/collection-page.ts
index dfcad2e..35f3564 100644
--- a/src/app/containers/collection-page.ts
+++ b/src/app/containers/collection-page.ts
@@ -20,7 +20,7 @@ import { Book } from '../models/book';
/**
* Container components are permitted to have just enough styles
* to bring the view together. If the number of styles grow,
- * consider breaking them out into presentational
+ * consider breaking them out into presentational
* components.
*/
styles: [`
diff --git a/src/app/containers/cube/collection-page.ts b/src/app/containers/cube/collection-page.ts
index 75dacd8..a17b329 100644
--- a/src/app/containers/cube/collection-page.ts
+++ b/src/app/containers/cube/collection-page.ts
@@ -15,7 +15,7 @@ import { Cube } from '../../models/cube';
My Collection
-
+
`,
/**
* Container components are permitted to have just enough styles
@@ -32,8 +32,16 @@ import { Cube } from '../../models/cube';
})
export class CollectionCubePageComponent {
cubes$: Observable;
+ currentPage: number = 1;
+
constructor(store: Store) {
this.cubes$ = store.let(fromRoot.getCubeCollection);
}
+
+ scrolled(event) {
+
+
+ }
+
}
diff --git a/src/app/containers/cube/cube-analytics-index-page.ts b/src/app/containers/cube/cube-analytics-index-page.ts
index d4e2847..e4eca46 100644
--- a/src/app/containers/cube/cube-analytics-index-page.ts
+++ b/src/app/containers/cube/cube-analytics-index-page.ts
@@ -10,8 +10,8 @@ import {
AddOutput,
RemoveOutput
} from '../../components/cube/analytics/cube-analytics-detail';
-import {Cube} from "../../models/cube";
-import {ActivatedRoute} from "@angular/router";
+import {Cube} from '../../models/cube';
+import {ActivatedRoute} from '@angular/router';
@Component({
diff --git a/src/app/containers/cube/find-cube-page.ts b/src/app/containers/cube/find-cube-page.ts
index 4baa814..6739826 100644
--- a/src/app/containers/cube/find-cube-page.ts
+++ b/src/app/containers/cube/find-cube-page.ts
@@ -1,42 +1,75 @@
import 'rxjs/add/operator/let';
import 'rxjs/add/operator/take';
-import { Component, ChangeDetectionStrategy } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import {Component, ChangeDetectionStrategy} from '@angular/core';
+import {Store} from '@ngrx/store';
+import {Observable} from 'rxjs/Observable';
import * as fromRoot from '../../reducers';
import * as cube from '../../actions/cube/cube2';
-import { Cube } from '../../models/cube';
+import {Cube} from '../../models/cube';
+import {environment} from "../../../environments/environment";
@Component({
selector: 'bc-find-cube-page',
changeDetection: ChangeDetectionStrategy.OnPush,
template: `
-
-
+
+
`,
- styles:[`
- indigo-cube-preview-list{
- margin-top:20px;
- display: block;
- }
+ styles: [`
+ indigo-cube-preview-list {
+ margin-top: 20px;
+ display: block;
+ }
-`]
+ `]
})
export class FindCubePageComponent {
searchQuery$: Observable;
cubes$: Observable;
loading$: Observable;
+ private query: string;
+ private currentPage = 0;
constructor(private store: Store) {
this.searchQuery$ = store.let(fromRoot.getCubeSearchQuery).take(1);
this.cubes$ = store.let(fromRoot.getCubeSearchResults);
this.loading$ = store.let(fromRoot.getCubeSearchLoading);
+ this.searchQuery$.subscribe(query => this.query = query);
+ this.scrollCallback = this.getCubes.bind(this);
+
+ }
+
+ scrollCallback;
+
+
+ search(query: string, size?: number, from?: number) {
+ if (!from) from = 0;
+ if (!size) size = environment.searchSize;
+ this.store.dispatch(new cube.SearchAction({query: query, from: from, size: size}));
+ }
+
+ scrolled() {
+ this.currentPage++;
+
+ this.store.dispatch(new cube.SearchAction({
+ query: this.query,
+ from: this.currentPage * environment.searchSize,
+ size: environment.searchSize
+ }));
+ return this.cubes$;
+
}
- search(query: string) {
- this.store.dispatch(new cube.SearchAction(query));
+ getCubes() {
+ this.scrolled();
+ return Observable.range(0, 3)
+ .delay(1000);
}
}
diff --git a/src/app/effects/cube.ts b/src/app/effects/cube.ts
index 7bf8d04..53d61d7 100644
--- a/src/app/effects/cube.ts
+++ b/src/app/effects/cube.ts
@@ -4,14 +4,14 @@ import 'rxjs/add/operator/switchMap';
import 'rxjs/add/operator/debounceTime';
import 'rxjs/add/operator/skip';
import 'rxjs/add/operator/takeUntil';
-import { Injectable } from '@angular/core';
-import { Effect, Actions } from '@ngrx/effects';
-import { Action } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
-import { empty } from 'rxjs/observable/empty';
-import { of } from 'rxjs/observable/of';
-
-import { ApiCubesService } from '../services/api-cubes';
+import {Injectable} from '@angular/core';
+import {Effect, Actions} from '@ngrx/effects';
+import {Action} from '@ngrx/store';
+import {Observable} from 'rxjs/Observable';
+import {empty} from 'rxjs/observable/empty';
+import {of} from 'rxjs/observable/of';
+
+import {ApiCubesService} from '../services/api-cubes';
import * as cube from '../actions/cube/cube2';
@@ -31,7 +31,8 @@ import * as cube from '../actions/cube/cube2';
@Injectable()
export class CubeEffects {
- constructor(private actions$: Actions, private rudolfCubes: ApiCubesService) { }
+ constructor(private actions$: Actions, private rudolfCubes: ApiCubesService) {
+ }
@Effect()
@@ -39,21 +40,23 @@ export class CubeEffects {
.ofType(cube.ActionTypes.SEARCH)
.debounceTime(300)
.map(action => action.payload)
- .switchMap(query => {
- /* if (query === '') {
- return empty();
- }*/
+ .switchMap(params => {
+ /* if (query === '') {
+ return empty();
+ }*/
const nextSearch$ = this.actions$.ofType(cube.ActionTypes.SEARCH).skip(1);
-
- return this.rudolfCubes.searchCubes(query)
+ return this.rudolfCubes.searchCubes(params.query, params.size, params.from)
.takeUntil(nextSearch$)
- .map(cubes => {return new cube.SearchCompleteAction(cubes.filter(function (cube) {
- if(query=="")return true;
- return (cube.package.title.toLocaleLowerCase().indexOf(query.toLocaleLowerCase())>-1);
- }));})
+ .map(cubes => {
+
+ return new cube.SearchCompleteAction({cubes: cubes.filter(function (cube) {
+
+ if (params.query === '') return true;
+ return (cube.package.title.toLocaleLowerCase().indexOf(params.query.toLocaleLowerCase()) > -1);
+ }), params: params});
+ })
.catch(() => of(new cube.SearchCompleteAction([])));
});
-
}
diff --git a/src/app/infinite-scroller.directive.ts b/src/app/infinite-scroller.directive.ts
new file mode 100644
index 0000000..a088610
--- /dev/null
+++ b/src/app/infinite-scroller.directive.ts
@@ -0,0 +1,106 @@
+import {Directive, AfterViewInit, ElementRef, Input, OnDestroy} from '@angular/core';
+
+import { Observable, Subscription } from 'rxjs/Rx';
+import 'rxjs/add/observable/fromEvent';
+import 'rxjs/add/operator/pairwise';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/exhaustMap';
+import 'rxjs/add/operator/filter';
+import 'rxjs/add/operator/startWith';
+import * as $ from 'jquery';
+
+interface ScrollPosition {
+ sH: number;
+ sT: number;
+ cH: number;
+};
+
+const DEFAULT_SCROLL_POSITION: ScrollPosition = {
+ sH: 0,
+ sT: 0,
+ cH: 0
+};
+
+@Directive({
+ selector: '[appInfiniteScroller]'
+})
+export class InfiniteScrollerDirective implements AfterViewInit, OnDestroy {
+
+ private scrollEvent$;
+
+ private userScrolledDown$;
+
+ private requestStream$;
+
+ private requestOnScroll$;
+
+ @Input()
+ scrollCallback;
+
+ @Input()
+ immediateCallback;
+
+ @Input()
+ scrollPercent = 70;
+
+ constructor(private elm: ElementRef) { }
+
+ ngAfterViewInit() {
+
+ this.registerScrollEvent();
+
+ this.streamScrollEvents();
+
+ this.requestCallbackOnScroll();
+
+ }
+
+ private registerScrollEvent() {
+
+ this.scrollEvent$ = Observable.fromEvent($('[cdk-scrollable]'), 'scroll');
+ }
+
+ private streamScrollEvents() {
+ this.userScrolledDown$ = Observable.fromEvent($('[cdk-scrollable]'), 'scroll')
+ .map((e: any): ScrollPosition => { return ({
+ sH: e.target.scrollHeight,
+ sT: e.target.scrollTop,
+ cH: e.target.clientHeight
+ });})
+ .pairwise()
+ .filter(positions => this.isUserScrollingDown(positions) && this.isScrollExpectedPercent(positions[1]));
+ }
+
+ private subscription: Subscription ;
+
+ private requestCallbackOnScroll() {
+
+ this.requestOnScroll$ = this.userScrolledDown$;
+
+
+
+ if (this.immediateCallback) {
+ this.requestOnScroll$
+ .startWith([DEFAULT_SCROLL_POSITION, DEFAULT_SCROLL_POSITION]);
+ }
+
+ this.subscription = this.requestOnScroll$
+ .exhaustMap(() => {debugger; return this.scrollCallback(); })
+ .subscribe(() => { });
+
+ }
+
+ public ngOnDestroy(): void {
+ debugger;
+ this.subscription.unsubscribe();
+ }
+
+ private isUserScrollingDown = (positions) => {
+ return positions[0].sT < positions[1].sT;
+ };
+
+ private isScrollExpectedPercent = (position) => {
+ return ((position.sT + position.cH) / position.sH) > (this.scrollPercent / 100);
+ }
+
+}
diff --git a/src/app/lib/json-tree/json-node.ts b/src/app/lib/json-tree/json-node.ts
deleted file mode 100644
index 8ee6139..0000000
--- a/src/app/lib/json-tree/json-node.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Created by larjo on 26/7/2016.
- */
-import { Component, Input, HostBinding } from '@angular/core';
-
-import * as types from './types';
-
-@Component({
- selector: 'ngrx-json-node',
- styles: [`
- :host {
- display: block;
- padding: 2px 2px 2px 20px;
- position: relative;
- color: #70AFCD;
- font-family: 'monaco', 'Consolas', 'Lucida Console', monospace;
- }
- .expanded-indicator {
- position: absolute;
- top: 7px;
- left: 5px;
- font-size: 10px;
- transition: transform 200ms;
- }
-
- .expanded .expanded-indicator {
- transform: rotate(90deg);
- }
-
- .node-key::after {
- content: ': ';
- display: inline;
- }
-
- .expanded .node-label {
- color: #BABBBD !important;
- }
-
- .node-label {
- color: #9AC05C;
- }
-
- .node-label.array, .node-label.null, .node-label.iterable {
- color: #D182C0;
- }
-
- .node-label.number, .node-label.undefined, .node-label.boolean {
- color: #F86936;
- }
- `],
- template: `
-
- ▶
- {{ key }}
- {{ label }}
-
-
-
-
- `
-})
-export class JsonNodeComponent {
- label: string;
- type: string;
- children: any[];
-
- @Input() key: string;
- @Input() expanded: boolean = false;
- @Input() set value(value: any) {
- this.label = types.getLabelFor(value);
- this.type = types.getTypeOf(value);
-
- if (this.type === types.KNOWN.Array || this.type === types.KNOWN.Object || this.type === types.KNOWN.Iterable) {
- this.children = types.getChildrenFor(value);
- }
- else {
- this.children = null;
- }
- }
-
- toggle() {
- if (this.children) {
- this.expanded = !this.expanded;
- }
- }
-}
diff --git a/src/app/lib/json-tree/json-tree.ts b/src/app/lib/json-tree/json-tree.ts
deleted file mode 100644
index 3375510..0000000
--- a/src/app/lib/json-tree/json-tree.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Created by larjo on 26/7/2016.
- */
-import { Component, Input } from '@angular/core';
-
-import { getChildrenFor } from './types';
-import { JsonNodeComponent } from './json-node';
-
-@Component({
- selector: 'ngrx-json-tree',
- template: `
-
- `
-})
-export class JsonTreeComponent {
- children: any[] = [];
-
- @Input() expanded: boolean = true;
- @Input() set value (value: any) {
- if(value==undefined)return;
- this.children = getChildrenFor(value);
- }
-}
diff --git a/src/app/lib/json-tree/types.ts b/src/app/lib/json-tree/types.ts
deleted file mode 100644
index 5d32eda..0000000
--- a/src/app/lib/json-tree/types.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Created by larjo on 26/7/2016.
- */
-import { compose } from '@ngrx/core/compose';
-
-export const KNOWN = {
- Array: 'array',
- Object: 'object',
- Null: 'null',
- Undefined: 'undefined',
- Boolean: 'boolean',
- Number: 'number',
- String: 'string',
- Symbol: 'symbol',
- Function: 'function',
- Iterable: 'iterable'
-};
-
-export function getTypeOf(object: any) {
- const literalType = typeof object;
-
- if (literalType === 'object') {
- if (Array.isArray(object)) {
- return KNOWN.Array;
- }
- if (object === null) {
- return KNOWN.Null;
- }
- if (typeof object[Symbol.iterator] === 'function') {
- return KNOWN.Iterable;
- }
- }
-
- return literalType;
-}
-
-const arrayLength = (value: any[]) => value.length;
-const lengthLabel = (single: string, plural: string) => (length: number) => `${length} ${length === 1 ? single : plural }`;
-const typeIndicator = (typeIndicator: string) => (input: string) => `${typeIndicator} ${input}`;
-const typeIdentity = (type: string) => () => type;
-const withQuotes = (val: string) => `"${val}"`;
-const toString = (val: Object) => val.toString();
-const iterableToArray = (value: Iterable) => Array.from(value);
-
-const labelFactoriesForTypes = {
- [KNOWN.Array]: compose(typeIndicator('[]'), lengthLabel('item', 'items'), arrayLength),
- [KNOWN.Object]: compose(typeIndicator('{}'), lengthLabel('key', 'keys'), arrayLength, Object.getOwnPropertyNames),
- [KNOWN.Null]: typeIdentity(KNOWN.Null),
- [KNOWN.Undefined]: typeIdentity(KNOWN.Undefined),
- [KNOWN.Boolean]: (val: boolean) => val ? 'true' : 'false',
- [KNOWN.Number]: toString,
- [KNOWN.String]: withQuotes,
- [KNOWN.Symbol]: compose(withQuotes, toString),
- [KNOWN.Function]: typeIdentity(KNOWN.Function),
- [KNOWN.Iterable]: compose(typeIndicator('()'), lengthLabel('entry', 'entries'), arrayLength, iterableToArray)
-};
-
-const lookupLabelForType = (type: string) => labelFactoriesForTypes[type];
-
-export const getLabelFor = (object: any) => labelFactoriesForTypes[getTypeOf(object)](object);
-
-export function getChildrenFor(object: any): any[] {
- const literalType = getTypeOf(object);
-
- if (literalType === KNOWN.Object) {
- return Object.getOwnPropertyNames(object).filter(function(name){return typeof object[name]!='function';})
- .map(name => {
- return { key: name, value: object[name] };
- });
- }
- else if (literalType === KNOWN.Array) {
-
- return object.map((value, index) => {
- return { key: index, value };
- });
- }
- else if (literalType === KNOWN.Iterable) {
-
- return Array.from(object).map((value, index) => {
- return { key: index, value };
- });
- }
-
- throw new TypeError(`Tried to get children for non-enumerable type "${literalType}"`);
-}
diff --git a/src/app/models/aggregate/aggregateRequest.ts b/src/app/models/aggregate/aggregateRequest.ts
index b421322..d3878bd 100644
--- a/src/app/models/aggregate/aggregateRequest.ts
+++ b/src/app/models/aggregate/aggregateRequest.ts
@@ -68,9 +68,6 @@ export class AggregateRequest implements Serializable {
return this;
}
- toURI() {
-
- }
}
diff --git a/src/app/models/analysis/algorithm.ts b/src/app/models/analysis/algorithm.ts
index 94de820..c3f6181 100644
--- a/src/app/models/analysis/algorithm.ts
+++ b/src/app/models/analysis/algorithm.ts
@@ -21,7 +21,7 @@ export class Algorithm {
for (let key of Object.keys(data.configurations)){
- let config = new ExecutionConfiguration().deserialize(data.input[key]);
+ let config = new ExecutionConfiguration().deserialize(data.configurations[key]);
config.algorithm = this;
configurations.set(key, config);
}
@@ -29,9 +29,30 @@ export class Algorithm {
this.configurations = configurations;
this.name = data.name;
- this.title = data.algorithm.title;
+ this.description = data.description;
+ this.title = data.title;
return this;
}
+ serialize(): any {
+
+ let output = {};
+
+ output['configurations'] = {};
+
+ this.configurations.forEach(function(value, key){
+ output['configurations'][key] = value.serialize();
+ });
+
+
+
+ output['name'] = this.name;
+ output['title'] = this.title;
+ output['description'] = this.description;
+
+
+
+ return output;
+ }
}
diff --git a/src/app/models/analysis/analysisCall.ts b/src/app/models/analysis/analysisCall.ts
index 64c7e37..e5c2449 100644
--- a/src/app/models/analysis/analysisCall.ts
+++ b/src/app/models/analysis/analysisCall.ts
@@ -59,12 +59,12 @@ export class AnalysisCall {
public constructor(public config: ExecutionConfiguration, public cube: Cube) {
- this.init();
+ this.initialize();
}
- public init() {
+ public initialize() {
let that = this;
this.config.inputs.forEach((input) => {
@@ -367,7 +367,7 @@ export class AnalysisCall {
request.pageSize = parseInt(parts['pagesize']);
}
if (parts['page']) {
- request.pageSize = parseInt(parts['page']);
+ request.page = parseInt(parts['page']);
}
return request;
diff --git a/src/app/models/analysis/executionConfiguration.ts b/src/app/models/analysis/executionConfiguration.ts
index 74b5f25..33879a4 100644
--- a/src/app/models/analysis/executionConfiguration.ts
+++ b/src/app/models/analysis/executionConfiguration.ts
@@ -2,7 +2,7 @@ import {RequestMethod} from '@angular/http';
import {Output} from './output';
import {Input} from './input';
import {environment} from '../../../environments/environment';
-import {Algorithm} from "./algorithm";
+import {Algorithm} from './algorithm';
/**
* Created by larjo on 28/4/2017.
*/
@@ -23,8 +23,8 @@ export class ExecutionConfiguration {
let inputs = new Map();
- for (let key of Object.keys(data.input)){
- inputs.set(key, new Input().deserialize(data.input[key]));
+ for (let key of Object.keys(data.inputs)){
+ inputs.set(key, new Input().deserialize(data.inputs[key]));
}
this.inputs = inputs;
@@ -34,21 +34,48 @@ export class ExecutionConfiguration {
let outputs = new Map();
- for (let key of Object.keys(data.output)){
- outputs.set(key, new Output().deserialize(data.output[key]));
+ for (let key of Object.keys(data.outputs)){
+ outputs.set(key, new Output().deserialize(data.outputs[key]));
}
this.outputs = outputs;
- this.prompt = data.algorithm.prompt;
- this.method = data.algorithm.method;
- this.endpoint = new URL(environment[data.algorithm.endpoint[0]] + '/' + data.algorithm.name);
+ this.prompt = data.prompt;
+ this.method = data.method;
+ this.endpoint = new URL(data.endpoint );
this.name = data.name;
this.title = data.title;
return this;
}
+ serialize() {
+
+ let output = {};
+
+ output['inputs'] = {};
+
+ this.inputs.forEach(function (value, key, map) {
+ output['inputs'][key] = value.serialize();
+ });
+
+ output['outputs'] = {};
+
+ this.outputs.forEach(function (value, key, map) {
+ output['outputs'][key] = value.serialize();
+ });
+
+ output['prompt'] = this.prompt;
+ output['method'] = this.method;
+ output['endpoint'] = this.endpoint.toString();
+ output['name'] = this.name;
+ output['title'] = this.title;
+
+
+
+
+ return output;
+ }
}
diff --git a/src/app/models/analysis/input.ts b/src/app/models/analysis/input.ts
index 31469cc..3303f62 100644
--- a/src/app/models/analysis/input.ts
+++ b/src/app/models/analysis/input.ts
@@ -3,19 +3,20 @@
*/
-export const InputTypes = {
- PARAMETER: 'Algorithm parameter',
- ATTRIBUTE_REF: 'Cube Dimension Attribute',
- MEASURE_REF: 'Cube Measure',
- AGGREGATE_REF: 'Cube Aggregate',
- QUERY: 'Query to the data store',
- RAW_DATA: 'Raw data',
- RAW_DATA_URI: 'URI pointing to raw data',
- BABBAGE_AGGREGATE_URI: 'URI pointing to a Babbage compliant aggregates API request',
- BABBAGE_AGGREGATE_RAW_DATA: 'Raw data coming from a Babbage compliant aggregates API request',
- BABBAGE_FACT_URI: 'URI pointing to a Babbage compliant facts API request',
- BABBAGE_FACT_RAW_DATA: 'Raw data coming from a Babbage compliant facts API request'
-};
+export enum InputTypes {
+ PARAMETER= 'Algorithm parameter',
+ ATTRIBUTE_REF= 'Cube Dimension Attribute',
+ MEASURE_REF= 'Cube Measure',
+ AGGREGATE_REF= 'Cube Aggregate',
+ QUERY= 'Query to the data store',
+ RAW_DATA= 'Raw data',
+ RAW_DATA_URI= 'URI pointing to raw data',
+ BABBAGE_AGGREGATE_URI= 'URI pointing to a Babbage compliant aggregates API request',
+ BABBAGE_AGGREGATE_RAW_DATA= 'Raw data coming from a Babbage compliant aggregates API request',
+ BABBAGE_FACT_URI= 'URI pointing to a Babbage compliant facts API request',
+ BABBAGE_FACT_RAW_DATA= 'Raw data coming from a Babbage compliant facts API request',
+ BABBAGE_MEMBER= 'Member values from a dimension'
+}
@@ -24,12 +25,13 @@ export class Input {
name: string;
cardinality: string = '1';
description: string;
- type: string;
+ type: InputTypes;
title: string;
data_type: string;
default_value: any;
guess: boolean;
required: boolean;
+ data: any;
deserialize(data: any): Input {
@@ -41,11 +43,25 @@ export class Input {
this.default_value = data.default_value;
this.required = data.required;
this.data_type = data.data_type;
- this.type = InputTypes[data.type];
+ this.type = data.type;
return this;
}
+ serialize() {
+ let output = {};
+
+ output['name'] = this.name;
+ output['title'] = this.title;
+ output['cardinality'] = this.cardinality;
+ output['guess'] = this.guess;
+ output['default_value'] = this.default_value;
+ output['required'] = this.required;
+ output['data_type'] = this.data_type;
+ output['type'] = this.type;
+
+ return output;
+ }
}
diff --git a/src/app/models/analysis/jobTimeoutException.ts b/src/app/models/analysis/jobTimeoutException.ts
new file mode 100644
index 0000000..ce1e03f
--- /dev/null
+++ b/src/app/models/analysis/jobTimeoutException.ts
@@ -0,0 +1,6 @@
+/**
+ * Created by larjo on 16/5/2017.
+ */
+export class JobTimeoutException {
+
+}
diff --git a/src/app/models/analysis/output.ts b/src/app/models/analysis/output.ts
index 6e0c35a..0f92679 100644
--- a/src/app/models/analysis/output.ts
+++ b/src/app/models/analysis/output.ts
@@ -2,12 +2,12 @@
* Created by larjo on 12/10/2016.
*/
-export const OutputTypes = {
- TABLE: 'table',
- ADJACENCY_MATRIX: 'adjacency matrix',
- OBJECT_COLLECTION: 'collection of objects',
- VISUALIZATION_PREFERENCE: 'visualization preference',
- VISUALIZATION_RENDERING: 'rendered visualization'
+export enum OutputTypes {
+ TABLE= 'table',
+ ADJACENCY_MATRIX= 'adjacency matrix',
+ OBJECT_COLLECTION= 'collection of objects',
+ VISUALIZATION_PREFERENCE= 'visualization preference',
+ VISUALIZATION_RENDERING= 'rendered visualization'
};
@@ -16,7 +16,7 @@ export class Output {
name: string;
cardinality: number= 1;
- type: string;
+ type: OutputTypes;
deserialize(data: any): Output {
@@ -25,10 +25,20 @@ export class Output {
this.name = data.name;
this.cardinality = data.cardinality;
- this.type = OutputTypes[data.type];
+ this.type = data.type;
return this;
}
+ serialize() {
+ let output = {};
+
+ output['name'] = this.name;
+ output['cardinality'] = this.cardinality;
+
+ output['type'] = this.type;
+
+ return output;
+ }
}
diff --git a/src/app/models/attribute.ts b/src/app/models/attribute.ts
index 07eb732..2b972bf 100644
--- a/src/app/models/attribute.ts
+++ b/src/app/models/attribute.ts
@@ -1,14 +1,14 @@
-import {Dimension} from "./dimension";
-import {Serializable} from "./iserializeable";
+import {Dimension} from './dimension';
+import {Serializable} from './iserializeable';
/**
* Created by larjo on 16/7/2016.
*/
-export class Attribute implements Serializable{
+export class Attribute implements Serializable {
serialize(input: Attribute): Object {
return this;
}
- deserialize(input:any):Attribute {
+ deserialize(input: any): Attribute {
this.ref = input.ref;
this.datatype = input.datatype;
@@ -18,17 +18,19 @@ export class Attribute implements Serializable{
return this;
}
- constructor(){}
+ constructor() {
- ref:string;
- datatype:string;
- label:string;
- orig_attribute:string;
- dimension:Dimension;
+ }
+
+ ref: string;
+ datatype: string;
+ label: string;
+ orig_attribute: string;
+ dimension: Dimension;
- public get fullLabel():string{
- return (this.dimension?this.dimension.label:"")+"→"+this.label;
+ public get fullLabel(): string{
+ return (this.dimension ? this.dimension.label : '') + '→' + this.label;
}
diff --git a/src/app/models/dimension.ts b/src/app/models/dimension.ts
index 17d5ff1..d0df5ec 100644
--- a/src/app/models/dimension.ts
+++ b/src/app/models/dimension.ts
@@ -49,7 +49,20 @@ export class Dimension implements Serializable {
hierarchy: string;
- attributes: Map = new Map();
+ attributes: Map = new Map();
+
+
+ get significants(): Map{
+
+ const significants = new Map();
+
+ significants.set(this.key_attribute, this.attributes.get(this.key_attribute));
+ significants.set(this.label_attribute, this.attributes.get(this.label_attribute));
+
+
+ return significants;
+
+ }
}
diff --git a/src/app/reducers/cube/cubes.ts b/src/app/reducers/cube/cubes.ts
index 5238c35..7f6e6b1 100644
--- a/src/app/reducers/cube/cubes.ts
+++ b/src/app/reducers/cube/cubes.ts
@@ -24,17 +24,19 @@ export function reducer(state = initialState, action: cube.Actions | collection.
switch (action.type) {
case cube.ActionTypes.SEARCH_COMPLETE:
case collection.ActionTypes.LOAD_SUCCESS: {
- const packages:any = action.payload;
- const newPackages = packages.filter(pckg => !state.entities[pckg.id]);
+ const packages: any = action.payload.cubes;
+ const newPackages = action.payload.params.from < 2 ? [ ...packages ] : packages.filter(pckg => !state.entities[pckg.id]);
const newPackageIds = newPackages.map(pckg => pckg.id);
const newCubeEntities = newPackages.reduce((entities: { [id: string]: any }, pckg: any) => {
return Object.assign(entities, {
- [pckg.id]: {pckg:pckg.package, id:pckg.id}
+ [pckg.id]: {pckg: pckg.package, id: pckg.id}
});
}, {});
+ let entities = Object.assign({}, state.entities, newCubeEntities);
+ let ids = action.payload.params.from < 2 ? [ ...newPackageIds ] : [ ...state.ids, ...newPackageIds ];
return {
- ids: [ ...state.ids, ...newPackageIds ],
- entities: Object.assign({}, state.entities, newCubeEntities),
+ ids: ids,
+ entities: entities,
selectedCubeId: state.selectedCubeId
};
}
@@ -44,7 +46,7 @@ export function reducer(state = initialState, action: cube.Actions | collection.
/* if (state.ids.indexOf(cube.name) > -1) {
return state;
}*/
- let mergedCube = Object.assign({}, state.entities[cube.name],cube);
+ let mergedCube = Object.assign({}, state.entities[cube.name], cube);
return {
ids: [ ...state.ids, cube.name ],
entities: Object.assign({}, state.entities, {
diff --git a/src/app/reducers/cube/search.ts b/src/app/reducers/cube/search.ts
index cc3dd53..e78fe4a 100644
--- a/src/app/reducers/cube/search.ts
+++ b/src/app/reducers/cube/search.ts
@@ -7,18 +7,24 @@ export interface State {
ids: string[];
loading: boolean;
query: string;
+ size: number;
+ from: number;
}
const initialState: State = {
ids: [],
loading: false,
- query: ''
+ query: '',
+ size: 50,
+ from: 0
};
export function reducer(state = initialState, action: cube.Actions): State {
switch (action.type) {
case cube.ActionTypes.SEARCH: {
- const query = action.payload;
+ const query = action.payload.query;
+ const size = action.payload.size;
+ const from = action.payload.from;
/* if (query === '') {
return {
@@ -29,17 +35,19 @@ export function reducer(state = initialState, action: cube.Actions): State {
}*/
return Object.assign({}, state, {
- query,
+ query, size, from,
loading: true
});
}
case cube.ActionTypes.SEARCH_COMPLETE: {
- const cubes = action.payload;
+ const cubes = action.payload.cubes;
return {
ids: cubes.map(cube => cube.id),
loading: false,
- query: state.query
+ query: state.query,
+ size: state.size,
+ from: state.from
};
}
@@ -60,6 +68,12 @@ export function getCubeIds(state$: Observable) {
export function getQuery(state$: Observable) {
return state$.select(state => state.query);
}
+export function getSize(state$: Observable) {
+ return state$.select(state => state.size);
+}
+export function getFrom(state$: Observable) {
+ return state$.select(state => state.from);
+}
export function getLoading(state$: Observable) {
return state$.select(state => {
diff --git a/src/app/reducers/index.ts b/src/app/reducers/index.ts
index 24068ba..c2ea36a 100644
--- a/src/app/reducers/index.ts
+++ b/src/app/reducers/index.ts
@@ -1,11 +1,11 @@
import '@ngrx/core/add/operator/select';
import 'rxjs/add/operator/switchMap';
import 'rxjs/add/operator/let';
-import { Observable } from 'rxjs/Observable';
-import { combineLatest } from 'rxjs/observable/combineLatest';
-import { ActionReducer } from '@ngrx/store';
+import {Observable} from 'rxjs/Observable';
+import {combineLatest} from 'rxjs/observable/combineLatest';
+import {ActionReducer} from '@ngrx/store';
import * as fromRouter from '@ngrx/router-store';
-import { Book } from '../models/book';
+import {Book} from '../models/book';
import {ExpressionTree} from '../models/expressionTree';
/**
@@ -16,14 +16,14 @@ import {ExpressionTree} from '../models/expressionTree';
*
* More: https://drboolean.gitbooks.io/mostly-adequate-guide/content/ch5.html
*/
-import { compose } from '@ngrx/core/compose';
+import {compose} from '@ngrx/core/compose';
/**
* storeFreeze prevents state from being mutated. When mutation occurs, an
* exception will be thrown. This is useful during development mode to
* ensure that none of the reducers accidentally mutates the state.
*/
-import { storeFreeze } from 'ngrx-store-freeze';
+import {storeFreeze} from 'ngrx-store-freeze';
/**
* combineReducers is another useful metareducer that takes a map of reducer
@@ -33,7 +33,7 @@ import { storeFreeze } from 'ngrx-store-freeze';
*
* More: https://egghead.io/lessons/javascript-redux-implementing-combinereducers-from-scratch
*/
-import { combineReducers } from '@ngrx/store';
+import {combineReducers} from '@ngrx/store';
/**
@@ -132,7 +132,7 @@ export function reducer(state: any, action: any) {
* ```
*
*/
- export function getBooksState(state$: Observable) {
+export function getBooksState(state$: Observable) {
return state$.select(state => state.books);
}
@@ -151,9 +151,9 @@ export function reducer(state: any, action: any) {
* observable. Each subscription to the resultant observable
* is shared across all subscribers.
*/
- export const getBookEntities = compose(fromBooks.getBookEntities, getBooksState);
- export const getBookIds = compose(fromBooks.getBookIds, getBooksState);
- export const getSelectedBook = compose(fromBooks.getSelectedBook, getBooksState);
+export const getBookEntities = compose(fromBooks.getBookEntities, getBooksState);
+export const getBookIds = compose(fromBooks.getBookIds, getBooksState);
+export const getSelectedBook = compose(fromBooks.getSelectedBook, getBooksState);
/**
@@ -161,7 +161,7 @@ export function reducer(state: any, action: any) {
* reducer's and collection reducer's selectors.
*/
export function getSearchState(state$: Observable) {
- return state$.select(s => s.search);
+ return state$.select(s => s.search);
}
export const getSearchBookIds = compose(fromSearch.getBookIds, getSearchState);
@@ -179,11 +179,10 @@ export const getSearchResults = function (state$: Observable) {
state$.let(getBookEntities),
state$.let(getSearchBookIds)
)
- .map(([ entities, ids ]) => ids.map(id => entities[id]));
+ .map(([entities, ids]) => ids.map(id => entities[id]));
};
-
export function getCollectionState(state$: Observable) {
return state$.select(s => s.collection);
}
@@ -197,7 +196,7 @@ export const getBookCollection = function (state$: Observable) {
state$.let(getBookEntities),
state$.let(getCollectionBookIds)
)
- .map(([ entities, ids ]) => ids.map(id => entities[id]));
+ .map(([entities, ids]) => ids.map(id => entities[id]));
};
export const isSelectedBookInCollection = function (state$: Observable) {
@@ -205,17 +204,10 @@ export const isSelectedBookInCollection = function (state$: Observable) {
state$.let(getCollectionBookIds),
state$.let(getSelectedBook)
)
- .map(([ ids, selectedBook ]) => ids.indexOf(selectedBook.id) > -1);
+ .map(([ids, selectedBook]) => ids.indexOf(selectedBook.id) > -1);
};
-
-
-
-
-
-
-
export function getExecutionState(state$: Observable) {
return state$.select(s => {
return s.executions;
@@ -226,14 +218,6 @@ export function getExecutionState(state$: Observable) {
export const getExecutionLoading = compose(fromExecutions.getLoading, getExecutionState);
-
-
-
-
-
-
-
-
/**
* A selector function is a map function factory. We pass it parameters and it
* returns a function that maps from the larger state tree into a smaller
@@ -295,6 +279,8 @@ export function getCubeSearchState(state$: Observable) {
export const getSearchCubeIds = compose(fromCubeSearch.getCubeIds, getCubeSearchState);
export const getCubeSearchStatus = compose(fromCubeSearch.getStatus, getCubeSearchState);
export const getCubeSearchQuery = compose(fromCubeSearch.getQuery, getCubeSearchState);
+export const getCubeSearchSize = compose(fromCubeSearch.getSize, getCubeSearchState);
+export const getCubeSearchFrom = compose(fromCubeSearch.getFrom, getCubeSearchState);
export const getCubeSearchLoading = compose(fromCubeSearch.getLoading, getCubeSearchState);
@@ -306,13 +292,14 @@ export const getCubeSearchResults = function (state$: Observable) {
return combineLatest<{ [name: string]: Cube }, string[]>(
state$.let(getCubeEntities),
- state$.let(getSearchCubeIds)
+ state$.let(getCubeIds)
)
- .map(([ entities, ids ]) => ids.map(name => { return entities[name]; }));
+ .map(([entities, ids]) => ids.map(name => {
+ return entities[name];
+ }));
};
-
export function getCubeCollectionState(state$: Observable) {
return state$.select(s => s.collection);
}
@@ -326,7 +313,7 @@ export const getCubeCollection = function (state$: Observable) {
state$.let(getCubeEntities),
state$.let(getCollectionCubeIds)
)
- .map(([ entities, ids ]) => ids.map(name => entities[name]));
+ .map(([entities, ids]) => ids.map(name => entities[name]));
};
export const isSelectedCubeInCollection = function (state$: Observable) {
@@ -334,7 +321,7 @@ export const isSelectedCubeInCollection = function (state$: Observable) {
state$.let(getCollectionCubeIds),
state$.let(getSelectedCube)
)
- .map(([ ids, selectedCube ]) => ids.indexOf(selectedCube.name) > -1);
+ .map(([ids, selectedCube]) => ids.indexOf(selectedCube.name) > -1);
};
@@ -351,8 +338,6 @@ export function getTreesState(state$: Observable) {
}
-
-
/**
* Layout Reducers
*/
diff --git a/src/app/services/algorithms.ts b/src/app/services/algorithms.ts
index efca449..fe2335c 100644
--- a/src/app/services/algorithms.ts
+++ b/src/app/services/algorithms.ts
@@ -13,36 +13,43 @@ import {Configuration} from 'jasmine-spec-reporter/built/configuration';
@Injectable()
export class AlgorithmsService {
- private API_DAM_PATH: string = environment.DAMUrl + '/cubes';
+ private API_DAM_PATH: string = environment.DAMUrl ;
constructor(private http: Http) {
}
- getCompatibleAlgorithms(cube: Cube): Observable {
- let that = this;
- return Observable.create(function (observer: any) {
- observer.next([AlgorithmsService.dummyTimeSeries(), AlgorithmsService.dummyDescriptiveStatistics(), AlgorithmsService.dummyClustering()]);
- });
+
+ getActualCompatibleAlgorithms(): Observable {
+ // console.log(JSON.stringify({time_series: AlgorithmsService.dummyTimeSeries().serialize(), descriptive_statistics: AlgorithmsService.dummyDescriptiveStatistics().serialize(), clustering: AlgorithmsService.dummyClustering().serialize()}));
+
+ return this.http.get(`${environment.DAMUrl}/services/meta/all`)
+ .map(res => {
+ let algorithms = [];
+ let response = res.json();
+ for (let key of Object.keys(response)){
+ let algorithm = new Algorithm().deserialize(response[key]);
+
+ algorithms.push(algorithm);
+
+ }
+
+ return algorithms;
+
+ });
+
}
- getActualCompatibleAlgorithms(cube: Cube): Observable {
- return this.http.get(`${this.API_DAM_PATH}/${cube.name}/algo`)
+ getActualCompatibleAlgorithm( algorithmName): Observable {
+
+ return this.http.get(`${environment.DAMUrl}/services/meta/${algorithmName}`)
.map(res => {
let response = res.json();
-
- let algorithms = [];
- for (let algorithmName of response.algos) {
- let algorithm = new Algorithm();
- algorithm.name = algorithmName;
- algorithm.title = algorithmName;
- algorithms.push(algorithm);
- }
- return algorithms;
+ return new Algorithm().deserialize(response);
});
@@ -51,24 +58,34 @@ export class AlgorithmsService {
getTimeSeriesAlgorithm(): Observable {
let that = this;
- debugger;
- return Observable.create(function (observer: any) {
- observer.next(AlgorithmsService.dummyTimeSeries());
- });
+ return this.getActualCompatibleAlgorithm('time_series');
+
}
getDescriptiveStatisticsAlgorithm(): Observable {
- let that = this;
- return Observable.create(function (observer: any) {
- observer.next(AlgorithmsService.dummyDescriptiveStatistics());
- });
+ return this.getActualCompatibleAlgorithm('descriptive_statistics');
+
}
getClusteringAlgorithm(): Observable {
+ return this.getActualCompatibleAlgorithm('clustering');
+
+ }
+
+ getOutlierDetectionAlgorithm(): Observable {
let that = this;
- return Observable.create(function (observer: any) {
- observer.next(AlgorithmsService.dummyClustering());
- });
+ return this.getActualCompatibleAlgorithm('outlier_detection');
+ /*return Observable.create(function (observer: any) {
+ observer.next(AlgorithmsService.dummyOutlierDetection());
+ });*/
+ }
+
+ getRuleMiningAlgorithm(): Observable {
+ let that = this;
+ return this.getActualCompatibleAlgorithm('rule_mining');
+ /*return Observable.create(function (observer: any) {
+ observer.next(AlgorithmsService.dummyOutlierDetection());
+ });*/
}
getAlgorithm(name, cube: Cube): Observable {
@@ -79,8 +96,12 @@ export class AlgorithmsService {
return this.getDescriptiveStatisticsAlgorithm();
case 'clustering':
return this.getClusteringAlgorithm();
+ case 'outlier_detection':
+ return this.getOutlierDetectionAlgorithm();
+ case 'rule_mining':
+ return this.getRuleMiningAlgorithm();
default:
- return this.http.get(`${this.API_DAM_PATH}/algo/${name}`)
+ return this.http.get(`${this.API_DAM_PATH}/${name}`)
.map(res => {
let response = res.json();
@@ -93,290 +114,9 @@ export class AlgorithmsService {
}
- static dummyTimeSeries(): Algorithm {
- let timeSeriesAlgorithm = new Algorithm();
- timeSeriesAlgorithm.title = 'Time Series';
- timeSeriesAlgorithm.name = 'time_series';
- timeSeriesAlgorithm.description = 'Time series analysis comprises methods for analyzing time series data in order to extract meaningful statistics and other characteristics of the data. Time series forecasting is the use of a model to predict future values based on previously observed values. While regression analysis is often employed in such a way as to test theories that the current values of one or more independent time series affect the current value of another time series, this type of analysis of time series is not called "time series analysis", which focuses on comparing values of a single time series or multiple dependent time series at different points in time.';
-
- let raw_data_input = new Input();
- raw_data_input.cardinality = '1';
- raw_data_input.type = InputTypes.BABBAGE_AGGREGATE_URI;
- raw_data_input.name = 'json_data';
- raw_data_input.title = 'Data coming from an aggregation';
- raw_data_input.guess = false;
- raw_data_input.description = 'This is the aggregated data that will be sent to the time series algorithm. You need to select at least a year-related drilldown and an amount-related aggregate.';
- raw_data_input.required = true;
-
- let time_dimension_input = new Input();
- time_dimension_input.cardinality = '1';
- time_dimension_input.type = InputTypes.ATTRIBUTE_REF;
- time_dimension_input.name = 'time';
- time_dimension_input.title = 'Time dimension';
- time_dimension_input.description = 'This is the time dimension that should exist in the aggregation result.';
- time_dimension_input.guess = true;
- time_dimension_input.required = true;
-
- let amount_aggregate_input = new Input();
- amount_aggregate_input.cardinality = '1';
- amount_aggregate_input.type = InputTypes.AGGREGATE_REF;
- amount_aggregate_input.name = 'amount';
- amount_aggregate_input.title = 'Amount aggregate';
- amount_aggregate_input.description = 'This is the amount aggregate that should exist in the aggregation result';
- amount_aggregate_input.guess = true;
- amount_aggregate_input.required = true;
-
- let prediction_steps_input = new Input();
- prediction_steps_input.cardinality = '1';
- prediction_steps_input.type = InputTypes.PARAMETER;
- prediction_steps_input.name = 'prediction_steps';
- prediction_steps_input.title = 'Prediction Steps';
- prediction_steps_input.description = 'The number of time steps you want to get prediction for.';
- prediction_steps_input.data_type = 'number';
- prediction_steps_input.default_value = 4;
- prediction_steps_input.guess = false;
- prediction_steps_input.required = false;
-
- let configuration = new ExecutionConfiguration;
-
- configuration.inputs.set(raw_data_input.name, raw_data_input);
- configuration.inputs.set(time_dimension_input.name, time_dimension_input);
- configuration.inputs.set(amount_aggregate_input.name, amount_aggregate_input);
- configuration.inputs.set(prediction_steps_input.name, prediction_steps_input);
-
- let json_output = new Output;
- json_output.name = 'output';
- json_output.cardinality = 1 ;
- json_output.type = OutputTypes.TABLE;
-
- configuration.outputs.set(json_output.name, json_output);
- configuration.name = 'aggregate';
- configuration.title = 'Timeseries of aggregated data';
- configuration.algorithm = timeSeriesAlgorithm;
- configuration.method = RequestMethod.Post;
- configuration.endpoint = new URL(environment.openCpuEndpoint + '/library/TimeSeries.OBeu/R/open_spending.ts/print');
- configuration.prompt = 'Build an aggregate, with a time-related drilldown and then enter the prediction steps parameter from the left and click on the execute button on top right.';
-
- timeSeriesAlgorithm.configurations.set('aggregate', configuration);
-
-
-
-
- return timeSeriesAlgorithm;
-
- }
-
-
-
- static dummyDescriptiveStatistics(): Algorithm {
- let descriptiveStatisticsAlgorithm = new Algorithm();
- descriptiveStatisticsAlgorithm.title = 'Descriptive Statistics';
- descriptiveStatisticsAlgorithm.name = 'descriptive_statistics';
- descriptiveStatisticsAlgorithm.description = 'Descriptive statistics provide simple summaries about the sample and about the observations that have been made. Such summaries may be either quantitative, i.e. summary statistics, or visual, i.e. simple-to-understand graphs. These summaries may either form the basis of the initial description of the data as part of a more extensive statistical analysis, or they may be sufficient in and of themselves for a particular investigation.';
-
-
- let raw_data_input = new Input();
- raw_data_input.cardinality = '1';
- raw_data_input.type = InputTypes.BABBAGE_FACT_URI;
- raw_data_input.name = 'json_data';
- raw_data_input.title = 'Tabular data';
- raw_data_input.description = 'These are the raw budget facts that will be sent for analysis. By default, all dimensions are included.';
- raw_data_input.guess = false;
-
- let what_dimension_input = new Input();
- what_dimension_input.cardinality = 'n';
- what_dimension_input.type = InputTypes.ATTRIBUTE_REF;
- what_dimension_input.name = 'dimensions';
- what_dimension_input.title = 'Analyzed dimensions';
- what_dimension_input.required = true;
- what_dimension_input.description = 'Select a specific dimension for further frequency analysis. If a dimension contains empty values, it should not be selected for further analysis.';
- what_dimension_input.guess = false;
-
- /* let to_what_dimension_input = new Input();
- to_what_dimension_input.cardinality = '1';
- to_what_dimension_input.type = InputTypes.ATTRIBUTE_REF;
- to_what_dimension_input.name = 'to.what';
- to_what_dimension_input.title = 'To what';
- what_dimension_input.required = true;
- to_what_dimension_input.guess = false;*/
-
-
- let amount_aggregate_input = new Input();
- amount_aggregate_input.cardinality = 'n';
- amount_aggregate_input.type = InputTypes.MEASURE_REF;
- amount_aggregate_input.name = 'amounts';
- amount_aggregate_input.description = 'This is the measure that will be used for the descriptive statistics analysis.';
- amount_aggregate_input.title = 'Amount measure';
- amount_aggregate_input.guess = false;
- amount_aggregate_input.required = true;
- let factsConfig = new ExecutionConfiguration();
- factsConfig.inputs.set(raw_data_input.name, raw_data_input);
- factsConfig.inputs.set(what_dimension_input.name, what_dimension_input);
-// descriptiveStatisticsAlgorithm.inputs.set(to_what_dimension_input.name, to_what_dimension_input);
- factsConfig.inputs.set(amount_aggregate_input.name, amount_aggregate_input);
- factsConfig.prompt = 'Build an budget facts subset, by selecting at least the dimension that is to be analyzed.';
-
- let json_output = new Output;
- json_output.name = 'output';
- json_output.cardinality = 1 ;
- json_output.type = OutputTypes.TABLE;
-
- factsConfig.outputs.set(json_output.name, json_output);
- factsConfig.name = 'facts';
- factsConfig.title = 'Descriptive statistics from facts';
- factsConfig.method = RequestMethod.Post;
- factsConfig.endpoint = new URL(environment.openCpuEndpoint + '/library/DescriptiveStats.OBeu/R/open_spending.ds');
- factsConfig.algorithm = descriptiveStatisticsAlgorithm;
-
- descriptiveStatisticsAlgorithm.configurations.set('facts', factsConfig);
-
- return descriptiveStatisticsAlgorithm;
-
-
-
- }
-
- static dummyClustering(): Algorithm {
- let clusteringAlgorithm = new Algorithm();
- clusteringAlgorithm.title = 'Clustering';
- clusteringAlgorithm.name = 'clustering';
- clusteringAlgorithm.description = 'Cluster analysis or clustering is the task of grouping a set of objects in such a way that objects in the same group (called a cluster) are more similar (in some sense or another) to each other than to those in other groups (clusters). It is a main task of exploratory data mining, and a common technique for statistical data analysis, used in many fields, including machine learning, pattern recognition, image analysis, information retrieval, bioinformatics, data compression, and computer graphics.';
-
-
- let raw_data_input = new Input();
- raw_data_input.cardinality = '1';
- raw_data_input.type = InputTypes.BABBAGE_FACT_URI;
- raw_data_input.name = 'json_data';
- raw_data_input.title = 'Tabular data';
- raw_data_input.description = 'These are the raw budget facts that will be sent for analysis. By default, all dimensions are included.';
- raw_data_input.guess = false;
-
- let agg_raw_data_input = new Input();
- agg_raw_data_input.cardinality = '1';
- agg_raw_data_input.type = InputTypes.BABBAGE_AGGREGATE_URI;
- agg_raw_data_input.name = 'json_data';
- agg_raw_data_input.title = 'Aggregate';
- agg_raw_data_input.description = 'This is budget aggregate that will be sent for analysis. By default, all dimensions are included.';
- agg_raw_data_input.guess = false;
-
- let what_dimension_input = new Input();
- what_dimension_input.cardinality = 'n';
- what_dimension_input.type = InputTypes.ATTRIBUTE_REF;
- what_dimension_input.name = 'dimensions';
- what_dimension_input.title = 'Analyzed dimensions';
- what_dimension_input.required = true;
- what_dimension_input.description = 'Select a specific dimension for further frequency analysis. If a dimension contains empty values, it should not be selected for further analysis.';
- what_dimension_input.guess = false;
-
-
- let measured_dimension_input = new Input();
- measured_dimension_input.cardinality = 'n';
- measured_dimension_input.type = InputTypes.ATTRIBUTE_REF;
- measured_dimension_input.name = 'measured.dim';
- measured_dimension_input.title = 'Aggregate modifier dimension';
- measured_dimension_input.required = true;
- measured_dimension_input.description = 'This dimension is used to create additional, virtual measure aggregates, based on the actual values of the dimension.';
- measured_dimension_input.guess = false;
-
- /* let to_what_dimension_input = new Input();
- to_what_dimension_input.cardinality = '1';
- to_what_dimension_input.type = InputTypes.ATTRIBUTE_REF;
- to_what_dimension_input.name = 'to.what';
- to_what_dimension_input.title = 'To what';
- what_dimension_input.required = true;
- to_what_dimension_input.guess = false;*/
-
-
- let amount_measure_input = new Input();
- amount_measure_input.cardinality = 'n';
- amount_measure_input.type = InputTypes.MEASURE_REF;
- amount_measure_input.name = 'amounts';
- amount_measure_input.description = 'This is the measure that will be used for the descriptive statistics analysis.';
- amount_measure_input.title = 'Amount measure';
- amount_measure_input.guess = false;
- amount_measure_input.required = true;
-
-
- let amount_aggregate_input = new Input();
- amount_aggregate_input.cardinality = 'n';
- amount_aggregate_input.type = InputTypes.AGGREGATE_REF;
- amount_aggregate_input.name = 'amounts';
- amount_aggregate_input.description = 'This is the aggregate that will be used for the descriptive statistics analysis.';
- amount_aggregate_input.title = 'Amount aggregate';
- amount_aggregate_input.guess = false;
- amount_aggregate_input.required = true;
-
- let clustering_method_input = new Input();
- clustering_method_input.cardinality = '1';
- clustering_method_input.type = InputTypes.PARAMETER;
- clustering_method_input.name = 'cl.method';
- clustering_method_input.title = 'Clustering Method';
- clustering_method_input.description = 'The method used to cluster observations.';
- clustering_method_input.data_type = 'string';
- clustering_method_input.default_value = 'pam';
- clustering_method_input.guess = false;
- clustering_method_input.required = false;
-
-
- let factsConfiguration = new ExecutionConfiguration();
- let aggregatesConfiguration = new ExecutionConfiguration();
-
-
-
- factsConfiguration.inputs.set(raw_data_input.name, raw_data_input);
- factsConfiguration.inputs.set(what_dimension_input.name, what_dimension_input);
- factsConfiguration.inputs.set(clustering_method_input.name, clustering_method_input);
-// descriptiveStatisticsAlgorithm.inputs.set(to_what_dimension_input.name, to_what_dimension_input);
- factsConfiguration.inputs.set(amount_measure_input.name, amount_measure_input);
- factsConfiguration.prompt = 'Build an budget facts subset, by selecting at least the dimension that is to be analyzed.';
-
-
- aggregatesConfiguration.inputs.set(agg_raw_data_input.name, agg_raw_data_input);
- aggregatesConfiguration.inputs.set(what_dimension_input.name, what_dimension_input);
- aggregatesConfiguration.inputs.set(measured_dimension_input.name, measured_dimension_input);
- aggregatesConfiguration.inputs.set(clustering_method_input.name, clustering_method_input);
-
-// descriptiveStatisticsAlgorithm.inputs.set(to_what_dimension_input.name, to_what_dimension_input);
- aggregatesConfiguration.inputs.set(amount_aggregate_input.name, amount_aggregate_input);
- aggregatesConfiguration.prompt = 'Build an budget aggregate, by selecting at least the dimension that is to be analyzed.';
-
- let json_output = new Output;
- json_output.name = 'output';
- json_output.cardinality = 1 ;
- json_output.type = OutputTypes.TABLE;
-
- factsConfiguration.outputs.set(json_output.name, json_output);
-
- factsConfiguration.method = RequestMethod.Post;
- factsConfiguration.endpoint = new URL(environment.openCpuEndpoint + '/library/Cluster.OBeu/R/open_spending.cl');
- factsConfiguration.algorithm = clusteringAlgorithm;
- factsConfiguration.name = 'facts';
- factsConfiguration.title = 'Clustering facts';
-
-
- clusteringAlgorithm.configurations.set('facts', factsConfiguration);
-
- aggregatesConfiguration.outputs.set(json_output.name, json_output);
-
- aggregatesConfiguration.method = RequestMethod.Post;
- aggregatesConfiguration.endpoint = new URL(environment.openCpuEndpoint + '/library/Cluster.OBeu/R/open_spending.cl');
- aggregatesConfiguration.algorithm = clusteringAlgorithm;
- aggregatesConfiguration.name = 'aggregates';
- aggregatesConfiguration.title = 'Clustering aggregates';
-
-
-
- clusteringAlgorithm.configurations.set('facts', factsConfiguration);
- clusteringAlgorithm.configurations.set('aggregates', aggregatesConfiguration);
-
- return clusteringAlgorithm;
-
-
-
- }
}
diff --git a/src/app/services/analysis.ts b/src/app/services/analysis.ts
index 0d67073..8455325 100644
--- a/src/app/services/analysis.ts
+++ b/src/app/services/analysis.ts
@@ -9,6 +9,9 @@ import {AnalysisCall} from '../models/analysis/analysisCall';
import {Algorithm} from '../models/analysis/algorithm';
import {ApiCubesService} from './api-cubes';
import {ExecutionConfiguration} from '../models/analysis/executionConfiguration';
+import {environment} from '../../environments/environment';
+import {OperationCanceledException} from 'typescript';
+import {JobTimeoutException} from '../models/analysis/jobTimeoutException';
@Injectable()
export class AnalysisService {
@@ -32,6 +35,14 @@ export class AnalysisService {
}
+ else if (configuration.algorithm.name === 'outlier_detection') {
+ return this.outlier(configuration, inputs);
+ }
+ else if (configuration.algorithm.name === 'rule_mining') {
+ return this.outlier(configuration, inputs);
+ }
+
+
}
timeseries(configuration, inputs) {
@@ -42,10 +53,9 @@ export class AnalysisService {
body.set('prediction_steps', inputs['prediction_steps']);
body.set('json_data', '\'' + inputs['json_data'] + '\'');
- return that.http.post(configuration.endpoint.toString() , body).map(res => {
+ return that.http.post(configuration.endpoint.toString(), body).map(res => {
let response = res.json();
- debugger;
let forecasts = response['forecasts'];
let values: any = [];
@@ -278,8 +288,85 @@ export class AnalysisService {
});
+ }
+
+ outlier(configuration, inputs) {
+ let that = this;
+ let body = new URLSearchParams();
+
+ body.set('BABBAGE_FACT_URI', inputs['BABBAGE_FACT_URI']);
+ return that.http.get(configuration.endpoint.toString(), {search: body}).map(res => {
+ return res.json();
+ }).mergeMap(resp => {
+
+
+ return this.http.get(environment.DAMUrl + '/results/' + resp.jobid)
+ .map(res => {
+ let response = res.json();
+
+ if (!response.hasOwnProperty('result')) {
+ throw 'ex';
+
+ }
+ if(configuration.name === 'LOF') {
+ let values: any = response.result.result;
+ return {values: values};
+
+ }else {
+ let values: any = response.result;
+
+ return {values: values};
+
+ }
+
+
+ }).retryWhen(function (attempts) {
+ return Observable.range(1, environment.DAMretries).zip(attempts, function (i) { return i; }).flatMap(function (i) {
+ console.log('delay retry by ' + i + ' second(s)');
+ if (i === environment.DAMretries) return Observable.throw(new JobTimeoutException);
+ return Observable.timer(i * environment.DAMpollingInitialStep);
+ });
+ });
+ });
+
+
+ }
+
+ rulemining(configuration, inputs) {
+ let that = this;
+ let body = new URLSearchParams();
+
+ body.set('BABBAGE_FACT_URI', inputs['BABBAGE_FACT_URI']);
+debugger;
+ return that.http.get(configuration.endpoint.toString(), {search: body}).map(res => {
+ return res.json();
+ }).mergeMap(resp => {
+
+
+ return this.http.get(environment.DAMUrl + '/results/' + resp.jobid)
+ .map(res => {
+ let response = res.json();
+
+ if (!response.hasOwnProperty('result')) {
+ throw 'ex';
+
+ }
+ let values: any = response.result;
+
+ return {values: values};
+
+ }).retryWhen(function (attempts) {
+ return Observable.range(1, environment.DAMretries).zip(attempts, function (i) { return i; }).flatMap(function (i) {
+ console.log('delay retry by ' + i + ' second(s)');
+ if (i === environment.DAMretries) return Observable.throw(new JobTimeoutException);
+ return Observable.timer(i * environment.DAMpollingInitialStep);
+ });
+ });
+ });
+
}
+
clustering(configuration, inputs) {
let that = this;
let body = new URLSearchParams();
@@ -288,17 +375,15 @@ export class AnalysisService {
let measuredDimString = '\'' + inputs['measured.dim'] + '\'';
-
body.set('amounts', '\'' + inputs['amounts'] + '\'');
body.set('dimensions', dimensionColumnString);
body.set('measured.dim', measuredDimString);
body.set('cl.method', '\'' + inputs['cl.method'] + '\'');
body.set('json_data', '\'' + inputs['json_data'] + '\'');
- return that.http.post(configuration.endpoint.toString() , body).map(res => {
+ return that.http.post(configuration.endpoint.toString(), body).map(res => {
let response = res.json();
- debugger;
let forecasts = response['forecasts'];
let values: any = [];
@@ -532,6 +617,7 @@ export class AnalysisService {
}
+
descriptive(configuration, inputs) {
let that = this;
let body = new URLSearchParams();
@@ -570,8 +656,6 @@ export class AnalysisService {
}
-
-
let boxplotResponse = response.boxplot;
let boxplots = [];
let boxplotkeys = Object.keys(boxplotResponse);
diff --git a/src/app/services/api-cubes.ts b/src/app/services/api-cubes.ts
index 94dc74a..fa36e19 100644
--- a/src/app/services/api-cubes.ts
+++ b/src/app/services/api-cubes.ts
@@ -18,11 +18,12 @@ export class ApiCubesService {
constructor(private http: Http) {
}
- searchCubes(queryTitle: string): Observable {
+ searchCubes(queryTitle: string, size: number, from: number): Observable {
let params = new URLSearchParams();
params.set('q', `"${queryTitle}"`);
- params.set('size', '10000');
+ params.set('size', size.toString());
+ params.set('from', from.toString());
return this.http.get(`${this.API_PACKAGES_PATH}`, {search: params})
.map(res => res.json())
;
@@ -77,7 +78,6 @@ export class ApiCubesService {
let orderString = element.sorts.map(s => s.column.ref + ':' + s.direction.key).join('|');
let cutString = element.cuts.map(c => c.column.ref + c.transitivity.key + ':' + c.value).join('|');
- debugger;
let params = new URLSearchParams();
if (element.cuts.length > 0) params.set('cut', cutString);
if (element.sorts.length > 0) params.set('order', orderString);
diff --git a/src/app/services/tree-execution.ts b/src/app/services/tree-execution.ts
deleted file mode 100644
index 83f2b45..0000000
--- a/src/app/services/tree-execution.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Created by larjo on 14/7/2016.
- */
-import 'rxjs/add/operator/map';
-import { Injectable } from '@angular/core';
-import {Store} from "@ngrx/store";
-import {Observable} from 'rxjs/Observable';
-import {ApiCubesService} from "./api-cubes";
-import {ExpressionNode} from "../models/expressionNode";
-import {AggregateNode} from "../models/aggregate/aggregateNode";
-import {ExpressionTree} from "../models/expressionTree";
-import {State} from "../reducers/index";
-import {Cube} from "../models/cube";
-import 'rxjs/add/operator/mergeMap'
-import {FuncNode} from "../models/func/funcNode";
-import {ReplaceAction} from "../actions/tree";
-
-@Injectable()
-export class TreeExecution {
-
- constructor(private rudolfCubesService: ApiCubesService, private store:Store) {}
-
- execute(expressionTree: ExpressionTree, rootNode:ExpressionNode){
- let that = this;
- if(rootNode instanceof AggregateNode){
- let observable = this.rudolfCubesService.aggregate(rootNode.element).share();
- observable.subscribe(response=>{
- rootNode.value = response;
- rootNode.executed = true;
- that.store.dispatch(new ReplaceAction(expressionTree));
- // return rootNode.value;
-
- });
-
- return observable;
-
- /* .catch(() => Observable.of(this.cubeActions.searchComplete([]));*/
- }
- else if(rootNode instanceof FuncNode) {
-
- if(rootNode.children.length<1){
- return Observable.create(function (observer) {
- rootNode.executed = true;
- that.store.dispatch(new ReplaceAction(expressionTree));
-
- observer.next({});
- })
- }
- let observables = [];
-
- rootNode.children.map(function (child) {
- return child.value;
- });
-
- rootNode.children.forEach((child) => {
- observables.push(this.execute(expressionTree, child));
- });
-
- let observable = Observable.forkJoin(observables).share();
- observable.subscribe(response=>{
- let data = rootNode.children.map(function (child) {
- return child.value;
- });
- rootNode.value = rootNode.element.invoke(data);
- rootNode.executed = true;
- that.store.dispatch(new ReplaceAction(expressionTree));
- });
-
- return observable;
-
-
- }
-
-
- }
-
-}
diff --git a/USERGUIDE.md b/src/assets/USERGUIDE.md
similarity index 97%
rename from USERGUIDE.md
rename to src/assets/USERGUIDE.md
index 80b3b17..49bc96e 100644
--- a/USERGUIDE.md
+++ b/src/assets/USERGUIDE.md
@@ -13,7 +13,7 @@ In the near future, Indigo is going to be backed by DAM, a service that can coor
When you visit Indigo's home page, you are presented with a search box, where you can type a word that is contained in a dataset's name in order to filter the datasets:
-
+
If you type nothing in the search box, you get all the datasets in the configured store. If you are using a Rudolf API store, you also get the Global dataset - you will use it in the following sections to build a time series analysis task. If you have spotted the dataset you want to analyze, press the green button "Analytics & Data Mining".
diff --git a/src/assets/img/OpenBudgets_Team.jpg b/src/assets/img/OpenBudgets_Team.jpg
new file mode 100644
index 0000000..13325e7
Binary files /dev/null and b/src/assets/img/OpenBudgets_Team.jpg differ
diff --git a/src/assets/img/OpenBudgets_Team_cropped.png b/src/assets/img/OpenBudgets_Team_cropped.png
new file mode 100644
index 0000000..5f8b2e6
Binary files /dev/null and b/src/assets/img/OpenBudgets_Team_cropped.png differ
diff --git a/src/assets/img/banner-image.png b/src/assets/img/banner-image.png
new file mode 100644
index 0000000..1c4f18a
Binary files /dev/null and b/src/assets/img/banner-image.png differ
diff --git a/src/assets/img/berlin2.jpg b/src/assets/img/berlin2.jpg
new file mode 100644
index 0000000..66ba315
Binary files /dev/null and b/src/assets/img/berlin2.jpg differ
diff --git a/src/assets/img/cd-arrow.svg b/src/assets/img/cd-arrow.svg
new file mode 100644
index 0000000..eb8f50b
--- /dev/null
+++ b/src/assets/img/cd-arrow.svg
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/src/assets/img/cd-icon-arrow-1.svg b/src/assets/img/cd-icon-arrow-1.svg
new file mode 100644
index 0000000..757be23
--- /dev/null
+++ b/src/assets/img/cd-icon-arrow-1.svg
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/src/assets/img/cd-icon-arrow-2.svg b/src/assets/img/cd-icon-arrow-2.svg
new file mode 100644
index 0000000..84a72fa
--- /dev/null
+++ b/src/assets/img/cd-icon-arrow-2.svg
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/src/assets/img/cd-logo.svg b/src/assets/img/cd-logo.svg
new file mode 100644
index 0000000..cbd742e
--- /dev/null
+++ b/src/assets/img/cd-logo.svg
@@ -0,0 +1,9 @@
+
+
+
+
diff --git a/src/assets/img/cd-socials.svg b/src/assets/img/cd-socials.svg
new file mode 100644
index 0000000..df7c367
--- /dev/null
+++ b/src/assets/img/cd-socials.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/img/chart.svg b/src/assets/img/chart.svg
new file mode 100644
index 0000000..e1a3bcf
--- /dev/null
+++ b/src/assets/img/chart.svg
@@ -0,0 +1,26 @@
+
+
+
diff --git a/src/assets/img/deliverable.png b/src/assets/img/deliverable.png
new file mode 100644
index 0000000..ed410d3
Binary files /dev/null and b/src/assets/img/deliverable.png differ
diff --git a/src/assets/img/down-arrow.svg b/src/assets/img/down-arrow.svg
new file mode 100644
index 0000000..bf9f800
--- /dev/null
+++ b/src/assets/img/down-arrow.svg
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/assets/img/embed.svg b/src/assets/img/embed.svg
new file mode 100644
index 0000000..fb9827a
--- /dev/null
+++ b/src/assets/img/embed.svg
@@ -0,0 +1,35 @@
+
+
+
diff --git a/src/assets/img/europes-money.png b/src/assets/img/europes-money.png
new file mode 100644
index 0000000..cf10bea
Binary files /dev/null and b/src/assets/img/europes-money.png differ
diff --git a/src/assets/img/find.svg b/src/assets/img/find.svg
new file mode 100644
index 0000000..2e0ad07
--- /dev/null
+++ b/src/assets/img/find.svg
@@ -0,0 +1,10 @@
+
+
+
diff --git a/src/assets/img/heart.svg b/src/assets/img/heart.svg
new file mode 100644
index 0000000..9c57e7b
--- /dev/null
+++ b/src/assets/img/heart.svg
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/src/assets/img/logos/TI.png b/src/assets/img/logos/TI.png
new file mode 100644
index 0000000..abf7346
Binary files /dev/null and b/src/assets/img/logos/TI.png differ
diff --git a/src/assets/img/logos/VSE.png b/src/assets/img/logos/VSE.png
new file mode 100644
index 0000000..826fac0
Binary files /dev/null and b/src/assets/img/logos/VSE.png differ
diff --git a/src/assets/img/logos/fraunhofer.png b/src/assets/img/logos/fraunhofer.png
new file mode 100644
index 0000000..20cf15a
Binary files /dev/null and b/src/assets/img/logos/fraunhofer.png differ
diff --git a/src/assets/img/logos/j++.png b/src/assets/img/logos/j++.png
new file mode 100644
index 0000000..13edc8b
Binary files /dev/null and b/src/assets/img/logos/j++.png differ
diff --git a/src/assets/img/logos/logo_civio.png b/src/assets/img/logos/logo_civio.png
new file mode 100644
index 0000000..84b20cf
Binary files /dev/null and b/src/assets/img/logos/logo_civio.png differ
diff --git a/src/assets/img/logos/okf.png b/src/assets/img/logos/okf.png
new file mode 100644
index 0000000..a5d9f4e
Binary files /dev/null and b/src/assets/img/logos/okf.png differ
diff --git a/src/assets/img/logos/okfde.png b/src/assets/img/logos/okfde.png
new file mode 100644
index 0000000..b5fb4e4
Binary files /dev/null and b/src/assets/img/logos/okfde.png differ
diff --git a/src/assets/img/logos/okfngr.svg b/src/assets/img/logos/okfngr.svg
new file mode 100644
index 0000000..6f975b5
--- /dev/null
+++ b/src/assets/img/logos/okfngr.svg
@@ -0,0 +1,138 @@
+
+
+
diff --git a/src/assets/img/logos/unibonn.png b/src/assets/img/logos/unibonn.png
new file mode 100644
index 0000000..12f50d6
Binary files /dev/null and b/src/assets/img/logos/unibonn.png differ
diff --git a/src/assets/img/mapping-the-landscape.png b/src/assets/img/mapping-the-landscape.png
new file mode 100644
index 0000000..22f739d
Binary files /dev/null and b/src/assets/img/mapping-the-landscape.png differ
diff --git a/src/assets/img/mining.svg b/src/assets/img/mining.svg
new file mode 100644
index 0000000..1d3bd35
--- /dev/null
+++ b/src/assets/img/mining.svg
@@ -0,0 +1,13 @@
+
+
+
diff --git a/src/assets/img/open-budget-survey.png b/src/assets/img/open-budget-survey.png
new file mode 100644
index 0000000..623873e
Binary files /dev/null and b/src/assets/img/open-budget-survey.png differ
diff --git a/src/assets/img/openbudgets-logo-squared.png b/src/assets/img/openbudgets-logo-squared.png
new file mode 100644
index 0000000..176b944
Binary files /dev/null and b/src/assets/img/openbudgets-logo-squared.png differ
diff --git a/src/assets/img/openbudgets-logo-white.png b/src/assets/img/openbudgets-logo-white.png
new file mode 100644
index 0000000..9d11599
Binary files /dev/null and b/src/assets/img/openbudgets-logo-white.png differ
diff --git a/src/assets/img/openbudgets-logo.png b/src/assets/img/openbudgets-logo.png
new file mode 100644
index 0000000..09d0177
Binary files /dev/null and b/src/assets/img/openbudgets-logo.png differ
diff --git a/src/assets/img/openbudgets-logo.svg b/src/assets/img/openbudgets-logo.svg
new file mode 100644
index 0000000..418b4e8
--- /dev/null
+++ b/src/assets/img/openbudgets-logo.svg
@@ -0,0 +1,23 @@
+
+
+
diff --git a/src/assets/img/pattern.svg b/src/assets/img/pattern.svg
new file mode 100644
index 0000000..d8e269b
--- /dev/null
+++ b/src/assets/img/pattern.svg
@@ -0,0 +1,52 @@
+
+
+
diff --git a/src/assets/img/performance.svg b/src/assets/img/performance.svg
new file mode 100644
index 0000000..f0dddbd
--- /dev/null
+++ b/src/assets/img/performance.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/img/placeholder.svg b/src/assets/img/placeholder.svg
new file mode 100644
index 0000000..76910d5
--- /dev/null
+++ b/src/assets/img/placeholder.svg
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/assets/img/reply.svg b/src/assets/img/reply.svg
new file mode 100644
index 0000000..dd6a26b
--- /dev/null
+++ b/src/assets/img/reply.svg
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/src/assets/img/retweet.svg b/src/assets/img/retweet.svg
new file mode 100644
index 0000000..e9eca1e
--- /dev/null
+++ b/src/assets/img/retweet.svg
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/src/assets/img/team.jpg b/src/assets/img/team.jpg
new file mode 100644
index 0000000..81c6bee
Binary files /dev/null and b/src/assets/img/team.jpg differ
diff --git a/src/assets/img/technical-structure.svg b/src/assets/img/technical-structure.svg
new file mode 100644
index 0000000..1572fce
--- /dev/null
+++ b/src/assets/img/technical-structure.svg
@@ -0,0 +1,2371 @@
+
+
+
+
diff --git a/src/assets/img/technical_structure.jpg b/src/assets/img/technical_structure.jpg
new file mode 100644
index 0000000..c0eaab7
Binary files /dev/null and b/src/assets/img/technical_structure.jpg differ
diff --git a/src/assets/img/tree-map.svg b/src/assets/img/tree-map.svg
new file mode 100644
index 0000000..24f8ca4
--- /dev/null
+++ b/src/assets/img/tree-map.svg
@@ -0,0 +1,22 @@
+
+
+
diff --git a/src/assets/img/upload1.jpg b/src/assets/img/upload1.jpg
new file mode 100644
index 0000000..7900da8
Binary files /dev/null and b/src/assets/img/upload1.jpg differ
diff --git a/src/assets/img/upload2.jpg b/src/assets/img/upload2.jpg
new file mode 100644
index 0000000..e63348b
Binary files /dev/null and b/src/assets/img/upload2.jpg differ
diff --git a/src/assets/img/upload3.jpg b/src/assets/img/upload3.jpg
new file mode 100644
index 0000000..03d0a06
Binary files /dev/null and b/src/assets/img/upload3.jpg differ
diff --git a/src/assets/img/workpackagestructure.png b/src/assets/img/workpackagestructure.png
new file mode 100644
index 0000000..3314461
Binary files /dev/null and b/src/assets/img/workpackagestructure.png differ
diff --git a/resources/indigo_cube_find.gif b/src/assets/resources/indigo_cube_find.gif
similarity index 100%
rename from resources/indigo_cube_find.gif
rename to src/assets/resources/indigo_cube_find.gif
diff --git a/src/assets/sprites/brushed_alu.png b/src/assets/sprites/brushed_alu.png
new file mode 100644
index 0000000..bf5a581
Binary files /dev/null and b/src/assets/sprites/brushed_alu.png differ
diff --git a/src/public/sprites/footer_lodyas.png b/src/assets/sprites/footer_lodyas.png
similarity index 100%
rename from src/public/sprites/footer_lodyas.png
rename to src/assets/sprites/footer_lodyas.png
diff --git a/src/public/sprites/grid_paper.png b/src/assets/sprites/grid_paper.png
similarity index 100%
rename from src/public/sprites/grid_paper.png
rename to src/assets/sprites/grid_paper.png
diff --git a/src/assets/sprites/icon.png b/src/assets/sprites/icon.png
new file mode 100644
index 0000000..4cdf78f
Binary files /dev/null and b/src/assets/sprites/icon.png differ
diff --git a/src/assets/sprites/openbudgets-logo.svg b/src/assets/sprites/openbudgets-logo.svg
new file mode 100644
index 0000000..418b4e8
--- /dev/null
+++ b/src/assets/sprites/openbudgets-logo.svg
@@ -0,0 +1,23 @@
+
+
+
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index e0c0ff7..90aa13d 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -5,9 +5,12 @@
export const environment = {
production: false,
+ searchSize: 50,
apiUrl: 'http://localhost/rudolf/public',
openCpuEndpoint: 'http://okfnrg.math.auth.gr/ocpu/',
versionSuffix: '3',
baseHref: 'indigo/',
- DAMUrl: 'http://192.168.0.108:5000'
+ DAMUrl: 'http://dam-obeu.iais.fraunhofer.de',
+ DAMretries: 12,
+ DAMpollingInitialStep: 1000,
};
diff --git a/src/index.html b/src/index.html
index fc798a9..a8e26ec 100644
--- a/src/index.html
+++ b/src/index.html
@@ -27,9 +27,7 @@
-webkit-animation: fullexpand 1.5s ease-out;
}
- html{
- background-color: #303030;
- }
+
/* Full Width Animation Bar */
@@ -54,13 +52,12 @@
-
-
+
-
+
diff --git a/src/main.ts b/src/main.ts
index 6dfa9a6..5c3c520 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,8 +9,4 @@ if (environment.production) {
enableProdMode();
}
-if (!/localhost/.test(document.location.host)) {
- enableProdMode();
-}
-
platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/obeu-theme.scss b/src/obeu-theme.scss
index 8268937..a300606 100644
--- a/src/obeu-theme.scss
+++ b/src/obeu-theme.scss
@@ -1,29 +1,118 @@
-@import '~@angular/material/core/theming/all-theme';
+@import '~@angular/material/theming';
@include mat-core();
+
+
+
+
+
+
+// Foreground palette for dark themes.
+$mat-dark-theme-foreground: (
+ base: white,
+ divider: $white-12-opacity,
+ dividers: $white-12-opacity,
+ disabled: rgba(white, 0.3),
+ disabled-button: rgba(white, 0.3),
+ disabled-text: rgba(white, 0.3),
+ hint-text: rgba(white, 0.3),
+ secondary-text: rgba(white, 0.7),
+ icon: white,
+ icons: white,
+ text: white,
+ slider-off: rgba(white, 0.3),
+ slider-off-active: rgba(white, 0.3),
+);
+
+
+
+
+
+
+$md-obeupalette0: (
+ 50 : #eaf7eb,
+ 100 : #cbeacd,
+ 200 : #a8dcac,
+ 300 : #85ce8a,
+ 400 : #6ac471,
+ 500 : #50b958,
+ 600 : #49b250,
+ 700 : #40aa47,
+ 800 : #37a23d,
+ 900 : #27932d,
+ A100 : #d4ffd6,
+ A200 : #a1ffa5,
+ A400 : #6eff74,
+ A700 : #54ff5c,
+ contrast: (
+ 50 : #000000,
+ 100 : #000000,
+ 200 : #000000,
+ 300 : #000000,
+ 400 : #000000,
+ 500 : #000000,
+ 600 : #000000,
+ 700 : #ffffff,
+ 800 : #ffffff,
+ 900 : #ffffff,
+ A100 : #000000,
+ A200 : #000000,
+ A400 : #000000,
+ A700 : #000000,
+ )
+);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue.
-$indigo-app-primary: mat-palette($mat-green);
-$indigo-app-accent: mat-palette($mat-indigo, A200, A100, A400);
+$indigo-app-primary: mat-palette($md-obeupalette0);
+$indigo-app-accent: mat-palette($md-obeupalette0, A200, A100, A400);
+
// The warn palette is optional (defaults to red).
$indigo-app-warn: mat-palette($mat-red);
// Create the theme object (a Sass map containing all of the palettes).
-$indigo-app-theme: mat-dark-theme($indigo-app-primary, $indigo-app-accent, $indigo-app-warn);
+$indigo-app-theme: mat-light-theme($indigo-app-primary, $indigo-app-accent, $indigo-app-warn);
+$indigo-app-theme-button: mat-dark-theme($indigo-app-primary, $indigo-app-accent, $indigo-app-warn);
+@include mat-button-theme($indigo-app-theme-button);
+
+$mat-font-family: 'Cabin', sans-serif;
// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
// that you are using.
@include angular-material-theme($indigo-app-theme);
-
+md-card-header, #giant, md-toolbar{
+ background-color: map_get($md-obeupalette0, 500);
+ color: map_get( map_get($md-obeupalette0, 'contrast'), 700)
+}
.mat-card-header-text{
display: flex;
}
.output-card{
- background: rgba(48, 48, 48, 0.71);
+ background: rgba(255, 255, 255, 0.58);
margin: 10px 0;
}
@@ -31,7 +120,10 @@ $indigo-app-theme: mat-dark-theme($indigo-app-primary, $indigo-app-accent, $indi
margin: 0 0 10px 0;
}
-
+bc-toolbar.indigo {
+ display: flex;
+ background: #4caf50;
+}
.output-card md-card-title{
font-size: 20px;
@@ -43,6 +135,11 @@ $indigo-app-theme: mat-dark-theme($indigo-app-primary, $indigo-app-accent, $indi
}
+footer{
+ background: #4E6864;
+}
+
+
th {
text-align: center;
background: gainsboro;
@@ -58,3 +155,678 @@ md-chip {
}
+*{
+ font-family: 'Cabin', sans-serif;
+}
+
+
+.mat-select-placeholder{
+ font-size: 14px;
+}
+
+.font-override { // body or wrapper class
+ .mat-button-toggle,
+ %mat-button-base,
+ .mat-button,
+ .mat-raised-button,
+ .mat-fab,
+ .mat-icon-button,
+ .mat-mini-fab,
+ .mat-card,
+ .mat-checkbox,
+ .mat-input-container,
+ .mat-list,
+ .mat-menu-item,
+ .mat-radio-button,
+ .mat-select,
+ .mat-list .mat-list-item .mat-list-item-content,
+ .mat-nav-list .mat-list-item .mat-list-item-content,
+ .mat-simple-snackbar,
+ .mat-tab-label,
+ .mat-slide-toggle-content,
+ .mat-option,
+ .mat-toolbar,
+
+ .mat-tooltip {
+ font-family: $mat-font-family!important;
+ }
+}
+
+
+md-chip-list{
+ overflow: auto;
+ padding: 0 20px 0 0;
+}
+
+md-chip{
+ cursor: pointer;
+}
+
+
+.row-item{
+ margin: 10px 0;
+}
+
+
+md-card-header md-card-title, md-toolbar{
+
+ color:white;
+}
+
+md-card-header .mat-button, md-card-header .mat-icon-button, md-card-header .mat-raised-button {
+ color: white;
+}
+
+.mat-raised-button.mat-primary, .mat-fab.mat-primary, .mat-mini-fab.mat-primary {
+ color: white;
+}
+
+md-select{
+ width:100%;
+}
+
+md-chip-list .mat-chip:not(.mat-basic-chip)+.mat-chip:not(.mat-basic-chip) {
+ margin: 3px;
+}
+
+md-card.input-card{
+ margin: 5px 0;
+}
+
+fact-request-builder>md-card, aggregate-request-builder>md-card{
+ margin: 5px 0;
+}
+
+
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+/** 1. Set default font family to sans-serif. 2. Prevent iOS and IE text size adjust after device orientation change, without disabling user zoom. */
+html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
+
+/** Remove default margin. */
+body { margin: 0; }
+
+/* HTML5 display definitions ========================================================================== */
+/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
+article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
+
+/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
+audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
+
+/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
+audio:not([controls]) { display: none; height: 0; }
+
+/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. */
+[hidden], template { display: none; }
+
+/* Links ========================================================================== */
+/** Remove the gray background color from active links in IE 10. */
+a { background-color: transparent; }
+
+/** Improve readability of focused elements when they are also in an active/hover state. */
+a:active, a:hover { outline: 0; }
+
+/* Text-level semantics ========================================================================== */
+/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
+abbr[title] { border-bottom: 1px dotted; }
+
+/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
+b, strong { font-weight: bold; }
+
+/** Address styling not present in Safari and Chrome. */
+dfn { font-style: italic; }
+
+/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
+h1 { font-size: 2em; margin: 0.67em 0; }
+
+/** Address styling not present in IE 8/9. */
+mark { background: #ff0; color: #000; }
+
+/** Address inconsistent and variable font size in all browsers. */
+small { font-size: 80%; }
+
+/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
+sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
+
+sup { top: -0.5em; }
+
+sub { bottom: -0.25em; }
+
+/* Embedded content ========================================================================== */
+/** Remove border when inside `a` element in IE 8/9/10. */
+img { border: 0; }
+
+/** Correct overflow not hidden in IE 9/10/11. */
+svg:not(:root) { overflow: hidden; }
+
+/* Grouping content ========================================================================== */
+/** Address margin not present in IE 8/9 and Safari. */
+figure { margin: 1em 40px; }
+
+/** Address differences between Firefox and other browsers. */
+hr { box-sizing: content-box; height: 0; }
+
+/** Contain overflow in all browsers. */
+pre { overflow: auto; }
+
+/** Address odd `em`-unit font size rendering in all browsers. */
+code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
+
+
+
+/* Tables ========================================================================== */
+/** Remove most spacing between table cells. */
+table { border-collapse: collapse; border-spacing: 0; }
+
+td, th { padding: 0; }
+
+html { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
+
+*, *:before, *:after { -webkit-box-sizing: inherit; -moz-box-sizing: inherit; box-sizing: inherit; }
+
+select { margin-bottom: 1.5rem; max-width: 100%; width: auto; }
+
+ul, ol { list-style-type: none; margin: 0; padding: 0; }
+article ul { list-style-type: disc; margin-bottom: 0.75rem; padding-left: 1.5rem; }
+article ol { list-style-type: decimal; margin-bottom: 0.75rem; padding-left: 1.5rem; }
+
+dl { margin-bottom: 0.75rem; }
+dl dt { font-weight: bold; margin-top: 0.75rem; }
+dl dd { margin: 0; }
+
+table { -webkit-font-feature-settings: "kern", "liga", "tnum"; -moz-font-feature-settings: "kern", "liga", "tnum"; -ms-font-feature-settings: "kern", "liga", "tnum"; font-feature-settings: "kern", "liga", "tnum"; border-collapse: collapse; margin: 0.75rem 0; table-layout: fixed; width: 100%; }
+
+th { border-bottom: 1px solid #a4c2bc; font-weight: 600; padding: 0.75rem 0; text-align: left; }
+
+td { border-bottom: 2px solid #d1e1de; padding: 0.75rem 0; }
+
+tr, td, th { vertical-align: middle; }
+
+body { -webkit-font-feature-settings: "kern", "liga", "pnum"; -moz-font-feature-settings: "kern", "liga", "pnum"; -ms-font-feature-settings: "kern", "liga", "pnum"; font-feature-settings: "kern", "liga", "pnum"; -webkit-font-smoothing: antialiased; color: #868593; font-family: "Cabin", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; font-size: 1em; line-height: 1.5; }
+
+h1, h2, h3, h4, h5, h6 { font-family: "Cabin", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; font-size: 1em; line-height: 1.2; margin: 1.5rem 0 0.75rem 0; color: #112233; }
+
+p { margin: 0 0 0.75rem; }
+
+a { color: #50B958; text-decoration: none; transition: color 0.1s linear; }
+a:active, a:focus, a:hover { color: #36873c; }
+a:active, a:focus { outline: none; }
+
+h1 { font-size: 1.625rem; }
+@media (min-width: 40rem) { h1 { font-size: 1.875rem; } }
+
+h2 { font-size: 1.5rem; }
+@media (min-width: 40rem) { h2 { font-size: 1.625rem; } }
+
+h3 { font-size: 1.375rem; }
+@media (min-width: 40rem) { h3 { font-size: 1.5rem; } }
+
+h4 { font-size: 1.25rem; }
+@media (min-width: 40rem) { h4 { font-size: 1.375rem; } }
+
+h5 { font-size: 1.125rem; }
+@media (min-width: 40rem) { h5 { font-size: 1.25rem; } }
+
+h6 { font-size: 1rem; }
+@media (min-width: 40rem) { h6 { font-size: 1.125rem; } }
+
+/* --------------------------------
+
+Modules - reusable parts of our design
+
+-------------------------------- */
+.cd-img-replace { /* replace text with a background-image */ display: inline-block; overflow: hidden; text-indent: 100%; white-space: nowrap; }
+
+.overflow-hidden { overflow: hidden; }
+
+/* --------------------------------
+
+Main components
+
+-------------------------------- */
+.cd-main-content { /* set a min-height and a z-index to be sure that the main element completely covers the lateral menu */ min-height: 100%; position: relative; background-color: #fff; z-index: 2; padding-top: 50px; /* Force Hardware Acceleration in WebKit */ -webkit-transform: translateZ(0); -webkit-backface-visibility: hidden; -webkit-transition-property: -webkit-transform; -moz-transition-property: -moz-transform; transition-property: transform; -webkit-transition-duration: 0.4s; -moz-transition-duration: 0.4s; transition-duration: 0.4s; }
+.cd-main-content.lateral-menu-is-open { /* translate to show the lateral menu - all content needs to be put in the .cd-main-content to translate*/ -webkit-transform: translateX(-260px); -moz-transform: translateX(-260px); -ms-transform: translateX(-260px); -o-transform: translateX(-260px); transform: translateX(-260px); }
+@media only screen and (min-width: 40rem) { .cd-main-content { padding-top: 70px; } }
+@media only screen and (min-width: 53.75rem) { .cd-main-content { padding-top: 125px; } }
+
+.site-header { position: absolute; top: 0; left: 0; height: 50px; width: 100%; background: #50B958; z-index: 3; /* Force Hardware Acceleration in WebKit */ -webkit-transform: translateZ(0); -webkit-backface-visibility: hidden; -webkit-transition-property: -webkit-transform; -moz-transition-property: -moz-transform; transition-property: transform; -webkit-transition-duration: 0.4s; -moz-transition-duration: 0.4s; transition-duration: 0.4s; }
+.site-header.lateral-menu-is-open { /* translate to show the lateral menu */ -webkit-transform: translateX(-260px); -moz-transform: translateX(-260px); -ms-transform: translateX(-260px); -o-transform: translateX(-260px); transform: translateX(-260px); }
+.site-header.is-fixed { position: fixed; }
+@media only screen and (min-width: 40rem) { .site-header { height: 70px; } }
+@media only screen and (min-width: 53.75rem) { .site-header { height: 125px; } }
+
+#cd-menu-trigger { position: absolute; right: 0; top: 0; height: 100%; width: 50px; background-color: #74c87b; }
+#cd-menu-trigger .cd-menu-text { height: 100%; text-transform: uppercase; color: #FFF; font-weight: 600; display: none; }
+#cd-menu-trigger .cd-menu-icon { /* this span is the central line in the menu menu */ display: inline-block; position: absolute; left: 50%; top: 50%; bottom: auto; right: auto; -webkit-transform: translateX(-50%) translateY(-50%); -moz-transform: translateX(-50%) translateY(-50%); -ms-transform: translateX(-50%) translateY(-50%); -o-transform: translateX(-50%) translateY(-50%); transform: translateX(-50%) translateY(-50%); width: 18px; height: 2px; background-color: #FFF; /* these are the upper and lower lines in the menu menu */ }
+#cd-menu-trigger .cd-menu-icon::before, #cd-menu-trigger .cd-menu-icon:after { content: ''; width: 100%; height: 100%; position: absolute; background-color: inherit; left: 0; }
+#cd-menu-trigger .cd-menu-icon::before { bottom: 5px; }
+#cd-menu-trigger .cd-menu-icon::after { top: 5px; }
+#cd-menu-trigger.is-clicked .cd-menu-icon { background-color: rgba(255, 255, 255, 0); }
+#cd-menu-trigger.is-clicked .cd-menu-icon::before, #cd-menu-trigger.is-clicked .cd-menu-icon::after { background-color: white; }
+#cd-menu-trigger.is-clicked .cd-menu-icon::before { bottom: 0; -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); -o-transform: rotate(45deg); transform: rotate(45deg); }
+#cd-menu-trigger.is-clicked .cd-menu-icon::after { top: 0; -webkit-transform: rotate(-45deg); -moz-transform: rotate(-45deg); -ms-transform: rotate(-45deg); -o-transform: rotate(-45deg); transform: rotate(-45deg); }
+@media only screen and (min-width: 40rem) { #cd-menu-trigger { width: 110px; padding-left: 1.25em; }
+ #cd-menu-trigger .cd-menu-text { display: inline-block; line-height: 70px; }
+ #cd-menu-trigger .cd-menu-icon { left: auto; right: 1.25em; -webkit-transform: translateX(0); -moz-transform: translateX(0); -ms-transform: translateX(0); -o-transform: translateX(0); transform: translateX(0); } }
+
+#cd-lateral-nav { position: fixed; height: 100%; right: 0; top: 0; visibility: hidden; /* the secondary navigation is covered by the main element */ z-index: 1; width: 260px; background-color: #333; overflow-y: auto; /* Force Hardware Acceleration in WebKit */ -webkit-transform: translateZ(0); -webkit-backface-visibility: hidden; -webkit-transition: -webkit-transform .4s 0s, visibility 0s .4s; -moz-transition: -moz-transform .4s 0s, visibility 0s .4s; transition: transform .4s 0s, visibility 0s .4s; /* this creates the subtle slide in animation of the navigation */ -webkit-transform: translateX(80px); -moz-transform: translateX(80px); -ms-transform: translateX(80px); -o-transform: translateX(80px); transform: translateX(80px); }
+#cd-lateral-nav .cd-navigation { margin: 10px 0 16px; }
+#cd-lateral-nav .sub-menu { padding: 0 10px 20px 15px; display: none; }
+#cd-lateral-nav a { display: block; line-height: 2em; padding: 0 16px 0 32px; color: #F0F5F4; }
+#cd-lateral-nav a.current { background-color: #4d4d4d; color: #FFF; }
+.no-touch #cd-lateral-nav a:hover { color: #FFF; }
+@media only screen and (min-width: 40rem) { #cd-lateral-nav .cd-navigation { margin: 20px 0; } }
+#cd-lateral-nav.lateral-menu-is-open { -webkit-transform: translateX(0); -moz-transform: translateX(0); -ms-transform: translateX(0); -o-transform: translateX(0); transform: translateX(0); visibility: visible; -webkit-transition: -webkit-transform .4s 0s, visibility 0s 0s; -moz-transition: -moz-transform .4s 0s, visibility 0s 0s; transition: transform .4s 0s, visibility 0s 0s; /* smooth the scrolling on touch devices - webkit browsers */ -webkit-overflow-scrolling: touch; }
+
+/* style menu items which have a submenu */
+#cd-lateral-nav .item-has-children > a { position: relative; text-transform: uppercase; font-weight: 600; /* this is the right arrow to show that the item has a submenu */ }
+#cd-lateral-nav .item-has-children > a::after { content: ''; display: block; height: 11px; width: 8px; position: absolute; top: 50%; bottom: auto; -webkit-transform: translateY(-50%); -moz-transform: translateY(-50%); -ms-transform: translateY(-50%); -o-transform: translateY(-50%); transform: translateY(-50%); right: 1em; background: url("assets/img/cd-arrow.svg") no-repeat center center; background-size: 8px 11px; -webkit-transition-property: -webkit-transform; -moz-transition-property: -moz-transform; transition-property: transform; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; transition-duration: 0.2s; }
+#cd-lateral-nav .item-has-children > a.submenu-open::after { -webkit-transform: translateY(-50%) rotate(90deg); -moz-transform: translateY(-50%) rotate(90deg); -ms-transform: translateY(-50%) rotate(90deg); -o-transform: translateY(-50%) rotate(90deg); transform: translateY(-50%) rotate(90deg); }
+
+#cd-lateral-nav .socials { padding: 0 32px; }
+#cd-lateral-nav .socials::after { clear: both; content: ""; display: table; }
+
+#cd-lateral-nav .socials a, .site-header .socials a { height: 32px; width: 32px; float: left; padding: 0; background-image: url("assets/img/cd-socials.svg"); background-repeat: no-repeat; background-size: 160px 96px; margin-right: 1em; border-radius: 32px; }
+#cd-lateral-nav .socials a.cd-twitter, .site-header .socials a.cd-twitter { background-position: 0 -64px; }
+#cd-lateral-nav .socials a.cd-github, .site-header .socials a.cd-github { background-position: -32px -64px; }
+#cd-lateral-nav .socials a.cd-facebook, .site-header .socials a.cd-facebook { background-position: -64px -64px; }
+#cd-lateral-nav .socials a.cd-google, .site-header .socials a.cd-google { background-position: -96px -64px; }
+#cd-lateral-nav .socials a.cd-linkedin, .site-header .socials a.cd-linkedin { background-position: -128px -64px; }
+.no-touch #cd-lateral-nav .socials a:hover, .no-touch .site-header .socials a:hover { background-color: #50B958; }
+.no-touch #cd-lateral-nav .socials a:hover.cd-twitter, .no-touch .site-header .socials a:hover.cd-twitter { background-position: 0 -32px; }
+.no-touch #cd-lateral-nav .socials a:hover.cd-github, .no-touch .site-header .socials a:hover.cd-github { background-position: -32px -32px; }
+.no-touch #cd-lateral-nav .socials a:hover.cd-facebook, .no-touch .site-header .socials a:hover.cd-facebook { background-position: -64px -32px; }
+.no-touch #cd-lateral-nav .socials a:hover.cd-google, .no-touch .site-header .socials a:hover.cd-google { background-position: -96px -32px; }
+.no-touch #cd-lateral-nav .socials a:hover.cd-linkedin, .no-touch .site-header .socials a:hover.cd-linkedin { background-position: -128px -32px; }
+
+#cd-lateral-nav .socials a.cd-twitter { background-position: 0 -32px; }
+#cd-lateral-nav .socials a.cd-github { background-position: -32px -32px; }
+#cd-lateral-nav .socials a.cd-facebook { background-position: -64px -32px; }
+#cd-lateral-nav .socials a.cd-google { background-position: -96px -32px; }
+#cd-lateral-nav .socials a.cd-linkedin { background-position: -128px -32px; }
+
+.site-header .socials { margin-left: 0.75rem; }
+
+html { overflow-x: hidden; }
+
+body { background-color: #fff; }
+
+hr { border-bottom: 2px solid #d1e1de; border-bottom-width: 1px; border-left: none; border-right: none; border-top: none; margin: 1.5rem 0; }
+
+img, picture { margin: 0; max-width: 100%; }
+
+.wrapper { max-width: 68rem; margin-left: auto; margin-right: auto; }
+.wrapper::after { clear: both; content: ""; display: table; }
+.wrapper > article, .wrapper > aside { padding: 1.5rem; margin-top: 0.75rem; }
+@media (min-width: 53.75rem) { .wrapper.aside { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAA1JREFUCB1jWL1qxX8ABv4C/R7sPqQAAAAASUVORK5CYII=); background-repeat: repeat-y; background-position: 76%; } }
+@media (min-width: 53.75rem) { .wrapper.aside > article { float: left; display: block; margin-right: 2.35765%; width: 74.41059%; }
+ .wrapper.aside > article:last-child { margin-right: 0; } }
+@media (min-width: 53.75rem) { .wrapper.aside > aside { float: left; display: block; margin-right: 2.35765%; width: 23.23176%; }
+ .wrapper.aside > aside:last-child { margin-right: 0; } }
+.wrapper.aside > aside > section { padding-bottom: 1.5rem; }
+.wrapper.aside > aside > section.news-feed div { padding-bottom: 0.75rem; border-bottom: dotted 1px rgba(213, 213, 213, 0.3); }
+.wrapper.aside > aside > section.news-feed div h5 { font-size: 1.1em; margin-bottom: 0.375rem; }
+.wrapper.aside > aside > section.news-feed div span { font-size: 0.9em; }
+.wrapper.aside > aside > section.news-feed div > a { color: inherit; display: block; line-height: 1.3; margin-top: 0.75rem; font-size: 0.8em; }
+.wrapper.aside > aside > section.twitter-feed { font-size: 0.8em; }
+.wrapper.aside > aside > section.twitter-feed li { border-bottom: dotted 1px rgba(213, 213, 213, 0.3); margin-bottom: 0.375rem; padding-top: 0.375rem; padding-left: 40px; }
+.wrapper.aside > aside > section.twitter-feed .user a { color: inherit; font-weight: bold; }
+.wrapper.aside > aside > section.twitter-feed .user a span[data-scribe="element:screen_name"] { color: rgba(213, 213, 213, 0.5); font-weight: normal; }
+.wrapper.aside > aside > section.twitter-feed .user img { width: 32px; margin-left: -40px; float: left; border-radius: 3px; display: block; margin-top: 3px; }
+.wrapper.aside > aside > section.twitter-feed .tweet { margin-bottom: 0.375rem; word-break: break-word; }
+.wrapper.aside > aside > section.twitter-feed .interact a { display: inline-block; height: 1em; line-height: 1.5; overflow: hidden; width: 16px; height: 16px; background-size: auto 14px; background-repeat: no-repeat; background-position: center; margin-right: 0.75rem; opacity: 0.4; }
+.wrapper.aside > aside > section.twitter-feed .interact a::before { content: ""; display: block; width: 0; height: 100%; }
+.wrapper.aside > aside > section.twitter-feed .interact a.twitter_reply_icon { background-image: url("assets/img/reply.svg"); }
+.wrapper.aside > aside > section.twitter-feed .interact a.twitter_retweet_icon { background-image: url("assets/img/retweet.svg"); }
+.wrapper.aside > aside > section.twitter-feed .interact a.twitter_fav_icon { background-image: url("assets/img/heart.svg"); }
+.wrapper.aside > aside > section.twitter-feed .interact a:hover { opacity: 0.5; }
+
+.wrapper-flex{
+ width: 68rem;
+ margin: 0 auto;
+}
+
+.banner { background-color: #50B958; color: rgba(255, 255, 255, 0.7); font-weight: bold; font-size: 1.3em; }
+.banner h1, .banner h2, .banner h3, .banner h4, .banner h5, .banner h6, .banner a { color: #fff; }
+.banner h1 { font-size: 2.5em; margin-bottom: 0.1rem; }
+.banner .wrapper { padding: 1.5rem; }
+@media (min-width: 40rem) { .banner .wrapper { padding: 3.75rem 1.5rem; } }
+@media (min-width: 53.75rem) { .banner span { float: left; display: block; margin-right: 2.35765%; width: 65.88078%; position: relative; padding-right: 3rem; }
+ .banner span:last-child { margin-right: 0; }
+ .banner span :first-child { margin-top: 0; }
+ .banner span :last-child { margin-bottom: 0; } }
+
+.video-wrapper { height: 0; overflow: hidden; padding-bottom: 56.25%; position: relative; }
+.video-wrapper embed, .video-wrapper object, .video-wrapper iframe { position: absolute; top: 0; left: 0; height: 100%; width: 100%; }
+
+section.users > div { max-width: 68rem; margin-left: auto; margin-right: auto; padding: 1.5rem; }
+section.users > div::after { clear: both; content: ""; display: table; }
+section.users > div h2 { margin-bottom: 3rem; }
+section.users > div .item { display: block; text-align: center; }
+section.users > div .item img { height: 100px; }
+section.users > div .item h3 { text-transform: uppercase; font-size: 1.15em; }
+section.users > div .item h3 a { color: inherit; }
+@media (min-width: 53.75rem) { section.users > div .item { float: left; display: block; margin-right: 2.35765%; width: 31.76157%; font-size: 1.1em; }
+ section.users > div .item:last-child { margin-right: 0; } }
+
+.site-header { background-color: #fff; color: #868593; }
+.site-header .wrapper { padding: 0 1.5rem; }
+.site-header .logo { display: block; float: left; padding-top: 10px; }
+@media only screen and (min-width: 40rem) { .site-header .logo { padding-top: 17px; } }
+@media only screen and (min-width: 53.75rem) { .site-header .logo { padding-top: 28px; } }
+.site-header .logo img { display: block; height: 36px; }
+@media (min-width: 53.75rem) { .site-header .logo img { height: 60px; } }
+.site-header .socials { float: right; display: none; padding-top: 32px; }
+@media (min-width: 53.75rem) { .site-header .socials { display: block; } }
+.site-header .socials a { margin: 0; }
+.site-header nav { display: none; padding-top: 30px; color: #112233; }
+@media (min-width: 53.75rem) { .site-header nav { display: block; } }
+.site-header nav > ul { list-style: none; position: relative; border-left: solid 1px #D5D5D5; margin: 0 0 0 210px; padding: 15px 20px; }
+.site-header nav > ul a { display: block; color: inherit; text-decoration: none; line-height: 28px; padding: 0 0.75rem; }
+.site-header nav > ul li { position: relative; display: inline-block; margin: 0; padding: 0; }
+.site-header nav > ul > li { margin-left: 3px; }
+.site-header nav > ul > li > a { border: solid 2px #fff; border-radius: 6px; font-weight: 600; font-size: 1.2em; }
+.site-header nav > ul > li.active > a { border-color: #50B958; background-color: #50B958; color: #fff; }
+.site-header nav > ul > li:hover > a { border-color: #868593; background-color: #868593; color: #fff; }
+.site-header nav > ul > li.has-children:hover { position: relative; }
+.site-header nav > ul > li.has-children:hover > a { border-radius: 6px 6px 0 0; border-color: #F0F5F4; }
+.site-header nav > ul > li.has-children:hover:after { content: ''; display: block; height: 4px; background-color: #fff; position: absolute; left: 0; right: 0; bottom: -2px; z-index: 2; border-left: solid 2px #F0F5F4; border-right: solid 2px #F0F5F4; }
+.site-header nav > ul ul { display: none; position: absolute; top: 100%; left: 0; background-color: #fff; padding: 0; border: solid 2px #F0F5F4; border-radius: 0 6px 6px 6px; overflow: hidden; z-index: 1; color: #868593; }
+.site-header nav > ul ul li { float: none; width: 12.7074em; }
+.site-header nav > ul ul li.active { background: #F0F5F4; }
+.site-header nav > ul ul li.active > a { color: inherit; }
+.site-header nav > ul ul a { padding-top: 0.2em; padding-bottom: 0.2em; font-size: 0.9em; }
+.site-header nav > ul ul a:hover { background-color: #F0F5F4; }
+.site-header nav > ul ul ul { top: 0; left: 100%; }
+.site-header nav > ul li:hover > ul { display: block; }
+@media (min-width: 53.75rem) { .site-header #cd-menu-trigger { display: none; } }
+
+.footer-nav { background-color: #273D3A; }
+.footer-nav > ul { max-width: 68rem; margin-left: auto; margin-right: auto; padding-top: 0.75rem; padding-bottom: 0.75rem; }
+.footer-nav > ul::after { clear: both; content: ""; display: table; }
+@media screen and (min-width: 40rem) { .footer-nav > ul > li { display: inline-block; } }
+.footer-nav > ul > li a { display: inline-block; padding: 0.75rem 1.5rem; color: rgba(255, 255, 255, 0.7); font-size: .9em; }
+.footer-nav > ul > li a:hover { color: #fff; }
+
+html { background: #333; }
+
+/* footer */
+.site-footer { background: #333; width: 100%; position: relative; z-index: 99; color: white; }
+.site-footer .wrapper { padding: 1.5rem; }
+.site-footer .wrapper::after { clear: both; content: ""; display: table; }
+.site-footer .wrapper .footer-logo { margin-right: 1em; margin-bottom: 1em; margin-top: -4px; }
+@media screen and (min-width: 53.75rem) { .site-footer .wrapper .footer-logo { float: left; margin-bottom: 0; } }
+.site-footer .wrapper .footer-logo img { opacity: .7; }
+.site-footer .wrapper .footer-logo img { height: 2em; }
+.site-footer .wrapper ul { margin-bottom: 1em; }
+@media screen and (min-width: 53.75rem) { .site-footer .wrapper ul { float: left; margin-left: 1em; margin-bottom: 0; } }
+.site-footer .wrapper ul li { padding-right: 1em; }
+@media screen and (min-width: 53.75rem) { .site-footer .wrapper ul li { display: inline; text-align: left; } }
+.site-footer .wrapper a { color: rgba(255, 255, 255, 0.6); }
+.site-footer .wrapper a:hover { color: white; }
+.site-footer .wrapper a[rel~="external"]:after { display: none; }
+.site-footer .wrapper svg { fill: currentColor; }
+.site-footer .wrapper .footer-primary-links { display: none; }
+@media screen and (min-width: 53.75rem) { .site-footer .wrapper .footer-secondary-links { float: right; } }
+.site-footer .wrapper .footer-secondary-links li { font-size: .8em; font-weight: 400; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social { margin-top: 1em; }
+@media screen and (min-width: 53.75rem) { .site-footer .wrapper .footer-secondary-links ul.footer-social { float: right; margin-top: 0; } }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li { float: left; font-size: 1em; padding-right: 1em; }
+@media screen and (min-width: 53.75rem) { .site-footer .wrapper .footer-secondary-links ul.footer-social li { padding-right: .45em; } }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li:last-child { padding-right: 0; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li a { height: 1em; line-height: 1.5; overflow: hidden; background-image: url(assets/img/cd-socials.svg); background-size: 9em 5.4em; width: 1.8em; height: 1.8em; display: block; opacity: .7; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li a::before { content: ""; display: block; width: 0; height: 100%; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li a.facebook { background-position: -3.6em -1.8em; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li a.twitter { background-position: 0 -1.8em; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li a.github { background-position: -1.8em -1.8em; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li a.linkedin { background-position: -7.2em -1.8em; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social li a:hover { opacity: 1; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social img { opacity: .7; height: 1.6em; padding: 1px; }
+.site-footer .wrapper .footer-secondary-links ul.footer-social img:hover { opacity: 1; }
+.site-footer hr { float: left; display: block; margin-right: 2.35765%; width: 100%; border-color: rgba(255, 255, 255, 0.4); }
+.site-footer hr:last-child { margin-right: 0; }
+.site-footer p { float: left; display: block; margin-right: 2.35765%; width: 100%; font-size: 0.75rem; color: rgba(255, 255, 255, 0.4); }
+.site-footer p:last-child { margin-right: 0; }
+.site-footer .attribution { display: none; }
+@media screen and (min-width: 53.75rem) { .site-footer .attribution { display: inline; } }
+
+.home .banner h1 { font-size: 1.5em; }
+.home > section > a { margin-bottom: 1.5rem; }
+.home > section.blog-posts { background-color: #F0F5F4; }
+@media (min-width: 53.75rem) { .home > section.blog-posts { margin-top: 6em; } }
+.home > section.blog-posts .wrapper { padding: 1.5rem; }
+.home > section.blog-posts h2 { color: #50B958; }
+@media (min-width: 40rem) { .home > section.blog-posts h2 { font-size: 2em; } }
+@media (min-width: 53.75rem) { .home > section.blog-posts h2 { width: 50%; font-size: 3em; position: relative; top: -2.8em; } }
+.home > section.blog-posts article { padding: 0; margin-bottom: 2.25rem; }
+@media (min-width: 40rem) { .home > section.blog-posts article { float: left; display: block; margin-right: 2.35765%; width: 48.82117%; }
+ .home > section.blog-posts article:last-child { margin-right: 0; }
+ .home > section.blog-posts article .text { font-size: 1.1em; }
+ .home > section.blog-posts article .text h3 { font-size: 1.7em; }
+ .home > section.blog-posts article.post-1 { padding-right: 1.5rem; }
+ .home > section.blog-posts article.post-2 { padding-left: 1.5rem; } }
+@media (min-width: 53.75rem) { .home > section.blog-posts article { margin-top: -5em; } }
+.home > section.blog-posts .image { display: none; }
+@media (min-width: 40rem) { .home > section.blog-posts .image { display: block; padding: 0 0 1.5rem 1.5rem; text-align: center; }
+ .home > section.blog-posts .image span { display: inline-block; height: 0; width: 250px; padding-top: 250px; background-size: cover; border-radius: 50%; } }
+.home > section.blog-posts .date { font-weight: bold; color: #273D3A; display: block; }
+.home > section.users { padding-top: 1.5rem; }
+.home > section.users h2 { display: none; }
+@media (min-width: 53.75rem) { .home > section.users { padding-top: 4.5rem; padding-bottom: 3rem; } }
+.home > section.users .item .more { display: none; }
+@media (min-width: 53.75rem) { .home > section.about .wrapper { background-image: url(assets/img/team.jpg); background-repeat: no-repeat; background-position: right center; padding-top: 7.5rem; padding-bottom: 7.5rem; } }
+.home > section.about article { padding-top: 0.75rem; padding-bottom: 0.75rem; }
+.home > section.about article h2 { margin-top: 1rem; }
+@media (min-width: 53.75rem) { .home > section.about article { width: 50%; background-color: rgba(255, 255, 255, 0.75); }
+ .home > section.about article h2 { font-size: 2.8em; }
+ .home > section.about article p { font-size: 1.1em; } }
+
+.modal label { cursor: pointer; margin-bottom: 0; }
+.modal label img { border-radius: 150px; display: block; max-width: 300px; }
+.modal input[type="checkbox"] { display: none; }
+.modal .modal-open { overflow: hidden; }
+.modal .modal-window { -webkit-transition: opacity 0.25s ease; -moz-transition: opacity 0.25s ease; transition: opacity 0.25s ease; position: fixed; top: 0px; right: 0px; bottom: 0px; left: 0px; background: rgba(0, 0, 0, 0.85); opacity: 0; text-align: left; visibility: hidden; z-index: 99999999999; }
+.modal .modal-window .modal-bg { position: absolute; top: 0px; right: 0px; bottom: 0px; left: 0px; cursor: pointer; }
+.modal .modal-close { position: absolute; top: 1.5em; right: 1.5em; height: 1.5em; width: 1.5em; cursor: pointer; background: #fff; }
+.modal .modal-close:after, .modal .modal-close:before { position: absolute; top: 3px; right: 3px; bottom: 0; left: 50%; -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); -o-transform: rotate(45deg); transform: rotate(45deg); height: 1.5em; width: 0.15em; background: #F0F5F4; content: ''; display: block; margin: -3px 0 0 -1px; }
+.modal .modal-close:hover:after, .modal .modal-close:hover:before { background: #d1e1de; }
+.modal .modal-close:before { -webkit-transform: rotate(-45deg); -moz-transform: rotate(-45deg); -ms-transform: rotate(-45deg); -o-transform: rotate(-45deg); transform: rotate(-45deg); }
+.modal .modal-inner { -webkit-transition: opacity 0.25s ease; -moz-transition: opacity 0.25s ease; transition: opacity 0.25s ease; border-radius: 3px; background: #fff; margin: auto; max-height: 95%; position: relative; overflow: auto; width: 95%; padding: 1.5em; margin-top: .6em; }
+@media screen and (min-width: 40rem) { .modal .modal-inner { padding: 3em; width: 60%; max-height: 60%; margin-top: 10em; } }
+@media screen and (min-width: 53.75rem) { .modal .modal-inner { width: 50%; margin-top: 10em; } }
+.modal .modal-inner h1 { color: #868593; text-align: left; text-transform: capitalize; }
+.modal .modal-inner p.body, .modal .modal-inner p.intro { font-size: 1em; max-width: 100% !important; text-align: left; }
+.modal .modal-inner a.cta { color: white; display: inline-block; margin-right: .5em; margin-top: 1em; }
+.modal .modal-inner a.cta:last-child { padding: 0 2em; }
+.modal .modal-state:checked + .modal-window, .modal.modal-active .modal-window { opacity: 1; visibility: visible; }
+.modal .modal-state:checked + .modal-window .modal-inner, .modal.modal-active .modal-window .modal-inner { top: 0; }
+
+.events .wrapper { margin-bottom: 1.5rem; }
+.events .wrapper section h2 { display: inline-block; font-size: 1em; text-transform: uppercase; border-bottom: solid 1px #868593; font-weight: 600; }
+.events .wrapper section h3 a { color: #868593; }
+.events .wrapper section .date { font-style: italic; }
+.events .wrapper section.featured { background-color: #F0F5F4; padding: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem; }
+.events .wrapper section:not(.featured) h2 { margin: 1.5rem 1.5rem 0 1.5rem; }
+.events .wrapper .event-list > li { border-bottom: solid 1px #F0F5F4; padding: 1.5rem; }
+
+.posts .post-list { margin-top: 1.5rem; margin-bottom: 1.5rem; }
+.posts .post-list > article { padding: 1.5rem; border-bottom: 1px solid #F0F5F4; max-width: 68rem; margin-left: auto; margin-right: auto; }
+.posts .post-list > article::after { clear: both; content: ""; display: table; }
+.posts .post-list > article .date { font-weight: bold; color: #273D3A; }
+@media (min-width: 40rem) { .posts .post-list > article .text { float: left; display: block; margin-right: 2.35765%; width: 74.41059%; }
+ .posts .post-list > article .text:last-child { margin-right: 0; } }
+.posts .post-list > article .text .categories { padding: 0; }
+.posts .post-list > article .text .categories li { display: inline-block; font-size: 0.75em; text-transform: uppercase; border-bottom: solid 1px #868593; margin-right: 0.75rem; font-weight: 600; }
+.posts .post-list > article .text p { margin: 0; }
+.posts .post-list > article .text > a { text-transform: uppercase; color: #478a4b; font-weight: bold; display: inline-block; margin-top: 1.5rem; }
+.posts .post-list > article .image { display: none; }
+@media (min-width: 40rem) { .posts .post-list > article .image { float: left; display: block; margin-right: 2.35765%; width: 23.23176%; padding: 0 0 1.5rem 1.5rem; }
+ .posts .post-list > article .image:last-child { margin-right: 0; }
+ .posts .post-list > article .image span { display: block; height: 0; padding-top: 100%; background-size: cover; border-radius: 50%; } }
+.posts .pagination { max-width: 68rem; margin-left: auto; margin-right: auto; margin-top: 1.5rem; margin-bottom: 1.5rem; padding-left: 1.5rem; padding-right: 1.5rem; }
+.posts .pagination::after { clear: both; content: ""; display: table; }
+
+.blog-table td { padding: 0.25rem 0px; font-size: 0.90em; background-color: #F0F5F4; }
+
+@media (min-width: 53.75rem) { .post .banner { display: none; } }
+.post article .header { display: none; }
+@media (min-width: 53.75rem) { .post article::after { clear: both; content: ""; display: table; }
+ .post article .header { float: left; display: block; margin-right: 2.35765%; width: 31.76157%; padding-right: 1.5rem; border-right: solid 1px #F0F5F4; }
+ .post article .header:last-child { margin-right: 0; }
+ .post article .header h1 { margin-top: 0; }
+ .post article .content { float: left; display: block; margin-right: 2.35765%; width: 65.88078%; text-align: justify; }
+ .post article .content:last-child { margin-right: 0; } }
+
+.pagination li { /* hide numbers on small devices */ display: none; margin: 0 .2em; }
+.pagination li.button { /* make sure prev next buttons are visible */ display: inline-block; }
+.pagination a, .pagination span { display: inline-block; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; /* use padding and font-size to change buttons size */ padding: .6em .8em; font-size: 0.9rem; }
+.pagination a { border: 1px solid #d1e1de; border-radius: 3px; }
+.no-touch .pagination a:hover { background-color: #e1ebe9; }
+.pagination a:active { /* click effect */ -webkit-transform: scale(0.9); -moz-transform: scale(0.9); -ms-transform: scale(0.9); -o-transform: scale(0.9); transform: scale(0.9); }
+.pagination a.disabled { /* button disabled */ color: rgba(80, 185, 88, 0.4); pointer-events: none; }
+.pagination a.disabled::before, .pagination a.disabled::after { opacity: .4; }
+.pagination .button:first-of-type a::before { content: '\00ab '; }
+.pagination .button:last-of-type a::after { content: ' \00bb'; }
+.pagination .current { /* selected number */ background-color: #D5D5D5; border-color: #D5D5D5; color: #F0F5F4; pointer-events: none; }
+@media only screen and (min-width: 40rem) { .pagination li { display: inline-block; } }
+@media only screen and (min-width: 53.75rem) { .pagination { margin: 4em auto 8em; } }
+
+/* --------------------------------
+
+No space - remove distance between list items
+
+-------------------------------- */
+.pagination.no-space { width: auto; max-width: none; display: inline-block; border-radius: 3px; border: 1px solid #d1e1de; }
+.pagination.no-space::after { clear: both; content: ""; display: table; }
+.pagination.no-space li { margin: 0; float: left; border-right: 1px solid #d1e1de; }
+.pagination.no-space li:last-of-type { border-right: none; }
+.pagination.no-space a, .pagination.no-space span { float: left; border-radius: 0; padding: .8em 1em; border: none; }
+.pagination.no-space li:first-of-type a { border-radius: 3px 0 0 3px; }
+.pagination.no-space li:last-of-type a { border-radius: 0 3px 3px 0; }
+
+/* --------------------------------
+
+move buttons - move prev and next buttons to the sides
+
+-------------------------------- */
+.pagination.move-buttons::after { clear: both; content: ""; display: table; }
+.pagination.move-buttons .button:first-of-type { float: left; }
+.pagination.move-buttons .button:last-of-type { float: right; }
+
+.pagination.no-space.move-buttons { width: 90%; max-width: 40rem; display: block; overflow: hidden; }
+.pagination.no-space.move-buttons li { float: none; border: none; }
+.pagination.no-space.move-buttons a, .pagination.no-space.move-buttons span { float: none; }
+
+/* --------------------------------
+
+custom icons - customize the small arrow inside the next and prev buttons
+
+-------------------------------- */
+.pagination.custom-icons .button a { position: relative; }
+.pagination.custom-icons .button:first-of-type a { padding-left: 2.4em; }
+.pagination.custom-icons .button:last-of-type a { padding-right: 2.4em; }
+.pagination.custom-icons .button:first-of-type a::before, .pagination.custom-icons .button:last-of-type a::after { content: ''; position: absolute; display: inline-block; /* set size for custom icons */ width: 16px; height: 16px; top: 50%; /* set margin-top = icon height/2 */ margin-top: -8px; background: transparent url("assets/img/cd-icon-arrow-1.svg") no-repeat center center; }
+.pagination.custom-icons .button:first-of-type a::before { left: .8em; }
+.pagination.custom-icons .button:last-of-type a::after { right: .8em; -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -ms-transform: rotate(180deg); -o-transform: rotate(180deg); transform: rotate(180deg); }
+
+/* --------------------------------
+
+custom buttons - replace prev and next buttons text with a custom icon
+
+-------------------------------- */
+.pagination.custom-buttons a, .pagination.custom-buttons span { vertical-align: middle; }
+.pagination.custom-buttons .button a { /* set custom width */ width: 40px; /* image replacement */ overflow: hidden; white-space: nowrap; text-indent: 100%; color: transparent; background-image: url("assets/img/cd-icon-arrow-2.svg"); background-repeat: no-repeat; background-position: center center; }
+.pagination.custom-buttons .button:last-of-type a { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -ms-transform: rotate(180deg); -o-transform: rotate(180deg); transform: rotate(180deg); }
+.no-touch .pagination.custom-buttons .button:last-of-type a:active { -webkit-transform: scale(0.9) rotate(180deg); -moz-transform: scale(0.9) rotate(180deg); -ms-transform: scale(0.9) rotate(180deg); -o-transform: scale(0.9) rotate(180deg); transform: scale(0.9) rotate(180deg); }
+
+.pagination.no-space.custom-buttons .button:last-of-type a { border-radius: 3px 0 0 3px; }
+
+/* --------------------------------
+
+animated buttons - animate the text inside prev and next buttons
+
+-------------------------------- */
+.pagination.animated-buttons a, .pagination.animated-buttons span { padding: 0 1.4em; height: 40px; line-height: 40px; overflow: hidden; }
+.pagination.animated-buttons .button a { position: relative; padding: 0 2em; }
+.pagination.animated-buttons .button:first-of-type a::before, .pagination.animated-buttons .button:last-of-type a::after { left: 50%; -webkit-transform: translateX(-50%); -moz-transform: translateX(-50%); -ms-transform: translateX(-50%); -o-transform: translateX(-50%); transform: translateX(-50%); right: auto; -webkit-transition: -webkit-transform 0.3s; -moz-transition: -moz-transform 0.3s; transition: transform 0.3s; }
+.pagination.animated-buttons .button:last-of-type a::after { -webkit-transform: translateX(-50%) rotate(180deg); -moz-transform: translateX(-50%) rotate(180deg); -ms-transform: translateX(-50%) rotate(180deg); -o-transform: translateX(-50%) rotate(180deg); transform: translateX(-50%) rotate(180deg); }
+.pagination.animated-buttons i { display: block; height: 100%; -webkit-transform: translateY(100%); -moz-transform: translateY(100%); -ms-transform: translateY(100%); -o-transform: translateY(100%); transform: translateY(100%); -webkit-transition: -webkit-transform 0.3s; -moz-transition: -moz-transform 0.3s; transition: transform 0.3s; }
+
+.no-touch .pagination.animated-buttons .button a:hover i { -webkit-transform: translateY(0); -moz-transform: translateY(0); -ms-transform: translateY(0); -o-transform: translateY(0); transform: translateY(0); }
+
+.no-touch .pagination.animated-buttons .button:first-of-type a:hover::before { -webkit-transform: translateX(-50%) translateY(-50px); -moz-transform: translateX(-50%) translateY(-50px); -ms-transform: translateX(-50%) translateY(-50px); -o-transform: translateX(-50%) translateY(-50px); transform: translateX(-50%) translateY(-50px); }
+
+.no-touch .pagination.animated-buttons .button:last-of-type a:hover::after { -webkit-transform: translateX(-50%) rotate(180deg) translateY(50px); -moz-transform: translateX(-50%) rotate(180deg) translateY(50px); -ms-transform: translateX(-50%) rotate(180deg) translateY(50px); -o-transform: translateX(-50%) rotate(180deg) translateY(50px); transform: translateX(-50%) rotate(180deg) translateY(50px); }
+
+.partners .logos { max-width: 68rem; margin-left: auto; margin-right: auto; margin-top: 1.5rem; margin-bottom: 1.5rem; }
+.partners .logos::after { clear: both; content: ""; display: table; }
+.partners .logos li { padding: 1.5rem; }
+@media (max-width: 40rem) { .partners .logos li { float: left; display: block; margin-right: 2.35765%; width: 48.82117%; }
+ .partners .logos li:last-child { margin-right: 0; }
+ .partners .logos li:nth-child(2n) { margin-right: 0; }
+ .partners .logos li:nth-child(2n+1) { clear: left; } }
+@media (min-width: 40rem) { .partners .logos li { float: left; display: block; margin-right: 2.35765%; width: 23.23176%; }
+ .partners .logos li:last-child { margin-right: 0; }
+ .partners .logos li:nth-child(4n) { margin-right: 0; }
+ .partners .logos li:nth-child(4n+1) { clear: left; } }
+.partners .logos li a { display: block; height: 0; padding-top: 100%; overflow: hidden; background-size: contain; background-repeat: no-repeat; background-position: center center; }
+
+.contact form { max-width: 68rem; margin-left: auto; margin-right: auto; padding: 1.5rem; margin-top: 0.75rem; margin-bottom: 0.75rem; }
+.contact form::after { clear: both; content: ""; display: table; }
+.contact form fieldset { margin: 0; padding: 0; border: none; background-color: transparent; }
+@media (min-width: 40rem) { .contact form fieldset { float: left; display: block; margin-right: 2.35765%; width: 48.82117%; }
+ .contact form fieldset:last-child { margin-right: 0; } }
+.contact form fieldset:nth-child(odd) { margin-right: 0; }
+
+.tools .tool-list { clear: both; padding-top: 200px; padding-bottom: 100px; }
+.tools .tool-list .tool { padding: 1.5rem; }
+.tools .tool-list .tool .type { color: #95E19A; }
+.tools .tool-list .tool img { height: 100px; }
+.tools .tool-list .tool .name { color: #273D3A; font-size: 1.3em; }
+.tools .tool-list .tool .name a { color: inherit; }
+.tools .tool-list .tool .primary-link { display: block; text-transform: uppercase; font-weight: bold; color: #478a4b; }
+.tools .tool-list .tool .secondary-link { display: block; font-style: italic; }
+@media (min-width: 40rem) and (max-width: 53.75rem) { .tools .tool-list .tool { float: left; display: block; margin-right: 2.35765%; width: 48.82117%; }
+ .tools .tool-list .tool:last-child { margin-right: 0; }
+ .tools .tool-list .tool:nth-child(2n) { margin-right: 0; }
+ .tools .tool-list .tool:nth-child(2n+1) { clear: left; } }
+@media (min-width: 53.75rem) { .tools .tool-list .tool { float: left; display: block; margin-right: 2.35765%; width: 31.76157%; }
+ .tools .tool-list .tool:last-child { margin-right: 0; }
+ .tools .tool-list .tool:nth-child(3n) { margin-right: 0; }
+ .tools .tool-list .tool:nth-child(3n+1) { clear: left; } }
+.tools .tool-filters { display: none; }
+.js .tools .tool-filters { display: block; position: absolute; z-index: 1; padding: 1.5rem 0.75rem; }
+.js .tools .tool-filters .filter-select { float: left; margin: 0.75rem; }
+.js .tools .tool-filters .filter-select .current { background-color: #e2e2e2; display: block; margin: 0; padding: 0.75rem; border-radius: 3px; cursor: pointer; color: #273D3A; border: solid 1px #D5D5D5; position: relative; }
+.js .tools .tool-filters .filter-select .current:after { content: ''; display: block; width: 20px; height: 20px; position: absolute; right: 0.75rem; top: 50%; margin-top: -10px; background-image: url("assets/img/down-arrow.svg"); background-repeat: no-repeat; background-position: center; background-size: contain; }
+.js .tools .tool-filters .filter-select .current span { display: block; width: 0; height: 0; overflow: hidden; }
+.js .tools .tool-filters .filter-select .filter-buttons { height: 0; overflow: hidden; border: solid 1px #D5D5D5; opacity: 0; }
+.js .tools .tool-filters .filter-select .filter-buttons li { padding: 0.75rem 100px 0.75rem 0.75rem; }
+.js .tools .tool-filters .filter-select.open .current { border-radius: 3px 3px 0 0; }
+.js .tools .tool-filters .filter-select.open .filter-buttons { height: auto; opacity: 1; max-height: 50vh; overflow-y: auto; background-color: #F0F5F4; border-radius: 0 0 3px 3px; }
+.js .tools .tool-filters .filter-select.open .filter-buttons li:hover { background-color: rgba(149, 225, 154, 0.5); cursor: pointer; }
+.js .tools .tool-filters .filter-select.open .filter-buttons li.active { background-color: #50B958; color: #fff; }
+
+.docs h2 { color: #50B958; }
+@media (min-width: 40rem) { .docs h2 { font-size: 2em; } }
+@media (min-width: 53.75rem) { .docs h2 { font-size: 3em; } }
+.docs article { margin-bottom: 1.5rem; }
+@media (min-width: 53.75rem) { .docs article { margin-bottom: 9rem; } }
+.docs .step .wrapper { padding: 1.5rem; }
+@media (min-width: 53.75rem) { .docs .step .wrapper { padding-top: 3rem; padding-bottom: 3rem; } }
+.docs .step figure { text-align: center; margin-left: auto; margin-right: auto; max-width: 768px; }
+.docs .step figure figcaption { text-align: left; }
+.docs .step figure figcaption h3 { font-size: 1.3em; margin: 0 0 0.4em 0; }
+.docs .step figure img { margin-top: 1.5rem; }
+.docs .step.done { background-image: url("assets/img/pattern.svg"); background-position: center top; }
+.docs .users { background-color: #F0F5F4; padding-bottom: 3rem; }
+@media (min-width: 53.75rem) { .docs .users { padding-bottom: 4.5rem; } }
+@media (min-width: 53.75rem) { .docs .users h2 { position: relative; top: -1.7em; } }
+
+body{
+ margin:0;
+}
+
+
+indigo-cube-preview md-card.mat-card{
+ background-color: map_get($md-obeupalette0, 50) ;
+}
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
new file mode 100644
index 0000000..5e2507d
--- /dev/null
+++ b/src/tsconfig.app.json
@@ -0,0 +1,13 @@
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/app",
+ "module": "es2015",
+ "baseUrl": "",
+ "types": []
+ },
+ "exclude": [
+ "test.ts",
+ "**/*.spec.ts"
+ ]
+}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
new file mode 100644
index 0000000..510e3f1
--- /dev/null
+++ b/src/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/spec",
+ "module": "commonjs",
+ "target": "es5",
+ "baseUrl": "",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "test.ts"
+ ],
+ "include": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index ffe935d..a35a8ee 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,41 +1,20 @@
{
+ "compileOnSave": false,
"compilerOptions": {
- "baseUrl": ".",
- "declaration": true,
- "stripInternal": true,
+ "outDir": "./dist/out-tsc",
+ "baseUrl": "src",
+ "sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
- "module": "es2015",
- "moduleResolution": "node",
- "noEmitOnError": false,
- "noImplicitAny": true,
- "noImplicitReturns": true,
- "outDir": "./dist",
- "rootDir": ".",
- "sourceMap": true,
- "inlineSources": true,
- "lib": ["es2015", "dom"],
"target": "es5",
- "skipLibCheck": true,
- "types": [
- "node",
- "hammerjs",
- "jquery",
- "d3",
- "lodash",
- "URI"
+ "typeRoots": [
+ "node_modules/@types"
+ ],
+ "lib": [
+ "es2016",
+ "dom"
]
- },
- "awesomeTypescriptLoaderOptions": {
- "useWebpackText": true // Allows other loaders to be chained to awesome-typescript-loader.
- },
- "exclude": [
- "node_modules"
- ],
- "include": [
- "typings/**/*"
- ],
- "compileOnSave": false,
- "buildOnSave": false,
- "atom": { "rewriteTsconfig": false }
+ }
}
diff --git a/tslint.json b/tslint.json
index 85bf3f4..dd117b3 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,29 +1,87 @@
{
+ "rulesDirectory": [
+ "node_modules/codelyzer"
+ ],
"rules": {
+ "arrow-return-shorthand": true,
+ "callable-types": true,
"class-name": true,
"comment-format": [
true,
"check-space"
],
+ "curly": true,
+ "eofline": true,
+ "forin": true,
+ "import-blacklist": [
+ true,
+ "rxjs"
+ ],
+ "import-spacing": true,
"indent": [
true,
"spaces"
],
- "no-duplicate-variable": true,
+ "interface-over-type-literal": true,
+ "label-position": true,
+ "max-line-length": [
+ true,
+ 140
+ ],
+ "member-access": false,
+ "member-ordering": [
+ true,
+ "static-before-instance",
+ "variables-before-functions"
+ ],
+ "no-arg": true,
+ "no-bitwise": true,
+ "no-console": [
+ true,
+ "debug",
+ "info",
+ "time",
+ "timeEnd",
+ "trace"
+ ],
+ "no-construct": true,
+ "no-debugger": true,
+ "no-duplicate-super": true,
+ "no-empty": false,
+ "no-empty-interface": true,
"no-eval": true,
- "no-internal-module": true,
+ "no-inferrable-types": [
+ true,
+ "ignore-params"
+ ],
+ "no-misused-new": true,
+ "no-non-null-assertion": true,
+ "no-shadowed-variable": true,
+ "no-string-literal": false,
+ "no-string-throw": true,
+ "no-switch-case-fall-through": true,
"no-trailing-whitespace": true,
+ "no-unnecessary-initializer": true,
+ "no-unused-expression": true,
+ "no-use-before-declare": true,
"no-var-keyword": true,
+ "object-literal-sort-keys": false,
"one-line": [
true,
"check-open-brace",
+ "check-catch",
+ "check-else",
"check-whitespace"
],
+ "prefer-const": true,
"quotemark": [
true,
"single"
],
- "semicolon": true,
+ "radix": true,
+ "semicolon": [
+ "always"
+ ],
"triple-equals": [
true,
"allow-null-check"
@@ -38,11 +96,9 @@
"variable-declaration": "nospace"
}
],
- "variable-name": [
- true,
- "ban-keywords",
- "allow-leading-underscore"
- ],
+ "typeof-compare": true,
+ "unified-signatures": true,
+ "variable-name": false,
"whitespace": [
true,
"check-branch",
@@ -50,6 +106,30 @@
"check-operator",
"check-separator",
"check-type"
- ]
+ ],
+ "directive-selector": [
+ true,
+ "attribute",
+ "app",
+ "camelCase"
+ ],
+ "component-selector": [
+ true,
+ "element",
+ "app",
+ "kebab-case"
+ ],
+ "use-input-property-decorator": true,
+ "use-output-property-decorator": true,
+ "use-host-property-decorator": true,
+ "no-input-rename": true,
+ "no-output-rename": true,
+ "use-life-cycle-interface": true,
+ "use-pipe-transform-interface": true,
+ "component-class-suffix": true,
+ "directive-class-suffix": true,
+ "no-access-missing-member": true,
+ "templates-use-public": true,
+ "invoke-injectable": true
}
}
diff --git a/typings.json b/typings.json
deleted file mode 100644
index 7952350..0000000
--- a/typings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "dependencies": {
- "d3": "registry:npm/d3#3.0.0+20160723033700",
- "lodash": "registry:npm/lodash#4.0.0+20161015015725"
- },
- "globalDevDependencies": {
- "node": "registry:dt/node#7.0.0+20170204020307"
- }
-}
+
+
+
+