Skip to content

Commit

Permalink
worked on the #37
Browse files Browse the repository at this point in the history
Authors updated and cleaning up the code
  • Loading branch information
IremToroslu committed May 18, 2021
1 parent dd44c9d commit 789053e
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 16 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/details/CanvasComponent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
in this main component come all the canvas page components
such as diagrams and tables
@author parham, 08.05, Irem Toroslu
@author Parham Gandomkar, Irem Toroslu
*/

import React, { Component } from 'react';
Expand Down
10 changes: 9 additions & 1 deletion frontend/src/components/details/CompareCanvas.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ import ColumnChart from './ColumnChartComponent';
import Table from './TableComponent';
import { Container, Row, Col } from 'react-grid-system';
import theme from 'resources/theme';

/**
* This component displays the difference/comparison between the dashboards of two different type of variables of the same model
* will be compared when clicking on the "comparison" button.
*
* @returns the dasboard comparison
* @author Parham Gandomkar, Irem Toroslu
*
*
*/

const CompareCanvas = () => {
return (
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/components/details/PanelComponent.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React, { Component } from 'react';
import theme from 'resources/theme';

/**
* a divider Pannel for seperating search compoents and result components
* and also providing the comparison feature by compare button
*
* @author parham
* @author Parham Gandomkar, Irem Toroslu
*/
import React, { Component } from 'react';
import theme from 'resources/theme';

const PanelComponent = (props) => {
return (
<div className='w3-panel w3-padding-small' style={{backgroundColor:'#466e78',marginLeft:15}}>
Expand Down
11 changes: 5 additions & 6 deletions frontend/src/components/details/PieChartComponent.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/**
* Pie Chart Diagram
*
* @author parham, Julian, Irem Toroslu
*/
import React, { Component } from 'react';
import ReactApexChart from 'react-apexcharts';
import { getMaterialComposition } from 'interface/projectInterface';
import theme from 'resources/theme';

/**
* Pie Chart Diagram
*
* @author Parham Gandomkar, Julian Oelhaf, Irem Toroslu
*/
const PieChartComponent = () => {
//const series = [17, 13, 3, 2, 1, 42, 21];
const series = getMaterialComposition();
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/components/details/SelectVariableComponent.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React, { Component } from 'react';
import theme from 'resources/theme';

/**
a drop down component for selecting variable
@author parham, Irem Toroslu
@author Parham Gandomkar, Irem Toroslu
*/
import React, { Component } from 'react';
import theme from 'resources/theme';

class SelectVariableComponent extends Component {
/*
Expand Down
9 changes: 8 additions & 1 deletion frontend/src/components/details/TableComponent.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import React, { Component } from 'react';
import { Container } from 'react-grid-system';
import theme from 'resources/theme';

/**
*
* @returns the impact catagories table of the selected model of the related product.
*
* @author Parham Gandomkar, Irem Toroslu
*
*
*/
class TableComponent extends Component {
state = {
headers: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import theme from 'resources/theme';
* This component creates the dropdownboxes for the related products
*
* @returns the model properties of the related product depending on the model values from getModels func from interface/simaProInterface
* @author parham, Martin Wagner, Irem Toroslu, Mani Anand
* @author Parham Gandomkar, Martin Wagner, Irem Toroslu, Mani Anand
*/

const ModelDropdownComponent = (props) => {
Expand Down

0 comments on commit 789053e

Please sign in to comment.