Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-16 00:00:03 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git.rwth-aachen.de:acs/public/villas/web into develop

Browse source
This commit is contained in:
Sonja Happ 2020-04-27 11:48:29 +02:00
commit 33fb73819d
16 changed files with 164 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/dashboard/dashboard.js
View file

@ -186,17 +186,6 @@ class Dashboard extends Component {
});
/*let widgets = [];
widgets = this.state.dashboard.get('widgets');
const widgetKey = Dashboard.getNewWidgetKey();
widgets[widgetKey] = widget;
const dashboard = this.state.dashboard.set('widgets',widgets);
// this.increaseHeightWithWidget(widget);
this.setState({ dashboard });*/
};
@ -206,11 +195,9 @@ class Dashboard extends Component {
}
widgetChange(widget, index, callback = null){
let tempChanges = this.state.widgetChangeData;
tempChanges.push(widget);
this.setState({ widgetChangeData: tempChanges})
let temp = this.state.widgetChangeData;
temp.push(widget);
this.setState({widgetChangeData: temp});
}
@ -294,7 +281,7 @@ class Dashboard extends Component {
data: widget
});
});
this.setState({ editing: false });
this.setState({ editing: false, widgetChangeData: [], widgetAddData: [] });
};
saveChanges() {
@ -312,21 +299,28 @@ class Dashboard extends Component {
cancelEditing() {
//raw widget has no id -> cannot be deleted in its original form
/*
this.state.widgetAddData.forEach( widget => {
let temp = [];
this.state.widgetAddData.forEach(rawWidget => {
this.state.widgets.forEach(widget => {
if(widget.y === rawWidget.y && widget.x === rawWidget.x && widget.type === rawWidget.type){
temp.push(widget);
}
})
})
temp.forEach( widget => {
AppDispatcher.dispatch({
type: 'widgets/start-remove',
data: widget,
token: this.state.sessionToken
});
}); */
});
AppDispatcher.dispatch({
type: 'widgets/start-load',
token: this.state.sessionToken,
param: '?dashboardID=1'
});
this.setState({ editing: false, widgetChangeData: [], widgetAddData: [] });
this.setState({ editing: false, widgetChangeData: [], widgetAddData: []});
};

1
src/styles/widgets.css
View file

@ -249,6 +249,7 @@ span.signal-unit::after {
width: 100%;
height: 100%;
display: flex;
flex: none;
word-wrap: break-word;
}

20
src/widget/dropzone.js
View file

@ -28,20 +28,20 @@ const dropzoneTarget = {
position.y -= dropzoneRect.top;
// Z-Index is one more the top most children
let foundZ = props.children.reduce( (maxZ, currentChildren) => {
if (currentChildren.props != null) {
let foundZ = props.widgets.reduce( (maxZ, currentWidget) => {
if (currentWidget != null) {
// Is there a simpler way? Is not easy to expose a getter in a Container.create(Component)
let widget = currentChildren.props.data;
if (widget && widget.z) {
if (widget.z > maxZ) {
return widget.z;
if (currentWidget.z > maxZ) {
return currentWidget.z;
}
}
}
return maxZ;
}, 0);
position.z = foundZ >= 100? foundZ : ++foundZ;
}, 0)
position.z = foundZ >= 100? foundZ : foundZ += 10;
if(monitor.getItem().name === "Box"){
position.z = 0;
}
props.onDrop(monitor.getItem(), position);
}

6
src/widget/edit-widget/edit-widget-control-creator.js
View file

@ -129,7 +129,8 @@ export default function CreateControls(widgetType = null, widget = null, session
case 'Box':
DialogControls.push(
<EditWidgetColorControl key={0} widget={widget} controlId={'customProperties.border_color'} label={'Border color'} handleChange={(e) => handleChange(e)} />,
<EditWidgetColorControl key={1} widget={widget} controlId={'customProperties.background_color'} label={'Background color'} handleChange={e => handleChange(e)} />
<EditWidgetColorControl key={1} widget={widget} controlId={'customProperties.background_color'} label={'Background color'} handleChange={e => handleChange(e)} />,
<EditWidgetNumberControl key={2} widget={widget} controlId={'customProperties.background_color_opacity'} label={'Background opacity'} defaultValue={0.5} handleChange={(e) => handleChange(e)} />
);
break;
case 'Label':
@ -155,7 +156,8 @@ export default function CreateControls(widgetType = null, widget = null, session
case 'NumberInput':
DialogControls.push(
<EditWidgetTextControl key={0} widget={widget} controlId={'name'} label={'Text'} placeholder={'Enter text'} handleChange={e => handleChange(e)} />,
<EditWidgetSignalControl key={2} widget={widget} controlId={'signalIDs'} input signals={signals} handleChange={(e) => handleChange(e)} />
<EditWidgetSignalControl key={2} widget={widget} controlId={'signalIDs'} input signals={signals} handleChange={(e) => handleChange(e)} />,
<EditWidgetCheckboxControl key={1} widget={widget} controlId={'customProperties.showUnit'} input text="Show unit" handleChange={e => handleChange(e)} />
);
break;

20
src/widget/edit-widget/edit-widget-number-control.js
View file

@ -25,21 +25,25 @@ class EditWidgetNumberControl extends Component {
this.state = {
widget: {
customProperties:{}
}
};
}
};
}
static getDerivedStateFromProps(props, state){
return{
widget: props.widget
};
}
widget: props.widget
};
}
render() {
render() {
let step = 1;
if(this.props.controlId ==='customProperties.background_color_opacity'){
step = 0.1;
}
return (
<FormGroup controlId={this.props.controlId}>
<FormLabel>{this.props.label}</FormLabel>
<FormControl type="number" step="any" value={this.state.widget[this.props.controlId]} onChange={e => this.props.handleChange(e)} />
<FormControl type="number" step={step} value={this.state.widget[this.props.controlId]} onChange={e => this.props.handleChange(e)} />
</FormGroup>
);
}

41
src/widget/edit-widget/edit-widget.js
View file

@ -57,12 +57,36 @@ class EditWidgetDialog extends React.Component {
const file = this.props.files.find(element => element.id === fileId);
// scale width to match aspect
if(file.dimensions){
const aspectRatio = file.dimensions.width / file.dimensions.height;
changeObject.width = this.state.temporal.height * aspectRatio;
}
return changeObject;
}
setMaxWidth(changeObject){
if(changeObject.type === 'Label'){
changeObject.customProperties.maxWidth = (changeObject.customProperties.textSize* 0.34) * changeObject.name.length;
}
else if (changeObject.type === 'Value'){
// changeObject.customProperties.maxWidth = (changeObject.customProperties.textSize* 0.5) * (changeObject.name.length+13);
}
return changeObject;
}
setNewLockRestrictions(changeObject){
if(changeObject.customProperties.orientation === 0){
changeObject.customProperties.resizeTopBottomLock = true;
changeObject.customProperties.resizeRightLeftLock = false;
}
else if(changeObject.customProperties.orientation === 1){
changeObject.customProperties.resizeTopBottomLock = false;
changeObject.customProperties.resizeRightLeftLock = true;
}
return changeObject;
}
handleChange(e) {
// TODO: check what we really need in this function. Can we reduce its complexity?
@ -73,13 +97,13 @@ class EditWidgetDialog extends React.Component {
// not a customProperty
customProperty = false;
}
if (e.target.id === 'lockAspect') {
if (parts[1] === 'lockAspect') {
//not a customProperty
customProperty ? changeObject[parts[0]][parts[1]] = e.target.checked : changeObject[e.target.id] = e.target.checked;
// correct image aspect if turned on
if (e.target.checked) {
if (e.target.checked && this.state.temporal.customProperties.file) {
changeObject = this.assignAspectRatio(changeObject, this.state.temporal.customProperties.file);
}
} else if (e.target.id.includes('file')) {
@ -91,7 +115,15 @@ class EditWidgetDialog extends React.Component {
// TODO this if condition requires changes to work!!!
changeObject = this.assignAspectRatio(changeObject, e.target.value);
}
} else if (e.target.type === 'number') {
}else if (parts[1] === 'textSize'){
changeObject[parts[0]][parts[1]] = Number(e.target.value);
changeObject = this.setMaxWidth(changeObject);
}else if(parts[1] === 'orientation'){
customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
changeObject = this.setNewLockRestrictions(changeObject);
}
else if (e.target.type === 'number') {
customProperty ? changeObject[parts[0]][parts[1]] = Number(e.target.value) : changeObject[e.target.id] = Number(e.target.value);
} else if(e.target.id === 'name'){
if(customProperty ? (changeObject[parts[0]][parts[1]] != null) : (changeObject[e.target.id] != null)){
@ -99,6 +131,7 @@ class EditWidgetDialog extends React.Component {
} else{
customProperty ? changeObject[parts[0]][parts[1]]= 'default' : changeObject[e.target.id] = 'default';
}
changeObject = this.setMaxWidth(changeObject);
} else {
customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
}

22
src/widget/editable-widget-container.js
View file

@ -84,16 +84,21 @@ class EditableWidgetContainer extends React.Component {
render() {
const widget = this.props.widget;
let resizingRestricted = false;
if(widget.customProperties.resizeRightLeftLock || widget.customProperties.resizeTopBottomLock){
resizingRestricted = true;
}
const resizing = {
bottom: !widget.isLocked,
bottomLeft: !widget.isLocked,
bottomRight: !widget.isLocked,
left: !widget.isLocked,
right: !widget.idLocked,
top: !widget.isLocked,
topLeft: !widget.isLocked,
topRight: !widget.isLocked
bottom: !(widget.customProperties.resizeTopBottomLock || widget.isLocked),
bottomLeft: !(resizingRestricted|| widget.isLocked),
bottomRight: !(resizingRestricted || widget.isLocked),
left: !(widget.customProperties.resizeRightLeftLock || widget.isLocked),
right: !(widget.customProperties.resizeRightLeftLock || widget.isLocked),
top: !(widget.customProperties.resizeTopBottomLock || widget.isLocked),
topLeft: !(resizingRestricted || widget.isLocked),
topRight: !(resizingRestricted || widget.isLocked)
};
const gridArray = [ this.props.grid, this.props.grid ];
@ -108,6 +113,7 @@ class EditableWidgetContainer extends React.Component {
default={{ x: Number(widget.x), y: Number(widget.y), width: widget.width, height: widget.height }}
minWidth={widget.minWidth}
minHeight={widget.minHeight}
maxWidth ={widget.customProperties.maxWidth || '100%' }
lockAspectRatio={Boolean(widget.isLocked)}
bounds={'parent'}
className={widgetClasses}

2
src/widget/widget-area.js
View file

@ -50,7 +50,7 @@ class WidgetArea extends React.Component {
return absolutHeight > currentHeight ? absolutHeight : currentHeight;
}, 0);
return <Dropzone height={maxHeight + 80} onDrop={this.handleDrop} editing={this.props.editing}>
return <Dropzone height={maxHeight + 80} onDrop={this.handleDrop} editing={this.props.editing} widgets={this.props.widgets}>
{this.props.children}
<Grid size={this.props.grid} disabled={this.props.grid === 1 || this.props.editing !== true} />

2
src/widget/widget-container.js
View file

@ -26,7 +26,7 @@ class WidgetContainer extends React.Component {
height: Number(this.props.widget.height),
left: Number(this.props.widget.x),
top: Number(this.props.widget.y),
zindex: Number(this.props.widget.z),
zIndex: Number(this.props.widget.z),
position: 'absolute'
};

6
src/widget/widget-context-menu.js
View file

@ -34,7 +34,7 @@ class WidgetContextMenu extends React.Component {
};
moveAbove = event => {
this.props.widget.z++;
this.props.widget.z += 10;
if (this.props.widget.z > 100) {
this.props.widget.z = 100;
}
@ -53,7 +53,7 @@ class WidgetContextMenu extends React.Component {
};
moveUnderneath = event => {
this.props.widget.z--;
this.props.widget.z -= 10;
if (this.props.widget.z < 0) {
this.props.widget.z = 0;
}
@ -90,7 +90,7 @@ class WidgetContextMenu extends React.Component {
render() {
const isLocked = this.props.widget.locked;
const ContextMenu = () => (
<Menu id={'widgetMenu'+ this.props.index}>
<Menu id={'widgetMenu'+ this.props.index} style={{zIndex: 1000}}>
<Item disabled={isLocked} onClick={this.editWidget}>Edit</Item>
<Item disabled={isLocked} onClick={this.deleteWidget}>Delete</Item>

10
src/widget/widget-factory.js
View file

@ -70,11 +70,12 @@ class WidgetFactory {
case 'Value':
widget.minWidth = 70;
widget.minHeight = 20;
widget.width = 120;
widget.width = 150;
widget.height = 30;
widget.customProperties.textSize = 16;
widget.name = 'Value';
widget.customProperties.showUnit = false;
widget.customProperties.resizeTopBottomLock = true;
break;
case 'Plot':
widget.customProperties.ylabel = '';
@ -96,11 +97,13 @@ class WidgetFactory {
case 'Label':
widget.minWidth = 20;
widget.minHeight = 20;
widget.customProperties.maxWidth = 100;
widget.width = 100;
widget.height = 35;
widget.name = 'Label';
widget.customProperties.textSize = 32;
widget.customProperties.fontColor = 0;
widget.customProperties.resizeTopBottomLock = true;
break;
case 'PlotTable':
widget.customProperties.ylabel = '';
@ -137,6 +140,8 @@ class WidgetFactory {
widget.minHeight = 50;
widget.width = 200;
widget.height = 50;
widget.customProperties.showUnit = false;
widget.customProperties.resizeTopBottomLock = true;
break;
case 'Slider':
widget.minWidth = 380;
@ -150,6 +155,8 @@ class WidgetFactory {
widget.customProperties.showUnit = true;
widget.customProperties.continous_update = false;
widget.customProperties.default_value = 0;
widget.customProperties.resizeLeftRightLock = false;
widget.customProperties.resizeTopBottomLock = true;
break;
case 'Gauge':
@ -169,6 +176,7 @@ class WidgetFactory {
widget.width = 100;
widget.height = 100;
widget.customProperties.border_color = 0;
widget.customProperties.background_color_opacity = 0.5;
widget.z = 0;
break;
case 'HTML':

2
src/widget/widgets/box.js
View file

@ -27,7 +27,7 @@ class WidgetBox extends Component {
let colorStyle = {
borderColor: colors[this.props.widget.customProperties.border_color],
backgroundColor: colors[this.props.widget.customProperties.background_color],
opacity: this.props.widget.customProperties.background_color_opacity
opacity: this.props.widget.customProperties.background_color_opacity,
}
return (

47
src/widget/widgets/gauge.js
View file

@ -31,17 +31,20 @@ class WidgetGauge extends Component {
unit: '',
minValue: null,
maxValue: null,
useColorZones: false,
useMinMax: false,
useMinMaxChange: false,
};
}
componentDidMount() {
this.gauge = new Gauge(this.gaugeCanvas).setOptions(this.computeGaugeOptions(this.props.widget));
//this.gauge.maxValue = this.state.maxValue;
//this.gauge.setMinValue(this.state.minValue);
this.gauge.maxValue = this.state.maxValue;
this.gauge.setMinValue(this.state.minValue);
this.gauge.animationSpeed = 30;
//this.gauge.set(this.state.value);
this.gauge.set(this.state.value);
//this.updateLabels(this.state.minValue, this.state.maxValue);
this.updateLabels(this.state.minValue, this.state.maxValue);
}
componentDidUpdate(prevProps: Readonly<P>, prevState: Readonly<S>, snapshot: SS): void {
@ -57,9 +60,19 @@ class WidgetGauge extends Component {
this.gauge.set(this.state.value)
}
if(prevState.useMinMax === true && this.state.useMinMax === false){
this.setState({useMinMaxChange: true});
}
// update labels
if(prevState.minValue !== this.state.minValue || prevState.maxValue !== this.state.maxValue){
this.updateLabels(this.state.minValue, this.state.maxValue)
if(prevState.minValue !== this.state.minValue || prevState.maxValue !== this.state.maxValue || prevState.useColorZones !== this.state.useColorZones
|| prevState.useMinMax !== this.state.useMinMax){
this.gauge = new Gauge(this.gaugeCanvas).setOptions(this.computeGaugeOptions(this.props.widget));
this.gauge.maxValue = this.state.maxValue;
this.gauge.setMinValue(this.state.minValue);
this.gauge.animationSpeed = 30;
this.gauge.set(this.state.value);
this.updateLabels(this.state.minValue, this.state.maxValue)
}
}
@ -69,9 +82,10 @@ class WidgetGauge extends Component {
if(props.widget.signalIDs.length === 0){
return null;
}
let returnState = {}
returnState["useColorZones"] = props.widget.customProperties.colorZones;
// Update unit (assuming there is exactly one signal for this widget)
let signalID = props.widget.signalIDs[0];
let widgetSignal = props.signals.find(sig => sig.id === signalID);
@ -105,7 +119,8 @@ class WidgetGauge extends Component {
const value = Math.round(signalData[signalData.length - 1].y * 1e3) / 1e3;
let minValue = null;
let maxValue = null;
if (state.value !== value && value != null) {
if ((state.value !== value && value != null) || props.widget.customProperties.valueUseMinMax || state.useMinMaxChange) {
//value has changed
updateValue = true;
@ -114,17 +129,18 @@ class WidgetGauge extends Component {
minValue = state.minValue;
maxValue = state.maxValue;
if (minValue == null) {
if (minValue == null || state.useMinMaxChange) {
minValue = value - 0.5;
updateLabels = true;
updateMinValue = true;
}
if (maxValue == null) {
if (maxValue == null || state.useMinMaxChange) {
maxValue = value + 0.5;
updateLabels = true;
updateMaxValue = true;
returnState["useMinMaxChange"] = false;
}
if (props.widget.customProperties.valueUseMinMax) {
@ -141,7 +157,7 @@ class WidgetGauge extends Component {
}
}
if (updateLabels === false) {
if (updateLabels === false && state.gauge) {
// check if min/max changed
if (minValue > state.gauge.minValue) {
minValue = state.gauge.minValue;
@ -155,6 +171,13 @@ class WidgetGauge extends Component {
}
}
if(props.widget.customProperties.valueUseMinMax !== state.useMinMax){
returnState["useMinMax"] = props.widget.customProperties.valueUseMinMax;
}
if(props.widget.customProperties.colorZones !== state.useColorZones){
returnState["useColorZones"] = props.widget.customProperties.colorZones;
}
// prepare returned state
if(updateValue === true){
returnState["value"] = value;

4
src/widget/widgets/input.js
View file

@ -84,9 +84,13 @@ class WidgetInput extends Component {
<Col>
<InputGroup>
<FormControl type="number" step="any" disabled={ this.props.editing } onKeyPress={ (e) => this.handleKeyPress(e) } onBlur={ (e) => this.valueChanged(this.state.value) } onChange={ (e) => this.valueIsChanging(e.target.value) } placeholder="Enter value" value={ this.state.value } />
{this.props.widget.customProperties.showUnit? (
<InputGroup.Append>
<InputGroup.Text>{this.state.unit}</InputGroup.Text>
</InputGroup.Append>
):(
<div></div>
)}
</InputGroup>
</Col>
</FormGroup>

10
src/widget/widgets/table.js
View file

@ -92,6 +92,14 @@ class WidgetTable extends Component {
}
render() {
let rows = this.state.rows;
if(rows.length === 0){
rows.push({
name: "no entries"
})
}
var columns = [
<TableColumn key={1} title="Signal" dataKey="name" width={120} />,
<TableColumn key={2} title="Value" dataKey="value" modifier={format('.4s')} />
@ -102,7 +110,7 @@ class WidgetTable extends Component {
return (
<div className="table-widget">
<Table data={this.state.rows}>
<Table data={rows}>
{ columns }
</Table>
</div>

12
src/widget/widgets/value.js
View file

@ -68,14 +68,16 @@ class WidgetValue extends Component {
}
render() {
var value_to_render = Number(this.state.value);
let value_to_render = Number(this.state.value);
let value_width = this.props.widget.customProperties.textSize*0.55* (this.state.value.length +2);
let unit_width = this.props.widget.customProperties.textSize*2;
return (
<div className="single-value-widget">
<strong style={{ fontSize: this.props.widget.customProperties.textSize + 'px' }}>{this.props.widget.name}</strong>
<span style={{ fontSize: this.props.widget.customProperties.textSize + 'px' }}>{Number.isNaN(value_to_render) ? NaN : format('.3s')(value_to_render)}</span>
<strong style={{ fontSize: this.props.widget.customProperties.textSize + 'px'}}>{this.props.widget.name}</strong>
<span style={{ fontSize: this.props.widget.customProperties.textSize + 'px',width: value_width }}>{Number.isNaN(value_to_render) ? NaN : format('.3s')(value_to_render)}</span>
{this.props.widget.customProperties.showUnit &&
<span style={{ fontSize: this.props.widget.customProperties.textSize + 'px' }}>[{this.state.unit}]</span>
}
<span style={{ fontSize: this.props.widget.customProperties.textSize + 'px', width: unit_width}}>[{this.state.unit}]</span>
}
</div>
);
}